From 5433f4b05f31c291780a5726cdf86eb8e77f9051 Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 27 Aug 2020 23:37:07 +0200 Subject: [PATCH] finished plasma heater, recipe ore dict fixes --- src/main/java/assets/hbm/lang/de_DE.lang | 7 +- src/main/java/assets/hbm/lang/en_US.lang | 3 +- .../hbm/textures/blocks/plasma_heater.png | Bin 0 -> 274 bytes .../hbm/textures/models/iter/microwave.png | Bin 3308 -> 7232 bytes src/main/java/com/hbm/blocks/ModBlocks.java | 4 +- .../hbm/blocks/machine/BlockPlasmaStruct.java | 32 +++++++- .../blocks/machine/MachinePlasmaHeater.java | 15 +++- .../com/hbm/inventory/AssemblerRecipes.java | 40 +++++----- .../java/com/hbm/main/CraftingManager.java | 1 + .../render/tileentity/RenderPlasmaHeater.java | 3 + .../tileentity/RenderPlasmaMultiblock.java | 11 ++- .../hbm/render/util/SmallBlockPronter.java | 3 +- .../tileentity/machine/TileEntityITER.java | 21 ++--- .../machine/TileEntityPlasmaStruct.java | 73 ++++++++++++++++++ 14 files changed, 167 insertions(+), 46 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/blocks/plasma_heater.png diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index e6985fe08..78fe5d49c 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -174,7 +174,7 @@ container.nukePrototype=Der Prototyp container.nukeSolinium=Die Blauspülung container.nukeTsar=Tsar Bombe container.oilWell=Ölbohrturm -container.plasmaHeater=Plasmaheizer +container.plasmaHeater=Plasmaerhitzer container.press=Befeuerte Presse container.puf6_tank=PuF6 Tank container.pumpjack=Pferdekopfpumpe @@ -2106,7 +2106,7 @@ tile.fusion_center.name=Zentralmagnetstück tile.fusion_conductor.name=Supraleiter-Magnet tile.fusion_core.name=Fusionsreaktorsteuerung tile.fusion_hatch.name=Fusionsreaktorzugriffsluke -tile.fusion_heater.name=Plasmaerhitzer +tile.fusion_heater.name=Plasmaerhitzer-Komponente tile.fusion_motor.name=Magnetmotorstück tile.fwatz_computer.name=Watzwerkrechenmatrix tile.fwatz_conductor.name=4000K Supraleiter-Magnet @@ -2292,7 +2292,7 @@ tile.pink_planks.name=Pinke Holzbretter tile.pink_slab.name=Pinke Holzstufe tile.pink_stairs.name=Pinke Holztreppen tile.plasma.name=Plasma -tile.plasma_heater.name=Plasmaheizer +tile.plasma_heater.name=Plasmaerhitzer tile.pole_satellite_receiver.name=Satellitenschüssel tile.pole_top.name=Antennenspitze tile.radiobox.name=Rosenberg Ungeziefervernichter @@ -2351,6 +2351,7 @@ tile.struct_iter_core.name=Fusionsreaktor-Kernkomponente tile.struct_launcher.name=Startrampe-Komponentenblock tile.struct_launcher_core.name=Kompaktrampe-Kernkomponente tile.struct_launcher_core_large.name=Startrampe-Kernkomponente +tile.struct_plasma_core.name=Plasmaerhitzer-Kernkomponente tile.struct_scaffold.name=Startrampe-Gerüstblock tile.struct_soyuz_core.name=Soyuz-Startrampe-Kernkomponente tile.taint.name=Korrupter Schmutz diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 29dc01b80..84ec675a1 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -2106,7 +2106,7 @@ tile.fusion_center.name=Central Magnet Piece tile.fusion_conductor.name=Superconducting Magnet tile.fusion_core.name=Fusion Reactor Control tile.fusion_hatch.name=Fusion Reactor Access Hatch -tile.fusion_heater.name=Plasma Heater +tile.fusion_heater.name=Plasma Heater Component tile.fusion_motor.name=Magnet Motor Piece tile.fwatz_computer.name=Fusionary Watz Reactor Calculation Matrix tile.fwatz_conductor.name=4000K Superconducting Magnet @@ -2351,6 +2351,7 @@ tile.struct_iter_core.name=Fusion Reactor Core Component tile.struct_launcher.name=Launch Pad Component Block tile.struct_launcher_core.name=Compact Launcher Core Component tile.struct_launcher_core_large.name=Launch Table Core Component +tile.struct_plasma_core.name=Plasma Heater Core Component tile.struct_scaffold.name=Launch Pad Scaffold Block tile.struct_soyuz_core.name=Soyuz Launcher Core Component tile.taint.name=Taint diff --git a/src/main/java/assets/hbm/textures/blocks/plasma_heater.png b/src/main/java/assets/hbm/textures/blocks/plasma_heater.png new file mode 100644 index 0000000000000000000000000000000000000000..4be1bf764e489a8af1b4813c857aa3f55346384a GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf#$ zUZ&PEtXrDE@|i0s)jlm#8Lef3{&)-~r*b3T++UY^jCDR$4;oUP$$3Cn?x1&j;q z;%BV={&6{j?EAf^jwip`RcA7P`hCM0Jn^r>SOh!cE=7H|D?Ycf-C@?Ui+}2Cj`Oz6 W3DvkPyTK9YDF#nhKbLh*2~7a)cyKBJ literal 0 HcmV?d00001 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 dedb4bf14919556d37f2dac9b2856047de282500..6352a909cf03c5e3579fd56a3fe1751db8e9605d 100644 GIT binary patch literal 7232 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 literal 3308 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 3) + break; SmallBlockPronter.renderSmolBlockAt(ix, iy, iz); } } } + for(int i = 10; i <= 11; i++) + for(int j = 2; j <= 3; j++) + SmallBlockPronter.renderSmolBlockAt(i, j, 0); + GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glDepthMask(true); diff --git a/src/main/java/com/hbm/render/util/SmallBlockPronter.java b/src/main/java/com/hbm/render/util/SmallBlockPronter.java index 21aac836f..7c19b3441 100644 --- a/src/main/java/com/hbm/render/util/SmallBlockPronter.java +++ b/src/main/java/com/hbm/render/util/SmallBlockPronter.java @@ -17,8 +17,7 @@ public class SmallBlockPronter { */ public static void renderSmolBlockAt(float x, float y, float z) { GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); - GL11.glRotatef(180, 0F, 0F, 1F); + GL11.glTranslatef(x - 1, y - 1, z); Tessellator tesseract = Tessellator.instance; tesseract.startDrawingQuads(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index 000f97e5d..7112c6310 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -95,16 +95,18 @@ public class TileEntityITER extends TileEntityMachineBase implements IConsumer, for(int i = 0; i < 20; i++) { - if(tanks[0].getFill() >= 10) { - tanks[0].setFill(tanks[0].getFill() - 10); - tanks[1].setFill(tanks[1].getFill() + 1); + if(plasma.getFill() > 0) { + + if(tanks[0].getFill() >= 10) { + 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()); + } - if(tanks[1].getFill() > tanks[1].getMaxFill()) - tanks[1].setFill(tanks[1].getMaxFill()); - } - - if(plasma.getFill() > 0) plasma.setFill(plasma.getFill() - 1); + } } } @@ -114,7 +116,6 @@ public class TileEntityITER extends TileEntityMachineBase implements IConsumer, for(int i = 0; i < tanks.length; i++) tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); plasma.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); - /// END Notif packets /// NBTTagCompound data = new NBTTagCompound(); data.setBoolean("isOn", isOn); @@ -133,6 +134,8 @@ public class TileEntityITER extends TileEntityMachineBase implements IConsumer, } this.networkPack(data, 250); + /// END Notif packets /// + } else { this.lastRotor = this.rotor; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityPlasmaStruct.java b/src/main/java/com/hbm/tileentity/machine/TileEntityPlasmaStruct.java index 3190a4fdc..3bccb09a5 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityPlasmaStruct.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityPlasmaStruct.java @@ -1,12 +1,85 @@ package com.hbm.tileentity.machine; +import com.hbm.blocks.BlockDummyable; +import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.machine.MachinePlasmaHeater; +import com.hbm.handler.MultiblockHandlerXR; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.common.util.ForgeDirection; public class TileEntityPlasmaStruct extends TileEntity { + int age; + + @Override + public void updateEntity() { + + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata()); + + if(worldObj.isRemote) { + worldObj.spawnParticle("reddust", + xCoord + 0.5 + dir.offsetX * -11 + worldObj.rand.nextGaussian() * 0.1, + yCoord + 2.5 + worldObj.rand.nextGaussian() * 0.1, + zCoord + 0.5 + dir.offsetZ * -11 + worldObj.rand.nextGaussian() * 0.1, + 0.9, 0.3, 0.7); + return; + } + + age++; + + if(age < 20) + return; + + age = 0; + + MachinePlasmaHeater plas = (MachinePlasmaHeater)ModBlocks.plasma_heater; + + int[] rot = MultiblockHandlerXR.rotate(plas.getDimensions(), dir); + + for(int a = xCoord - rot[4]; a <= xCoord + rot[5]; a++) { + for(int b = yCoord - rot[1]; b <= yCoord + rot[0]; b++) { + for(int c = zCoord - rot[2]; c <= zCoord + rot[3]; c++) { + + if(a == xCoord && b == yCoord && c == zCoord) + continue; + + if(worldObj.getBlock(a, b, c) != ModBlocks.fusion_heater) + return; + } + } + } + + rot = MultiblockHandlerXR.rotate(new int[] {4, -3, 1, 1, 1, 1}, dir); + + for(int a = xCoord - rot[4]; a <= xCoord + rot[5]; a++) { + for(int b = yCoord - rot[1]; b <= yCoord + rot[0]; b++) { + for(int c = zCoord - rot[2]; c <= zCoord + rot[3]; c++) { + + if(a == xCoord && b == yCoord && c == zCoord) + continue; + + if(worldObj.getBlock(a, b, c) != ModBlocks.fusion_heater) + return; + } + } + } + + + for(int i = 9; i <= 10; i++) + for(int j = 1; j <= 2; j++) + if(worldObj.getBlock(xCoord - dir.offsetX * i, yCoord + j, zCoord - dir.offsetZ * i) != ModBlocks.fusion_heater) + return; + + BlockDummyable.safeRem = true; + worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.plasma_heater, this.getBlockMetadata() + BlockDummyable.offset, 3); + plas.fillSpace(worldObj, xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ, dir, -plas.getOffset()); + BlockDummyable.safeRem = false; + } + @Override public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB;