From f0b58647231ef8a87786b46cd327d0b29ec64816 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Wed, 7 Aug 2024 18:38:08 -0500 Subject: [PATCH 1/8] feat: supporting multiblocks --- .../capability/impl/PrimitiveRecipeLogic.java | 8 +- ...ecipeMapPrimitiveMultiblockController.java | 8 +- .../java/gregtech/api/recipes/RecipeMaps.java | 65 ++++++++++++ .../client/renderer/texture/Textures.java | 6 ++ .../blocks/BlockGasCentrifugeCasing.java | 49 +++++++++ .../common/blocks/BlockNuclearCasing.java | 48 +++++++++ .../common/blocks/BlockPanelling.java | 50 +++++++++ .../gregtech/common/blocks/MetaBlocks.java | 12 +++ .../metatileentities/MetaTileEntities.java | 9 ++ .../MetaTileEntityHeatExchanger.java | 62 +++++++++++ .../multi/MetaTileEntitySpentFuelPool.java | 99 ++++++++++++++++++ .../electric/MetaTileEntityGasCentrifuge.java | 94 +++++++++++++++++ .../casings/nuclear/gas_centrifuge_end.png | Bin 0 -> 4413 bytes .../nuclear/gas_centrifuge_heater_side.png | Bin 0 -> 485 bytes .../gas_centrifuge_heater_side_bloom.png | Bin 0 -> 144 bytes .../nuclear/gas_centrifuge_heater_top.png | Bin 0 -> 472 bytes .../gas_centrifuge_heater_top_bloom.png | Bin 0 -> 159 bytes .../casings/nuclear/gas_centrifuge_side.png | Bin 0 -> 4522 bytes .../nuclear/spent_fuel_casing_empty_side.png | Bin 0 -> 410 bytes .../nuclear/spent_fuel_casing_empty_top.png | Bin 0 -> 447 bytes .../nuclear/spent_fuel_casing_side.png | Bin 0 -> 410 bytes .../nuclear/spent_fuel_casing_side_bloom.png | Bin 0 -> 142 bytes .../casings/nuclear/spent_fuel_casing_top.png | Bin 0 -> 447 bytes .../nuclear/spent_fuel_casing_top_bloom.png | Bin 0 -> 150 bytes .../gas_centrifuge/overlay_front.png | Bin 0 -> 245 bytes .../gas_centrifuge/overlay_front_active.png | Bin 0 -> 267 bytes .../overlay_front_active_emissive.png | Bin 0 -> 203 bytes .../gas_centrifuge/overlay_front_emissive.png | Bin 0 -> 217 bytes .../gas_centrifuge/overlay_front_paused.png | Bin 0 -> 252 bytes .../overlay_front_paused_emissive.png | Bin 0 -> 203 bytes .../heat_exchanger/overlay_front.png | Bin 0 -> 245 bytes .../heat_exchanger/overlay_front_active.png | Bin 0 -> 267 bytes .../overlay_front_active_emissive.png | Bin 0 -> 203 bytes .../heat_exchanger/overlay_front_emissive.png | Bin 0 -> 217 bytes .../heat_exchanger/overlay_front_paused.png | Bin 0 -> 252 bytes .../overlay_front_paused_emissive.png | Bin 0 -> 203 bytes .../spent_fuel_pool/overlay_back.png | Bin 0 -> 245 bytes .../spent_fuel_pool/overlay_back_active.png | Bin 0 -> 245 bytes .../overlay_back_active_emissive.png | Bin 0 -> 4911 bytes .../spent_fuel_pool/overlay_back_emissive.png | Bin 0 -> 4911 bytes .../spent_fuel_pool/overlay_front.png | Bin 0 -> 245 bytes .../spent_fuel_pool/overlay_front_active.png | Bin 0 -> 245 bytes .../overlay_front_active_emissive.png | Bin 0 -> 4911 bytes .../overlay_front_emissive.png | Bin 0 -> 4911 bytes .../spent_fuel_pool/overlay_side.png | Bin 0 -> 245 bytes .../spent_fuel_pool/overlay_side_active.png | Bin 0 -> 245 bytes .../overlay_side_active_emissive.png | Bin 0 -> 4911 bytes .../spent_fuel_pool/overlay_side_emissive.png | Bin 0 -> 4911 bytes .../spent_fuel_pool/overlay_top.png | Bin 0 -> 303 bytes .../spent_fuel_pool/overlay_top_active.png | Bin 0 -> 320 bytes .../overlay_top_active_emissive.png | Bin 0 -> 185 bytes .../spent_fuel_pool/overlay_top_emissive.png | Bin 0 -> 186 bytes .../spent_fuel_pool/overlay_top_paused.png | Bin 0 -> 242 bytes .../overlay_top_paused_emissive.png | Bin 0 -> 177 bytes 54 files changed, 501 insertions(+), 9 deletions(-) create mode 100644 src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java create mode 100644 src/main/java/gregtech/common/blocks/BlockNuclearCasing.java create mode 100644 src/main/java/gregtech/common/blocks/BlockPanelling.java create mode 100644 src/main/java/gregtech/common/metatileentities/MetaTileEntityHeatExchanger.java create mode 100644 src/main/java/gregtech/common/metatileentities/multi/MetaTileEntitySpentFuelPool.java create mode 100644 src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_end.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_heater_side.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_heater_side_bloom.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_heater_top.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_heater_top_bloom.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_side.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_empty_side.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_empty_top.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_side.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_side_bloom.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_top.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_top_bloom.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_active_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_paused.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_paused_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_active_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_paused.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_paused_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back_active_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front_active_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side_active_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_active_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_paused.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_paused_emissive.png diff --git a/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java index d1893fa8f84..cd88864369a 100644 --- a/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java @@ -1,7 +1,7 @@ package gregtech.api.capability.impl; import gregtech.api.GTValues; -import gregtech.api.metatileentity.multiblock.RecipeMapPrimitiveMultiblockController; +import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.logic.OCParams; import gregtech.api.recipes.logic.OCResult; @@ -12,10 +12,10 @@ /** * Recipe Logic for a Multiblock that does not require power. */ -public class PrimitiveRecipeLogic extends AbstractRecipeLogic { +public class PrimitiveRecipeLogic extends MultiblockRecipeLogic { - public PrimitiveRecipeLogic(RecipeMapPrimitiveMultiblockController tileEntity, RecipeMap recipeMap) { - super(tileEntity, recipeMap); + public PrimitiveRecipeLogic(RecipeMapMultiblockController tileEntity) { + super(tileEntity); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapPrimitiveMultiblockController.java b/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapPrimitiveMultiblockController.java index da874e0bdb8..72eb8cd0e9a 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapPrimitiveMultiblockController.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapPrimitiveMultiblockController.java @@ -20,13 +20,11 @@ import java.util.ArrayList; import java.util.List; -public abstract class RecipeMapPrimitiveMultiblockController extends MultiblockWithDisplayBase { - - protected PrimitiveRecipeLogic recipeMapWorkable; +public abstract class RecipeMapPrimitiveMultiblockController extends RecipeMapMultiblockController { public RecipeMapPrimitiveMultiblockController(ResourceLocation metaTileEntityId, RecipeMap recipeMap) { - super(metaTileEntityId); - this.recipeMapWorkable = new PrimitiveRecipeLogic(this, recipeMap); + super(metaTileEntityId, recipeMap); + this.recipeMapWorkable = new PrimitiveRecipeLogic(this); initializeAbilities(); } diff --git a/src/main/java/gregtech/api/recipes/RecipeMaps.java b/src/main/java/gregtech/api/recipes/RecipeMaps.java index b0766a74c9a..2add8cd5c76 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipes/RecipeMaps.java @@ -1473,6 +1473,71 @@ public final class RecipeMaps { .sound(GTSoundEvents.MOTOR) .build(); + /** + * Example: + * + * 
+     * RecipeMap.HEAT_EXCHANGER_RECIPES.recipeBuilder()
+     *         .circuitMeta(1)
+     *         .fluidInputs(DistilledWater.getFluid(1000), HotHighPressureSteam.getFluid(100))
+     *         .fluidOutputs(Steam.getFluid(96000), DistilledWater.getFluid(100))
+     *         .duration(1)
+     *         .buildAndRegister();
+     *
+ */ + @ZenProperty + public static final RecipeMap HEAT_EXCHANGER_RECIPES = new RecipeMapBuilder<>( + "heat_exchanger", + new PrimitiveRecipeBuilder()) + .itemInputs(1) + .fluidInputs(2) + .fluidOutputs(2) + .progressBar(GuiTextures.PROGRESS_BAR_ARROW_MULTIPLE, MoveType.HORIZONTAL) + .sound(GTSoundEvents.COOLING) + .build(); + + /** + * Example: + * + * 
+     * RecipeMap.SPENT_FUEL_POOL_RECIPES.recipeBuilder()
+     *         .input(OrePrefix.fuelRodHotDepleted, Materials.LEU235)
+     *         .output(OrePrefix.fuelRodDepleted, Materials.LEU235)
+     *         .duration(1000)
+     *         .buildAndRegister();
+     *
+ */ + @ZenProperty + public static final RecipeMap SPENT_FUEL_POOL_RECIPES = new RecipeMapBuilder<>( + "spent_fuel_pool", + new SimpleRecipeBuilder()) + .itemInputs(1) + .itemOutputs(1) + .fluidInputs(1) + .fluidOutputs(1) + .progressBar(GuiTextures.PROGRESS_BAR_BATH, MoveType.HORIZONTAL) + .build(); + + /** + * Example: + * + * 
+     * GAS_CENTRIFUGE_RECIPES.recipeBuilder().duration(800).EUt(VA[HV])
+     *         .fluidInputs(UraniumHexafluoride.getFluid(1000))
+     *         .fluidOutputs(LowEnrichedUraniumHexafluoride.getFluid(100))
+     *         .fluidOutputs(DepletedUraniumHexafluoride.getFluid(900))
+     *         .buildAndRegister();
+     *
+ */ + @ZenProperty + public static final RecipeMap GAS_CENTRIFUGE_RECIPES = new RecipeMapBuilder<>("gas_centrifuge", + new SimpleRecipeBuilder()) + .fluidInputs(1) + .fluidOutputs(2) + .progressBar(GuiTextures.PROGRESS_BAR_MIXER, MoveType.CIRCULAR) + .sound(GTSoundEvents.CENTRIFUGE) + .build(); + ////////////////////////////////////// // Fuel Recipe Maps // ////////////////////////////////////// diff --git a/src/main/java/gregtech/client/renderer/texture/Textures.java b/src/main/java/gregtech/client/renderer/texture/Textures.java index 8615691ba87..825a070187f 100644 --- a/src/main/java/gregtech/client/renderer/texture/Textures.java +++ b/src/main/java/gregtech/client/renderer/texture/Textures.java @@ -196,6 +196,12 @@ public class Textures { "multiblock/network_switch"); public static final OrientedOverlayRenderer POWER_SUBSTATION_OVERLAY = new OrientedOverlayRenderer( "multiblock/power_substation"); + public static final OrientedOverlayRenderer SPENT_FUEL_POOL_OVERLAY = new OrientedOverlayRenderer( + "multiblock/spent_fuel_pool"); + public static final OrientedOverlayRenderer HEAT_EXCHANGER_OVERLAY = new OrientedOverlayRenderer( + "multiblock/heat_exchanger"); + public static final OrientedOverlayRenderer GAS_CENTRIFUGE_OVERLAY = new OrientedOverlayRenderer( + "multiblock/gas_centrifuge"); public static final OrientedOverlayRenderer ALLOY_SMELTER_OVERLAY = new OrientedOverlayRenderer( "machines/alloy_smelter"); diff --git a/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java b/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java new file mode 100644 index 00000000000..de487915754 --- /dev/null +++ b/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java @@ -0,0 +1,49 @@ +package gregtech.common.blocks; + +import gregtech.api.block.IStateHarvestLevel; +import gregtech.api.block.VariantBlock; + +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.IStringSerializable; + +public class BlockGasCentrifugeCasing extends VariantBlock { + + public BlockGasCentrifugeCasing() { + super(Material.IRON); + setTranslationKey("gas_centrifuge_casing"); + setHardness(5.0f); + setResistance(10.0f); + setSoundType(SoundType.METAL); + setDefaultState(getState(GasCentrifugeCasingType.GAS_CENTRIFUGE_COLUMN)); + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return state != getState(GasCentrifugeCasingType.GAS_CENTRIFUGE_COLUMN); + } + + public enum GasCentrifugeCasingType implements IStringSerializable, IStateHarvestLevel { + + GAS_CENTRIFUGE_COLUMN("gas_centrifuge_column", 2); + + private String name; + private int harvestLevel; + + GasCentrifugeCasingType(String name, int harvestLevel) { + this.name = name; + this.harvestLevel = harvestLevel; + } + + @Override + public String getName() { + return name; + } + + @Override + public int getHarvestLevel(IBlockState state) { + return harvestLevel; + } + } +} diff --git a/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java b/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java new file mode 100644 index 00000000000..1ae9d470f3a --- /dev/null +++ b/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java @@ -0,0 +1,48 @@ +package gregtech.common.blocks; + +import gregtech.api.block.IStateHarvestLevel; +import gregtech.api.block.VariantActiveBlock; + +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.IStringSerializable; + +import org.jetbrains.annotations.NotNull; + +public class BlockNuclearCasing extends VariantActiveBlock { + + public BlockNuclearCasing() { + super(Material.IRON); + setTranslationKey("nuclear_casing"); + setHardness(5.0f); + setResistance(10.0f); + setSoundType(SoundType.METAL); + setDefaultState(getState(NuclearCasingType.SPENT_FUEL_CASING)); + } + + public enum NuclearCasingType implements IStringSerializable, IStateHarvestLevel { + + SPENT_FUEL_CASING("spent_fuel_casing", 2), + GAS_CENTRIFUGE_HEATER("gas_centrifuge_heater", 1); + + NuclearCasingType(String name, int harvestLevel) { + this.name = name; + this.harvestLevel = harvestLevel; + } + + private final String name; + private final int harvestLevel; + + @NotNull + @Override + public String getName() { + return this.name; + } + + @Override + public int getHarvestLevel(IBlockState state) { + return this.harvestLevel; + } + } +} diff --git a/src/main/java/gregtech/common/blocks/BlockPanelling.java b/src/main/java/gregtech/common/blocks/BlockPanelling.java new file mode 100644 index 00000000000..2a732ede1e5 --- /dev/null +++ b/src/main/java/gregtech/common/blocks/BlockPanelling.java @@ -0,0 +1,50 @@ +package gregtech.common.blocks; + +import gregtech.api.block.VariantBlock; + +import net.minecraft.block.SoundType; +import net.minecraft.util.IStringSerializable; + +public class BlockPanelling extends VariantBlock { + + public BlockPanelling() { + super(net.minecraft.block.material.Material.IRON); + setTranslationKey("panelling"); + setHardness(2.0f); + setResistance(5.0f); + setSoundType(SoundType.METAL); + setHarvestLevel("wrench", 2); + setDefaultState(getState(PanellingType.WHITE)); + } + + public enum PanellingType implements IStringSerializable { + + WHITE("white"), + ORANGE("orange"), + MAGENTA("magenta"), + LIGHT_BLUE("light_blue"), + YELLOW("yellow"), + LIME("lime"), + PINK("pink"), + GRAY("gray"), + LIGHT_GRAY("light_gray"), + CYAN("cyan"), + PURPLE("purple"), + BLUE("blue"), + BROWN("brown"), + GREEN("green"), + RED("red"), + BLACK("black"); + + private final String name; + + PanellingType(String name) { + this.name = name; + } + + @Override + public String getName() { + return this.name; + } + } +} diff --git a/src/main/java/gregtech/common/blocks/MetaBlocks.java b/src/main/java/gregtech/common/blocks/MetaBlocks.java index ed353717832..618c32081bb 100644 --- a/src/main/java/gregtech/common/blocks/MetaBlocks.java +++ b/src/main/java/gregtech/common/blocks/MetaBlocks.java @@ -138,6 +138,8 @@ private MetaBlocks() {} public static BlockCleanroomCasing CLEANROOM_CASING; public static BlockComputerCasing COMPUTER_CASING; public static BlockBatteryPart BATTERY_BLOCK; + public static BlockNuclearCasing NUCLEAR_CASING; + public static BlockGasCentrifugeCasing GAS_CENTRIFUGE_CASING; public static final EnumMap LAMPS = new EnumMap<>(EnumDyeColor.class); public static final EnumMap BORDERLESS_LAMPS = new EnumMap<>(EnumDyeColor.class); @@ -174,6 +176,7 @@ private MetaBlocks() {} public static BlockColored METAL_SHEET; public static BlockColored LARGE_METAL_SHEET; public static BlockColored STUDS; + public static BlockPanelling PANELLING; public static final Map COMPRESSED = new Object2ObjectOpenHashMap<>(); public static final Map FRAMES = new Object2ObjectOpenHashMap<>(); @@ -263,6 +266,10 @@ public static void init() { COMPUTER_CASING.setRegistryName("computer_casing"); BATTERY_BLOCK = new BlockBatteryPart(); BATTERY_BLOCK.setRegistryName("battery_block"); + NUCLEAR_CASING = new BlockNuclearCasing(); + NUCLEAR_CASING.setRegistryName("nuclear_casing"); + GAS_CENTRIFUGE_CASING = new BlockGasCentrifugeCasing(); + GAS_CENTRIFUGE_CASING.setRegistryName("gas_centrifuge_casing"); for (EnumDyeColor color : EnumDyeColor.values()) { BlockLamp block = new BlockLamp(color); @@ -336,6 +343,8 @@ public static void init() { STUDS = new BlockColored(net.minecraft.block.material.Material.CARPET, "studs", 1.5f, 2.5f, SoundType.CLOTH, EnumDyeColor.BLACK); STUDS.setRegistryName("studs"); + PANELLING = new BlockPanelling(); + PANELLING.setRegistryName("panelling"); createGeneratedBlock(m -> m.hasProperty(PropertyKey.DUST) && m.hasFlag(GENERATE_FRAME), MetaBlocks::createFrameBlock); @@ -469,6 +478,8 @@ public static void registerItemModels() { registerItemModel(COMPUTER_CASING); registerItemModel(BATTERY_BLOCK); registerItemModel(ASPHALT); + registerItemModel(GAS_CENTRIFUGE_CASING); + registerItemModel(PANELLING); for (StoneVariantBlock block : STONE_BLOCKS.values()) registerItemModel(block); registerItemModelWithOverride(RUBBER_LOG, ImmutableMap.of(BlockLog.LOG_AXIS, EnumAxis.Y)); @@ -507,6 +518,7 @@ public static void registerItemModels() { FUSION_CASING.onModelRegister(); MULTIBLOCK_CASING.onModelRegister(); TRANSPARENT_CASING.onModelRegister(); + NUCLEAR_CASING.onModelRegister(); for (BlockLamp lamp : LAMPS.values()) lamp.onModelRegister(); for (BlockLamp lamp : BORDERLESS_LAMPS.values()) lamp.onModelRegister(); diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java index e2e2624f8cd..6dd0512c5bc 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java @@ -47,6 +47,7 @@ import gregtech.common.metatileentities.multi.MetaTileEntityPrimitiveBlastFurnace; import gregtech.common.metatileentities.multi.MetaTileEntityPrimitiveWaterPump; import gregtech.common.metatileentities.multi.MetaTileEntityPumpHatch; +import gregtech.common.metatileentities.multi.MetaTileEntitySpentFuelPool; import gregtech.common.metatileentities.multi.MetaTileEntityTankValve; import gregtech.common.metatileentities.multi.electric.MetaTileEntityActiveTransformer; import gregtech.common.metatileentities.multi.electric.MetaTileEntityAssemblyLine; @@ -57,6 +58,7 @@ import gregtech.common.metatileentities.multi.electric.MetaTileEntityElectricBlastFurnace; import gregtech.common.metatileentities.multi.electric.MetaTileEntityFluidDrill; import gregtech.common.metatileentities.multi.electric.MetaTileEntityFusionReactor; +import gregtech.common.metatileentities.multi.electric.MetaTileEntityGasCentrifuge; import gregtech.common.metatileentities.multi.electric.MetaTileEntityHPCA; import gregtech.common.metatileentities.multi.electric.MetaTileEntityImplosionCompressor; import gregtech.common.metatileentities.multi.electric.MetaTileEntityLargeChemicalReactor; @@ -332,6 +334,9 @@ public class MetaTileEntities { public static MetaTileEntityNetworkSwitch NETWORK_SWITCH; public static MetaTileEntityPowerSubstation POWER_SUBSTATION; public static MetaTileEntityActiveTransformer ACTIVE_TRANSFORMER; + public static MetaTileEntityHeatExchanger HEAT_EXCHANGER; + public static MetaTileEntitySpentFuelPool SPENT_FUEL_POOL; + public static MetaTileEntityGasCentrifuge GAS_CENTRIFUGE; // STORAGE SECTION public static MetaTileEntityTankValve WOODEN_TANK_VALVE; @@ -774,6 +779,10 @@ public static void init() { ACTIVE_TRANSFORMER = registerMetaTileEntity(1042, new MetaTileEntityActiveTransformer(gregtechId("active_transformer"))); + SPENT_FUEL_POOL = registerMetaTileEntity(1044, new MetaTileEntitySpentFuelPool(gregtechId("spent_fuel_pool"))); + HEAT_EXCHANGER = registerMetaTileEntity(1045, new MetaTileEntityHeatExchanger(gregtechId("heat_exchanger"))); + GAS_CENTRIFUGE = registerMetaTileEntity(1046, new MetaTileEntityGasCentrifuge(gregtechId("gas_centrifuge"))); + // MISC MTE's START: IDs 1150-2000 // Import/Export Buses/Hatches, IDs 1150-1209 diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntityHeatExchanger.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntityHeatExchanger.java new file mode 100644 index 00000000000..c6054ac252a --- /dev/null +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntityHeatExchanger.java @@ -0,0 +1,62 @@ +package gregtech.common.metatileentities; + +import gregtech.api.capability.impl.PrimitiveRecipeLogic; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.metatileentity.multiblock.IMultiblockPart; +import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; +import gregtech.api.pattern.BlockPattern; +import gregtech.api.pattern.FactoryBlockPattern; +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.unification.material.Materials; +import gregtech.client.renderer.ICubeRenderer; +import gregtech.client.renderer.texture.Textures; +import gregtech.common.blocks.BlockBoilerCasing.BoilerCasingType; +import gregtech.common.blocks.BlockMetalCasing.MetalCasingType; +import gregtech.common.blocks.MetaBlocks; + +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + +public class MetaTileEntityHeatExchanger extends RecipeMapMultiblockController { + + public MetaTileEntityHeatExchanger(ResourceLocation metaTileEntityId) { + super(metaTileEntityId, RecipeMaps.HEAT_EXCHANGER_RECIPES); + this.recipeMapWorkable = new PrimitiveRecipeLogic(this); + } + + @Override + public MetaTileEntity createMetaTileEntity(IGregTechTileEntity iGregTechTileEntity) { + return new MetaTileEntityHeatExchanger(metaTileEntityId); + } + + @Override + protected @NotNull BlockPattern createStructurePattern() { + return FactoryBlockPattern.start() + .aisle("CCC", "BCB", "ACA") + .aisle("CCC", "CDC", "ACA").setRepeatable(7) + .aisle("CCC", "BSB", "AEA") + .where('S', selfPredicate()) + .where('A', frames(Materials.Steel)) + .where('B', autoAbilities(false, false, false, false, false, true, false).setMinGlobalLimited(2) + .or(autoAbilities(false, false, false, false, true, false, false).setMinGlobalLimited(2))) + .where('C', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID)) + .or(autoAbilities(false, true, false, false, false, false, false))) + .where('D', states(MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE))) + .where('E', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID)) + .or(autoAbilities(false, false, true, false, false, false, false))) + .build(); + } + + @Override + public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) { + return Textures.SOLID_STEEL_CASING; + } + + @NotNull + @Override + protected ICubeRenderer getFrontOverlay() { + return Textures.HEAT_EXCHANGER_OVERLAY; + } +} diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntitySpentFuelPool.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntitySpentFuelPool.java new file mode 100644 index 00000000000..4ed1070b84b --- /dev/null +++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntitySpentFuelPool.java @@ -0,0 +1,99 @@ +package gregtech.common.metatileentities.multi; + +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.metatileentity.multiblock.IMultiblockPart; +import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; +import gregtech.api.pattern.BlockPattern; +import gregtech.api.pattern.FactoryBlockPattern; +import gregtech.api.pattern.PatternMatchContext; +import gregtech.api.recipes.RecipeMaps; +import gregtech.client.renderer.ICubeRenderer; +import gregtech.client.renderer.texture.Textures; +import gregtech.common.blocks.BlockMetalCasing; +import gregtech.common.blocks.BlockNuclearCasing; +import gregtech.common.blocks.MetaBlocks; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +import static gregtech.api.util.RelativeDirection.*; + +public class MetaTileEntitySpentFuelPool extends RecipeMapMultiblockController { + + public MetaTileEntitySpentFuelPool(ResourceLocation metaTileEntityId) { + super(metaTileEntityId, RecipeMaps.SPENT_FUEL_POOL_RECIPES); + } + + @Override + public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { + return new MetaTileEntitySpentFuelPool(metaTileEntityId); + } + + @Override + public boolean hasMaintenanceMechanics() { + return false; + } + + @NotNull + @Override + protected BlockPattern createStructurePattern() { + return FactoryBlockPattern.start(FRONT, UP, RIGHT) + // spotless:off + .aisle("CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "TTTTTTTTTT") + .aisle("CCCCCCCCCC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CUUUUUUUUC", "S........T") + .aisle("CCCCCCCCCC", "CWRRRRRRWC", "CWRRRRRRWC", "CWRRRRRRWC", "CWRRRRRRWC", "CWRRRRRRWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CUUUUUUUUC", "T........T") + .setRepeatable(1, 10) + .aisle("CCCCCCCCCC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CUUUUUUUUC", "T........T") + .aisle("CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "TTTTTTTTTT") + //spotless:on + .where('S', selfPredicate()) + .where('.', any()) + .where('C', blocks(MetaBlocks.PANELLING)) + .where('W', blocks(Blocks.WATER).or(blocks(Blocks.FLOWING_WATER))) + .where('U', blocks(Blocks.WATER)) + .where('R', states(getRodState())) + .where('T', + states(getMetalCasingState()).or(autoAbilities(true, false, true, true, false, true, false))) + .build(); + } + + @Override + protected void formStructure(PatternMatchContext context) { + super.formStructure(context); + this.recipeMapWorkable.setParallelLimit(structurePattern.formedRepetitionCount[0] * 32); + } + + @Override + public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { + return Textures.CLEAN_STAINLESS_STEEL_CASING; + } + + @NotNull + @Override + protected ICubeRenderer getFrontOverlay() { + return Textures.SPENT_FUEL_POOL_OVERLAY; + } + + private IBlockState getRodState() { + return MetaBlocks.NUCLEAR_CASING.getState(BlockNuclearCasing.NuclearCasingType.SPENT_FUEL_CASING); + } + + private IBlockState getMetalCasingState() { + return MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.STAINLESS_CLEAN); + } + + public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + tooltip.add(I18n.format("gregtech.universal.tooltip.parallel", "32 per block of pool length")); + } +} diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java new file mode 100644 index 00000000000..1860d82e00b --- /dev/null +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java @@ -0,0 +1,94 @@ +package gregtech.common.metatileentities.multi.electric; + +import gregtech.api.capability.impl.MultiblockRecipeLogic; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.metatileentity.multiblock.IMultiblockPart; +import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; +import gregtech.api.pattern.BlockPattern; +import gregtech.api.pattern.FactoryBlockPattern; +import gregtech.api.pattern.PatternMatchContext; +import gregtech.api.recipes.RecipeMaps; +import gregtech.client.renderer.ICubeRenderer; +import gregtech.client.renderer.texture.Textures; +import gregtech.common.blocks.BlockBoilerCasing; +import gregtech.common.blocks.BlockGasCentrifugeCasing; +import gregtech.common.blocks.BlockNuclearCasing; +import gregtech.common.blocks.MetaBlocks; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +import static gregtech.api.util.RelativeDirection.*; + +public class MetaTileEntityGasCentrifuge extends RecipeMapMultiblockController { + + public MetaTileEntityGasCentrifuge(ResourceLocation metaTileEntityId) { + super(metaTileEntityId, RecipeMaps.GAS_CENTRIFUGE_RECIPES); + this.recipeMapWorkable = new MultiblockRecipeLogic(this); + } + + @NotNull + @Override + protected BlockPattern createStructurePattern() { + return FactoryBlockPattern.start(FRONT, UP, RIGHT) + .aisle("SI", "HH", "CC", "CC", "CC", "CC", "CC") + .aisle("EE", "HH", "CC", "CC", "CC", "CC", "CC").setRepeatable(1, 14) + .aisle("OO", "HH", "CC", "CC", "CC", "CC", "CC") + .where('S', selfPredicate()) + .where('P', states(getPipeState())) + .where('H', states(getHeaterState())) + .where('C', states(getCentrifugeState())) + .where('I', states(getPipeState()).or(autoAbilities(false, false, false, false, true, false, false))) + .where('E', states(getPipeState()).or(autoAbilities(true, true, false, false, false, false, false))) + .where('O', states(getPipeState()).or(autoAbilities(false, false, false, false, false, true, false))) + .build(); + } + + @Override + protected void formStructure(PatternMatchContext context) { + super.formStructure(context); + this.recipeMapWorkable.setParallelLimit(structurePattern.formedRepetitionCount[0]); + } + + public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + tooltip.add(I18n.format("gregtech.universal.tooltip.parallel", "1 + number of added columns")); + } + + @Override + public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { + return Textures.INERT_PTFE_CASING; + } + + @Override + public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { + return new MetaTileEntityGasCentrifuge(metaTileEntityId); + } + + private IBlockState getPipeState() { + return MetaBlocks.BOILER_CASING.getState(BlockBoilerCasing.BoilerCasingType.POLYTETRAFLUOROETHYLENE_PIPE); + } + + private IBlockState getHeaterState() { + return MetaBlocks.NUCLEAR_CASING.getState( + BlockNuclearCasing.NuclearCasingType.GAS_CENTRIFUGE_HEATER); + } + + private IBlockState getCentrifugeState() { + return MetaBlocks.GAS_CENTRIFUGE_CASING + .getState(BlockGasCentrifugeCasing.GasCentrifugeCasingType.GAS_CENTRIFUGE_COLUMN); + } + + protected ICubeRenderer getFrontOverlay() { + return Textures.GAS_CENTRIFUGE_OVERLAY; + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_end.png b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_end.png new file mode 100644 index 0000000000000000000000000000000000000000..abbd8bfbcd5b7b7d7c68193b8e110bb4492c8e33 GIT binary patch literal 4413 zcmeH~eNYo;9>-TfNTK$uFBAl7Txl(~o88R|Nwx_u5?%s^ro0GP9J<-vge^%nWETjj z-dV6MB38ND!!lqyb3*N@sB@m}wB=3;6i@AVDr(OcyireOw7#6J(i7}Gn*hSJGaY8G z|B;#GdG>jJzt8jhzR&OZO?I6*D{W@T{16C&W*XBC*`O8sA(9~QyFq@m12mo9+yWt+ ztdzRkoRzgRQlZMlNEr`ng&@xvhq-fR7bY1}q@?YccGeU1k+IeJk2|4n7|L>D7WBR$ z3;ZVj)>FC{FolcFetnm*=EcgWjF_tWX#QgK?xvIPK4A;UgTKDq+P5X)yH)c&^A8>B zN#A;`;7aP%+l>nreP`I;a7R_|4S&+R=ov`u^#^o;2>{=l{db{~OgAe4Wudy9eaAo6S{e$L?Av?htDPkS-T1}Yw#dyW ztvjXR%1&kGo%&+&??{d91+=W?3O2jo08FQwU+xLY*e=c3kyN)~?zg?GhmzZipKZ)& zpNYAT{PFSVy6eF|)?7G$=7+yOhQ>w(6U9+isX)oM(>F9-TD9QCtV@BC_<;P>!^Q0Z zCqCGAdc}&%l51y!WbLmseHL7F6RLTs%@W%_cU$b`y9XXbtj-Aw|8&M@`5paD4>YTx z<9&Jm3DRf+Q$sg*T)BI*{a*h={fQg5g4cQ7du$Is>H|sVVL@^gn3fR~=a7*!XJKR> zhYMsK1nCkyE|Mx`1gV9wu}(dF>+`?CQkK@k`6?4;awRh*Y`WLYN62a^>Bg7EKTOzj8rL8$}l9w!&b=Q_zk~9bu{7c9 zY7`8`s7VW=q}4Q{#FR8*QDQVgs;vq&hN&^isu_neI(dO~QjCZKa2X3YG^0=}6qp*( z#;MeZ5+^CdqG52vN~a#~Iz@;Iv&QN~dg zM1$cNf{{vG8^>5^2G{yfG)1IxZU+gDlXZ|b26Z`Yz6nuqBFSvj!*Ut+XvAzM1uJmS z!^>D_x#!VDF6&@&1X5HJSIcpgT%%U0HQG2O=3mIiTh6$7kclD_$7Bk>AmXtQAQ&Jl zDds5v_^==rBH7K50_V=bke)uRq|f;dDt4lEWeFpm0uT%V`Sw%6(2;;qv1W`$tV4gIiOy#* zuE+pC{}?DlEVz|AH#P%hGUuVkmgg3bJIT8K5xGi$7i6eGjycxzY=H2nwAeey2fA z&Ea4$STLGWg0BV7n;xN!Y3-;7Ljy)bQf~N(yiI#w>q?wuxX^N+j^4j_#__ZPK06}t zdh9%9-I|WDAh0ptMK7ThOz7hPpk*HJ0|Ef8ntYR_cEY zuXc5uFRVk_nr(BiPnNd;T=RRq+v+bJ9PkXPHzxe1vHaYuwZrXgrIAZ#H9uomB13l% ZK{a9A#eW~(EC)eD#*{2W`_fmd{|DfPK`;OS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_heater_side.png b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_heater_side.png new file mode 100644 index 0000000000000000000000000000000000000000..b5bf39ba6d1c2a8e9fc6bc1c9c634a80d0a69471 GIT binary patch literal 485 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0eVS9K~y+TrBlm_ z!Y~v~2BL@vKEdija3ik7wIZU3NEafA_|g7?D_0^u!B?)<$+<&HE6(7|1TH7J?Rngk z%IS2fJ8=e^t-V-Aa*vw|G>-AV*xm;2@ zomP0kIt87r01V)4?nSXcx7*d3OokKG>vi7^q#!XU7>!0b!EU!B+39pNoY5#03L#>U zgu))ZQmMpam^38Y?Y1_zs_;#L*X#8q$)1rC&hdC$9S#SQtyYT#plAze-a!^-mrQ05vdpy85}Sb4q9e0A`;ig8%>k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_heater_top.png b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_heater_top.png new file mode 100644 index 0000000000000000000000000000000000000000..6330cdea6265b21de0bf96f6f1ea8e9c3fb19a72 GIT binary patch literal 472 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_empty_side.png b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_empty_side.png new file mode 100644 index 0000000000000000000000000000000000000000..344dda81d068f95fda657d54de16451fa90b5ec7 GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lhn0G|-o@bm@~3;T$)hTz2Nu(Y~}jK+xchUl#3$n=KL)Vk1=+Q^K?kffT3 zwEB?bnsA^ zcv?ePT76h*U2sxOP$E#OCMLT%ETt|sw>2`oF(9rYB)K*+vne#KEFr%o3R|8ORrl*Tzh(@q(Kf6$qg8<8N-UUeq8X^UY|NQ?h6SjKYwsmdq zZaO!ynJi?@^_b$szUxA_MX)@Z0nef0B{Ihn3YmguTyg06aTy5BDJOg$f)wNS%LhS0X`wF;pq)gnN5)yjS*=LA;~qtiPgbL)nRFM;c4{|8I577brIAxSk6K&iC4(B#^P^!mum#>ljWsH~=tl-kggy6EiY@U(`=jE3-(`jF)6 z;N5Tz#6``p>qnbjJYeRun zrvgzuyHnH-pd&d8JR*x382Ao?FyoGi*>8b@>pfi@Lo|YA`(6hfO5kzXF0UJVd$Fiv zKp^AVrtmA@>n)s(X3qU{<4xpBt;xGgE??Sam%TfV_1r@ywu}WYgwg_>XICxVxp%|U z%OT&kPTSBVy`z=u-IliBU)5=Vw|(!LcYbT<#AX4ekotm eB~^a-zJ1>Z-bWKupM?OO&fw|l=d#Wzp$PzM5VRTq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_side.png b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_side.png new file mode 100644 index 0000000000000000000000000000000000000000..10b7d26f8c52ba294c449b8f0c8c6e7c30c0c0a2 GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lhn0G|-o@bm^JkHCnuhTz2Nu(Y~}jK+xchUl#3$n=KL)Vk1=+Q^K?kffT3 zwEB?bnsA^ zcv?ePT76h*U2sxOP$E#OCMLT%ETt|sw>2`oF(9rYB)K*+vne#KE90XXF^Dam_&=4tD{OA97nXuLCwykS> zchk9v&14~KuE!K7_FWgcErR9Q40sL|FOfNxP{aW=-f}-&n3P=@ihB44$rjF6*2UngF3NoFM=J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_side_bloom.png b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/spent_fuel_casing_side_bloom.png new file mode 100644 index 0000000000000000000000000000000000000000..7bed8529d7f62a9f75cc9ee6639b35ec461000c2 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;pt7fnV~B-+G6N%H^N;@uK76w|T>_ZgcqL33 gSb$^&vxEf0t@i@n-Sbv?0hKd&y85}Sb4q9e0B$ECeENS%LhS0X`wF;pq)gnN5)yjS*=LA;~qtiPgbL)nRFM;c4{|8I577brIAxSk6K&iC4(B#^P^!mum#>ljWsH~=tl-kggy6EiY@U(`=jE3-(`jF)6 z;N5Tz#6``p>qnbjJYeRun zrvg#^A%!>(>63o?`Y+Ex25g(7k9Te&2n#h_nuup^KSO^a}||M&lxmw9OV)jZ+l$owpB^m z(tUSsm+L$2FO_Syo=j@ei>z+77f9r@y^%lbuyxIW^sxVz80RdwkZ2Tx#bIdvA lHrrRMS&UFd7b7z>L)4Lg=Yp%ZNdvVpc)I$ztaD0e0swHYDQo}$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front.png new file mode 100644 index 0000000000000000000000000000000000000000..72bbef85af9e35ae95f62a89dd5126a004721c0c GIT binary patch literal 245 zcmVXkReh1nvQr6lw0E5qU1)lv9 v*$?3g`|GFxIfZX(_Mqn)%_g4ynf}!a!Fu2m_VxOB00000NkvXXu0mjfL9%Er literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_active.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_active.png new file mode 100644 index 0000000000000000000000000000000000000000..94a4416b1f5229549d2dc5f446037736de3c2800 GIT binary patch literal 267 zcmV+m0rdWfP)?*1Q!jg5`L7^WDT999EhfB^_4Wo7@nI6E`g+S!5S7?2=H z4#NPbsi=w)f${|mV7UVa4*YLuXaLhV4ZyIa8z?^uVgO7th{kCEG6pHKwy|L_GczOJ z1t0|=%)o%@1)^L4(+oEN>ID!R9b*pzsAiY}uvoCLumBsPqoV_+v8DrTwqV#gj{&y< zAi=QEFoyrJK(QPK23Hps2BcVE_`eg#K7q#o^jN@$afSgg-oP1%6lW%KF#!D>_}Tgm RvWNfx002ovPDHLkV1g$LVtxPs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_active_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..822fa52e130e5f775e31d79f23eb2e028111cfed GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-o|Ns9p{AW0D;6Ot|15k{;*x){pVl4^s3kFL4XZXF14`dK$fk$L9 z0|Vb-5N14{zaj-FXyWPO7@`rJoZ!fOgww#lplL==j{=ttL)u0ILt{r)g&>_XK4$_L mH5^tnF!6{A7$`95=rDZiVm=Z3$txbHpTX1B&t;ucLK6UmpEwTy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..00bcc3b5185fcdf739795dfffaa9007341dddbfc GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|+7AkEOgaNxj!hK7d!Kmg)1NOOjOjAbtg@(TtD0)?f#ncaXwoCO|{ z#S9F5he4R}c>anMprDnfi(`mJaB_k(vkIqyfkBf82RqA*88aJHCNUTb8&5d0s;RYA vRHY%{;2|!t28Ia?+PfII7Bn(QOEWNTWZm`l$=@kJQy4s5{an^LB{Ts5que}7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_paused.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_paused.png new file mode 100644 index 0000000000000000000000000000000000000000..8f139ba6ab3fbf05f0bcc16d9afe5daced7ba10f GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|+7cXxMVW8?ooaDzcoR`$Sw0}TxgKuI9j>g{g}q&Q20{DMIWK!73G zzd{HkSl|&^%)r2R7=#&*=dVZs3Wj>RIEH8h=k{`QF(`7dn(qH@|8bS%#5W>)B%_AYQ3&%;fgIcR6{O`9lX6TE5AL8%WvBTp>u^^A)1ztE-BS#R=NAD eB&$ds`pYa-#rpJ%VOko{0tQc4KbLh*2~7Y=mQmgS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_paused_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/gas_centrifuge/overlay_front_paused_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..577f0815c1d7961e36373551a479ee90a2aadb21 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-o|3Gkq;lP0d4Gj%Iv3X~2zXMXNB|(0{ASs65+xS2RaTa()7BevL z9RguSQ4KGUViQjn#}JL+H7}7Qx7#cgWDg^1A@i`N~sNt}p ifr&>{z(9dXM~C5C7xRhOPhRmr{S2P2elF{r5}E*15jj-= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front.png new file mode 100644 index 0000000000000000000000000000000000000000..72bbef85af9e35ae95f62a89dd5126a004721c0c GIT binary patch literal 245 zcmVXkReh1nvQr6lw0E5qU1)lv9 v*$?3g`|GFxIfZX(_Mqn)%_g4ynf}!a!Fu2m_VxOB00000NkvXXu0mjfL9%Er literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_active.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_active.png new file mode 100644 index 0000000000000000000000000000000000000000..94a4416b1f5229549d2dc5f446037736de3c2800 GIT binary patch literal 267 zcmV+m0rdWfP)?*1Q!jg5`L7^WDT999EhfB^_4Wo7@nI6E`g+S!5S7?2=H z4#NPbsi=w)f${|mV7UVa4*YLuXaLhV4ZyIa8z?^uVgO7th{kCEG6pHKwy|L_GczOJ z1t0|=%)o%@1)^L4(+oEN>ID!R9b*pzsAiY}uvoCLumBsPqoV_+v8DrTwqV#gj{&y< zAi=QEFoyrJK(QPK23Hps2BcVE_`eg#K7q#o^jN@$afSgg-oP1%6lW%KF#!D>_}Tgm RvWNfx002ovPDHLkV1g$LVtxPs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_active_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..822fa52e130e5f775e31d79f23eb2e028111cfed GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-o|Ns9p{AW0D;6Ot|15k{;*x){pVl4^s3kFL4XZXF14`dK$fk$L9 z0|Vb-5N14{zaj-FXyWPO7@`rJoZ!fOgww#lplL==j{=ttL)u0ILt{r)g&>_XK4$_L mH5^tnF!6{A7$`95=rDZiVm=Z3$txbHpTX1B&t;ucLK6UmpEwTy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..00bcc3b5185fcdf739795dfffaa9007341dddbfc GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|+7AkEOgaNxj!hK7d!Kmg)1NOOjOjAbtg@(TtD0)?f#ncaXwoCO|{ z#S9F5he4R}c>anMprDnfi(`mJaB_k(vkIqyfkBf82RqA*88aJHCNUTb8&5d0s;RYA vRHY%{;2|!t28Ia?+PfII7Bn(QOEWNTWZm`l$=@kJQy4s5{an^LB{Ts5que}7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_paused.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_paused.png new file mode 100644 index 0000000000000000000000000000000000000000..8f139ba6ab3fbf05f0bcc16d9afe5daced7ba10f GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|+7cXxMVW8?ooaDzcoR`$Sw0}TxgKuI9j>g{g}q&Q20{DMIWK!73G zzd{HkSl|&^%)r2R7=#&*=dVZs3Wj>RIEH8h=k{`QF(`7dn(qH@|8bS%#5W>)B%_AYQ3&%;fgIcR6{O`9lX6TE5AL8%WvBTp>u^^A)1ztE-BS#R=NAD eB&$ds`pYa-#rpJ%VOko{0tQc4KbLh*2~7Y=mQmgS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_paused_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/heat_exchanger/overlay_front_paused_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..577f0815c1d7961e36373551a479ee90a2aadb21 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-o|3Gkq;lP0d4Gj%Iv3X~2zXMXNB|(0{ASs65+xS2RaTa()7BevL z9RguSQ4KGUViQjn#}JL+H7}7Qx7#cgWDg^1A@i`N~sNt}p ifr&>{z(9dXM~C5C7xRhOPhRmr{S2P2elF{r5}E*15jj-= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back.png new file mode 100644 index 0000000000000000000000000000000000000000..a265b3bbaceab8c4126f9403631a2abc4eaa074e GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggK4iP>kzAL}&DuF^xo-U3d7N?W{{QqyytlH4o=yZT7 z+2iENiBG1a_sba?834h*|NrIJS=w68)HrMW{9LOvlR3k(pFci6t}u;`iaNww`R#?E z@*VCLlSe`Bg$jLA4O1rE+f#Y?01zlBDK&*N`^dI2o{!s`G(kxCa6p5p=)Nk}bmK!t g!mgf`4$OiKZ*N#LO264I40H{Hr>mdKI;Vst03#q((f|Me literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back_active.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back_active.png new file mode 100644 index 0000000000000000000000000000000000000000..cba59fa39355e874024a794fdf911b25a3b2c2ea GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggK4iP>k{>6Xz-UEf2JY5_^EKVo?`TyUZS+$|F(dhtF zvd77j6Q4{;@0T+)G5~^q|NqOcv$VCGsd3i$`MFkUCUb^mKYx6DTwxj=6?KTW^4kkR zBfhQ ggk3!=9he0f-rlfglzy{a80Z=XPgg&ebxsLQ05DKh=>Px# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back_active_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..19114daf4f5c489daef9e588fd38598be3d25bce GIT binary patch literal 4911 zcmeHLX;c$u7app}DsF{}U>hU0#X8Ak17;*eAOV6T1f)e=&|xx!QL>N(5>P3MBG@Wo z6BrEP;T>1k5Jp)tk&IYr_6KuTX+n%HxXrn)@Oue3kec4^z0l*Zb_TLTW~ z!jn3YlLJZPE`FEl?7L<6UOP?L5t|G5*;K%^rfbz3KMIrcjJMmj&}i9Rhn9y6Bd5#P z7am$v6xZBpGx|uiz5G$hwkJ0`F5BP#I;X5)>WxFUQXCQ{81FxfUZ0|B`>oW@nreP8 zF@(IbxSVdpeC&e89SG!~+r06!s;{Bsg=b3Xj*=Nwms%3K8@IL1uzM>=cgbzXo9;AL zYsgMF_lmLBM{~+&k33-;y~EPrxKFdB6IJHbIC|JGaL)ZfUEl8)C-ceKj{Uk~M)J>f z=jQru{Y-4(oPO;zZb`eAooJM&W$RXqinR3gsfqt$arBj@x?htQ%_k=RGIAf%`~Hy= z^#|`cjHQ2ecS?ri$P(3$9FNd9vl=sZt_;nXTC+RH(YkrrH&S;A58BW$(dC9<`{6Ef zY5kX$W24gpimD&J@xj{k(Rbd%Y9^hDKJjO})jKC18MPNWR*jibi#Sxe@+xiFuZWO;74J{T(w_-J3l{T|MqdGsn zG$1LFRn9~!xVq>A-yeVL!IXEmO}gzbxH%BeNL9pj9xd^){Xx<^^Os3Azvt>VlxQpW zkavpv%C4c0_vbc^cp_LX3H+UE34ZJxn|FH!9NP2A!n5zLX}|i%L##q5IA3N=<7 zrfv|rZCq{b{84<7ytI~i)AF$Ipu$rEJ>{r(l?`mckUvE!`*sO8q_rzLx+-=xEUW5vKzfR2 zXBdN0^ZdSoju&3^>`wc8e$ld@?(RF9ec6iUzYx9-S*@*#%PGC;-G05Ly{%H7_v8sQ zjiJd*UfWs%2JA!%4AQyc5R6bM7`RLoLoy5sH5jxI^EzMgai^akP0Yebrj!%!%>C_mLsn_cn zdJaRSkuzB+iZT&4lg);K1*}b0>Tm*I!dLanK1DfRichhrvp9h zS$+z&So|DbsU2bg@WC|TY9@<;Fck{sa1X6cm;^wE68cvUZ3Or}Vuq7iRicIg z(wNH`o(OP%j{B1Jv)awZz)CE}1S%rYl%7byr<>wqG8I9|F!Loza>!V=mnV#qhz#b& zvb2<-q~D@=%0rdh@t1j6NncTF{FoR2ITu4{A&cgMo4YwYaHM0f5;9RD=0z zNL;7VM5t8pe7Y$qn#t4L;56^SWeK9Rz#`ey^Fv)fhfEl}8{7o(lvzcinHv|wiNPRR zJc*Q<0|CE56%mIk2VF|D+iT=YCsE_tD(I=M5g=8_WC%|#1z72!3YW?+z1v2V|ih0Hk~f#CvX74!M98sf`D;eYrVT8IBI0)T!U zUWtKMGJf4%ujzUv242bdb$9*W=(2tBxI-$zFCaa5m_e=!-v&S)7)#N4+tPRx{B)h%8Tw idyAG{XKC%)6J-OrX4z%);#m^l1c`(a!G6ERtNsBnd0T@3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_back_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..19114daf4f5c489daef9e588fd38598be3d25bce GIT binary patch literal 4911 zcmeHLX;c$u7app}DsF{}U>hU0#X8Ak17;*eAOV6T1f)e=&|xx!QL>N(5>P3MBG@Wo z6BrEP;T>1k5Jp)tk&IYr_6KuTX+n%HxXrn)@Oue3kec4^z0l*Zb_TLTW~ z!jn3YlLJZPE`FEl?7L<6UOP?L5t|G5*;K%^rfbz3KMIrcjJMmj&}i9Rhn9y6Bd5#P z7am$v6xZBpGx|uiz5G$hwkJ0`F5BP#I;X5)>WxFUQXCQ{81FxfUZ0|B`>oW@nreP8 zF@(IbxSVdpeC&e89SG!~+r06!s;{Bsg=b3Xj*=Nwms%3K8@IL1uzM>=cgbzXo9;AL zYsgMF_lmLBM{~+&k33-;y~EPrxKFdB6IJHbIC|JGaL)ZfUEl8)C-ceKj{Uk~M)J>f z=jQru{Y-4(oPO;zZb`eAooJM&W$RXqinR3gsfqt$arBj@x?htQ%_k=RGIAf%`~Hy= z^#|`cjHQ2ecS?ri$P(3$9FNd9vl=sZt_;nXTC+RH(YkrrH&S;A58BW$(dC9<`{6Ef zY5kX$W24gpimD&J@xj{k(Rbd%Y9^hDKJjO})jKC18MPNWR*jibi#Sxe@+xiFuZWO;74J{T(w_-J3l{T|MqdGsn zG$1LFRn9~!xVq>A-yeVL!IXEmO}gzbxH%BeNL9pj9xd^){Xx<^^Os3Azvt>VlxQpW zkavpv%C4c0_vbc^cp_LX3H+UE34ZJxn|FH!9NP2A!n5zLX}|i%L##q5IA3N=<7 zrfv|rZCq{b{84<7ytI~i)AF$Ipu$rEJ>{r(l?`mckUvE!`*sO8q_rzLx+-=xEUW5vKzfR2 zXBdN0^ZdSoju&3^>`wc8e$ld@?(RF9ec6iUzYx9-S*@*#%PGC;-G05Ly{%H7_v8sQ zjiJd*UfWs%2JA!%4AQyc5R6bM7`RLoLoy5sH5jxI^EzMgai^akP0Yebrj!%!%>C_mLsn_cn zdJaRSkuzB+iZT&4lg);K1*}b0>Tm*I!dLanK1DfRichhrvp9h zS$+z&So|DbsU2bg@WC|TY9@<;Fck{sa1X6cm;^wE68cvUZ3Or}Vuq7iRicIg z(wNH`o(OP%j{B1Jv)awZz)CE}1S%rYl%7byr<>wqG8I9|F!Loza>!V=mnV#qhz#b& zvb2<-q~D@=%0rdh@t1j6NncTF{FoR2ITu4{A&cgMo4YwYaHM0f5;9RD=0z zNL;7VM5t8pe7Y$qn#t4L;56^SWeK9Rz#`ey^Fv)fhfEl}8{7o(lvzcinHv|wiNPRR zJc*Q<0|CE56%mIk2VF|D+iT=YCsE_tD(I=M5g=8_WC%|#1z72!3YW?+z1v2V|ih0Hk~f#CvX74!M98sf`D;eYrVT8IBI0)T!U zUWtKMGJf4%ujzUv242bdb$9*W=(2tBxI-$zFCaa5m_e=!-v&S)7)#N4+tPRx{B)h%8Tw idyAG{XKC%)6J-OrX4z%);#m^l1c`(a!G6ERtNsBnd0T@3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front.png new file mode 100644 index 0000000000000000000000000000000000000000..a265b3bbaceab8c4126f9403631a2abc4eaa074e GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggK4iP>kzAL}&DuF^xo-U3d7N?W{{QqyytlH4o=yZT7 z+2iENiBG1a_sba?834h*|NrIJS=w68)HrMW{9LOvlR3k(pFci6t}u;`iaNww`R#?E z@*VCLlSe`Bg$jLA4O1rE+f#Y?01zlBDK&*N`^dI2o{!s`G(kxCa6p5p=)Nk}bmK!t g!mgf`4$OiKZ*N#LO264I40H{Hr>mdKI;Vst03#q((f|Me literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front_active.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front_active.png new file mode 100644 index 0000000000000000000000000000000000000000..cba59fa39355e874024a794fdf911b25a3b2c2ea GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggK4iP>k{>6Xz-UEf2JY5_^EKVo?`TyUZS+$|F(dhtF zvd77j6Q4{;@0T+)G5~^q|NqOcv$VCGsd3i$`MFkUCUb^mKYx6DTwxj=6?KTW^4kkR zBfhQ ggk3!=9he0f-rlfglzy{a80Z=XPgg&ebxsLQ05DKh=>Px# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front_active_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..19114daf4f5c489daef9e588fd38598be3d25bce GIT binary patch literal 4911 zcmeHLX;c$u7app}DsF{}U>hU0#X8Ak17;*eAOV6T1f)e=&|xx!QL>N(5>P3MBG@Wo z6BrEP;T>1k5Jp)tk&IYr_6KuTX+n%HxXrn)@Oue3kec4^z0l*Zb_TLTW~ z!jn3YlLJZPE`FEl?7L<6UOP?L5t|G5*;K%^rfbz3KMIrcjJMmj&}i9Rhn9y6Bd5#P z7am$v6xZBpGx|uiz5G$hwkJ0`F5BP#I;X5)>WxFUQXCQ{81FxfUZ0|B`>oW@nreP8 zF@(IbxSVdpeC&e89SG!~+r06!s;{Bsg=b3Xj*=Nwms%3K8@IL1uzM>=cgbzXo9;AL zYsgMF_lmLBM{~+&k33-;y~EPrxKFdB6IJHbIC|JGaL)ZfUEl8)C-ceKj{Uk~M)J>f z=jQru{Y-4(oPO;zZb`eAooJM&W$RXqinR3gsfqt$arBj@x?htQ%_k=RGIAf%`~Hy= z^#|`cjHQ2ecS?ri$P(3$9FNd9vl=sZt_;nXTC+RH(YkrrH&S;A58BW$(dC9<`{6Ef zY5kX$W24gpimD&J@xj{k(Rbd%Y9^hDKJjO})jKC18MPNWR*jibi#Sxe@+xiFuZWO;74J{T(w_-J3l{T|MqdGsn zG$1LFRn9~!xVq>A-yeVL!IXEmO}gzbxH%BeNL9pj9xd^){Xx<^^Os3Azvt>VlxQpW zkavpv%C4c0_vbc^cp_LX3H+UE34ZJxn|FH!9NP2A!n5zLX}|i%L##q5IA3N=<7 zrfv|rZCq{b{84<7ytI~i)AF$Ipu$rEJ>{r(l?`mckUvE!`*sO8q_rzLx+-=xEUW5vKzfR2 zXBdN0^ZdSoju&3^>`wc8e$ld@?(RF9ec6iUzYx9-S*@*#%PGC;-G05Ly{%H7_v8sQ zjiJd*UfWs%2JA!%4AQyc5R6bM7`RLoLoy5sH5jxI^EzMgai^akP0Yebrj!%!%>C_mLsn_cn zdJaRSkuzB+iZT&4lg);K1*}b0>Tm*I!dLanK1DfRichhrvp9h zS$+z&So|DbsU2bg@WC|TY9@<;Fck{sa1X6cm;^wE68cvUZ3Or}Vuq7iRicIg z(wNH`o(OP%j{B1Jv)awZz)CE}1S%rYl%7byr<>wqG8I9|F!Loza>!V=mnV#qhz#b& zvb2<-q~D@=%0rdh@t1j6NncTF{FoR2ITu4{A&cgMo4YwYaHM0f5;9RD=0z zNL;7VM5t8pe7Y$qn#t4L;56^SWeK9Rz#`ey^Fv)fhfEl}8{7o(lvzcinHv|wiNPRR zJc*Q<0|CE56%mIk2VF|D+iT=YCsE_tD(I=M5g=8_WC%|#1z72!3YW?+z1v2V|ih0Hk~f#CvX74!M98sf`D;eYrVT8IBI0)T!U zUWtKMGJf4%ujzUv242bdb$9*W=(2tBxI-$zFCaa5m_e=!-v&S)7)#N4+tPRx{B)h%8Tw idyAG{XKC%)6J-OrX4z%);#m^l1c`(a!G6ERtNsBnd0T@3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_front_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..19114daf4f5c489daef9e588fd38598be3d25bce GIT binary patch literal 4911 zcmeHLX;c$u7app}DsF{}U>hU0#X8Ak17;*eAOV6T1f)e=&|xx!QL>N(5>P3MBG@Wo z6BrEP;T>1k5Jp)tk&IYr_6KuTX+n%HxXrn)@Oue3kec4^z0l*Zb_TLTW~ z!jn3YlLJZPE`FEl?7L<6UOP?L5t|G5*;K%^rfbz3KMIrcjJMmj&}i9Rhn9y6Bd5#P z7am$v6xZBpGx|uiz5G$hwkJ0`F5BP#I;X5)>WxFUQXCQ{81FxfUZ0|B`>oW@nreP8 zF@(IbxSVdpeC&e89SG!~+r06!s;{Bsg=b3Xj*=Nwms%3K8@IL1uzM>=cgbzXo9;AL zYsgMF_lmLBM{~+&k33-;y~EPrxKFdB6IJHbIC|JGaL)ZfUEl8)C-ceKj{Uk~M)J>f z=jQru{Y-4(oPO;zZb`eAooJM&W$RXqinR3gsfqt$arBj@x?htQ%_k=RGIAf%`~Hy= z^#|`cjHQ2ecS?ri$P(3$9FNd9vl=sZt_;nXTC+RH(YkrrH&S;A58BW$(dC9<`{6Ef zY5kX$W24gpimD&J@xj{k(Rbd%Y9^hDKJjO})jKC18MPNWR*jibi#Sxe@+xiFuZWO;74J{T(w_-J3l{T|MqdGsn zG$1LFRn9~!xVq>A-yeVL!IXEmO}gzbxH%BeNL9pj9xd^){Xx<^^Os3Azvt>VlxQpW zkavpv%C4c0_vbc^cp_LX3H+UE34ZJxn|FH!9NP2A!n5zLX}|i%L##q5IA3N=<7 zrfv|rZCq{b{84<7ytI~i)AF$Ipu$rEJ>{r(l?`mckUvE!`*sO8q_rzLx+-=xEUW5vKzfR2 zXBdN0^ZdSoju&3^>`wc8e$ld@?(RF9ec6iUzYx9-S*@*#%PGC;-G05Ly{%H7_v8sQ zjiJd*UfWs%2JA!%4AQyc5R6bM7`RLoLoy5sH5jxI^EzMgai^akP0Yebrj!%!%>C_mLsn_cn zdJaRSkuzB+iZT&4lg);K1*}b0>Tm*I!dLanK1DfRichhrvp9h zS$+z&So|DbsU2bg@WC|TY9@<;Fck{sa1X6cm;^wE68cvUZ3Or}Vuq7iRicIg z(wNH`o(OP%j{B1Jv)awZz)CE}1S%rYl%7byr<>wqG8I9|F!Loza>!V=mnV#qhz#b& zvb2<-q~D@=%0rdh@t1j6NncTF{FoR2ITu4{A&cgMo4YwYaHM0f5;9RD=0z zNL;7VM5t8pe7Y$qn#t4L;56^SWeK9Rz#`ey^Fv)fhfEl}8{7o(lvzcinHv|wiNPRR zJc*Q<0|CE56%mIk2VF|D+iT=YCsE_tD(I=M5g=8_WC%|#1z72!3YW?+z1v2V|ih0Hk~f#CvX74!M98sf`D;eYrVT8IBI0)T!U zUWtKMGJf4%ujzUv242bdb$9*W=(2tBxI-$zFCaa5m_e=!-v&S)7)#N4+tPRx{B)h%8Tw idyAG{XKC%)6J-OrX4z%);#m^l1c`(a!G6ERtNsBnd0T@3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side.png new file mode 100644 index 0000000000000000000000000000000000000000..c4d67c201a70d51fe51bc741b9dad601b63afb8d GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggK4iP>k)e86HmO!B~Zqs#3xhI`{fLc41nO@|NrvqENv}kYMeEGey&xT$(&)?&mSKjSC~deMIGX;{Psdn z`3`rB$)h0mLWMr5hA9*7?WsI`006IH18)bYB%~y73_+ gVOP&e2WCNrw>PXArQd892D*m9)78&qol`;+0JiE?A^-pY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side_active.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side_active.png new file mode 100644 index 0000000000000000000000000000000000000000..6eb0165c340ac07f58c25adf7f776cb7902f77fb GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggK4iP>k<%uduJV2o)PZ!4!i_^(}{{OdUR&D5PbUMJ4 z>~Zqs#3xhI`{fLc41nO@|NrvqENv}kYMeEGey&xT$(&)?&mSKjSC~deMIGX;{Psdn z`3`rB$)h0mLWMr5hA9*7?WsI`006IH18)bYB%~y73_+ gVOP&e2WCNrw>PXArQd892D*m9)78&qol`;+09M#kga7~l literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side_active_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..19114daf4f5c489daef9e588fd38598be3d25bce GIT binary patch literal 4911 zcmeHLX;c$u7app}DsF{}U>hU0#X8Ak17;*eAOV6T1f)e=&|xx!QL>N(5>P3MBG@Wo z6BrEP;T>1k5Jp)tk&IYr_6KuTX+n%HxXrn)@Oue3kec4^z0l*Zb_TLTW~ z!jn3YlLJZPE`FEl?7L<6UOP?L5t|G5*;K%^rfbz3KMIrcjJMmj&}i9Rhn9y6Bd5#P z7am$v6xZBpGx|uiz5G$hwkJ0`F5BP#I;X5)>WxFUQXCQ{81FxfUZ0|B`>oW@nreP8 zF@(IbxSVdpeC&e89SG!~+r06!s;{Bsg=b3Xj*=Nwms%3K8@IL1uzM>=cgbzXo9;AL zYsgMF_lmLBM{~+&k33-;y~EPrxKFdB6IJHbIC|JGaL)ZfUEl8)C-ceKj{Uk~M)J>f z=jQru{Y-4(oPO;zZb`eAooJM&W$RXqinR3gsfqt$arBj@x?htQ%_k=RGIAf%`~Hy= z^#|`cjHQ2ecS?ri$P(3$9FNd9vl=sZt_;nXTC+RH(YkrrH&S;A58BW$(dC9<`{6Ef zY5kX$W24gpimD&J@xj{k(Rbd%Y9^hDKJjO})jKC18MPNWR*jibi#Sxe@+xiFuZWO;74J{T(w_-J3l{T|MqdGsn zG$1LFRn9~!xVq>A-yeVL!IXEmO}gzbxH%BeNL9pj9xd^){Xx<^^Os3Azvt>VlxQpW zkavpv%C4c0_vbc^cp_LX3H+UE34ZJxn|FH!9NP2A!n5zLX}|i%L##q5IA3N=<7 zrfv|rZCq{b{84<7ytI~i)AF$Ipu$rEJ>{r(l?`mckUvE!`*sO8q_rzLx+-=xEUW5vKzfR2 zXBdN0^ZdSoju&3^>`wc8e$ld@?(RF9ec6iUzYx9-S*@*#%PGC;-G05Ly{%H7_v8sQ zjiJd*UfWs%2JA!%4AQyc5R6bM7`RLoLoy5sH5jxI^EzMgai^akP0Yebrj!%!%>C_mLsn_cn zdJaRSkuzB+iZT&4lg);K1*}b0>Tm*I!dLanK1DfRichhrvp9h zS$+z&So|DbsU2bg@WC|TY9@<;Fck{sa1X6cm;^wE68cvUZ3Or}Vuq7iRicIg z(wNH`o(OP%j{B1Jv)awZz)CE}1S%rYl%7byr<>wqG8I9|F!Loza>!V=mnV#qhz#b& zvb2<-q~D@=%0rdh@t1j6NncTF{FoR2ITu4{A&cgMo4YwYaHM0f5;9RD=0z zNL;7VM5t8pe7Y$qn#t4L;56^SWeK9Rz#`ey^Fv)fhfEl}8{7o(lvzcinHv|wiNPRR zJc*Q<0|CE56%mIk2VF|D+iT=YCsE_tD(I=M5g=8_WC%|#1z72!3YW?+z1v2V|ih0Hk~f#CvX74!M98sf`D;eYrVT8IBI0)T!U zUWtKMGJf4%ujzUv242bdb$9*W=(2tBxI-$zFCaa5m_e=!-v&S)7)#N4+tPRx{B)h%8Tw idyAG{XKC%)6J-OrX4z%);#m^l1c`(a!G6ERtNsBnd0T@3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_side_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..19114daf4f5c489daef9e588fd38598be3d25bce GIT binary patch literal 4911 zcmeHLX;c$u7app}DsF{}U>hU0#X8Ak17;*eAOV6T1f)e=&|xx!QL>N(5>P3MBG@Wo z6BrEP;T>1k5Jp)tk&IYr_6KuTX+n%HxXrn)@Oue3kec4^z0l*Zb_TLTW~ z!jn3YlLJZPE`FEl?7L<6UOP?L5t|G5*;K%^rfbz3KMIrcjJMmj&}i9Rhn9y6Bd5#P z7am$v6xZBpGx|uiz5G$hwkJ0`F5BP#I;X5)>WxFUQXCQ{81FxfUZ0|B`>oW@nreP8 zF@(IbxSVdpeC&e89SG!~+r06!s;{Bsg=b3Xj*=Nwms%3K8@IL1uzM>=cgbzXo9;AL zYsgMF_lmLBM{~+&k33-;y~EPrxKFdB6IJHbIC|JGaL)ZfUEl8)C-ceKj{Uk~M)J>f z=jQru{Y-4(oPO;zZb`eAooJM&W$RXqinR3gsfqt$arBj@x?htQ%_k=RGIAf%`~Hy= z^#|`cjHQ2ecS?ri$P(3$9FNd9vl=sZt_;nXTC+RH(YkrrH&S;A58BW$(dC9<`{6Ef zY5kX$W24gpimD&J@xj{k(Rbd%Y9^hDKJjO})jKC18MPNWR*jibi#Sxe@+xiFuZWO;74J{T(w_-J3l{T|MqdGsn zG$1LFRn9~!xVq>A-yeVL!IXEmO}gzbxH%BeNL9pj9xd^){Xx<^^Os3Azvt>VlxQpW zkavpv%C4c0_vbc^cp_LX3H+UE34ZJxn|FH!9NP2A!n5zLX}|i%L##q5IA3N=<7 zrfv|rZCq{b{84<7ytI~i)AF$Ipu$rEJ>{r(l?`mckUvE!`*sO8q_rzLx+-=xEUW5vKzfR2 zXBdN0^ZdSoju&3^>`wc8e$ld@?(RF9ec6iUzYx9-S*@*#%PGC;-G05Ly{%H7_v8sQ zjiJd*UfWs%2JA!%4AQyc5R6bM7`RLoLoy5sH5jxI^EzMgai^akP0Yebrj!%!%>C_mLsn_cn zdJaRSkuzB+iZT&4lg);K1*}b0>Tm*I!dLanK1DfRichhrvp9h zS$+z&So|DbsU2bg@WC|TY9@<;Fck{sa1X6cm;^wE68cvUZ3Or}Vuq7iRicIg z(wNH`o(OP%j{B1Jv)awZz)CE}1S%rYl%7byr<>wqG8I9|F!Loza>!V=mnV#qhz#b& zvb2<-q~D@=%0rdh@t1j6NncTF{FoR2ITu4{A&cgMo4YwYaHM0f5;9RD=0z zNL;7VM5t8pe7Y$qn#t4L;56^SWeK9Rz#`ey^Fv)fhfEl}8{7o(lvzcinHv|wiNPRR zJc*Q<0|CE56%mIk2VF|D+iT=YCsE_tD(I=M5g=8_WC%|#1z72!3YW?+z1v2V|ih0Hk~f#CvX74!M98sf`D;eYrVT8IBI0)T!U zUWtKMGJf4%ujzUv242bdb$9*W=(2tBxI-$zFCaa5m_e=!-v&S)7)#N4+tPRx{B)h%8Tw idyAG{XKC%)6J-OrX4z%);#m^l1c`(a!G6ERtNsBnd0T@3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top.png new file mode 100644 index 0000000000000000000000000000000000000000..a00ea6ee4e8cb04112329e8e2774e2efc91dfcfe GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggK4iR2!;obI$&Oo6(o-U3d7N_?HJMy(C@XX1pVePD8 zvib7hZu-vyzc~41I_eYr1p-}!gsZcH(q>3%9F_REtga%`Icr+#$)Inw{<@tWrFu#w zfd|ecq~+XZlV@T$5H!LljuX`OOmdKI;Vst06i0IxBvhE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_active.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_active.png new file mode 100644 index 0000000000000000000000000000000000000000..8cace5651b8cc557e7f85ca3069ae0acad4141e3 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggK4iR2!^;z9hzX65Ldb&7?~_IElvh0R}GSSWKSM#-72+j1b_@rt#Geg{Y_d8B2ycWzn!r=EQfwN3W zW2)C@28OKI`hyb+x0by;y^SfEr^oQc@48#oK?1hPx3_&Zv*Vh?5p>W`<=cVI1uIs) z*mUid`pg$=mYNp)Fo<@!DQ9hbc_Py->1FY(OM~hj^2-YSNtL=Ev?#*G@ZYVOK#wta My85}Sb4q9e01V}OkpKVy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_active_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..48b5a3c360c4caf9622525622e64853b9695c6a6 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-o|Ns9p{AZ|XXaNco{)%`HQdbh>7Yq`2&|3Kg$mcBZh%9Dc;1&d7 z#`=`_i9kU$PZ!4!jo{=2H|8Up1_lOAH+_5z7~M=5-AWiGBor786jTnJ;bEwYV7eiF S_v0&|4hBzGKbLh*2~7ad)i6c? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock/spent_fuel_pool/overlay_top_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..4f2753163585861aabbaea164cfab431058afb47 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-onueDDKmg=2FiZ{T2?J6rB|(0{ATbB6m0y5-&H|6fVg?3oK@euF zPl=xh6jb+gaSYK2PEK%RUczb6V3ERQU}UtA(*T6H4=_kFB{+CA%#>s(e$KR$=hZKu P4h9BKS3j3^P6NS%G}%0G|+7cXxMVW8?ooaDzcoR<@?0rJb3jsy!PdY{fW=W}Mc@U2np+0JPwn?eeg0%t#$jYHW6dUT TYgLsc&{zgfS3j3^P6My0`@x*DCKV1q!-(x;Tbd_$N!GJ+SAwlkkII)QQoQSNFf8 z#3@#0HH}^dbIFA~j~G@ls${V-iZDx Date: Wed, 7 Aug 2024 18:52:34 -0500 Subject: [PATCH 2/8] fix: spipple --- .../java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java index cd88864369a..9754a26f0fe 100644 --- a/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java @@ -2,7 +2,6 @@ import gregtech.api.GTValues; import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; -import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.logic.OCParams; import gregtech.api.recipes.logic.OCResult; import gregtech.api.recipes.recipeproperties.IRecipePropertyStorage; From 49a8bb0e63ae975728f15e6606882dd6bb1a306c Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:25:57 -0500 Subject: [PATCH 3/8] feat: en_us.lang and some of the JSONs I forgot --- .../gregtech/blockstates/fission_casing.json | 41 +++++++ .../blockstates/gas_centrifuge_casing.json | 21 ++++ .../gregtech/blockstates/nuclear_casing.json | 41 +++++++ .../gregtech/blockstates/panelling.json | 109 ++++++++++++++++++ .../resources/assets/gregtech/lang/en_us.lang | 41 +++++++ .../gregtech/models/block/gas_centrifuge.json | 19 +++ .../blocks/panelling/panelling_black.png | Bin 0 -> 4725 bytes .../panelling/panelling_black.png.mcmeta | 9 ++ .../blocks/panelling/panelling_blue.png | Bin 0 -> 5010 bytes .../panelling/panelling_blue.png.mcmeta | 9 ++ .../blocks/panelling/panelling_brown.png | Bin 0 -> 4324 bytes .../panelling/panelling_brown.png.mcmeta | 9 ++ .../blocks/panelling/panelling_cyan.png | Bin 0 -> 4773 bytes .../panelling/panelling_cyan.png.mcmeta | 9 ++ .../blocks/panelling/panelling_gray.png | Bin 0 -> 4725 bytes .../panelling/panelling_gray.png.mcmeta | 9 ++ .../blocks/panelling/panelling_green.png | Bin 0 -> 4715 bytes .../panelling/panelling_green.png.mcmeta | 9 ++ .../blocks/panelling/panelling_light_blue.png | Bin 0 -> 4955 bytes .../panelling/panelling_light_blue.png.mcmeta | 9 ++ .../blocks/panelling/panelling_light_gray.png | Bin 0 -> 4717 bytes .../panelling/panelling_light_gray.png.mcmeta | 9 ++ .../blocks/panelling/panelling_lime.png | Bin 0 -> 4981 bytes .../panelling/panelling_lime.png.mcmeta | 9 ++ .../blocks/panelling/panelling_magenta.png | Bin 0 -> 5014 bytes .../panelling/panelling_magenta.png.mcmeta | 9 ++ .../blocks/panelling/panelling_orange.png | Bin 0 -> 5000 bytes .../panelling/panelling_orange.png.mcmeta | 9 ++ .../blocks/panelling/panelling_pink.png | Bin 0 -> 5024 bytes .../panelling/panelling_pink.png.mcmeta | 9 ++ .../blocks/panelling/panelling_purple.png | Bin 0 -> 3550 bytes .../panelling/panelling_purple.png.mcmeta | 9 ++ .../blocks/panelling/panelling_red.png | Bin 0 -> 4935 bytes .../blocks/panelling/panelling_red.png.mcmeta | 9 ++ .../blocks/panelling/panelling_white.png | Bin 0 -> 4729 bytes .../panelling/panelling_white.png.mcmeta | 9 ++ .../blocks/panelling/panelling_yellow.png | Bin 0 -> 4891 bytes .../panelling/panelling_yellow.png.mcmeta | 9 ++ 38 files changed, 416 insertions(+) create mode 100644 src/main/resources/assets/gregtech/blockstates/fission_casing.json create mode 100644 src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json create mode 100644 src/main/resources/assets/gregtech/blockstates/nuclear_casing.json create mode 100644 src/main/resources/assets/gregtech/blockstates/panelling.json create mode 100644 src/main/resources/assets/gregtech/models/block/gas_centrifuge.json create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_black.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_black.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_blue.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_blue.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_brown.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_brown.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_cyan.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_cyan.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_gray.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_gray.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_green.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_green.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_blue.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_blue.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_gray.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_gray.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_lime.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_lime.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_magenta.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_magenta.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_orange.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_orange.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_pink.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_pink.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_purple.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_purple.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_red.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_red.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_white.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_white.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_yellow.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_yellow.png.mcmeta diff --git a/src/main/resources/assets/gregtech/blockstates/fission_casing.json b/src/main/resources/assets/gregtech/blockstates/fission_casing.json new file mode 100644 index 00000000000..13f608d2f10 --- /dev/null +++ b/src/main/resources/assets/gregtech/blockstates/fission_casing.json @@ -0,0 +1,41 @@ +{ + "forge_marker" : 1, + "defaults": { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/casings/solid/machine_casing_solid_steel" + } + }, + "variants" : { + "variant=reactor_vessel" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/casings/fission/reactor_vessel" + } + }, + "variant=fuel_channel" : { + "model" : "minecraft:cube_bottom_top", + "textures" : { + "top" : "gregtech:blocks/casings/fission/fuel_channel_top", + "bottom" : "gregtech:blocks/casings/fission/fuel_channel_top", + "side" : "gregtech:blocks/casings/fission/fuel_channel_side" + } + }, + "variant=control_rod_channel" : { + "model" : "minecraft:cube_bottom_top", + "textures" : { + "top" : "gregtech:blocks/casings/fission/control_rod_channel_top", + "bottom" : "gregtech:blocks/casings/fission/control_rod_channel_top", + "side" : "gregtech:blocks/casings/fission/fuel_channel_side" + } + }, + "variant=coolant_channel" : { + "model" : "minecraft:cube_bottom_top", + "textures" : { + "top" : "gregtech:blocks/casings/fission/coolant_channel_top", + "bottom" : "gregtech:blocks/casings/fission/coolant_channel_top", + "side" : "gregtech:blocks/casings/fission/fuel_channel_side" + } + } + } +} diff --git a/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json b/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json new file mode 100644 index 00000000000..67f4dd5d3b1 --- /dev/null +++ b/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json @@ -0,0 +1,21 @@ +{ + "forge_marker" : 1, + "defaults": { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/casings/solid/machine_casing_solid_steel" + } + }, + "variants" : { + "variant" : { + "gas_centrifuge_column" : { + "model" : "gregtech:gas_centrifuge", + "textures" : { + "0" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side", + "1" : "gregtech:blocks/casings/nuclear/gas_centrifuge_end", + "particle" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side" + } + } + } + } +} diff --git a/src/main/resources/assets/gregtech/blockstates/nuclear_casing.json b/src/main/resources/assets/gregtech/blockstates/nuclear_casing.json new file mode 100644 index 00000000000..c894ad1856d --- /dev/null +++ b/src/main/resources/assets/gregtech/blockstates/nuclear_casing.json @@ -0,0 +1,41 @@ +{ + "forge_marker" : 1, + "variants" : { + "active=false,variant=spent_fuel_casing" : { + "model": "minecraft:cube_column", + "textures": { + "end": "gregtech:blocks/casings/nuclear/spent_fuel_casing_empty_top", + "side": "gregtech:blocks/casings/nuclear/spent_fuel_casing_empty_side" + } + }, + "active=true,variant=spent_fuel_casing" : { + "model" : "gregtech:cube_2_layer_bottom_top", + "textures" : { + "bot_side" : "gregtech:blocks/casings/nuclear/spent_fuel_casing_side", + "bot_bottom" : "gregtech:blocks/casings/nuclear/spent_fuel_casing_top", + "bot_top" : "gregtech:blocks/casings/nuclear/spent_fuel_casing_top", + "top_side" : "gregtech:blocks/casings/nuclear/spent_fuel_casing_side_bloom", + "top_bottom" : "gregtech:blocks/casings/nuclear/spent_fuel_casing_top_bloom", + "top_top" : "gregtech:blocks/casings/nuclear/spent_fuel_casing_top_bloom" + } + }, + "active=false,variant=gas_centrifuge_heater" : { + "model" : "minecraft:cube_column", + "textures" : { + "end" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_top", + "side" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_side" + } + }, + "active=true,variant=gas_centrifuge_heater" : { + "model" : "gregtech:cube_2_layer_bottom_top", + "textures" : { + "bot_side" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_side", + "bot_bottom" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_top", + "bot_top" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_top", + "top_side" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_side_bloom", + "top_bottom" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_top_bloom", + "top_top" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_top_bloom" + } + } + } +} diff --git a/src/main/resources/assets/gregtech/blockstates/panelling.json b/src/main/resources/assets/gregtech/blockstates/panelling.json new file mode 100644 index 00000000000..e9e2170f7d7 --- /dev/null +++ b/src/main/resources/assets/gregtech/blockstates/panelling.json @@ -0,0 +1,109 @@ +{ + "forge_marker" : 1, + "defaults": { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_white" + } + }, + "variants" : { + "variant" : { + "white" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_white" + } + }, + "orange" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_orange" + } + }, + "magenta" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_magenta" + } + }, + "light_blue" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_light_blue" + } + }, + "yellow" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_yellow" + } + }, + "lime" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_lime" + } + }, + "pink" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_pink" + } + }, + "gray" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_gray" + } + }, + "light_gray" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_light_gray" + } + }, + "cyan" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_cyan" + } + }, + "purple" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_purple" + } + }, + "blue" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_blue" + } + }, + "brown" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_brown" + } + }, + "green" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_green" + } + }, + "red" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_red" + } + }, + "black" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/panelling/panelling_black" + } + } + } + } +} diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 55d74be23f2..dac4a928999 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -150,6 +150,10 @@ gregtech.multiblock.primitive_water_pump.extra1=Biome Coefficient:/n Ocean, Riv gregtech.multiblock.primitive_water_pump.extra2=Hatch Multipliers:/n Pump Hatch: 1x/n ULV Output Hatch: 2x/n LV Output Hatch: 4x/n/nWhile raining in the Pump's Biome, the total water production will be increased by 50%%. gregtech.multiblock.processing_array.description=The Processing Array combines up to 16 single block machine(s) in a single multiblock, effectively easing automation. gregtech.multiblock.advanced_processing_array.description=The Processing Array combines up to 64 single block machine(s) in a single multiblock, effectively easing automation. +gregtech.multiblock.fission_reactor.description=Fission Reactors use fuel rods placed together to create a sustained chain of fission reactions. These reactions generate heat (power) that may be soaked up by coolants, which can then be used inside turbines. For example, using distilled water as a coolant, each channel soaks up about 2 EU/t of heat per degree Kelvin and block of internal reactor depth. The reactor can take on a variety of shapes. Its cross sections can be seen in JEI, and the reactor may extend 7 blocks up and down from the controller. Reactors can import and export fuel rods/coolants through special pairs of hatches on the top and bottom layers, respectively. Control rod hatches may also be placed on the top layer, and they give the user more control over the reactor. Inserting them more decreases the neutron multiplication rate "effective K" (shown as k_eff), a factor by which the power is continually multiplied by until it reaches the approximate max power. If k_eff is over 1, the reactor's power will eventually increase; if it's below 1, it will eventually decrease; and if it's around 1, it will stay stable. In fact, the reactor automatically shifts this over time, attempting to reach a stable equilibrium. This may be overridden manually, which you may want to do if the k_eff is over 1.05 to avoid it spiralling out of control and melting down. K_eff is also affected by neutron poisons inside the reactor, which will increase in concentration over time as the reactor runs (and still remain in a fairly high concentration for a while after). The rate at which k_eff "acts" is dependent on the mean generation time, which is how long it takes for the next generation of neutrons to be produced. This depends on the fuel rod (and can be seen in their tooltips), and it is mostly affected by delayed neutrons produced from decaying fission products. The power may then be modeled using an exponential function with a time constant of the mean generation time divided by (k_eff - 1). Control rods, fuel hatches, and coolant hatches all require special tubing beneath them to form correctly; check their tooltips to see which blocks to use. Once a reactor's hatches are filled, the reactor can be locked to begin operation, meaning that the types of items/fluids in the hatches can not be changed while the reactor operates. The placement of the fuel rods and coolant channels within the reactor is quite important. Neutrons produced by decaying atoms in the fuel rods can cause fissions in other fuel rods; therefore, reactors work far more effectively with more than one fuel rod channel. The chance that a neutron interacts with a fuel rod is increased if it is slowed down by a moderator, such as distilled water inside a coolant channel. As such, it can be helpful to put coolant channels between fuel rods to increase k_eff (and control rods do much the opposite). Fuel rods also decay at a rate proportional to the power; a 600 MJ fuel rod will deplete after 600 seconds of 1 MW, or alternatively 1 second of 600 MW. Note: if this multiblock receives maintenance problems, the coolant systems will occasionally seize up and stop working. However, coolant channels only operate when the hot coolant fluid is actually hotter than the reactor itself, and they can also only altogether export as much heat as the max power. +gregtech.multiblock.gas_centrifuge.description=The Gas Centrifuge can help in the purification process of isotopes, especially those of uranium. By repeatedly putting uranium hexafluoride into a gas centrifuge, one can obtain highly enriched uranium hexafluoride, which has a purity high enough to make nuclear fuels. Each block of length makes it perform one more recipe in parallel. +gregtech.multiblock.heat_exchanger.description=The Heat Exchanger can be used to take heat out from one fluid by either radiating it out into its surrounding environment or by transferring it into another fluid. This can be used with hot coolant from fission reactors to help generate steam for steam turbines. +gregtech.multiblock.spent_fuel_pool.description=The Spent Fuel Pool takes hot depleted fuel rods fresh from a fission reactor and cools them down to be processed later. It only forms when full blocks of water are placed on top; what did you expect? Each block of length makes it perform 32 more recipes in parallel. item.invalid.name=Invalid item fluid.empty=Empty @@ -2351,6 +2355,9 @@ recipemap.rock_breaker.name=Rock Breaker recipemap.primitive_blast_furnace.name=Primitive Blast Furnace recipemap.coke_oven.name=Coke Oven recipemap.research_station.name=Research Station +recipemap.heat_exchanger.name=Heat Exchanger +recipemap.gas_centrifuge.name=Gas Centrifuge +recipemap.spent_fuel_pool.name=Spent Fuel Pool gregtech.recipe.category.arc_furnace_recycling=Arc Furnace Recycling gregtech.recipe.category.macerator_recycling=Macerator Recycling @@ -2601,6 +2608,23 @@ tile.studs.green.name=Green Studs tile.studs.red.name=Red Studs tile.studs.black.name=Black Studs +tile.panelling.white.name=White Panelling +tile.panelling.orange.name=Orange Panelling +tile.panelling.magenta.name=Magenta Panelling +tile.panelling.light_blue.name=Light Blue Panelling +tile.panelling.yellow.name=Yellow Panelling +tile.panelling.lime.name=Lime Panelling +tile.panelling.pink.name=Pink Panelling +tile.panelling.gray.name=Gray Panelling +tile.panelling.light_gray.name=Light Gray Panelling +tile.panelling.cyan.name=Cyan Panelling +tile.panelling.purple.name=Purple Panelling +tile.panelling.blue.name=Blue Panelling +tile.panelling.brown.name=Brown Panelling +tile.panelling.green.name=Green Panelling +tile.panelling.red.name=Red Panelling +tile.panelling.black.name=Black Panelling + # Lamps(ON) tile.gregtech_lamp.white.name=White Lamp tile.gregtech_lamp.orange.name=Orange Lamp @@ -2743,6 +2767,11 @@ tile.battery_block.tooltip_empty=For filling space in your Power Substation tile.long_distance_item_pipeline.name=Long Distance Item Pipe tile.long_distance_fluid_pipeline.name=Long Distance Fluid Pipe +# Nuclear Blocks +tile.nuclear_casing.spent_fuel_casing.name=Spent Fuel Casing +tile.nuclear_casing.gas_centrifuge_heater.name=Gas Centrifuge Heater +tile.gas_centrifuge_casing.gas_centrifuge_column.name=Gas Centrifuge Column + # Creative tabs itemGroup.gregtech.main=GregTech itemGroup.gregtech.machines=Machines (GT) @@ -4921,6 +4950,16 @@ metaitem.cover.digital.mode.fluid.enabled=Fluid Mode enabled gregtech.machine.monitor_screen.name=Monitor Screen +gregtech.machine.fission_reactor.name=Fission Reactor +gregtech.machine.fission_reactor.tooltip.1=Check preview for allowed shapes. +gregtech.machine.fission_reactor.tooltip.2=§cMay meltdown/explode if the temperature/pressure gets too high! +gregtech.machine.fission_reactor.tooltip.3=§cPlease read the JEI info page! It is very important! + + +gregtech.machine.heat_exchanger.name=Heat Exchanger +gregtech.machine.spent_fuel_pool.name=Spent Fuel Pool +gregtech.machine.gas_centrifuge.name=Gas Centrifuge + # Multiblock Tooltips gregtech.machine.primitive_water_pump.tooltip=Endervoir at Home @@ -4960,6 +4999,8 @@ gregtech.machine.fluid_drilling_rig.hv.tooltip=Does not perform Fracking gregtech.machine.fluid_drilling_rig.ev.tooltip=Well Drainer gregtech.machine.cleanroom.tooltip=Keeping those pesky particles out gregtech.machine.charcoal_pile.tooltip=Underground fuel bakery +gregtech.machine.fission_reactor.tooltip=Blowy-uppy yumyum generator +gregtech.machine.heat_exchanger.tooltip=Molecular hot potato player # Multiblock machine parts gregtech.machine.item_bus.import.tooltip=Item Input for Multiblocks diff --git a/src/main/resources/assets/gregtech/models/block/gas_centrifuge.json b/src/main/resources/assets/gregtech/models/block/gas_centrifuge.json new file mode 100644 index 00000000000..39d000cbd89 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/block/gas_centrifuge.json @@ -0,0 +1,19 @@ +{ + "parent": "block/block", + "credit": "Made with Blockbench", + "elements": [ + { + "from": [3, 0, 3], + "to": [13, 16, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 10, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_black.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_black.png new file mode 100644 index 0000000000000000000000000000000000000000..0ab0e5ca3b59dcd67f74abef5b2d83c5a5d6ad92 GIT binary patch literal 4725 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 WjvQ?MPchhABxz`rxFUE~_J09Ze{}x< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_blue.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_blue.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_blue.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_brown.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_brown.png new file mode 100644 index 0000000000000000000000000000000000000000..e960139fedfce6680de6acbba6a7dd4e73c65187 GIT binary patch literal 4324 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_gray.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_gray.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_gray.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_green.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_green.png new file mode 100644 index 0000000000000000000000000000000000000000..8024c38601dc783f1af5e8ae41ec0ff61edff88e GIT binary patch literal 4715 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 JzqNSze*wIkNOk}K literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_blue.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_blue.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_blue.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_gray.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..168556ba072d796a40c130a724d8be1283dc9eb7 GIT binary patch literal 4717 zcmeHKdsGuw8czWeo~u@*Dxxten$}4sLqd{~s6Y|}7>oquEjyW+gg{;-0YY4q`YI0< zt@tR5c74B)x<}|*l~zT-2Od}DfLg_NwW2K*tq*Di-J5_2r#)wn=WPEY=S=R*y}$4G zec$hX_d7F1is-pMp5r_z6pBxTOdJD7y5n-Ef`5zM{uB(S?Xd~g7%Z1=G8@%e9Z9$5 znMgWm)2b;H+YP<f=@(fVY22wg>n^ca@^8K4C@QUsoRDEN#BP{LVm6VujgD8&LkS6<;s$ zsK21|PwaNzJ|S#g+w@6rck)*``c`&j^0w`Ub296qm(z?#+wfB}=T&EY@2y^#R&a63 z<2nC6IsF>Ff!eg?#WgqDi`>1g4_vS9OZ13$U8kZ@-dmv!4_8Elhrh`NoV zGrm4extkFe8dNAC_C@=NO9UCCixrcaJrAK_O(mg8TQMi zTTbgN3pZ_e6p+^C{^%L&{E_ZUJwkhR#l?aGaY)^~gJCD4LuwK^!p>18mHX1qw4cHK zQrG>u{-*ue?e+58 zw{E;R=fP%O8_gu0%i^+NNMh6GAdFd_^bj+lMq|X%J__(8Vx(KG zCX~(2&CO-y2CbGJIip{a&OlM#qz`UP#5c*B-PB1{p<*3+*XFI}+5Q`WN|0rR^wFK(C<&y-T!&Ac$ zh6G~}SB(oGp-_!On3|*Jb1@PQ7IFqqMHnnr%z%>)DnQQC0v(``B->=rI2Rm(qoIlj5d&etZ)X%b%&G_76&d5F!}HBVY(YKuK|VqyWNr!7!v!1>r#mhcD!Ck-_X1quQE_ znaNNM&=F__%G0S8eY$g_n1j)|>7-*9fM5{Jhkh>@yDwq3qi4LyIE4K>O+uW20Zj(j z_0ECj1$rU7zZv#v=4d;A;;(Nn{zMOeddSH;={qFXkX-Miz&nA5s%uEDcT(V;z(dvb zf0N7e?dKF}0B=FL;A3fzz$F`eXi-&BbHx-ta5t-U*_r2H^f1X1Efk8^D9804rMzMc zn50=F=9Jc{yUR)o zJYGcglv|1qu%s_n{$+bsSAJBcyt<6hnq72YNoohw@Wbs=&ev_%^SDiSo3Q%Bb7?!G z5)&2#A{nb67k#-SY-YiON78L6??3RqnqHiL_L1s!8_^?~kuk&Po|q~5&|a$?GuB#; zH1pcK-cVb4z+sgBrhuR#bl{CMN=RSudVxWWsh-l)IDsK&(34Hk+mCN z?Qr+6oFmbetS%a}eecxK`;SHqmu^@PKQevhT|~0b=dz;mQ(4#fUm6NldKVJ;^-uCj z?c!Tm{1RDN;HDUA`Wj#9ci4St%HfQ&8Bt_UdEU4Mtb>JHTyB1}3Oz4!@vbdYT#70A zO*wAI2Z_pZ%c@mUvzO0Kv~(rD`th>~$(ELh*Tgm4$(2_t_Yo_nW)hX=j9rwvvS*(J zNG8Af&JdryA`UXk2>vj{pQje^G77}{;nP&PJDg) zV&R0QN$$B<6;h`3h)$Xi$e>OMuB?E=;+VU879D}fdZKH!CW;v)smbOJ@1AzzddG;h z1cPy@eZ!J<9S!>9XIBk>x+$M|yQ^pBx~FZsYXUpFUKSp|O!LT8jg=;4URk_(VvDVY VnUoaV1j>dIA&C}Oh5dEee*v(*(Zv7& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_gray.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_gray.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_light_gray.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_lime.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_lime.png new file mode 100644 index 0000000000000000000000000000000000000000..c32fd7306704782ab8eb14a90e6b7debf00aee5d GIT binary patch literal 4981 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 ZsOGxY!x5Q&d@x^-EFwly5%$mA{{l+eWh(#x literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_magenta.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_magenta.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_magenta.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_orange.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..716fa6a7f1e665002017b30c516cc3bdda0ab943 GIT binary patch literal 5000 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 F{1<96XHftE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_orange.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_orange.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_orange.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_pink.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_pink.png new file mode 100644 index 0000000000000000000000000000000000000000..c4f959b6a830a94ed95038c8a81aef760d6bd36f GIT binary patch literal 5024 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_pink.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_pink.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_pink.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_purple.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..8ef9ea56bdd0193109cf13b2308ec4c6de52da4d GIT binary patch literal 3550 zcmV<44I%Q0P)Px?m`OxIRCt`_TU(B0xecRS4Ft%45M&?OYj!w67LWl3>9X=6QKWo(2Xle$s(T)` zM7?O)761I(zY>4q&kq3j%h%rl1S0BU&VLsXU&u^e005l$LiYE}+gI!T0C4LDA_Cbz z1A&_t^#l;XcMk$UB5~s2_FQ~-$u(nML>y#d?)j(Q<0Lg@ta~-%AK(8e03rha{oii@ zfWQ9uM+Vd<;vxs71aNwAhY2lUDU#5{yjSlf5`hTat9O7C2Z=NwqDMFl z9-oVngo;1LjJkrGiQj+z+w^S7a|J=P@^$fM;^sx51d27$4AG!*N{mAFXtb#)PLCCs z@9tv+_ht@=@x%pc@y+qdn^st*1PUU$^gt0sUH~>2CI))7cqHak6fg1Qu?8~?j zz)g&0UO-(DwOZUC)k!e7XTGEFt@H) zm;Q{k)0wy|x=R~{r>7i?QvrB;+NuBqm2MjmKz>`Y(@(m+e#dh2GhTQGP=8h*E9pY1 zzJ}eR!VHT7>bC8z*5ZzroJnA}!Rcf(N%E_~b#H<_lkL`NA>~Sb8JG^>t6a3#?T}?v zc>u7fXr2#`4sY}AEtXY-LTkU=AUdlf+}9e8yYZ$M*=fPW#Bh!M|?dl|7{#VN{LY( z1IazfbBz)xbs5M#3Etd-DMzQkVQe?b6|XFP?KK^LZ_+^o4#Fyd@dOeaOS<(_-orU7 z*HTu|WgmCQQRfqe!8MOF@rnou_12Y$!;?%4Vc$i$y*9%LUm`OGBnQUGxkfi@Zp(T( zawY4Ya}v6DLZnNdi_FbW=I%I-)$^N58Z0sq2ST#lb9As$w6w&hwWc0>jlWCbcM(>xjq&p(n?SY zbS!@`#=YwFq$nNk{G`!h#-j?Rkks;@ocIS6?~LV(i^Rn(Vv^{E$QePe2}n@tHzQmI z5(AZB9UEummsT`EFkOBwfGEcqfH>vw0DQb0_ERNkJRvOmOrD zYT_*itht+;Ox3Ul;`nJwW4=?^ z8tMh?0O{VNup%H4>Y;G@^iRhlgUPt7VLB7{SNc7Zs{~ow5X&|n`(#)n(v&+*Pw`zC{!|Wtg z@4AvqX6-vmHoE$*?KFh1B`SQG3>6|uf-~8Uc}_?jDX5phScJ&kIgF&ZH*Ht;tnNIY z-)S-C1y__6!V{l^x%D7`q~%V8QdXmtJQ=e3Y;v*z%K>56ek_`8;;(G&Z8QnLfs#TV z4vFoxn@L*pE!h>4oST-J0v4_xldHTuPo&r4FxTdgPGS;i6qdQFsOJZum!Ylnj$gM%Eq4{i3Z+;{xPOkNWE54KFz>Q! zc1fWW-OX;W2zM9&EJdx(j@ty(VshlYSC^9uV+L3KXJsf{D=~VBasoA>Vg_O8DF-Bc z17)oM;rF!=V|WI3lKnA4%;3kqZ#P^PLXPFVH^3f%c6K_m;|!a-&PbhG;jNG5fK4c16Z5e{G5cBx5$RTEBE@7m$=mU6LqCb zIIw2blE1^Py{Yv0Y7iQb@rI9m0ngCP-~@+?Gzl`^?+S}fi!TgZwuw4GgQZgC_c+*A z&cJXQ!*e4?;ZS*|o|*pQ@*L#=epCh@rL<;#>hQcBAMv*V@k_GAOl%2MNwasBdR}#j zrEppMN@|wCRVK+56!SIKRbq7jCN_s7XS=ph%}LFpKe%_m_PN0DjH9h_RsvbbyH0e* z?^POiA|_C$<{sAfHJ05SrhXnysJfTw01&yQ-9tjU@LBz|q}kc`#5+!b#9Tk~JV^=g zF7wxfl9x4FQ-H*Hf;ft2{gR`$*!!7>Jq`dAf*+@-vk@^0b6-Be#RUgr@88SRSba4o zoeY(is5DZB&PAZI4`_>#wo#mQPA(I8NOifHH%iDlPll;+FVtLBnLO+&Pf(Ab-k~KSYO>SU>Q3$ zpq0Ejd`NWWI+a`F`Mx2QJRcszF=Q=z4b{=gkDyejh)=xbb5|*S4v4Ts7_<~CzVni% zVCapm$7l5vj0mkwS6^JI7wI0w15&VgPHVgr1%{E1Qm>ZSZF$d4r^OlK;N22F9C6kO z454(_L?%D3E4mY z#et_mC&$$YmI#h5sbl%dT9iyW3tGMso64s$w#qL7ad5V`ET2xl9&pe6-~qFB6ldys zQB?2V_?e%F{6rms2(xVcpLR5^h?MUe#900!;>RzNoq%#WOS;TC#zUuadBw^E>&~9V#hsChN{END$$AzKk0%ueFA{=TBp*sA>}R1lpPjv za1g^!4^d*dsaW>p)u7DRn0bZ|SnVHMP=}9%R4$mKklI$SF_`6wKimP6-^EU0KX+cZ z`CTQHIjSoJUz&XZ3gjhDUZ5i|fLl?qr{85so&p}#$qhaL!E#xGTG#z7GUa*C2Kh3a z;d!mO5@RsVwYtJYU)xYZum+^C6h@U|sbZ585XJE(TJd<46yBZTC!N`Kh$R|3bZ^0W zb9a*`hXC5klPlGr^oThqjbjRwqI*+<@1Don+?BzE#`d)47M+96FD=cj_2~C~{Fj`? zGkG|4%%YmG>Slako z_Pxo{9)dHndKDWUuv$y@y#(2f(6RbridNM77M0le=DJ4LoK>7Z>B(&ps;Uad5MR*m ztP~t^%6NMjzfVI%Xfd`lCO<=sx$jAq!Xnv z9s);aip`tk_MS7$(wxJN-${zepgAw^^75X!)%u>+BS3y$fVp8NUsjT^B_Nd|2vQmR zJ-kX#$zM@*%BE!OJ4Jq`fbAWql+Z=}8bA41)veC2cQP(5L4D#G-@UipV*$7*rcLE_})h+v)7D|olfVtR?n3p&mc1{BvA+so>A z@(C#>Hp`|fx8B>E0C}w?*7oTyOJdx`*(fusPA(4qY04%&3@;^`3nxtD=HWzVQ)_RL zdz^D+H?-G6*H5M;ez8XJzkqqEFi})j_UC#?nVrc)e=+76l`Kr(G={htqH{w$yW Y14T#o)60?o2><{907*qoM6N<$f;t1pOaK4? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_purple.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_purple.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_purple.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_red.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_red.png new file mode 100644 index 0000000000000000000000000000000000000000..52af19d4b4c94d55cab81c60aaa2c62471447a79 GIT binary patch literal 4935 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_red.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_red.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_red.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_white.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a9edf8421dce1785115c0755c32218d062515476 GIT binary patch literal 4729 zcmeHKdr(tX8V?UmM8K{BtqM!LSQXownYf`AVcMA;XSV;5g@U>sSsN|rYLYsNZHfalMhO&H&oyF#T>y3yGbO~+g^G0Xx-aZPs*vF9(yf_ zu&}I*^=y`GVvV+db3VKBM9_&L#}0-kwb>V7qkj$+4R1TxI6vj(6~Tt84#Vj2qe6y; zoH-E3NLlNSivJ6fH@5Wx7IC5ywWG~><(9Yi-~|2j@cCT3+v4!O8&dGyM8 z%y;t^L}d?&?+R$T>`}EUXLskM=KtxYr*PW!YfG;>11jt*?iDvnwvP?};H%1{P4}z9 z>`E47Z~bDUx4=4o{o1amoTsd=$DEUgyU)Ck+K+5GU0$w`HO|>T!;vhj&*VuTj#_zO zZ+_FACSAmW>R;A$>}xh{8O|9l(;hkZjWl;n#^fV^YyaUu{=FvNzbbc+U5DVZ3ldY| zg`{~G91}mqBzYeqg<*7>2|~GSQsKJGwwtr~j&&n;%C{Nxm7#ni`Nkvn8i4pzZ5j7qhZ% zvF=_O%BlOP<`^^k0b_Z}?%deAuwAjY9=V^7F4IQ5_uY_V>CWpl&n0DybLZ#%d#FSb zICJYiMGDQ~;~kh#Kc`8Mz6p7WsbY$Rx~4D}pTXEJaw+>}djYz8yvJO)EH z&1S}QO9+acOXQJ8IrQ-R28d1KawuJ-=BmvJL_V2lw-8!;a+=P*L?^|eX;Xt_HWUyT z2nu7{3Dn+<_gwKZo0=AYKDa-~NtuZu34~K%V>MW$0 zB27j%&57ljiYPe*0YCe7eg?Bz-A8Y<_NoB%Kx~*9;c>W#!GQFSuu{rmK+>Dg??zbD zz&=G%39G5dq9c^WgprErPl4|^t0$(|}4j~E%1Atn=th@nJ&Qhs0eG#+-d8EPY zivnT~KvJasjaUP6qdmTI`X>Uy`*;VSU)Syf1C&~gDonZ}Iz5#_4$AQ0nH~YR?vwwCy&b!^myoHK|wJ< zSd8vdK;Vl2wV(+W0;5cpG?S@74$%p)>Bv5}8f+&Vqc8c_@#M z3V1MAgmU}gO*pA9{af< z-)JK90s0*>Ag;#-4li&PB7KKpuV(bI^9R0q*WwSH0Zco|$~7q0TPg5X;KA-1 zl7S1<#c&`z6O`e6k zHqw`0vuQ65j7&Y z+y2w2qlT9s)@lE zyNGd%;yC`5CCtz74+~IEUlnVt_a2D(V)x_B#`zkyQ)xCq#4RJ@_eUJ^ zT==zi-BL)qM$;G*9DZ@fp*8A0=*_v0_Qs)s#=#vL=>C?HFSzKXp2T z6SdD)yD)xfeyFyoI{ovFJC{C*4P`!Wja+m&;hC^3y~CmZ>!Punyt>0*jk-5_F&x3z zbb9MZ5t0e*k~tiOmnF3mCa$}C`r6s$#}7Sy*zsz_c-HuJJ136x2aCo~DU%g-GZroT EFSzdXVgLXD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_white.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_white.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_white.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_yellow.png b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..36a6fbc8a6bcc8001a46bfd65de4d0c802a252e2 GIT binary patch literal 4891 zcmeHKc~BE+7H{N8Fwy%Br3JOjW1*d&lp+_xs-W zsyi<>Cfv<=h%*F1ZjlkPIB;iJFS-->H(D&ef!isIBFPkoWi#{!or+SE4AUGv$so;? z3WCfxHLj<+*q=R$vcQkT>ecDeR2yv01V zCd_yKl317FnC^l5qt3mG^;erc8(0@O!XeuN_q|)4IQ?n)&)(Qwzvy1eOJGJ-@iyPm zRF4`)4Z7mwXmPc^a6vXY-sk$Vsq~T=$505eTSA3|#72gMysrk-upy^N8c{Xg>vT%| zznKZayk#PyG-jY|xoFma{Mg}FocE$7)87u~QxVD2y&SJCTI{ntf##Vu!+W}8@H6}B z8z&>{LZdoT;?n!xKRJ8c-8*w{AGcp($$Ol2Mzne8fPgj2qSv+Ldsss0OiSIWl2dBq zly6o)^GIZD6N$F z^yq(?42qC469saPTpvQFQxO&e8E=VE;Fb(rOfbgeXXZV0fFGSf{aJqp9w z+1c!D9$RNfgAuV<40E_Jm&*bcEaM!l2{W^_MqevL7lw>9;s#1@qI6n@6%$kHGEGt@ z6X+T5^V8_%@(=J@V>b(c57><9VT8?rH5$05htU+81wgtJ`cn_10vu8}jx_2r4LBK^ zMQTmHJs}AEgTFr0pthAm;4rBsHNeyeq9UJ!43Ct@e(MWDM=om z#p4AEgaSTBs<>nih)D(tbS0+lnUxia08oKqfr=~Ufow=6kHr@V5f&yCidj4%q2h|f z1cvYt8x(<~VLF2b1KUYyurw0ZYtw8BE8%ExY^0RQWph4CV%3;Q1stTziIg_e{86Ex zG-SL9v$BZ@xrl%(6bB*#v6vUw708A+g)|sJCt5KP4x1;kxm&jd1;qejF>9X!0Gk}t zf`%AK%%n3YbUL+^X@y`|JwK@B;5ZSO36o(a5`c2Je3TM_3#I%IRUR zBPi9Jzp}O-9)_fA%OfZwh(E_B>N-*JnovPi;~C&21b z;pvz*jRe!9yItSQsXu826{b`PlqA9;MM@QmkMM*nOoU)8k&wqF5dlxh#f6`u8+9sE zHfA7$(*TcvE6|=ct{9_i8|DA0b#^*w-334xiz8(HkubQsVAwh{-d8Mv|GIx|~0LPLW#h7L*M>mgcW-`Wbv^IVq#VWzazI6m)G-^-FN?t&f;$gdmsx*2@lB zzhMv%(oB)^P}(EffL^ZteRf25Kv1umNLjEVsj46`QhR&6>zIB+?x~*Cx%~RXs|~(% zC%AC&nnH1@r*>~Sgg?;cH^wE%>sD>L_oB66yhG`!cfC4;W~Lk(`Vu;lN7sAhw`Tdy z>*&|g?k2mC_gzim$^^T{%at_EzVe2S9|X|Tr?g?&PCWbe`SxwD@r!)hqGi5cX;H`Dr}><_wb6JfCV71Q*`svHqOzMKSD#mTT58r*)qNd=_kRxUuIU~Uvhex4~HvtrgdD8oaqSUpQxf~LC8-qO_P0&!q( z`kr`GzuyX^*?3Xq@Ts2a$8qi@yPWKAuUr?mBz;Q0@2NbAdw}?AAw{@5H~1C4bXG_! z`-E>gv<#Zro>I=-HOB7x=vj)>}q`X>68QK3QmN3~Ss zlx&?>IgB?q*XubZ&fs3 z?4P@J{H!elQZ@w4`AK@d@18N59s9f|{7~z>Ct&r`dOlH~*Algdx!G&6A1~D_sAX|u zv|qyQJ`>`m98aGX#k^=A@OI7HT)~-rr5TP9G?y{SBPK~7)2A%h?596nbl%nPytwwl znvB`S+YdA+-%#$nkvkG^z@QgFdUY09q{n?|bl+Jm>-0dnaO*(!5 z;_J5ddk$9{cV}gK9R2E_jra&ezVOV(=dWTrXagN?-o4x=SqGXNiVTgBl}$)p^glqJ BBYgk> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_yellow.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_yellow.png.mcmeta new file mode 100644 index 00000000000..9be26b2b4a4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/panelling/panelling_yellow.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "pattern", + "extra": { + "size": 2 + } + } +} From fc6b9e217f44d002e40784df98689c21d41fd593 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:34:41 -0500 Subject: [PATCH 4/8] feat: transfer changes for CommonProxy --- src/main/java/gregtech/common/CommonProxy.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/gregtech/common/CommonProxy.java b/src/main/java/gregtech/common/CommonProxy.java index 6817aaa7ce5..5b973d98917 100644 --- a/src/main/java/gregtech/common/CommonProxy.java +++ b/src/main/java/gregtech/common/CommonProxy.java @@ -136,6 +136,8 @@ public static void registerBlocks(RegistryEvent.Register event) { registry.register(CLEANROOM_CASING); registry.register(COMPUTER_CASING); registry.register(BATTERY_BLOCK); + registry.register(NUCLEAR_CASING); + registry.register(GAS_CENTRIFUGE_CASING); registry.register(FOAM); registry.register(REINFORCED_FOAM); registry.register(PETRIFIED_FOAM); @@ -174,6 +176,7 @@ public static void registerBlocks(RegistryEvent.Register event) { registry.register(METAL_SHEET); registry.register(LARGE_METAL_SHEET); registry.register(STUDS); + registry.register(PANELLING); for (BlockLamp block : LAMPS.values()) registry.register(block); for (BlockLamp block : BORDERLESS_LAMPS.values()) registry.register(block); @@ -278,6 +281,9 @@ public static void registerItems(RegistryEvent.Register event) { registry.register(createItemBlock(block, LampItemBlock::new)); } registry.register(createItemBlock(ASPHALT, VariantItemBlock::new)); + registry.register(createItemBlock(NUCLEAR_CASING, VariantItemBlock::new)); + registry.register(createItemBlock(GAS_CENTRIFUGE_CASING, VariantItemBlock::new)); + registry.register(createItemBlock(PANELLING, VariantItemBlock::new)); for (StoneVariantBlock block : STONE_BLOCKS.values()) { registry.register(createItemBlock(block, VariantItemBlock::new)); } From 24c4f13a9cbbff8e75aeffe938316fbaf0dcc150 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:44:40 -0500 Subject: [PATCH 5/8] feat: other review comments except for the casing merge one --- .../gregtech/common/metatileentities/MetaTileEntities.java | 2 +- .../multi/electric/MetaTileEntityGasCentrifuge.java | 7 +++++-- .../multi/{ => electric}/MetaTileEntitySpentFuelPool.java | 5 +++-- src/main/resources/assets/gregtech/lang/en_us.lang | 4 ++++ 4 files changed, 13 insertions(+), 5 deletions(-) rename src/main/java/gregtech/common/metatileentities/multi/{ => electric}/MetaTileEntitySpentFuelPool.java (97%) diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java index 6dd0512c5bc..0fbe659d82b 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java @@ -47,7 +47,6 @@ import gregtech.common.metatileentities.multi.MetaTileEntityPrimitiveBlastFurnace; import gregtech.common.metatileentities.multi.MetaTileEntityPrimitiveWaterPump; import gregtech.common.metatileentities.multi.MetaTileEntityPumpHatch; -import gregtech.common.metatileentities.multi.MetaTileEntitySpentFuelPool; import gregtech.common.metatileentities.multi.MetaTileEntityTankValve; import gregtech.common.metatileentities.multi.electric.MetaTileEntityActiveTransformer; import gregtech.common.metatileentities.multi.electric.MetaTileEntityAssemblyLine; @@ -69,6 +68,7 @@ import gregtech.common.metatileentities.multi.electric.MetaTileEntityProcessingArray; import gregtech.common.metatileentities.multi.electric.MetaTileEntityPyrolyseOven; import gregtech.common.metatileentities.multi.electric.MetaTileEntityResearchStation; +import gregtech.common.metatileentities.multi.electric.MetaTileEntitySpentFuelPool; import gregtech.common.metatileentities.multi.electric.MetaTileEntityVacuumFreezer; import gregtech.common.metatileentities.multi.electric.centralmonitor.MetaTileEntityCentralMonitor; import gregtech.common.metatileentities.multi.electric.centralmonitor.MetaTileEntityMonitorScreen; diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java index 1860d82e00b..1b09bae933c 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java @@ -56,12 +56,15 @@ protected BlockPattern createStructurePattern() { @Override protected void formStructure(PatternMatchContext context) { super.formStructure(context); - this.recipeMapWorkable.setParallelLimit(structurePattern.formedRepetitionCount[0]); + if (structurePattern != null) { + this.recipeMapWorkable.setParallelLimit(structurePattern.formedRepetitionCount[0]); + } } public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); - tooltip.add(I18n.format("gregtech.universal.tooltip.parallel", "1 + number of added columns")); + tooltip.add(I18n.format("gregtech.universal.tooltip.parallel", + I18n.format("gregtech.gas_centrifuge.tooltip.parallel"))); } @Override diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntitySpentFuelPool.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntitySpentFuelPool.java similarity index 97% rename from src/main/java/gregtech/common/metatileentities/multi/MetaTileEntitySpentFuelPool.java rename to src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntitySpentFuelPool.java index 4ed1070b84b..1103e35b3e7 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntitySpentFuelPool.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntitySpentFuelPool.java @@ -1,4 +1,4 @@ -package gregtech.common.metatileentities.multi; +package gregtech.common.metatileentities.multi.electric; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -94,6 +94,7 @@ private IBlockState getMetalCasingState() { public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); - tooltip.add(I18n.format("gregtech.universal.tooltip.parallel", "32 per block of pool length")); + tooltip.add(I18n.format("gregtech.universal.tooltip.parallel", + I18n.format("gregtech.spent_fuel_pool.tooltip.parallel"))); } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index dac4a928999..9ba6c0decf8 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -5404,6 +5404,10 @@ gregtech.universal.tooltip.produces_fluid=§eProduces: §f%,d L/t gregtech.universal.tooltip.terrain_resist=This Machine will not explode when exposed to the Elements gregtech.universal.tooltip.requires_redstone=§4Requires Redstone power +# Nuclear supporting multiblock special tooltips +gregtech.spent_fuel_pool.tooltip.parallel=32 per block of pool length +gregtech.gas_centrifuge.tooltip.parallel=1 + number of added columns + gregtech.block.tooltip.no_mob_spawning=§bMobs cannot spawn on this block gregtech.recipe.total=Total: %,d EU From 8550660351911344b8b542d9f0f9e352e30b1b19 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:55:50 -0500 Subject: [PATCH 6/8] feat: merge casings --- .../java/gregtech/common/CommonProxy.java | 2 - .../blocks/BlockGasCentrifugeCasing.java | 49 ------------------- .../common/blocks/BlockNuclearCasing.java | 9 +++- .../gregtech/common/blocks/MetaBlocks.java | 4 -- .../electric/MetaTileEntityGasCentrifuge.java | 5 +- .../gregtech/blockstates/nuclear_casing.json | 16 ++++++ .../resources/assets/gregtech/lang/en_us.lang | 2 +- 7 files changed, 27 insertions(+), 60 deletions(-) delete mode 100644 src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java diff --git a/src/main/java/gregtech/common/CommonProxy.java b/src/main/java/gregtech/common/CommonProxy.java index 5b973d98917..e2acad2dee3 100644 --- a/src/main/java/gregtech/common/CommonProxy.java +++ b/src/main/java/gregtech/common/CommonProxy.java @@ -137,7 +137,6 @@ public static void registerBlocks(RegistryEvent.Register event) { registry.register(COMPUTER_CASING); registry.register(BATTERY_BLOCK); registry.register(NUCLEAR_CASING); - registry.register(GAS_CENTRIFUGE_CASING); registry.register(FOAM); registry.register(REINFORCED_FOAM); registry.register(PETRIFIED_FOAM); @@ -282,7 +281,6 @@ public static void registerItems(RegistryEvent.Register event) { } registry.register(createItemBlock(ASPHALT, VariantItemBlock::new)); registry.register(createItemBlock(NUCLEAR_CASING, VariantItemBlock::new)); - registry.register(createItemBlock(GAS_CENTRIFUGE_CASING, VariantItemBlock::new)); registry.register(createItemBlock(PANELLING, VariantItemBlock::new)); for (StoneVariantBlock block : STONE_BLOCKS.values()) { registry.register(createItemBlock(block, VariantItemBlock::new)); diff --git a/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java b/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java deleted file mode 100644 index de487915754..00000000000 --- a/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java +++ /dev/null @@ -1,49 +0,0 @@ -package gregtech.common.blocks; - -import gregtech.api.block.IStateHarvestLevel; -import gregtech.api.block.VariantBlock; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.IStringSerializable; - -public class BlockGasCentrifugeCasing extends VariantBlock { - - public BlockGasCentrifugeCasing() { - super(Material.IRON); - setTranslationKey("gas_centrifuge_casing"); - setHardness(5.0f); - setResistance(10.0f); - setSoundType(SoundType.METAL); - setDefaultState(getState(GasCentrifugeCasingType.GAS_CENTRIFUGE_COLUMN)); - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return state != getState(GasCentrifugeCasingType.GAS_CENTRIFUGE_COLUMN); - } - - public enum GasCentrifugeCasingType implements IStringSerializable, IStateHarvestLevel { - - GAS_CENTRIFUGE_COLUMN("gas_centrifuge_column", 2); - - private String name; - private int harvestLevel; - - GasCentrifugeCasingType(String name, int harvestLevel) { - this.name = name; - this.harvestLevel = harvestLevel; - } - - @Override - public String getName() { - return name; - } - - @Override - public int getHarvestLevel(IBlockState state) { - return harvestLevel; - } - } -} diff --git a/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java b/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java index 1ae9d470f3a..105b356d4ac 100644 --- a/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java +++ b/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java @@ -21,10 +21,17 @@ public BlockNuclearCasing() { setDefaultState(getState(NuclearCasingType.SPENT_FUEL_CASING)); } + @Override + public boolean isOpaqueCube(IBlockState state) { + return state != getState(NuclearCasingType.GAS_CENTRIFUGE_COLUMN); + } + public enum NuclearCasingType implements IStringSerializable, IStateHarvestLevel { SPENT_FUEL_CASING("spent_fuel_casing", 2), - GAS_CENTRIFUGE_HEATER("gas_centrifuge_heater", 1); + GAS_CENTRIFUGE_HEATER("gas_centrifuge_heater", 1), + GAS_CENTRIFUGE_COLUMN("gas_centrifuge_column", 2); + NuclearCasingType(String name, int harvestLevel) { this.name = name; diff --git a/src/main/java/gregtech/common/blocks/MetaBlocks.java b/src/main/java/gregtech/common/blocks/MetaBlocks.java index 618c32081bb..8eacd89ef9d 100644 --- a/src/main/java/gregtech/common/blocks/MetaBlocks.java +++ b/src/main/java/gregtech/common/blocks/MetaBlocks.java @@ -139,7 +139,6 @@ private MetaBlocks() {} public static BlockComputerCasing COMPUTER_CASING; public static BlockBatteryPart BATTERY_BLOCK; public static BlockNuclearCasing NUCLEAR_CASING; - public static BlockGasCentrifugeCasing GAS_CENTRIFUGE_CASING; public static final EnumMap LAMPS = new EnumMap<>(EnumDyeColor.class); public static final EnumMap BORDERLESS_LAMPS = new EnumMap<>(EnumDyeColor.class); @@ -268,8 +267,6 @@ public static void init() { BATTERY_BLOCK.setRegistryName("battery_block"); NUCLEAR_CASING = new BlockNuclearCasing(); NUCLEAR_CASING.setRegistryName("nuclear_casing"); - GAS_CENTRIFUGE_CASING = new BlockGasCentrifugeCasing(); - GAS_CENTRIFUGE_CASING.setRegistryName("gas_centrifuge_casing"); for (EnumDyeColor color : EnumDyeColor.values()) { BlockLamp block = new BlockLamp(color); @@ -478,7 +475,6 @@ public static void registerItemModels() { registerItemModel(COMPUTER_CASING); registerItemModel(BATTERY_BLOCK); registerItemModel(ASPHALT); - registerItemModel(GAS_CENTRIFUGE_CASING); registerItemModel(PANELLING); for (StoneVariantBlock block : STONE_BLOCKS.values()) registerItemModel(block); diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java index 1b09bae933c..f14d9cb0a84 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java @@ -12,7 +12,6 @@ import gregtech.client.renderer.ICubeRenderer; import gregtech.client.renderer.texture.Textures; import gregtech.common.blocks.BlockBoilerCasing; -import gregtech.common.blocks.BlockGasCentrifugeCasing; import gregtech.common.blocks.BlockNuclearCasing; import gregtech.common.blocks.MetaBlocks; @@ -87,8 +86,8 @@ private IBlockState getHeaterState() { } private IBlockState getCentrifugeState() { - return MetaBlocks.GAS_CENTRIFUGE_CASING - .getState(BlockGasCentrifugeCasing.GasCentrifugeCasingType.GAS_CENTRIFUGE_COLUMN); + return MetaBlocks.NUCLEAR_CASING + .getState(BlockNuclearCasing.NuclearCasingType.GAS_CENTRIFUGE_COLUMN); } protected ICubeRenderer getFrontOverlay() { diff --git a/src/main/resources/assets/gregtech/blockstates/nuclear_casing.json b/src/main/resources/assets/gregtech/blockstates/nuclear_casing.json index c894ad1856d..d5ac53cd7e8 100644 --- a/src/main/resources/assets/gregtech/blockstates/nuclear_casing.json +++ b/src/main/resources/assets/gregtech/blockstates/nuclear_casing.json @@ -36,6 +36,22 @@ "top_bottom" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_top_bloom", "top_top" : "gregtech:blocks/casings/nuclear/gas_centrifuge_heater_top_bloom" } + }, + "active=false,variant=gas_centrifuge_column" : { + "model" : "gregtech:gas_centrifuge", + "textures" : { + "0" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side", + "1" : "gregtech:blocks/casings/nuclear/gas_centrifuge_end", + "particle" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side" + } + }, + "active=true,variant=gas_centrifuge_column" : { + "model" : "gregtech:gas_centrifuge", + "textures" : { + "0" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side", + "1" : "gregtech:blocks/casings/nuclear/gas_centrifuge_end", + "particle" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side" + } } } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 9ba6c0decf8..23da2608229 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -2770,7 +2770,7 @@ tile.long_distance_fluid_pipeline.name=Long Distance Fluid Pipe # Nuclear Blocks tile.nuclear_casing.spent_fuel_casing.name=Spent Fuel Casing tile.nuclear_casing.gas_centrifuge_heater.name=Gas Centrifuge Heater -tile.gas_centrifuge_casing.gas_centrifuge_column.name=Gas Centrifuge Column +tile.nuclear_casing.gas_centrifuge_column.name=Gas Centrifuge Column # Creative tabs itemGroup.gregtech.main=GregTech From 3fb416456aa1ee82318400917592d91e6583b800 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:56:42 -0500 Subject: [PATCH 7/8] fix: spot-cleaning --- src/main/java/gregtech/common/blocks/BlockNuclearCasing.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java b/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java index 105b356d4ac..7bcfb689cf5 100644 --- a/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java +++ b/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java @@ -32,7 +32,6 @@ public enum NuclearCasingType implements IStringSerializable, IStateHarvestLevel GAS_CENTRIFUGE_HEATER("gas_centrifuge_heater", 1), GAS_CENTRIFUGE_COLUMN("gas_centrifuge_column", 2); - NuclearCasingType(String name, int harvestLevel) { this.name = name; this.harvestLevel = harvestLevel; From 1c7b287c09e43c2a45003311949a9db937077693 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:19:53 -0500 Subject: [PATCH 8/8] refactor: remove gas_centrifuge_casing.json --- .../blockstates/gas_centrifuge_casing.json | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json diff --git a/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json b/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json deleted file mode 100644 index 67f4dd5d3b1..00000000000 --- a/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker" : 1, - "defaults": { - "model" : "minecraft:cube_all", - "textures" : { - "all" : "gregtech:blocks/casings/solid/machine_casing_solid_steel" - } - }, - "variants" : { - "variant" : { - "gas_centrifuge_column" : { - "model" : "gregtech:gas_centrifuge", - "textures" : { - "0" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side", - "1" : "gregtech:blocks/casings/nuclear/gas_centrifuge_end", - "particle" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side" - } - } - } - } -}