fixed some tasty garbage

This commit is contained in:
Boblet 2021-11-15 11:19:53 +01:00
parent bba17b713f
commit 419a331f6d
10 changed files with 31 additions and 10 deletions

View File

@ -10,6 +10,11 @@ import net.minecraft.init.Blocks;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.World; 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 { public class Mark5Ausf2 implements IExplosionLogic {
//holds rays after being calculated up to where the blocks get removed //holds rays after being calculated up to where the blocks get removed

View File

@ -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), 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"), ETHANOL (0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"),
HEAVYWATER (0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"), 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 //Approximate HEX Color of the fluid, used for pipe rendering
private int color; private int color;

View File

@ -1737,6 +1737,9 @@ public class MachineRecipes {
case CO2: case CO2:
input[0] = new FluidStack(1000, FluidType.GAS); input[0] = new FluidStack(1000, FluidType.GAS);
break; break;
case HEAVY_ELECTROLYSIS:
input[0] = new FluidStack(8000, FluidType.HEAVYWATER);
break;
default: default:
break; break;
} }
@ -2057,6 +2060,10 @@ public class MachineRecipes {
case CO2: case CO2:
output[0] = new FluidStack(1000, FluidType.CARBONDIOXIDE); output[0] = new FluidStack(1000, FluidType.CARBONDIOXIDE);
break; break;
case HEAVY_ELECTROLYSIS:
output[0] = new FluidStack(400, FluidType.DEUTERIUM);
output[1] = new FluidStack(400, FluidType.OXYGEN);
break;
default: default:
break; break;
} }

View File

@ -107,7 +107,8 @@ public class ItemChemistryTemplate extends Item {
OSMIRIDIUM_DEATH, OSMIRIDIUM_DEATH,
ETHANOL, ETHANOL,
METH, METH,
CO2; CO2,
HEAVY_ELECTROLYSIS;
public static EnumChemistryTemplate getEnum(int i) { public static EnumChemistryTemplate getEnum(int i) {
if(i < EnumChemistryTemplate.values().length) if(i < EnumChemistryTemplate.values().length)
@ -315,6 +316,8 @@ public class ItemChemistryTemplate extends Item {
return 30; return 30;
case CO2: case CO2:
return 60; return 60;
case HEAVY_ELECTROLYSIS:
return 150;
default: default:
return 100; return 100;
} }

View File

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings { public class RefStrings {
public static final String MODID = "hbm"; public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod"; 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: //HBM's Beta Naming Convention:
//V T (X) //V T (X)
//V -> next release version //V -> next release version

View File

@ -293,7 +293,7 @@ public class AuxButtonPacket implements IMessage {
if(m.id == 1) { if(m.id == 1) {
int fill = zirnox.carbonDioxide.getFill(); int fill = zirnox.carbonDioxide.getFill();
zirnox.carbonDioxide.setFill(fill - 1000); zirnox.carbonDioxide.setFill(fill - 1000);
if(fill < 0) { if(zirnox.carbonDioxide.getFill() < 0) {
zirnox.carbonDioxide.setFill(0); zirnox.carbonDioxide.setFill(0);
} }
} }

View File

@ -133,7 +133,7 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI
@Override @Override
public boolean isItemValidForSlot(int i, ItemStack itemStack) { 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(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; return true;
if(i == 12) 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) 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++) { 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; rodMax += ((ItemFuelRod) slots[i].getItem()).lifeTime;
rod += ((ItemFuelRod) slots[i].getItem()).lifeTime - ItemFuelRod.getLifeTime(slots[i]); 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++) { for(int i = 0; i < 12; i++) {
if(slots[i] != null) { if(slots[i] != null) {
if(slots[i].getItem() instanceof ItemFuelRod) if(slots[i].getItem().getClass() == ItemFuelRod.class)
decay(i); decay(i);
else if(slots[i].getItem() == ModItems.meteorite_sword_bred) else if(slots[i].getItem() == ModItems.meteorite_sword_bred)
slots[i] = new ItemStack(ModItems.meteorite_sword_irradiated); 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++) { 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++; count++;
} }
@ -598,7 +598,7 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI
return false; return false;
if(slots[id] != null) if(slots[id] != null)
return slots[id].getItem() instanceof ItemFuelRod; return slots[id].getItem().getClass() == ItemFuelRod.class;
return false; return false;
} }

View File

@ -437,6 +437,7 @@ hbmfluid.balefire=BF-Raketentreibstoff
hbmfluid.biofuel=Biodiesel hbmfluid.biofuel=Biodiesel
hbmfluid.biogas=Biogas hbmfluid.biogas=Biogas
hbmfluid.bitumen=Bitumen hbmfluid.bitumen=Bitumen
hbmfluid.carbondioxide=Kohlenstoffdioxid
hbmfluid.coolant=Kühlflüssigkeit hbmfluid.coolant=Kühlflüssigkeit
hbmfluid.cryogel=Kryogel hbmfluid.cryogel=Kryogel
hbmfluid.death=Osmiridiumlösung hbmfluid.death=Osmiridiumlösung
@ -448,6 +449,8 @@ hbmfluid.gas=Erdgas
hbmfluid.gasoline=Bleibenzin hbmfluid.gasoline=Bleibenzin
hbmfluid.heatingoil=Heizöl hbmfluid.heatingoil=Heizöl
hbmfluid.heavyoil=Schweröl hbmfluid.heavyoil=Schweröl
hbmfluid.heavywater=Schweres Wasser
hbmfluid.helium3=Helium-3
hbmfluid.hotoil=Heißes Rohöl hbmfluid.hotoil=Heißes Rohöl
hbmfluid.hotsteam=Dichter Dampf hbmfluid.hotsteam=Dichter Dampf
hbmfluid.hydrogen=Flüssiger Wasserstoff hbmfluid.hydrogen=Flüssiger Wasserstoff

View File

@ -505,6 +505,7 @@ hbmfluid.balefire=BF Rocket Fuel
hbmfluid.biofuel=Biofuel hbmfluid.biofuel=Biofuel
hbmfluid.biogas=Biogas hbmfluid.biogas=Biogas
hbmfluid.bitumen=Bitumen hbmfluid.bitumen=Bitumen
hbmfluid.carbondioxide=Carbondioxide
hbmfluid.coolant=Coolant hbmfluid.coolant=Coolant
hbmfluid.cryogel=Cryogel hbmfluid.cryogel=Cryogel
hbmfluid.death=Osmiridic Solution hbmfluid.death=Osmiridic Solution
@ -516,6 +517,8 @@ hbmfluid.gas=Natural Gas
hbmfluid.gasoline=Leaded Gasoline hbmfluid.gasoline=Leaded Gasoline
hbmfluid.heatingoil=Heating Oil hbmfluid.heatingoil=Heating Oil
hbmfluid.heavyoil=Heavy Oil hbmfluid.heavyoil=Heavy Oil
hbmfluid.heavywater=Heavy Water
hbmfluid.helium3=Helium-3
hbmfluid.hotoil=Hot Crude Oil hbmfluid.hotoil=Hot Crude Oil
hbmfluid.hotsteam=Dense Steam hbmfluid.hotsteam=Dense Steam
hbmfluid.hydrogen=Liquid Hydrogen hbmfluid.hydrogen=Liquid Hydrogen

View File

@ -3,7 +3,7 @@
"modid": "hbm", "modid": "hbm",
"name": "Hbm's Nuclear Tech", "name": "Hbm's Nuclear Tech",
"description": "A mod that adds weapons, nuclear themed stuff and machines", "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", "mcversion": "1.7.10",
"url": "", "url": "",
"updateUrl": "", "updateUrl": "",