From 2d441e5a75186a49774a092b01ee6ac1a8da6f81 Mon Sep 17 00:00:00 2001 From: Spicierspace153 Date: Sat, 14 Sep 2024 12:48:16 -0600 Subject: [PATCH 1/7] deprecates covers depricated crafting. wireless digital interface, and digital interface --- .../data/recipe/misc/MiscRecipeLoader.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java index c7741857374..14edeecd1fc 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java @@ -296,18 +296,16 @@ public static void init(Consumer provider) { * .outputItems(GTMachines.CENTRAL_MONITOR) * .save(provider); */ - /* - * ASSEMBLER_RECIPES.recipeBuilder("cover_digital_interface").duration(100).EUt(VA[HV]) - * .inputItems(COVER_SCREEN) - * .inputItems(plate, Aluminium) - * .inputItems(CustomTags.MV_CIRCUITS) - * .inputItems(screw, StainlessSteel, 4) - * .inputFluids(Polyethylene.getFluid(L)) - * .outputItems(COVER_DIGITAL_INTERFACE) - * .save(provider); - * \ - * - */ + + ASSEMBLER_RECIPES.recipeBuilder("cover_digital_interface").duration(100).EUt(VA[HV]) + .inputItems(COVER_SCREEN) + .inputItems(plate, Aluminium) + .inputItems(CustomTags.MV_CIRCUITS) + .inputItems(screw, StainlessSteel, 4) + .inputFluids(Polyethylene.getFluid(L)) + .outputItems(COVER_DIGITAL_INTERFACE) + .save(provider); + // todo digital interface cover /* * ASSEMBLER_RECIPES.recipeBuilder("cover_wireless_digital_interface").duration(100).EUt(VA[HV]) From 20b35c0ce1b03a9e5ac30c05449d151611f2d26e Mon Sep 17 00:00:00 2001 From: Spicierspace153 Date: Sat, 14 Sep 2024 13:26:13 -0600 Subject: [PATCH 2/7] Revert "deprecates covers" This reverts commit 3b6c6f6f600a285d8eb8fb943712534200dd3c89. --- .../com/gregtechceu/gtceu/common/data/GTItems.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java index 92ed72be061..38aa18f0604 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -2076,6 +2076,11 @@ public Component getItemName(ItemStack stack) { .onRegister(attach(new CoverPlaceBehavior(GTCovers.COMPUTER_MONITOR))) .onRegister(compassNode(GTCompassSections.COVERS, GTCompassNodes.COVER)) .register(); + public static ItemEntry COVER_CRAFTING = REGISTRATE + .item("crafting_table_cover", ComponentItem::create) + .lang("Crafting Table Cover") + .onRegister(compassNode(GTCompassSections.COVERS, GTCompassNodes.COVER)) + .register(); public static ItemEntry COVER_SHUTTER = REGISTRATE .item("shutter_module_cover", ComponentItem::create) .lang("Shutter Module") @@ -2096,6 +2101,14 @@ public Component getItemName(ItemStack stack) { .lang("Ender Fluid Link") .onRegister(compassNode(GTCompassSections.COVERS, GTCompassNodes.COVER)) .register(); + public static ItemEntry COVER_DIGITAL_INTERFACE = REGISTRATE + .item("digital_interface_cover", ComponentItem::create) + .lang("Digital Interface") + .register(); + public static ItemEntry COVER_DIGITAL_INTERFACE_WIRELESS = REGISTRATE + .item("wireless_digital_interface_cover", ComponentItem::create) + .lang("Wireless Digital Interface") + .register(); public static ItemEntry COVER_FLUID_VOIDING = REGISTRATE .item("fluid_voiding_cover", ComponentItem::create) .lang("Fluid Voiding Cover") From 6ab5be6ebe22da1e79e61c74b4f7ed22aca33a15 Mon Sep 17 00:00:00 2001 From: Spicierspace153 Date: Mon, 16 Sep 2024 12:25:44 -0600 Subject: [PATCH 3/7] fixed the import fixed imports to native lib --- .../gtceu/common/pipelike/cable/EnergyNetWalker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java index 6f1b5fd9cf9..a81994d1f2f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java @@ -12,7 +12,7 @@ import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; -import com.llamalad7.mixinextras.lib.apache.commons.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; From 95adbea1d98504534e2d0abe24433e5b935438de Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Sun, 22 Sep 2024 20:20:10 -0600 Subject: [PATCH 4/7] fix parallel --- .../com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java index f935a43f1cc..3ed0c1cb769 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java @@ -246,7 +246,6 @@ public static GTRecipe multiSmelterParallel(MetaMachine machine, @NotNull GTReci // double durationForParallel = Math.max(1.0, FURNACE_DURATION * 2 * parallel.getSecond() / Math.max(1, // maxParallel * 1.0)); - recipe = parallel.getFirst() == recipe ? parallel.getFirst().copy() : parallel.getFirst(); int parallelValue = parallel.getSecond(); long eut = 4 * (parallelValue / 8) / coilMachine.getCoilType().getEnergyDiscount(); From c6f5cb161b1b34aec109512fb5655cb59c213e3b Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:21:20 -0700 Subject: [PATCH 5/7] remove vanilla dye recipes to add extractor recipes too --- .../gtceu/data/recipe/configurable/RecipeRemoval.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index 614abe84ed6..abdb57eb502 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -74,6 +74,12 @@ private static void generalRemovals(Consumer registry) { // removed these for parity with the other torch recipes registry.accept(new ResourceLocation("minecraft:soul_torch")); registry.accept(new ResourceLocation("minecraft:soul_lantern")); + + //removed these to add in GT style recipes + registry.accept(new ResourceLocation("minecraft:white_dye")); + registry.accept(new ResourceLocation("minecraft:black_dye")); + registry.accept(new ResourceLocation("black_dye_from_wither_rose")); + registry.accept(new ResourceLocation("blue_dye")); } private static void disableManualCompression(Consumer registry) { From 52f31c6bc646962acca4314bec2237450e36ea21 Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:55:44 -0700 Subject: [PATCH 6/7] adds in extractor recipes --- .../data/recipe/misc/VanillaStandardRecipes.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index ca7f209f1d9..9911e0cd796 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -1356,7 +1356,18 @@ private static void dyeRecipes(Consumer provider) { .inputItems(new ItemStack(Items.PITCHER_PLANT)) .outputItems(new ItemStack(Items.CYAN_DYE, 3)) .save(provider); - + EXTRACTOR_RECIPES.recipeBuilder("white_dye") + .inputItems(new ItemStack(Items.BONE_MEAL)) + .outputItems(new ItemStack(Items.WHITE_DYE, 1)) + .save(provider); + EXTRACTOR_RECIPES.recipeBuilder("lapis_dye") + .inputItems(new ItemStack(Items.LAPIS_LAZULI)) + .outputItems(new ItemStack(Items.BLUE_DYE)) + .save(provider); + EXTRACTOR_RECIPES.recipeBuilder("ink_dye") + .inputItems(new ItemStack(Items.INK_SAC)) + .outputItems(new ItemStack(Items.BLACK_DYE)) + .save(provider); EXTRACTOR_RECIPES.recipeBuilder("pink_petals_dye") .inputItems(new ItemStack(Items.PINK_PETALS)) .outputItems(new ItemStack(Items.PINK_DYE, 2)) From ae5eb757382ccdda6be69b395995d88993397dba Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:56:43 -0700 Subject: [PATCH 7/7] SPOTLESS :3 --- .../gtceu/common/data/GTRecipeModifiers.java | 1 - .../data/recipe/configurable/RecipeRemoval.java | 2 +- .../data/recipe/misc/VanillaStandardRecipes.java | 12 ++++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java index 3ed0c1cb769..dbfa8582078 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java @@ -246,7 +246,6 @@ public static GTRecipe multiSmelterParallel(MetaMachine machine, @NotNull GTReci // double durationForParallel = Math.max(1.0, FURNACE_DURATION * 2 * parallel.getSecond() / Math.max(1, // maxParallel * 1.0)); - int parallelValue = parallel.getSecond(); long eut = 4 * (parallelValue / 8) / coilMachine.getCoilType().getEnergyDiscount(); result.init(eut, Math.max(1, 256 * parallelValue / maxParallel), parallelValue, params.getOcAmount()); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index abdb57eb502..202b0d2435f 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -75,7 +75,7 @@ private static void generalRemovals(Consumer registry) { registry.accept(new ResourceLocation("minecraft:soul_torch")); registry.accept(new ResourceLocation("minecraft:soul_lantern")); - //removed these to add in GT style recipes + // removed these to add in GT style recipes registry.accept(new ResourceLocation("minecraft:white_dye")); registry.accept(new ResourceLocation("minecraft:black_dye")); registry.accept(new ResourceLocation("black_dye_from_wither_rose")); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index 9911e0cd796..b4773661d08 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -1361,13 +1361,13 @@ private static void dyeRecipes(Consumer provider) { .outputItems(new ItemStack(Items.WHITE_DYE, 1)) .save(provider); EXTRACTOR_RECIPES.recipeBuilder("lapis_dye") - .inputItems(new ItemStack(Items.LAPIS_LAZULI)) - .outputItems(new ItemStack(Items.BLUE_DYE)) - .save(provider); + .inputItems(new ItemStack(Items.LAPIS_LAZULI)) + .outputItems(new ItemStack(Items.BLUE_DYE)) + .save(provider); EXTRACTOR_RECIPES.recipeBuilder("ink_dye") - .inputItems(new ItemStack(Items.INK_SAC)) - .outputItems(new ItemStack(Items.BLACK_DYE)) - .save(provider); + .inputItems(new ItemStack(Items.INK_SAC)) + .outputItems(new ItemStack(Items.BLACK_DYE)) + .save(provider); EXTRACTOR_RECIPES.recipeBuilder("pink_petals_dye") .inputItems(new ItemStack(Items.PINK_PETALS)) .outputItems(new ItemStack(Items.PINK_DYE, 2))