Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EE Vanilla items removal + bunch of fixes. #797

Merged
merged 16 commits into from
Dec 6, 2023
Merged

EE Vanilla items removal + bunch of fixes. #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ceac3fe
Partial Fix for #677 . Waiting for mod updates now!
Kanzaji Aug 30, 2023
ebd4870
Fix Gold Vanilla replacement removal
Kanzaji Aug 30, 2023
3340d50
Merge branch 'develop-upstream' into EE-Setup
Kanzaji Oct 24, 2023
63e29a3
Include Andesite Block Texture, after very long time ^^"
Kanzaji Oct 24, 2023
501abf8
Merge branch 'develop-upstream' into EE-Setup
Kanzaji Oct 26, 2023
172c580
Bring back JEI Support for added items, reworking emi_add_items.js
Kanzaji Oct 26, 2023
cd98fa9
Update emi_add_items.js
Kanzaji Oct 26, 2023
be49565
Merge branch 'develop-upstream' into EE-Setup
Kanzaji Dec 2, 2023
7b1208f
Fix for #677 + bunch of EMI/JEI QoL
Kanzaji Dec 2, 2023
c1cf26a
Add compacting support for blocks mentioned in #731
Kanzaji Dec 2, 2023
88125f9
Refactor added_items constant to be a part of jei constant from jei_h…
Kanzaji Dec 2, 2023
0a6237f
Remove disabled items from addition list, move expert disabled to sho…
Kanzaji Dec 2, 2023
2167d7d
Override Amethyst json to fix the dupe on our side...
Kanzaji Dec 3, 2023
ae356e2
Change Functional Storage jsons to a script
Kanzaji Dec 5, 2023
46d855a
Simplify the overcomplicated code :smile:
Kanzaji Dec 5, 2023
e1cc55d
Remove "Temporary" Scripts that added Notes and conversion recipes fo…
Kanzaji Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions config/almostunified/unify.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,15 @@
"sugar_cane"
],
"priorityOverrides": {
"forge:ores/iron": "emendatusenigmatica",
"forge:ores/emerald": "emendatusenigmatica",
"forge:ores/copper": "emendatusenigmatica",
"forge:ores/iron": "emendatusenigmatica",
"forge:ores/gold": "emendatusenigmatica",
"forge:ores/diamond": "emendatusenigmatica"
"forge:ores/diamond": "emendatusenigmatica",
"forge:ores/emerald": "emendatusenigmatica",
"forge:ores/redstone": "emendatusenigmatica",
"forge:ores/lapis": "emendatusenigmatica",
"forge:ores/coal": "emendatusenigmatica",
"forge:ores/quartz": "emendatusenigmatica"
},
"customTags": {},
"tagOwnerships": {
Expand Down Expand Up @@ -147,4 +151,4 @@
],
"ignoredRecipes": [],
"itemsHidingJeiRei": true
}
}
4 changes: 0 additions & 4 deletions config/configswapper/expert/config/emendatusenigmatica/material/gold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
"localizedName": "Gold",
"disableDefaultOre": true,
"processedTypes": [
"storage_block",
"ore",
"raw",
"crushed_ore",
"ingot",
"nugget",
"dust",
"plate",
"rod",
Expand Down
4 changes: 0 additions & 4 deletions config/configswapper/normal/config/emendatusenigmatica/material/gold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
"localizedName": "Gold",
"disableDefaultOre": true,
"processedTypes": [
"storage_block",
"ore",
"raw",
"crushed_ore",
"ingot",
"nugget",
"dust",
"plate",
"rod",
Expand Down
3 changes: 0 additions & 3 deletions config/emendatusenigmatica/material/copper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
"localizedName": "Copper",
"disableDefaultOre": true,
"processedTypes": [
"storage_block",
"ore",
"raw",
"crushed_ore",
"ingot",
"nugget",
"dust",
"plate",
Expand Down
1 change: 0 additions & 1 deletion config/emendatusenigmatica/material/diamond.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"disableDefaultOre": true,
"processedTypes": [
"ore",
"storage_block",
"dust",
"gear"
],
Expand Down
1 change: 0 additions & 1 deletion config/emendatusenigmatica/material/emerald.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"disableDefaultOre": true,
"processedTypes": [
"ore",
"storage_block",
"dust",
"gear"
],
Expand Down
4 changes: 0 additions & 4 deletions config/emendatusenigmatica/material/gold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
"localizedName": "Gold",
"disableDefaultOre": true,
"processedTypes": [
"storage_block",
"ore",
"raw",
"crushed_ore",
"ingot",
"nugget",
"dust",
"plate",
"rod",
Expand Down
4 changes: 0 additions & 4 deletions config/emendatusenigmatica/material/iron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
"localizedName": "Iron",
"disableDefaultOre": true,
"processedTypes": [
"storage_block",
"ore",
"raw",
"crushed_ore",
"ingot",
"nugget",
"dust",
"plate",
"rod",
Expand Down
2 changes: 0 additions & 2 deletions config/emendatusenigmatica/material/netherite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"source": "vanilla",
"localizedName": "Netherite",
"processedTypes": [
"storage_block",
"ingot",
"nugget",
"dust",
"gear",
Expand Down
Binary file added kubejs/assets/emendatusenigmatica/textures/blocks/andesite_block.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 24 additions & 11 deletions kubejs/assets/emi/index/stacks/emi_added_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"added": [
{
"stack": "item:immersiveengineering:alloy_smelter"
},
{
"stack": "item:immersiveengineering:arc_furnace"
},
Expand All @@ -12,9 +9,6 @@
{
"stack": "item:immersiveengineering:auto_workbench"
},
{
"stack": "item:immersiveengineering:blast_furnace"
},
{
"stack": "item:immersiveengineering:bottling_machine"
},
Expand Down Expand Up @@ -61,16 +55,28 @@
"stack": "item:immersiveengineering:tank"
},
{
"stack": "item:emendatusenigmatica:bitumen_sandstone_ore"
"stack": "item:emendatusenigmatica:bitumen_sandstone_ore",
"after": "item:emendatusenigmatica:iron_ore"
},
{
"stack": "item:emendatusenigmatica:quartz_netherrack_ore",
"after": "item:emendatusenigmatica:bitumen_sandstone_ore"
},
{
"stack": "item:minecraft:enchanted_book{StoredEnchantments:[{id:\"ars_nouveau:reactive\",lvl:1s}]}"
"stack": "item:occultism:iesnium_ore",
"after": "item:emendatusenigmatica:quartz_netherrack_ore"
},
{
"stack": "item:minecraft:enchanted_book{StoredEnchantments:[{id:\"ars_nouveau:reactive\",lvl:2s}]}"
"stack": "item:minecraft:enchanted_book{StoredEnchantments:[{id:\"ars_nouveau:reactive\",lvl:1s}]}",
"after": "item:minecraft:enchanted_book{StoredEnchantments:[{id:\"ars_nouveau:mana_boost\",lvl:3s}]}"
},
{
"stack": "item:minecraft:enchanted_book{StoredEnchantments:[{id:\"ars_nouveau:reactive\",lvl:3s}]}"
"stack": "item:minecraft:enchanted_book{StoredEnchantments:[{id:\"ars_nouveau:reactive\",lvl:2s}]}",
"after": "item:minecraft:enchanted_book{StoredEnchantments:[{id:\"ars_nouveau:reactive\",lvl:1s}]}"
},
{
"stack": "item:minecraft:enchanted_book{StoredEnchantments:[{id:\"ars_nouveau:reactive\",lvl:3s}]}",
"after": "item:minecraft:enchanted_book{StoredEnchantments:[{id:\"ars_nouveau:reactive\",lvl:2s}]}"
},
{
"stack": "item:ars_nouveau:novice_boots{Damage:0,an_stack_perks:{color:\"\",perks:[],tier:2}}",
Expand Down Expand Up @@ -167,6 +173,13 @@
{
"stack": "item:ars_nouveau:archmage_hood{Damage:0,an_stack_perks:{color:\"\",perks:[],tier:1}}",
"after": "item:ars_nouveau:archmage_hood{Damage:0}"
},
{
"stack": "item:immersiveengineering:alloy_smelter"
},
{
"stack": "item:immersiveengineering:blast_furnace"
}
]
],
"priority": 100
}
2 changes: 1 addition & 1 deletion kubejs/assets/emi/index/stacks/emi_disabled_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"/thermal.*sulfur_ore/",
"/mekanism.*fluorite_ore/",
"/rftoolsbase:dimensionalshard_/",
"/emendatusenigmatica:.*_cluster_shard\\b/",
"/pendorite/",
"/ametrine/",
"/theoneprobe/",
Expand All @@ -28,6 +27,7 @@
"createaddition:biomass",
"createaddition:bioethanol_bucket",
"createaddition:seed_oil_bucket",
"/emendatusenigmatica:.*_cluster_shard\\b/",
"engineersdecor:factory_dropper",
"engineersdecor:factory_hopper",
"engineersdecor:factory_placer",
Expand Down
2 changes: 2 additions & 0 deletions kubejs/assets/emi/index/stacks/emi_hidden_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"/densetrees/",
"/emendatusenigmatica:bitumen_.*_ore/",
"emendatusenigmatica:bitumen_ore",
"emendatusenigmatica:quartz_netherrack_ore",
"emendatusenigmatica:quartz_ore",
"/hexerei:.*selenite/",
"hexerei:creative_waxing_kit",
"/kubejs:.*indicator/",
Expand Down
52 changes: 1 addition & 51 deletions kubejs/client_scripts/base/emi_add_items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1 @@
ClientEvents.highPriorityAssets((event) => {
// https://github.com/emilyploszaj/emi/wiki/Hiding-and-Adding-Index-Stacks

const payload = {
added: [
{ stack: 'item:immersiveengineering:alloy_smelter' },
{ stack: 'item:immersiveengineering:arc_furnace' },
{ stack: 'item:immersiveengineering:assembler' },
{ stack: 'item:immersiveengineering:auto_workbench' },
{ stack: 'item:immersiveengineering:blast_furnace' },
{ stack: 'item:immersiveengineering:bottling_machine' },
{ stack: 'item:immersiveengineering:coke_oven' },
{ stack: 'item:immersiveengineering:crusher' },
{ stack: 'item:immersiveengineering:diesel_generator' },
{ stack: 'item:immersiveengineering:excavator' },
{ stack: 'item:immersiveengineering:fermenter' },
{ stack: 'item:immersiveengineering:advanced_blast_furnace' },
{ stack: 'item:immersiveengineering:lightning_rod' },
{ stack: 'item:immersiveengineering:metal_press' },
{ stack: 'item:immersiveengineering:mixer' },
{ stack: 'item:immersiveengineering:refinery' },
{ stack: 'item:immersiveengineering:sawmill' },
{ stack: 'item:immersiveengineering:silo' },
{ stack: 'item:immersiveengineering:squeezer' },
{ stack: 'item:immersiveengineering:tank' },
{ stack: 'item:emendatusenigmatica:bitumen_sandstone_ore' },
{ stack: 'item:minecraft:enchanted_book{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:1s}]}' },
{ stack: 'item:minecraft:enchanted_book{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:2s}]}' },
{ stack: 'item:minecraft:enchanted_book{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:3s}]}' }
]
};

const ars_nouveau = {
sets: ['novice', 'apprentice', 'archmage'],
types: ['boots', 'leggings', 'robes', 'hood'],
tiers: ['2', '1']
};

ars_nouveau.tiers.forEach((tier) => {
ars_nouveau.types.forEach((type) => {
ars_nouveau.sets.forEach((set) => {
payload.added.push({
stack: `item:ars_nouveau:${set}_${type}{Damage:0,an_stack_perks:{color:"",perks:[],tier:${tier}}}`,
after: `item:ars_nouveau:${set}_${type}{Damage:0}`
});
});
});
});

JsonIO.write(`kubejs/assets/emi/index/stacks/emi_added_items.json`, payload);
});
// TODO: Remove next breaking update
10 changes: 9 additions & 1 deletion kubejs/client_scripts/base/jei_add_items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
// TODO: Remove next breaking update
JEIEvents.addItems((event) => {
jei.base.items.added.forEach((item) => {
if (item.nbt == null) {
event.add(Item.of(item.id));
} else {
event.add(Item.of(item.id, item.nbt));
}
});
});
56 changes: 0 additions & 56 deletions kubejs/client_scripts/base/jei_ee_conversion_note.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1 @@
// TODO: Delete next breaking update
// This script is TEMPORARY!
// It should be removed in next release / breaking update, with additional removal of EE Vanilla materials, full list of items removed can be found here:
// https://github.com/EnigmaticaModpacks/Enigmatica9/pull/338
// It is used to add conversion note for all items that are going to be removed!

JEIEvents.information((event) => {
const materials = ['copper', 'iron', 'gold', 'diamond', 'emerald', 'netherite'];
const types = ['ingot', 'nugget', 'block'];
const conversion_message = [
Text.of('This item is going to be removed in the near future.').red(),
' ',
Text.of('Please convert it to the vanilla variant before updating.').red()
];

materials.forEach((material) => {
types.forEach((type) => {
let ee_item = `emendatusenigmatica:${material}_${type}`;
let mc_item = `minecraft:${material}_${type}`;
if (Item.exists(ee_item) && Item.exists(mc_item)) {
event.addItem(ee_item, conversion_message);
}
});

let ee_item = `emendatusenigmatica:raw_${material}`;
let mc_item = `minecraft:raw_${material}`;
if (Item.exists(ee_item) && Item.exists(mc_item)) {
event.addItem(ee_item, conversion_message);
}
if (Item.exists(ee_item + '_block') && Item.exists(mc_item + '_block')) {
event.addItem(ee_item + '_block', conversion_message);
}
});
});

ItemEvents.tooltip((event) => {
const materials = ['copper', 'iron', 'gold', 'diamond', 'emerald', 'netherite'];
const types = ['ingot', 'nugget', 'block'];
const conversion_message = 'This item is going to be removed! Convert it before updating.';

materials.forEach((material) => {
types.forEach((type) => {
let item = `emendatusenigmatica:${material}_${type}`;
if (Item.exists(item) && Item.exists(`minecraft:${material}_${type}`)) {
event.add(item, Text.of(conversion_message).red());
}
});

let item = `emendatusenigmatica:raw_${material}`;
if (Item.exists(item) && Item.exists(`minecraft:raw_${material}`)) {
event.add(item, Text.of(conversion_message).red());
}
if (Item.exists(item + '_block') && Item.exists(`minecraft:raw_${material}_block`)) {
event.add(item + '_block', Text.of(conversion_message).red());
}
});
});
63 changes: 63 additions & 0 deletions kubejs/client_scripts/constants/jei_add.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
//priority: 999
// EMI / JEI Added items constants.
// Object format:
// id: -> String ID of the item. REQUIRED
// nbt: -> String JSON with NBT Data.
// after: -> String ID of the item to place 'id' item after on the EMI. Doesn't do anything in JEI. NBT added at the end of the ID in the same String.

// Example object
// { id: 'minecraft:diamond', nbt: '{test:"This field is used by unkown mod lol"}', after: 'minecraft:stone{test2:"Another test nbt field!"}' }

// Base
jei.base.items.added = [
{ id: 'immersiveengineering:assembler' },
{ id: 'immersiveengineering:bottling_machine' },
{ id: 'immersiveengineering:coke_oven' },
{ id: 'immersiveengineering:crusher' },
{ id: 'immersiveengineering:fermenter' },
{ id: 'immersiveengineering:advanced_blast_furnace' },
{ id: 'immersiveengineering:metal_press' },
{ id: 'immersiveengineering:mixer' },
{ id: 'immersiveengineering:refinery' },
{ id: 'immersiveengineering:sawmill' },
{ id: 'immersiveengineering:silo' },
{ id: 'immersiveengineering:squeezer' },
{ id: 'immersiveengineering:tank' },
{ id: 'emendatusenigmatica:bitumen_sandstone_ore', after: 'emendatusenigmatica:iron_ore' },
{ id: 'emendatusenigmatica:quartz_netherrack_ore', after: 'emendatusenigmatica:bitumen_sandstone_ore' },
{ id: 'occultism:iesnium_ore', after: 'emendatusenigmatica:quartz_netherrack_ore' },
{ id: 'minecraft:enchanted_book', nbt: '{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:1s}]}', after: 'minecraft:enchanted_book{StoredEnchantments:[{id:"ars_nouveau:mana_boost",lvl:3s}]}' },
{ id: 'minecraft:enchanted_book', nbt: '{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:2s}]}', after: 'minecraft:enchanted_book{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:1s}]}' },
{ id: 'minecraft:enchanted_book', nbt: '{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:3s}]}', after: 'minecraft:enchanted_book{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:2s}]}' }
];

// Normal
jei.normal.items.added = [
{ id: 'immersiveengineering:arc_furnace' },
{ id: 'immersiveengineering:auto_workbench' },
{ id: 'immersiveengineering:diesel_generator' },
{ id: 'immersiveengineering:excavator' },
{ id: 'immersiveengineering:lightning_rod' }
];

// Expert
jei.expert.items.added = [];

// Automated addition:
const ars_nouveau = {
sets: ['novice', 'apprentice', 'archmage'],
types: ['boots', 'leggings', 'robes', 'hood'],
tiers: ['2', '1']
};

ars_nouveau.tiers.forEach((tier) => {
ars_nouveau.types.forEach((type) => {
ars_nouveau.sets.forEach((set) => {
jei.base.items.added.push({
id: `ars_nouveau:${set}_${type}`,
nbt: `{Damage:0,an_stack_perks:{color:"",perks:[],tier:${tier}}}`,
after: `ars_nouveau:${set}_${type}{Damage:0}`
});
});
});
});
Loading