From b48613dc7d877db112a0f51587a1583297209aaf Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Wed, 19 Oct 2016 00:37:48 +0200 Subject: [PATCH] Add EnderIO Rocket Fuel compat --- src/main/java/gregtech/api/enums/ItemList.java | 2 +- .../gregtech/loaders/load/GT_FuelLoader.java | 9 +++++++++ .../loaders/postload/GT_MachineRecipeLoader.java | 3 ++- .../textures/blocks/fluids/fluid.rocket_fuel.png | Bin 0 -> 4470 bytes .../blocks/fluids/fluid.rocket_fuel.png.mcmeta | 5 +++++ 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rocket_fuel.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rocket_fuel.png.mcmeta diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 382d3e06..43df5d61 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -643,7 +643,7 @@ public enum ItemList implements IItemContainer { public static final ItemList[] DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15}, SPRAY_CAN_DYES = {Spray_Color_00, Spray_Color_01, Spray_Color_02, Spray_Color_03, Spray_Color_04, Spray_Color_05, Spray_Color_06, Spray_Color_07, Spray_Color_08, Spray_Color_09, Spray_Color_10, Spray_Color_11, Spray_Color_12, Spray_Color_13, Spray_Color_14, Spray_Color_15}, SPRAY_CAN_DYES_USED = {Spray_Color_Used_00, Spray_Color_Used_01, Spray_Color_Used_02, Spray_Color_Used_03, Spray_Color_Used_04, Spray_Color_Used_05, Spray_Color_Used_06, Spray_Color_Used_07, Spray_Color_Used_08, Spray_Color_Used_09, Spray_Color_Used_10, Spray_Color_Used_11, Spray_Color_Used_12, Spray_Color_Used_13, Spray_Color_Used_14, Spray_Color_Used_15}, TRANSFORMERS = {Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV}, MACHINE_HULLS = {Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX}, HATCHES_DYNAMO = {Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX}, HATCHES_ENERGY = {Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX}, HATCHES_INPUT = {Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX}, HATCHES_INPUT_BUS = {Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX}, HATCHES_OUTPUT = {Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX}, HATCHES_OUTPUT_BUS = {Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX}, HATCHES_MUFFLER = {Hatch_Muffler_LV, Hatch_Muffler_LV, Hatch_Muffler_MV, Hatch_Muffler_HV, Hatch_Muffler_EV, Hatch_Muffler_IV, Hatch_Muffler_LuV, Hatch_Muffler_ZPM, Hatch_Muffler_UV, Hatch_Muffler_MAX}; - public static Fluid sOilExtraHeavy, sEpichlorhydrin, sDrillingFluid, sNitricAcid, sBlueVitriol, sNickelSulfate, sToluene, sNitrationMixture; + public static Fluid sOilExtraHeavy, sEpichlorhydrin, sDrillingFluid, sNitricAcid, sBlueVitriol, sNickelSulfate, sToluene, sNitrationMixture, sRocketFuel; private ItemStack mStack; private boolean mHasNotBeenSet = true; diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 04b2648f..469e32e9 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -1,6 +1,7 @@ package gregtech.loaders.load; import gregtech.GT_Mod; +import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -9,9 +10,12 @@ import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; +import ic2.core.Ic2Items; +import ic2.core.item.ItemFluidCell; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class GT_FuelLoader implements Runnable { @@ -20,6 +24,7 @@ public class GT_FuelLoader ItemList.sNitricAcid = GT_Mod.gregtechproxy.addFluid("nitricacid", "Nitric acid ", null, 1, 295); ItemList.sBlueVitriol = GT_Mod.gregtechproxy.addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); ItemList.sNickelSulfate = GT_Mod.gregtechproxy.addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); + ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295); new GT_Recipe(new ItemStack(Items.lava_bucket), new ItemStack(Blocks.obsidian), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L), 30, 2); GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 25000); @@ -30,5 +35,9 @@ public class GT_FuelLoader GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5); GT_Values.RA.addFuel(new ItemStack(Items.ghast_tear, 1), null, 50, 5); GT_Values.RA.addFuel(new ItemStack(Blocks.beacon, 1), null, Materials.NetherStar.mFuelPower * 2, Materials.NetherStar.mFuelType); + GT_Values.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketRocket_fuel", 1), null, 250, 1); + if(!GregTech_API.mIC2Classic){ + GT_Values.RA.addFuel(ItemFluidCell.getUniversalFluidCell(new FluidStack(ItemList.sRocketFuel,1000)), Ic2Items.FluidCell.copy(), 250, 1); + } } } diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index b698b709..352505f0 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -991,7 +991,8 @@ if(Loader.isModLoaded("Railcraft")){ GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3L), Materials.Chlorine.getFluid(2000L), Materials.Titaniumtetrachloride.getFluid(1000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L), 500, 480); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 2L), GT_Values.NF, Materials.Chlorine.getFluid(1500L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Magnesium, 6L), 300, 240); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 9L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), GT_Values.NF, Materials.Rubber.getMolten(1296L), GT_Values.NI, 600, 16); - + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3L), Materials.Air.getGas(500), new FluidStack(ItemList.sRocketFuel,3000), ItemList.Cell_Water.get(4, new Object[0]), 500, 96); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8L), new ItemStack(Items.melon, 1, 32767), new ItemStack(Items.speckled_melon, 1, 0), 50); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8L), new ItemStack(Items.carrot, 1, 32767), new ItemStack(Items.golden_carrot, 1, 0), 50); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 8L), new ItemStack(Items.apple, 1, 32767), new ItemStack(Items.golden_apple, 1, 0), 50); diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rocket_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rocket_fuel.png new file mode 100644 index 0000000000000000000000000000000000000000..11c8d78df46e1a32b416261252871ff64bcf1dc0 GIT binary patch literal 4470 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rocket_fuel.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rocket_fuel.png.mcmeta new file mode 100644 index 00000000..7e77c648 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rocket_fuel.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file