From d718cac331526a1d13a4df12fba42ef01028bd90 Mon Sep 17 00:00:00 2001 From: Teteros Date: Thu, 14 Jan 2016 06:14:53 +0000 Subject: [PATCH] Modify Wet Concrete to be able to use cells Wet Concrete was lacking cell support as it was a 'molten' fluid type. This patch adds a new type 'wet', which replaces 'molten' for Concrete. This means with this patch you can either use the canner with concrete dust to fill the cell, or the fluid canning machine to input or output Wet Concrete. Ideally Wet Concrete would be separate from Concrete as one is solid and the other fluid, but they were kept together for compatibility with existing recipes. 1 Concrete Cell = 144 Wet Concrete = Concrete Block 'Wet' fluid type can be used anytime you'd like both solid and fluid cell support, as these were usually separate for good reasons. Mostly to prevent the awkward ratio above. --- src/main/java/gregtech/api/enums/Materials.java | 2 +- src/main/java/gregtech/common/GT_Proxy.java | 5 +++++ .../postload/GT_MachineRecipeLoader.java | 2 ++ .../preload/GT_Loader_Item_Block_And_Fluid.java | 2 +- .../blocks/fluids/fluid.wet.autogenerated.png | Bin 0 -> 21917 bytes ...cmeta => fluid.wet.autogenerated.png.mcmeta} | 0 ...lten.concrete.png => fluid.wet.concrete.png} | Bin .../blocks/fluids/fluid.wet.concrete.png.mcmeta | 5 +++++ 8 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png rename src/main/resources/assets/gregtech/textures/blocks/fluids/{fluid.molten.concrete.png.mcmeta => fluid.wet.autogenerated.png.mcmeta} (100%) rename src/main/resources/assets/gregtech/textures/blocks/fluids/{fluid.molten.concrete.png => fluid.wet.concrete.png} (100%) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 39d2dfae..4c1b3b2f 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -632,7 +632,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Kaolinite(929, TextureSet.SET_DULL, 1.0F, 0, 2, 1 | 8, 245, 235, 235, 0, "Kaolinite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL, 1, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 9))), // Al2Si2O5(OH)4 Talc(902, TextureSet.SET_DULL, 1.0F, 0, 2, 1 | 8, 90, 180, 90, 0, "Talc", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL, 1, Arrays.asList(new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 4), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 12))), // H2Mg3(SiO3)4 Soapstone(877, TextureSet.SET_DULL, 1.0F, 0, 1, 1 | 8, 95, 145, 95, 0, "Soapstone", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL, 1, Arrays.asList(new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 4), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 12))), // H2Mg3(SiO3)4 - Concrete(947, TextureSet.SET_ROUGH, 1.0F, 0, 1, 1, 100, 100, 100, 0, "Concrete", 0, 0, 300, 0, false, false, 0, 1, 1, Dyes.dyeGray, 0, Arrays.asList(new MaterialStack(Stone, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.TERRA, 1))), + Concrete(947, TextureSet.SET_ROUGH, 1.0F, 0, 1, 1 | 16, 100, 100, 100, 0, "Concrete", 0, 0, 300, 0, false, false, 0, 1, 1, Dyes.dyeGray, 0, Arrays.asList(new MaterialStack(Stone, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.TERRA, 1))), IronMagnetic(354, TextureSet.SET_MAGNETIC, 6.0F, 256, 2, 1 | 2 | 64 | 128, 200, 200, 200, 0, "Magnetic Iron", 0, 0, -1, 0, false, false, 4, 51, 50, Dyes.dyeGray, 1, Arrays.asList(new MaterialStack(Iron, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.MAGNETO, 1))), SteelMagnetic(355, TextureSet.SET_MAGNETIC, 6.0F, 512, 2, 1 | 2 | 64 | 128, 128, 128, 128, 0, "Magnetic Steel", 0, 0, 1000, 1000, true, false, 4, 51, 50, Dyes.dyeGray, 1, Arrays.asList(new MaterialStack(Steel, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_AspectStack(TC_Aspects.ORDO, 1), new TC_AspectStack(TC_Aspects.MAGNETO, 1))), NeodymiumMagnetic(356, TextureSet.SET_MAGNETIC, 7.0F, 512, 2, 1 | 2 | 64 | 128, 100, 100, 100, 0, "Magnetic Neodymium", 0, 0, 1297, 1297, true, false, 4, 51, 50, Dyes.dyeGray, 1, Arrays.asList(new MaterialStack(Neodymium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_AspectStack(TC_Aspects.MAGNETO, 3))), diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 0868a50f..b4a9c248 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1685,6 +1685,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 : aMaterial.mMeltingPoint, null, null, 0); } + public Fluid addAutogeneratedWetFluid(Materials aMaterial) { + return addFluid("wet." + aMaterial.name().toLowerCase(), "wet.autogenerated", "Wet " + aMaterial.mDefaultLocalName, aMaterial, + aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 : aMaterial.mMeltingPoint, GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + } + public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) { return addFluid("plasma." + aMaterial.name().toLowerCase(), "plasma.autogenerated", aMaterial.mDefaultLocalName + " Plasma", aMaterial, aMaterial.mMoltenRGBa, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index c2867e7a..73b72910 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -120,6 +120,8 @@ public class GT_MachineRecipeLoader GT_Values.RA.addFluidCannerRecipe(ItemList.Battery_Hull_MV.get(1L, new Object[0]), ItemList.Battery_SU_MV_SulfuricAcid.getWithCharge(1L, Integer.MAX_VALUE, new Object[0]), Materials.SulfuricAcid.getFluid(4000L), GT_Values.NF); GT_Values.RA.addFluidCannerRecipe(ItemList.Battery_Hull_HV.get(1L, new Object[0]), ItemList.Battery_SU_HV_SulfuricAcid.getWithCharge(1L, Integer.MAX_VALUE, new Object[0]), Materials.SulfuricAcid.getFluid(16000L), GT_Values.NF); GT_Values.RA.addFluidCannerRecipe(ItemList.TF_Vial_FieryTears.get(1L, new Object[0]), ItemList.Bottle_Empty.get(1L, new Object[0]), GT_Values.NF, Materials.FierySteel.getFluid(250L)); + GT_Values.RA.addFluidCannerRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Concrete, 1L),ItemList.Cell_Empty.get(1L, new Object [0]), GT_Values.NF, Materials.Concrete.getMolten(144L)); + GT_Values.RA.addFluidCannerRecipe(ItemList.Cell_Empty.get(1L, new Object [0]), (GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Concrete, 1L)), Materials.Concrete.getMolten(144L), GT_Values.NF); Materials tMaterial = Materials.Iron; if (tMaterial.mStandardMoltenFluid != null) { diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 3e747296..91e4f8d7 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -240,10 +240,10 @@ public class GT_Loader_Item_Block_And_Fluid Materials.Water.mSolid = Materials.Ice.mSolid; + GT_Mod.gregtechproxy.addFluid("wet.concrete", "Wet Concrete", Materials.Concrete, 4, 300); GT_Mod.gregtechproxy.addFluid("molten.glass", "Molten Glass", Materials.Glass, 4, 1500); GT_Mod.gregtechproxy.addFluid("molten.redstone", "Molten Redstone", Materials.Redstone, 4, 500); GT_Mod.gregtechproxy.addFluid("molten.blaze", "Molten Blaze", Materials.Blaze, 4, 6400); - GT_Mod.gregtechproxy.addFluid("molten.concrete", "Wet Concrete", Materials.Concrete, 4, 300); for (Materials tMaterial : Materials.VALUES) { if ((tMaterial.mStandardMoltenFluid == null) && (tMaterial.contains(SubTag.SMELTING_TO_FLUID)) && (!tMaterial.contains(SubTag.NO_SMELTING))) { GT_Mod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial); diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png new file mode 100644 index 0000000000000000000000000000000000000000..8cb44c0505caec390010789532d0dff0611a114e GIT binary patch literal 21917 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta rename to src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png rename to src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta new file mode 100644 index 00000000..0df7234a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file