diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/thermalfoundation')
10 files changed, 158 insertions, 158 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java deleted file mode 100644 index 460a5e9fbe..0000000000 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java +++ /dev/null @@ -1,36 +0,0 @@ -package gtPlusPlus.xmod.thermalfoundation; - -import static gregtech.api.enums.Mods.COFHCore; - -import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; -import gtPlusPlus.xmod.thermalfoundation.item.TF_Items; -import gtPlusPlus.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes; - -public class HANDLER_TF { - - public static void preInit() { - if (COFHCore.isModLoaded()) { - TF_Fluids.preInit(); - TF_Items.preInit(); - TF_Blocks.preInit(); - } - } - - public static void init() { - if (COFHCore.isModLoaded()) { - TF_Fluids.init(); - TF_Blocks.init(); - TF_Items.init(); - } - } - - public static void postInit() { - if (COFHCore.isModLoaded()) { - TF_Fluids.postInit(); - TF_Items.postInit(); - TF_Blocks.postInit(); - TF_Gregtech_Recipes.run(); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HandlerTF.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HandlerTF.java new file mode 100644 index 0000000000..cb8b2c38c3 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HandlerTF.java @@ -0,0 +1,36 @@ +package gtPlusPlus.xmod.thermalfoundation; + +import static gregtech.api.enums.Mods.COFHCore; + +import gtPlusPlus.xmod.thermalfoundation.block.TFBlocks; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; +import gtPlusPlus.xmod.thermalfoundation.item.TFItems; +import gtPlusPlus.xmod.thermalfoundation.recipe.TFGregtechRecipes; + +public class HandlerTF { + + public static void preInit() { + if (COFHCore.isModLoaded()) { + TFFluids.preInit(); + TFItems.preInit(); + TFBlocks.preInit(); + } + } + + public static void init() { + if (COFHCore.isModLoaded()) { + TFFluids.init(); + TFBlocks.init(); + TFItems.init(); + } + } + + public static void postInit() { + if (COFHCore.isModLoaded()) { + TFFluids.postInit(); + TFItems.postInit(); + TFBlocks.postInit(); + TFGregtechRecipes.run(); + } + } +} diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidCryotheum.java index b48be445e5..0fefa79686 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidCryotheum.java @@ -26,16 +26,16 @@ import cofh.lib.util.BlockWrapper; import cofh.lib.util.helpers.DamageHelper; import cofh.lib.util.helpers.ServerHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; -public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { +public class TFBlockFluidCryotheum extends BlockFluidInteractive { public static final Material materialFluidCryotheum = new MaterialLiquid(MapColor.iceColor); private static boolean enableSourceFall = true; private static boolean effect = true; - public TF_Block_Fluid_Cryotheum() { - super(GTPlusPlus.ID, TF_Fluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); + public TFBlockFluidCryotheum() { + super(GTPlusPlus.ID, TFFluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); this.setQuantaPerBlock(5); this.setTickRate(15); @@ -116,7 +116,7 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { @Override public int getLightValue(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2, final int paramInt3) { - return TF_Fluids.fluidCryotheum.getLuminosity(); + return TFFluids.fluidCryotheum.getLuminosity(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidEnder.java index 9f89d01250..1f7c1fec93 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidEnder.java @@ -12,15 +12,15 @@ import net.minecraft.world.World; import cofh.core.fluid.BlockFluidCoFHBase; import cofh.core.util.CoreUtils; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; -public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { +public class TFBlockFluidEnder extends BlockFluidCoFHBase { public static final Material materialFluidEnder = new MaterialLiquid(MapColor.greenColor); private static boolean effect = true; - public TF_Block_Fluid_Ender() { - super(GTPlusPlus.ID, TF_Fluids.fluidEnder, materialFluidEnder, "ender"); + public TFBlockFluidEnder() { + super(GTPlusPlus.ID, TFFluids.fluidEnder, materialFluidEnder, "ender"); setQuantaPerBlock(4); setTickRate(20); @@ -56,6 +56,6 @@ public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { @Override public int getLightValue(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3) { - return TF_Fluids.fluidEnder.getLuminosity(); + return TFFluids.fluidEnder.getLuminosity(); } } diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidPyrotheum.java index 90c8be8bf7..1014667355 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidPyrotheum.java @@ -18,16 +18,16 @@ import cofh.core.fluid.BlockFluidInteractive; import cofh.lib.util.BlockWrapper; import cofh.lib.util.helpers.ServerHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; -public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { +public class TFBlockFluidPyrotheum extends BlockFluidInteractive { Random random = new Random(); private static boolean effect = true; private static boolean enableSourceFall = true; - public TF_Block_Fluid_Pyrotheum() { - super(GTPlusPlus.ID, TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum"); + public TFBlockFluidPyrotheum() { + super(GTPlusPlus.ID, TFFluids.fluidPyrotheum, Material.lava, "pyrotheum"); this.setQuantaPerBlock(5); this.setTickRate(10); @@ -89,7 +89,7 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { @Override public int getLightValue(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2, final int paramInt3) { - return TF_Fluids.fluidPyrotheum.getLuminosity(); + return TFFluids.fluidPyrotheum.getLuminosity(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlocks.java index 38fed4c137..4e238ae5f5 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlocks.java @@ -2,16 +2,16 @@ package gtPlusPlus.xmod.thermalfoundation.block; import cofh.core.fluid.BlockFluidCoFHBase; -public class TF_Blocks { +public class TFBlocks { public static BlockFluidCoFHBase blockFluidPyrotheum; public static BlockFluidCoFHBase blockFluidCryotheum; public static BlockFluidCoFHBase blockFluidEnder; public static void preInit() { - blockFluidPyrotheum = new TF_Block_Fluid_Pyrotheum(); - blockFluidCryotheum = new TF_Block_Fluid_Cryotheum(); - blockFluidEnder = new TF_Block_Fluid_Ender(); + blockFluidPyrotheum = new TFBlockFluidPyrotheum(); + blockFluidCryotheum = new TFBlockFluidCryotheum(); + blockFluidEnder = new TFBlockFluidEnder(); blockFluidPyrotheum.preInit(); blockFluidCryotheum.preInit(); blockFluidEnder.preInit(); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TFFluids.java index 63d0c49b2f..61832d630d 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TFFluids.java @@ -5,7 +5,7 @@ import net.minecraftforge.fluids.FluidRegistry; import gtPlusPlus.api.objects.Logger; -public class TF_Fluids { +public class TFFluids { public static Fluid fluidPyrotheum; public static Fluid fluidCryotheum; diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TFItems.java index d2ea7ea2d1..556b11483f 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TFItems.java @@ -10,10 +10,10 @@ import cofh.core.util.fluid.BucketHandler; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; +import gtPlusPlus.xmod.thermalfoundation.block.TFBlocks; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; -public class TF_Items { +public class TFItems { public static ItemBase itemMaterial; public static ItemStack rodBlizz; @@ -60,15 +60,15 @@ public class TF_Items { public static void init() { - BucketHandler.registerBucket(TF_Blocks.blockFluidPyrotheum, 0, bucketPyrotheum); - BucketHandler.registerBucket(TF_Blocks.blockFluidCryotheum, 0, bucketCryotheum); - BucketHandler.registerBucket(TF_Blocks.blockFluidEnder, 0, bucketEnder); + BucketHandler.registerBucket(TFBlocks.blockFluidPyrotheum, 0, bucketPyrotheum); + BucketHandler.registerBucket(TFBlocks.blockFluidCryotheum, 0, bucketCryotheum); + BucketHandler.registerBucket(TFBlocks.blockFluidEnder, 0, bucketEnder); FluidContainerRegistry - .registerFluidContainer(TF_Fluids.fluidPyrotheum, bucketPyrotheum, FluidContainerRegistry.EMPTY_BUCKET); + .registerFluidContainer(TFFluids.fluidPyrotheum, bucketPyrotheum, FluidContainerRegistry.EMPTY_BUCKET); FluidContainerRegistry - .registerFluidContainer(TF_Fluids.fluidCryotheum, bucketCryotheum, FluidContainerRegistry.EMPTY_BUCKET); + .registerFluidContainer(TFFluids.fluidCryotheum, bucketCryotheum, FluidContainerRegistry.EMPTY_BUCKET); FluidContainerRegistry - .registerFluidContainer(TF_Fluids.fluidEnder, bucketEnder, FluidContainerRegistry.EMPTY_BUCKET); + .registerFluidContainer(TFFluids.fluidEnder, bucketEnder, FluidContainerRegistry.EMPTY_BUCKET); } public static void postInit() {} diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TFGregtechRecipes.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TFGregtechRecipes.java new file mode 100644 index 0000000000..52b85d6a19 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TFGregtechRecipes.java @@ -0,0 +1,93 @@ +package gtPlusPlus.xmod.thermalfoundation.recipe; + +import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; +import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import gregtech.api.enums.GTValues; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; +import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.util.minecraft.FluidUtils; + +public class TFGregtechRecipes { + + public static void run() { + start(); + } + + private static void start() { + + final FluidStack moltenBlaze = getFluidStack("molten.blaze", 1440); + + // Gelid Cryotheum + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L)) + .fluidInputs(getFluidStack("cryotheum", 144)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(chemicalBathRecipes); + + // Blizz Powder + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Items.snowball, 4)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) + .fluidInputs(moltenBlaze) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV / 2) + .addTo(chemicalBathRecipes); + + // Blizz Rod + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Items.blaze_rod)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Blizz, 1L)) + .duration(((int) Math.max((Materials.Blaze.getMass() * 4) * 3L, 1L)) * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(vacuumFreezerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Niter, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); + } + + private static FluidStack getFluidStack(final String fluidName, final int amount) { + return FluidUtils.getFluidStack(fluidName, amount); + } +} diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java deleted file mode 100644 index cd48964d37..0000000000 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java +++ /dev/null @@ -1,93 +0,0 @@ -package gtPlusPlus.xmod.thermalfoundation.recipe; - -import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; -import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.util.minecraft.FluidUtils; - -public class TF_Gregtech_Recipes { - - public static void run() { - start(); - } - - private static void start() { - - final FluidStack moltenBlaze = getFluidStack("molten.blaze", 1440); - - // Gelid Cryotheum - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L)) - .fluidInputs(getFluidStack("cryotheum", 144)) - .duration(20 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(chemicalBathRecipes); - - // Blizz Powder - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.snowball, 4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) - .fluidInputs(moltenBlaze) - .duration(20 * SECONDS) - .eut(TierEU.RECIPE_HV / 2) - .addTo(chemicalBathRecipes); - - // Blizz Rod - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.blaze_rod)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Blizz, 1L)) - .duration(((int) Math.max((Materials.Blaze.getMass() * 4) * 3L, 1L)) * TICKS) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)) - .duration(8 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(mixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) - .duration(8 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(mixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Niter, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) - .duration(8 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(mixerRecipes); - } - - private static FluidStack getFluidStack(final String fluidName, final int amount) { - return FluidUtils.getFluidStack(fluidName, amount); - } -} |