diff options
Diffstat (limited to 'src/Java/miscutil')
16 files changed, 127 insertions, 67 deletions
diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java index 7d6c49db87..53e070a2d2 100644 --- a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java +++ b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java @@ -9,24 +9,24 @@ import miscutil.gregtech.HANDLER_Gregtech; public class COMPAT_IntermodStaging { public static void preInit(){ + HANDLER_Gregtech.preInit(); HANDLER_Growthcraft.preInit(); HANDLER_ThermalFoundation.preInit(); - HANDLER_Gregtech.preInit(); HANDLER_Forestry.preInit(); HANDLER_Psychedelicraft.preInit(); } public static void init(){ - HANDLER_ThermalFoundation.init(); HANDLER_Gregtech.init(); + HANDLER_ThermalFoundation.init(); HANDLER_Forestry.Init(); HANDLER_Psychedelicraft.init(); } public static void postInit(){ - HANDLER_ThermalFoundation.postInit(); HANDLER_Gregtech.postInit(); + HANDLER_ThermalFoundation.postInit(); HANDLER_Forestry.postInit(); HANDLER_Psychedelicraft.postInit(); } diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java b/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java index 9709c13e50..499c20ff95 100644 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java +++ b/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java @@ -10,6 +10,7 @@ ******************************************************************************/ package miscutil.core.intermod.forestry.apiculture.blocks; +import miscutil.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -21,14 +22,14 @@ import forestry.core.utils.StringUtil; public class FR_BlockRegistryApiculture extends BlockRegistry { public static FR_BlockAlveary alveary; - + public static void RegistryApiculture() { - - alveary = registerBlock2(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary"); + if (CORE.DEBUG){ + alveary = registerBlock2(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary"); + } } - + protected static <T extends Block> T registerBlock2(T block, Class<? extends ItemBlock> itemClass, String name, Object... itemCtorArgs) { - block.setBlockName(name); GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs); return block; diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java b/src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java index fbbe0edf25..b04518b270 100644 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java +++ b/src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java @@ -1,16 +1,14 @@ package miscutil.core.intermod.forestry.apiculture.tiles; import miscutil.core.intermod.forestry.apiculture.multiblock.TileAlvearyMutatron; +import miscutil.core.lib.CORE; import cpw.mods.fml.common.registry.GameRegistry; public class FR_TileHandler { public static void init(){ - // Inducers for swarmer - //BeeManager.inducers.put(items.royalJelly.getItemStack(), 10); - - GameRegistry.registerTileEntity(TileAlvearyMutatron.class, "MiscUtils.AlvearyMutatron"); - - } - + if (CORE.DEBUG){ + GameRegistry.registerTileEntity(TileAlvearyMutatron.class, "MiscUtils.AlvearyMutatron"); + } + } } diff --git a/src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java b/src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java index 2d2af56967..641979408a 100644 --- a/src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java +++ b/src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java @@ -18,15 +18,15 @@ public class PS_Fluids { public static void registerFluids(){ alcJD = new FluidAlcohol("psc_JD", 2, 0.45D, 1.9D, 0.15D, PSConfig.alcInfoPotato); - alcJD.addName(CORE.MODID + "drinkMash", new IntegerRange(0, -1), new IntegerRange(0, 0)); - alcJD.addName(CORE.MODID + "drinkAgedWhisky", new IntegerRange(0, 0), new IntegerRange(1, -1)); - alcJD.addName(CORE.MODID + "drinkWhisky", new IntegerRange(0, -1), new IntegerRange(1, -1)); + alcJD.addName(CORE.MODID + ":" + "drinkMash", new IntegerRange(0, -1), new IntegerRange(0, 0)); + alcJD.addName(CORE.MODID + ":" + "drinkAgedWhisky", new IntegerRange(0, 0), new IntegerRange(1, -1)); + alcJD.addName(CORE.MODID + ":" + "drinkWhisky", new IntegerRange(0, -1), new IntegerRange(1, -1)); alcJD.setColor(-1426150904); - alcJD.setStillIconName(CORE.MODID + "mash_still"); - alcJD.setFlowingIconName(CORE.MODID + "mash_flow"); - alcJD.addIcon(new IntegerRange(-1, -1), new IntegerRange(0, 3), new IntegerRange(2, -1), CORE.MODID + "clear_still", CORE.MODID + "clear_flow"); - alcJD.addIcon(new IntegerRange(-1, -1), new IntegerRange(4, 13), new IntegerRange(0, -1), CORE.MODID + "rum_semi_mature_still", CORE.MODID + "rum_semi_mature_flow"); - alcJD.addIcon(new IntegerRange(-1, -1), new IntegerRange(14, -1), new IntegerRange(0, -1), CORE.MODID + "rum_mature_still", CORE.MODID + "rum_mature_flow"); + alcJD.setStillIconName(CORE.MODID + ":" + "mash_still"); + alcJD.setFlowingIconName(CORE.MODID + ":" + "mash_flow"); + alcJD.addIcon(new IntegerRange(-1, -1), new IntegerRange(0, 3), new IntegerRange(2, -1), CORE.MODID + ":" + "clear_still", CORE.MODID + ":" + "clear_flow"); + alcJD.addIcon(new IntegerRange(-1, -1), new IntegerRange(4, 13), new IntegerRange(0, -1), CORE.MODID + ":" + "rum_semi_mature_still", CORE.MODID + ":" + "rum_semi_mature_flow"); + alcJD.addIcon(new IntegerRange(-1, -1), new IntegerRange(14, -1), new IntegerRange(0, -1), CORE.MODID + ":" + "rum_mature_still", CORE.MODID + ":" + "rum_mature_flow"); FluidRegistry.registerFluid(alcJD); } diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java b/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java index c510763bd0..df23361504 100644 --- a/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java +++ b/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java @@ -19,8 +19,8 @@ public class HANDLER_ThermalFoundation { public static void init(){ if (LoadedMods.CoFHCore){ TF_Fluids.init(); + TF_Blocks.init(); TF_Items.init(); - TF_Blocks.init(); } } diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java index cc9094714e..dbf0f8a26e 100644 --- a/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java +++ b/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java @@ -3,6 +3,7 @@ package miscutil.core.intermod.thermalfoundation.block; import java.util.Random; import miscutil.core.intermod.thermalfoundation.fluid.TF_Fluids; +import miscutil.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -36,7 +37,7 @@ public class TF_Block_Fluid_Cryotheum public TF_Block_Fluid_Cryotheum() { - super("MiscUtils", TF_Fluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); + super(CORE.MODID, TF_Fluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); setQuantaPerBlock(5); setTickRate(15); diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java index 461f4cdbef..cb6f432262 100644 --- a/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java +++ b/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java @@ -3,6 +3,7 @@ package miscutil.core.intermod.thermalfoundation.block; import java.util.Random; import miscutil.core.intermod.thermalfoundation.fluid.TF_Fluids; +import miscutil.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -30,7 +31,7 @@ public class TF_Block_Fluid_Pyrotheum public TF_Block_Fluid_Pyrotheum() { - super("MiscUtils", TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum"); + super(CORE.MODID, TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum"); setQuantaPerBlock(5); setTickRate(10); diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/miscutil/core/intermod/thermalfoundation/fluid/TF_Fluids.java index 7554a9a594..214f592558 100644 --- a/src/Java/miscutil/core/intermod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/Java/miscutil/core/intermod/thermalfoundation/fluid/TF_Fluids.java @@ -16,10 +16,21 @@ public class TF_Fluids public static void preInit() { - fluidPyrotheum = new Fluid("pyrotheum").setLuminosity(15).setDensity(2000).setViscosity(1200).setTemperature(4000).setRarity(EnumRarity.rare); - fluidCryotheum = new Fluid("cryotheum").setLuminosity(0).setDensity(4000).setViscosity(3000).setTemperature(50).setRarity(EnumRarity.rare); - registerFluid(fluidPyrotheum, "pyrotheum"); - registerFluid(fluidCryotheum, "cryotheum"); + + if (FluidRegistry.getFluid("pyrotheum") == null){ + fluidPyrotheum = new Fluid("pyrotheum").setLuminosity(15).setDensity(2000).setViscosity(1200).setTemperature(4000).setRarity(EnumRarity.rare); + registerFluid(fluidPyrotheum, "pyrotheum"); + } + else { + fluidPyrotheum = FluidRegistry.getFluid("pyrotheum"); + } + if (FluidRegistry.getFluid("cryotheum") == null){ + fluidCryotheum = new Fluid("cryotheum").setLuminosity(0).setDensity(4000).setViscosity(3000).setTemperature(50).setRarity(EnumRarity.rare); + registerFluid(fluidCryotheum, "cryotheum"); + } + else { + fluidCryotheum = FluidRegistry.getFluid("cryotheum"); + } } public static void init() {} diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/item/TF_Items.java b/src/Java/miscutil/core/intermod/thermalfoundation/item/TF_Items.java index 0853580c6b..257bc29113 100644 --- a/src/Java/miscutil/core/intermod/thermalfoundation/item/TF_Items.java +++ b/src/Java/miscutil/core/intermod/thermalfoundation/item/TF_Items.java @@ -3,6 +3,7 @@ package miscutil.core.intermod.thermalfoundation.item; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.intermod.thermalfoundation.block.TF_Blocks; import miscutil.core.intermod.thermalfoundation.fluid.TF_Fluids; +import miscutil.core.util.item.UtilsItems; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -22,22 +23,33 @@ public class TF_Items { public static ItemBucket itemBucket; public static ItemStack bucketPyrotheum; public static ItemStack bucketCryotheum; + + public static ItemStack itemDustBlizz; + public static ItemStack itemDustPyrotheum; + public static ItemStack itemDustCryotheum; + public static ItemStack itemRodBlizz; public static void preInit(){ itemBucket = (ItemBucket)new ItemBucket("MiscUtils").setUnlocalizedName("bucket").setCreativeTab(AddToCreativeTab.tabMisc); itemMaterial = (ItemBase)new ItemBase("MiscUtils").setUnlocalizedName("material").setCreativeTab(AddToCreativeTab.tabMisc); - - bucketPyrotheum = itemBucket.addOreDictItem(6661, "bucketPyrotheum", 2); - bucketCryotheum = itemBucket.addOreDictItem(6662, "bucketCryotheum", 2); - dustPyrotheum = itemMaterial.addOreDictItem(6663, "dustPyrotheum", 2); - dustCryotheum = itemMaterial.addOreDictItem(6664, "dustCryotheum", 2); - + + + bucketPyrotheum = itemBucket.addOreDictItem(1, "bucketPyrotheum"); + bucketCryotheum = itemBucket.addOreDictItem(2, "bucketCryotheum"); + rodBlizz = itemMaterial.addOreDictItem(1, "rodBlizz"); + dustBlizz = itemMaterial.addOreDictItem(2, "dustBlizz"); + dustPyrotheum = itemMaterial.addOreDictItem(3, "dustPyrotheum"); + dustCryotheum = itemMaterial.addOreDictItem(4, "dustCryotheum"); + FurnaceFuelHandler.registerFuel(dustPyrotheum, 2400); - rodBlizz = itemMaterial.addOreDictItem(6665, "rodBlizz"); - dustBlizz = itemMaterial.addOreDictItem(6666, "dustBlizz"); + + itemRodBlizz = UtilsItems.simpleMetaStack(itemMaterial, 1, 1); + itemDustBlizz = UtilsItems.simpleMetaStack(itemMaterial, 2, 1); + itemDustPyrotheum = UtilsItems.simpleMetaStack(itemMaterial, 3, 1); + itemDustCryotheum = UtilsItems.simpleMetaStack(itemMaterial, 4, 1); @@ -55,8 +67,9 @@ public class TF_Items { public static void postInit(){ - ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(ItemHelper.cloneStack(dustPyrotheum, 1), new Object[] { "dustCoal", "dustSulfur", "dustRedstone", Items.blaze_powder })); + ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(ItemHelper.cloneStack(dustPyrotheum, 1), new Object[] { "dustCoal", "dustSulfur", "dustRedstone", "dustBlaze" })); ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(ItemHelper.cloneStack(dustCryotheum, 1), new Object[] { Items.snowball, "dustSaltpeter", "dustRedstone", "dustBlizz" })); + ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(ItemHelper.cloneStack(dustCryotheum, 1), new Object[] { Items.snowball, "dustNitor", "dustRedstone", "dustBlizz" })); //ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(ItemHelper.cloneStack(dustBlizz, 2), new Object[] { "rodBlizz" })); diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java index 75f50e7634..ff4ff29641 100644 --- a/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java +++ b/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java @@ -7,42 +7,54 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.intermod.thermalfoundation.item.TF_Items; import miscutil.core.util.Utils; -import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; +import miscutil.core.util.item.UtilsItems; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; public class TF_Gregtech_Recipes { public static void run(){ start(); } - + private static void start(){ //Get Items to work with - Item dust_Cryotheum = TF_Items.dustCryotheum.getItem(); - Item dust_Pyrotheum = TF_Items.dustPyrotheum.getItem(); - Item dust_Blizz = TF_Items.dustBlizz.getItem(); - Item rod_Blizz = TF_Items.rodBlizz.getItem(); - + ItemStack dust_Cryotheum = TF_Items.itemDustCryotheum.copy(); + ItemStack dust_Pyrotheum = TF_Items.itemDustPyrotheum.copy(); + ItemStack dust_Blizz = TF_Items.itemDustBlizz.copy(); + ItemStack dust_Blizz3 = UtilsItems.simpleMetaStack(TF_Items.itemMaterial, 2, 3); + ItemStack rod_Blizz = TF_Items.itemRodBlizz.copy(); + //Gelid Cryotheum Utils.LOG_INFO("Adding Recipes for Gelid Cryotheum"); - GT_Values.RA.addFluidExtractionRecipe(new ItemStack(dust_Cryotheum, 6664, 1), GT_Values.NI, GT_Materials.Cryotheum.getFluid(250L), 10000, 32, 2); - GT_Values.RA.addChemicalBathRecipe((GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)), GT_Materials.Cryotheum.getFluid(200L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 2L), GT_Values.NI, GT_Values.NI, null, 400, 2); - + GT_Values.RA.addFluidExtractionRecipe(dust_Cryotheum, GT_Values.NI, getFluidStack("cryotheum", 250), 10000, 32, 2); + GT_Values.RA.addChemicalBathRecipe((GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)), getFluidStack("cryotheum", 200), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 2L), GT_Values.NI, GT_Values.NI, null, 400, 2); + //Blizz Powder Utils.LOG_INFO("Adding Recipes for Blizz Powder"); - GT_Values.RA.addChemicalBathRecipe(new ItemStack(Items.snowball, 1), Materials.Redstone.getFluid(200L), new ItemStack(dust_Blizz, 6666, 1), GT_Values.NI, GT_Values.NI, null, 400, 2); - + GT_Values.RA.addChemicalBathRecipe(new ItemStack(Items.snowball, 1), getFluidStack("molten.redstone", 200), dust_Blizz, GT_Values.NI, GT_Values.NI, null, 400, 2); + //Blizz Rod Utils.LOG_INFO("Adding Recipes for Blizz Rod"); - GT_ModHandler.addPulverisationRecipe(new ItemStack(rod_Blizz, 6665, 1), new ItemStack(dust_Blizz, 6666, 3), new ItemStack(Items.snowball, 1), 50, false); - - + GT_ModHandler.addPulverisationRecipe(rod_Blizz, dust_Blizz3, new ItemStack(Items.snowball, 1), 50, false); + //Blazing Pyrotheum - GT_Values.RA.addFluidExtractionRecipe(new ItemStack(dust_Pyrotheum, 6663, 1), GT_Values.NI, GT_Materials.Pyrotheum.getFluid(250L), 10000, 32, 2); - Utils.LOG_INFO("Adding Recipes for Blazing Pyrotheum"); - + Utils.LOG_INFO("Adding Recipes for Blazing Pyrotheum"); + GT_Values.RA.addFluidExtractionRecipe(dust_Pyrotheum, GT_Values.NI, getFluidStack("pyrotheum", 250), 10000, 32, 2); + } - + + private static FluidStack getFluidStack(String fluidName, int amount){ + Utils.LOG_INFO("Trying to get a fluid stack of "+fluidName); + try { + return FluidRegistry.getFluidStack(fluidName, amount); + } + catch (Throwable e){ + return null; + } + + } + } diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java index 590b0167be..82075a7093 100644 --- a/src/Java/miscutil/core/util/item/UtilsItems.java +++ b/src/Java/miscutil/core/util/item/UtilsItems.java @@ -112,6 +112,28 @@ public class UtilsItems { return null; } } + + @SuppressWarnings("unused") + public static ItemStack simpleMetaStack(Item item, int meta, int itemstackSize){ + try { + Item em = item; + Item em1 = item; + Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); + if (em1 != null){ + if (null == em){ + em = em1; + } + if (em != null){ + ItemStack metaStack = new ItemStack(em,itemstackSize,meta); + return metaStack; + } + } + return null; + } catch (NullPointerException e) { + Utils.LOG_ERROR(item.getUnlocalizedName()+" not found. [NULL]"); + return null; + } + } public static ItemStack getCorrectStacktype(String fqrn, int stackSize){ String oreDict = "ore:"; 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); } |