Skip to content

Commit

Permalink
Fix empty tags.
Browse files Browse the repository at this point in the history
  • Loading branch information
PinkDisorder committed Oct 21, 2024
1 parent faae748 commit dab478d
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 37 deletions.
10 changes: 0 additions & 10 deletions index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64940,11 +64940,6 @@ file = "mods/create-deco.pw.toml"
hash = "0bbb0d5c211ddf6fd76fd602167b1f012dbfe56e72c5f2568ec1089cd930ece0"
metafile = true

[[files]]
file = "mods/create-food.pw.toml"
hash = "0f1aed690018994d65c3abe59d2e709d9668caa25ee9baa42f98589141d536ee"
metafile = true

[[files]]
file = "mods/create-liquid-fuel.pw.toml"
hash = "ca274f1a31ba6fdf3ce7fc4a14e5d6ffcaa19c711595d98d87deb1d9fe365727"
Expand Down Expand Up @@ -65395,11 +65390,6 @@ file = "mods/miners-delight-plus.pw.toml"
hash = "8a459a2534f09d18581fa154a84f428b1eaf1721fc8493ebe1e80df490e7502c"
metafile = true

[[files]]
file = "mods/mob-plaques.pw.toml"
hash = "b649de8b5b82992aa2e6a1412bef7fcc2b016714f3ab815761f881dc9ad134a4"
metafile = true

[[files]]
file = "mods/modern-ae2-additions.pw.toml"
hash = "c6b6251dcd9f357f739ad8ccfed0e6e97b6e39f4f5b706863f239d912eeb0cb3"
Expand Down
74 changes: 48 additions & 26 deletions kubejs/server_scripts/corrections.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,53 @@
//priority: 9001

ServerEvents.tags("item", event => {
// Fix empty tags
event.add("minecraft:stone", "#forge:stone");
event.add("wizards_reborn:arcane_wood_slabs", "wizards_reborn:arcane_wood_slab");

event.add("forge:raw_pasta", "#forge:pasta/raw_pasta");

event.add("forge:food/raw_pasta", "#forge:pasta/raw_pasta");
event.add("forge:food/raw_pasta", "#forge:raw_pasta");

event.add("forge:grain/barley", "#forge:barley");

event.add("forge:foods/raw_rabbit", "minecraft:rabbit");

event.add("forge:water_bucket", "#forge:buckets/water");

// Would be so nice if the let's do dev was using forge tags
event.add("c:sugar", "#forge:dusts/sugar");
event.add("c:grain/oat", "#forge:grain/oat");
event.add("c:bones", "#forge:bones");
event.add("c:fruits/strawberries", "#forge:fruits/strawberries");

// Because having one set of tags that makes sense is too much to ask for humble onions
event.add("forge:vegetables/onion", "#forge:crops/onion");
event.add("forge:crops/onion", "#forge:vegetables/onion");
event.add("c:crops/onion", "#forge:crops/onion");

event.add("c:crops/tomato", "#forge:crops/tomato");
// what was wrong with #forge:tools/knives in the first place?
event.add("lets_do_addon_compat:tools/knives", "#forge:tools/knives");



// Ingredient.of("#forge:stone").itemIds.forEach(item => event.add(item, "minecraft:stone"));
})

ServerEvents.tags('fluid', event => {
const fluids = [
"iron", "gold", "copper", "lead", "silver", "nickel", "tin", "zinc",
"platinum", "bronze", "electrum", "brass", "invar", "steel"
]

const fluidTagstoAdd = [
{ gtceu: 'gtceu:iron', tag: 'forge:molten_iron'},
{ gtceu: 'gtceu:gold', tag: 'forge:molten_gold'},
{ gtceu: 'gtceu:copper', tag: 'forge:molten_copper'},
{ gtceu: 'gtceu:lead', tag: 'forge:molten_lead'},
{ gtceu: 'gtceu:silver', tag: 'forge:molten_silver'},
{ gtceu: 'gtceu:nickel', tag: 'forge:molten_nickel'},
{ gtceu: 'gtceu:tin', tag: 'forge:molten_tin'},
{ gtceu: 'gtceu:aluminium', tag: 'forge:molten_aluminum'},
{ gtceu: 'gtceu:zinc', tag: 'forge:molten_zinc'},
{ gtceu: 'gtceu:platinum', tag: 'forge:molten_platinum'},
{ gtceu: 'gtceu:bronze', tag: 'forge:molten_bronze'},
{ gtceu: 'gtceu:electrum', tag: 'forge:molten_electrum'},
{ gtceu: 'gtceu:brass', tag: 'forge:molten_brass'},
{ gtceu: 'gtceu:invar', tag: 'forge:molten_invar'},
{ gtceu: 'gtceu:steel', tag: 'forge:molten_steel'}
];

fluidTagstoAdd.forEach(
tags => {
event.add(tags.gtceu, tags.tag);
event.add(tags.tag, tags.gtceu);
}
);
});
event.add("gtceu:aluminium", "#forge:molten_aluminum");
event.add("forge:molten_aluminum", "gtceu:aluminium");

fluids.forEach(f => {
event.add(`gtceu:${f}`, `#forge:molten_${f}`);
event.add(`forge:molten_${f}`, `#gtceu:${f}`);
});

// ServerEvents.tags("item", event => {})
});
2 changes: 1 addition & 1 deletion pack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "8b04997d55d9d85a3a1058a2e69f89efc9e6199629340939598401c2ca9515e9"
hash = "b8aa837758a4d04bf2dc09ac02eec901f02c3ff2bfcf7b16f021092659f1010a"

[versions]
forge = "47.3.11"
Expand Down

0 comments on commit dab478d

Please sign in to comment.