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

Retrofitted CMB furnace, removed deuterium extractor, pumpjack fixes

Browse Source
This commit is contained in:
HbmMods 2017-08-30 11:17:51 +02:00
parent f5c8d4309a
commit b09ac815f3
13 changed files with 99 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/hbm/lang/de_DE.lang
View File

@ -215,8 +215,10 @@ container.iGenerator=Industrieller Generator
tile.machine_cyclotron.name=Zyklotron
container.cyclotron=Zyklotron
tile.machine_well.name=Ölbohrturm
tile.machine_pumpjack.name=Pferdekopfpumpe
tile.oil_pipe.name=Rohölrohr
container.oilWell=Ölbohrturm
container.pumpjack=Pferdekopfpumpe
tile.machine_refinery.name=Ölraffinerie
container.machineRefinery=Ölraffinerie
tile.oil_duct.name=Ölrohr
@ -303,6 +305,7 @@ tile.machine_rtg_cyan.name=Schrabidium-Zerfallsenergie-Generator (WIP)
tile.machine_rtg_blue.name=Konvektionsgenerator
tile.machine_rtg_purple.name=Paarvernichtungsgenerator
item.template_folder.name=Produktionsvorlagen-Zeichenmappe
item.fluid_identifier.name=Flüssigkeits-Kennzeichnung
item.assembly_template.name=Fertigungsvorlage:
item.chemistry_template.name=Chemievorlage:
@ -578,6 +581,7 @@ item.upgrade_fortune_3.name=Lila Maschinenupgrade Mk.III
item.fusion_core.name=Fusionskern
item.energy_core.name=Selbstgebauter Energiekern
item.fusion_core_infinite.name=Unendlicher Fusionskern
item.plate_iron.name=Eisenplatte
item.plate_lead.name=Bleiplatte

4
assets/hbm/lang/en_US.lang
View File

@ -215,8 +215,10 @@ container.iGenerator=Industrial Generator
tile.machine_cyclotron.name=Cyclotron
container.cyclotron=Cyclotron
tile.machine_well.name=Oil Derrick
tile.machine_pumpjack.name=Pumpjack
tile.oil_pipe.name=Crude Oil Extraction Pipe
container.oilWell=Oil Derrick
container.pumpjack=Pumpjack
tile.machine_refinery.name=Oil Refinery
container.machineRefinery=Oil Refinery
tile.oil_duct.name=Oil Pipe
@ -303,6 +305,7 @@ tile.machine_rtg_cyan.name=Schrabidium Decay Generator (WIP)
tile.machine_rtg_blue.name=Convection Generator
tile.machine_rtg_purple.name=Antimatter Annihilation Generator
item.template_folder.name=Machine Template Folder
item.fluid_identifier.name=Fluid Identifier
item.assembly_template.name=Assembly Template:
item.chemistry_template.name=Chemistry Template:
@ -578,6 +581,7 @@ item.upgrade_fortune_3.name=Purple Machine Upgrade Mk.III
item.fusion_core.name=Fusion Core
item.energy_core.name=Makeshift Energy Core
item.fusion_core_infinite.name=Infinite Fusion Core
item.plate_iron.name=Iron Plate
item.plate_lead.name=Lead Plate

BIN
assets/hbm/textures/gui/gui_cmb_manufactory.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

6
com/hbm/blocks/ModBlocks.java
View File

@ -234,7 +234,7 @@ public class ModBlocks {
public static Block machine_electric_furnace_on;
public static final int guiID_electric_furnace = 16;
public static Block machine_deuterium;
//public static Block machine_deuterium;
public static final int guiID_machine_deuterium = 20;
public static Block machine_battery;
@ -592,7 +592,7 @@ public class ModBlocks {
machine_electric_furnace_off = new MachineElectricFurnace(false).setBlockName("machine_electric_furnace_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
machine_electric_furnace_on = new MachineElectricFurnace(true).setBlockName("machine_electric_furnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F);
machine_deuterium = new MachineDeuterium(Material.iron).setBlockName("machine_deuterium").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
//machine_deuterium = new MachineDeuterium(Material.iron).setBlockName("machine_deuterium").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
machine_battery = new MachineBattery(Material.iron).setBlockName("machine_battery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
@ -958,7 +958,7 @@ public class ModBlocks {
GameRegistry.registerBlock(machine_chemplant, machine_chemplant.getUnlocalizedName());
GameRegistry.registerBlock(machine_fluidtank, machine_fluidtank.getUnlocalizedName());
GameRegistry.registerBlock(machine_shredder, machine_shredder.getUnlocalizedName());
GameRegistry.registerBlock(machine_deuterium, machine_deuterium.getUnlocalizedName());
//GameRegistry.registerBlock(machine_deuterium, machine_deuterium.getUnlocalizedName());
GameRegistry.registerBlock(machine_well, machine_well.getUnlocalizedName());
GameRegistry.registerBlock(machine_pumpjack, machine_pumpjack.getUnlocalizedName());
GameRegistry.registerBlock(machine_flare, machine_flare.getUnlocalizedName());

4
com/hbm/blocks/machine/MachineDeuterium.java
View File

@ -54,11 +54,11 @@ public class MachineDeuterium extends BlockContainer {
return new TileEntityMachineDeuterium();
}
@Override
/*@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
{
return Item.getItemFromBlock(ModBlocks.machine_deuterium);
}
}*/
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {

10
com/hbm/inventory/MachineRecipes.java
View File

@ -2083,13 +2083,13 @@ public class MachineRecipes {
list.add(new ItemStack(Blocks.iron_bars, 2));
list.add(new ItemStack(ModBlocks.red_wire_coated, 1));
break;
case DEUTERIUM_EXTRACTOR:
/*case DEUTERIUM_EXTRACTOR:
list.add(new ItemStack(ModItems.ingot_titanium, 4));
list.add(new ItemStack(ModItems.plate_titanium, 6));
list.add(new ItemStack(ModItems.wire_red_copper, 4));
list.add(new ItemStack(ModItems.tank_steel, 2));
list.add(new ItemStack(ModItems.coil_tungsten, 4));
break;
break;*/
case DERRICK:
list.add(new ItemStack(ModBlocks.steel_scaffold, 20));
list.add(new ItemStack(ModBlocks.steel_beam, 8));
@ -2451,9 +2451,9 @@ public class MachineRecipes {
case SHREDDER:
output = new ItemStack(ModBlocks.machine_shredder, 1);
break;
case DEUTERIUM_EXTRACTOR:
output = new ItemStack(ModBlocks.machine_deuterium, 1);
break;
//case DEUTERIUM_EXTRACTOR:
// output = new ItemStack(ModBlocks.machine_deuterium, 1);
// break;
case DERRICK:
output = new ItemStack(ModBlocks.machine_well, 1);
break;

28
com/hbm/inventory/container/ContainerMachineCMBFactory.java
View File

@ -14,19 +14,18 @@ public class ContainerMachineCMBFactory extends Container {
private TileEntityMachineCMBFactory diFurnace;
private int power;
private int progress;
private int waste;
public ContainerMachineCMBFactory(InventoryPlayer invPlayer, TileEntityMachineCMBFactory tedf) {
power = 0;
waste = 0;
diFurnace = tedf;
this.addSlotToContainer(new Slot(tedf, 0, 62, 17));
this.addSlotToContainer(new Slot(tedf, 1, 80, 17));
this.addSlotToContainer(new Slot(tedf, 2, 62, 53));
this.addSlotToContainer(new Slot(tedf, 3, 80, 53));
this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134, 35));
this.addSlotToContainer(new Slot(tedf, 0, 62 + 9, 17));
this.addSlotToContainer(new Slot(tedf, 1, 80 + 9, 17));
this.addSlotToContainer(new Slot(tedf, 2, 62 + 9, 53));
this.addSlotToContainer(new Slot(tedf, 3, 80 + 9, 53));
this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134 + 9, 35));
this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 62 - 9, 53));
for(int i = 0; i < 3; i++)
{
@ -47,7 +46,6 @@ public class ContainerMachineCMBFactory extends Container {
super.addCraftingToCrafters(crafting);
crafting.sendProgressBarUpdate(this, 0, this.diFurnace.power);
crafting.sendProgressBarUpdate(this, 1, this.diFurnace.process);
crafting.sendProgressBarUpdate(this, 2, this.diFurnace.waste);
}
@Override
@ -61,8 +59,8 @@ public class ContainerMachineCMBFactory extends Container {
ItemStack var5 = var4.getStack();
var3 = var5.copy();
if (par2 <= 4) {
if (!this.mergeItemStack(var5, 5, this.inventorySlots.size(), true))
if (par2 <= 5) {
if (!this.mergeItemStack(var5, 6, this.inventorySlots.size(), true))
{
return null;
}
@ -108,16 +106,10 @@ public class ContainerMachineCMBFactory extends Container {
{
par1.sendProgressBarUpdate(this, 1, this.diFurnace.process);
}
if(this.progress != this.diFurnace.waste)
{
par1.sendProgressBarUpdate(this, 2, this.diFurnace.waste);
}
}
this.power = this.diFurnace.power;
this.progress = this.diFurnace.process;
this.waste = this.diFurnace.waste;
}
@Override
@ -130,9 +122,5 @@ public class ContainerMachineCMBFactory extends Container {
{
diFurnace.process = j;
}
if(i == 2)
{
diFurnace.waste = j;
}
}
}

18
com/hbm/inventory/gui/GUIMachineCMBFactory.java
View File

@ -2,6 +2,7 @@ package com.hbm.inventory.gui;
import org.lwjgl.opengl.GL11;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.container.ContainerMachineCMBFactory;
import com.hbm.lib.RefStrings;
import com.hbm.tileentity.TileEntityMachineCMBFactory;
@ -11,7 +12,7 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
public class GUIMachineCMBFactory extends GuiContainer {
public class GUIMachineCMBFactory extends GuiFluidContainer {
private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_cmb_manufactory.png");
private TileEntityMachineCMBFactory diFurnace;
@ -24,6 +25,13 @@ public class GUIMachineCMBFactory extends GuiContainer {
this.ySize = 166;
}
@Override
public void drawScreen(int mouseX, int mouseY, float f) {
super.drawScreen(mouseX, mouseY, f);
diFurnace.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 69 - 52, 16, 52);
}
@Override
protected void drawGuiContainerForegroundLayer(int i, int j) {
String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName());
@ -42,12 +50,12 @@ public class GUIMachineCMBFactory extends GuiContainer {
int i = diFurnace.getPowerScaled(52);
drawTexturedModalRect(guiLeft + 8, guiTop + 69 - i, 176, 52 - i, 16, i);
}
if(diFurnace.waste > 0) {
int i = diFurnace.getWasteScaled(52);
drawTexturedModalRect(guiLeft + 26, guiTop + 69 - i, 192, 52 - i, 16, i);
}
int j1 = diFurnace.getProgressScaled(24);
drawTexturedModalRect(guiLeft + 101, guiTop + 34, 208, 0, j1 + 1, 16);
Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
diFurnace.tank.renderTank(this, guiLeft + 26, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52);
}
}

42
com/hbm/items/special/ItemStarterKit.java
View File

@ -33,6 +33,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_centrifuge), 1));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_reactor), 1));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_uf6_tank), 1));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_assembler), 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.ingot_uranium, 6));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.ingot_red_copper, 16));
@ -51,7 +52,9 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.coil_copper, 8));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.tank_steel, 4));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_rtg, 4));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_rtg, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_rtg, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_rtg, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.cell_empty, 32));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.cell_uf6, 8));
@ -65,7 +68,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_reactor), 3));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_uf6_tank), 2));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_puf6_tank), 2));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_deuterium), 1));
//player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_deuterium), 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.ingot_uranium, 16));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.ingot_u235, 16));
@ -134,26 +137,20 @@ public class ItemStarterKit extends Item {
if(this == ModItems.nuke_electric_kit)
{
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_coal_off), 4));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_coal_off), 2));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_diesel), 1));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.red_cable), 64));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.red_cable), 64));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.red_wire_coated), 64));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 6));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off), 2));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_generic, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_generic, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_generic, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_generic, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_generic, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_generic, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_advanced, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_advanced, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_advanced, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_advanced, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_chemplant), 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_red_cell_24, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_advanced_cell_4, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_advanced_cell_4, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_lithium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fusion_core, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.energy_core, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.energy_core, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.plate_aluminium, 32));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.plate_titanium, 32));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.plate_steel, 32));
@ -293,18 +290,8 @@ public class ItemStarterKit extends Item {
{
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.launch_pad), 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.designator, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.designator_range, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium_cell_4, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_generic, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_strong, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_burst, 1));
@ -321,6 +308,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_nuclear_cluster, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_endo, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_exo, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_doomsday, 1));
}
if(this == ModItems.t45_kit)

4
com/hbm/items/tool/ItemAssemblyTemplate.java
View File

@ -30,7 +30,7 @@ public class ItemAssemblyTemplate extends Item {
TITANIUM_FILTER, LITHIUM_BOX, BERYLLIUM_BOX, COAL_BOX, COPPER_BOX, PLUTONIUM_BOX, THERMO_ELEMENT,
LIMITER, ANGRY_METAL, CMB_TILE, CMB_BRICKS, HATCH_FRAME, HATCH_CONTROLLER, CENTRIFUGE,
BREEDING_REACTOR, RTG_FURNACE, DIESEL_GENERATOR, NUCLEAR_GENERATOR, INDUSTRIAL_GENERATOR, CYCLOTRON,
RT_GENERATOR, BATTERY, HE_TO_RF, RF_TO_HE, SHREDDER, DEUTERIUM_EXTRACTOR, DERRICK, FLARE_STACK,
RT_GENERATOR, BATTERY, HE_TO_RF, RF_TO_HE, SHREDDER, DERRICK, FLARE_STACK,
REFINERY, CHEMPLANT, TANK, MINER, SCHRABTRANS, CMB_FURNACE, FA_HULL, FA_HATCH, FA_CORE, FA_PORT,
LR_ELEMENT, LR_HATCH, LR_PORT, LR_CORE, LF_MAGNET, LF_CENTER, LF_MOTOR, LF_HEATER, LF_HATCH, LF_CORE,
LW_ELEMENT, LW_CONTROL, LW_COOLER, LW_STRUTURE, LW_HATCH, LW_PORT, LW_CORE, FW_MAGNET, FW_COMPUTER,
@ -305,8 +305,6 @@ public class ItemAssemblyTemplate extends Item {
return 150;
case SHREDDER:
return 200;
case DEUTERIUM_EXTRACTOR:
return 150;
case DERRICK:
return 250;
case FLARE_STACK:

2
com/hbm/main/CraftingManager.java
View File

@ -480,7 +480,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.oil_duct), 16), new Object[] { "SIS", " ", "SIS", 'S', "plateSteel", 'I', "plateIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.gas_duct_solid), 16), new Object[] { "SPS", "P P", "SPS", 'S', "ingotSteel", 'P', "plateCopper" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.gas_duct), 16), new Object[] { "SIS", " ", "SIS", 'S', "plateSteel", 'I', "plateCopper" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_deuterium), 1), new Object[] { "TIT", "RFR", "CCC", 'T', ModItems.tank_steel, 'I', "ingotTitanium", 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 'C', ModItems.coil_tungsten }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_deuterium), 1), new Object[] { "TIT", "RFR", "CCC", 'T', ModItems.tank_steel, 'I', "ingotTitanium", 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 'C', ModItems.coil_tungsten }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TST", "RIR", "TLT", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TLT", "RIR", "TST", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_coal_off), 1), new Object[] { "STS", "SCS", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'C', "ingotRedstoneAlloy", 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) }));

61
com/hbm/tileentity/TileEntityMachineCMBFactory.java
View File

@ -1,6 +1,10 @@
package com.hbm.tileentity;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.interfaces.IConsumer;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.inventory.FluidTank;
import com.hbm.items.ModItems;
import com.hbm.items.special.ItemBattery;
import com.hbm.lib.Library;
@ -13,17 +17,16 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInventory, IConsumer {
public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInventory, IConsumer, IFluidContainer, IFluidAcceptor {
private ItemStack slots[];
public int power = 0;
public int waste = 0;
public int process = 0;
public int soundCycle = 0;
public static final int maxFill = 1000;
public static final int maxPower = 100000;
public static final int processSpeed = 200;
public FluidTank tank;
private static final int[] slots_top = new int[] {1, 3};
private static final int[] slots_bottom = new int[] {0, 2, 4};
@ -32,7 +35,8 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
private String customName;
public TileEntityMachineCMBFactory() {
slots = new ItemStack[5];
slots = new ItemStack[6];
tank = new FluidTank(FluidType.WATZ, 16000, 0);
}
@Override
@ -153,7 +157,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
NBTTagList list = nbt.getTagList("items", 10);
power = nbt.getInteger("power");
waste = nbt.getInteger("waste");
tank.readFromNBT(nbt, "watz");
process = nbt.getShort("process");
slots = new ItemStack[getSizeInventory()];
@ -172,7 +176,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setInteger("power", power);
nbt.setInteger("waste", waste);
tank.writeToNBT(nbt, "watz");
nbt.setShort("process", (short) process);
NBTTagList list = new NBTTagList();
@ -218,10 +222,6 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
return (power * i) / maxPower;
}
public int getWasteScaled(int i) {
return (waste * i) / maxFill;
}
public int getProgressScaled(int i) {
return (process * i) / processSpeed;
}
@ -230,7 +230,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
boolean b = false;
if(waste > 0 && power > 0 && slots[1] != null && slots[3] != null && (slots[4] == null || slots[4].stackSize <= 60))
if(tank.getFill() > 0 && power > 0 && slots[1] != null && slots[3] != null && (slots[4] == null || slots[4].stackSize <= 60))
{
boolean flag0 = slots[1].getItem() == ModItems.ingot_magnetized_tungsten || slots[1].getItem() == ModItems.powder_magnetized_tungsten;
boolean flag1 = slots[3].getItem() == ModItems.ingot_advanced_alloy || slots[3].getItem() == ModItems.powder_advanced_alloy;
@ -246,7 +246,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
}
public void process() {
waste -= 1;
tank.setFill(tank.getFill() - 1);
power -= 15;
process++;
@ -282,15 +282,8 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
power = Library.chargeTEFromItems(slots, 0, power, maxPower);
if(waste + 500 <= maxFill && slots[2] != null && slots[2].getItem() == ModItems.bucket_mud) {
waste += 500;
slots[2] = new ItemStack(slots[2].getItem().getContainerItem());
}
if(waste + 500 <= maxFill && slots[2] != null && slots[2].getItem() == ModItems.tank_waste && slots[2].getItemDamage() > 0) {
waste += 500;
slots[2].setItemDamage(slots[2].getItemDamage() - 1);
}
tank.loadTank(2, 5, slots);
tank.updateTank(xCoord, yCoord, zCoord);
if (canProcess()) {
process();
@ -322,4 +315,30 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
public int getMaxPower() {
return maxPower;
}
@Override
public void setFillstate(int fill, int index) {
tank.setFill(fill);
}
@Override
public void setType(FluidType type, int index) {
tank.setTankType(type);
}
@Override
public int getMaxAFluidFill(FluidType type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0;
}
@Override
public int getAFluidFill(FluidType type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0;
}
@Override
public void setAFluidFill(int i, FluidType type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}
}

4
com/hbm/tileentity/TileEntityMachinePumpjack.java
View File

@ -96,7 +96,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven
@Override
public String getInventoryName() {
return this.hasCustomInventoryName() ? this.customName : "container.oilWell";
return this.hasCustomInventoryName() ? this.customName : "container.pumpjack";
}
@Override
@ -170,6 +170,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven
this.power = nbt.getInteger("powerTime");
this.age = nbt.getInteger("age");
this.rotation = nbt.getInteger("rotation");
this.tanks[0].readFromNBT(nbt, "oil");
this.tanks[1].readFromNBT(nbt, "gas");
@ -192,6 +193,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven
super.writeToNBT(nbt);
nbt.setInteger("powerTime", power);
nbt.setInteger("age", age);
nbt.setInteger("rotation", rotation);
this.tanks[0].writeToNBT(nbt, "oil");
this.tanks[1].writeToNBT(nbt, "gas");