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

ugh

Browse Source 
only doing this to appease bob, but what can you do
This commit is contained in:
Vaern 2022-01-05 16:21:15 -08:00
parent 66ed3ce371
commit bb9d444920
5 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/hbm/blocks/ModBlocks.java
View File

@ -976,7 +976,7 @@ public class ModBlocks {
public static Block reactor_research; public static Block reactor_research;
public static final int guiID_reactor_research = 65; public static final int guiID_reactor_research = 65;
public static Block machine_zirnox; public static Block reactor_zirnox;
public static final int guiID_reactor_zirnox = 124; public static final int guiID_reactor_zirnox = 124;
public static Block zirnox_destroyed; public static Block zirnox_destroyed;
@ -1709,7 +1709,7 @@ public class ModBlocks {
machine_puf6_tank = new MachinePuF6Tank(Material.iron).setBlockName("machine_puf6_tank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_puf6_tank = new MachinePuF6Tank(Material.iron).setBlockName("machine_puf6_tank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
machine_reactor_breeding = new MachineReactorBreeding(Material.iron).setBlockName("machine_reactor_breeding").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_reactor"); machine_reactor_breeding = new MachineReactorBreeding(Material.iron).setBlockName("machine_reactor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_reactor");
machine_nuke_furnace_off = new MachineNukeFurnace(false).setBlockName("machine_nuke_furnace_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_nuke_furnace_off = new MachineNukeFurnace(false).setBlockName("machine_nuke_furnace_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
machine_nuke_furnace_on = new MachineNukeFurnace(true).setBlockName("machine_nuke_furnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F); machine_nuke_furnace_on = new MachineNukeFurnace(true).setBlockName("machine_nuke_furnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F);
@ -2040,7 +2040,7 @@ public class ModBlocks {
machine_epress = new MachineEPress(Material.iron).setBlockName("machine_epress").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_epress"); machine_epress = new MachineEPress(Material.iron).setBlockName("machine_epress").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_epress");
machine_selenium = new MachineSeleniumEngine(Material.iron).setBlockName("machine_selenium").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_selenium"); machine_selenium = new MachineSeleniumEngine(Material.iron).setBlockName("machine_selenium").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_selenium");
reactor_research = new ReactorResearch(Material.iron).setBlockName("reactor_research").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_reactor_small"); reactor_research = new ReactorResearch(Material.iron).setBlockName("reactor_research").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_reactor_small");
machine_zirnox = new ReactorZirnox(Material.iron).setBlockName("machine_zirnox").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); reactor_zirnox = new ReactorZirnox(Material.iron).setBlockName("machine_reactor_small").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
zirnox_destroyed = new ZirnoxDestroyed(Material.iron).setBlockName("zirnox_destroyed").setHardness(100.0F).setResistance(800.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); zirnox_destroyed = new ZirnoxDestroyed(Material.iron).setBlockName("zirnox_destroyed").setHardness(100.0F).setResistance(800.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
machine_controller = new MachineReactorControl(Material.iron).setBlockName("machine_controller").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_controller = new MachineReactorControl(Material.iron).setBlockName("machine_controller").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
@ -2803,7 +2803,7 @@ public class ModBlocks {
GameRegistry.registerBlock(machine_generator, machine_generator.getUnlocalizedName()); GameRegistry.registerBlock(machine_generator, machine_generator.getUnlocalizedName());
GameRegistry.registerBlock(machine_controller, machine_controller.getUnlocalizedName()); GameRegistry.registerBlock(machine_controller, machine_controller.getUnlocalizedName());
GameRegistry.registerBlock(reactor_research, reactor_research.getUnlocalizedName()); GameRegistry.registerBlock(reactor_research, reactor_research.getUnlocalizedName());
GameRegistry.registerBlock(machine_zirnox, machine_zirnox.getUnlocalizedName()); GameRegistry.registerBlock(reactor_zirnox, reactor_zirnox.getUnlocalizedName());
GameRegistry.registerBlock(zirnox_destroyed, zirnox_destroyed.getUnlocalizedName()); GameRegistry.registerBlock(zirnox_destroyed, zirnox_destroyed.getUnlocalizedName());
GameRegistry.registerBlock(machine_industrial_generator, machine_industrial_generator.getUnlocalizedName()); GameRegistry.registerBlock(machine_industrial_generator, machine_industrial_generator.getUnlocalizedName());
GameRegistry.registerBlock(machine_radgen, machine_radgen.getUnlocalizedName()); GameRegistry.registerBlock(machine_radgen, machine_radgen.getUnlocalizedName());

37
src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java
View File

@ -19,7 +19,7 @@ public class ContainerReactorZirnox extends Container {
public ContainerReactorZirnox(InventoryPlayer invPlayer, TileEntityReactorZirnox te) { public ContainerReactorZirnox(InventoryPlayer invPlayer, TileEntityReactorZirnox te) {
zirnox = te; zirnox = te;
//Rods // Rods
this.addSlotToContainer(new Slot(te, 0, 26, 16)); this.addSlotToContainer(new Slot(te, 0, 26, 16));
this.addSlotToContainer(new Slot(te, 1, 62, 16)); this.addSlotToContainer(new Slot(te, 1, 62, 16));
this.addSlotToContainer(new Slot(te, 2, 98, 16)); this.addSlotToContainer(new Slot(te, 2, 98, 16));
@ -45,38 +45,35 @@ public class ContainerReactorZirnox extends Container {
this.addSlotToContainer(new Slot(te, 22, 62, 124)); this.addSlotToContainer(new Slot(te, 22, 62, 124));
this.addSlotToContainer(new Slot(te, 23, 98, 124)); this.addSlotToContainer(new Slot(te, 23, 98, 124));
//Fluid IO // Fluid IO
this.addSlotToContainer(new Slot(te, 24, 143, 124)); this.addSlotToContainer(new Slot(te, 24, 143, 124));
this.addSlotToContainer(new SlotMachineOutput(te, 26, 143, 142)); this.addSlotToContainer(new SlotMachineOutput(te, 26, 143, 142));
this.addSlotToContainer(new Slot(te, 25, 179, 124)); this.addSlotToContainer(new Slot(te, 25, 179, 124));
this.addSlotToContainer(new SlotMachineOutput(te, 27, 179, 142)); this.addSlotToContainer(new SlotMachineOutput(te, 27, 179, 142));
for(int i = 0; i < 3; i++) for(int i = 0; i < 3; i++) {
{ for(int j = 0; j < 9; j++) {
for(int j = 0; j < 9; j++)
{
this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 90)); this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 90));
} }
} }
for(int i = 0; i < 9; i++) for(int i = 0; i < 9; i++) {
{
this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 232)); this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 232));
} }
} }
@Override @Override
public ItemStack transferStackInSlot(EntityPlayer player, int index) { public ItemStack transferStackInSlot(EntityPlayer player, int index) {
ItemStack var3 = null; ItemStack var3 = null;
Slot slot = (Slot) this.inventorySlots.get(index); Slot slot = (Slot) this.inventorySlots.get(index);
if (slot != null && slot.getHasStack()) { if(slot != null && slot.getHasStack()) {
ItemStack stack = slot.getStack(); ItemStack stack = slot.getStack();
var3 = stack.copy(); var3 = stack.copy();
if (index <= 27) { if(index <= 27) {
if (!this.mergeItemStack(stack, 28, this.inventorySlots.size(), true)) { if(!this.mergeItemStack(stack, 28, this.inventorySlots.size(), true)) {
return null; return null;
} }
} else { } else {
@ -89,17 +86,25 @@ public class ContainerReactorZirnox extends Container {
if(!this.mergeItemStack(stack, 25, 26, true)) if(!this.mergeItemStack(stack, 25, 26, true))
return null; return null;
} else if(!this.mergeItemStack(stack, 0, 24, true)) } else {
return null;
if(stack.getItem() instanceof ItemZirnoxRod) {
if(!this.mergeItemStack(stack, 0, 24, true))
return null;
}
}
} }
if (stack.stackSize == 0) {
if(stack.stackSize == 0) {
slot.putStack((ItemStack) null); slot.putStack((ItemStack) null);
} else { } else {
slot.onSlotChanged(); slot.onSlotChanged();
} }
} }
return var3; return var3;
} }
@Override @Override
public boolean canInteractWith(EntityPlayer player) { public boolean canInteractWith(EntityPlayer player) {

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

@ -516,7 +516,7 @@ public class AssemblerRecipes {
new ComparableStack(ModItems.circuit_gold, 3), new ComparableStack(ModItems.circuit_gold, 3),
}, 600); }, 600);
makeRecipe(new ComparableStack(ModBlocks.machine_zirnox, 1), new AStack[] { makeRecipe(new ComparableStack(ModBlocks.reactor_zirnox, 1), new AStack[] {
new ComparableStack(ModItems.hull_big_steel, 3), new ComparableStack(ModItems.hull_big_steel, 3),
new ComparableStack(ModItems.hull_small_steel, 6), new ComparableStack(ModItems.hull_small_steel, 6),
new ComparableStack(ModBlocks.steel_scaffold, 4), new ComparableStack(ModBlocks.steel_scaffold, 4),

2
src/main/java/com/hbm/render/item/ItemRenderLibrary.java
View File

@ -1160,7 +1160,7 @@ public class ItemRenderLibrary {
} }
}); });
renderers.put(Item.getItemFromBlock(ModBlocks.machine_zirnox), new ItemRenderBase( ) { renderers.put(Item.getItemFromBlock(ModBlocks.reactor_zirnox), new ItemRenderBase( ) {
public void renderInventory() { public void renderInventory() {
GL11.glTranslated(0, -2, 0); GL11.glTranslated(0, -2, 0);
GL11.glScaled(2.8, 2.8, 2.8); GL11.glScaled(2.8, 2.8, 2.8);

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

@ -3391,7 +3391,7 @@ tile.machine_puf6_tank.name=Plutonium Hexafluoride Tank
tile.machine_pumpjack.name=Pumpjack tile.machine_pumpjack.name=Pumpjack
tile.machine_radar.name=Radar tile.machine_radar.name=Radar
tile.machine_radgen.name=Radiation-Powered Engine tile.machine_radgen.name=Radiation-Powered Engine
tile.machine_reactor_breeding.name=Breeding Reactor tile.machine_reactor.name=Breeding Reactor
tile.machine_refinery.name=Oil Refinery tile.machine_refinery.name=Oil Refinery
tile.machine_reix_mainframe.name=Rei-X Mainframe (WIP) tile.machine_reix_mainframe.name=Rei-X Mainframe (WIP)
tile.machine_rtg_blue.name=Convection Generator tile.machine_rtg_blue.name=Convection Generator
@ -3572,7 +3572,7 @@ tile.reactor_ejector.name=Reactor Waste Ejector
tile.reactor_element.name=Reactor Chamber tile.reactor_element.name=Reactor Chamber
tile.reactor_hatch.name=Reactor Access Hatch tile.reactor_hatch.name=Reactor Access Hatch
tile.reactor_inserter.name=Reactor Fuel Inserter tile.reactor_inserter.name=Reactor Fuel Inserter
tile.reactor_research.name=Research Reactor tile.machine_reactor_small.name=Research Reactor
tile.reactor_zirnox.name=ZIRNOX Nuclear Reactor tile.reactor_zirnox.name=ZIRNOX Nuclear Reactor
tile.red_barrel.name=Explosive Barrel tile.red_barrel.name=Explosive Barrel
tile.red_cable.name=Red Copper Cable tile.red_cable.name=Red Copper Cable