Skip to content

Commit

Permalink
Merge pull request #141 from Kanzaji/develop
Browse files Browse the repository at this point in the history 
Another try at fixing random tags errors
  • Loading branch information
@MuteTiefling
MuteTiefling authored Nov 27, 2022
2 parents 1e0a88e + e982620 commit a931b1b
Show file tree
Hide file tree
Showing 25 changed files with 189 additions and 99 deletions.
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/enigmatica/storage/bags.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ ServerEvents.tags('item', (event) => {
'#create:toolboxes'
];

const tagGroups = ['enigmatica:containers', 'enigmatica:containers/bag'];
// const tagGroups = ['enigmatica:containers', 'enigmatica:containers/bag'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items);
// });

event.get('enigmatica:containers').add(items);
event.get('enigmatica:containers/bags').add(items);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/enigmatica/storage/basic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ ServerEvents.tags('item', (event) => {
'immersiveengineering:armor_faraday_chest'
];

const tagGroups = ['enigmatica:containers', 'enigmatica:containers/basic'];
// const tagGroups = ['enigmatica:containers', 'enigmatica:containers/basic'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('enigmatica:containers').add(items).remove(exceptions);
event.get('enigmatica:containers/basic').add(items).remove(exceptions);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/enigmatica/storage/bulk.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ ServerEvents.tags('item', (event) => {
//'botania:black_hole_talisman'
];

const tagGroups = ['enigmatica:containers', 'enigmatica:containers/bulk'];
// const tagGroups = ['enigmatica:containers', 'enigmatica:containers/bulk'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items);
// });

event.get('enigmatica:containers').add(items);
event.get('enigmatica:containers/bulk').add(items);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/enigmatica/storage/energy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ ServerEvents.tags('item', (event) => {
'mekanism:energy_tablet'
];

const tagGroups = ['enigmatica:containers', 'enigmatica:containers/energy'];
// const tagGroups = ['enigmatica:containers', 'enigmatica:containers/energy'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items);
// });

event.get('enigmatica:containers').add(items);
event.get('enigmatica:containers/energy').add(items);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/enigmatica/storage/gases.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
ServerEvents.tags('item', (event) => {
const items = [/chemical_tank/, /chemical_storage_cell/, 'mekanism:dynamic_tank', 'mekanism:dynamic_valve'];

const tagGroups = ['enigmatica:containers', 'enigmatica:containers/gas'];
// const tagGroups = ['enigmatica:containers', 'enigmatica:containers/gas'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items);
// });

event.get('enigmatica:containers').add(items);
event.get('enigmatica:containers/gas').add(items);
});
12 changes: 8 additions & 4 deletions kubejs/server_scripts/base/tags/items/enigmatica/storage/liquids.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ ServerEvents.tags('item', (event) => {
'mekanism:ultimate_chemical_tank',
'mekanism:creative_chemical_tank'
];
const tagGroups = ['enigmatica:containers', 'enigmatica:containers/liquid', 'enigmatica:containers/fluid'];
// const tagGroups = ['enigmatica:containers', 'enigmatica:containers/liquid', 'enigmatica:containers/fluid'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('enigmatica:containers').add(items).remove(exceptions);
event.get('enigmatica:containers/liquid').add(items).remove(exceptions);
event.get('enigmatica:containers/fluid').add(items).remove(exceptions);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/enigmatica/weapons/melee.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ ServerEvents.tags('item', (event) => {
];
const exceptions = [];

const tagGroups = ['enigmatica:weapons', 'enigmatica:weapons/melee'];
// const tagGroups = ['enigmatica:weapons', 'enigmatica:weapons/melee'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('enigmatica:weapons').add(items).remove(exceptions);
event.get('enigmatica:weapons/melee').add(items).remove(exceptions);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/enigmatica/weapons/ranged.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@ ServerEvents.tags('item', (event) => {
];
const exceptions = [];

const tagGroups = ['enigmatica:weapons', 'enigmatica:weapons/ranged'];
// const tagGroups = ['enigmatica:weapons', 'enigmatica:weapons/ranged'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('enigmatica:weapons').add(items).remove(exceptions);
event.get('enigmatica:weapons/ranged').add(items).remove(exceptions);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/armor/boots.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ ServerEvents.tags('item', (event) => {
'pneumaticcraft:jet_boots_upgrade_5'
];

const tagGroups = ['forge:armors', 'forge:armors/boots'];
// const tagGroups = ['forge:armors', 'forge:armors/boots'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:armors').add(items).remove(exceptions);
event.get('forge:armors/boots').add(items).remove(exceptions);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/armor/chests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ ServerEvents.tags('item', (event) => {

const exceptions = ['pneumaticcraft:jet_boots_upgrade_1'];

const tagGroups = ['forge:armors', 'forge:armors/chestplates'];
// const tagGroups = ['forge:armors', 'forge:armors/chestplates'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:armors').add(items).remove(exceptions);
event.get('forge:armors/chestplates').add(items).remove(exceptions);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/armor/helms.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ ServerEvents.tags('item', (event) => {

const exceptions = [];

const tagGroups = ['forge:armors', 'forge:armors/helmets'];
// const tagGroups = ['forge:armors', 'forge:armors/helmets'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:armors').add(items).remove(exceptions);
event.get('forge:armors/helmets').add(items).remove(exceptions);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/armor/legs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ ServerEvents.tags('item', (event) => {

const exceptions = [];

const tagGroups = ['forge:armors', 'forge:armors/leggings'];
// const tagGroups = ['forge:armors', 'forge:armors/leggings'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:armors').add(items).remove(exceptions);
event.get('forge:armors/leggings').add(items).remove(exceptions);
});
12 changes: 8 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/axes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ ServerEvents.tags('item', (event) => {
const items = [/_axe$/, /_paxel/, /_aiot/, 'immersiveengineering:axe_steel'];
const exceptions = [];

const tagGroups = ['forge:tools', 'forge:axes', 'forge:tools/axes'];
// const tagGroups = ['forge:tools', 'forge:axes', 'forge:tools/axes'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:tools/axes').add(items).remove(exceptions);
event.get('forge:axes').add(items).remove(exceptions);
});
12 changes: 8 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/bows.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ ServerEvents.tags('item', (event) => {
const items = [/_bow$/];
const exceptions = [];

const tagGroups = ['forge:tools', 'forge:bows', 'forge:tools/bows'];
// const tagGroups = ['forge:tools', 'forge:bows', 'forge:tools/bows'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:tools/bows').add(items).remove(exceptions);
event.get('forge:bows').add(items).remove(exceptions);
});
11 changes: 7 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ ServerEvents.tags('item', (event) => {
const items = ['immersiveengineering:hammer'];
const exceptions = [];

const tagGroups = ['forge:tools', 'forge:tools/crafting_hammers'];
// const tagGroups = ['forge:tools', 'forge:tools/crafting_hammers'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:tools/crafting_hammers').add(items).remove(exceptions);
});
12 changes: 8 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/fishing_rods.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ ServerEvents.tags('item', (event) => {

const exceptions = [];

const tagGroups = ['forge:tools', 'forge:fishing_rods', 'forge:tools/fishing_rods'];
// const tagGroups = ['forge:tools', 'forge:fishing_rods', 'forge:tools/fishing_rods'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:tools/fishing_rods').add(items).remove(exceptions);
event.get('forge:fishing_rods').add(items).remove(exceptions);
});
12 changes: 8 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/hammers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ ServerEvents.tags('item', (event) => {

const exceptions = ['immersiveengineering:gunpart_hammer', 'immersiveengineering:bannerpattern_hammer'];

const tagGroups = ['forge:tools', 'forge:hammers', 'forge:tools/hammers'];
// const tagGroups = ['forge:tools', 'forge:hammers', 'forge:tools/hammers'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:tools/hammers').add(items).remove(exceptions);
event.get('forge:hammers').add(items).remove(exceptions);
});
12 changes: 8 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/hoes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ ServerEvents.tags('item', (event) => {
const items = [/_hoe/, /_aiot/, 'immersiveengineering:hoe_steel'];
const exceptions = [];

const tagGroups = ['forge:tools', 'forge:hoes', 'forge:tools/hoes'];
// const tagGroups = ['forge:tools', 'forge:hoes', 'forge:tools/hoes'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:tools/hoes').add(items).remove(exceptions);
event.get('forge:hoes').add(items).remove(exceptions);
});
13 changes: 9 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/knives.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ ServerEvents.tags('item', (event) => {

const exceptions = [];

const tagGroups = ['forge:tools', 'forge:knives', 'farmersdelight:tools/knives', 'farmersdelight:straw_harvesters'];
// const tagGroups = ['forge:tools', 'forge:knives', 'farmersdelight:tools/knives', 'farmersdelight:straw_harvesters'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:knives').add(items).remove(exceptions);
event.get('farmersdelight:tools/knives').add(items).remove(exceptions);
event.get('farmersdelight:straw_harvesters').add(items).remove(exceptions);
});
12 changes: 8 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/multi-tools.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ ServerEvents.tags('item', (event) => {

const exceptions = [];

const tagGroups = ['forge:tools', 'forge:multi_tools', 'forge:tools/multi_tools'];
// const tagGroups = ['forge:tools', 'forge:multi_tools', 'forge:tools/multi_tools'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:tools/multi_tools').add(items).remove(exceptions);
event.get('forge:multi_tools').add(items).remove(exceptions);
});
13 changes: 9 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/pickaxes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ ServerEvents.tags('item', (event) => {

const exceptions = ['occultism:ritual_dummy/craft_infused_pickaxe'];

const tagGroups = ['minecraft:cluster_max_harvestables', 'forge:tools', 'forge:pickaxes', 'forge:tools/pickaxes'];
// const tagGroups = ['minecraft:cluster_max_harvestables', 'forge:tools', 'forge:pickaxes', 'forge:tools/pickaxes'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:tools/pickaxes').add(items).remove(exceptions);
event.get('forge:pickaxes').add(items).remove(exceptions);
event.get('minecraft:cluster_max_harvestables').add(items).remove(exceptions);
});
12 changes: 8 additions & 4 deletions kubejs/server_scripts/base/tags/items/forge/tools/shields.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ ServerEvents.tags('item', (event) => {

const exceptions = ['twilightforest:stronghold_shield'];

const tagGroups = ['forge:tools', 'forge:shields', 'forge:tools/shields'];
// const tagGroups = ['forge:tools', 'forge:shields', 'forge:tools/shields'];

tagGroups.forEach((tagGroup) => {
event.get(tagGroup).add(items).remove(exceptions);
});
// tagGroups.forEach((tagGroup) => {
// event.get(tagGroup).add(items).remove(exceptions);
// });

event.get('forge:tools').add(items).remove(exceptions);
event.get('forge:tools/shields').add(items).remove(exceptions);
event.get('forge:shields').add(items).remove(exceptions);
});
Loading

0 comments on commit a931b1b

Please sign in to comment.