diff options
5 files changed, 222 insertions, 62 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 880e4e515c..265d368702 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,7 +3,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:master-SNAPSHOT') - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.81:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.84:dev') compile('com.github.GTNewHorizons:Yamcl:0.5.82:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev') compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 400f8e7e11..e81272ebd6 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -789,6 +789,8 @@ public class DreamCraftRecipeLoader { item_parts_UIV_assline_recipes(); item_parts_UMV_assline_recipes(); + add_wireless_energy_recipes(); + //UHV-UMV Energy Hatch & Dynamo TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Energy_UV.get(1L), 24000, 16, 50000, 2, new Object[]{ @@ -833,6 +835,7 @@ public class DreamCraftRecipeLoader { }, ItemList.Hatch_Dynamo_MAX.get(1L), 1000, 2000000); + // UEV Dynamo / energy hatch TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Energy_MAX.get(1L), 48000, 32, 100000, 4, new Object[]{ getItemContainer("Hull_UEV").get(1L), @@ -866,11 +869,12 @@ public class DreamCraftRecipeLoader { new FluidStack(solderUEV, 20*144), Materials.UUMatter.getFluid(8000L)}, getItemContainer("Hatch_Dynamo_UEV").get(1L), 1000, 8000000); - + + // UIV Dynamo/energy hatch TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Energy_UEV").get(1L), 96_000, 64, 200_000, 8, new Object[]{ getItemContainer("Hull_UIV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 8L), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUEV, 8L), ItemList.Circuit_Chip_QPIC.get(4L), getItemContainer("NanoCircuit").get(2), ItemList.UHV_Coil.get(8L), @@ -880,17 +884,17 @@ public class DreamCraftRecipeLoader { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UEV.get(2L)}, + ItemList.Electric_Pump_UIV.get(1L)}, new FluidStack[]{ - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64_000), + Materials.SuperCoolant.getFluid(16_000L), new FluidStack(solderUEV, 20*144), Materials.UUMatter.getFluid(16_000L)}, - getItemContainer("Hatch_Energy_UIV").get(1L), 1000, 16_000_000); + getItemContainer("Hatch_Energy_UIV").get(1L), 1000, 32_000_000); TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Dynamo_UEV").get(1L), 192_000, 128, 400_000, 16, new Object[]{ getItemContainer("Hull_UIV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuhvwire, 32L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUEVBase, 32L), ItemList.Circuit_Chip_QPIC.get(4L), getItemContainer("NanoCircuit").get(2), ItemList.UHV_Coil.get(8L), @@ -900,17 +904,18 @@ public class DreamCraftRecipeLoader { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UEV.get(2L)}, + ItemList.Electric_Pump_UIV.get(1L)}, new FluidStack[]{ - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64_000), + Materials.SuperCoolant.getFluid(16_000L), new FluidStack(solderUEV, 20*144), Materials.UUMatter.getFluid(16_000L)}, - getItemContainer("Hatch_Dynamo_UIV").get(1L), 1000, 16_000_000); + getItemContainer("Hatch_Dynamo_UIV").get(1L), 1000, 32_000_000); + // UMV Dynamo/energy hatch TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Energy_UIV").get(1L), 192000, 128, 400000, 16, new Object[]{ getItemContainer("Hull_UMV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 16L), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 16L), ItemList.Circuit_Chip_QPIC.get(4L), getItemContainer("PikoCircuit").get(2), ItemList.UHV_Coil.get(16L), @@ -923,17 +928,17 @@ public class DreamCraftRecipeLoader { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UEV.get(4L)}, + ItemList.Electric_Pump_UMV.get(1L)}, new FluidStack[]{ - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 128000), + Materials.SuperCoolant.getFluid(32_000L), new FluidStack(solderUEV, 40*144), Materials.UUMatter.getFluid(32000L)}, - getItemContainer("Hatch_Energy_UMV").get(1L), 1000, 32000000); + getItemContainer("Hatch_Energy_UMV").get(1L), 1000, 128_000_000); TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Dynamo_UIV").get(1L), 384000, 256, 800000, 32, new Object[]{ getItemContainer("Hull_UMV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuhvwire, 64L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUEVBase, 64L), ItemList.Circuit_Chip_QPIC.get(4L), getItemContainer("PikoCircuit").get(2), ItemList.UHV_Coil.get(16L), @@ -946,23 +951,23 @@ public class DreamCraftRecipeLoader { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UEV.get(4L)}, + ItemList.Electric_Pump_UMV.get(1L)}, new FluidStack[]{ - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 128000), + Materials.SuperCoolant.getFluid(32_000L), new FluidStack(solderUEV, 40*144), Materials.UUMatter.getFluid(32000L)}, - getItemContainer("Hatch_Dynamo_UMV").get(1L), 1000, 32000000); + getItemContainer("Hatch_Dynamo_UMV").get(1L), 1000, 128_000_000); - //UHV Circuit ASMD + //UHV Circuit Wetwaremainframe TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Wetwaresupercomputer.get(1L), 24000, 64, 50000, 4, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 2), ItemList.Circuit_Wetwaresupercomputer.get(2L), ItemList.ZPM_Coil.get(16L), - ItemList.Circuit_Parts_CapacitorASMD.get(16L), - ItemList.Circuit_Parts_ResistorASMD.get(16L), - ItemList.Circuit_Parts_TransistorASMD.get(16L), - ItemList.Circuit_Parts_DiodeASMD.get(16L), + new ItemStack[]{ItemList.Circuit_Parts_CapacitorASMD.get(16L), ItemList.Circuit_Parts_CapacitorXSMD.get(4L)}, + new ItemStack[]{ItemList.Circuit_Parts_ResistorASMD.get(16L), ItemList.Circuit_Parts_ResistorXSMD.get(4L)}, + new ItemStack[]{ItemList.Circuit_Parts_TransistorASMD.get(16L), ItemList.Circuit_Parts_TransistorXSMD.get(4L)}, + new ItemStack[]{ItemList.Circuit_Parts_DiodeASMD.get(16L), ItemList.Circuit_Parts_DiodeXSMD.get(4L)}, ItemList.Circuit_Chip_Ram.get(48L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64L), new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, @@ -988,7 +993,7 @@ public class DreamCraftRecipeLoader { }, new FluidStack[]{ new FluidStack(solderUEV, 1440), Materials.BioMediumSterilized.getFluid(1440L), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000) + Materials.SuperCoolant.getFluid(10_000L), }, ItemList.Circuit_Biowaresupercomputer.get(1L), 4000, 500000); @@ -1009,7 +1014,7 @@ public class DreamCraftRecipeLoader { }, new FluidStack[]{ new FluidStack(solderUEV, 2880), Materials.BioMediumSterilized.getFluid(2880L), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 20000) + Materials.SuperCoolant.getFluid(20_000L), }, ItemList.Circuit_Biomainframe.get(1L), 6000, 2000000); @@ -1091,8 +1096,8 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 16L), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16L), - ItemList.Sensor_UEV.get(16L), - ItemList.Emitter_UEV.get(16L), + ItemList.Sensor_UMV.get(16L), + ItemList.Emitter_UMV.get(16L), GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 16L) }, @@ -1122,9 +1127,9 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), - ItemList.Electric_Motor_UEV.get(64L), - ItemList.Electric_Piston_UEV.get(64L), - ItemList.Field_Generator_UEV.get(16L), + ItemList.Electric_Motor_UMV.get(64L), + ItemList.Electric_Piston_UMV.get(64L), + ItemList.Field_Generator_UMV.get(16L), getItemContainer("QuantumCircuit").get(1L).splitStack(32), }, new FluidStack[]{ @@ -1177,7 +1182,7 @@ public class DreamCraftRecipeLoader { 32_000_000, 4096, 32_000_000, 1, new Object[]{ ItemList.Casing_Dim_Bridge.get(4), GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 16L, 12730), - getItemContainer("Hatch_Energy_UIV").get(4L), + getItemContainer("Hatch_Energy_UEV").get(4L), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 6), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -1260,21 +1265,21 @@ public class DreamCraftRecipeLoader { Fluid oganesson = FluidRegistry.getFluid("oganesson"); //Deep Dark Portal TT_recipeAdder.addResearchableAssemblylineRecipe(GT_ModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier8", 1, 0), - 16777216, 2048, 2000000, 64, new Object[]{ + 16_777_216, 2048, 2_000_000, 64, new Object[]{ GT_ModHandler.getModItem("ExtraUtilities", "cobblestone_compressed", 1, 7), GT_ModHandler.getModItem("IC2", "blockMachine2", 1, 0), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), - new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1}, - new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1}, - new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1}, - new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1}, + new Object[]{OrePrefixes.circuit.get(Materials.Quantum), 1}, + new Object[]{OrePrefixes.circuit.get(Materials.Quantum), 1}, + new Object[]{OrePrefixes.circuit.get(Materials.Quantum), 1}, + new Object[]{OrePrefixes.circuit.get(Materials.Quantum), 1}, GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 32, 0), - ItemList.Robot_Arm_UEV.get(4), - ItemList.Emitter_UEV.get(4), - ItemList.Sensor_UEV.get(4), + ItemList.Robot_Arm_UMV.get(4), + ItemList.Emitter_UMV.get(4), + ItemList.Sensor_UMV.get(4), }, new FluidStack[]{ oganesson != null ? new FluidStack(oganesson, 50000) : null, - Materials.Infinity.getMolten(9216L), + Materials.Infinity.getMolten(144L*512), Materials.Cheese.getMolten(232000L), }, ItemList.Block_BedrockiumCompressed.get(1), 10000, 5000000); @@ -3069,6 +3074,163 @@ public class DreamCraftRecipeLoader { } + private void add_wireless_energy_recipes() { + + Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null ? FluidRegistry.getFluid("molten.mutatedlivingsolder") : FluidRegistry.getFluid("molten.solderingalloy"); + + int recipe_duration_ticks = 20*20; + int recipe_eu_per_tick = 128_000_000; + + int research_eu_per_tick = 128_000_000; + int research_amperage = 4; + int comp_per_second = 2000; + int total_computation = 500_000; + + ItemStack[] energy_hatches = { + ItemList.Hatch_Energy_ULV.get(1), + ItemList.Hatch_Energy_LV.get(1), + ItemList.Hatch_Energy_MV.get(1), + ItemList.Hatch_Energy_HV.get(1), + ItemList.Hatch_Energy_EV.get(1), + ItemList.Hatch_Energy_IV.get(1), + ItemList.Hatch_Energy_LuV.get(1), + ItemList.Hatch_Energy_ZPM.get(1), + ItemList.Hatch_Energy_UV.get(1), + ItemList.Hatch_Energy_MAX.get(1), + getItemContainer("Hatch_Energy_UEV").get(1L), + getItemContainer("Hatch_Energy_UIV").get(1L), + getItemContainer("Hatch_Energy_UMV").get(1L) + }; + + ItemStack[] dynamo_hatches = { + ItemList.Hatch_Dynamo_ULV.get(1), + ItemList.Hatch_Dynamo_LV.get(1), + ItemList.Hatch_Dynamo_MV.get(1), + ItemList.Hatch_Dynamo_HV.get(1), + ItemList.Hatch_Dynamo_EV.get(1), + ItemList.Hatch_Dynamo_IV.get(1), + ItemList.Hatch_Dynamo_LuV.get(1), + ItemList.Hatch_Dynamo_ZPM.get(1), + ItemList.Hatch_Dynamo_UV.get(1), + ItemList.Hatch_Dynamo_MAX.get(1), + getItemContainer("Hatch_Dynamo_UEV").get(1L), + getItemContainer("Hatch_Dynamo_UIV").get(1L), + getItemContainer("Hatch_Dynamo_UMV").get(1L) + }; + + Object[] circuits_tier_plus_two = { + new Object[]{OrePrefixes.circuit.get(Materials.Good), 1L}, // MV + new Object[]{OrePrefixes.circuit.get(Materials.Advanced), 1L}, // HV + new Object[]{OrePrefixes.circuit.get(Materials.Data), 1L}, // EV + new Object[]{OrePrefixes.circuit.get(Materials.Elite), 1L}, // IV + new Object[]{OrePrefixes.circuit.get(Materials.Master), 1L}, // LuV + new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 1L}, // ZPM + new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 1L}, // UV + new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 1L}, // UHV + new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L}, // UEV + new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1L}, // UIV + new Object[]{OrePrefixes.circuit.get(Materials.Piko), 1L}, // UMV + new Object[]{OrePrefixes.circuit.get(Materials.Quantum), 1L}, // UXV + new Object[]{OrePrefixes.circuit.get(Materials.Transcendent), 1L}, // MAX + }; + + ItemStack[] wireless_hatches = { + ItemList.Wireless_Hatch_Energy_ULV.get(1), + ItemList.Wireless_Hatch_Energy_LV.get(1), + ItemList.Wireless_Hatch_Energy_MV.get(1), + ItemList.Wireless_Hatch_Energy_HV.get(1), + ItemList.Wireless_Hatch_Energy_EV.get(1), + ItemList.Wireless_Hatch_Energy_IV.get(1), + ItemList.Wireless_Hatch_Energy_LuV.get(1), + ItemList.Wireless_Hatch_Energy_ZPM.get(1), + ItemList.Wireless_Hatch_Energy_UV.get(1), + ItemList.Wireless_Hatch_Energy_UHV.get(1), + ItemList.Wireless_Hatch_Energy_UEV.get(1), + ItemList.Wireless_Hatch_Energy_UIV.get(1), + ItemList.Wireless_Hatch_Energy_UMV.get(1), + }; + + ItemStack[] wireless_dynamos = { + ItemList.Wireless_Dynamo_Energy_ULV.get(1), + ItemList.Wireless_Dynamo_Energy_LV.get(1), + ItemList.Wireless_Dynamo_Energy_MV.get(1), + ItemList.Wireless_Dynamo_Energy_HV.get(1), + ItemList.Wireless_Dynamo_Energy_EV.get(1), + ItemList.Wireless_Dynamo_Energy_IV.get(1), + ItemList.Wireless_Dynamo_Energy_LuV.get(1), + ItemList.Wireless_Dynamo_Energy_ZPM.get(1), + ItemList.Wireless_Dynamo_Energy_UV.get(1), + ItemList.Wireless_Dynamo_Energy_UHV.get(1), + ItemList.Wireless_Dynamo_Energy_UEV.get(1), + ItemList.Wireless_Dynamo_Energy_UIV.get(1), + ItemList.Wireless_Dynamo_Energy_UMV.get(1), + }; + + // ------------------------ Wireless EU hatches ------------------------ + + for(int i = 0; i < wireless_hatches.length; i++) { + + TT_recipeAdder.addResearchableAssemblylineRecipe( + + (i==0) ? ItemList.Tesseract.get(1) : wireless_hatches[i-1], + + total_computation, comp_per_second, research_eu_per_tick, research_amperage, + + new Object[]{ + energy_hatches[i], + GT_ModHandler.getModItem("GoodGenerator", "compactFusionCoil", 1), + ItemList.Casing_Coil_Superconductor.get(1), + CustomItemList.Machine_Multi_Transformer.get(1), + CustomItemList.eM_Power.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 2), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 1), + circuits_tier_plus_two[i], + ItemList.EnergisedTesseract.get(1) + }, + + new FluidStack[]{ + new FluidStack(solderUEV, 1296), + Materials.ExcitedDTEC.getFluid(500L) + }, + + wireless_hatches[i], + + recipe_duration_ticks, recipe_eu_per_tick); + } + + // ------------------------ Wireless EU dynamos ------------------------ + + for(int i = 1; i < wireless_hatches.length; i++) { + + TT_recipeAdder.addResearchableAssemblylineRecipe( + + (i==0) ? ItemList.EnergisedTesseract.get(1) : wireless_dynamos[i-1], + + total_computation, comp_per_second, research_eu_per_tick, research_amperage, + + new Object[]{ + dynamo_hatches[i], + GT_ModHandler.getModItem("GoodGenerator", "compactFusionCoil", 1), + ItemList.Casing_Coil_Superconductor.get(1), + CustomItemList.Machine_Multi_Transformer.get(1), + CustomItemList.eM_Power.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 2), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 1), + circuits_tier_plus_two[i], + ItemList.EnergisedTesseract.get(1) + }, + + new FluidStack[]{ + new FluidStack(solderUEV, 1296), + Materials.ExcitedDTEC.getFluid(500L) + }, + + wireless_dynamos[i], + + recipe_duration_ticks, recipe_eu_per_tick); + } + } + private void register_machine_EM_behaviours() { GT_MetaTileEntity_EM_machine.registerBehaviour(() -> new Behaviour_Centrifuge(5), ItemList.Machine_IV_Centrifuge.get(1)); GT_MetaTileEntity_EM_machine.registerBehaviour(() -> new Behaviour_Centrifuge(6), getItemContainer("CentrifugeLuV").get(1)); diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java index 23bf1d308e..e77e057d94 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java @@ -51,13 +51,13 @@ public class BaseRecipeLoader { new ItemStack(StructureLibAPI.getBlockHint(), 1, i), 32, 120); } - //Scrench -// GT_ModHandler.addCraftingRecipe(new ItemStack(FrontRotationTriggerItem.INSTANCE,1), -// GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, -// new Object[]{"fPR", " RP", "S h", -// 'P', OrePrefixes.plate.get(Materials.Cobalt), -// 'R', OrePrefixes.stick.get(Materials.Cobalt), -// 'S', OrePrefixes.stick.get(Materials.Wood),}); + //Front Rotation Tool + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem(StructureLibAPI.MOD_ID, "item.structurelib.frontRotationTool", 1L, 0), + GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[]{"fPR", " RP", "S h", + 'P', OrePrefixes.plate.get(Materials.Cobalt), + 'R', OrePrefixes.stick.get(Materials.Cobalt), + 'S', OrePrefixes.stick.get(Materials.Wood),}); //BLUEprint // GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1), diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java index 1a5ad6a69c..ca1d872ed1 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.mechanics.enderStorage; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -10,8 +11,11 @@ import java.io.Serializable; public class EnderFluidContainer implements IFluidHandler, Serializable { private static final int CAPACITY = 64000; + @Deprecated() private int fluidID = -1; + @Deprecated() private int fluidQuantity = 0; + private NBTTagCompound fluid; public EnderFluidContainer() { } @@ -19,18 +23,21 @@ public class EnderFluidContainer implements IFluidHandler, Serializable { private FluidStack getFluidStack() { FluidStack fluidStack = null; if (fluidID >= 0) { - fluidStack = new FluidStack(fluidID, fluidQuantity); + fluid = new FluidStack(fluidID, fluidQuantity).writeToNBT(new NBTTagCompound()); + fluidID = -1; + fluidQuantity = 0; + } + if (fluid != null) { + fluidStack = FluidStack.loadFluidStackFromNBT(fluid); } return fluidStack; } private void setFluidStack(FluidStack fluidStack) { - if (fluidStack != null && fluidStack.amount != 0) { - fluidID = fluidStack.getFluidID(); - fluidQuantity = fluidStack.amount; + if (fluidStack != null) { + fluid = fluidStack.writeToNBT(new NBTTagCompound()); } else { - fluidID = -1; - fluidQuantity = 0; + fluid = null; } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java index 20b690a3e8..f3fc2145a6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java @@ -111,15 +111,6 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac } @Override - public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (aBaseMetaTileEntity.isServerSide() && (aTick & 0xF) == 0) { - if(aBaseMetaTileEntity.isActive()) { - aBaseMetaTileEntity.decreaseStoredEnergyUnits(CommonValues.V[mTier] >> 2, true); - } - } - } - - @Override public boolean isFacingValid(byte aFacing) { return true; } |