diff --git a/changelog b/changelog index 6221f663e..00743753b 100644 --- a/changelog +++ b/changelog @@ -23,4 +23,5 @@ ## Fixed * Fixed gas centrifuge sound persisting when broken or when unloaded * Fixed all centrifuge sounds trying to play even when the player is far away, using up audio slots -* Fixed guns that don't have durability always displaying a condition of 0% \ No newline at end of file +* Fixed guns that don't have durability always displaying a condition of 0% +* Fixed GL state leak caused by skeletons \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbineGas.java b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbineGas.java index 87895df93..66a3b7152 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbineGas.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbineGas.java @@ -124,9 +124,9 @@ public class GUIMachineTurbineGas extends GuiInfoContainer { } if(turbinegas.temp >= 20) - this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 133, guiTop + 23, 8, 72, mouseX, mouseY, new String[] {"Temperature: " + (turbinegas.temp) + "°C"}); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 133, guiTop + 23, 8, 72, mouseX, mouseY, new String[] {"Temperature: " + (turbinegas.temp) + "°C"}); else - this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 133, guiTop + 23, 8, 72, mouseX, mouseY, new String[] {"Temperature: 20°C"}); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 133, guiTop + 23, 8, 72, mouseX, mouseY, new String[] {"Temperature: 20°C"}); turbinegas.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 16, 16, 48); turbinegas.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 70, 16, 32); diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java index aed9b4798..c6e98b525 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java @@ -48,7 +48,7 @@ public class AssemblyMachineRecipes extends GenericRecipes { @Override public int outputItemLimit() { return 1; } @Override public int outputFluidLimit() { return 1; } - @Override public String getFileName() { return "hbmAsemblyMachine.json"; } + @Override public String getFileName() { return "hbmAssemblyMachine.json"; } @Override public GenericRecipe instantiateRecipe(String name) { return new GenericRecipe(name); } @Override diff --git a/src/main/java/com/hbm/render/tileentity/RenderSkeletonHolder.java b/src/main/java/com/hbm/render/tileentity/RenderSkeletonHolder.java index adcbea5e9..45401d406 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderSkeletonHolder.java +++ b/src/main/java/com/hbm/render/tileentity/RenderSkeletonHolder.java @@ -23,6 +23,10 @@ public class RenderSkeletonHolder extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y, z + 0.5); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_CULL_FACE); + RenderHelper.enableStandardItemLighting(); + switch(te.getBlockMetadata()) { case 2: GL11.glRotatef(180, 0F, 1F, 0F); break; case 4: GL11.glRotatef(270, 0F, 1F, 0F); break; @@ -30,10 +34,6 @@ public class RenderSkeletonHolder extends TileEntitySpecialRenderer { case 5: GL11.glRotatef(90, 0F, 1F, 0F); break; } //why the FUCK did this not commit properl;y - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_CULL_FACE); - RenderHelper.enableStandardItemLighting(); - bindTexture(ResourceManager.skeleton_holder_tex); ResourceManager.skeleton_holder.renderPart("Holder1"); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 7def2090a..955ecfdc9 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -371,6 +371,7 @@ container.leadBox=Sicherheitsbehälter container.machineAmmoPress=Munitionspresse container.machineArcWelder=Lichtbogenschweißer container.machineArcFurnaceLarge=Lichtbogenofen +container.machineAssemblyMachine=Montagemaschine container.machineBoiler=Ölwärmer container.machineChemicalFactory=Chemiefabrik container.machineChemicalPlant=Chemiewerk @@ -4347,8 +4348,9 @@ tile.machine_arc_welder.name=Lichtbogenschweißer tile.machine_armor_table.name=Rüstungsmodifikationstisch tile.machine_ashpit.name=Aschekasten tile.machine_ashpit.desc=Sammelt Asche von Feuerbüchsen und Heizöfen -tile.machine_assembler.name=Fertigungsmaschine +tile.machine_assembler.name=Fertigungsmaschine (Legacy) tile.machine_assemfac.name=Fertigungsfabrik +tile.machine_assembly_machine.name=Montagemaschine tile.machine_autocrafter.name=Automatische Werkbank tile.machine_autosaw.name=Automatische Kreissäge tile.machine_autosaw.desc=Schneidet Pflanzen nieder, pflanzt Bäume nach$Akzeptiert:$-Holzöl$-Ethanol$-Fischöl$-Schweröl diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index be8eeaa6e..b70a4e262 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -773,6 +773,7 @@ container.leadBox=Containment Box container.machineAmmoPress=Ammo Press container.machineArcWelder=Arc Welder container.machineArcFurnaceLarge=Arc Furnace +container.machineAssemblyMachine=Assembly Machine container.machineBoiler=Oil Heater container.machineChemicalFactory=Chemical Factory container.machineChemicalPlant=Chemical Plant @@ -5480,8 +5481,9 @@ tile.machine_arc_welder.name=Arc Welder tile.machine_armor_table.name=Armor Modification Table tile.machine_ashpit.name=Ashpit tile.machine_ashpit.desc=Collects ashes from fireboxes and heating ovens -tile.machine_assembler.name=Assembly Machine +tile.machine_assembler.name=Assembly Machine (Legacy) tile.machine_assemfac.name=Assembly Factory +tile.machine_assembly_machine.name=Assembly Machine tile.machine_autocrafter.name=Automatic Crafting Table tile.machine_autosaw.name=Automatic Buzz Saw tile.machine_autosaw.desc=Cuts down nearby plants, re-plants trees$Accepts:$-Wood oil$-Ethanol$-Fish oil$-Heavy oil diff --git a/src/main/resources/assets/hbm/models/machines/assembly_machine.obj b/src/main/resources/assets/hbm/models/machines/assembly_machine.obj index bf0e3b1c4..1b79436d5 100644 --- a/src/main/resources/assets/hbm/models/machines/assembly_machine.obj +++ b/src/main/resources/assets/hbm/models/machines/assembly_machine.obj @@ -578,12 +578,12 @@ vt 0.947368 0.518519 vt 0.881579 0.574074 vt 0.881579 0.518519 vt 0.861842 0.574074 -vt 0.720395 0.629566 -vt 0.707282 0.611111 -vt 0.720395 0.592656 -vt 0.684807 0.624161 -vt 0.684807 0.598061 -vt 0.703351 0.598061 +vt 0.723684 0.629566 +vt 0.710572 0.611111 +vt 0.723684 0.592656 +vt 0.688096 0.624161 +vt 0.688096 0.598061 +vt 0.706641 0.598061 vt 0.907895 0.481481 vt 0.894737 0.462963 vt 0.907895 0.462963 @@ -607,12 +607,12 @@ vt 0.947368 0.518519 vt 0.881579 0.574074 vt 0.881579 0.518519 vt 0.861842 0.574074 -vt 0.720395 0.629566 -vt 0.707282 0.611111 -vt 0.720395 0.592656 -vt 0.684807 0.624161 -vt 0.684807 0.598061 -vt 0.703351 0.598061 +vt 0.723684 0.629566 +vt 0.710572 0.611111 +vt 0.723684 0.592656 +vt 0.688096 0.624161 +vt 0.688096 0.598061 +vt 0.706641 0.598061 vt 0.907895 0.481481 vt 0.894737 0.462963 vt 0.907895 0.462963 @@ -649,29 +649,29 @@ vt 0.470395 0.148148 vt 0.417763 0.148148 vt 0.319079 0.148148 vt 0.947368 0.574074 -vt 0.729667 0.598061 -vt 0.733508 0.611111 -vt 0.729667 0.624161 -vt 0.711123 0.624161 -vt 0.711123 0.598061 -vt 0.680966 0.611111 -vt 0.694079 0.592656 -vt 0.707192 0.611111 -vt 0.703351 0.624161 -vt 0.694079 0.629566 +vt 0.732957 0.598061 +vt 0.736797 0.611111 +vt 0.732957 0.624161 +vt 0.714412 0.624161 +vt 0.714412 0.598061 +vt 0.684256 0.611111 +vt 0.697369 0.592656 +vt 0.710482 0.611111 +vt 0.706641 0.624161 +vt 0.697369 0.629566 vt 0.894737 0.481481 vt 0.947368 0.462963 vt 0.947368 0.574074 -vt 0.729667 0.598061 -vt 0.733508 0.611111 -vt 0.729667 0.624161 -vt 0.711123 0.624161 -vt 0.711123 0.598061 -vt 0.680966 0.611111 -vt 0.694079 0.592656 -vt 0.707192 0.611111 -vt 0.703351 0.624161 -vt 0.694079 0.629566 +vt 0.732957 0.598061 +vt 0.736797 0.611111 +vt 0.732957 0.624161 +vt 0.714412 0.624161 +vt 0.714412 0.598061 +vt 0.684256 0.611111 +vt 0.697369 0.592656 +vt 0.710482 0.611111 +vt 0.706641 0.624161 +vt 0.697369 0.629566 vt 0.894737 0.481481 vt 0.947368 0.462963 vt 0.319079 0.296296 diff --git a/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_connector.png b/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_connector.png index 1a0327a1a..133f16515 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_connector.png and b/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_connector.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_in.png b/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_in.png index b0cb8e0e9..2abafb352 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_in.png and b/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_in.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_out.png b/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_out.png index 000c59850..a0374af58 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_out.png and b/src/main/resources/assets/hbm/textures/blocks/pneumatic_tube_out.png differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_biofuel.png b/src/main/resources/assets/hbm/textures/items/canister_biofuel.png deleted file mode 100644 index 5e509e6b8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_biofuel.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_bitumen.png b/src/main/resources/assets/hbm/textures/items/canister_bitumen.png deleted file mode 100644 index 3e3e9e79c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_bitumen.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_blank.png b/src/main/resources/assets/hbm/textures/items/canister_blank.png index 9e19878bc..0524cbe1d 100644 Binary files a/src/main/resources/assets/hbm/textures/items/canister_blank.png and b/src/main/resources/assets/hbm/textures/items/canister_blank.png differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_canola.png b/src/main/resources/assets/hbm/textures/items/canister_canola.png deleted file mode 100644 index 7f5a44f91..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_canola.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_empty.png b/src/main/resources/assets/hbm/textures/items/canister_empty.png index 36c11231a..a41347e95 100644 Binary files a/src/main/resources/assets/hbm/textures/items/canister_empty.png and b/src/main/resources/assets/hbm/textures/items/canister_empty.png differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_ethanol.png b/src/main/resources/assets/hbm/textures/items/canister_ethanol.png deleted file mode 100644 index b29ab22cc..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_ethanol.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_fracksol.png b/src/main/resources/assets/hbm/textures/items/canister_fracksol.png deleted file mode 100644 index 8111eab89..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_fracksol.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_fuel.png b/src/main/resources/assets/hbm/textures/items/canister_fuel.png deleted file mode 100644 index 359fba8c8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_fuel.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_gasoline.png b/src/main/resources/assets/hbm/textures/items/canister_gasoline.png deleted file mode 100644 index 1b466069c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_gasoline.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_heatingoil.png b/src/main/resources/assets/hbm/textures/items/canister_heatingoil.png deleted file mode 100644 index e8654568e..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_heatingoil.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_heavyoil.png b/src/main/resources/assets/hbm/textures/items/canister_heavyoil.png deleted file mode 100644 index 62f810b25..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_heavyoil.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_kerosene.png b/src/main/resources/assets/hbm/textures/items/canister_kerosene.png deleted file mode 100644 index 61649e01b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_kerosene.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_lightoil.png b/src/main/resources/assets/hbm/textures/items/canister_lightoil.png deleted file mode 100644 index 49528bdd0..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_lightoil.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_napalm.png b/src/main/resources/assets/hbm/textures/items/canister_napalm.png index 66d2fae42..1c65524d3 100644 Binary files a/src/main/resources/assets/hbm/textures/items/canister_napalm.png and b/src/main/resources/assets/hbm/textures/items/canister_napalm.png differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_naphtha.png b/src/main/resources/assets/hbm/textures/items/canister_naphtha.png deleted file mode 100644 index 8ca35d24f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_naphtha.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_oil.png b/src/main/resources/assets/hbm/textures/items/canister_oil.png deleted file mode 100644 index 6af9430a0..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_oil.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_overlay.png b/src/main/resources/assets/hbm/textures/items/canister_overlay.png index f32b8014f..27bd808e5 100644 Binary files a/src/main/resources/assets/hbm/textures/items/canister_overlay.png and b/src/main/resources/assets/hbm/textures/items/canister_overlay.png differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_petroil.png b/src/main/resources/assets/hbm/textures/items/canister_petroil.png deleted file mode 100644 index bc5aa6314..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_petroil.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_reoil.png b/src/main/resources/assets/hbm/textures/items/canister_reoil.png deleted file mode 100644 index aa36d54e1..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_reoil.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_smear.png b/src/main/resources/assets/hbm/textures/items/canister_smear.png deleted file mode 100644 index e81ab1572..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_smear.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_superfuel.png b/src/main/resources/assets/hbm/textures/items/canister_superfuel.png deleted file mode 100644 index f38d02ff7..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/canister_superfuel.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/fluid_barrel.png b/src/main/resources/assets/hbm/textures/items/fluid_barrel.png index 8eb04cde2..fdc431861 100644 Binary files a/src/main/resources/assets/hbm/textures/items/fluid_barrel.png and b/src/main/resources/assets/hbm/textures/items/fluid_barrel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/fluid_barrel_infinite.png b/src/main/resources/assets/hbm/textures/items/fluid_barrel_infinite.png index b2e78fd7a..361fc9f7c 100644 Binary files a/src/main/resources/assets/hbm/textures/items/fluid_barrel_infinite.png and b/src/main/resources/assets/hbm/textures/items/fluid_barrel_infinite.png differ diff --git a/src/main/resources/assets/hbm/textures/items/fluid_barrel_overlay.png b/src/main/resources/assets/hbm/textures/items/fluid_barrel_overlay.png index 35cfb942d..518122010 100644 Binary files a/src/main/resources/assets/hbm/textures/items/fluid_barrel_overlay.png and b/src/main/resources/assets/hbm/textures/items/fluid_barrel_overlay.png differ diff --git a/src/main/resources/assets/hbm/textures/items/fluid_tank.png b/src/main/resources/assets/hbm/textures/items/fluid_tank.png index 3ff266568..32d7f9822 100644 Binary files a/src/main/resources/assets/hbm/textures/items/fluid_tank.png and b/src/main/resources/assets/hbm/textures/items/fluid_tank.png differ diff --git a/src/main/resources/assets/hbm/textures/items/fluid_tank_overlay.png b/src/main/resources/assets/hbm/textures/items/fluid_tank_overlay.png index 69f09af83..bc05d8645 100644 Binary files a/src/main/resources/assets/hbm/textures/items/fluid_tank_overlay.png and b/src/main/resources/assets/hbm/textures/items/fluid_tank_overlay.png differ diff --git a/src/main/resources/assets/hbm/textures/items/gas_bottle.png b/src/main/resources/assets/hbm/textures/items/gas_bottle.png index 7776838e6..4e2b038df 100644 Binary files a/src/main/resources/assets/hbm/textures/items/gas_bottle.png and b/src/main/resources/assets/hbm/textures/items/gas_bottle.png differ diff --git a/src/main/resources/assets/hbm/textures/items/gas_empty.png b/src/main/resources/assets/hbm/textures/items/gas_empty.png index 8014cfd5e..f901a9fbf 100644 Binary files a/src/main/resources/assets/hbm/textures/items/gas_empty.png and b/src/main/resources/assets/hbm/textures/items/gas_empty.png differ diff --git a/src/main/resources/assets/hbm/textures/items/gas_label.png b/src/main/resources/assets/hbm/textures/items/gas_label.png index eee087c9e..5c0dde543 100644 Binary files a/src/main/resources/assets/hbm/textures/items/gas_label.png and b/src/main/resources/assets/hbm/textures/items/gas_label.png differ diff --git a/src/main/resources/assets/hbm/textures/items/inf_water.png b/src/main/resources/assets/hbm/textures/items/inf_water.png index 766c4c5c9..b2f400e0b 100644 Binary files a/src/main/resources/assets/hbm/textures/items/inf_water.png and b/src/main/resources/assets/hbm/textures/items/inf_water.png differ diff --git a/src/main/resources/assets/hbm/textures/items/inf_water_mk2.png b/src/main/resources/assets/hbm/textures/items/inf_water_mk2.png index 9c53f6f1e..2513580a3 100644 Binary files a/src/main/resources/assets/hbm/textures/items/inf_water_mk2.png and b/src/main/resources/assets/hbm/textures/items/inf_water_mk2.png differ