From aa273e3e1aaa64f4fa8693c7d8ca437b10333207 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 30 Aug 2020 00:26:20 +0200 Subject: [PATCH] fixed some console spam, added and changed recipes --- .../com/hbm/inventory/AssemblerRecipes.java | 13 +++++++++-- .../hbm/tileentity/TileEntityProxyCombo.java | 19 +++++++++++++++ .../tileentity/machine/TileEntityITER.java | 2 ++ .../TileEntityMachineReactorSmall.java | 23 +++++++++++++++---- .../machine/TileEntityMachineTransformer.java | 2 ++ 5 files changed, 52 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hbm/inventory/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/AssemblerRecipes.java index ac06aa242..6d0d11f91 100644 --- a/src/main/java/com/hbm/inventory/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/AssemblerRecipes.java @@ -151,7 +151,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.magnet_dee, 1), new AStack[] {new ComparableStack(ModBlocks.fusion_conductor, 6), new OreDictStack("ingotSteel", 3), new ComparableStack(ModItems.coil_advanced_torus, 1), },100); makeRecipe(new ComparableStack(ModItems.magnet_circular, 1), new AStack[] {new ComparableStack(ModBlocks.fusion_conductor, 5), new OreDictStack("ingotSteel", 4), new ComparableStack(ModItems.plate_advanced_alloy, 6), },150); makeRecipe(new ComparableStack(ModItems.cyclotron_tower, 1), new AStack[] {new ComparableStack(ModItems.magnet_circular, 6), new ComparableStack(ModItems.magnet_dee, 3), new OreDictStack("plateSteel", 12), new ComparableStack(ModItems.wire_advanced_alloy, 8), new ComparableStack(ModItems.plate_polymer, 24), },300); - makeRecipe(new ComparableStack(ModItems.reactor_core, 1), new AStack[] {new OreDictStack("ingotLead", 4), new OreDictStack("plateSteel", 4), new OreDictStack("plateDenseLead", 4), },100); + makeRecipe(new ComparableStack(ModItems.reactor_core, 1), new AStack[] {new OreDictStack("ingotLead", 8), new OreDictStack("ingotBeryllium", 6), new OreDictStack("plateSteel", 16), new OreDictStack("plateDenseLead", 8), new ComparableStack(ModItems.ingot_fiberglass, 2) },100); makeRecipe(new ComparableStack(ModItems.rtg_unit, 1), new AStack[] {new ComparableStack(ModItems.thermo_element, 3), new ComparableStack(ModItems.board_copper, 1), new OreDictStack("ingotLead", 2), new OreDictStack("plateSteel", 2), new ComparableStack(ModItems.circuit_copper, 1), },100); makeRecipe(new ComparableStack(ModItems.thermo_unit_empty, 1), new AStack[] {new ComparableStack(ModItems.coil_copper_torus, 3), new OreDictStack("ingotSteel", 3), new OreDictStack("plateTitanium", 6), new ComparableStack(ModItems.plate_polymer, 12), },100); makeRecipe(new ComparableStack(ModItems.levitation_unit, 1), new AStack[] {new ComparableStack(ModItems.coil_copper, 4), new ComparableStack(ModItems.coil_tungsten, 2), new OreDictStack("plateTitanium", 6), new ComparableStack(ModItems.nugget_schrabidium, 2), },100); @@ -259,7 +259,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModBlocks.blast_door, 1), new AStack[] {new OreDictStack("ingotSteel", 16), new OreDictStack("ingotTungsten", 8), new OreDictStack("plateLead", 12), new ComparableStack(ModItems.plate_advanced_alloy, 3), new ComparableStack(ModItems.plate_polymer, 3), new ComparableStack(ModItems.bolt_tungsten, 3), new ComparableStack(ModItems.bolt_dura_steel, 3), new ComparableStack(ModItems.motor, 1), },300); makeRecipe(new ComparableStack(ModBlocks.machine_centrifuge, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_tower, 1), new OreDictStack("ingotSteel", 4), new OreDictStack("ingotIron", 4), new OreDictStack("plateSteel", 2), new OreDictStack("plateCopper", 2), new ComparableStack(ModItems.wire_red_copper, 8), },250); makeRecipe(new ComparableStack(ModBlocks.machine_gascent, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_tower, 1), new OreDictStack("ingotSteel", 4), new ComparableStack(ModItems.ingot_polymer, 4), new OreDictStack("ingotDesh", 2), new OreDictStack("plateSteel", 6), new ComparableStack(ModItems.plate_advanced_alloy, 4), new ComparableStack(ModItems.wire_red_copper, 8), new ComparableStack(ModItems.wire_gold, 4), },300); - makeRecipe(new ComparableStack(ModBlocks.machine_reactor, 1), new AStack[] {new ComparableStack(ModItems.reactor_core, 1), new OreDictStack("ingotLead", 4), new OreDictStack("ingotSteel", 2), new OreDictStack("plateSteel", 4), },150); + makeRecipe(new ComparableStack(ModBlocks.machine_reactor, 1), new AStack[] {new ComparableStack(ModItems.reactor_core, 1), new OreDictStack("ingotSteel", 12), new OreDictStack("plateLead", 16), new ComparableStack(ModBlocks.reinforced_glass, 4), new ComparableStack(ModItems.ingot_asbestos, 4)},150); makeRecipe(new ComparableStack(ModBlocks.machine_rtg_furnace_off, 1), new AStack[] {new ComparableStack(Blocks.furnace, 1), new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack("plateLead", 6), new OreDictStack("plateDenseLead", 4), new OreDictStack("plateCopper", 2), },150); makeRecipe(new ComparableStack(ModBlocks.machine_radgen, 1), new AStack[] {new OreDictStack("ingotSteel", 8), new OreDictStack("plateSteel", 32), new ComparableStack(ModItems.coil_magnetized_tungsten, 6), new ComparableStack(ModItems.wire_magnetized_tungsten, 24), new ComparableStack(ModItems.circuit_gold, 4), new ComparableStack(ModItems.reactor_core, 3), new ComparableStack(ModItems.ingot_starmetal, 1), new OreDictStack("dyeRed", 1), },400); makeRecipe(new ComparableStack(ModBlocks.machine_diesel, 1), new AStack[] {new ComparableStack(ModItems.hull_small_steel, 4), new ComparableStack(Blocks.piston, 4), new OreDictStack("ingotSteel", 6), new OreDictStack("ingotRedCopperAlloy", 2), new OreDictStack("plateCopper", 4), new ComparableStack(ModItems.wire_red_copper, 6), },200); @@ -462,6 +462,15 @@ public class AssemblerRecipes { new ComparableStack(ModItems.ingot_u238m2), new ComparableStack(ModItems.ingot_fiberglass, 128) }, 1200); + makeRecipe(new ComparableStack(ModBlocks.struct_iter_core, 1), new AStack[] { + new OreDictStack("ingotSteel", 6), + new OreDictStack("ingotTungsten", 6), + new OreDictStack("plateDenseLead", 12), + new ComparableStack(ModItems.coil_advanced_alloy, 12), + new ComparableStack(ModItems.ingot_polymer, 8), + new ComparableStack(ModItems.circuit_red_copper, 24), + new ComparableStack(ModItems.circuit_gold, 12) + }, 600); } private static void makeRecipe(ComparableStack out, AStack[] in, int duration) { diff --git a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java index 0d1fb030d..23d80c82a 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java +++ b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java @@ -10,6 +10,7 @@ import com.hbm.inventory.FluidTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; public class TileEntityProxyCombo extends TileEntityProxyBase implements IConsumer, IFluidAcceptor, ISidedInventory { @@ -331,5 +332,23 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IConsum return false; } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + this.inventory = nbt.getBoolean("inv"); + this.power = nbt.getBoolean("power"); + this.fluid = nbt.getBoolean("fluid"); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setBoolean("inv", inventory); + nbt.setBoolean("power", power); + nbt.setBoolean("fluid", fluid); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index 4a03ff908..901884b7e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -376,6 +376,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IConsumer, super.readFromNBT(nbt); this.power = nbt.getLong("power"); + this.isOn = nbt.getBoolean("isOn"); tanks[0].readFromNBT(nbt, "water"); tanks[1].readFromNBT(nbt, "steam"); @@ -387,6 +388,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IConsumer, super.writeToNBT(nbt); nbt.setLong("power", this.power); + nbt.setBoolean("isOn", isOn); tanks[0].writeToNBT(nbt, "water"); tanks[1].writeToNBT(nbt, "steam"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index b96c62f8c..5fc8c1d7b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.machine.MachineReactor; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidAcceptor; @@ -524,11 +525,23 @@ public class TileEntityMachineReactorSmall extends TileEntity tanks[1].setFill(tanks[1].getFill() + 5); } - } else if(te instanceof TileEntityMachineReactor) { - TileEntityMachineReactor reactor = (TileEntityMachineReactor)te; - if(reactor.charge <= 1 && this.hullHeat > 0) { - reactor.charge = 1; - reactor.heat = (int)Math.floor(hullHeat * 4 / maxHullHeat) + 1; + } else if(b == ModBlocks.machine_reactor) { + + int[] pos = ((MachineReactor)ModBlocks.machine_reactor).findCore(worldObj, x, y, z); + + if(pos != null) { + + TileEntity tile = worldObj.getTileEntity(pos[0], pos[1], pos[2]); + + if(tile instanceof TileEntityMachineReactor) { + + TileEntityMachineReactor reactor = (TileEntityMachineReactor)tile; + + if(reactor.charge <= 1 && this.hullHeat > 0) { + reactor.charge = 1; + reactor.heat = (int)Math.floor(hullHeat * 4 / maxHullHeat) + 1; + } + } } } else if(te instanceof TileEntityNukeFurnace) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTransformer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTransformer.java index 0c2413cfb..38c678b45 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTransformer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTransformer.java @@ -19,6 +19,8 @@ public class TileEntityMachineTransformer extends TileEntity implements ISource, boolean tact; int age; + public TileEntityMachineTransformer() { } + public TileEntityMachineTransformer(long buffer, int d) { maxPower = buffer; delay = d;