Merge pull request #1 from Goderium/pr/598-work

Tiered Structure
Goderium · Sep 10, 2024 · 8cc96c5 · 8cc96c5
2 parents e8f4ea0 + 005202c
commit 8cc96c5
Show file tree

Hide file tree

Showing 6 changed files with 435 additions and 135 deletions.
diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java
@@ -157,6 +157,9 @@ public enum GTCMItemList {
     PrimitiveMansSpaceTimeDistortionDevice,
     BallLightningUpgradeChip,
     HatchUpdateTool,
+    FountOfEcology,
+    OffSpring,
+
     // endregion
 
     // region Blocks
@@ -189,6 +192,9 @@ public enum GTCMItemList {
     CompositeFarmCasing,
     DenseCyclotronOuterCasing,
     CompactCyclotronCoil,
+    AsepticGreenhouseCasing,
+    BloodyCasing1,
+    BloodyCasing2,
     // endregion
 
     // region Machines
@@ -249,6 +255,7 @@ public enum GTCMItemList {
     ExtremeCraftCenter,
     MassFabricatorGenesis,
     IncompactCyclotron,
+    BloodyHell,
 
     // endregion
 
@@ -321,8 +328,6 @@ public enum GTCMItemList {
     AdvancedExecutionCore,
     PerfectExecutionCore,
 
-    BloodOrbHatch,
-
     // endregion
 
     // region MAX
@@ -344,7 +349,6 @@ public enum GTCMItemList {
     EncapsulatedMicroSpaceTimeUnit,
     SeedsSpaceTime,
     MicroSpaceTimeFabricatorio,
-    BloodyHell,
 
     // endregion
 
@@ -406,9 +410,9 @@ public enum GTCMItemList {
     LaserSmartNode,
     FackRackHatch,
     RealRackHatch,
-
     WirelessDataInputHatch,
     WirelessDataOutputHatch,
+    BloodOrbHatch,
 
     // endregion
 

diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/block/BlockRegister.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/block/BlockRegister.java
@@ -38,6 +38,11 @@ public static void registryBlocks() {
             MetaItemBlockCasing.class,
             BasicBlocks.MetaBlockCasing01.getUnlocalizedName());
 
+        GameRegistry.registerBlock(
+            BasicBlocks.MetaBlockCasing02,
+            MetaItemBlockCasing.class,
+            BasicBlocks.MetaBlockCasing02.getUnlocalizedName());
+
         GameRegistry.registerBlock(
             PhotonControllerUpgrade,
             PhotonControllerUpgradeCasingItemBlock.class,
@@ -193,6 +198,38 @@ public static void registryBlockContainers() {
                 (byte) 12,
                 BasicBlocks.MetaBlockCasing01));
 
+        GTCMItemList.AsepticGreenhouseCasing.set(
+            MetaBlockConstructors.initMetaBlockCasing(
+                "Aseptic Greenhouse Casing",
+                // #tr MetaBlockCasing01.13.name
+                // # Aseptic Greenhouse Casing
+                // #zh_CN 无菌温室机械方块
+                (byte) 13,
+                BasicBlocks.MetaBlockCasing01,
+                new String[] { TextEnums.tr("Tooltip_AsepticGreenhouseCasing")
+                // #tr Tooltip_AsepticGreenhouseCasing
+                // # Absolutely Clean!
+                // #zh_CN 一尘不染!
+                }));
+
+        GTCMItemList.BloodyCasing1.set(
+            MetaBlockConstructors.initMetaBlockCasing(
+                "BloodyCasing1",
+                // #tr MetaBlockCasing02.0.name
+                // #
+                // #zh_CN
+                (byte) 0,
+                BasicBlocks.MetaBlockCasing02));
+
+        GTCMItemList.BloodyCasing2.set(
+            MetaBlockConstructors.initMetaBlockCasing(
+                "BloodyCasing2",
+                // #tr MetaBlockCasing02.1.name
+                // #
+                // #zh_CN
+                (byte) 1,
+                BasicBlocks.MetaBlockCasing02));
+
         // region SpaceTimeOscillator
 
         // #tr SpaceTimeOscillator.0.name