From 419a331f6df76e8cf3e1bd4a9a64a0bd9ee1774f Mon Sep 17 00:00:00 2001 From: Boblet Date: Mon, 15 Nov 2021 11:19:53 +0100 Subject: [PATCH] fixed some tasty garbage --- src/main/java/com/hbm/explosion/nt/Mark5Ausf2.java | 5 +++++ src/main/java/com/hbm/handler/FluidTypeHandler.java | 2 +- .../java/com/hbm/inventory/recipes/MachineRecipes.java | 7 +++++++ .../com/hbm/items/machine/ItemChemistryTemplate.java | 5 ++++- src/main/java/com/hbm/lib/RefStrings.java | 2 +- src/main/java/com/hbm/packet/AuxButtonPacket.java | 2 +- .../machine/TileEntityMachineReactorSmall.java | 10 +++++----- src/main/resources/assets/hbm/lang/de_DE.lang | 3 +++ src/main/resources/assets/hbm/lang/en_US.lang | 3 +++ src/main/resources/mcmod.info | 2 +- 10 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/hbm/explosion/nt/Mark5Ausf2.java b/src/main/java/com/hbm/explosion/nt/Mark5Ausf2.java index 6097939c7..4f9c2498e 100644 --- a/src/main/java/com/hbm/explosion/nt/Mark5Ausf2.java +++ b/src/main/java/com/hbm/explosion/nt/Mark5Ausf2.java @@ -10,6 +10,11 @@ import net.minecraft.init.Blocks; import net.minecraft.util.Vec3; import net.minecraft.world.World; +/* + * Turns out segmenting makes the craters ugly and, for whatever reason, doesn't actually improve performance (??????) + * Ausf3 will use the same approach as MK4 but with some optimizations regarding setBlock redundancy and getBlock operations + * See: docvt7 + */ public class Mark5Ausf2 implements IExplosionLogic { //holds rays after being calculated up to where the blocks get removed diff --git a/src/main/java/com/hbm/handler/FluidTypeHandler.java b/src/main/java/com/hbm/handler/FluidTypeHandler.java index 8027d6194..d9050065a 100644 --- a/src/main/java/com/hbm/handler/FluidTypeHandler.java +++ b/src/main/java/com/hbm/handler/FluidTypeHandler.java @@ -99,7 +99,7 @@ public class FluidTypeHandler { DEATH (0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), ETHANOL (0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"), HEAVYWATER (0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"), - CARBONDIOXIDE (0x747474, 6, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide"); + CARBONDIOXIDE (0x747474, 11, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide"); //Approximate HEX Color of the fluid, used for pipe rendering private int color; diff --git a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java index 417adf575..7d640cfdf 100644 --- a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java @@ -1737,6 +1737,9 @@ public class MachineRecipes { case CO2: input[0] = new FluidStack(1000, FluidType.GAS); break; + case HEAVY_ELECTROLYSIS: + input[0] = new FluidStack(8000, FluidType.HEAVYWATER); + break; default: break; } @@ -2057,6 +2060,10 @@ public class MachineRecipes { case CO2: output[0] = new FluidStack(1000, FluidType.CARBONDIOXIDE); break; + case HEAVY_ELECTROLYSIS: + output[0] = new FluidStack(400, FluidType.DEUTERIUM); + output[1] = new FluidStack(400, FluidType.OXYGEN); + break; default: break; } diff --git a/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java b/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java index 6d9bc3dd6..94a9080b2 100644 --- a/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java +++ b/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java @@ -107,7 +107,8 @@ public class ItemChemistryTemplate extends Item { OSMIRIDIUM_DEATH, ETHANOL, METH, - CO2; + CO2, + HEAVY_ELECTROLYSIS; public static EnumChemistryTemplate getEnum(int i) { if(i < EnumChemistryTemplate.values().length) @@ -315,6 +316,8 @@ public class ItemChemistryTemplate extends Item { return 30; case CO2: return 60; + case HEAVY_ELECTROLYSIS: + return 150; default: return 100; } diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 112aeaac6..0d6602139 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4053)"; + public static final String VERSION = "1.0.27 BETA (4054)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/packet/AuxButtonPacket.java b/src/main/java/com/hbm/packet/AuxButtonPacket.java index 56173b8a5..f825cdfaf 100644 --- a/src/main/java/com/hbm/packet/AuxButtonPacket.java +++ b/src/main/java/com/hbm/packet/AuxButtonPacket.java @@ -293,7 +293,7 @@ public class AuxButtonPacket implements IMessage { if(m.id == 1) { int fill = zirnox.carbonDioxide.getFill(); zirnox.carbonDioxide.setFill(fill - 1000); - if(fill < 0) { + if(zirnox.carbonDioxide.getFill() < 0) { zirnox.carbonDioxide.setFill(0); } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index fcfe01f07..3504a92a5 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -133,7 +133,7 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI @Override public boolean isItemValidForSlot(int i, ItemStack itemStack) { if(i == 0 || i == 1 || i == 2 || i == 3 || i == 4 || i == 5 || i == 6 || i == 7 || i == 8 || i == 9 || i == 10 || i == 11) - if(itemStack.getItem() instanceof ItemFuelRod) + if(itemStack.getItem().getClass() == ItemFuelRod.class) return true; if(i == 12) if(itemStack.getItem() == ModItems.rod_water || itemStack.getItem() == ModItems.rod_dual_water || itemStack.getItem() == ModItems.rod_quad_water || itemStack.getItem() == Items.water_bucket) @@ -308,7 +308,7 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI for(int i = 0; i < 12; i++) { - if(slots[i] != null && slots[i].getItem() instanceof ItemFuelRod) { + if(slots[i] != null && slots[i].getItem().getClass() == ItemFuelRod.class) { rodMax += ((ItemFuelRod) slots[i].getItem()).lifeTime; rod += ((ItemFuelRod) slots[i].getItem()).lifeTime - ItemFuelRod.getLifeTime(slots[i]); } @@ -362,7 +362,7 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI for(int i = 0; i < 12; i++) { if(slots[i] != null) { - if(slots[i].getItem() instanceof ItemFuelRod) + if(slots[i].getItem().getClass() == ItemFuelRod.class) decay(i); else if(slots[i].getItem() == ModItems.meteorite_sword_bred) slots[i] = new ItemStack(ModItems.meteorite_sword_irradiated); @@ -586,7 +586,7 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI for(int i = 0; i < 12; i++) { - if(slots[i] != null && slots[i].getItem() instanceof ItemFuelRod) + if(slots[i] != null && slots[i].getItem().getClass() == ItemFuelRod.class) count++; } @@ -598,7 +598,7 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI return false; if(slots[id] != null) - return slots[id].getItem() instanceof ItemFuelRod; + return slots[id].getItem().getClass() == ItemFuelRod.class; return false; } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 5aa03ce19..aa40a5e78 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -437,6 +437,7 @@ hbmfluid.balefire=BF-Raketentreibstoff hbmfluid.biofuel=Biodiesel hbmfluid.biogas=Biogas hbmfluid.bitumen=Bitumen +hbmfluid.carbondioxide=Kohlenstoffdioxid hbmfluid.coolant=Kühlflüssigkeit hbmfluid.cryogel=Kryogel hbmfluid.death=Osmiridiumlösung @@ -448,6 +449,8 @@ hbmfluid.gas=Erdgas hbmfluid.gasoline=Bleibenzin hbmfluid.heatingoil=Heizöl hbmfluid.heavyoil=Schweröl +hbmfluid.heavywater=Schweres Wasser +hbmfluid.helium3=Helium-3 hbmfluid.hotoil=Heißes Rohöl hbmfluid.hotsteam=Dichter Dampf hbmfluid.hydrogen=Flüssiger Wasserstoff diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 9e3040be3..329a05d59 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -505,6 +505,7 @@ hbmfluid.balefire=BF Rocket Fuel hbmfluid.biofuel=Biofuel hbmfluid.biogas=Biogas hbmfluid.bitumen=Bitumen +hbmfluid.carbondioxide=Carbondioxide hbmfluid.coolant=Coolant hbmfluid.cryogel=Cryogel hbmfluid.death=Osmiridic Solution @@ -516,6 +517,8 @@ hbmfluid.gas=Natural Gas hbmfluid.gasoline=Leaded Gasoline hbmfluid.heatingoil=Heating Oil hbmfluid.heavyoil=Heavy Oil +hbmfluid.heavywater=Heavy Water +hbmfluid.helium3=Helium-3 hbmfluid.hotoil=Hot Crude Oil hbmfluid.hotsteam=Dense Steam hbmfluid.hydrogen=Liquid Hydrogen diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index cd746a0fd..6d82b37ec 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27_X4053", + "version":"1.0.27_X4054", "mcversion": "1.7.10", "url": "", "updateUrl": "",