mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
The great fluid engoodening, part 3 I think
This commit is contained in:
Boblet
parent
4a395504cd
commit
ac54cc18b9
@ -2,7 +2,8 @@ package com.hbm.blocks.machine;
|
||||
|
||||
import com.hbm.blocks.BlockDummyable;
|
||||
import com.hbm.handler.MultiblockHandlerXR;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.tileentity.TileEntityProxyCombo;
|
||||
import com.hbm.tileentity.machine.oil.TileEntityMachineCatalyticCracker;
|
||||
@ -69,7 +70,7 @@ public class MachineCatalyticCracker extends BlockDummyable {
|
||||
player.addChatComponentMessage(new ChatComponentTranslation("hbmfluid." + cracker.tanks[i].getTankType().getName().toLowerCase()).appendSibling(new ChatComponentText(": " + cracker.tanks[i].getFill() + "/" + cracker.tanks[i].getMaxFill() + "mB")));
|
||||
} else {
|
||||
|
||||
FluidTypeTheOldOne type = FluidTypeTheOldOne.values()[player.getHeldItem().getItemDamage()];
|
||||
FluidType type = Fluids.fromID(player.getHeldItem().getItemDamage());
|
||||
cracker.tanks[0].setTankType(type);
|
||||
cracker.markDirty();
|
||||
player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Changed type to " + type + "!"));
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
package com.hbm.blocks.machine;
|
||||
|
||||
import com.hbm.blocks.BlockDummyable;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.handler.MultiblockHandlerXR;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.tileentity.TileEntityProxyCombo;
|
||||
import com.hbm.tileentity.machine.TileEntityChungus;
|
||||
|
||||
@ -55,35 +56,27 @@ public class MachineChungus extends BlockDummyable {
|
||||
world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.chungusLever", 1.5F, 1.0F);
|
||||
|
||||
if(!world.isRemote) {
|
||||
switch(entity.tanks[0].getTankType()) {
|
||||
case STEAM:
|
||||
entity.tanks[0].setTankType(FluidTypeTheOldOne.HOTSTEAM);
|
||||
entity.tanks[1].setTankType(FluidTypeTheOldOne.STEAM);
|
||||
FluidType type = entity.tanks[0].getTankType();
|
||||
if(type == Fluids.STEAM) {
|
||||
entity.tanks[0].setTankType(Fluids.HOTSTEAM);
|
||||
entity.tanks[1].setTankType(Fluids.STEAM);
|
||||
entity.tanks[0].setFill(entity.tanks[0].getFill() / 10);
|
||||
entity.tanks[1].setFill(0);
|
||||
break;
|
||||
|
||||
case HOTSTEAM:
|
||||
entity.tanks[0].setTankType(FluidTypeTheOldOne.SUPERHOTSTEAM);
|
||||
entity.tanks[1].setTankType(FluidTypeTheOldOne.HOTSTEAM);
|
||||
} else if(type == Fluids.HOTSTEAM) {
|
||||
entity.tanks[0].setTankType(Fluids.SUPERHOTSTEAM);
|
||||
entity.tanks[1].setTankType(Fluids.HOTSTEAM);
|
||||
entity.tanks[0].setFill(entity.tanks[0].getFill() / 10);
|
||||
entity.tanks[1].setFill(0);
|
||||
break;
|
||||
|
||||
case SUPERHOTSTEAM:
|
||||
entity.tanks[0].setTankType(FluidTypeTheOldOne.ULTRAHOTSTEAM);
|
||||
entity.tanks[1].setTankType(FluidTypeTheOldOne.SUPERHOTSTEAM);
|
||||
} else if(type == Fluids.SUPERHOTSTEAM) {
|
||||
entity.tanks[0].setTankType(Fluids.ULTRAHOTSTEAM);
|
||||
entity.tanks[1].setTankType(Fluids.SUPERHOTSTEAM);
|
||||
entity.tanks[0].setFill(entity.tanks[0].getFill() / 10);
|
||||
entity.tanks[1].setFill(0);
|
||||
break;
|
||||
|
||||
default:
|
||||
case ULTRAHOTSTEAM:
|
||||
entity.tanks[0].setTankType(FluidTypeTheOldOne.STEAM);
|
||||
entity.tanks[1].setTankType(FluidTypeTheOldOne.SPENTSTEAM);
|
||||
} else {
|
||||
entity.tanks[0].setTankType(Fluids.STEAM);
|
||||
entity.tanks[1].setTankType(Fluids.SPENTSTEAM);
|
||||
entity.tanks[0].setFill(Math.min(entity.tanks[0].getFill() * 1000, entity.tanks[0].getMaxFill()));
|
||||
entity.tanks[1].setFill(0);
|
||||
break;
|
||||
}
|
||||
|
||||
entity.markDirty();
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
package com.hbm.blocks.machine;
|
||||
|
||||
import com.hbm.blocks.BlockDummyable;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.tileentity.TileEntityProxyCombo;
|
||||
import com.hbm.tileentity.machine.oil.TileEntityMachineFractionTower;
|
||||
@ -71,7 +72,7 @@ public class MachineFractionTower extends BlockDummyable {
|
||||
if(world.getTileEntity(pos[0], pos[1] - 3, pos[2]) instanceof TileEntityMachineFractionTower) {
|
||||
player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.RED + "You can only change the type in the bottom segment!"));
|
||||
} else {
|
||||
FluidTypeTheOldOne type = FluidTypeTheOldOne.values()[player.getHeldItem().getItemDamage()];
|
||||
FluidType type = Fluids.fromID(player.getHeldItem().getItemDamage());
|
||||
frac.tanks[0].setTankType(type);
|
||||
frac.markDirty();
|
||||
player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Changed type to " + type + "!"));
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package com.hbm.inventory;
|
||||
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
|
||||
public class FluidStack {
|
||||
|
||||
public int fill;
|
||||
public FluidTypeTheOldOne type;
|
||||
public FluidType type;
|
||||
|
||||
public FluidStack(int fill, FluidTypeTheOldOne type) {
|
||||
public FluidStack(int fill, FluidType type) {
|
||||
this.fill = fill;
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
@ -66,6 +66,7 @@ public class FluidType {
|
||||
public int getColor() {
|
||||
return this.color;
|
||||
}
|
||||
@Deprecated
|
||||
public int getMSAColor() {
|
||||
return this.color;
|
||||
}
|
||||
|
||||
@ -70,9 +70,9 @@ public class Fluids {
|
||||
public static FluidType ETHANOL;
|
||||
public static FluidType HEAVYWATER;
|
||||
|
||||
public static final HashMap<Integer, FluidType> idMapping = new HashMap();
|
||||
public static final HashMap<String, FluidType> nameMapping = new HashMap();
|
||||
public static final List<FluidType> metaOrder = new ArrayList();
|
||||
private static final HashMap<Integer, FluidType> idMapping = new HashMap();
|
||||
private static final HashMap<String, FluidType> nameMapping = new HashMap();
|
||||
protected static final List<FluidType> metaOrder = new ArrayList();
|
||||
|
||||
public static void init() {
|
||||
|
||||
@ -226,9 +226,13 @@ public class Fluids {
|
||||
metaOrder.add(PLASMA_DH3);
|
||||
metaOrder.add(PLASMA_XM);
|
||||
metaOrder.add(PLASMA_BF);
|
||||
|
||||
if(idMapping.size() != metaOrder.size()) {
|
||||
throw new IllegalStateException("A severe error has occoured during NTM's fluid registering process! The MetaOrder and Mappings are inconsistent! Mapping size: " + idMapping.size()+ " / MetaORder size: " + metaOrder.size());
|
||||
}
|
||||
}
|
||||
|
||||
public static int registerSelf(FluidType fluid) {
|
||||
protected static int registerSelf(FluidType fluid) {
|
||||
int id = idMapping.size();
|
||||
idMapping.put(id, fluid);
|
||||
nameMapping.put(fluid.getName(), fluid);
|
||||
@ -252,4 +256,28 @@ public class Fluids {
|
||||
|
||||
return fluid;
|
||||
}
|
||||
|
||||
public static FluidType[] getAll() {
|
||||
return getInOrder(false);
|
||||
}
|
||||
|
||||
public static FluidType[] getInNiceOrder() {
|
||||
return getInOrder(true);
|
||||
}
|
||||
|
||||
private static FluidType[] getInOrder(final boolean nice) {
|
||||
FluidType[] all = new FluidType[idMapping.size()];
|
||||
|
||||
for(int i = 0; i < all.length; i++) {
|
||||
FluidType type = nice ? metaOrder.get(i) : idMapping.get(i);
|
||||
|
||||
if(type == null) {
|
||||
throw new IllegalStateException("A severe error has occoured with NTM's fluid system! Fluid of the ID " + i + " has returned NULL in the registry!");
|
||||
}
|
||||
|
||||
all[i] = type;
|
||||
}
|
||||
|
||||
return all;
|
||||
}
|
||||
}
|
||||
@ -3,6 +3,8 @@ package com.hbm.inventory.gui;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.hbm.inventory.container.ContainerRBMKBoiler;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.lib.RefStrings;
|
||||
import com.hbm.packet.NBTControlPacket;
|
||||
import com.hbm.packet.PacketDispatcher;
|
||||
@ -57,7 +59,6 @@ public class GUIRBMKBoiler extends GuiInfoContainer {
|
||||
this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
|
||||
}
|
||||
|
||||
@SuppressWarnings("incomplete-switch") //shut up
|
||||
@Override
|
||||
protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
@ -74,11 +75,10 @@ public class GUIRBMKBoiler extends GuiInfoContainer {
|
||||
|
||||
drawTexturedModalRect(guiLeft + 91, guiTop + 65 - j, 190, 24 - j, 4, j);
|
||||
|
||||
switch(boiler.steam.getTankType()) {
|
||||
case STEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 194, 0, 14, 58); break;
|
||||
case HOTSTEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 208, 0, 14, 58); break;
|
||||
case SUPERHOTSTEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 222, 0, 14, 58); break;
|
||||
case ULTRAHOTSTEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 236, 0, 14, 58); break;
|
||||
}
|
||||
FluidType type = boiler.steam.getTankType();
|
||||
if(type == Fluids.STEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 194, 0, 14, 58);
|
||||
if(type == Fluids.HOTSTEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 208, 0, 14, 58);
|
||||
if(type == Fluids.SUPERHOTSTEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 222, 0, 14, 58);
|
||||
if(type == Fluids.ULTRAHOTSTEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 236, 0, 14, 58);
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,6 +4,8 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.hbm.inventory.FluidTank;
|
||||
import com.hbm.inventory.container.ContainerReactorMultiblock;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.lib.RefStrings;
|
||||
import com.hbm.packet.AuxButtonPacket;
|
||||
import com.hbm.packet.PacketDispatcher;
|
||||
@ -27,7 +29,6 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
|
||||
this.ySize = 222;
|
||||
}
|
||||
|
||||
@SuppressWarnings("incomplete-switch")
|
||||
@Override
|
||||
public void drawScreen(int mouseX, int mouseY, float f) {
|
||||
super.drawScreen(mouseX, mouseY, f);
|
||||
@ -71,18 +72,16 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
|
||||
|
||||
String s = "0";
|
||||
|
||||
switch(diFurnace.tanks[2].getTankType()) {
|
||||
case STEAM: s = "1x"; break;
|
||||
case HOTSTEAM:s = "10x"; break;
|
||||
case SUPERHOTSTEAM: s = "100x"; break;
|
||||
}
|
||||
FluidType type = diFurnace.tanks[2].getTankType();
|
||||
if(type == Fluids.STEAM) s = "1x";
|
||||
if(type == Fluids.HOTSTEAM) s = "10x";
|
||||
if(type == Fluids.SUPERHOTSTEAM) s = "100x";
|
||||
|
||||
String[] text4 = new String[] { "Steam compression switch",
|
||||
"Current compression level: " + s};
|
||||
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 63, guiTop + 107, 14, 18, mouseX, mouseY, text4);
|
||||
}
|
||||
|
||||
@SuppressWarnings("incomplete-switch")
|
||||
protected void mouseClicked(int x, int y, int i) {
|
||||
super.mouseClicked(x, y, i);
|
||||
|
||||
@ -108,11 +107,10 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
|
||||
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
|
||||
int c = 0;
|
||||
|
||||
switch(diFurnace.tanks[2].getTankType()) {
|
||||
case STEAM: c = 0; break;
|
||||
case HOTSTEAM: c = 1; break;
|
||||
case SUPERHOTSTEAM: c = 2; break;
|
||||
}
|
||||
FluidType type = diFurnace.tanks[2].getTankType();
|
||||
if(type == Fluids.STEAM) c = 0;
|
||||
if(type == Fluids.HOTSTEAM) c = 1;
|
||||
if(type == Fluids.SUPERHOTSTEAM) c = 2;
|
||||
|
||||
PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(diFurnace.xCoord, diFurnace.yCoord, diFurnace.zCoord, c, 1));
|
||||
}
|
||||
@ -126,7 +124,6 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
|
||||
this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
|
||||
}
|
||||
|
||||
@SuppressWarnings("incomplete-switch")
|
||||
@Override
|
||||
protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
@ -151,12 +148,12 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
|
||||
drawTexturedModalRect(guiLeft + 50, guiTop + 17, 208, 50 + s * 18, 22, 18);
|
||||
else
|
||||
drawTexturedModalRect(guiLeft + 50, guiTop + 17, 230, 50 + (s - 8) * 18, 22, 18);
|
||||
|
||||
|
||||
switch(diFurnace.tanks[2].getTankType()) {
|
||||
case STEAM: drawTexturedModalRect(guiLeft + 63, guiTop + 107, 176, 18, 14, 18); break;
|
||||
case HOTSTEAM: drawTexturedModalRect(guiLeft + 63, guiTop + 107, 190, 18, 14, 18); break;
|
||||
case SUPERHOTSTEAM: drawTexturedModalRect(guiLeft + 63, guiTop + 107, 204, 18, 14, 18); break;
|
||||
}
|
||||
FluidType type = diFurnace.tanks[2].getTankType();
|
||||
if(type == Fluids.STEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 176, 18, 14, 18);
|
||||
if(type == Fluids.HOTSTEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 190, 18, 14, 18);
|
||||
if(type == Fluids.SUPERHOTSTEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 204, 18, 14, 18);
|
||||
|
||||
if(diFurnace.hasHullHeat()) {
|
||||
int i = diFurnace.getHullHeatScaled(88);
|
||||
@ -181,10 +178,8 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
|
||||
|
||||
int offset = 234;
|
||||
|
||||
switch(diFurnace.tanks[2].getTankType()) {
|
||||
case HOTSTEAM: offset += 4; break;
|
||||
case SUPERHOTSTEAM: offset += 8; break;
|
||||
}
|
||||
if(type == Fluids.HOTSTEAM) offset += 4;
|
||||
if(type == Fluids.SUPERHOTSTEAM) offset += 8;
|
||||
|
||||
drawTexturedModalRect(guiLeft + 80, guiTop + 108, 0, offset, i, 4);
|
||||
}
|
||||
|
||||
@ -4,12 +4,12 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.FluidStack;
|
||||
import static com.hbm.inventory.OreDictManager.*;
|
||||
import com.hbm.inventory.RecipesCommon.AStack;
|
||||
import com.hbm.inventory.RecipesCommon.ComparableStack;
|
||||
import com.hbm.inventory.RecipesCommon.OreDictStack;
|
||||
import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.items.ModItems;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
@ -69,157 +69,157 @@ public class ChemplantRecipes {
|
||||
|
||||
public static void registerFuelProcessing() {
|
||||
recipes.add(new ChemRecipe("FP_HEAVYOIL", 50)
|
||||
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.HEAVYOIL))
|
||||
.inputFluids(new FluidStack(1000, Fluids.HEAVYOIL))
|
||||
.outputFluids(
|
||||
new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, FluidTypeTheOldOne.BITUMEN),
|
||||
new FluidStack(RefineryRecipes.heavy_frac_smear * 10, FluidTypeTheOldOne.SMEAR)
|
||||
new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, Fluids.BITUMEN),
|
||||
new FluidStack(RefineryRecipes.heavy_frac_smear * 10, Fluids.SMEAR)
|
||||
));
|
||||
recipes.add(new ChemRecipe("FP_SMEAR", 50)
|
||||
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.SMEAR))
|
||||
.inputFluids(new FluidStack(1000, Fluids.SMEAR))
|
||||
.outputFluids(
|
||||
new FluidStack(RefineryRecipes.smear_frac_heat * 10, FluidTypeTheOldOne.HEATINGOIL),
|
||||
new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidTypeTheOldOne.LUBRICANT)
|
||||
new FluidStack(RefineryRecipes.smear_frac_heat * 10, Fluids.HEATINGOIL),
|
||||
new FluidStack(RefineryRecipes.smear_frac_lube * 10, Fluids.LUBRICANT)
|
||||
));
|
||||
recipes.add(new ChemRecipe("FP_NAPHTHA", 50)
|
||||
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.NAPHTHA))
|
||||
.inputFluids(new FluidStack(1000, Fluids.NAPHTHA))
|
||||
.outputFluids(
|
||||
new FluidStack(RefineryRecipes.napht_frac_heat * 10, FluidTypeTheOldOne.HEATINGOIL),
|
||||
new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidTypeTheOldOne.DIESEL)
|
||||
new FluidStack(RefineryRecipes.napht_frac_heat * 10, Fluids.HEATINGOIL),
|
||||
new FluidStack(RefineryRecipes.napht_frac_diesel * 10, Fluids.DIESEL)
|
||||
));
|
||||
recipes.add(new ChemRecipe("FP_LIGHTOIL", 50)
|
||||
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.LIGHTOIL))
|
||||
.inputFluids(new FluidStack(1000, Fluids.LIGHTOIL))
|
||||
.outputFluids(
|
||||
new FluidStack(RefineryRecipes.light_frac_diesel * 10, FluidTypeTheOldOne.DIESEL),
|
||||
new FluidStack(RefineryRecipes.light_frac_kero * 10, FluidTypeTheOldOne.KEROSENE)
|
||||
new FluidStack(RefineryRecipes.light_frac_diesel * 10, Fluids.DIESEL),
|
||||
new FluidStack(RefineryRecipes.light_frac_kero * 10, Fluids.KEROSENE)
|
||||
));
|
||||
recipes.add(new ChemRecipe("FR_REOIL", 30)
|
||||
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.SMEAR))
|
||||
.outputFluids(new FluidStack(800, FluidTypeTheOldOne.RECLAIMED)));
|
||||
.inputFluids(new FluidStack(1000, Fluids.SMEAR))
|
||||
.outputFluids(new FluidStack(800, Fluids.RECLAIMED)));
|
||||
recipes.add(new ChemRecipe("FR_PETROIL", 30)
|
||||
.inputFluids(
|
||||
new FluidStack(800, FluidTypeTheOldOne.RECLAIMED),
|
||||
new FluidStack(200, FluidTypeTheOldOne.LUBRICANT))
|
||||
.outputFluids(new FluidStack(1000, FluidTypeTheOldOne.PETROIL)));
|
||||
new FluidStack(800, Fluids.RECLAIMED),
|
||||
new FluidStack(200, Fluids.LUBRICANT))
|
||||
.outputFluids(new FluidStack(1000, Fluids.PETROIL)));
|
||||
}
|
||||
|
||||
public static void registerFuelCracking() {
|
||||
recipes.add(new ChemRecipe("FC_BITUMEN", 100)
|
||||
.inputFluids(
|
||||
new FluidStack(1200, FluidTypeTheOldOne.BITUMEN),
|
||||
new FluidStack(2400, FluidTypeTheOldOne.STEAM))
|
||||
new FluidStack(1200, Fluids.BITUMEN),
|
||||
new FluidStack(2400, Fluids.STEAM))
|
||||
.outputFluids(
|
||||
new FluidStack(1000, FluidTypeTheOldOne.OIL),
|
||||
new FluidStack(200, FluidTypeTheOldOne.PETROLEUM)));
|
||||
new FluidStack(1000, Fluids.OIL),
|
||||
new FluidStack(200, Fluids.PETROLEUM)));
|
||||
recipes.add(new ChemRecipe("FC_I_NAPHTHA", 150)
|
||||
.inputFluids(
|
||||
new FluidStack(1400, FluidTypeTheOldOne.SMEAR),
|
||||
new FluidStack(800, FluidTypeTheOldOne.WATER))
|
||||
.outputFluids(new FluidStack(800, FluidTypeTheOldOne.NAPHTHA)));
|
||||
new FluidStack(1400, Fluids.SMEAR),
|
||||
new FluidStack(800, Fluids.WATER))
|
||||
.outputFluids(new FluidStack(800, Fluids.NAPHTHA)));
|
||||
recipes.add(new ChemRecipe("FC_GAS_PETROLEUM", 100)
|
||||
.inputFluids(
|
||||
new FluidStack(1800, FluidTypeTheOldOne.GAS),
|
||||
new FluidStack(1200, FluidTypeTheOldOne.WATER))
|
||||
.outputFluids(new FluidStack(800, FluidTypeTheOldOne.PETROLEUM)));
|
||||
new FluidStack(1800, Fluids.GAS),
|
||||
new FluidStack(1200, Fluids.WATER))
|
||||
.outputFluids(new FluidStack(800, Fluids.PETROLEUM)));
|
||||
recipes.add(new ChemRecipe("FC_DIESEL_KEROSENE", 150)
|
||||
.inputFluids(
|
||||
new FluidStack(1200, FluidTypeTheOldOne.DIESEL),
|
||||
new FluidStack(2000, FluidTypeTheOldOne.STEAM))
|
||||
.outputFluids(new FluidStack(400, FluidTypeTheOldOne.KEROSENE)));
|
||||
new FluidStack(1200, Fluids.DIESEL),
|
||||
new FluidStack(2000, Fluids.STEAM))
|
||||
.outputFluids(new FluidStack(400, Fluids.KEROSENE)));
|
||||
recipes.add(new ChemRecipe("FC_KEROSENE_PETROLEUM", 150)
|
||||
.inputFluids(
|
||||
new FluidStack(1400, FluidTypeTheOldOne.KEROSENE),
|
||||
new FluidStack(2000, FluidTypeTheOldOne.STEAM))
|
||||
.outputFluids(new FluidStack(800, FluidTypeTheOldOne.PETROLEUM)));
|
||||
new FluidStack(1400, Fluids.KEROSENE),
|
||||
new FluidStack(2000, Fluids.STEAM))
|
||||
.outputFluids(new FluidStack(800, Fluids.PETROLEUM)));
|
||||
}
|
||||
|
||||
public static void registerCoalCracking() {
|
||||
recipes.add(new ChemRecipe("CC_OIL", 150)
|
||||
.inputItems(new OreDictStack(COAL.dust(), 8), new ComparableStack(ModItems.oil_tar, 4))
|
||||
.inputFluids(new FluidStack(1400, FluidTypeTheOldOne.STEAM))
|
||||
.outputFluids(new FluidStack(2000, FluidTypeTheOldOne.OIL)));
|
||||
.inputFluids(new FluidStack(1400, Fluids.STEAM))
|
||||
.outputFluids(new FluidStack(2000, Fluids.OIL)));
|
||||
recipes.add(new ChemRecipe("CC_I", 200)
|
||||
.inputItems(new OreDictStack(COAL.dust(), 6), new ComparableStack(ModItems.oil_tar, 4))
|
||||
.inputFluids(new FluidStack(1800, FluidTypeTheOldOne.WATER))
|
||||
.outputFluids(new FluidStack(1600, FluidTypeTheOldOne.SMEAR)));
|
||||
.inputFluids(new FluidStack(1800, Fluids.WATER))
|
||||
.outputFluids(new FluidStack(1600, Fluids.SMEAR)));
|
||||
recipes.add(new ChemRecipe("CC_HEATING", 250)
|
||||
.inputItems(new OreDictStack(COAL.dust(), 6), new ComparableStack(ModItems.oil_tar, 4))
|
||||
.inputFluids(new FluidStack(2000, FluidTypeTheOldOne.STEAM))
|
||||
.outputFluids(new FluidStack(1800, FluidTypeTheOldOne.HEATINGOIL)));
|
||||
.inputFluids(new FluidStack(2000, Fluids.STEAM))
|
||||
.outputFluids(new FluidStack(1800, Fluids.HEATINGOIL)));
|
||||
recipes.add(new ChemRecipe("CC_HEAVY", 200)
|
||||
.inputItems(new OreDictStack(COAL.dust(), 8), new ComparableStack(ModItems.oil_tar, 4))
|
||||
.inputFluids(new FluidStack(1400, FluidTypeTheOldOne.WATER))
|
||||
.outputFluids(new FluidStack(1800, FluidTypeTheOldOne.HEAVYOIL)));
|
||||
.inputFluids(new FluidStack(1400, Fluids.WATER))
|
||||
.outputFluids(new FluidStack(1800, Fluids.HEAVYOIL)));
|
||||
recipes.add(new ChemRecipe("CC_NAPHTHA", 300)
|
||||
.inputItems(new OreDictStack(COAL.dust(), 8), new ComparableStack(ModItems.oil_tar, 4))
|
||||
.inputFluids(new FluidStack(2400, FluidTypeTheOldOne.STEAM))
|
||||
.outputFluids(new FluidStack(2000, FluidTypeTheOldOne.NAPHTHA)));
|
||||
.inputFluids(new FluidStack(2400, Fluids.STEAM))
|
||||
.outputFluids(new FluidStack(2000, Fluids.NAPHTHA)));
|
||||
}
|
||||
|
||||
public static void registerSolidFuel() {
|
||||
recipes.add(new ChemRecipe("SF_OIL", 20)
|
||||
.inputFluids(new FluidStack(350, FluidTypeTheOldOne.OIL))
|
||||
.inputFluids(new FluidStack(350, Fluids.OIL))
|
||||
.outputItems(new ItemStack(ModItems.oil_tar, 1), new ItemStack(ModItems.oil_tar, 1)));
|
||||
recipes.add(new ChemRecipe("SF_HEAVYOIL", 20)
|
||||
.inputFluids(new FluidStack(250, FluidTypeTheOldOne.HEAVYOIL))
|
||||
.inputFluids(new FluidStack(250, Fluids.HEAVYOIL))
|
||||
.outputItems(new ItemStack(ModItems.oil_tar, 1), new ItemStack(ModItems.oil_tar, 1)));
|
||||
recipes.add(new ChemRecipe("SF_SMEAR", 20)
|
||||
.inputFluids(new FluidStack(200, FluidTypeTheOldOne.SMEAR))
|
||||
.inputFluids(new FluidStack(200, Fluids.SMEAR))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_HEATINGOIL", 20)
|
||||
.inputFluids(new FluidStack(100, FluidTypeTheOldOne.HEATINGOIL))
|
||||
.inputFluids(new FluidStack(100, Fluids.HEATINGOIL))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_RECLAIMED", 20)
|
||||
.inputFluids(new FluidStack(200, FluidTypeTheOldOne.RECLAIMED))
|
||||
.inputFluids(new FluidStack(200, Fluids.RECLAIMED))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_PETROIL", 20)
|
||||
.inputFluids(new FluidStack(250, FluidTypeTheOldOne.PETROIL))
|
||||
.inputFluids(new FluidStack(250, Fluids.PETROIL))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_LUBRICANT", 20)
|
||||
.inputFluids(new FluidStack(250, FluidTypeTheOldOne.LUBRICANT))
|
||||
.inputFluids(new FluidStack(250, Fluids.LUBRICANT))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_NAPHTHA", 20)
|
||||
.inputFluids(new FluidStack(300, FluidTypeTheOldOne.NAPHTHA))
|
||||
.inputFluids(new FluidStack(300, Fluids.NAPHTHA))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_DIESEL", 20)
|
||||
.inputFluids(new FluidStack(400, FluidTypeTheOldOne.DIESEL))
|
||||
.inputFluids(new FluidStack(400, Fluids.DIESEL))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_LIGHTOIL", 20)
|
||||
.inputFluids(new FluidStack(450, FluidTypeTheOldOne.LIGHTOIL))
|
||||
.inputFluids(new FluidStack(450, Fluids.LIGHTOIL))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_KEROSENE", 20)
|
||||
.inputFluids(new FluidStack(550, FluidTypeTheOldOne.KEROSENE))
|
||||
.inputFluids(new FluidStack(550, Fluids.KEROSENE))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_GAS", 20)
|
||||
.inputFluids(new FluidStack(750, FluidTypeTheOldOne.GAS))
|
||||
.inputFluids(new FluidStack(750, Fluids.GAS))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_PETROLEUM", 20)
|
||||
.inputFluids(new FluidStack(600, FluidTypeTheOldOne.PETROLEUM))
|
||||
.inputFluids(new FluidStack(600, Fluids.PETROLEUM))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_BIOGAS", 20)
|
||||
.inputFluids(new FluidStack(3500, FluidTypeTheOldOne.BIOGAS))
|
||||
.inputFluids(new FluidStack(3500, Fluids.BIOGAS))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
|
||||
recipes.add(new ChemRecipe("SF_BIOFUEL", 20)
|
||||
.inputFluids(new FluidStack(1500, FluidTypeTheOldOne.BIOFUEL))
|
||||
.inputFluids(new FluidStack(1500, Fluids.BIOFUEL))
|
||||
.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));;
|
||||
}
|
||||
|
||||
public static void registerOtherOil() {
|
||||
recipes.add(new ChemRecipe("BP_BIOGAS", 200)
|
||||
.inputItems(new ComparableStack(ModItems.biomass, 16))
|
||||
.outputFluids(new FluidStack(4000, FluidTypeTheOldOne.BIOGAS)));
|
||||
.outputFluids(new FluidStack(4000, Fluids.BIOGAS)));
|
||||
recipes.add(new ChemRecipe("BP_BIOFUEL", 100)
|
||||
.inputFluids(new FluidStack(2000, FluidTypeTheOldOne.BIOGAS))
|
||||
.outputFluids(new FluidStack(1000, FluidTypeTheOldOne.BIOFUEL)));
|
||||
.inputFluids(new FluidStack(2000, Fluids.BIOGAS))
|
||||
.outputFluids(new FluidStack(1000, Fluids.BIOFUEL)));
|
||||
recipes.add(new ChemRecipe("LPG", 100)
|
||||
.inputFluids(new FluidStack(2000, FluidTypeTheOldOne.PETROLEUM))
|
||||
.outputFluids(new FluidStack(1000, FluidTypeTheOldOne.LPG)));
|
||||
.inputFluids(new FluidStack(2000, Fluids.PETROLEUM))
|
||||
.outputFluids(new FluidStack(1000, Fluids.LPG)));
|
||||
recipes.add(new ChemRecipe("OIL_SAND", 200)
|
||||
.inputItems(new ComparableStack(ModBlocks.ore_oil_sand, 16), new ComparableStack(ModItems.oil_tar, 1))
|
||||
.outputItems(new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4))
|
||||
.outputFluids(new FluidStack(1000, FluidTypeTheOldOne.BITUMEN)));
|
||||
.outputFluids(new FluidStack(1000, Fluids.BITUMEN)));
|
||||
recipes.add(new ChemRecipe("ASPHALT", 100)
|
||||
.inputItems(new ComparableStack(Blocks.gravel, 2), new ComparableStack(Blocks.sand, 6))
|
||||
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.BITUMEN))
|
||||
.inputFluids(new FluidStack(1000, Fluids.BITUMEN))
|
||||
.outputItems(new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4)));
|
||||
}
|
||||
|
||||
|
||||
@ -1,77 +1,82 @@
|
||||
package com.hbm.inventory.recipes;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.items.ModItems;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class FusionRecipes {
|
||||
|
||||
public static int getByproductChance(FluidTypeTheOldOne plasma) {
|
||||
|
||||
switch(plasma) {
|
||||
case PLASMA_DT: return 1200;
|
||||
case PLASMA_DH3: return 600;
|
||||
case PLASMA_HD: return 1200;
|
||||
case PLASMA_HT: return 1200;
|
||||
case PLASMA_XM: return 2400;
|
||||
case PLASMA_BF: return 150;
|
||||
default: return 0;
|
||||
}
|
||||
public static HashMap<FluidType, Integer> chances = new HashMap();
|
||||
static {
|
||||
chances.put(Fluids.PLASMA_DT, 1200);
|
||||
chances.put(Fluids.PLASMA_DH3, 600);
|
||||
chances.put(Fluids.PLASMA_HD, 1200);
|
||||
chances.put(Fluids.PLASMA_HT, 1200);
|
||||
chances.put(Fluids.PLASMA_XM, 1200);
|
||||
chances.put(Fluids.PLASMA_BF, 150);
|
||||
}
|
||||
|
||||
public static int getBreedingLevel(FluidTypeTheOldOne plasma) {
|
||||
|
||||
switch(plasma) {
|
||||
case PLASMA_DT: return 1;
|
||||
case PLASMA_DH3: return 2;
|
||||
case PLASMA_HD: return 1;
|
||||
case PLASMA_HT: return 1;
|
||||
case PLASMA_XM: return 3;
|
||||
case PLASMA_BF: return 4;
|
||||
default: return 0;
|
||||
}
|
||||
public static int getByproductChance(FluidType plasma) {
|
||||
Integer chance = chances.get(plasma);
|
||||
return chance != null ? chance : 0;
|
||||
}
|
||||
|
||||
public static ItemStack getByproduct(FluidTypeTheOldOne plasma) {
|
||||
|
||||
switch(plasma) {
|
||||
case PLASMA_DT: return new ItemStack(ModItems.pellet_charged);
|
||||
case PLASMA_DH3: return new ItemStack(ModItems.pellet_charged);
|
||||
case PLASMA_HD: return new ItemStack(ModItems.pellet_charged);
|
||||
case PLASMA_HT: return new ItemStack(ModItems.pellet_charged);
|
||||
case PLASMA_XM: return new ItemStack(ModItems.powder_chlorophyte);
|
||||
case PLASMA_BF: return new ItemStack(ModItems.powder_balefire);
|
||||
default: return null;
|
||||
}
|
||||
public static HashMap<FluidType, Integer> levels = new HashMap();
|
||||
static {
|
||||
levels.put(Fluids.PLASMA_DT, 1);
|
||||
levels.put(Fluids.PLASMA_DH3, 2);
|
||||
levels.put(Fluids.PLASMA_HD, 1);
|
||||
levels.put(Fluids.PLASMA_HT, 1);
|
||||
levels.put(Fluids.PLASMA_XM, 3);
|
||||
levels.put(Fluids.PLASMA_BF, 4);
|
||||
}
|
||||
|
||||
public static int getSteamProduction(FluidTypeTheOldOne plasma) {
|
||||
|
||||
switch(plasma) {
|
||||
case PLASMA_DT: return 30;
|
||||
case PLASMA_DH3: return 50;
|
||||
case PLASMA_HD: return 20;
|
||||
case PLASMA_HT: return 25;
|
||||
case PLASMA_XM: return 60;
|
||||
case PLASMA_BF: return 160;
|
||||
default: return 0;
|
||||
}
|
||||
public static int getBreedingLevel(FluidType plasma) {
|
||||
Integer level = levels.get(plasma);
|
||||
return level != null ? level : 0;
|
||||
}
|
||||
|
||||
public static HashMap<FluidType, ItemStack> byproducts = new HashMap();
|
||||
static {
|
||||
byproducts.put(Fluids.PLASMA_DT, new ItemStack(ModItems.pellet_charged));
|
||||
byproducts.put(Fluids.PLASMA_DH3, new ItemStack(ModItems.pellet_charged));
|
||||
byproducts.put(Fluids.PLASMA_HD, new ItemStack(ModItems.pellet_charged));
|
||||
byproducts.put(Fluids.PLASMA_HT, new ItemStack(ModItems.pellet_charged));
|
||||
byproducts.put(Fluids.PLASMA_XM, new ItemStack(ModItems.powder_chlorophyte));
|
||||
byproducts.put(Fluids.PLASMA_BF, new ItemStack(ModItems.powder_balefire));
|
||||
}
|
||||
|
||||
public static ItemStack getByproduct(FluidType plasma) {
|
||||
ItemStack byproduct = byproducts.get(plasma);
|
||||
return byproduct != null ? byproduct.copy() : null;
|
||||
}
|
||||
|
||||
public static HashMap<FluidType, Integer> steamprod = new HashMap();
|
||||
static {
|
||||
steamprod.put(Fluids.PLASMA_DT, 30);
|
||||
steamprod.put(Fluids.PLASMA_DH3, 50);
|
||||
steamprod.put(Fluids.PLASMA_HD, 20);
|
||||
steamprod.put(Fluids.PLASMA_HT, 25);
|
||||
steamprod.put(Fluids.PLASMA_XM, 60);
|
||||
steamprod.put(Fluids.PLASMA_BF, 160);
|
||||
}
|
||||
|
||||
public static int getSteamProduction(FluidType plasma) {
|
||||
Integer steam = steamprod.get(plasma);
|
||||
return steam != null ? steam : 0;
|
||||
}
|
||||
|
||||
public static HashMap<ItemStack, ItemStack> getRecipes() {
|
||||
|
||||
HashMap<ItemStack, ItemStack> map = new HashMap();
|
||||
|
||||
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_DT.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_DT));
|
||||
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_DH3.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_DH3));
|
||||
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_HD.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_HD));
|
||||
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_HT.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_HT));
|
||||
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_XM.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_XM));
|
||||
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_BF.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_BF));
|
||||
|
||||
for(Entry<FluidType, ItemStack> entry : byproducts.entrySet()) {
|
||||
map.put(new ItemStack(ModItems.fluid_icon, 1, entry.getKey().getID()), entry.getValue().copy());
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
@ -6,6 +6,8 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.items.machine.ItemFluidIcon;
|
||||
|
||||
@ -14,7 +16,7 @@ import net.minecraft.item.ItemStack;
|
||||
public class GasCentrifugeRecipes {
|
||||
|
||||
public static enum PseudoFluidType {
|
||||
NONE (0, 0, "NONE", "Empty", false, null),
|
||||
NONE (0, 0, "NONE", "Empty", false, (ItemStack)null),
|
||||
|
||||
NUF6 (400, 300, "LEUF6", "Natural UF6", false, new ItemStack(ModItems.nugget_u238, 1)),
|
||||
LEUF6 (300, 200, "MEUF6", "Low Enriched UF6", false, new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.fluorite, 1)),
|
||||
@ -66,42 +68,33 @@ public class GasCentrifugeRecipes {
|
||||
};
|
||||
|
||||
//Recipes for NEI
|
||||
public static List<ItemStack> getGasCentOutputs(FluidTypeTheOldOne fluid) {
|
||||
public static List<ItemStack> getGasCentOutputs(FluidType fluid) {
|
||||
List<ItemStack> outputs = new ArrayList(4);
|
||||
|
||||
switch(fluid) {
|
||||
case UF6:
|
||||
if(fluid == Fluids.UF6) {
|
||||
outputs.add(new ItemStack(ModItems.nugget_u238, 11));
|
||||
outputs.add(new ItemStack(ModItems.nugget_u235, 1));
|
||||
outputs.add(new ItemStack(ModItems.fluorite, 4));
|
||||
return outputs;
|
||||
case PUF6:
|
||||
} else if(fluid == Fluids.PUF6) {
|
||||
outputs.add(new ItemStack(ModItems.nugget_pu238, 3));
|
||||
outputs.add(new ItemStack(ModItems.nugget_pu_mix, 6));
|
||||
outputs.add(new ItemStack(ModItems.fluorite, 3));
|
||||
return outputs;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
return outputs;
|
||||
}
|
||||
|
||||
public static int getQuantityRequired(FluidTypeTheOldOne fluid) {
|
||||
switch(fluid) {
|
||||
case UF6:
|
||||
return 1200;
|
||||
case PUF6:
|
||||
return 900;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
public static int getQuantityRequired(FluidType fluid) {
|
||||
if(fluid == Fluids.UF6) return 1200;
|
||||
if(fluid == Fluids.PUF6)return 900;
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static Map<Object, Object[]> getGasCentrifugeRecipes() {
|
||||
Map<Object, Object[]> recipes = new HashMap<Object, Object[]>();
|
||||
|
||||
for(int i = 0; i < FluidTypeTheOldOne.values().length; i++) {
|
||||
if(getGasCentOutputs(FluidTypeTheOldOne.getEnum(i)) != null) {
|
||||
List<ItemStack> out = getGasCentOutputs(FluidTypeTheOldOne.getEnum(i));
|
||||
for(int i = 0; i < FluidType.values().length; i++) {
|
||||
if(getGasCentOutputs(Fluids.fromID(i)) != null) {
|
||||
List<ItemStack> out = getGasCentOutputs(Fluids.fromID(i));
|
||||
ItemStack[] outputs = new ItemStack[4];
|
||||
|
||||
for(int j = 0; j < out.size(); j++) {
|
||||
@ -112,7 +105,7 @@ public class GasCentrifugeRecipes {
|
||||
outputs[j] = new ItemStack(ModItems.nothing);
|
||||
|
||||
ItemStack input = new ItemStack(ModItems.fluid_icon, 1, i);
|
||||
ItemFluidIcon.addQuantity(input, getQuantityRequired(FluidTypeTheOldOne.getEnum(i)));
|
||||
ItemFluidIcon.addQuantity(input, getQuantityRequired(Fluids.fromID(i)));
|
||||
|
||||
recipes.put(input, outputs);
|
||||
}
|
||||
|
||||
@ -5,8 +5,8 @@ import com.hbm.handler.BucketHandler;
|
||||
import com.hbm.handler.ToolAbility;
|
||||
import com.hbm.handler.ToolAbility.LuckAbility;
|
||||
import com.hbm.handler.WeaponAbility;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.handler.guncfg.*;
|
||||
import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.items.armor.*;
|
||||
import com.hbm.items.bomb.*;
|
||||
import com.hbm.items.food.*;
|
||||
@ -5212,10 +5212,10 @@ public class ModItems {
|
||||
|
||||
australium_iii = new ArmorAustralium(MainRegistry.aMatAus3, 9, 1).setUnlocalizedName("australium_iii").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iii");
|
||||
|
||||
jetpack_boost = new JetpackBooster(FluidTypeTheOldOne.BALEFIRE, 32000).setUnlocalizedName("jetpack_boost").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost");
|
||||
jetpack_break = new JetpackBreak(FluidTypeTheOldOne.KEROSENE, 12000).setUnlocalizedName("jetpack_break").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break");
|
||||
jetpack_fly = new JetpackRegular(FluidTypeTheOldOne.KEROSENE, 12000).setUnlocalizedName("jetpack_fly").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly");
|
||||
jetpack_vector = new JetpackVectorized(FluidTypeTheOldOne.KEROSENE, 16000).setUnlocalizedName("jetpack_vector").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_vector");
|
||||
jetpack_boost = new JetpackBooster(Fluids.BALEFIRE, 32000).setUnlocalizedName("jetpack_boost").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost");
|
||||
jetpack_break = new JetpackBreak(Fluids.KEROSENE, 12000).setUnlocalizedName("jetpack_break").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break");
|
||||
jetpack_fly = new JetpackRegular(Fluids.KEROSENE, 12000).setUnlocalizedName("jetpack_fly").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly");
|
||||
jetpack_vector = new JetpackVectorized(Fluids.KEROSENE, 16000).setUnlocalizedName("jetpack_vector").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_vector");
|
||||
wings_murk = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_murk").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_murk");
|
||||
wings_limp = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_limp").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_limp");
|
||||
|
||||
|
||||
@ -3,8 +3,8 @@ package com.hbm.items.armor;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.handler.ArmorModHandler;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.interfaces.IPartiallyFillable;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.render.model.ModelJetPack;
|
||||
import com.hbm.util.ArmorUtil;
|
||||
import com.hbm.util.I18nUtil;
|
||||
@ -27,10 +27,10 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
|
||||
public abstract class JetpackBase extends ItemArmorMod implements IPartiallyFillable {
|
||||
|
||||
private ModelJetPack model;
|
||||
public FluidTypeTheOldOne fuel;
|
||||
public FluidType fuel;
|
||||
public int maxFuel;
|
||||
|
||||
public JetpackBase(FluidTypeTheOldOne fuel, int maxFuel) {
|
||||
public JetpackBase(FluidType fuel, int maxFuel) {
|
||||
super(ArmorModHandler.plate_only, false, true, false, false);
|
||||
this.fuel = fuel;
|
||||
this.maxFuel = maxFuel;
|
||||
@ -139,7 +139,7 @@ public abstract class JetpackBase extends ItemArmorMod implements IPartiallyFill
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTypeTheOldOne getType(ItemStack stack) {
|
||||
public FluidType getType(ItemStack stack) {
|
||||
return fuel;
|
||||
}
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ package com.hbm.items.armor;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.extprop.HbmPlayerProps;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.packet.AuxParticlePacketNT;
|
||||
import com.hbm.packet.PacketDispatcher;
|
||||
|
||||
@ -19,7 +19,7 @@ import net.minecraft.world.World;
|
||||
|
||||
public class JetpackBooster extends JetpackBase {
|
||||
|
||||
public JetpackBooster(FluidTypeTheOldOne fuel, int maxFuel) {
|
||||
public JetpackBooster(FluidType fuel, int maxFuel) {
|
||||
super(fuel, maxFuel);
|
||||
}
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ package com.hbm.items.armor;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.extprop.HbmPlayerProps;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.packet.AuxParticlePacketNT;
|
||||
import com.hbm.packet.PacketDispatcher;
|
||||
|
||||
@ -20,7 +20,7 @@ public class JetpackBreak extends JetpackBase {
|
||||
|
||||
public static int maxFuel = 1200;
|
||||
|
||||
public JetpackBreak(FluidTypeTheOldOne fuel, int maxFuel) {
|
||||
public JetpackBreak(FluidType fuel, int maxFuel) {
|
||||
super(fuel, maxFuel);
|
||||
}
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ package com.hbm.items.armor;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.extprop.HbmPlayerProps;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.packet.AuxParticlePacketNT;
|
||||
import com.hbm.packet.PacketDispatcher;
|
||||
|
||||
@ -18,7 +18,7 @@ import net.minecraft.world.World;
|
||||
|
||||
public class JetpackRegular extends JetpackBase {
|
||||
|
||||
public JetpackRegular(FluidTypeTheOldOne fuel, int maxFuel) {
|
||||
public JetpackRegular(FluidType fuel, int maxFuel) {
|
||||
super(fuel, maxFuel);
|
||||
}
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ package com.hbm.items.armor;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.extprop.HbmPlayerProps;
|
||||
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
import com.hbm.packet.AuxParticlePacketNT;
|
||||
import com.hbm.packet.PacketDispatcher;
|
||||
|
||||
@ -19,7 +19,7 @@ import net.minecraft.world.World;
|
||||
|
||||
public class JetpackVectorized extends JetpackBase {
|
||||
|
||||
public JetpackVectorized(FluidTypeTheOldOne fuel, int maxFuel) {
|
||||
public JetpackVectorized(FluidType fuel, int maxFuel) {
|
||||
super(fuel, maxFuel);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user