Merge pull request #362 from SymmetricDevs/dungeons

Implement Hermetically Sealed Crate & Industrial Concrete for Dungeons

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

@@ -118,7 +118,8 @@ public enum StoneType implements IStringSerializable {
         SHALE("shale", MapColor.RED_STAINED_HARDENED_CLAY),
         SLATE("slate", MapColor.RED_STAINED_HARDENED_CLAY),
         SOAPSTONE("soapstone", MapColor.GRAY_STAINED_HARDENED_CLAY),
-        KIMBERLITE("kimberlite", MapColor.GRAY);
+        KIMBERLITE("kimberlite", MapColor.GRAY),
+        INDUSTRIAL_CONCRETE("industrial_concrete", MapColor.YELLOW_STAINED_HARDENED_CLAY);
 
         private final String name;
         public final MapColor mapColor;
@@ -137,6 +138,7 @@ public OrePrefix getOrePrefix() {
             return switch (this) {
                 case GABBRO, GNEISS, LIMESTONE, PHYLLITE, QUARTZITE, SHALE, SLATE, SOAPSTONE, KIMBERLITE ->
                         OrePrefix.stone;
+                case INDUSTRIAL_CONCRETE -> OrePrefix.block;
             };
         }
 
@@ -151,6 +153,7 @@ public gregtech.api.unification.material.Material getMaterial() {
                 case SLATE -> SusyMaterials.Slate;
                 case SOAPSTONE -> Materials.Soapstone;
                 case KIMBERLITE -> SusyMaterials.Kimberlite;
+                case INDUSTRIAL_CONCRETE -> Materials.Concrete;
             };
         }
     }

src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java

@@ -14,6 +14,7 @@
 import gregtech.common.blocks.MetaBlocks;
 import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityEnergyHatch;
 import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiFluidHatch;
+import gregtech.common.metatileentities.storage.MetaTileEntityCrate;
 import gregtech.common.metatileentities.storage.MetaTileEntityDrum;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
@@ -80,6 +81,8 @@ public class SuSyMetaTileEntities {
     public static MetaTileEntityPlasticCan PTFE_CAN;
     public static MetaTileEntityPlasticCan UHMWPE_CAN;
 
+    public static MetaTileEntityCrate HERMETICALLY_SEALED_CRATE;
+
     //Machines for chem overhaul
     public static ContinuousMachineMetaTileEntity[] CONTINUOUS_STIRRED_TANK_REACTOR;
     public static ContinuousMachineMetaTileEntity[] FIXED_BED_REACTOR;
@@ -205,6 +208,8 @@ public static void init() {
 
         SINTERING_OVEN = registerMetaTileEntity(14521, new MetaTileEntitySinteringOven(susyId("sintering_oven")));
 
+        HERMETICALLY_SEALED_CRATE = registerMetaTileEntity(14522, new MetaTileEntityCrate(susyId("crate.pe"), Materials.Polyethylene, 54));
+
         registerSimpleSteamMTE(STEAM_VULCANIZING_PRESS, 14515, "vulcanizing_press", SuSyRecipeMaps.VULCANIZATION_RECIPES, SuSySteamProgressIndicators.COMPRESS, SusyTextures.VULCANIZING_PRESS_OVERLAY, true);
         registerCatalystMTE(VULCANIZING_PRESS, 3, 14517, "vulcanizing_press", SuSyRecipeMaps.VULCANIZATION_RECIPES, SusyTextures.VULCANIZING_PRESS_OVERLAY, true);
 

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

@@ -59,6 +59,11 @@
         "textures" : {
           "all" : "gregtech:blocks/susy_stones/kimberlite_bricks"
         }
+      },
+      "industrial_concrete" : {
+        "textures" : {
+          "all" : "gregtech:blocks/susy_stones/industrial_concrete_bricks"
+        }
       }
     }
   }

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

@@ -59,6 +59,11 @@
         "textures" : {
           "all" : "gregtech:blocks/susy_stones/kimberlite_cobble"
         }
+      },
+      "industrial_concrete" : {
+        "textures" : {
+          "all" : "gregtech:blocks/susy_stones/industrial_concrete_cobble"
+        }
       }
     }
   }

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

@@ -59,6 +59,11 @@
         "textures" : {
           "all" : "gregtech:blocks/susy_stones/kimberlite"
         }
+      },
+      "industrial_concrete" : {
+        "textures" : {
+          "all" : "gregtech:blocks/susy_stones/industrial_concrete"
+        }
       }
     }
   }

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

@@ -112,6 +112,7 @@ tile.susy_stone_smooth.shale.name=Shale
 tile.susy_stone_smooth.slate.name=Slate
 tile.susy_stone_smooth.soapstone.name=Soapstone
 tile.susy_stone_smooth.kimberlite.name=Kimberlite
+tile.susy_stone_smooth.industrial_concrete.name=Industrial Concrete
 tile.susy_stone_cobble.gabbro.name=Gabbro Cobblestone
 tile.susy_stone_cobble.gneiss.name=Gneiss Cobblestone
 tile.susy_stone_cobble.graphite.name=Graphite Cobblestone
@@ -123,6 +124,7 @@ tile.susy_stone_cobble.shale.name=Shale Cobblestone
 tile.susy_stone_cobble.slate.name=Slate Cobblestone
 tile.susy_stone_cobble.soapstone.name=Soapstone Cobblestone
 tile.susy_stone_cobble.kimberlite.name=Kimberlite Cobblestone
+tile.susy_stone_cobble.industrial_concrete.name=Industrial Concrete Cobblestone
 tile.susy_stone_bricks.gabbro.name=Gabbro Bricks
 tile.susy_stone_bricks.gneiss.name=Gneiss Bricks
 tile.susy_stone_bricks.graphite.name=Graphite Bricks
@@ -134,6 +136,7 @@ tile.susy_stone_bricks.shale.name=Shale Bricks
 tile.susy_stone_bricks.slate.name=Slate Bricks
 tile.susy_stone_bricks.soapstone.name=Soapstone Bricks
 tile.susy_stone_bricks.kimberlite.name=Kimberlite Bricks
+tile.susy_stone_bricks.industrial_concrete.name=Industrial Concrete Bricks
 
 # Materials
 susy.material.manganese_iron_arsenic_phosphide=Manganese Iron Arsenic Phosphide
@@ -214,6 +217,8 @@ gregtech.machine.drum.pp.name=Polypropylene (PP) Can
 gregtech.machine.drum.ptfe.name=Polytetrafluoroethylene (PTFE) Can
 gregtech.machine.drum.uhmwpe.name=Ultra High Molecular Weight Polyethylene (UHMWPE) Can
 
+gregtech.machine.crate.pe.name=Hermetically Sealed Crate
+
 gregtech.machine.polymerization_tank.name=Polymerization Tank
 gregtech.machine.fluidized_bed_reactor.name=Fluidized Bed Reactor