Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<ComponentItem> COVER_CRAFTING = REGISTRATE
.item("crafting_table_cover", ComponentItem::create)
.lang("Crafting Table Cover")
.onRegister(compassNode(GTCompassSections.COVERS, GTCompassNodes.COVER))
.register();
public static ItemEntry<ComponentItem> COVER_SHUTTER = REGISTRATE
.item("shutter_module_cover", ComponentItem::create)
.lang("Shutter Module")
Expand All @@ -2096,6 +2101,14 @@ public Component getItemName(ItemStack stack) {
.lang("Ender Fluid Link")
.onRegister(compassNode(GTCompassSections.COVERS, GTCompassNodes.COVER))
.register();
public static ItemEntry<ComponentItem> COVER_DIGITAL_INTERFACE = REGISTRATE
.item("digital_interface_cover", ComponentItem::create)
.lang("Digital Interface")
.register();
public static ItemEntry<ComponentItem> COVER_DIGITAL_INTERFACE_WIRELESS = REGISTRATE
.item("wireless_digital_interface_cover", ComponentItem::create)
.lang("Wireless Digital Interface")
.register();
public static ItemEntry<ComponentItem> COVER_FLUID_VOIDING = REGISTRATE
.item("fluid_voiding_cover", ComponentItem::create)
.lang("Fluid Voiding Cover")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ private static void generalRemovals(Consumer<ResourceLocation> 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<ResourceLocation> registry) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,18 +296,16 @@ public static void init(Consumer<FinishedRecipe> 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])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,18 @@ private static void dyeRecipes(Consumer<FinishedRecipe> 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))
Expand Down