Merge pull request #477 from Nxer/main

sync from main
Nxer · Jun 17, 2024 · a3e6ebf · a3e6ebf
2 parents 67e0947 + bba7446
commit a3e6ebf
Show file tree

Hide file tree

Showing 27 changed files with 931 additions and 152 deletions.
diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java
@@ -185,7 +185,10 @@ public enum GTCMItemList {
     ParallelismCasing3,
     ParallelismCasing4,
     AntiMagneticCasing,
-
+    ReinforcedStoneBrickCasing,
+    CompositeFarmCasing,
+    DenseCyclotronOuterCasing,
+    CompactCyclotronCoil,
     // endregion
 
     // region Machines
@@ -245,6 +248,7 @@ public enum GTCMItemList {
     LightningSpire,
     ExtremeCraftCenter,
     MassFabricatorGenesis,
+    IncompactCyclotron,
 
     // 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
@@ -119,7 +119,59 @@ public static void registryBlockContainers() {
                     TextEnums.tr("Tooltip_MetaBlockCasing01.7.name_1") }));
 
         GTCMItemList.AntiMagneticCasing.set(
-            MetaBlockConstructors.initMetaBlockCasing("Anti-Magnetic Casing", (byte) 8, BasicBlocks.MetaBlockCasing01));
+            MetaBlockConstructors.initMetaBlockCasing(
+                "Anti-Magnetic Casing",
+                // #tr MetaBlockCasing01.8.name
+                // # Anti-Magnetic Casing
+                // #zh_CN 抗磁机械方块
+                (byte) 8,
+                BasicBlocks.MetaBlockCasing01));
+
+        GTCMItemList.ReinforcedStoneBrickCasing.set(
+            MetaBlockConstructors.initMetaBlockCasing(
+                "Reinforced Stone Brick Casing",
+                // #tr MetaBlockCasing01.9.name
+                // # Reinforced Stone Brick Casing
+                // #zh_CN 强化石砖机械方块
+                (byte) 9,
+                BasicBlocks.MetaBlockCasing01,
+                new String[] { TextEnums.tr("Tooltip_ReinforcedStoneBrickCasing")
+                // #tr Tooltip_ReinforcedStoneBrickCasing
+                // # Stronger than bedrock!
+                // #zh_CN 比磐石更坚！
+                }));
+
+        GTCMItemList.CompositeFarmCasing.set(
+            MetaBlockConstructors.initMetaBlockCasing(
+                "Composite Farm Casing",
+                // #tr MetaBlockCasing01.10.name
+                // # Composite Farm Casing
+                // #zh_CN 复合农场机械方块
+                (byte) 10,
+                BasicBlocks.MetaBlockCasing01,
+                new String[] { TextEnums.tr("Tooltip_CompositeFarmCasing")
+                // #tr Tooltip_CompositeFarmCasing
+                // # A force stronger than four combined.
+                // #zh_CN 一个更比四个强
+                }));
+
+        GTCMItemList.DenseCyclotronOuterCasing.set(
+            MetaBlockConstructors.initMetaBlockCasing(
+                "Dense Cyclotron Outer Casing",
+                // #tr MetaBlockCasing01.11.name
+                // # Dense Cyclotron Outer Casing
+                // #zh_CN 致密回旋加速器机械方块
+                (byte) 11,
+                BasicBlocks.MetaBlockCasing01));
+
+        GTCMItemList.CompactCyclotronCoil.set(
+            MetaBlockConstructors.initMetaBlockCasing(
+                "Compact Cyclotron Coil",
+                // #tr MetaBlockCasing01.12.name
+                // # Compact Cyclotron Coil
+                // #zh_CN 压缩回旋加速器线圈
+                (byte) 12,
+                BasicBlocks.MetaBlockCasing01));
 
         // region PhotonControllerUpgrade
         GTCMItemList.PhotonControllerUpgradeLV

diff --git a/...java/com/Nxer/TwistSpaceTechnology/common/block/blockClass/BlockStaticDataClientOnly.java b/...java/com/Nxer/TwistSpaceTechnology/common/block/blockClass/BlockStaticDataClientOnly.java
@@ -21,10 +21,6 @@ public class BlockStaticDataClientOnly {
     public static Map<Integer, IIcon> iconsSpaceStationStructureCasingMap = new HashMap<>();
     @SideOnly(Side.CLIENT)
     public static Map<Integer, IIcon> iconsNuclearReactor = new HashMap<>();
-    @SideOnly(Side.CLIENT)
-    public static Map<Integer, IIcon> iconsHighPowerRadiationProofCasing = new HashMap<>();
-    @SideOnly(Side.CLIENT)
-    public static Map<Integer, IIcon> iconsAdvancedHighPowerCoil = new HashMap<>();
     public static Map<Integer, IIcon> iconsMetaBlockCasing01 = new HashMap<>(16);
 
 }
diff --git a/...java/com/Nxer/TwistSpaceTechnology/common/block/blockClass/Casings/MetaBlockCasing01.java b/...java/com/Nxer/TwistSpaceTechnology/common/block/blockClass/Casings/MetaBlockCasing01.java
@@ -124,6 +124,7 @@ public void registerBlockIcons(IIconRegister reg) {
             BlockStaticDataClientOnly.iconsMetaBlockCasing01
                 .put(Meta, reg.registerIcon("gtnhcommunitymod:MetaBlockCasing01/" + Meta));
         }
+
     }
 
     @Override

diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_BallLightning.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_BallLightning.java
@@ -524,15 +524,15 @@ public IStructureDefinition<TST_BallLightning> getStructureDefinition() {
                         .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Energy.or(ExoticEnergy))
                         .adder(TST_BallLightning::addToMachineList)
                         .casingIndex(BasicBlocks.MetaBlockCasing01.getTextureIndex(1))
-                        .dot(2)
+                        .dot(1)
                         .buildAndChain(BasicBlocks.MetaBlockCasing01, 1))
                 .addElement(
                     'Z',
                     GT_HatchElementBuilder.<TST_BallLightning>builder()
                         .atLeast(Energy.or(ExoticEnergy))
                         .adder(TST_BallLightning::addToMachineList)
                         .casingIndex(getCasingTextureIndex(GregTech_API.sBlockCasings8, 5))
-                        .dot(1)
+                        .dot(2)
                         .buildAndChain(GregTech_API.sBlockCasings8, 5))
                 .build();
         }
@@ -876,15 +876,15 @@ protected GT_Multiblock_Tooltip_Builder createTooltip() {
             // #zh_CN 基础结构为等级1
             .addInfo(TextEnums.tr("Tooltip_BallLightning.0.12"))
             // #tr Tooltip_BallLightning.0.13
-            // # Gravitational Lens in the control slot unlocks level 2
+            // # Gravitational Lens in the control slot unlocks Tier 2
             // #zh_CN 在主机内放入引力透镜解锁等级2
             .addInfo(TextEnums.tr("Tooltip_BallLightning.0.13"))
             // #tr Tooltip_BallLightning.0.14
-            // # Upgrade Chip in the control slot and utilizing Tier 2 structure unlocks level 3
+            // # Upgrade Chip in the control slot and utilizing Tier 2 structure unlocks Tier 3
             // #zh_CN 在主机内放入升级芯片且使用2级结构解锁等级3
             .addInfo(TextEnums.tr("Tooltip_BallLightning.0.14"))
             // #tr Tooltip_BallLightning.0.15
-            // # Utilizing Advanced High Power Coil unlocks level 4
+            // # Utilizing Advanced High Power Coil unlocks Tier 4
             // #zh_CN 使用进阶高能线圈解锁等级4
             .addInfo(TextEnums.tr("Tooltip_BallLightning.0.15"))
             // #tr Tooltip_BallLightning.0.16