From 3379ec1a5fb2208da1a5b6e9013287194ac4b1f6 Mon Sep 17 00:00:00 2001 From: last8kings Date: Sun, 19 Nov 2023 00:44:24 -0500 Subject: [PATCH 01/22] this better work bruh --- groovy/prePostInit/oreDict.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/groovy/prePostInit/oreDict.groovy b/groovy/prePostInit/oreDict.groovy index ec82b95cc..caa548dd9 100644 --- a/groovy/prePostInit/oreDict.groovy +++ b/groovy/prePostInit/oreDict.groovy @@ -85,6 +85,10 @@ ore('dyeWhite').add(metaitem('dustLeadNitrate')) ore('dyeBlack').add(metaitem('dustCarbon')) ore('dyeGreen').add(metaitem('gregtechfoodoption:cupric_hydrogen_arsenite_dust')) +//Adds non-traditional "ores" to oredict + +ore('oreBauxite').add(item('susy:resource_block')) + //Ore dict changes and unification //DISABLED FOR NOW DUE TO SERVER CRASHES From 956e51d9b309babb97b494007cad04b8f080a4a6 Mon Sep 17 00:00:00 2001 From: last8kings Date: Sun, 19 Nov 2023 00:47:24 -0500 Subject: [PATCH 02/22] changes bauxite ore in sorter to use correct one --- groovy/postInit/chemistry/OreSorting.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/groovy/postInit/chemistry/OreSorting.groovy b/groovy/postInit/chemistry/OreSorting.groovy index c67b3a9bb..17916fd9d 100644 --- a/groovy/postInit/chemistry/OreSorting.groovy +++ b/groovy/postInit/chemistry/OreSorting.groovy @@ -117,7 +117,7 @@ def sedimentary_tier_1 = [ 'gregtech:ore_malachite_0' : 10000, 'gregtech:ore_cinnabar_0' : 10000, 'gregtech:ore_fluorite_0' : 10000, - 'gregtech:ore_bauxite_0' : 10000, + 'susy:resource_block:0' : 10000, 'gregtech:ore_pyrolusite_0' : 10000 ]; @@ -131,7 +131,7 @@ def sedimentary_tier_2 = [ 'gregtech:ore_cinnabar_0' : 10000, 'gregtech:ore_fluorite_0' : 10000, 'gregtech:ore_magnesite_0' : 10000, - 'gregtech:ore_bauxite_0' : 10000, + 'susy:resource_block:0' : 10000, 'gregtech:ore_pyrolusite_0' : 10000 ]; @@ -147,7 +147,7 @@ def sedimentary_tier_3 = [ 'gregtech:ore_cinnabar_0' : 10000, 'gregtech:ore_fluorite_0' : 10000, 'gregtech:ore_magnesite_0' : 10000, - 'gregtech:ore_bauxite_0' : 10000, + 'susy:resource_block:0' : 10000, 'gregtech:ore_ilmenite_0' : 10000, 'susy:resource_block:1' : 10000, 'gregtech:ore_pyrolusite_0' : 10000 @@ -166,7 +166,7 @@ def sedimentary_tier_4 = [ 'gregtech:ore_uraninite_0' : 10000, 'gregtech:ore_fluorite_0' : 10000, 'gregtech:ore_magnesite_0' : 10000, - 'gregtech:ore_bauxite_0' : 10000, + 'susy:resource_block:0' : 10000, 'gregtech:ore_ilmenite_0' : 10000, 'susy:resource_block:1' : 10000, 'gregtech:ore_pyrolusite_0' : 10000, From ec59f5d3447117de725847739a2db784cf0ad55a Mon Sep 17 00:00:00 2001 From: last8kings Date: Sun, 19 Nov 2023 03:09:19 -0500 Subject: [PATCH 03/22] Swaps around wires for LV/MV electrolyzer --- groovy/postInit/mod/GregTech.groovy | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index ab5d6bf0b..acc78dc81 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -344,6 +344,24 @@ crafting.replaceShaped("gregtech:gregtech.machine.cutter.hv", metaitem('gregtech [ore('circuitHv'), metaitem('cableGtSingleGold'), metaitem('electric.motor.hv')] ]) +crafting.replaceShaped("gregtech:gregtech.machine.cutter.lv", metaitem('gregtech:cutter.lv'), [ + [metaitem('cableGtSingleTin'), ore('circuitLv'), item('minecraft:glass')], + [metaitem('conveyor.module.lv'), metaitem('gregtech:hull.lv'), metaitem('toolHeadBuzzSawSteel')], + [ore('circuitLv'), metaitem('cableGtSingleTin'), metaitem('electric.motor.lv')] +]) + +crafting.replaceShaped("gregtech:gregtech.machine.electrolyzer.lv", metaitem('gregtech:electrolyzer.lv'), [ + [metaitem('wireGtSingleSilver'), item('minecraft:glass'), metaitem('wireGtSingleSilver')], + [metaitem('wireGtSingleSilver'), metaitem('gregtech:hull.lv'), metaitem('wireGtSingleSilver')], + [ore('circuitLv'), metaitem('cableGtSingleTin'), ore('circuitLv')] +]) + +crafting.replaceShaped("gregtech:gregtech.machine.electrolyzer.mv", metaitem('gregtech:electrolyzer.mv'), [ + [metaitem('wireGtSingleGold'), item('minecraft:glass'), metaitem('wireGtSingleGold')], + [metaitem('wireGtSingleGold'), metaitem('gregtech:hull.mv'), metaitem('wireGtSingleGold')], + [ore('circuitMv'), metaitem('cableGtSingleCopper'), ore('circuitMv')] +]) + // crafting.addShaped("rubber_rod_manual", metaitem('stickRubber'), [ // [ore('craftingToolFile'), null, null], // [null, ore('ingotRubber'), null], From 5fef941e7dc4f8e9f7ce376da3e1684dc4a3b83d Mon Sep 17 00:00:00 2001 From: last8kings Date: Sun, 19 Nov 2023 03:12:29 -0500 Subject: [PATCH 04/22] fixes previous committ --- groovy/postInit/mod/GregTech.groovy | 6 ------ 1 file changed, 6 deletions(-) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index acc78dc81..dab841f05 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -344,12 +344,6 @@ crafting.replaceShaped("gregtech:gregtech.machine.cutter.hv", metaitem('gregtech [ore('circuitHv'), metaitem('cableGtSingleGold'), metaitem('electric.motor.hv')] ]) -crafting.replaceShaped("gregtech:gregtech.machine.cutter.lv", metaitem('gregtech:cutter.lv'), [ - [metaitem('cableGtSingleTin'), ore('circuitLv'), item('minecraft:glass')], - [metaitem('conveyor.module.lv'), metaitem('gregtech:hull.lv'), metaitem('toolHeadBuzzSawSteel')], - [ore('circuitLv'), metaitem('cableGtSingleTin'), metaitem('electric.motor.lv')] -]) - crafting.replaceShaped("gregtech:gregtech.machine.electrolyzer.lv", metaitem('gregtech:electrolyzer.lv'), [ [metaitem('wireGtSingleSilver'), item('minecraft:glass'), metaitem('wireGtSingleSilver')], [metaitem('wireGtSingleSilver'), metaitem('gregtech:hull.lv'), metaitem('wireGtSingleSilver')], From 2d4d471d7333b410ad4fb04ccf027acd42f8afc3 Mon Sep 17 00:00:00 2001 From: last8kings Date: Sun, 19 Nov 2023 03:17:05 -0500 Subject: [PATCH 05/22] properly removes the IV quantum chest/tank --- groovy/postInit/mod/GregTech.groovy | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index dab841f05..0e81c23e7 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -70,18 +70,16 @@ def name_removals = [ 'gregtech:super_chest_mv', 'gregtech:super_chest_hv', 'gregtech:super_chest_ev', - 'gregtech:super_chest_iv', 'gregtech:super_tank_lv', 'gregtech:super_tank_mv', 'gregtech:super_tank_hv', 'gregtech:super_tank_ev', - 'gregtech:super_tank_iv', - 'gregtech:quantum_chest_uhv', + 'gregtech:quantum_chest_iv', 'gregtech:quantum_chest_luv', 'gregtech:quantum_chest_zpm', 'gregtech:quantum_chest_uv', 'gregtech:quantum_chest_uhv', - 'gregtech:quantum_tank_uhv', + 'gregtech:quantum_tank_iv', 'gregtech:quantum_tank_luv', 'gregtech:quantum_tank_zpm', 'gregtech:quantum_tank_uv', From 9729879be6c16c2173a59b3c910c15069a5c4cec Mon Sep 17 00:00:00 2001 From: last8kings Date: Mon, 20 Nov 2023 01:25:26 -0500 Subject: [PATCH 06/22] removes recipes for lapotron and enerergium batteries --- groovy/postInit/mod/GregTech.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index 0e81c23e7..7746bc255 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -62,7 +62,7 @@ def name_removals = [ 'gregtech:gregtech.machine.world_accelerator.luv', 'gregtech:gregtech.machine.world_accelerator.zpm', 'gregtech:gregtech.machine.world_accelerator.uv', - 'gregtech:nano_helmet', + 'gregtech:nano_helmet', 'gregtech:nano_chestplate', 'gregtech:nano_leggings', 'gregtech:nano_boots', @@ -84,8 +84,8 @@ def name_removals = [ 'gregtech:quantum_tank_zpm', 'gregtech:quantum_tank_uv', 'gregtech:quantum_tank_uhv', - 'gregtech:large_combustion_engine', - 'gregtech:extreme_combustion_engine', + 'gregtech:large_combustion_engine', + 'gregtech:extreme_combustion_engine', 'gregtech:gregtech.machine.fisher.lv', 'gregtech:gregtech.machine.fisher.mv', 'gregtech:gregtech.machine.fisher.hv', From 43960d9479e444ca17fdb12c3af7e73908e4b5cf Mon Sep 17 00:00:00 2001 From: last8kings Date: Tue, 21 Nov 2023 06:32:23 -0500 Subject: [PATCH 07/22] removes recipes for lapotron and energium batteries --- groovy/postInit/electronics/Batteries.groovy | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/groovy/postInit/electronics/Batteries.groovy b/groovy/postInit/electronics/Batteries.groovy index aeecf76a5..d03226e06 100644 --- a/groovy/postInit/electronics/Batteries.groovy +++ b/groovy/postInit/electronics/Batteries.groovy @@ -85,12 +85,12 @@ mods.gregtech.assembler.recipeBuilder() .buildAndRegister() MIXER_RECIPES.recipeBuilder() -.fluidInputs(Materials.SulfurTrioxide.getFluid(1000)) -.fluidInputs(Materials.Water.getFluid(1000)) -.fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) -.EUt(7) -.duration(40) -.buildAndRegister() + .fluidInputs(Materials.SulfurTrioxide.getFluid(1000)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .EUt(7) + .duration(40) + .buildAndRegister() mods.gregtech.electric_blast_furnace.recipeBuilder() .inputs(ore('dustSodium') * 4) @@ -259,6 +259,17 @@ mods.gregtech.assembler.recipeBuilder() .buildAndRegister() // Remove Batteries + +mods.gregtech.autoclave.removeByInput(480, [metaitem('energium_dust') * 9], [fluid('water') * 1000]) +mods.gregtech.autoclave.removeByInput(320, [metaitem('energium_dust') * 9], [fluid('distilled_water') * 1000]) +mods.gregtech.autoclave.removeByInput(256, [metaitem('energium_dust') * 9], [fluid('black_steel') * 288]) +mods.gregtech.autoclave.removeByInput(192, [metaitem('energium_dust') * 9], [fluid('blue_steel') * 72]) + +mods.gregtech.autoclave.removeByInput(480, [metaitem('dustLapotron') * 15], [fluid('water') * 1000]) +mods.gregtech.autoclave.removeByInput(320, [metaitem('dustLapotron') * 15], [fluid('distilled_water') * 1000]) +mods.gregtech.autoclave.removeByInput(256, [metaitem('dustLapotron') * 15], [fluid('blue_steel') * 288]) +mods.gregtech.autoclave.removeByInput(192, [metaitem('dustLapotron') * 15], [fluid('red_steel') * 72]) + mods.hei.removeAndHide(metaitem('energy_crystal')); mods.hei.removeAndHide(metaitem('lapotron_crystal')); From 57c24ba39eff5bde83f0831510334166269208e8 Mon Sep 17 00:00:00 2001 From: last8kings Date: Tue, 21 Nov 2023 06:39:12 -0500 Subject: [PATCH 08/22] WHY ARE SOME OF THESE TABS AND SOME SPACES --- groovy/material/FirstDegreeMaterials.groovy | 77 +++++++++++++++------ 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index 6f8ef9f1a..3b3c9eb50 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -790,7 +790,7 @@ public class FirstDegreeMaterials{ .components(Nitrogen, 78, Oxygen, 21, Argon, 1) .color(0x90bbe0) .build(); - + ZincOxide = new Material.Builder(8203, SuSyUtility.susyId("zinc_oxide")) .dust() .components(Zinc, 1, Oxygen, 1) @@ -1860,7 +1860,7 @@ public class FirstDegreeMaterials{ .color(0xd40d5c) .iconSet(SHINY) .build(); - + DecarburizedAir = new Material.Builder(8371, SuSyUtility.susyId('decarburized_air')) .fluid(FluidTypes.GAS) .components(Nitrogen, 78, Oxygen, 21, Argon, 1) @@ -2309,7 +2309,7 @@ public class FirstDegreeMaterials{ .components(Titanium, 4, Carbon, 32, Hydrogen, 80, Oxygen, 16) .colorAverage() .build(); - + DilutedPhosphoricAcid = new Material.Builder(8437, SuSyUtility.susyId('diluted_phosphoric_acid')) .fluid(FluidTypes.ACID) .components(PhosphoricAcid, 3, Water, 1) @@ -2763,7 +2763,7 @@ public class FirstDegreeMaterials{ .build(); CementedHexachloroplatinicAcidSolution.setFormula("(?)(H2PtCl6)3(ZnCl2)(H2O)8", true) - + AmmoniumHexachloroplatinate = new Material.Builder(8503, SuSyUtility.susyId('ammonium_hexachloroplatinate')) .dust() .components(Nitrogen, 2, Hydrogen, 8, Platinum, 1, Chlorine, 6) @@ -2860,7 +2860,7 @@ public class FirstDegreeMaterials{ .components(Molybdenum, 1, Sulfur, 3) .colorAverage() .build(); - + AmmoniumIsopolytungstateSolution = new Material.Builder(8518, SuSyUtility.susyId('ammonium_isopolytungstate_solution')) .fluid() .components(Nitrogen, 5, Hydrogen, 21, Tungsten, 6, Oxygen, 21, Water, 5) @@ -2868,7 +2868,7 @@ public class FirstDegreeMaterials{ .build(); AmmoniumIsopolytungstateSolution.setFormula("[(NH4)5(HW6O21)](H2O)5", true) - + AmmoniumParatungstate = new Material.Builder(8519, SuSyUtility.susyId('ammonium_paratungstate')) .dust() .components(Nitrogen, 10, Hydrogen, 42, Tungsten, 12, Oxygen, 42, Water, 4) @@ -2876,7 +2876,7 @@ public class FirstDegreeMaterials{ .build(); AmmoniumParatungstate.setFormula("(NH4)10(H2W12O42) * 4H2O", true) - + ManganeseIIHydroxide = new Material.Builder(8520, SuSyUtility.susyId('manganese_ii_hydroxide')) .dust() .components(Manganese, 1, Oxygen, 2, Hydrogen, 2) @@ -3101,12 +3101,12 @@ public class FirstDegreeMaterials{ .components(Calcium, 1, Zirconium, 1, Oxygen, 3) .colorAverage() .build(); - + NickelIINitrateSolution = new Material.Builder(8551, SuSyUtility.susyId('nickel_nitrate_solution')) - .fluid() - .components(Nickel, 1, Nitrogen, 2, Oxygen, 6, Water, 1) - .colorAverage() - .build(); + .fluid() + .components(Nickel, 1, Nitrogen, 2, Oxygen, 6, Water, 1) + .colorAverage() + .build(); NickelIINitrateSolution.setFormula("[Ni(NO3)2](H2O)", true); @@ -3116,7 +3116,7 @@ public class FirstDegreeMaterials{ .flags(DISABLE_DECOMPOSITION) .colorAverage() .build(); - + TantalumPentachloride = new Material.Builder(8553, SuSyUtility.susyId('tantalum_pentachloride')) .dust().fluid(FluidTypes.GAS) .flags(NO_UNIFICATION) @@ -3124,7 +3124,7 @@ public class FirstDegreeMaterials{ .components(Tantalum, 1, Chlorine, 5) .colorAverage() .build(); - + NiobiumPentachloride = new Material.Builder(8554, SuSyUtility.susyId('niobium_pentachloride')) .dust().fluid(FluidTypes.GAS) .flags(NO_UNIFICATION) @@ -3132,7 +3132,7 @@ public class FirstDegreeMaterials{ .components(Niobium, 1, Chlorine, 5) .color(0xcfcf1d) .build(); - + NiobiumOxideDihydrate = new Material.Builder(8555, SuSyUtility.susyId('niobium_oxide_dihydrate')) .dust() .components(Niobium, 2, Oxygen, 5, Water, 2) @@ -3140,7 +3140,7 @@ public class FirstDegreeMaterials{ .build(); NiobiumOxideDihydrate.setFormula("Nb2O5 * (H2O)2", true) - + PurifiedFluoroniobicAcidSolution = new Material.Builder(8556, SuSyUtility.susyId('purified_fluoroniobic_acid_solution')) .fluid(FluidTypes.ACID) .components(Hydrogen, 6, Niobium, 3, Fluorine, 9, Water, 6) @@ -3148,13 +3148,13 @@ public class FirstDegreeMaterials{ .build(); PurifiedFluoroniobicAcidSolution.setFormula("(H2NbF7)1.35(H2O)6", true) - + NiobiumOxide = new Material.Builder(8557, SuSyUtility.susyId('niobium_oxide')) .dust() .components(Niobium, 2, Oxygen, 5) .colorAverage() .build(); - + FluorotantalicAcidSolution = new Material.Builder(8558, SuSyUtility.susyId('fluorotantalic_acid_solution')) .fluid(FluidTypes.ACID) .components(Hydrogen, 2, Tantalum, 1, Fluorine, 7, Water, 1) @@ -3162,19 +3162,19 @@ public class FirstDegreeMaterials{ .build(); FluorotantalicAcidSolution.setFormula("(H2TaF7)0.9(H2O)", true) - + PotassiumHeptafluorotantalate = new Material.Builder(8559, SuSyUtility.susyId('potassium_heptafluorotantalate')) .dust() .components(Potassium, 2, Tantalum, 1, Fluorine, 7) .colorAverage() .build(); - + DilutedAmmoniaSolution = new Material.Builder(8560, SuSyUtility.susyId('diluted_ammonia_solution')) .fluid() .components(Ammonia, 1, Water, 2) .colorAverage() .build(); - + TantalumFluoride = new Material.Builder(8561, SuSyUtility.susyId('tantalum_fluoride')) .dust() .components(Tantalum, 1, Fluorine, 5) @@ -3259,7 +3259,7 @@ public class FirstDegreeMaterials{ .build(); StrontiumSulfideSolution.setFormula("(SrS)(H2O)", true) - + StrontiumOxide = new Material.Builder(8575, SuSyUtility.susyId("strontium_oxide")) .dust() .components(Strontium, 1, Oxygen, 1) @@ -3278,6 +3278,37 @@ public class FirstDegreeMaterials{ .color(0xfc7e89) .build(); - CobaltIIAcetate.setFormula("Co(C2H3O2)2", true) + CobaltIIAcetate.setFormula("Co(C2H3O2)2", true) + + OrthomagmaticDeposit = new Material.Builder(8578, SuSyUtility.susyId("orthomagmatic_deposit")) + .ore() + .color(0x80081e) + .build(); + + MetamorphicDeposit = new Material.Builder(8579, SuSyUtility.susyId("metamorphic_deposit")) + .ore() + .color(0x21011c) + .build(); + + SedimentaryDeposit = new Material.Builder(8580, SuSyUtility.susyId("sedimentary_deposit")) + .ore() + .color(0xfce46d) + .build(); + + HydrothermalDeposit = new Material.Builder(8581, SuSyUtility.susyId("hydrothermal_deposit")) + .ore() + .color(0xe8e1c1) + .build(); + + AlluvialDeposit = new Material.Builder(8582, SuSyUtility.susyId("alluvial_deposit")) + .ore() + .color(0xb59e35) + .build(); + + MagmaticHydrothermalDeposit = new Material.Builder(8583, SuSyUtility.susyId("magmatic_hydrothermal_deposit")) + .ore() + .color(0x91835d) + .build(); + } } \ No newline at end of file From f04f9e162e26d07b0d6401b8212a8e9d5a4e855b Mon Sep 17 00:00:00 2001 From: last8kings Date: Tue, 21 Nov 2023 06:39:49 -0500 Subject: [PATCH 09/22] oh crap committed wrong file --- groovy/postInit/mod/GregTech.groovy | 40 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index 7746bc255..0fc4ceadf 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -48,24 +48,24 @@ mods.gregtech.arc_furnace.removeByInput(30, [item('gregtech:turbine_casing', 5)] mods.gregtech.macerator.removeByInput(8, [item('gregtech:turbine_casing', 5)], null) def name_removals = [ - 'gregtech:cover_fluid_voiding', - 'gregtech:cover_item_voiding', - 'gregtech:fluid_filter_lapis', - 'gregtech:fluid_filter_sodalite', - 'gregtech:fluid_filter_lazurite', - 'gregtech:comparator_certus', - 'gregtech:gregtech.machine.world_accelerator.lv', - 'gregtech:gregtech.machine.world_accelerator.mv', - 'gregtech:gregtech.machine.world_accelerator.hv', - 'gregtech:gregtech.machine.world_accelerator.ev', - 'gregtech:gregtech.machine.world_accelerator.iv', - 'gregtech:gregtech.machine.world_accelerator.luv', - 'gregtech:gregtech.machine.world_accelerator.zpm', - 'gregtech:gregtech.machine.world_accelerator.uv', - 'gregtech:nano_helmet', - 'gregtech:nano_chestplate', - 'gregtech:nano_leggings', - 'gregtech:nano_boots', + 'gregtech:cover_fluid_voiding', + 'gregtech:cover_item_voiding', + 'gregtech:fluid_filter_lapis', + 'gregtech:fluid_filter_sodalite', + 'gregtech:fluid_filter_lazurite', + 'gregtech:comparator_certus', + 'gregtech:gregtech.machine.world_accelerator.lv', + 'gregtech:gregtech.machine.world_accelerator.mv', + 'gregtech:gregtech.machine.world_accelerator.hv', + 'gregtech:gregtech.machine.world_accelerator.ev', + 'gregtech:gregtech.machine.world_accelerator.iv', + 'gregtech:gregtech.machine.world_accelerator.luv', + 'gregtech:gregtech.machine.world_accelerator.zpm', + 'gregtech:gregtech.machine.world_accelerator.uv', + 'gregtech:nano_helmet', + 'gregtech:nano_chestplate', + 'gregtech:nano_leggings', + 'gregtech:nano_boots', 'gregtech:super_chest_lv', 'gregtech:super_chest_mv', 'gregtech:super_chest_hv', @@ -84,8 +84,8 @@ def name_removals = [ 'gregtech:quantum_tank_zpm', 'gregtech:quantum_tank_uv', 'gregtech:quantum_tank_uhv', - 'gregtech:large_combustion_engine', - 'gregtech:extreme_combustion_engine', + 'gregtech:large_combustion_engine', + 'gregtech:extreme_combustion_engine', 'gregtech:gregtech.machine.fisher.lv', 'gregtech:gregtech.machine.fisher.mv', 'gregtech:gregtech.machine.fisher.hv', From b51467b390454b0fbc2183f007abbca685bf1580 Mon Sep 17 00:00:00 2001 From: last8kings Date: Tue, 21 Nov 2023 06:41:46 -0500 Subject: [PATCH 10/22] more deposit scanning stuff --- groovy/material/SuSyMaterials.groovy | 41 +++++++++++++++++----------- groovy/prePostInit/oreDict.groovy | 11 ++++++-- resources/langfiles/lang/en_us.lang | 19 +++++++++++-- 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy index 200d97fea..1eb77c16c 100644 --- a/groovy/material/SuSyMaterials.groovy +++ b/groovy/material/SuSyMaterials.groovy @@ -106,6 +106,15 @@ class SuSyMaterials { public static Material Carnotite; public static Material AlluvialPlatinum; + // Deposits for scanning + + public static Material OrthomagmaticDeposit; + public static Material MetamorphicDeposit; + public static Material SedimentaryDeposit; + public static Material HydrothermalDeposit; + public static Material AlluvialDeposit; + public static Material MagmaticHydrothermalDeposit; + // Roasted Ores public static Material RoastedSperrylite; @@ -407,7 +416,7 @@ class SuSyMaterials { public static Material PropanalMixture; public static Material ZSMFive; public static Material AminatedEthyleneMixture; - public static Material NeutralizedAminatedEthyleneMixture; + public static Material NeutralizedAminatedEthyleneMixture; public static Material SiftedPyrochlore; public static Material PyrochloreConcentrate; public static Material ImpurePyrochloreSlurry; @@ -479,9 +488,9 @@ class SuSyMaterials { public static Material CelestineSlurry; public static Material BariumResidue; - public static Material OrganosiliconMixture; - public static Material ImpurePolydimethylsiloxaneMixture; - public static Material RawPolydimethylsiloxaneMixture; + public static Material OrganosiliconMixture; + public static Material ImpurePolydimethylsiloxaneMixture; + public static Material RawPolydimethylsiloxaneMixture; // Petrochem Materials @@ -1361,17 +1370,17 @@ class SuSyMaterials { public static Material NBromopropane; public static Material TetrapropylammoniumBromide; public static Material Propionaldehyde; - public static Material Triethylenetetramine; - public static Material Aminoethylpiperazine; - public static Material Diethylenetriamine; - public static Material Piperazine; - public static Material Cyclooctadiene; - public static Material TriethylPhosphate; - public static Material IsopropenylAcetate; - public static Material Acetylacetone; - public static Material NickelIIBisacetylacetonate; - public static Material BiscyclooctadienenickelZero; - public static Material DiethylaluminiumAcetylacetonate; + public static Material Triethylenetetramine; + public static Material Aminoethylpiperazine; + public static Material Diethylenetriamine; + public static Material Piperazine; + public static Material Cyclooctadiene; + public static Material TriethylPhosphate; + public static Material IsopropenylAcetate; + public static Material Acetylacetone; + public static Material NickelIIBisacetylacetonate; + public static Material BiscyclooctadienenickelZero; + public static Material DiethylaluminiumAcetylacetonate; public static Material OxalicAcid; public static Material OneAmidoethylTwoAlkylTwoImidazoline; public static Material Chlorodiphenylphosphine; @@ -1477,7 +1486,7 @@ class SuSyMaterials { public static Material TetrabromobisphenolASolution; public static Material EpoxyCuringMixture; public static Material WetFlameRetardantEpoxy; - public static Material PropyleneOxideSolution; + public static Material PropyleneOxideSolution; public static Material DilutedZincChlorideSolution; public static Material HydrogenSilsesquioxanePhotoresist; public static Material CrudeTerephthalicAcidSolution; diff --git a/groovy/prePostInit/oreDict.groovy b/groovy/prePostInit/oreDict.groovy index caa548dd9..a61bdcd18 100644 --- a/groovy/prePostInit/oreDict.groovy +++ b/groovy/prePostInit/oreDict.groovy @@ -85,9 +85,14 @@ ore('dyeWhite').add(metaitem('dustLeadNitrate')) ore('dyeBlack').add(metaitem('dustCarbon')) ore('dyeGreen').add(metaitem('gregtechfoodoption:cupric_hydrogen_arsenite_dust')) -//Adds non-traditional "ores" to oredict - -ore('oreBauxite').add(item('susy:resource_block')) +ore('ore').add(item('susy:resource_block')) + +ore('oreOrthomagmaticDeposit').add(item('susy:deposit_block:0')) +ore('oreMetamorphicDeposit').add(item('susy:deposit_block:1')) +ore('oreSedimentaryDeposit').add(item('susy:deposit_block:2')) +ore('oreHydrothermalDeposit').add(item('susy:deposit_block:3')) +ore('oreAlluvialDeposit').add(item('susy:deposit_block:4')) +ore('oreMagmaticHydrothermalDeposit').add(item('susy:deposit_block:5')) //Ore dict changes and unification //DISABLED FOR NOW DUE TO SERVER CRASHES diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index eacc19be1..26a36e5de 100644 --- a/resources/langfiles/lang/en_us.lang +++ b/resources/langfiles/lang/en_us.lang @@ -1,7 +1,6 @@ # Chemistry susy.material.dichlorobenzene=1,4-Dichlorobenzene - susy.material.ammonium_chloride_solution=Ammonium Chloride Solution susy.material.crude_styrene=Crude Styrene susy.material.hydrogen_chloride=Hydrogen Chloride @@ -112,7 +111,7 @@ susy.material.diluted_methyl_ii_pyrrolidone=Diluted N-Methyl-2-pyrrolidone susy.material.dimethyldichlorosilane_emulsion=Dimethyldichlorosilane Emulsion susy.material.tetrafluoroethylene_emulsion=Tetrafluoroethylene Emulsion susy.material.dichloromethane=Dichloromethane -susy.material.carbon_tetrachloride=Carbon Tetrachloride +susy.material.carbon_tetrachloride=Carbon Tetrachloride susy.material.phthalic_acid_solution=Phthalic Acid Solution susy.material.butanol=Butanol susy.material.saltpeter_solution=Saltpeter Solution @@ -1122,6 +1121,22 @@ susy.material.anthracite=Anthracite susy.material.phosphorite=Phosphorite susy.material.sperrylite=Sperrylite +# Deposit ores for scanning + +item.susy.material.orthomagmatic_deposit.ore=Orthomagmatic Deposit +item.susy.material.orthomagmatic_deposit.ore=Metamorphic Deposit +item.susy.material.orthomagmatic_deposit.ore=Sedimentary Deposit +item.susy.material.orthomagmatic_deposit.ore=Hydrothermal Deposit +item.susy.material.orthomagmatic_deposit.ore=Alluvial Deposit +item.susy.material.orthomagmatic_deposit.ore=Magmatic Hydrothermal Deposit + +susy.material.orthomagmatic_deposit=Orthomagmatic Deposit +susy.material.metamorphic_deposit=Metamorphic Deposit +susy.material.sedimentary_deposit=Sedimentary Deposit +susy.material.hydrothermal_deposit=Hydrothermal Deposit +susy.material.alluvial_deposit=Alluvial Deposit +susy.material.magmatic_hydrothermal_deposit=Magmatic Hydrothermal Deposit + susy.material.corundum=Corundum susy.material.tourmaline=Tourmaline susy.material.non_marine_evaporite=Non Marine Evaporite From 72814d2afa1848ab525bf5fe0e3368ff5996f6d2 Mon Sep 17 00:00:00 2001 From: last8kings Date: Tue, 21 Nov 2023 06:44:09 -0500 Subject: [PATCH 11/22] formatting --- groovy/postInit/mod/GregTech.groovy | 50 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index 0fc4ceadf..1c265a387 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -62,34 +62,34 @@ def name_removals = [ 'gregtech:gregtech.machine.world_accelerator.luv', 'gregtech:gregtech.machine.world_accelerator.zpm', 'gregtech:gregtech.machine.world_accelerator.uv', - 'gregtech:nano_helmet', + 'gregtech:nano_helmet', 'gregtech:nano_chestplate', 'gregtech:nano_leggings', 'gregtech:nano_boots', - 'gregtech:super_chest_lv', - 'gregtech:super_chest_mv', - 'gregtech:super_chest_hv', - 'gregtech:super_chest_ev', - 'gregtech:super_tank_lv', - 'gregtech:super_tank_mv', - 'gregtech:super_tank_hv', - 'gregtech:super_tank_ev', - 'gregtech:quantum_chest_iv', - 'gregtech:quantum_chest_luv', - 'gregtech:quantum_chest_zpm', - 'gregtech:quantum_chest_uv', - 'gregtech:quantum_chest_uhv', - 'gregtech:quantum_tank_iv', - 'gregtech:quantum_tank_luv', - 'gregtech:quantum_tank_zpm', - 'gregtech:quantum_tank_uv', - 'gregtech:quantum_tank_uhv', - 'gregtech:large_combustion_engine', - 'gregtech:extreme_combustion_engine', - 'gregtech:gregtech.machine.fisher.lv', - 'gregtech:gregtech.machine.fisher.mv', - 'gregtech:gregtech.machine.fisher.hv', - 'gregtech:gregtech.machine.fisher.ev', + 'gregtech:super_chest_lv', + 'gregtech:super_chest_mv', + 'gregtech:super_chest_hv', + 'gregtech:super_chest_ev', + 'gregtech:super_tank_lv', + 'gregtech:super_tank_mv', + 'gregtech:super_tank_hv', + 'gregtech:super_tank_ev', + 'gregtech:quantum_chest_iv', + 'gregtech:quantum_chest_luv', + 'gregtech:quantum_chest_zpm', + 'gregtech:quantum_chest_uv', + 'gregtech:quantum_chest_uhv', + 'gregtech:quantum_tank_iv', + 'gregtech:quantum_tank_luv', + 'gregtech:quantum_tank_zpm', + 'gregtech:quantum_tank_uv', + 'gregtech:quantum_tank_uhv', + 'gregtech:large_combustion_engine', + 'gregtech:extreme_combustion_engine', + 'gregtech:gregtech.machine.fisher.lv', + 'gregtech:gregtech.machine.fisher.mv', + 'gregtech:gregtech.machine.fisher.hv', + 'gregtech:gregtech.machine.fisher.ev', ] for (name in name_removals) { From 8a81eb00b034958d36e6088daf21da50fb5715b5 Mon Sep 17 00:00:00 2001 From: last8kings Date: Tue, 21 Nov 2023 06:45:04 -0500 Subject: [PATCH 12/22] formatting 2 --- groovy/postInit/mod/GregTech.groovy | 84 ++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index 1c265a387..c7529e829 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -48,48 +48,48 @@ mods.gregtech.arc_furnace.removeByInput(30, [item('gregtech:turbine_casing', 5)] mods.gregtech.macerator.removeByInput(8, [item('gregtech:turbine_casing', 5)], null) def name_removals = [ - 'gregtech:cover_fluid_voiding', - 'gregtech:cover_item_voiding', - 'gregtech:fluid_filter_lapis', - 'gregtech:fluid_filter_sodalite', - 'gregtech:fluid_filter_lazurite', - 'gregtech:comparator_certus', - 'gregtech:gregtech.machine.world_accelerator.lv', - 'gregtech:gregtech.machine.world_accelerator.mv', - 'gregtech:gregtech.machine.world_accelerator.hv', - 'gregtech:gregtech.machine.world_accelerator.ev', - 'gregtech:gregtech.machine.world_accelerator.iv', - 'gregtech:gregtech.machine.world_accelerator.luv', - 'gregtech:gregtech.machine.world_accelerator.zpm', - 'gregtech:gregtech.machine.world_accelerator.uv', - 'gregtech:nano_helmet', - 'gregtech:nano_chestplate', - 'gregtech:nano_leggings', - 'gregtech:nano_boots', - 'gregtech:super_chest_lv', - 'gregtech:super_chest_mv', - 'gregtech:super_chest_hv', - 'gregtech:super_chest_ev', - 'gregtech:super_tank_lv', - 'gregtech:super_tank_mv', - 'gregtech:super_tank_hv', - 'gregtech:super_tank_ev', - 'gregtech:quantum_chest_iv', - 'gregtech:quantum_chest_luv', - 'gregtech:quantum_chest_zpm', - 'gregtech:quantum_chest_uv', - 'gregtech:quantum_chest_uhv', - 'gregtech:quantum_tank_iv', - 'gregtech:quantum_tank_luv', - 'gregtech:quantum_tank_zpm', - 'gregtech:quantum_tank_uv', - 'gregtech:quantum_tank_uhv', - 'gregtech:large_combustion_engine', - 'gregtech:extreme_combustion_engine', - 'gregtech:gregtech.machine.fisher.lv', - 'gregtech:gregtech.machine.fisher.mv', - 'gregtech:gregtech.machine.fisher.hv', - 'gregtech:gregtech.machine.fisher.ev', + 'gregtech:cover_fluid_voiding', + 'gregtech:cover_item_voiding', + 'gregtech:fluid_filter_lapis', + 'gregtech:fluid_filter_sodalite', + 'gregtech:fluid_filter_lazurite', + 'gregtech:comparator_certus', + 'gregtech:gregtech.machine.world_accelerator.lv', + 'gregtech:gregtech.machine.world_accelerator.mv', + 'gregtech:gregtech.machine.world_accelerator.hv', + 'gregtech:gregtech.machine.world_accelerator.ev', + 'gregtech:gregtech.machine.world_accelerator.iv', + 'gregtech:gregtech.machine.world_accelerator.luv', + 'gregtech:gregtech.machine.world_accelerator.zpm', + 'gregtech:gregtech.machine.world_accelerator.uv', + 'gregtech:nano_helmet', + 'gregtech:nano_chestplate', + 'gregtech:nano_leggings', + 'gregtech:nano_boots', + 'gregtech:super_chest_lv', + 'gregtech:super_chest_mv', + 'gregtech:super_chest_hv', + 'gregtech:super_chest_ev', + 'gregtech:super_tank_lv', + 'gregtech:super_tank_mv', + 'gregtech:super_tank_hv', + 'gregtech:super_tank_ev', + 'gregtech:quantum_chest_iv', + 'gregtech:quantum_chest_luv', + 'gregtech:quantum_chest_zpm', + 'gregtech:quantum_chest_uv', + 'gregtech:quantum_chest_uhv', + 'gregtech:quantum_tank_iv', + 'gregtech:quantum_tank_luv', + 'gregtech:quantum_tank_zpm', + 'gregtech:quantum_tank_uv', + 'gregtech:quantum_tank_uhv', + 'gregtech:large_combustion_engine', + 'gregtech:extreme_combustion_engine', + 'gregtech:gregtech.machine.fisher.lv', + 'gregtech:gregtech.machine.fisher.mv', + 'gregtech:gregtech.machine.fisher.hv', + 'gregtech:gregtech.machine.fisher.ev', ] for (name in name_removals) { From 3ccf74271ca4c563803f4ffe6c0e4f2dc15c7fb4 Mon Sep 17 00:00:00 2001 From: last8kings Date: Thu, 23 Nov 2023 15:55:54 -0500 Subject: [PATCH 13/22] removes redundant ores from JEI --- groovy/postInit/gameplay/Ores.groovy | 81 ++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 groovy/postInit/gameplay/Ores.groovy diff --git a/groovy/postInit/gameplay/Ores.groovy b/groovy/postInit/gameplay/Ores.groovy new file mode 100644 index 000000000..56a035fe8 --- /dev/null +++ b/groovy/postInit/gameplay/Ores.groovy @@ -0,0 +1,81 @@ +def RedundantOreRemovals = [ + + ore('oreOrthomagmaticDeposit'), + ore('oreNetherrackOrthomagmaticDeposit'), + ore('oreEndstoneOrthomagmaticDeposit'), + ore('crushedOrthomagmaticDeposit'), + ore('crushedPurifiedOrthomagmaticDeposit'), + ore('crushedCentrifugedOrthomagmaticDeposit'), + ore('dustImpureOrthomagmaticDeposit'), + ore('dustPureOrthomagmaticDeposit'), + ore('dustOrthomagmaticDeposit'), + ore('dustSmallOrthomagmaticDeposit'), + ore('dustTinyOrthomagmaticDeposit'), + + ore('oreMetamorphicDeposit'), + ore('oreNetherrackMetamorphicDeposit'), + ore('oreEndstoneMetamorphicDeposit'), + ore('crushedMetamorphicDeposit'), + ore('crushedPurifiedMetamorphicDeposit'), + ore('crushedCentrifugedMetamorphicDeposit'), + ore('dustImpureMetamorphicDeposit'), + ore('dustPureMetamorphicDeposit'), + ore('dustMetamorphicDeposit'), + ore('dustSmallMetamorphicDeposit'), + ore('dustTinyMetamorphicDeposit'), + + ore('oreSedimentaryDeposit'), + ore('oreNetherrackSedimentaryDeposit'), + ore('oreEndstoneSedimentaryDeposit'), + ore('crushedSedimentaryDeposit'), + ore('crushedPurifiedSedimentaryDeposit'), + ore('crushedCentrifugedSedimentaryDeposit'), + ore('dustImpureSedimentaryDeposit'), + ore('dustPureSedimentaryDeposit'), + ore('dustSedimentaryDeposit'), + ore('dustSmallSedimentaryDeposit'), + ore('dustTinySedimentaryDeposit'), + + ore('oreHydrothermalDeposit'), + ore('oreNetherrackHydrothermalDeposit'), + ore('oreEndstoneHydrothermalDeposit'), + ore('crushedHydrothermalDeposit'), + ore('crushedPurifiedHydrothermalDeposit'), + ore('crushedCentrifugedHydrothermalDeposit'), + ore('dustImpureHydrothermalDeposit'), + ore('dustPureHydrothermalDeposit'), + ore('dustHydrothermalDeposit'), + ore('dustSmallHydrothermalDeposit'), + ore('dustTinyHydrothermalDeposit'), + + ore('oreAlluvialDeposit'), + ore('oreNetherrackAlluvialDeposit'), + ore('oreEndstoneAlluvialDeposit'), + ore('crushedAlluvialDeposit'), + ore('crushedPurifiedAlluvialDeposit'), + ore('crushedCentrifugedAlluvialDeposit'), + ore('dustImpureAlluvialDeposit'), + ore('dustPureAlluvialDeposit'), + ore('dustAlluvialDeposit'), + ore('dustSmallAlluvialDeposit'), + ore('dustTinyAlluvialDeposit'), + + ore('oreMagmaticHydrothermalDeposit'), + ore('oreNetherrackMagmaticHydrothermalDeposit'), + ore('oreEndstoneMagmaticHydrothermalDeposit'), + ore('crushedMagmaticHydrothermalDeposit'), + ore('crushedPurifiedMagmaticHydrothermalDeposit'), + ore('crushedCentrifugedMagmaticHydrothermalDeposit'), + ore('dustImpureMagmaticHydrothermalDeposit'), + ore('dustPureMagmaticHydrothermalDeposit'), + ore('dustMagmaticHydrothermalDeposit'), + ore('dustSmallMagmaticHydrothermalDeposit'), + ore('dustTinyMagmaticHydrothermalDeposit') + +] + +for (entry in RedundantOreRemovals) { + for (item in entry.getMatchingStacks()) { + mods.jei.removeAndHide(item) + } +} From 1a27b6c2434dc272bd06769bc59e728a26954c45 Mon Sep 17 00:00:00 2001 From: last8kings Date: Sat, 25 Nov 2023 01:24:02 -0500 Subject: [PATCH 14/22] remove recipe for explosive arrows --- groovy/postInit/mod/Quark.groovy | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 groovy/postInit/mod/Quark.groovy diff --git a/groovy/postInit/mod/Quark.groovy b/groovy/postInit/mod/Quark.groovy new file mode 100644 index 000000000..6448022fe --- /dev/null +++ b/groovy/postInit/mod/Quark.groovy @@ -0,0 +1,3 @@ +import static globals.Globals.* + +crafting.remove("quark:arrow_explosive") \ No newline at end of file From 5cac3f5e2b6234ec683e32fbe132c7be5d969a90 Mon Sep 17 00:00:00 2001 From: last8kings Date: Sat, 25 Nov 2023 01:58:47 -0500 Subject: [PATCH 15/22] fixes lang --- resources/langfiles/lang/en_us.lang | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index 26a36e5de..2754e7b99 100644 --- a/resources/langfiles/lang/en_us.lang +++ b/resources/langfiles/lang/en_us.lang @@ -1124,11 +1124,11 @@ susy.material.sperrylite=Sperrylite # Deposit ores for scanning item.susy.material.orthomagmatic_deposit.ore=Orthomagmatic Deposit -item.susy.material.orthomagmatic_deposit.ore=Metamorphic Deposit -item.susy.material.orthomagmatic_deposit.ore=Sedimentary Deposit -item.susy.material.orthomagmatic_deposit.ore=Hydrothermal Deposit -item.susy.material.orthomagmatic_deposit.ore=Alluvial Deposit -item.susy.material.orthomagmatic_deposit.ore=Magmatic Hydrothermal Deposit +item.susy.material.metamorphic_deposit.ore=Metamorphic Deposit +item.susy.material.sedimentary_deposit.ore=Sedimentary Deposit +item.susy.material.hydrothermal_deposit.ore=Hydrothermal Deposit +item.susy.material.alluvial_deposit.ore=Alluvial Deposit +item.susy.material.magmatic_hydrothermal_deposit.ore=Magmatic Hydrothermal Deposit susy.material.orthomagmatic_deposit=Orthomagmatic Deposit susy.material.metamorphic_deposit=Metamorphic Deposit From 0661c542bdd41623ea170813269bef982188681d Mon Sep 17 00:00:00 2001 From: last8kings <97848034+last8kings@users.noreply.github.com> Date: Sun, 31 Dec 2023 02:26:12 -0500 Subject: [PATCH 16/22] Update FirstDegreeMaterials.groovy --- groovy/material/FirstDegreeMaterials.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index 066a51bd0..73300c235 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -3292,7 +3292,8 @@ public class FirstDegreeMaterials{ .components(Gelatin, 1, Water, 1) .colorAverage() .build(); - OrthomagmaticDeposit = new Material.Builder(8580, SuSyUtility.susyId("orthomagmatic_deposit")) + + OrthomagmaticDeposit = new Material.Builder(8580, SuSyUtility.susyId("orthomagmatic_deposit")) .ore() .color(0x80081e) .build(); @@ -3323,4 +3324,4 @@ public class FirstDegreeMaterials{ .build(); } -} \ No newline at end of file +} From 779e535cce1d07eefbca43a65b5e7ca7b59e1165 Mon Sep 17 00:00:00 2001 From: planetme <87911459+planetme@users.noreply.github.com> Date: Mon, 1 Jan 2024 13:33:33 -0600 Subject: [PATCH 17/22] fix manifest --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index d6c9a4478..c181330f6 100644 --- a/manifest.json +++ b/manifest.json @@ -895,8 +895,8 @@ "projectID": 241140, "fileID": 2499252, "required": true - } - { + }, + { "projectID": 78778, "fileID": 2524058, "required": true From 0326d37f68a136885aee0014a4569328a413a89d Mon Sep 17 00:00:00 2001 From: last8kings Date: Mon, 1 Jan 2024 14:50:26 -0500 Subject: [PATCH 18/22] Add sulfur deposit to scanner --- groovy/prePostInit/oreDict.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/groovy/prePostInit/oreDict.groovy b/groovy/prePostInit/oreDict.groovy index a61bdcd18..443d45dbf 100644 --- a/groovy/prePostInit/oreDict.groovy +++ b/groovy/prePostInit/oreDict.groovy @@ -85,7 +85,8 @@ ore('dyeWhite').add(metaitem('dustLeadNitrate')) ore('dyeBlack').add(metaitem('dustCarbon')) ore('dyeGreen').add(metaitem('gregtechfoodoption:cupric_hydrogen_arsenite_dust')) -ore('ore').add(item('susy:resource_block')) +ore('oreBauxite').add(item('susy:resource_block:0')) +ore('oreSulfur').add(item('susy:resource_blocK:14')) ore('oreOrthomagmaticDeposit').add(item('susy:deposit_block:0')) ore('oreMetamorphicDeposit').add(item('susy:deposit_block:1')) From e86bea00e8965e0348e662a2c6f361472e51281f Mon Sep 17 00:00:00 2001 From: planetme <87911459+planetme@users.noreply.github.com> Date: Mon, 1 Jan 2024 17:25:26 -0600 Subject: [PATCH 19/22] fix oredict error --- groovy/prePostInit/oreDict.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groovy/prePostInit/oreDict.groovy b/groovy/prePostInit/oreDict.groovy index 87e7f5f35..d5a634ac1 100644 --- a/groovy/prePostInit/oreDict.groovy +++ b/groovy/prePostInit/oreDict.groovy @@ -104,7 +104,7 @@ ore('blockConcrete').add(item('industrialrenewal:concrete')) ore('blockConcrete').add(item('engineersdecor:rebar_concrete')) ore('blockConcrete').add(item('engineersdecor:rebar_concrete_tile')) ore('blockConcrete').add(item('engineersdecor:gas_concrete')) -ore('blockConcrete').add(metaitem('icbmclassic:concrete')) +ore('blockConcrete').add(item('icbmclassic:concrete')) //Ore dict changes and unification From fc0f95c2edc8d895f703a20ed975471c5b03ba22 Mon Sep 17 00:00:00 2001 From: planetme <87911459+planetme@users.noreply.github.com> Date: Mon, 1 Jan 2024 17:28:50 -0600 Subject: [PATCH 20/22] clean up more lapotron stuff --- config/jei/itemBlacklist.cfg | 2 ++ groovy/postInit/mod/GregTech.groovy | 2 ++ 2 files changed, 4 insertions(+) diff --git a/config/jei/itemBlacklist.cfg b/config/jei/itemBlacklist.cfg index 6f5d4f503..24fd815c7 100644 --- a/config/jei/itemBlacklist.cfg +++ b/config/jei/itemBlacklist.cfg @@ -152,6 +152,7 @@ advanced { enchantment:enchantment.thorns.lvl2 rftools:matter_booster enchantment:enchantment.thorns.lvl3 + gregtech:meta_item_1:492; rftools:energyplus_module enchantment:enchantment.thorns.lvl1 enchantment:enchantment.arrowFire.lvl1 @@ -210,6 +211,7 @@ advanced { rftools:shape_card enchantment:enchantment.arrowInfinite.lvl1 enchantment:enchantment.binding_curse.lvl1 + gregtech:meta_gem:1647; enchantment:enchantment.spaceBreathing.lvl1 enchantment:enchantment.mending.lvl1 gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:radon",grenade_skin:0} diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index b4b29d276..5c39f53fc 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -167,6 +167,8 @@ mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustStainlessSteel') * 9], mods.gregtech.arc_furnace.removeByInput(30, [metaitem('pyrolyse_oven')], [fluid('oxygen') * 2160]) // Aluminium Dust * 21 mods.gregtech.macerator.removeByInput(8, [metaitem('pyrolyse_oven')], null) +// Lapotron Crystal * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('gemLapotron'), metaitem('circuit.advanced_integrated') * 2], null) //ADDITIONS From 0132b23531987ef4b02f27ff6bbd6cd577771f51 Mon Sep 17 00:00:00 2001 From: planetme <87911459+planetme@users.noreply.github.com> Date: Mon, 1 Jan 2024 17:47:09 -0600 Subject: [PATCH 21/22] migrate "fake" deposit materials to OreMaterials --- groovy/material/FirstDegreeMaterials.groovy | 31 --------------------- groovy/material/OreMaterials.groovy | 29 +++++++++++++++++++ 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index 73300c235..68317d88b 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -3292,36 +3292,5 @@ public class FirstDegreeMaterials{ .components(Gelatin, 1, Water, 1) .colorAverage() .build(); - - OrthomagmaticDeposit = new Material.Builder(8580, SuSyUtility.susyId("orthomagmatic_deposit")) - .ore() - .color(0x80081e) - .build(); - - MetamorphicDeposit = new Material.Builder(8581, SuSyUtility.susyId("metamorphic_deposit")) - .ore() - .color(0x21011c) - .build(); - - SedimentaryDeposit = new Material.Builder(8582, SuSyUtility.susyId("sedimentary_deposit")) - .ore() - .color(0xfce46d) - .build(); - - HydrothermalDeposit = new Material.Builder(8583, SuSyUtility.susyId("hydrothermal_deposit")) - .ore() - .color(0xe8e1c1) - .build(); - - AlluvialDeposit = new Material.Builder(8584, SuSyUtility.susyId("alluvial_deposit")) - .ore() - .color(0xb59e35) - .build(); - - MagmaticHydrothermalDeposit = new Material.Builder(8585, SuSyUtility.susyId("magmatic_hydrothermal_deposit")) - .ore() - .color(0x91835d) - .build(); - } } diff --git a/groovy/material/OreMaterials.groovy b/groovy/material/OreMaterials.groovy index df0d8c136..6ef2b90c1 100644 --- a/groovy/material/OreMaterials.groovy +++ b/groovy/material/OreMaterials.groovy @@ -571,5 +571,34 @@ public class OreMaterials{ .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE) .build(); + OrthomagmaticDeposit = new Material.Builder(7076, SuSyUtility.susyId("orthomagmatic_deposit")) + .ore() + .color(0x80081e) + .build(); + + MetamorphicDeposit = new Material.Builder(7077, SuSyUtility.susyId("metamorphic_deposit")) + .ore() + .color(0x21011c) + .build(); + + SedimentaryDeposit = new Material.Builder(7078, SuSyUtility.susyId("sedimentary_deposit")) + .ore() + .color(0xfce46d) + .build(); + + HydrothermalDeposit = new Material.Builder(7079, SuSyUtility.susyId("hydrothermal_deposit")) + .ore() + .color(0xe8e1c1) + .build(); + + AlluvialDeposit = new Material.Builder(7080, SuSyUtility.susyId("alluvial_deposit")) + .ore() + .color(0xb59e35) + .build(); + + MagmaticHydrothermalDeposit = new Material.Builder(7081, SuSyUtility.susyId("magmatic_hydrothermal_deposit")) + .ore() + .color(0x91835d) + .build(); } } \ No newline at end of file From bc868e500e48c928bab305e899ac5aa6803690b0 Mon Sep 17 00:00:00 2001 From: planetme <87911459+planetme@users.noreply.github.com> Date: Mon, 1 Jan 2024 19:44:50 -0600 Subject: [PATCH 22/22] fix unintended removal of regular deposits from JEI --- groovy/postInit/gameplay/Ores.groovy | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/groovy/postInit/gameplay/Ores.groovy b/groovy/postInit/gameplay/Ores.groovy index 56a035fe8..1ccaebfdf 100644 --- a/groovy/postInit/gameplay/Ores.groovy +++ b/groovy/postInit/gameplay/Ores.groovy @@ -1,6 +1,5 @@ def RedundantOreRemovals = [ - - ore('oreOrthomagmaticDeposit'), + item('gregtech:ore_orthomagmatic_deposit_0'), ore('oreNetherrackOrthomagmaticDeposit'), ore('oreEndstoneOrthomagmaticDeposit'), ore('crushedOrthomagmaticDeposit'), @@ -12,7 +11,7 @@ def RedundantOreRemovals = [ ore('dustSmallOrthomagmaticDeposit'), ore('dustTinyOrthomagmaticDeposit'), - ore('oreMetamorphicDeposit'), + item('gregtech:ore_metamorphic_deposit_0'), ore('oreNetherrackMetamorphicDeposit'), ore('oreEndstoneMetamorphicDeposit'), ore('crushedMetamorphicDeposit'), @@ -24,7 +23,7 @@ def RedundantOreRemovals = [ ore('dustSmallMetamorphicDeposit'), ore('dustTinyMetamorphicDeposit'), - ore('oreSedimentaryDeposit'), + item('gregtech:ore_sedimentary_deposit_0'), ore('oreNetherrackSedimentaryDeposit'), ore('oreEndstoneSedimentaryDeposit'), ore('crushedSedimentaryDeposit'), @@ -36,7 +35,7 @@ def RedundantOreRemovals = [ ore('dustSmallSedimentaryDeposit'), ore('dustTinySedimentaryDeposit'), - ore('oreHydrothermalDeposit'), + item('gregtech:ore_hydrothermal_deposit_0'), ore('oreNetherrackHydrothermalDeposit'), ore('oreEndstoneHydrothermalDeposit'), ore('crushedHydrothermalDeposit'), @@ -48,7 +47,7 @@ def RedundantOreRemovals = [ ore('dustSmallHydrothermalDeposit'), ore('dustTinyHydrothermalDeposit'), - ore('oreAlluvialDeposit'), + item('gregtech:ore_alluvial_deposit_0'), ore('oreNetherrackAlluvialDeposit'), ore('oreEndstoneAlluvialDeposit'), ore('crushedAlluvialDeposit'), @@ -60,7 +59,7 @@ def RedundantOreRemovals = [ ore('dustSmallAlluvialDeposit'), ore('dustTinyAlluvialDeposit'), - ore('oreMagmaticHydrothermalDeposit'), + item('gregtech:ore_magmatic_hydrothermal_deposit_0'), ore('oreNetherrackMagmaticHydrothermalDeposit'), ore('oreEndstoneMagmaticHydrothermalDeposit'), ore('crushedMagmaticHydrothermalDeposit'), @@ -71,7 +70,6 @@ def RedundantOreRemovals = [ ore('dustMagmaticHydrothermalDeposit'), ore('dustSmallMagmaticHydrothermalDeposit'), ore('dustTinyMagmaticHydrothermalDeposit') - ] for (entry in RedundantOreRemovals) {