From 94c8552bc867e5a48f583d2b97c4cfa9346e24b0 Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 19 Sep 2020 22:33:20 +0200 Subject: [PATCH] some texture stuff, RTG pellets --- src/main/java/assets/hbm/lang/de_DE.lang | 1 + src/main/java/assets/hbm/lang/en_US.lang | 1 + .../hbm/textures/gui/gauges/large_bow.png | Bin 0 -> 2878 bytes .../hbm/textures/gui/gauges/large_round.png | Bin 0 -> 3550 bytes .../hbm/textures/gui/gauges/small_bow.png | Bin 0 -> 1298 bytes .../hbm/textures/gui/gauges/small_round.png | Bin 0 -> 1599 bytes .../textures/gui/machine/gui_laser_miner.png | Bin 2913 -> 3237 bytes .../assets/hbm/textures/items/pellet_rtg.png | Bin 280 -> 248 bytes .../textures/items/pellet_rtg_polonium.png | Bin 0 -> 267 bytes .../hbm/textures/items/pellet_rtg_weak.png | Bin 222 -> 251 bytes .../com/hbm/inventory/AssemblerRecipes.java | 1 + .../com/hbm/inventory/gui/GUIMachineRTG.java | 3 +- .../com/hbm/inventory/gui/GUIMiningLaser.java | 2 +- src/main/java/com/hbm/items/ModItems.java | 3 + .../com/hbm/items/special/ItemCustomLore.java | 8 ++ .../com/hbm/render/tileentity/RenderCore.java | 74 ++++++++++++------ .../machine/TileEntityMachineCyclotron.java | 2 +- .../machine/TileEntityMachineRTG.java | 5 ++ .../machine/TileEntityRtgFurnace.java | 13 ++- 19 files changed, 78 insertions(+), 35 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/gui/gauges/large_bow.png create mode 100644 src/main/java/assets/hbm/textures/gui/gauges/large_round.png create mode 100644 src/main/java/assets/hbm/textures/gui/gauges/small_bow.png create mode 100644 src/main/java/assets/hbm/textures/gui/gauges/small_round.png create mode 100644 src/main/java/assets/hbm/textures/items/pellet_rtg_polonium.png diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index b678a0537..271acfc35 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -1447,6 +1447,7 @@ item.pellet_mes.name=MES-Watzpellet item.pellet_meteorite.name=Meteoritenkugeln item.pellet_neptunium.name=Neptunium-Watzpellet item.pellet_rtg.name=Plutonium 238 Pellet +item.pellet_rtg_polonium.name=Polonium 210 Pellet item.pellet_rtg_weak.name=Schwaches Uran RTG-Pellet item.pellet_schrabidium.name=Pures Schrabidium-Watzpellet item.photo_panel.name=Photovoltaikpanele diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 28222fb3f..09635c3ce 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -1447,6 +1447,7 @@ item.pellet_mes.name=MES Watz Pellet item.pellet_meteorite.name=Meteorite Rounds item.pellet_neptunium.name=Neptunium Watz Pellet item.pellet_rtg.name=Plutonium 238 Fuel Pellet +item.pellet_rtg_polonium.name=Polonium 210 Fuel Pellet item.pellet_rtg_weak.name=Weak Uranium RTG Pellet item.pellet_schrabidium.name=Pure Schrabidium Watz Pellet item.photo_panel.name=Photovoltaic Panel diff --git a/src/main/java/assets/hbm/textures/gui/gauges/large_bow.png b/src/main/java/assets/hbm/textures/gui/gauges/large_bow.png new file mode 100644 index 0000000000000000000000000000000000000000..3675290745d540026633bb057ff5c9ce5fa994fc GIT binary patch literal 2878 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 literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/gui/gauges/large_round.png b/src/main/java/assets/hbm/textures/gui/gauges/large_round.png new file mode 100644 index 0000000000000000000000000000000000000000..5796614e6458a8c4829fb1096c9c3f492ecd83d1 GIT binary patch literal 3550 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 literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/gui/gauges/small_bow.png b/src/main/java/assets/hbm/textures/gui/gauges/small_bow.png new file mode 100644 index 0000000000000000000000000000000000000000..7fc15dd1e04faadb0dee24903ab056cd68db4e2e GIT binary patch literal 1298 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 literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/gui/machine/gui_laser_miner.png b/src/main/java/assets/hbm/textures/gui/machine/gui_laser_miner.png index a1e7653cd2167e549ad574ebf9e6ef0ea8006dd3..6afcec92c52878cf10a6b3c7365ef1a14cbcb3b5 100644 GIT binary patch literal 3237 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 J78*I;{s+^Q!67e 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 diff --git a/src/main/java/assets/hbm/textures/items/pellet_rtg_polonium.png b/src/main/java/assets/hbm/textures/items/pellet_rtg_polonium.png new file mode 100644 index 0000000000000000000000000000000000000000..8f35993236f3901b4a5de25189d69e86f2a6c90f GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf-K{9Wry@bXN6+O&_20MrF~cnOtm*Drz6YH=M3M!0;ix zE4TJL5s;j)}8V)jm49^Z&)ztUwii~o>MG4 zkdtxuy2^t-Et597Y>DWeWEkR-p9?g>|tBu&JjJLG+n|**MD0GJiFTlG O7(8A5T-G@yGywn)k7l_5 literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/pellet_rtg_weak.png b/src/main/java/assets/hbm/textures/items/pellet_rtg_weak.png index 326dda2f5278e5c5dfef70bc47a16e1cc8644170..b914c0d16e3282a514e4f4f1451916f3448fa4cc 100644 GIT binary patch delta 207 zcmV;=05JdF0s8@vG=H*5L_t(IjjfU~62l-21kaf?Dxvf9D0va3e+QjZiq5HEFp$Jf zd=*IS0t3LGS>83g_j@}JAxzf}#R3{*Kt#13W1NbX9`3_9|z8@JZN+>41qW}f^pMhKb$5!q2#N|^w?_Y-6xi!VlDt#tyZ>It%tHR|h$ zHXESNNVbI(z|1KGzR%fwB8KQeek&=!Pv84!B?S;&HvkWtxGM#yYPd#!JJFvH$wG); gKII4mWuNJ@4(euFyxnR@p8x;=07*qoM6N<$f(?sIqyPW_ diff --git a/src/main/java/com/hbm/inventory/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/AssemblerRecipes.java index b95fe3140..c170a081e 100644 --- a/src/main/java/com/hbm/inventory/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/AssemblerRecipes.java @@ -205,6 +205,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.circuit_red_copper, 1), new AStack[] {new ComparableStack(ModItems.circuit_copper, 1), new ComparableStack(ModItems.wire_red_copper, 6), new OreDictStack("dustGold", 4), new ComparableStack(ModItems.plate_polymer, 1), },150); makeRecipe(new ComparableStack(ModItems.pellet_rtg, 1), new AStack[] {new ComparableStack(ModItems.nugget_pu238, 5), new OreDictStack("plateIron", 2), },50); makeRecipe(new ComparableStack(ModItems.pellet_rtg_weak, 1), new AStack[] {new ComparableStack(ModItems.nugget_u238, 4), new ComparableStack(ModItems.nugget_pu238, 1), new OreDictStack("plateIron", 2), },50); + makeRecipe(new ComparableStack(ModItems.pellet_rtg_polonium, 1), new AStack[] {new ComparableStack(ModItems.nugget_polonium, 5), new OreDictStack("plateIron", 2), }, 50); makeRecipe(new ComparableStack(ModItems.tritium_deuterium_cake, 1), new AStack[] {new ComparableStack(ModItems.cell_deuterium, 6), new ComparableStack(ModItems.cell_tritium, 2), new ComparableStack(ModItems.lithium, 4), },150); makeRecipe(new ComparableStack(ModItems.pellet_cluster, 1), new AStack[] {new OreDictStack("plateSteel", 4), new ComparableStack(Blocks.tnt, 1), }, 50); makeRecipe(new ComparableStack(ModItems.pellet_buckshot, 1), new AStack[] {new ComparableStack(ModItems.nugget_lead, 6), }, 50); diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java index f031bb6a9..9d94c434e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java @@ -32,7 +32,8 @@ public class GUIMachineRTG extends GuiInfoContainer { String[] text = new String[] { "Accepted Pellets:", " Regular Pellet (5 HE/t)", - " Weak Pellet (3 HE/t)" }; + " Weak Pellet (3 HE/t)", + " Polonium Pellet (25 HE/t)" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java b/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java index 6a1bef2e0..1e54cbb94 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java @@ -63,7 +63,7 @@ public class GUIMiningLaser extends GuiInfoContainer { protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.laser.hasCustomInventoryName() ? this.laser.getInventoryName() : I18n.format(this.laser.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 4, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); String width = "" + laser.getWidth(); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 672529a61..75f5b0bc8 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -523,6 +523,7 @@ public class ModItems { public static Item pellet_rtg; public static Item pellet_rtg_weak; + public static Item pellet_rtg_polonium; public static Item tritium_deuterium_cake; public static Item pellet_schrabidium; @@ -2385,6 +2386,7 @@ public class ModItems { pellet_rtg = new ItemRadioactive(0.25F).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); pellet_rtg_weak = new ItemRadioactive(0.1F).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); + pellet_rtg_polonium = new ItemRadioactive(2.5F).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake"); piston_selenium = new Item().setUnlocalizedName("piston_selenium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":piston_selenium"); @@ -4466,6 +4468,7 @@ public class ModItems { //Pellets GameRegistry.registerItem(pellet_rtg, pellet_rtg.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_weak, pellet_rtg_weak.getUnlocalizedName()); + GameRegistry.registerItem(pellet_rtg_polonium, pellet_rtg_polonium.getUnlocalizedName()); GameRegistry.registerItem(tritium_deuterium_cake, tritium_deuterium_cake.getUnlocalizedName()); GameRegistry.registerItem(pellet_cluster, pellet_cluster.getUnlocalizedName()); GameRegistry.registerItem(pellet_buckshot, pellet_buckshot.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemCustomLore.java b/src/main/java/com/hbm/items/special/ItemCustomLore.java index b202c3767..45a0cc806 100644 --- a/src/main/java/com/hbm/items/special/ItemCustomLore.java +++ b/src/main/java/com/hbm/items/special/ItemCustomLore.java @@ -61,6 +61,14 @@ public class ItemCustomLore extends Item { list.add("Cheaper and weaker pellet, now with more U238!"); } + if(this == ModItems.pellet_rtg_polonium) + { + if(MainRegistry.polaroidID == 11) + list.add("Polonium 4 U and me."); + else + list.add("More powderful RTG pellet, made from finest polonium!"); + } + if(this == ModItems.pellet_cluster) { list.add("Used in multi purpose bombs:"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderCore.java b/src/main/java/com/hbm/render/tileentity/RenderCore.java index bb462d38f..2c55d77cf 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderCore.java +++ b/src/main/java/com/hbm/render/tileentity/RenderCore.java @@ -9,11 +9,14 @@ import com.hbm.main.ResourceManager; import com.hbm.render.util.RenderSparks; import com.hbm.tileentity.machine.TileEntityCore; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Vec3; import net.minecraft.world.World; public class RenderCore extends TileEntitySpecialRenderer { @@ -28,10 +31,19 @@ public class RenderCore extends TileEntitySpecialRenderer { TileEntityCore core = (TileEntityCore)tileEntity; - if(core.heat == 0) + if(core.heat == 0) { renderStandby(x, y, z); - else - renderOrb(core, x, y, z); + } else { + + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + GL11.glRotatef(-RenderManager.instance.playerViewY, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(RenderManager.instance.playerViewX - 90, 1.0F, 0.0F, 0.0F); + GL11.glTranslated(-0.5, -0.5, -0.5); + + renderVoid(core, 0, 0, 0); + GL11.glPopMatrix(); + } } public void renderStandby(double x, double y, double z) { @@ -109,6 +121,8 @@ public class RenderCore extends TileEntitySpecialRenderer { } public void renderVoid(TileEntity tile, double x, double y, double z) { + + TileEntityCore core = (TileEntityCore)tile; World world = tile.getWorldObj(); GL11.glPushMatrix(); @@ -155,14 +169,14 @@ public class RenderCore extends TileEntitySpecialRenderer { } GL11.glTranslatef(random.nextFloat() * (1 - f7), random.nextFloat() * (1 - f7), random.nextFloat() * (1 - f7)); - float scale = 0.9F; + float scale = 0.8F; GL11.glScalef(scale, scale, scale); float ang = 360 / end; GL11.glRotatef(ang * i + ang * random.nextFloat(), 0.0F, 0.0F, 1.0F); - float f11 = (float) random.nextDouble() * 0.5F + 0.9F; - float f12 = (float) random.nextDouble() * 0.5F + 0.1F; - float f13 = (float) random.nextDouble() * 0.5F + 0.9F; + float f11 = (float) random.nextDouble() * 0.5F + 0.4F; + float f12 = (float) random.nextDouble() * 0.5F + 0.4F; + float f13 = (float) random.nextDouble() * 0.5F + 2F; if (i == 0) { f13 = 1.0F; f12 = 1.0F; @@ -178,25 +192,35 @@ public class RenderCore extends TileEntitySpecialRenderer { GL11.glTexGen(GL11.GL_Q, GL11.GL_EYE_PLANE, this.func_147525_a(0, 1, 0, 0)); GL11.glRotatef(180, 0, 0, 1); - tessellator.startDrawingQuads(); - tessellator.setColorOpaque_F(f11, f12, f13); - tessellator.setBrightness(0xF000F0); - tessellator.addVertex(x + 0.0, y + 0.0, z + 1.0); - tessellator.addVertex(x + 0.0, y + 0.0, z + 0.0); - tessellator.addVertex(x + 1.0, y + 0.0, z + 0.0); - tessellator.addVertex(x + 1.0, y + 0.0, z + 1.0); - tessellator.draw(); + + int tot = core.tanks[0].getMaxFill() + core.tanks[1].getMaxFill(); + int fill = core.tanks[0].getFill() + core.tanks[1].getFill(); + + float s = 2.25F * fill / tot + 0.5F; - tessellator.startDrawingQuads(); - tessellator.setColorOpaque_F(f11, f12, f13); - tessellator.setBrightness(0xF000F0); - tessellator.addVertex(x + 1.0, y + 1.0, z + 1.0); - tessellator.addVertex(x + 1.0, y + 1.0, z + 0.0); - tessellator.addVertex(x + 0.0, y + 1.0, z + 0.0); - tessellator.addVertex(x + 0.0, y + 1.0, z + 1.0); - tessellator.draw(); + int count = 32; + + for(int j = 0; j < count; j++) { + + Vec3 vec = Vec3.createVectorHelper(s, 0, 0); + + + tessellator.startDrawing(GL11.GL_TRIANGLES); + tessellator.setColorOpaque_F(f11, f12, f13); + tessellator.setBrightness(0xF000F0); - GL11.glTexGen(GL11.GL_S, GL11.GL_EYE_PLANE, this.func_147525_a(0, 1, 0, 0)); + vec.rotateAroundY((float) Math.PI * 2F / count * j - 0.0025F); + + tessellator.addVertex(x + 0.5 + vec.xCoord, y + 1.0, z + 0.5 + vec.zCoord); + + vec.rotateAroundY((float) Math.PI * 2F / count + 0.005F); + tessellator.addVertex(x + 0.5 + vec.xCoord, y + 1.0, z + 0.5 + vec.zCoord); + tessellator.addVertex(x + 0.5, y + 1.0, z + 0.5); + + tessellator.draw(); + } + + /*GL11.glTexGen(GL11.GL_S, GL11.GL_EYE_PLANE, this.func_147525_a(0, 1, 0, 0)); GL11.glTexGen(GL11.GL_T, GL11.GL_EYE_PLANE, this.func_147525_a(1, 0, 0, 0)); GL11.glTexGen(GL11.GL_R, GL11.GL_EYE_PLANE, this.func_147525_a(0, 0, 0, 1)); GL11.glTexGen(GL11.GL_Q, GL11.GL_EYE_PLANE, this.func_147525_a(0, 0, 1, 0)); @@ -236,7 +260,7 @@ public class RenderCore extends TileEntitySpecialRenderer { tessellator.addVertex(x + 1.0, y + 1.0, z + 0.0); tessellator.addVertex(x + 1.0, y + 1.0, z + 1.0); tessellator.addVertex(x + 1.0, y + 0.0, z + 1.0); - tessellator.draw(); + tessellator.draw();*/ } GL11.glPopMatrix(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java index 523e4e60b..0c8c02303 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java @@ -43,7 +43,7 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements @Override public String getName() { - return "container.machineCyclotron"; + return "container.cyclotron"; } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java index b8b5cc45a..b1956f170 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java @@ -228,9 +228,14 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, heat += 5; if(slots[i].getItem() == ModItems.pellet_rtg_weak) heat += 3; + if(slots[i].getItem() == ModItems.pellet_rtg_polonium) + heat += 25; } } + if(heat > heatMax) + heat = heatMax; + power += heat; if(power > powerMax) power = powerMax; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityRtgFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityRtgFurnace.java index eba2a2ba9..08162fc08 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityRtgFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityRtgFurnace.java @@ -101,15 +101,14 @@ public class TileEntityRtgFurnace extends TileEntity implements ISidedInventory } public boolean isLoaded() { - if(slots[1] != null && slots[2] != null && slots[3] != null) - { - if(slots[1].getItem() == ModItems.pellet_rtg && slots[2].getItem() == ModItems.pellet_rtg && slots[3].getItem() == ModItems.pellet_rtg) - { - return true; - } + + for(int i = 1; i <= 3; i++) { + + if(!(slots[i] != null && (slots[i].getItem() == ModItems.pellet_rtg || slots[i].getItem() == ModItems.pellet_rtg_polonium))) + return false; } - return false; + return true; } @Override