From 71797edde81cd92490c3307977bf71995da7bcdc Mon Sep 17 00:00:00 2001 From: 70000hp <105080577+70000hp@users.noreply.github.com> Date: Fri, 30 Dec 2022 14:42:28 -0600 Subject: [PATCH] ain't that a kick in the head forgot to save these files ough --- .../com/hbm/inventory/AssemblerRecipes.java | 2 +- .../java/com/hbm/inventory/gui/GUIFEL.java | 1 + .../com/hbm/inventory/gui/GUIFirebox.java | 1 + .../hbm/inventory/gui/GUIFurnaceSteel.java | 1 + .../java/com/hbm/main/CraftingManager.java | 2 +- .../render/tileentity/RenderFurnaceSteel.java | 32 +++++++++++++++++-- 6 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hbm/inventory/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/AssemblerRecipes.java index 2aa3ceec8e..56ea8675f5 100644 --- a/src/main/java/com/hbm/inventory/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/AssemblerRecipes.java @@ -324,7 +324,7 @@ private static void registerDefaults() { makeRecipe(new ComparableStack(ModBlocks.watz_conductor, 1), new AStack[] { new OreDictStack("ingotTungsten", 2), new OreDictStack(PB.ingot(), 2), new OreDictStack(STEEL.ingot(), 2), new ComparableStack(ModItems.wire_red_copper, 6), new ComparableStack(ModItems.wire_magnetized_tungsten, 2), new ComparableStack(ModItems.fuse, 4), }, 250); makeRecipe(new ComparableStack(ModBlocks.watz_core, 1), new AStack[] { new ComparableStack(ModBlocks.block_meteor, 1), new ComparableStack(ModItems.circuit_gold, 5), new ComparableStack(ModItems.circuit_schrabidium, 2), new ComparableStack(ModItems.wire_magnetized_tungsten, 12), }, 350); makeRecipe(new ComparableStack(ModBlocks.fwatz_hatch, 1), new AStack[] { new OreDictStack("ingotTungsten", 6), new OreDictStack(CMB.plate(), 4), }, 250); - makeRecipe(new ComparableStack(ModBlocks.fwatz_conductor, 1), new AStack[] { new OreDictStack(CMB.plate(), 10), new ComparableStack(ModItems.coil_magnetized_tungsten, 5), }, 250); + makeRecipe(new ComparableStack(ModBlocks.fwatz_conductor, 1), new AStack[] { new OreDictStack(CMB.plate(), 2), new ComparableStack(ModItems.coil_magnetized_tungsten, 3), }, 250); makeRecipe(new ComparableStack(ModBlocks.fwatz_computer, 1), new AStack[] { new ComparableStack(ModBlocks.block_meteor, 1), new ComparableStack(ModItems.wire_magnetized_tungsten, 16), new OreDictStack("dustDiamond", 6), new ComparableStack(ModItems.powder_magnetized_tungsten, 6), new OreDictStack(DESH.dust(), 4), }, 300); makeRecipe(new ComparableStack(ModBlocks.fwatz_core, 1), new AStack[] { new ComparableStack(ModBlocks.block_meteor, 1), new ComparableStack(ModItems.wire_magnetized_tungsten, 24), new OreDictStack("dustDiamond", 8), new ComparableStack(ModItems.powder_magnetized_tungsten, 12), new OreDictStack(DESH.dust(), 8), new ComparableStack(ModItems.upgrade_power_3, 1), new ComparableStack(ModItems.upgrade_speed_3, 1), }, 450); makeRecipe(new ComparableStack(ModBlocks.nuke_gadget, 1), new AStack[] { new ComparableStack(ModItems.sphere_steel, 1), new ComparableStack(ModItems.fins_flat, 2), new ComparableStack(ModItems.pedestal_steel, 1), new ComparableStack(ModItems.circuit_targeting_tier3, 1), new ComparableStack(ModItems.wire_gold, 6), new OreDictStack("dyeGray", 6), }, 300); diff --git a/src/main/java/com/hbm/inventory/gui/GUIFEL.java b/src/main/java/com/hbm/inventory/gui/GUIFEL.java index 985290b98a..cf1920b12b 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIFEL.java +++ b/src/main/java/com/hbm/inventory/gui/GUIFEL.java @@ -53,6 +53,7 @@ public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 182, guiTop + 27, 16, 113, fel.power, fel.maxPower); + this.renderHoveredToolTip(mouseX, mouseY); } protected void mouseClicked(int mouseX, int mouseY, int i) throws IOException { diff --git a/src/main/java/com/hbm/inventory/gui/GUIFirebox.java b/src/main/java/com/hbm/inventory/gui/GUIFirebox.java index 3a64cabc96..ce3caf29c0 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIFirebox.java +++ b/src/main/java/com/hbm/inventory/gui/GUIFirebox.java @@ -51,6 +51,7 @@ public void drawScreen(int x, int y, float interp) { this.drawCustomInfoStat(x, y, guiLeft + 80, guiTop + 27, 71, 7, x, y, new String[] { String.format("%,d", firebox.heatEnergy) + " / " + String.format("%,d", firebox.getMaxHeat()) + "TU" }); this.drawCustomInfoStat(x, y, guiLeft + 80, guiTop + 36, 71, 7, x, y, new String[] { firebox.burnHeat + "TU/t", (firebox.burnTime / 20) + "s" }); + this.renderHoveredToolTip(x, y); } @Override diff --git a/src/main/java/com/hbm/inventory/gui/GUIFurnaceSteel.java b/src/main/java/com/hbm/inventory/gui/GUIFurnaceSteel.java index 6f585923d3..58efa834e0 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIFurnaceSteel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIFurnaceSteel.java @@ -34,6 +34,7 @@ public void drawScreen(int x, int y, float interp) { } this.drawCustomInfoStat(x, y, guiLeft + 151, guiTop + 18, 9, 50, x, y, new String[] { String.format("%,d", furnace.heat) + " / " + String.format("%,d", furnace.maxHeat) + "TU" }); + this.renderHoveredToolTip(x, y); } @Override diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 5a529da7a0..06b6300c82 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -2278,7 +2278,7 @@ public static void reg3(){ addShapedRecipe(new ItemStack(ModBlocks.hadron_coil_magtung, 1), new Object[] { "WWW", "WCW", "WWW", 'W', ModItems.wire_magnetized_tungsten, 'C', ModBlocks.fwatz_conductor }); addShapedRecipe(new ItemStack(ModBlocks.hadron_coil_gold, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.coil_gold, 'C', ModBlocks.hadron_coil_alloy }); addShapedRecipe(new ItemStack(ModBlocks.hadron_coil_neodymium, 1), new Object[] { " G ", "GCG", " G ", 'G', ModItems.powder_neodymium, 'C', ModBlocks.hadron_coil_gold }); - addShapedRecipe(new ItemStack(ModBlocks.hadron_coil_schrabidate, 1), new Object[] { "S", "SCS", "S", 'S', ModItems.powder_schrabidate, 'C', ModBlocks.hadron_coil_schrabidium }); + addShapedRecipe(new ItemStack(ModBlocks.hadron_coil_schrabidate, 1), new Object[] { " S ", "SCS", " S ", 'S', ModItems.powder_schrabidate, 'C', ModBlocks.hadron_coil_schrabidium }); addShapedRecipe(new ItemStack(ModBlocks.hadron_coil_schrabidium, 1), new Object[] { "SCS", "CSC", "SCS", 'S', ModItems.wire_schrabidium, 'C', ModBlocks.hadron_coil_alloy }); addShapedRecipe(new ItemStack(ModBlocks.hadron_coil_starmetal, 1), new Object[] { "ICI", "ISI", "ICI", 'S', ModBlocks.hadron_coil_schrabidate, 'C', ModBlocks.hadron_coil_neodymium,'I',STAR.ingot() }); addShapedOreRecipe(new ItemStack(ModBlocks.hadron_diode, 1), new Object[] { "CIC", "ISI", "CIC", 'C', ModBlocks.hadron_coil_alloy, 'I', "ingotSteel", 'S', ModItems.circuit_gold }); diff --git a/src/main/java/com/hbm/render/tileentity/RenderFurnaceSteel.java b/src/main/java/com/hbm/render/tileentity/RenderFurnaceSteel.java index 41183ad7fa..f4f97cbd1a 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderFurnaceSteel.java +++ b/src/main/java/com/hbm/render/tileentity/RenderFurnaceSteel.java @@ -4,10 +4,13 @@ import com.hbm.blocks.BlockDummyable; import com.hbm.main.ResourceManager; - import com.hbm.tileentity.machine.TileEntityFurnaceSteel; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; public class RenderFurnaceSteel extends TileEntitySpecialRenderer { @@ -29,7 +32,32 @@ public void render(TileEntityFurnaceSteel tileEntity, double x, double y, double bindTexture(ResourceManager.furnace_steel_tex); ResourceManager.furnace_steel.renderAll(); - //for now no anim, while I figure out the 1.12 tesselator + + TileEntityFurnaceSteel furnace = (TileEntityFurnaceSteel) tileEntity; + if(furnace.wasOn) { + GlStateManager.disableTexture2D(); + GlStateManager.enableBlend(); + GlStateManager.disableLighting(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + float col = (float )Math.sin(System.currentTimeMillis() * 0.001); + GlStateManager.color(0.875F + col * 0.125F, 0.625F + col * 0.375F, 0F, 0.5F); + BufferBuilder buf = Tessellator.getInstance().getBuffer(); + buf.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); + + + for(int i = 0; i < 4; i++) { + buf.pos(1 + i * 0.0625, 1, -1).endVertex(); + buf.pos(1 + i * 0.0625, 1, 1).endVertex(); + buf.pos(1 + i * 0.0625, 0.5, 1).endVertex(); + buf.pos(1 + i * 0.0625, 0.5, -1).endVertex(); + } + Tessellator.getInstance().draw(); + GlStateManager.disableBlend(); + GlStateManager.enableTexture2D(); + GlStateManager.enableLighting(); + } + + GL11.glPopMatrix(); }