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") 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..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,8 +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(); result.init(eut, Math.max(1, 256 * parallelValue / maxParallel), parallelValue, params.getOcAmount()); 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; 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..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 @@ -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) { 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]) 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..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 @@ -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))