From e921ba17d287a14c79c83333ee08deab0eacd829 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 23 Aug 2020 23:10:36 +0200 Subject: [PATCH] =?UTF-8?q?=C3=A6=C3=BCgh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/assets/hbm/lang/de_DE.lang | 4 ++++ src/main/java/assets/hbm/lang/en_US.lang | 4 ++++ .../assets/hbm/textures/gui/gui_turbine.png | Bin 3086 -> 3252 bytes .../hbm/textures/models/iter/microwave.png | Bin 4780 -> 3308 bytes .../assets/hbm/textures/models/iter/motor.png | Bin 277 -> 549 bytes .../com/hbm/blocks/machine/MachineITER.java | 1 - .../blocks/machine/MachinePlasmaHeater.java | 20 ++++++++++++++++++ .../com/hbm/inventory/MachineRecipes.java | 1 + .../hbm/inventory/gui/GUIMachineTurbine.java | 3 +++ src/main/java/com/hbm/lib/RefStrings.java | 2 +- .../tileentity/machine/TileEntityITER.java | 13 ++++++++++++ .../TileEntityMachinePlasmaHeater.java | 5 +++-- 12 files changed, 49 insertions(+), 4 deletions(-) diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index 4c78f8022..5722e72ae 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -149,6 +149,7 @@ container.machineCMB=CMB-Stahl Hochofen container.machineCoal=Verbrennungsgenerator container.machineDiesel=Dieselgenerator container.machineElectricBoiler=Elektrischer Boiler +container.machineITER=Kernfusionsreaktor container.machineRefinery=Ölraffinerie container.machineSelenium=Hochleistungs-Sternmotor container.machineShredder=Brecher @@ -2012,6 +2013,7 @@ tile.block_uranium.name=Uranblock tile.block_uranium_fuel.name=Urankernbrennstoffblock tile.block_verticium.name=Verticiumblock tile.block_waste.name=Atommüllblock +tile.block_waste_painted.name=Bemalter Atommüllblock tile.block_weidanium.name=Weidaniumblock tile.block_white_phosphorus.name=Weißer Phosphorblock tile.block_yellowcake.name=Yellowcakeblock @@ -2020,6 +2022,7 @@ tile.bomb_multi.name=Mehrzweckbombe tile.bomber.name=Abgestürtzer Bomber tile.book_guide.name=Hbm's Nuclear Tech Mod Handbuch [LEGACY] tile.boxcar.name=Güterwagon +tile.brick_asbestos.name=Asbestziegel tile.brick_compound.name=Verstärkter Verbund tile.brick_concrete.name=Betonziegel tile.brick_concrete_broken.name=Gebrochene Betonziegel @@ -2120,6 +2123,7 @@ tile.glass_uranium.name=Uranglas tile.gravel_diamond.name=Diamantkies tile.gravel_obsidian.name=Gebrochener Obsidian tile.hazmat.name=Strahlenschutzstoff-Block +tile.iter.name=Kernfusionsreaktor tile.launch_pad.name=Raketenabschussrampe tile.launch_table.name=Große Startrampe tile.lox_barrel.name=LOX-Fass diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 2b7a99b19..cc44c6b9b 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -149,6 +149,7 @@ container.machineCMB=CMB Steel Furnace container.machineCoal=Combustion Generator container.machineDiesel=Diesel Generator container.machineElectricBoiler=Electric Boiler +container.machineITER=Fusion Reactor container.machineRefinery=Oil Refinery container.machineSelenium=Radial Performance Engine container.machineShredder=Shredder @@ -2012,6 +2013,7 @@ tile.block_uranium.name=Block of Uranium tile.block_uranium_fuel.name=Block of Uranium Fuel tile.block_verticium.name=Block of Verticium tile.block_waste.name=Block of Nuclear Waste +tile.block_waste_painted.name=Painted Block of Nuclear Waste tile.block_weidanium.name=Block of Weidanium tile.block_white_phosphorus.name=Block of White Phosphorus tile.block_yellowcake.name=Block of Yellowcake @@ -2020,6 +2022,7 @@ tile.bomb_multi.name=Multi Purpose Bomb tile.bomber.name=Crashed Bomber tile.book_guide.name=Hbm's Nuclear Tech Mod Manual [LEGACY] tile.boxcar.name=Boxcar +tile.brick_asbestos.name=Asbestos Bricks tile.brick_compound.name=Compound Mesh tile.brick_concrete.name=Concrete Bricks tile.brick_concrete_broken.name=Broken Concrete Bricks @@ -2120,6 +2123,7 @@ tile.glass_uranium.name=Uranium Glass tile.gravel_diamond.name=Diamond Gravel tile.gravel_obsidian.name=Crushed Obsidian tile.hazmat.name=Hazmat Cloth Block +tile.iter.name=Fusion Reactor tile.launch_pad.name=Missile Launch Pad tile.launch_table.name=Large Launch Pad tile.lox_barrel.name=LOX Barrel diff --git a/src/main/java/assets/hbm/textures/gui/gui_turbine.png b/src/main/java/assets/hbm/textures/gui/gui_turbine.png index 235ae4775817650a4dc6b6e23d3cefacd8077964..1e0398ba4281d1c487593c8cf2daf3a74ca8cc57 100644 GIT binary patch delta 2871 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 delta 2719 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 Z^nY+Tq&F^4jwAp8002ovPDHLkV1mt8P`>~G diff --git a/src/main/java/assets/hbm/textures/models/iter/microwave.png b/src/main/java/assets/hbm/textures/models/iter/microwave.png index cddfb5b6fc0e6243efb8bca0fb9f32aaa4e41ec7..dedb4bf14919556d37f2dac9b2856047de282500 100644 GIT binary patch literal 3308 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 diff --git a/src/main/java/assets/hbm/textures/models/iter/motor.png b/src/main/java/assets/hbm/textures/models/iter/motor.png index fdfde0dd2e2f9efe8d745c84a9c0a64f9d368f1c..d9451091ab464a9a24c8169149641f3738e95a80 100644 GIT binary patch delta 508 zcmV6$B*_ZU!NuXJbedLR>^>7^z=x;v@puFPXsrPN#uxxV zp677RK}y+bVtkItz z%VpyI6?(55V^d4)z1U}@h14LR)U-O*ItMN5LjC?Hx>9G1EFp*v;uUVw4IJk;2<&Y1AH!}25n@0 y-?secW(phdw=H?zqcaRO32HF9X0(cC3{rYtv-9a{BK~MWIfJ=O^0hXbf_F-Vi=K)3s z2M4@K<->;$^l}SXfQ1?k#8m*$BYCnARze(DCjT0RAN5d_T4P4z1ys!ga_s*Z= 12) return new TileEntityMachinePlasmaHeater(); + + if(meta >= 6) + return new TileEntityProxyCombo(false, true, true); + return null; } @@ -49,6 +55,20 @@ public class MachinePlasmaHeater extends BlockDummyable { } } + @Override + public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) { + super.fillSpace(world, x, y, z, dir, o); + + ForgeDirection side = dir.getRotation(ForgeDirection.UP); + + for(int i = 1; i < 4; i++) { + for(int j = -1; j < 2; j++) { + + this.makeExtra(world, x + side.offsetX * j, y + i, z + side.offsetZ * j); + } + } + } + @Override public int[] getDimensions() { return new int[] {3, 0, 8, 1, 1, 1}; diff --git a/src/main/java/com/hbm/inventory/MachineRecipes.java b/src/main/java/com/hbm/inventory/MachineRecipes.java index 6d7320395..eeb9b1571 100644 --- a/src/main/java/com/hbm/inventory/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/MachineRecipes.java @@ -233,6 +233,7 @@ public class MachineRecipes { case STEAM: return new Object[] { FluidType.WATER, 5, 500, 50 }; case HOTSTEAM: return new Object[] { FluidType.STEAM, 50, 5, 100 }; case SUPERHOTSTEAM: return new Object[] { FluidType.HOTSTEAM, 50, 5, 150 }; + case ULTRAHOTSTEAM: return new Object[] { FluidType.SUPERHOTSTEAM, 50, 5, 250 }; } return null; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java index a33b4da39..85381e4d5 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java @@ -65,6 +65,9 @@ public class GUIMachineTurbine extends GuiInfoContainer { if(diFurnace.tanks[0].getTankType().name().equals(FluidType.SUPERHOTSTEAM.name())) { drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14); } + if(diFurnace.tanks[0].getTankType().name().equals(FluidType.ULTRAHOTSTEAM.name())) { + drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14); + } int i = (int)diFurnace.getPowerScaled(34); drawTexturedModalRect(guiLeft + 123, guiTop + 69 - i, 176, 34 - i, 7, i); diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 5873df969..9a679128b 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3598)"; + public static final String VERSION = "1.0.27 BETA (3605)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index 2d9fcd18b..cb99a359e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -78,6 +78,19 @@ public class TileEntityITER extends TileEntityMachineBase implements IConsumer, if(isOn && power >= powerReq) { power -= powerReq; + + for(int i = 0; i < 20; i++) { + + if(tanks[0].getFill() >= 10 && plasma.getFill() > 0) { + tanks[0].setFill(tanks[0].getFill() - 10); + tanks[1].setFill(tanks[1].getFill() + 1); + + if(tanks[1].getFill() > tanks[1].getMaxFill()) + tanks[1].setFill(tanks[1].getMaxFill()); + + plasma.setFill(plasma.getFill() - 1); + } + } } /// END Processing part /// diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java index cf80d4247..f9de97dc0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java @@ -60,6 +60,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme convert = Math.min(convert, (plasma.getMaxFill() - plasma.getFill()) * 2); convert = Math.min(convert, maxConv); convert = (int) Math.min(convert, power / powerReq); + convert = Math.max(0, convert); tanks[0].setFill(tanks[0].getFill() - convert); tanks[1].setFill(tanks[1].getFill() - convert); @@ -117,8 +118,8 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme private void updateType() { - if(plasma.getFill() > 0) - return; + //if(plasma.getFill() > 0) + // return; List types = new ArrayList() {{ add(tanks[0].getTankType()); add(tanks[1].getTankType()); }};