0.1.2 update (#114)

* Added ULV structural casing

* Fix mistake in ULV structural casing localization

* Make sintering oven use ULV structural casings

* Improved basic structural casing texture

* Add serpentine blocks

* Make heat radiator use serpentine blocks

* Added localisation to serpentine

* Version bump to 0.1.2

gradle.properties

@@ -5,7 +5,7 @@ modId = susy
 
 modGroup = supersymmetry
 
-modVersion = 0.1.1
+modVersion = 0.1.2
 
 # The name of your jar when you produce builds, not including any versioning info
 modArchivesBaseName = supersymmetry

src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java

@@ -40,4 +40,5 @@ public SusyTextures(){
     public static final OrientedOverlayRenderer FLUID_DECOMPRESSOR_OVERLAY = new OrientedOverlayRenderer("machines/fluid_decompressor");
 
     public static final SimpleOverlayRenderer SILICON_CARBIDE_CASING = new SimpleOverlayRenderer("multiblock_casing/silicon_carbide_casing");
+    public static final SimpleOverlayRenderer ULV_STRUCTURAL_CASING = new SimpleOverlayRenderer("multiblock_casing/ulv_structural_casing");
 }

src/main/java/supersymmetry/common/CommonProxy.java

@@ -61,6 +61,7 @@ public static void registerBlocks(@NotNull RegistryEvent.Register<Block> event)
         registry.register(SuSyBlocks.EVAPORATION_BED);
         registry.register(SuSyBlocks.ELECTRODE_ASSEMBLY);
         registry.register(SuSyBlocks.MULTIBLOCK_CASING);
+        registry.register(SuSyBlocks.SERPENTINE);
     }
 
     @SubscribeEvent
@@ -85,6 +86,7 @@ public static void registerItems(@NotNull RegistryEvent.Register<Item> event) {
         registry.register(createItemBlock(SuSyBlocks.MULTIBLOCK_TANK, VariantItemBlock::new));
         registry.register(createItemBlock(SuSyBlocks.ELECTRODE_ASSEMBLY, VariantItemBlock::new));
         registry.register(createItemBlock(SuSyBlocks.MULTIBLOCK_CASING, VariantItemBlock::new));
+        registry.register(createItemBlock(SuSyBlocks.SERPENTINE, VariantItemBlock::new));
     }
 
     @SubscribeEvent(priority = EventPriority.HIGH)

src/main/java/supersymmetry/common/blocks/BlockSerpentine.java

@@ -0,0 +1,37 @@
+package supersymmetry.common.blocks;
+
+import gregtech.api.block.VariantActiveBlock;
+import net.minecraft.block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.util.IStringSerializable;
+
+public class BlockSerpentine extends VariantActiveBlock<BlockSerpentine.SerpentineType> {
+
+    public BlockSerpentine() {
+        super(Material.IRON);
+        setTranslationKey("serpentine");
+        setHardness(0.5f);
+        setSoundType(SoundType.METAL);
+        setHarvestLevel("wrench", 2);
+        setDefaultState(getState(SerpentineType.BASIC));
+    }
+
+    public enum SerpentineType implements IStringSerializable {
+        BASIC("basic");
+
+        public final String name;
+
+        SerpentineType(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String getName() {
+            return this.name;
+        }
+
+        public String toString() {
+            return this.getName();
+        }
+    }
+}

src/main/java/supersymmetry/common/blocks/BlockSuSyMultiblockCasing.java

@@ -30,7 +30,8 @@ public boolean canCreatureSpawn(@Nonnull IBlockState state, @Nonnull IBlockAcces
 
     public enum CasingType implements IStringSerializable {
 
-        SILICON_CARBIDE_CASING("silicon_carbide_casing");
+        SILICON_CARBIDE_CASING("silicon_carbide_casing"),
+        ULV_STRUCTURAL_CASING("ulv_structural_casing");
 
         private final String name;
 

src/main/java/supersymmetry/common/blocks/SuSyBlocks.java

@@ -35,6 +35,7 @@ public class SuSyBlocks {
     public static BlockEvaporationBed EVAPORATION_BED;
     public static BlockElectrodeAssembly ELECTRODE_ASSEMBLY;
     public static BlockSuSyMultiblockCasing MULTIBLOCK_CASING;
+    public static BlockSerpentine SERPENTINE;
 
     public static void init() {
         COOLING_COIL = new BlockCoolingCoil();
@@ -89,6 +90,9 @@ public static void init() {
         MULTIBLOCK_CASING = new BlockSuSyMultiblockCasing();
         MULTIBLOCK_CASING.setRegistryName("susy_multiblock_casing");
 
+        SERPENTINE = new BlockSerpentine();
+        SERPENTINE.setRegistryName("serpentine");
+
     }
 
     @SideOnly(Side.CLIENT)
@@ -111,6 +115,7 @@ public static void registerItemModels() {
         MULTIBLOCK_TANK.onModelRegister();
         ELECTRODE_ASSEMBLY.onModelRegister();
         registerItemModel(MULTIBLOCK_CASING);
+        SERPENTINE.onModelRegister();
     }
 
     @SideOnly(Side.CLIENT)

src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHeatRadiator.java

@@ -12,8 +12,9 @@
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.ResourceLocation;
 import supersymmetry.api.recipes.SuSyRecipeMaps;
-import gregtech.common.blocks.BlockBoilerCasing.BoilerCasingType;
 import gregtech.common.blocks.BlockMetalCasing.MetalCasingType;
+import supersymmetry.common.blocks.BlockSerpentine;
+import supersymmetry.common.blocks.SuSyBlocks;
 
 import javax.annotation.Nonnull;
 
@@ -37,16 +38,20 @@ protected BlockPattern createStructurePattern() {
                 .aisle("DBBBBBBBBBC").setRepeatable(1,14)
                 .aisle("AAAAAAAAAAA")
                 .where('S', selfPredicate())
-                .where('A', states(new IBlockState[]{MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID)})
+                .where('A', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID))
                         .or(autoAbilities(false, true, false, false, false, false, false)))
-                .where('B', states(new IBlockState[]{MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE)}))
-                .where('C', states(new IBlockState[]{MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID)})
+                .where('B', states(getRadiatorElementState()))
+                .where('C', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID))
                         .or(autoAbilities(false, false, false, false, true, false, false)))
-                .where('D', states(new IBlockState[]{MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID)})
+                .where('D', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID))
                         .or(autoAbilities(false, false, false, false, false, true, false)))
                 .build();
     }
 
+    public IBlockState getRadiatorElementState() {
+        return SuSyBlocks.SERPENTINE.getState(BlockSerpentine.SerpentineType.BASIC);
+    }
+
     @Override
     public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) {
         return Textures.SOLID_STEEL_CASING;

src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySinteringOven.java

@@ -21,10 +21,13 @@
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.util.text.TextFormatting;
 import org.jetbrains.annotations.NotNull;
+import supersymmetry.client.renderer.textures.SusyTextures;
 import supersymmetry.common.blocks.BlockSinteringBrick;
 import supersymmetry.api.metatileentity.multiblock.SuSyPredicates;
 import supersymmetry.api.recipes.SuSyRecipeMaps;
 import supersymmetry.api.recipes.properties.SinterProperty;
+import supersymmetry.common.blocks.BlockSuSyMultiblockCasing;
+import supersymmetry.common.blocks.SuSyBlocks;
 
 import java.util.List;
 
@@ -54,7 +57,7 @@ protected void addDisplayText(List<ITextComponent> textList) {
 
     @Override
     public ICubeRenderer getBaseTexture(IMultiblockPart multiblockPart) {
-        return Textures.VOLTAGE_CASINGS[0];
+        return SusyTextures.ULV_STRUCTURAL_CASING;
     }
 
     @NotNull
@@ -64,7 +67,7 @@ protected ICubeRenderer getFrontOverlay() {
     }
 
     protected IBlockState getCasingState() {
-        return MetaBlocks.MACHINE_CASING.getState(BlockMachineCasing.MachineCasingType.ULV);
+        return SuSyBlocks.MULTIBLOCK_CASING.getState(BlockSuSyMultiblockCasing.CasingType.ULV_STRUCTURAL_CASING);
     }
 
     protected IBlockState getFrameState() {

src/main/resources/assets/susy/blockstates/serpentine.json

@@ -0,0 +1,18 @@
+{
+  "forge_marker" : 1,
+  "variants" : {
+    "active=false,variant=basic" : {
+      "model" : "minecraft:cube_all",
+      "textures" : {
+        "all" : "gregtech:blocks/casings/serpentine/serpentine"
+      }
+    },
+    "active=true,variant=basic" : {
+      "model" : "gregtech:cube_2_layer_all",
+      "textures" : {
+        "bot_all" : "gregtech:blocks/casings/serpentine/serpentine",
+        "top_all" : "gregtech:blocks/casings/serpentine/serpentine_bloom"
+      }
+    }
+  }
+}

src/main/resources/assets/susy/blockstates/susy_multiblock_casing.json

@@ -14,6 +14,12 @@
       "textures" : {
         "all" : "gregtech:blocks/multiblock_casing/silicon_carbide_casing"
       }
+    },
+    "variant=ulv_structural_casing" : {
+      "model" : "minecraft:cube_all",
+      "textures" : {
+        "all" : "gregtech:blocks/multiblock_casing/ulv_structural_casing"
+      }
     }
   }
 }

src/main/resources/assets/susy/lang/en_us.lang

@@ -15,6 +15,9 @@ tile.turbine_rotor.steel.name=Steel Turbine Block
 tile.drill_head.steel.name=Steel Drill Head
 
 tile.susy_multiblock_casing.silicon_carbide_casing.name=Tough Silicon Carbide Casing
+tile.susy_multiblock_casing.ulv_structural_casing.name=Basic Structural Casing
+
+tile.serpentine.basic.name=Copper Tubing Serpentine Block
 
 tile.structural_block.base_structural_block.name=Structural Block
 tile.structural_block.structural_block_low.name=Striped Structural Block