diff options
Diffstat (limited to 'src/Java/miscutil/gregtech')
5 files changed, 9 insertions, 8 deletions
diff --git a/src/Java/miscutil/gregtech/HANDLER_Gregtech.java b/src/Java/miscutil/gregtech/HANDLER_Gregtech.java index 7d13ff7b36..f0793d63fd 100644 --- a/src/Java/miscutil/gregtech/HANDLER_Gregtech.java +++ b/src/Java/miscutil/gregtech/HANDLER_Gregtech.java @@ -11,8 +11,8 @@ public class HANDLER_Gregtech { public static void preInit(){ if (mMaterialProperties != null){ GT_Materials.init(mMaterialProperties); - } - GregtechFluidHandler.run(); + GregtechFluidHandler.run(); + } } public static void init(){ diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/miscutil/gregtech/api/enums/GregtechOrePrefixes.java index 76ca8c71fa..c3fd890a63 100644 --- a/src/Java/miscutil/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/Java/miscutil/gregtech/api/enums/GregtechOrePrefixes.java @@ -268,8 +268,8 @@ public enum GregtechOrePrefixes { //Lapis(526, TextureSet.SET_LAPIS, 1.0F, 0, 1, 1 | 4 | 8, 70, 70, 220, 0, "Lapis", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlue, 2, Arrays.asList(new MaterialStack(Materials.Lazurite, 12), new MaterialStack(Materials.Sodalite, 2), new MaterialStack(Materials.Pyrite, 1), new MaterialStack(Materials.Calcite, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.SENSUS, 1))), - Pyrotheum(20, TextureSet.SET_FIERY, 1.0F, 0, 1, 1, 255, 128, 0, 0, "Pyrotheum", 2, 62, -1, 0, false, false, 2, 3, 1, Dyes.dyeYellow, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), new TC_AspectStack(TC_Aspects.IGNIS, 1))), - Cryotheum(21, TextureSet.SET_FIERY, 1.0F, 0, 1, 1, 102, 178, 255, 0, "Cryotheum", 2, 62, -1, 0, false, false, 2, 3, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Blizz, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Snow, 1), new MaterialStack(Materials.Niter, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), new TC_AspectStack(TC_Aspects.GELUM, 1))), + Pyrotheum(20, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 255, 128, 0, 0, "Pyrotheum", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeYellow, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), new TC_AspectStack(TC_Aspects.IGNIS, 1))), + Cryotheum(21, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 102, 178, 255, 0, "Cryotheum", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Blizz, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Snow, 1), new MaterialStack(Materials.Niter, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), new TC_AspectStack(TC_Aspects.GELUM, 1))), /** * Circuitry, Batteries and other Technical things diff --git a/src/Java/miscutil/gregtech/api/objects/GregtechFluid.java b/src/Java/miscutil/gregtech/api/objects/GregtechFluid.java index 6352883995..03b1ddfc10 100644 --- a/src/Java/miscutil/gregtech/api/objects/GregtechFluid.java +++ b/src/Java/miscutil/gregtech/api/objects/GregtechFluid.java @@ -22,6 +22,6 @@ public class GregtechFluid extends Fluid implements Runnable { @Override public void run() { - setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID + "fluids/fluid." + mTextureName)); + setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID+ ":" + "fluids/fluid." + mTextureName)); } }
\ No newline at end of file diff --git a/src/Java/miscutil/gregtech/common/Meta_GT_Proxy.java b/src/Java/miscutil/gregtech/common/Meta_GT_Proxy.java index 7f8dedf08d..059a13d914 100644 --- a/src/Java/miscutil/gregtech/common/Meta_GT_Proxy.java +++ b/src/Java/miscutil/gregtech/common/Meta_GT_Proxy.java @@ -18,9 +18,9 @@ public class Meta_GT_Proxy { return addFluid(aName, aLocalized, aMaterial, aState, aTemperatureK, null, null, 0); } - public static Fluid addFluid(String aName, String aLocalized, GT_Materials cryotheum, int aState, int aTemperatureK, ItemStack aFullContainer, + public static Fluid addFluid(String aName, String aLocalized, GT_Materials aMaterial, int aState, int aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { - return addFluid(aName, aName.toLowerCase(), aLocalized, cryotheum, null, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount); + return addFluid(aName, aName.toLowerCase(), aLocalized, aMaterial, null, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount); } public static Fluid addFluid(String aName, String aTexture, String aLocalized, GT_Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK, diff --git a/src/Java/miscutil/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/gregtech/common/blocks/fluid/GregtechFluidHandler.java index bfea3b93d3..8483d1f96f 100644 --- a/src/Java/miscutil/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/Java/miscutil/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -28,7 +28,8 @@ public class GregtechFluidHandler { Meta_GT_Proxy.addFluid("mcguffium", "Mc Guffium 239", Materials.McGuffium239, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); Meta_GT_Proxy.addFluid("glue", "Glue", Materials.Glue, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); */ - Meta_GT_Proxy.addFluid("gelidcryotheum", "Gelid Cryotheum", GT_Materials.Cryotheum, 1, 400, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + Meta_GT_Proxy.addFluid("cryotheum", "Gelid Cryotheum", GT_Materials.Cryotheum, 4, -1200, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + Meta_GT_Proxy.addFluid("pyrotheum", "Blazing Pyrotheum", GT_Materials.Pyrotheum, 4, 1200, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); } |