fix: revert gas centrifuge shenanigans

GregTechCEu · Jun 7, 2024 · a852a37 · a852a37
1 parent a258bf2
commit a852a37
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ modGroup = gregtech
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.8.7-beta
+modVersion = 2.9.0-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true

diff --git a/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java b/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java
@@ -26,8 +26,7 @@ public boolean isOpaqueCube(IBlockState state) {
 
     public enum GasCentrifugeCasingType implements IStringSerializable, IStateHarvestLevel {
 
-        GAS_CENTRIFUGE_COLUMN("gas_centrifuge_column", 2),
-        GAS_CENTRIFUGE_HEATER("gas_centrifuge_heater", 1);
+        GAS_CENTRIFUGE_COLUMN("gas_centrifuge_column", 2);
 
         private String name;
         private int harvestLevel;

diff --git a/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java b/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java
@@ -23,7 +23,8 @@ public BlockNuclearCasing() {
 
     public enum NuclearCasingType implements IStringSerializable, IStateHarvestLevel {
 
-        SPENT_FUEL_CASING("spent_fuel_casing", 2);
+        SPENT_FUEL_CASING("spent_fuel_casing", 2),
+        GAS_CENTRIFUGE_HEATER("gas_centrifuge_heater", 1);
 
         NuclearCasingType(String name, int harvestLevel) {
             this.name = name;

diff --git a/...ain/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java b/...ain/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java
@@ -12,6 +12,7 @@
 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;
@@ -60,8 +61,8 @@ private IBlockState getPipeState() {
     }
 
     private IBlockState getHeaterState() {
-        return MetaBlocks.GAS_CENTRIFUGE_CASING
-                .getState(BlockGasCentrifugeCasing.GasCentrifugeCasingType.GAS_CENTRIFUGE_HEATER);
+        return MetaBlocks.NUCLEAR_CASING.getState(
+                BlockNuclearCasing.NuclearCasingType.GAS_CENTRIFUGE_HEATER);
     }
 
     private IBlockState getCentrifugeState() {

diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java
@@ -865,8 +865,8 @@ private static void registerAssemblerRecipes() {
                 .inputs(MetaBlocks.BOILER_CASING.getItemVariant(
                         BlockBoilerCasing.BoilerCasingType.POLYTETRAFLUOROETHYLENE_PIPE))
                 .input(wireGtSingle, Nichrome, 4)
-                .outputs(MetaBlocks.GAS_CENTRIFUGE_CASING.getItemVariant(
-                        BlockGasCentrifugeCasing.GasCentrifugeCasingType.GAS_CENTRIFUGE_HEATER))
+                .outputs(MetaBlocks.NUCLEAR_CASING.getItemVariant(
+                        BlockNuclearCasing.NuclearCasingType.GAS_CENTRIFUGE_HEATER))
                 .buildAndRegister();
 
         ASSEMBLER_RECIPES.recipeBuilder().EUt(64).duration(200)