xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

preliminary changes

Browse Source
This commit is contained in:
Vaern 2024-05-26 23:02:54 -07:00
parent 9f567135d2
commit 6f86dc4db2
35 changed files with 111 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/hbm/crafting/WeaponRecipes.java
View File

@ -139,7 +139,7 @@ public class WeaponRecipes {
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_b92), new Object[] { "DDD", "SSC", " R", 'D', ModItems.plate_dineutronium, 'S', STAR.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BISMOID), 'R', ModItems.gun_revolver_schrabidium });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_b93), new Object[] { "PCE", "SEB", "PCE", 'P', ModItems.plate_dineutronium, 'C', ModItems.weaponized_starblaster_cell, 'E', ModItems.component_emitter, 'B', ModItems.gun_b92, 'S', ModItems.singularity_spark });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_b92_ammo, 1), new Object[] { "PSP", "ESE", "PSP", 'P', STEEL.plate(), 'S', STAR.ingot(), 'E', ModItems.powder_spark_mix });
CraftingManager.addShapelessAuto(new ItemStack(ModItems.weaponized_starblaster_cell, 1), new Object[] { new ItemStack(ModItems.fluid_tank_full, 1, Fluids.ACID.getID()), GunB92Cell.getFullCell(), CU.wireFine() });
CraftingManager.addShapelessAuto(new ItemStack(ModItems.weaponized_starblaster_cell, 1), new Object[] { new ItemStack(ModItems.fluid_tank_full, 1, Fluids.PEROXIDE.getID()), GunB92Cell.getFullCell(), CU.wireFine() });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uzi, 1), new Object[] { "SMS", " PB", " P ", 'S', STEEL.ingot(), 'M', ModItems.mechanism_rifle_2, 'P', STEEL.plate(), 'B', DURA.bolt() });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uzi_silencer, 1), new Object[] { "P ", " P ", " U", 'P', ANY_PLASTIC.ingot(), 'U', ModItems.gun_uzi });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uzi_saturnite, 1), new Object[] { "SMS", " PB", " P ", 'S', BIGMT.ingot(), 'M', ModItems.mechanism_rifle_2, 'P', BIGMT.plate(), 'B', W.bolt() });
@ -348,7 +348,7 @@ public class WeaponRecipes {
CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_mirv, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_smart, 'C', ModItems.grenade_generic });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_breach, 1), new Object[] { "G", "G", "P", 'G', ModItems.grenade_smart, 'P', BIGMT.plate() });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_burst, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_breach, 'C', ModItems.grenade_generic });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_cloud), new Object[] { "SPS", "CAC", "SPS", 'S', S.dust(), 'P', ModItems.powder_poison, 'C', CU.dust(), 'A', new ItemStack(ModItems.fluid_tank_full, 1, Fluids.ACID.getID()) });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_cloud), new Object[] { "SPS", "CAC", "SPS", 'S', S.dust(), 'P', ModItems.powder_poison, 'C', CU.dust(), 'A', new ItemStack(ModItems.fluid_tank_full, 1, Fluids.PEROXIDE.getID()) });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_pink_cloud), new Object[] { " S ", "ECE", " E ", 'S', ModItems.powder_spark_mix, 'E', ModItems.powder_magic, 'C', ModItems.grenade_cloud });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.nuclear_waste_pearl), new Object[] { "WWW", "WFW", "WWW", 'W', ModItems.nuclear_waste_tiny, 'F', ModBlocks.block_fallout });
CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_kyiv), new Object[] { ModItems.canister_napalm, ModItems.bottle2_empty, ModItems.rag });

11
src/main/java/com/hbm/entity/item/EntityDeliveryDrone.java
View File

@ -2,6 +2,7 @@ package com.hbm.entity.item;
import com.hbm.entity.logic.IChunkLoader;
import com.hbm.inventory.FluidStack;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.main.MainRegistry;
@ -73,7 +74,7 @@ public class EntityDeliveryDrone extends EntityDroneBase implements IInventory,
nbt.setTag("Items", nbttaglist);
if(fluid != null) {
nbt.setString("fluidType", fluid.type.getName());
nbt.setInteger("fluidType", fluid.type.getID());
nbt.setInteger("fluidAmount", fluid.fill);
}
@ -98,7 +99,13 @@ public class EntityDeliveryDrone extends EntityDroneBase implements IInventory,
}
if(nbt.hasKey("fluidType")) {
this.fluid = new FluidStack(Fluids.fromName(nbt.getString("fluidType")), nbt.getInteger("fluidAmount"));
FluidType type = Fluids.fromNameCompat(nbt.getString("fluidType"));
if(type != Fluids.NONE) {
nbt.removeTag(nbt.getString("fluidType"));
} else
type = Fluids.fromID(nbt.getInteger("fluidType"));
this.fluid = new FluidStack(type, nbt.getInteger("fluidAmount"));
}
this.dataWatcher.updateObject(11, nbt.getByte("load"));

2
src/main/java/com/hbm/handler/ToolAbility.java
View File

@ -441,7 +441,7 @@ public abstract class ToolAbility {
block = Blocks.redstone_ore;
ItemStack stack = new ItemStack(block, 1, meta);
CrystallizerRecipe result = CrystallizerRecipes.getOutput(stack, Fluids.ACID);
CrystallizerRecipe result = CrystallizerRecipes.getOutput(stack, Fluids.PEROXIDE);
if(result != null) {
world.setBlockToAir(x, y, z);

2
src/main/java/com/hbm/handler/imc/IMCCrystallizer.java
View File

@ -40,7 +40,7 @@ public class IMCCrystallizer extends IMCHandler {
time = 600;
if(acid.type == Fluids.NONE)
acid = new FluidStack(Fluids.ACID, 500);
acid = new FluidStack(Fluids.PEROXIDE, 500);
CrystallizerRecipe recipe = new CrystallizerRecipe(out, time);
recipe.acidAmount = acid.fill;

42
src/main/java/com/hbm/inventory/fluid/Fluids.java
View File

@ -9,6 +9,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import com.google.common.collect.HashBiMap;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@ -83,7 +84,7 @@ public class Fluids {
public static FluidType SCHRABIDIC;
public static FluidType AMAT;
public static FluidType ASCHRAB;
public static FluidType ACID;
public static FluidType PEROXIDE;
public static FluidType WATZ;
public static FluidType CRYOGEL;
public static FluidType HYDROGEN;
@ -175,6 +176,8 @@ public class Fluids {
public static FluidType FULLERENE;
public static FluidType STELLAR_FLUX;
public static final HashBiMap<String, FluidType> renameMapping = HashBiMap.create();
public static List<FluidType> customFluids = new ArrayList();
private static final HashMap<Integer, FluidType> idMapping = new HashMap();
@ -265,7 +268,7 @@ public class Fluids {
SCHRABIDIC = new FluidType("SCHRABIDIC", 0x006B6B, 5, 0, 5, EnumSymbol.ACID).addTraits(new FT_VentRadiation(1F), new FT_Corrosive(75), new FT_Poison(true, 2), LIQUID);
AMAT = new FluidType("AMAT", 0x010101, 5, 0, 5, EnumSymbol.ANTIMATTER).addTraits(ANTI, GASEOUS);
ASCHRAB = new FluidType("ASCHRAB", 0xb50000, 5, 0, 5, EnumSymbol.ANTIMATTER).addTraits(ANTI, GASEOUS);
ACID = new FluidType("ACID", 0xfff7aa, 3, 0, 3, EnumSymbol.OXIDIZER).addTraits(new FT_Corrosive(40), LIQUID);
PEROXIDE = new FluidType("PEROXIDE", 0xfff7aa, 3, 0, 3, EnumSymbol.OXIDIZER).addTraits(new FT_Corrosive(40), LIQUID);
WATZ = new FluidType("WATZ", 0x86653E, 4, 0, 3, EnumSymbol.ACID).addTraits(new FT_Corrosive(60), new FT_VentRadiation(0.1F), LIQUID, VISCOUS, new FT_Polluting().release(PollutionType.POISON, POISON_EXTREME));
CRYOGEL = new FluidType("CRYOGEL", 0x32ffff, 2, 0, 0, EnumSymbol.CROYGENIC).setTemp(-170).addTraits(LIQUID, VISCOUS);
HYDROGEN = new FluidType("HYDROGEN", 0x4286f4, 3, 4, 0, EnumSymbol.CROYGENIC).setTemp(-260).addContainers(new CD_Gastank(0x4286f4, 0xffffff)).addTraits(new FT_Flammable(5_000), new FT_Combustible(FuelGrade.HIGH, 10_000), LIQUID, EVAP);
@ -484,7 +487,7 @@ public class Fluids {
metaOrder.add(SEEDSLURRY);
metaOrder.add(COLLOID);
metaOrder.add(IONGEL);
metaOrder.add(ACID);
metaOrder.add(PEROXIDE);
metaOrder.add(SULFURIC_ACID);
metaOrder.add(NITRIC_ACID);
metaOrder.add(SOLVENT);
@ -539,6 +542,11 @@ public class Fluids {
metaOrder.add(PHEROMONE);
metaOrder.add(PHEROMONE_M);
//ANY INTERNAL RENAMING MUST BE REFLECTED HERE - DON'T FORGET TO CHANGE: LANG FILES + TYPE'S STRING ID + NAME OF TANK/GUI TEXTURE FILES!
// V
renameMapping.put("ACID", PEROXIDE);
for(FluidType custom : customFluids) metaOrder.add(custom);
CHLORINE.addTraits(new FT_Toxin().addEntry(new ToxinDirectDamage(ModDamageSource.cloud, 2F, 20, HazardClass.GAS_LUNG, false)));
@ -869,6 +877,34 @@ public class Fluids {
return fluid;
}
/** for old worlds with types saved as name, do not use otherwise */
public static FluidType fromNameCompat(String name) {
if(renameMapping.containsKey(name)) {
FluidType fluid = renameMapping.get(name);
if(fluid == null) //null safety never killed nobody
fluid = Fluids.NONE;
return fluid;
}
return fromName(name);
}
/** basically the inverse of the above method */
public static String toNameCompat(FluidType type) {
if(renameMapping.containsValue(type)) {
String name = renameMapping.inverse().get(type);
if(name == null) //ditto
name = Fluids.NONE.getName();
return name;
}
return type.getName();
}
public static FluidType[] getAll() {
return getInOrder(false);
}

2
src/main/java/com/hbm/inventory/fluid/tank/FluidTank.java
View File

@ -301,7 +301,7 @@ public class FluidTank {
fluid = MathHelper.clamp_int(fluid, 0, max);
type = Fluids.fromName(nbt.getString(s + "_type")); //compat
type = Fluids.fromNameCompat(nbt.getString(s + "_type")); //compat
if(type == Fluids.NONE)
type = Fluids.fromID(nbt.getInteger(s + "_type"));

4
src/main/java/com/hbm/inventory/gui/GUISILEX.java
View File

@ -88,7 +88,7 @@ public class GUISILEX extends GuiInfoContainer {
if(silex.tank.getFill() > 0) {
if(silex.tank.getTankType() == Fluids.ACID || silex.fluidConversion.containsKey(silex.tank.getTankType()) || SILEXRecipes.getOutput(new ItemStack(ModItems.fluid_icon, 1, silex.tank.getTankType().getID())) != null) {
if(silex.tank.getTankType() == Fluids.PEROXIDE || silex.fluidConversion.containsKey(silex.tank.getTankType()) || SILEXRecipes.getOutput(new ItemStack(ModItems.fluid_icon, 1, silex.tank.getTankType().getID())) != null) {
drawTexturedModalRect(guiLeft + 7, guiTop + 41, 176, 118, 54, 9);
} else {
drawTexturedModalRect(guiLeft + 7, guiTop + 41, 176, 109, 54, 9);
@ -102,7 +102,7 @@ public class GUISILEX extends GuiInfoContainer {
drawTexturedModalRect(guiLeft + 26, guiTop + 124 - f, 176, 109 - f, 16, f);
int i = silex.getFluidScaled(52);
drawTexturedModalRect(guiLeft + 8, guiTop + 42, 176, silex.tank.getTankType() == Fluids.ACID ? 43 : 50, i, 7);
drawTexturedModalRect(guiLeft + 8, guiTop + 42, 176, silex.tank.getTankType() == Fluids.PEROXIDE ? 43 : 50, i, 7);
}
private void drawWave(int x, int y, int height, int width, float resolution, float freq, int color, float thickness, float mult) {

4
src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java
View File

@ -738,7 +738,7 @@ public class AssemblerRecipes extends SerializableRecipe {
new ComparableStack(ModItems.rocket_fuel, 48),
new ComparableStack(ModItems.ball_tatb, 32),
new OreDictStack(Fluids.KEROSENE_REFORM.getDict(1_000), 12),
new OreDictStack(Fluids.ACID.getDict(1_000), 12),
new OreDictStack(Fluids.PEROXIDE.getDict(1_000), 12),
new ComparableStack(ModItems.circuit, 6, EnumCircuitType.BASIC)
}, 100);
makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, ItemAmmoHIMARS.SMALL_MINI_NUKE), new AStack[] {
@ -771,7 +771,7 @@ public class AssemblerRecipes extends SerializableRecipe {
new ComparableStack(ModItems.rocket_fuel, 36),
new ComparableStack(ModItems.ball_tatb, 24),
new OreDictStack(Fluids.KEROSENE_REFORM.getDict(1_000), 16),
new OreDictStack(Fluids.ACID.getDict(1_000), 16),
new OreDictStack(Fluids.PEROXIDE.getDict(1_000), 16),
new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED),
}, 100);

18
src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java
View File

@ -64,10 +64,10 @@ public class ChemplantRecipes extends SerializableRecipe {
.outputFluids(new FluidStack(Fluids.NITAN, 1000)));
recipes.add(new ChemRecipe(40, "PEROXIDE", 50)
.inputFluids(new FluidStack(Fluids.WATER, 1000))
.outputFluids(new FluidStack(Fluids.ACID, 800)));
.outputFluids(new FluidStack(Fluids.PEROXIDE, 800)));
recipes.add(new ChemRecipe(90, "SULFURIC_ACID", 50)
.inputItems(new OreDictStack(S.dust()))
.inputFluids(new FluidStack(Fluids.ACID, 800))
.inputFluids(new FluidStack(Fluids.PEROXIDE, 800))
.outputFluids(new FluidStack(Fluids.SULFURIC_ACID, 500)));
recipes.add(new ChemRecipe(92, "NITRIC_ACID", 50)
.inputItems(new OreDictStack(KNO.dust()))
@ -142,7 +142,7 @@ public class ChemplantRecipes extends SerializableRecipe {
.inputItems(
new OreDictStack(U.billet(), 2), //12 nuggets: the numbers do match up :)
new OreDictStack(S.dust(), 2))
.inputFluids(new FluidStack(Fluids.ACID, 500))
.inputFluids(new FluidStack(Fluids.PEROXIDE, 500))
.outputItems(new ItemStack(ModItems.powder_yellowcake)));
recipes.add(new ChemRecipe(47, "UF6", 100)
.inputItems(
@ -161,7 +161,7 @@ public class ChemplantRecipes extends SerializableRecipe {
.inputItems(
new OreDictStack(SA326.dust()),
new OreDictStack(S.dust(), 2))
.inputFluids(new FluidStack(Fluids.ACID, 2000))
.inputFluids(new FluidStack(Fluids.PEROXIDE, 2000))
.outputFluids(new FluidStack(Fluids.SAS3, 1000)));
recipes.add(new ChemRecipe(53, "CORDITE", 40)
.inputItems(
@ -236,7 +236,7 @@ public class ChemplantRecipes extends SerializableRecipe {
.inputItems(new ComparableStack(ModItems.pellet_charged))
.inputFluids(
new FluidStack(Fluids.SAS3, 8000),
new FluidStack(Fluids.ACID, 6000))
new FluidStack(Fluids.PEROXIDE, 6000))
.outputFluids(new FluidStack(Fluids.SCHRABIDIC, 16000)));
recipes.add(new ChemRecipe(64, "SCHRABIDATE", 150)
.inputItems(new OreDictStack(IRON.dust()))
@ -247,7 +247,7 @@ public class ChemplantRecipes extends SerializableRecipe {
new OreDictStack(COLTAN.dust(), 2),
new OreDictStack(COAL.dust()))
.inputFluids(
new FluidStack(Fluids.ACID, 250),
new FluidStack(Fluids.PEROXIDE, 250),
new FluidStack(Fluids.HYDROGEN, 500))
.outputItems(
new ItemStack(ModItems.powder_coltan),
@ -265,7 +265,7 @@ public class ChemplantRecipes extends SerializableRecipe {
recipes.add(new ChemRecipe(67, "COLTAN_CRYSTAL", 80)
.inputFluids(
new FluidStack(Fluids.PAIN, 1000),
new FluidStack(Fluids.ACID, 500))
new FluidStack(Fluids.PEROXIDE, 500))
.outputItems(
new ItemStack(ModItems.gem_tantalium),
new ItemStack(ModItems.dust, 3))
@ -328,7 +328,7 @@ public class ChemplantRecipes extends SerializableRecipe {
new ComparableStack(ModItems.powder_paleogenite),
new OreDictStack(F.dust(), 8),
new ComparableStack(ModItems.nugget_bismuth, 4))
.inputFluids(new FluidStack(Fluids.ACID, 1000, 5))
.inputFluids(new FluidStack(Fluids.PEROXIDE, 1000, 5))
.outputFluids(new FluidStack(Fluids.DEATH, 1000, GeneralConfig.enable528 ? 5 : 0)));
//one bucket of ethanol equals 275_000 TU using the diesel baseline0
//the coal baseline is 400_000 per piece
@ -342,7 +342,7 @@ public class ChemplantRecipes extends SerializableRecipe {
new ComparableStack(Items.dye, 2, 3))
.inputFluids(
new FluidStack(Fluids.LUBRICANT, 400),
new FluidStack(Fluids.ACID, 400))
new FluidStack(Fluids.PEROXIDE, 400))
.outputItems(new ItemStack(ModItems.chocolate, 4)));
recipes.add(new ChemRecipe(77, "CO2", 60)
.inputFluids(new FluidStack(Fluids.GAS, 1000))

2
src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java
View File

@ -226,7 +226,7 @@ public class CrystallizerRecipes extends SerializableRecipe {
}
public static void registerRecipe(Object input, CrystallizerRecipe recipe) {
registerRecipe(input, recipe, new FluidStack(Fluids.ACID, 500));
registerRecipe(input, recipe, new FluidStack(Fluids.PEROXIDE, 500));
}
public static void registerRecipe(Object input, CrystallizerRecipe recipe, FluidStack stack) {

4
src/main/java/com/hbm/inventory/recipes/MixerRecipes.java
View File

@ -55,10 +55,10 @@ public class MixerRecipes extends SerializableRecipe {
new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_CRACK, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)),
new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_DS, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)),
new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_COKER, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)));
register(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(S.dust())));
register(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.PEROXIDE, 800)).setSolid(new OreDictStack(S.dust())));
register(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(KNO.dust())));
register(Fluids.RADIOSOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.REFORMGAS, 750)).setStack2(new FluidStack(Fluids.CHLORINE, 250)));
register(Fluids.SCHRABIDIC, new MixerRecipe(16_000, 100).setStack1(new FluidStack(Fluids.SAS3, 8_000)).setStack2(new FluidStack(Fluids.ACID, 6_000)).setSolid(new ComparableStack(ModItems.pellet_charged)));
register(Fluids.SCHRABIDIC, new MixerRecipe(16_000, 100).setStack1(new FluidStack(Fluids.SAS3, 8_000)).setStack2(new FluidStack(Fluids.PEROXIDE, 6_000)).setSolid(new ComparableStack(ModItems.pellet_charged)));
register(Fluids.PETROIL, new MixerRecipe(1_000, 30).setStack1(new FluidStack(Fluids.RECLAIMED, 800)).setStack2(new FluidStack(Fluids.LUBRICANT, 200)));
register(Fluids.LUBRICANT,

2
src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java
View File

@ -47,7 +47,7 @@ public class RadiolysisRecipes {
}
public static void registerRadiolysis() {
radiolysis.put(Fluids.WATER, new Pair(new FluidStack(80, Fluids.ACID), new FluidStack(20, Fluids.HYDROGEN)));
radiolysis.put(Fluids.WATER, new Pair(new FluidStack(80, Fluids.PEROXIDE), new FluidStack(20, Fluids.HYDROGEN)));
//automatically add cracking recipes to the radiolysis recipe list
//we want the numbers and types to stay consistent anyway and this will save us a lot of headache later on

2
src/main/java/com/hbm/inventory/recipes/SolderingRecipes.java
View File

@ -61,7 +61,7 @@ public class SolderingRecipes extends SerializableRecipe {
));
recipes.add(new SolderingRecipe(new ItemStack(ModItems.circuit, 1, EnumCircuitType.CAPACITOR_BOARD.ordinal()), 200, 300,
new FluidStack(Fluids.ACID, 250),
new FluidStack(Fluids.PEROXIDE, 250),
new AStack[] {
new ComparableStack(ModItems.circuit, 3, EnumCircuitType.CAPACITOR_TANTALIUM)},
new AStack[] {

14
src/main/java/com/hbm/items/tool/ItemBlowtorch.java
View File

@ -69,7 +69,17 @@ public class ItemBlowtorch extends Item implements IFillableItem {
initNBT(stack);
}
return stack.stackTagCompound.getInteger(type.getName());
//just in case
String name = Fluids.toNameCompat(type);
if(stack.stackTagCompound.hasKey(name)) {
int fill = stack.stackTagCompound.getInteger(name);
stack.stackTagCompound.removeTag(name);
stack.stackTagCompound.setInteger(Integer.toString(type.getID()), fill);
return fill;
}
return stack.stackTagCompound.getInteger(Integer.toString(type.getID()));
}
public int getMaxFill(FluidType type) {
@ -85,7 +95,7 @@ public class ItemBlowtorch extends Item implements IFillableItem {
initNBT(stack);
}
stack.stackTagCompound.setInteger(type.getName(), fill);
stack.stackTagCompound.setInteger(Integer.toString(type.getID()), fill);
}
public void initNBT(ItemStack stack) {

2
src/main/java/com/hbm/items/tool/ItemPipette.java
View File

@ -143,7 +143,7 @@ public class ItemPipette extends Item implements IFillableItem {
public boolean willFizzle(FluidType type) {
if (this != ModItems.pipette) return false;
return type.isCorrosive() && type != Fluids.ACID;
return type.isCorrosive() && type != Fluids.PEROXIDE;
}
@Override

4
src/main/java/com/hbm/main/CraftingManager.java
View File

@ -442,7 +442,7 @@ public class CraftingManager {
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire, 16), new Object[] { "AIA", "I I", "AIA", 'A', STEEL.wireFine(), 'I', IRON.ingot() });
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_fire, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', P_RED.dust() });
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_poison, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', ModItems.powder_poison });
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_acid, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(ModItems.fluid_tank_full, 1, Fluids.ACID.getID()) });
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_acid, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(ModItems.fluid_tank_full, 1, Fluids.PEROXIDE.getID()) });
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_wither, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(Items.skull, 1, 1) });
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_ultradeath, 4), new Object[] { "BCB", "CIC", "BCB", 'B', ModBlocks.barbed_wire, 'C', ModItems.powder_yellowcake, 'I', ModItems.nuclear_waste });
@ -796,7 +796,7 @@ public class CraftingManager {
addRecipeAuto(new ItemStack(ModItems.upgrade_smelter, 1), new Object[] { "PHP", "CUC", "DTD", 'P', CU.plate(), 'H', Blocks.hopper, 'C', ModItems.coil_tungsten, 'U', ModItems.upgrade_template, 'D', ModItems.coil_copper, 'T', ModBlocks.machine_transformer });
addRecipeAuto(new ItemStack(ModItems.upgrade_shredder, 1), new Object[] { "PHP", "CUC", "DTD", 'P', ModItems.motor, 'H', Blocks.hopper, 'C', ModItems.blades_advanced_alloy, 'U', ModItems.upgrade_smelter, 'D', TI.plate(), 'T', ModBlocks.machine_transformer });
addRecipeAuto(new ItemStack(ModItems.upgrade_centrifuge, 1), new Object[] { "PHP", "PUP", "DTD", 'P', ModItems.centrifuge_element, 'H', Blocks.hopper, 'U', ModItems.upgrade_shredder, 'D', ANY_PLASTIC.ingot(), 'T', ModBlocks.machine_transformer });
addRecipeAuto(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, Fluids.ACID.getID()), 'H', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer });
addRecipeAuto(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, Fluids.PEROXIDE.getID()), 'H', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer });
addRecipeAuto(new ItemStack(ModItems.upgrade_screm, 1), new Object[] { "SUS", "SCS", "SUS", 'S', STEEL.plate(), 'U', ModItems.upgrade_template, 'C', ModItems.crystal_xen });
addRecipeAuto(new ItemStack(ModItems.upgrade_gc_speed, 1), new Object[] {"GNG", "RUR", "GMG", 'R', RUBBER.ingot(), 'M', ModItems.motor, 'G', ModItems.coil_gold, 'N', NB.ingot(), 'U', ModItems.upgrade_template});

4
src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java
View File

@ -472,7 +472,7 @@ public class TileEntityCompactLauncher extends TileEntityLoadedBase implements I
switch((FuelType)fuselage.attributes[0]) {
case KEROSENE:
tanks[0].setTankType(Fluids.KEROSENE);
tanks[1].setTankType(Fluids.ACID);
tanks[1].setTankType(Fluids.PEROXIDE);
break;
case HYDROGEN:
tanks[0].setTankType(Fluids.HYDROGEN);
@ -483,7 +483,7 @@ public class TileEntityCompactLauncher extends TileEntityLoadedBase implements I
break;
case BALEFIRE:
tanks[0].setTankType(Fluids.BALEFIRE);
tanks[1].setTankType(Fluids.ACID);
tanks[1].setTankType(Fluids.PEROXIDE);
break;
default: break;
}

4
src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java
View File

@ -284,11 +284,11 @@ public abstract class TileEntityLaunchPadBase extends TileEntityMachineBase impl
switch(missile.fuel) {
case ETHANOL_PEROXIDE:
tanks[0].setTankType(Fluids.ETHANOL);
tanks[1].setTankType(Fluids.ACID);
tanks[1].setTankType(Fluids.PEROXIDE);
break;
case KEROSENE_PEROXIDE:
tanks[0].setTankType(Fluids.KEROSENE);
tanks[1].setTankType(Fluids.ACID);
tanks[1].setTankType(Fluids.PEROXIDE);
break;
case KEROSENE_LOXY:
tanks[0].setTankType(Fluids.KEROSENE);

4
src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java
View File

@ -467,7 +467,7 @@ public class TileEntityLaunchTable extends TileEntityLoadedBase implements ISide
switch((FuelType)fuselage.attributes[0]) {
case KEROSENE:
tanks[0].setTankType(Fluids.KEROSENE);
tanks[1].setTankType(Fluids.ACID);
tanks[1].setTankType(Fluids.PEROXIDE);
break;
case HYDROGEN:
tanks[0].setTankType(Fluids.HYDROGEN);
@ -478,7 +478,7 @@ public class TileEntityLaunchTable extends TileEntityLoadedBase implements ISide
break;
case BALEFIRE:
tanks[0].setTankType(Fluids.BALEFIRE);
tanks[1].setTankType(Fluids.ACID);
tanks[1].setTankType(Fluids.PEROXIDE);
break;
default: break;
}

2
src/main/java/com/hbm/tileentity/machine/TileEntityCore.java
View File

@ -257,7 +257,7 @@ public class TileEntityCore extends TileEntityMachineBase implements IGUIProvide
return 1.7F;
if(type == Fluids.OXYGEN)
return 1.2F;
if(type == Fluids.ACID)
if(type == Fluids.PEROXIDE)
return 1.4F;
if(type == Fluids.XENON)
return 1.5F;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java
View File

@ -53,7 +53,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
public TileEntityMachineCrystallizer() {
super(8);
tank = new FluidTank(Fluids.ACID, 8000);
tank = new FluidTank(Fluids.PEROXIDE, 8000);
}
@Override

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java
View File

@ -266,7 +266,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
if(stack != null && stack.getItem() != null) {
if(hasCrystallizer()) {
CrystallizerRecipe result = CrystallizerRecipes.getOutput(stack, Fluids.ACID);
CrystallizerRecipe result = CrystallizerRecipes.getOutput(stack, Fluids.PEROXIDE);
if(result == null) result = CrystallizerRecipes.getOutput(stack, Fluids.SULFURIC_ACID);
if(result != null) {

4
src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java
View File

@ -53,7 +53,7 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce
public TileEntitySILEX() {
super(11);
tank = new FluidTank(Fluids.ACID, 16000, 0);
tank = new FluidTank(Fluids.PEROXIDE, 16000, 0);
}
@Override
@ -188,7 +188,7 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce
if(loadDelay > 20)
loadDelay = 0;
if(loadDelay == 0 && slots[0] != null && tank.getTankType() == Fluids.ACID && (this.current == null || this.current.equals(new ComparableStack(slots[0]).makeSingular()))) {
if(loadDelay == 0 && slots[0] != null && tank.getTankType() == Fluids.PEROXIDE && (this.current == null || this.current.equals(new ComparableStack(slots[0]).makeSingular()))) {
SILEXRecipe recipe = SILEXRecipes.getOutput(slots[0]);
if(recipe == null)

2
src/main/java/com/hbm/wiaj/cannery/CannerySILEX.java
View File

@ -184,7 +184,7 @@ public class CannerySILEX extends CanneryBase {
scene1.add(new ActionWait(10));
TileEntityPipeBaseNT duct = new TileEntityPipeBaseNT();
duct.setType(Fluids.ACID);
duct.setType(Fluids.PEROXIDE);
scene1.add(new ActionSetTile(5, 2, 0, duct));
scene1.add(new ActionSetTile(5, 1, 0, duct));
scene1.add(new ActionSetTile(6, 1, 0, duct));

10
src/main/java/com/hbm/world/feature/BedrockOre.java
View File

@ -35,19 +35,19 @@ public class BedrockOre {
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.BORAX, 3, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockBoraxSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.CHLOROCALCITE, 3, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockChlorocalciteSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.ASBESTOS, 2), WorldConfig.bedrockAsbestosSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NIOBIUM, 2, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockNiobiumSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NEODYMIUM, 3, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockNeodymiumSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NIOBIUM, 2, new FluidStack(Fluids.PEROXIDE, 500)), WorldConfig.bedrockNiobiumSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NEODYMIUM, 3, new FluidStack(Fluids.PEROXIDE, 500)), WorldConfig.bedrockNeodymiumSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TITANIUM, 2, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockTitaniumSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TUNGSTEN, 2, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockTungstenSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TUNGSTEN, 2, new FluidStack(Fluids.PEROXIDE, 500)), WorldConfig.bedrockTungstenSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.GOLD, 1), WorldConfig.bedrockGoldSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.URANIUM, 4, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockUraniumSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.THORIUM, 4, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockThoriumSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.FLUORITE, 1), WorldConfig.bedrockFluoriteSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.coal, 8), 1, 0x202020), WorldConfig.bedrockCoalSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(ModItems.niter, 4), 2, 0x808080, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockNiterSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(ModItems.niter, 4), 2, 0x808080, new FluidStack(Fluids.PEROXIDE, 500)), WorldConfig.bedrockNiterSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.redstone, 4), 1, 0xd01010), WorldConfig.bedrockRedstoneSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.emerald, 4), 1, 0x3FDD85), WorldConfig.bedrockEmeraldSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE), 2, 0x8F9999, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockRareEarthSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE), 2, 0x8F9999, new FluidStack(Fluids.PEROXIDE, 500)), WorldConfig.bedrockRareEarthSpawn);
registerBedrockOre(weightedOres, new BedrockOreDefinition(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.BAUXITE, 2),1, 0xEF7213), WorldConfig.bedrockBauxiteSpawn);
registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(Items.glowstone_dust, 4), 1, 0xF9FF4D), WorldConfig.bedrockGlowstoneSpawn);

2
src/main/resources/assets/hbm/lang/de_DE.lang
View File

@ -653,7 +653,6 @@ hbm.key.toggleBack=Rucksack umschalten
hbm.key.toggleHUD=HUD umschalten
hbm.key.reload=Nachladen
hbmfluid.acid=Wasserstoffperoxid
hbmfluid.amat=Antimaterie
hbmfluid.aromatics=Aromatische Kohlenwasserstoffe
hbmfluid.aschrab=Antischrabidium
@ -739,6 +738,7 @@ hbmfluid.oil_coker=Koker-Öl
hbmfluid.oxyhydrogen=Knallgas
hbmfluid.oxygen=Flüssiger Sauerstoff
hbmfluid.pain=Pandemonium(III)tantalit-Lösung
hbmfluid.peroxide=Wasserstoffperoxid
hbmfluid.petroil=Gemisch
hbmfluid.petroil_leaded=Bleigemisch
hbmfluid.petroleum=Petroleumgas

2
src/main/resources/assets/hbm/lang/en_NT.lang
View File

@ -69,7 +69,7 @@ hbmfluid.heatingoil=Heating Oil
hbmfluid.naphtha=Naphtha
hbmfluid.lightoil=Light Oil
hbmfluid.petroleum=Petroleum Gas
hbmfluid.acid=Hydrogen Peroxide
hbmfluid.peroxide=Hydrogen Peroxide
hbmfluid.watz=Poisonous Mud
hbmfluid.biogas=Biogas
hbmfluid.biofuel=Biofuel

2
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -1341,7 +1341,6 @@ hbm.key.toggleBack=Toggle Backpack
hbm.key.toggleHUD=Toggle HUD
hbm.key.reload=Reload
hbmfluid.acid=Hydrogen Peroxide
hbmfluid.amat=Antimatter
hbmfluid.aromatics=Aromatic Hydrocarbons
hbmfluid.aschrab=Antischrabidium
@ -1428,6 +1427,7 @@ hbmfluid.oil_ds=Desulfurized Crude Oil
hbmfluid.oxygen=Liquid Oxygen
hbmfluid.oxyhydrogen=Oxyhydrogen
hbmfluid.pain=Pandemonium(III)tantalite Solution
hbmfluid.peroxide=Hydrogen Peroxide
hbmfluid.petroil=Petroil
hbmfluid.petroil_leaded=Leaded Petroil
hbmfluid.petroleum=Petroleum Gas

2
src/main/resources/assets/hbm/lang/fr_FR.lang
View File

@ -37,7 +37,7 @@ hbmfluid.heatingoil=Huile de chauffage
hbmfluid.naphtha=Naphta
hbmfluid.lightoil=Huile légère
hbmfluid.petroleum=Gaz pétrolier
hbmfluid.acid=Peroxyde d'hydrogène
hbmfluid.peroxide=Peroxyde d'hydrogène
hbmfluid.watz=Boue vénéneuse
hbmfluid.biogas=Biogaz
hbmfluid.biofuel=Biocarburant

2
src/main/resources/assets/hbm/lang/it_IT.lang
View File

@ -1338,7 +1338,6 @@ hbm.key.toggleBack=Toggle Backpack
hbm.key.toggleHUD=Toggle HUD
hbm.key.reload=Reload
hbmfluid.acid=Hydrogen Peroxide
hbmfluid.amat=Antimatter
hbmfluid.aromatics=Aromatic Hydrocarbons
hbmfluid.aschrab=Antischrabidium
@ -1425,6 +1424,7 @@ hbmfluid.oil_ds=Desulfurized Crude Oil
hbmfluid.oxygen=Liquid Oxygen
hbmfluid.oxyhydrogen=Oxyhydrogen
hbmfluid.pain=Pandemonium(III)tantalite Solution
hbmfluid.peroxide=Hydrogen Peroxide
hbmfluid.petroil=Petroil
hbmfluid.petroil_leaded=Leaded Petroil
hbmfluid.petroleum=Petroleum Gas

2
src/main/resources/assets/hbm/lang/pl_PL.lang
View File

@ -1247,7 +1247,6 @@ hbm.key.toggleBack=Włącz/wyłącz plecak
hbm.key.toggleHUD=Włącz/wyłącz HUD
hbm.key.reload=Przeładuj
hbmfluid.acid=Nadtlenek wodoru
hbmfluid.amat=Antymateria
hbmfluid.aromatics=Węglowodory aromatyczne
hbmfluid.aschrab=Antyschrabid
@ -1326,6 +1325,7 @@ hbmfluid.oil_coker=Olej koksowniczy
hbmfluid.oxygen=Ciekły tlen
hbmfluid.oxyhydrogen=Tlenowodór
hbmfluid.pain=Roztwór tantalitu pandemonium(III).
hbmfluid.peroxide=Nadtlenek wodoru
hbmfluid.petroil=Benzyna
hbmfluid.petroil_leaded=Benzyna ołowiowa
hbmfluid.petroleum=Gaz z ropy naftowej

2
src/main/resources/assets/hbm/lang/ru_RU.lang
View File

@ -1169,7 +1169,7 @@ hbmfluid.naphtha=Нафта
hbmfluid.lightoil=Легкая нефть
hbmfluid.petroleum=Попутный нефтяной газ
hbmfluid.lpg=Сжиженный попутный газ (СПГ)
hbmfluid.acid=Пероксид водорода
hbmfluid.peroxide=Пероксид водорода
hbmfluid.watz=Токсичные отходы
hbmfluid.wastefluid=Жидкие ядерные отходы
hbmfluid.wastegas=Газовые ядерные отходы

2
src/main/resources/assets/hbm/lang/zh_CN.lang
View File

@ -1230,7 +1230,6 @@ hbm.key.dash=冲刺 (在config中解绑)
hbm.key.toggleBack=开关 喷气背包
hbm.key.toggleHUD=开关 HUD
hbm.key.reload=装弹
hbmfluid.acid=过氧化氢
hbmfluid.amat=反物质
hbmfluid.aromatics=芳香烃
hbmfluid.aschrab=反Sa326
@ -1317,6 +1316,7 @@ hbmfluid.oil_ds=脱硫原油
hbmfluid.oxygen=液氧
hbmfluid.oxyhydrogen=氢氧混合气
hbmfluid.pain=Pn(III) 钽铁溶液
hbmfluid.peroxide=过氧化氢
hbmfluid.petroil=汽油
hbmfluid.petroil_leaded=含铅石油
hbmfluid.petroleum=石油气

0
src/main/resources/assets/hbm/textures/gui/fluids/acid.png → src/main/resources/assets/hbm/textures/gui/fluids/peroxide.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 489 B

After

Width:  |  Height:  |  Size: 489 B

0
src/main/resources/assets/hbm/textures/models/tank/tank_ACID.png → src/main/resources/assets/hbm/textures/models/tank/tank_PEROXIDE.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 958 B

After

Width:  |  Height:  |  Size: 958 B