diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 058ea8fd7..7d3d4b836 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -228,14 +228,14 @@ public class HazardRegistry { registerOtherFuel(plate_fuel_mox, mox * ingot, mox * ingot * 100); registerOtherFuel(plate_fuel_pu239, pu239 * ingot, pu239 * ingot * 100); registerOtherFuel(plate_fuel_sa326, sa326 * ingot, sa326 * ingot * 100); - registerOtherFuel(plate_fuel_ra226be, rabe * ingot, rabe * ingot * 100); + registerOtherFuel(plate_fuel_ra226be, rabe * ingot, po210 * nugget * 3); registerOtherWaste(waste_plate_u233, u233 * ingot * 100); registerOtherWaste(waste_plate_u235, u235 * ingot * 100); registerOtherWaste(waste_plate_mox, mox * ingot * 100); registerOtherWaste(waste_plate_pu239, pu239 * ingot * 100); registerOtherWaste(waste_plate_sa326, sa326 * ingot * 100); - registerOtherWaste(waste_plate_ra226be, rabe * ingot * 100); + registerOtherWaste(waste_plate_ra226be, po210 * billet * 3); HazardSystem.register(debris_graphite, new HazardData().addEntry(RADIATION, 70F).addEntry(HOT, 5F)); HazardSystem.register(debris_metal, makeData(RADIATION, 5F)); diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorControl.java b/src/main/java/com/hbm/inventory/gui/GUIReactorControl.java index fb2687b68..d4b58cc43 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorControl.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorControl.java @@ -154,21 +154,10 @@ public class GUIReactorControl extends GuiInfoContainer { tess.startDrawing(3); tess.setColorOpaque_I(0x08FF00); - double render[] = new double[39]; - - for(int i = 0; i < render.length; i++) { - render[i] = control.getTargetLevel(control.function, 0 + i * 50000 / 28); + for(int i = 0; i < 40; i++) { + tess.addVertex(guiLeft + 128 + i, guiTop + 39 + MathHelper.clamp_double(control.getTargetLevel(control.function, i * 1250) / 100 * 28, 0, 28), this.zLevel); } - for(int i = 0; i < render.length; i++) { - tess.addVertex(guiLeft + 128 + i, guiTop + 39 + render[i], this.zLevel); - } - - //fuck i will figure this out later - /*for(int i = 0; i < render.length; i++) { - tess.addVertex(guiLeft + 128 + i, guiTop + 39 + control.getGraphPoint(control.function, 0 + i * 50, 28), this.zLevel); - }*/ - tess.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glPushMatrix(); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index bddd3c66e..7a338d8f9 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -614,7 +614,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.vent_pink_cloud), new Object[] { "IGI", "ICI", "IDI", 'I', IRON.plate(), 'G', Blocks.iron_bars, 'C', ModItems.grenade_pink_cloud, 'D', Blocks.dispenser }); addRecipeAuto(new ItemStack(ModBlocks.spikes, 4), new Object[] { "FFF", "BBB", "TTT", 'F', Items.flint, 'B', ModItems.bolt_tungsten, 'T', W.ingot() }); addRecipeAuto(new ItemStack(ModItems.custom_fall, 1), new Object[] { "IIP", "CHW", "IIP", 'I', ModItems.plate_polymer, 'P', BIGMT.plate(), 'C', ModItems.circuit_red_copper, 'H', ModItems.hull_small_steel, 'W', ModItems.coil_copper }); - addRecipeAuto(new ItemStack(ModBlocks.machine_controller, 1), new Object[] { "PGP", "ICI", "PRP", 'P', ModItems.plate_desh, 'G', KEY_ANYPANE, 'I', POLYMER.ingot(), 'R', REDSTONE.block(), 'C', ModItems.circuit_targeting_tier4 }); + addRecipeAuto(new ItemStack(ModBlocks.machine_controller, 1), new Object[] { "TDT", "DCD", "TDT", 'T', TCALLOY.ingot(), 'D', ModItems.crt_display, 'C', ModItems.circuit_targeting_tier3 }); addRecipeAuto(new ItemStack(ModItems.containment_box, 1), new Object[] { "LLL", "LCL", "LLL", 'L', PB.plate(), 'C', Blocks.chest }); addRecipeAuto(new ItemStack(ModBlocks.absorber, 1), new Object[] { "ICI", "CPC", "ICI", 'I', CU.ingot(), 'C', COAL.dust(), 'P', PB.dust() }); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java index 5a6567002..543152963 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java @@ -100,7 +100,6 @@ public class TileEntityReactorControl extends TileEntityMachineBase implements I public double heatUpper; public RodFunction function = RodFunction.LINEAR; - //TODO: Remove all large reactor functionality for this @Override public void updateEntity() { diff --git a/src/main/resources/assets/hbm/textures/items/plate_fuel_mox.png b/src/main/resources/assets/hbm/textures/items/plate_fuel_mox.png index c409d12e4..2c31daf21 100644 Binary files a/src/main/resources/assets/hbm/textures/items/plate_fuel_mox.png and b/src/main/resources/assets/hbm/textures/items/plate_fuel_mox.png differ diff --git a/src/main/resources/assets/hbm/textures/items/plate_fuel_pu239.png b/src/main/resources/assets/hbm/textures/items/plate_fuel_pu239.png index 173c5955e..aa95f50f5 100644 Binary files a/src/main/resources/assets/hbm/textures/items/plate_fuel_pu239.png and b/src/main/resources/assets/hbm/textures/items/plate_fuel_pu239.png differ diff --git a/src/main/resources/assets/hbm/textures/items/plate_fuel_ra226be.png b/src/main/resources/assets/hbm/textures/items/plate_fuel_ra226be.png index 1b4d8b7af..3c8678bc2 100644 Binary files a/src/main/resources/assets/hbm/textures/items/plate_fuel_ra226be.png and b/src/main/resources/assets/hbm/textures/items/plate_fuel_ra226be.png differ diff --git a/src/main/resources/assets/hbm/textures/items/plate_fuel_sa326.png b/src/main/resources/assets/hbm/textures/items/plate_fuel_sa326.png index bf3317f83..6285b4b9f 100644 Binary files a/src/main/resources/assets/hbm/textures/items/plate_fuel_sa326.png and b/src/main/resources/assets/hbm/textures/items/plate_fuel_sa326.png differ diff --git a/src/main/resources/assets/hbm/textures/items/plate_fuel_u233.png b/src/main/resources/assets/hbm/textures/items/plate_fuel_u233.png index 92e1988c2..f799744fd 100644 Binary files a/src/main/resources/assets/hbm/textures/items/plate_fuel_u233.png and b/src/main/resources/assets/hbm/textures/items/plate_fuel_u233.png differ diff --git a/src/main/resources/assets/hbm/textures/items/plate_fuel_u235.png b/src/main/resources/assets/hbm/textures/items/plate_fuel_u235.png index 798a1a61d..77bd86659 100644 Binary files a/src/main/resources/assets/hbm/textures/items/plate_fuel_u235.png and b/src/main/resources/assets/hbm/textures/items/plate_fuel_u235.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rod_zirnox_les_fuel.png b/src/main/resources/assets/hbm/textures/items/rod_zirnox_les_fuel.png index bf06918cd..0aca52a3d 100644 Binary files a/src/main/resources/assets/hbm/textures/items/rod_zirnox_les_fuel.png and b/src/main/resources/assets/hbm/textures/items/rod_zirnox_les_fuel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rod_zirnox_mox_fuel.png b/src/main/resources/assets/hbm/textures/items/rod_zirnox_mox_fuel.png index 730470c7a..3f7883f93 100644 Binary files a/src/main/resources/assets/hbm/textures/items/rod_zirnox_mox_fuel.png and b/src/main/resources/assets/hbm/textures/items/rod_zirnox_mox_fuel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rod_zirnox_plutonium_fuel.png b/src/main/resources/assets/hbm/textures/items/rod_zirnox_plutonium_fuel.png index 9a7b8afa9..f7f4d008f 100644 Binary files a/src/main/resources/assets/hbm/textures/items/rod_zirnox_plutonium_fuel.png and b/src/main/resources/assets/hbm/textures/items/rod_zirnox_plutonium_fuel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rod_zirnox_thorium_fuel.png b/src/main/resources/assets/hbm/textures/items/rod_zirnox_thorium_fuel.png index 4b53780e9..94ebe0219 100644 Binary files a/src/main/resources/assets/hbm/textures/items/rod_zirnox_thorium_fuel.png and b/src/main/resources/assets/hbm/textures/items/rod_zirnox_thorium_fuel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rod_zirnox_u233_fuel.png b/src/main/resources/assets/hbm/textures/items/rod_zirnox_u233_fuel.png index eda241127..0342ae95d 100644 Binary files a/src/main/resources/assets/hbm/textures/items/rod_zirnox_u233_fuel.png and b/src/main/resources/assets/hbm/textures/items/rod_zirnox_u233_fuel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rod_zirnox_u235_fuel.png b/src/main/resources/assets/hbm/textures/items/rod_zirnox_u235_fuel.png index 34ae57632..c12b4a7d5 100644 Binary files a/src/main/resources/assets/hbm/textures/items/rod_zirnox_u235_fuel.png and b/src/main/resources/assets/hbm/textures/items/rod_zirnox_u235_fuel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rod_zirnox_uranium_fuel.png b/src/main/resources/assets/hbm/textures/items/rod_zirnox_uranium_fuel.png index 90bcacfa4..0db645c6f 100644 Binary files a/src/main/resources/assets/hbm/textures/items/rod_zirnox_uranium_fuel.png and b/src/main/resources/assets/hbm/textures/items/rod_zirnox_uranium_fuel.png differ