Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
Unify ender pearl dusts
Browse files Browse the repository at this point in the history
  • Loading branch information
@egelja
egelja committed Jul 27, 2021
1 parent 501d334 commit caa8b2b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
19 changes: 11 additions & 8 deletions modpack/overrides/kubejs/server_scripts/instantUnify/unify.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ var tagGen = [
"coal_coke=storage_blocks,ingots,nuggets,dusts,ores,gears,plates,rods,gems",
// Charcoal
"charcoal=storage_blocks,ingots,nuggets,dusts,ores,gears,plates,rods,gems",
// Ender Pearl Dust
"ender=dusts",
"ender_pearl=dusts",
// Sawdust
"wood=storage_blocks,dusts",
];
Expand Down Expand Up @@ -259,16 +262,16 @@ onEvent("entity.spawned", (event) => {

// Check for every tag in the list
outer: for (let tag of global["unifytags"]) {
// Check if item should be unified
for (let e of global["UNIFY_SKIP"]) {
// Check if item's mod is one that shouldn't be unified
if (e.mods === "*" || e.mods.indexOf(gItem.getMod()) == -1) {
// Check if current tag is one that shouldn't be unified
if (tag.match(e.filter)) {
continue outer;
// Check if item should be unified
for (let e of global["UNIFY_SKIP"]) {
// Check if item's mod is one that shouldn't be unified
if (e.mods === "*" || e.mods.indexOf(gItem.getMod()) == -1) {
// Check if current tag is one that shouldn't be unified
if (tag.match(e.filter)) {
continue outer;
}
}
}
}

let ingr = Ingredient.of("#" + tag);
if (ingr && ingr.test(gItem)) {
Expand Down
2 changes: 1 addition & 1 deletion modpack/overrides/kubejs/server_scripts/theLatestSummerFun/tags/item.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ onEvent("item.tags", (event) => {
event.add("appliedenergistics2:silicon", "#forge:gems/silicon");

// Ender dust
event.add("forge:dusts", "appliedenergistics2:ender_dust");
event.add("forge:dusts/ender", "appliedenergistics2:ender_dust");
event.add("forge:dusts/ender_pearl", "emendatusenigmatica:ender_dust");

//$ Planks
// Non-vanilla
Expand Down

1 comment on commit caa8b2b

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

🔴 Please review

Unrecognized words (50) 
Amertrine
ashenwheat
atum
BCB
BFB
BGB
bokshelf
BPB
buildersaddiction
choosen
CJC
CQC
deepslate
DJD
drawerstooltip
EDE
EGE
eidon
EJE
EUE
FRF
GDG
GFG
ggg
GJG
GNG
GRG
GWG
IFI
IJI
infernalexp
IRI
LLL
LSL
mutlipliers
NJN
NRN
OIO
Ouptuts
PCP
QCQ
RCR
RER
revertable
RRR
RUR
SGS
shroomloin
vanillacookbook
voline
Available dictionaries could cover words not in the dictionary

cspell:cpp/cpp.txt (104293) covers 1 of them

Consider adding them using:

      with:
        extra_dictionaries:
          cspell:cpp/cpp.txt

To stop checking additional dictionaries, add:

      with:
        check_extra_dictionaries: ''
To accept these unrecognized words as correct, run the following commands

... in a clone of the git@github.com:MrAwesomeRocks/the-latest-summer-fun.git repository
on the dev branch:

(cd $(git rev-parse --show-toplevel)
perl -e '
my $new_expect_file=".github/actions/spelling/expect.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"Amertrine ashenwheat atum BCB BFB BGB bokshelf BPB buildersaddiction choosen CJC CQC deepslate DJD drawerstooltip EDE EGE eidon EJE EUE FRF GDG GFG ggg GJG GNG GRG GWG IFI IJI infernalexp IRI LLL LSL mutlipliers NJN NRN OIO Ouptuts PCP QCQ RCR RER revertable RRR RUR SGS shroomloin vanillacookbook voline "');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
)
If you see a bunch of garbage

If it relates to a ...

well-formed pattern

See if there's a pattern that would match it.

If not, try writing one and adding it to the patterns.txt file.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.

binary-ish string

Please add a file path to the excludes.txt file instead of just accepting the garbage.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

Please sign in to comment.