Merge pull request #24 from SymmetricDevs/lead_drum

Lead drum and latex fix
SymmetricDevs · Apr 13, 2023 · e490d8b · e490d8b
2 parents 1f7399c + 181e933
commit e490d8b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/supersymmetry/common/materials/SuSyUnknownCompositionMaterials.java b/src/main/java/supersymmetry/common/materials/SuSyUnknownCompositionMaterials.java
@@ -1,5 +1,6 @@
 package supersymmetry.common.materials;
 
+import gregtech.api.fluids.fluidType.FluidTypes;
 import gregtech.api.unification.material.Material;
 
 import static supersymmetry.common.materials.SusyMaterials.*;
@@ -8,10 +9,8 @@ public class SuSyUnknownCompositionMaterials {
 
     public static void init() {
         Latex = new Material.Builder(27050, "latex")
+                .dust().fluid(FluidTypes.LIQUID)
                 .color(0xFFFADA)
-                .dust()
-                .fluid()
-                .fluidTemp(293)
                 .build();
     }
 }
diff --git a/src/main/java/supersymmetry/common/materials/SusyMaterials.java b/src/main/java/supersymmetry/common/materials/SusyMaterials.java
@@ -2,9 +2,7 @@
 
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.Materials;
-import gregtech.api.unification.material.properties.IMaterialProperty;
-import gregtech.api.unification.material.properties.MaterialProperties;
-import gregtech.api.unification.material.properties.PropertyKey;
+import gregtech.api.unification.material.properties.*;
 import supersymmetry.api.SusyLog;
 
 import java.lang.reflect.Field;
@@ -48,13 +46,17 @@ public static void init() {
         SuSyOrganicChemistryMaterials.init();
         SuSyHighDegreeMaterials.init();
         SuSyUnknownCompositionMaterials.init();
+
+        Latex.getProperty(PropertyKey.FLUID).setFluidTemperature(293);
     }
 
     private static void changeProperties() {
         //removeProperty(PropertyKey.ORE, Materials.Graphite);
         removeProperty(PropertyKey.ORE, Materials.Soapstone);
         removeProperty(PropertyKey.ORE, Materials.Quartzite);
         removeProperty(PropertyKey.ORE, Materials.Mica);
+        removeProperty(PropertyKey.FLUID_PIPE, Materials.Lead);
+        Materials.Lead.setProperty(PropertyKey.FLUID_PIPE, new FluidPipeProperties(1200, 8, true, true, false, false));
     }
 
     private static void removeProperty(PropertyKey<?> key, Material material) {

diff --git a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java
@@ -2,8 +2,9 @@
 
 import gregtech.api.GTValues;
 import gregtech.api.metatileentity.SimpleMachineMetaTileEntity;
+import gregtech.api.unification.material.Materials;
 import gregtech.client.renderer.texture.Textures;
-import gregtech.common.metatileentities.MetaTileEntities;
+import gregtech.common.metatileentities.storage.MetaTileEntityDrum;
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import supersymmetry.api.recipes.SuSyRecipeMaps;
@@ -38,6 +39,8 @@ public class SuSyMetaTileEntities {
     public static MetaTileEntitySteamVacuumChamber VACUUM_CHAMBER_BRONZE;
     public static SimpleMachineMetaTileEntity[] VACUUM_CHAMBER;
 
+    public static MetaTileEntityDrum LEAD_DRUM;
+
     public static void init() {
         MAGNETIC_REFRIGERATOR = registerMetaTileEntity(14500, new MetaTileEntityMagneticRefrigerator(susyId("magnetic_refrigerator")));
         COAGULATION_TANK = registerMetaTileEntity(14501, new MetaTileEntityCoagulationTank(susyId("coagulation_tank")));
@@ -91,6 +94,8 @@ public static void init() {
         VACUUM_CHAMBER[10] = registerMetaTileEntity(14548, new SimpleMachineMetaTileEntity(susyId("vacuum_chamber.uiv"), SuSyRecipeMaps.VACUUM_CHAMBER, Textures.GAS_COLLECTOR_OVERLAY, 11, true));
         VACUUM_CHAMBER[11] = registerMetaTileEntity(14549, new SimpleMachineMetaTileEntity(susyId("vacuum_chamber.uxv"), SuSyRecipeMaps.VACUUM_CHAMBER, Textures.GAS_COLLECTOR_OVERLAY, 12, true));
         VACUUM_CHAMBER[12] = registerMetaTileEntity(14550, new SimpleMachineMetaTileEntity(susyId("vacuum_chamber.opv"), SuSyRecipeMaps.VACUUM_CHAMBER, Textures.GAS_COLLECTOR_OVERLAY,13, true));
+
+        LEAD_DRUM = registerMetaTileEntity(14551, new MetaTileEntityDrum(susyId("drum.lead"), Materials.Lead, 32000));
     }
 
     private static @NotNull ResourceLocation susyId(@NotNull String name) {

diff --git a/src/main/resources/assets/susy/lang/en_us.lang b/src/main/resources/assets/susy/lang/en_us.lang
@@ -82,6 +82,7 @@ gregtech.multiblocks.sintering_oven.use_plasma.affirmative=Yes
 gregtech.multiblocks.sintering_oven.use_plasma.negative=No
 
 gregtech.machine.coagulation_tank.name=Coagulation Tank
+gregtech.machine.drum.lead.name=Lead Drum
 
 # Properties
 gregtech.recipe.plasma_requirement=Requires plasma: %s