From ee9cb4106f837a2ce29e5ed388456ebb02c73499 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Sat, 5 Oct 2024 23:59:30 +0200 Subject: [PATCH 1/4] update dep --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 0f0736d1..362844f5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api("com.github.GTNewHorizons:waila:1.8.1:dev") - api("com.github.GTNewHorizons:NotEnoughItems:2.6.35-GTNH:dev") + api("com.github.GTNewHorizons:NotEnoughItems:2.6.41-GTNH:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:TinkersConstruct:1.12.10-GTNH:dev") } From ddc15a0cd50dccacfe57132d54a3580bb0bc2a47 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Sun, 6 Oct 2024 00:00:12 +0200 Subject: [PATCH 2/4] update rendering calls to CCRenderState --- .../client/models/ModelBackpackBlock.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/darkona/adventurebackpack/client/models/ModelBackpackBlock.java b/src/main/java/com/darkona/adventurebackpack/client/models/ModelBackpackBlock.java index ea22b66f..cba68ff6 100644 --- a/src/main/java/com/darkona/adventurebackpack/client/models/ModelBackpackBlock.java +++ b/src/main/java/com/darkona/adventurebackpack/client/models/ModelBackpackBlock.java @@ -290,8 +290,8 @@ public void render(Entity entity, float f, float f1, float f2, float f3, float f (tankLeftTop.rotationPointY * 0.1f + 0.05f), (tankLeftTop.rotationPointZ * 0.1f + 0.15f)); GL11.glPushMatrix(); - state.reset(); - state.pullLightmap(); + state.resetInstance(); + state.pullLightmapInstance(); state.useNormals = true; RenderUtils.renderFluidCuboid( tankLeft.getFluid(), @@ -307,8 +307,8 @@ public void render(Entity entity, float f, float f1, float f2, float f3, float f (tankRightTop.rotationPointY * 0.1f + 0.05f), (tankRightTop.rotationPointZ * 0.1f + 0.15f)); GL11.glPushMatrix(); - state.reset(); - state.pullLightmap(); + state.resetInstance(); + state.pullLightmapInstance(); state.useNormals = true; RenderUtils.renderFluidCuboid( tankRight.getFluid(), @@ -340,8 +340,8 @@ private void renderFluidsInTanks(FluidTank tankLeft, FluidTank tankRight, float (tankLeftTop.rotationPointY * 0.1f + 0.1f), (tankLeftTop.rotationPointZ * 0.1f + 0.13f)); // ChickenStuff - state.reset(); - state.pullLightmap(); + state.resetInstance(); + state.pullLightmapInstance(); state.useNormals = true; Cuboid6 left = new Cuboid6(minX, minY, minZ, maxX, maxY, maxZ); @@ -362,8 +362,8 @@ private void renderFluidsInTanks(FluidTank tankLeft, FluidTank tankRight, float (tankRightTop.rotationPointY * 0.1f + 0.1f), (tankRightTop.rotationPointZ * 0.1f + 0.13f)); // ChickenStuff - state.reset(); - state.pullLightmap(); + state.resetInstance(); + state.pullLightmapInstance(); state.useNormals = true; Cuboid6 right = new Cuboid6(minX, minY, minZ, maxX, maxY, maxZ); From 9e5833888301b655dd94a4379fb6d5ec0d6dadf1 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Sun, 6 Oct 2024 00:04:58 +0200 Subject: [PATCH 3/4] change poor wording for "backback already equipped message" --- src/main/resources/assets/adventurebackpack/lang/en_US.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/adventurebackpack/lang/en_US.lang b/src/main/resources/assets/adventurebackpack/lang/en_US.lang index 7a65bd6d..6c5a6914 100644 --- a/src/main/resources/assets/adventurebackpack/lang/en_US.lang +++ b/src/main/resources/assets/adventurebackpack/lang/en_US.lang @@ -61,9 +61,9 @@ fluid.milk=Milk fluid.mushrromstew=Mushroom Stew ## Messages -adventurebackpack:messages.already.equipped.backpack=You are already equipping an Adventure Backpack. -adventurebackpack:messages.already.equipped.copterpack=You are already equipping a Copter Pack. -adventurebackpack:messages.already.equipped.jetpack=You are already equipping a Coal Jetpack. +adventurebackpack:messages.already.equipped.backpack=You are already have an Adventure Backpack equipped. +adventurebackpack:messages.already.equipped.copterpack=You are already have a Copter Pack equipped. +adventurebackpack:messages.already.equipped.jetpack=You are already have a Coal Jetpack equipped. adventurebackpack:messages.already.impossibru=You aren't wearing any backpacks. adventurebackpack:messages.backpack.cant.bag=Can't deploy the sleeping bag! Check the surrounding area. adventurebackpack:messages.cant.sleep.here=Ancient forces do not welcome sleep here. From 7893d2d9be12bfe50e905bffb2b7c98089205786 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 9 Oct 2024 19:07:23 +0200 Subject: [PATCH 4/4] typo --- src/main/resources/assets/adventurebackpack/lang/en_US.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/adventurebackpack/lang/en_US.lang b/src/main/resources/assets/adventurebackpack/lang/en_US.lang index 6c5a6914..f0000a2e 100644 --- a/src/main/resources/assets/adventurebackpack/lang/en_US.lang +++ b/src/main/resources/assets/adventurebackpack/lang/en_US.lang @@ -61,9 +61,9 @@ fluid.milk=Milk fluid.mushrromstew=Mushroom Stew ## Messages -adventurebackpack:messages.already.equipped.backpack=You are already have an Adventure Backpack equipped. -adventurebackpack:messages.already.equipped.copterpack=You are already have a Copter Pack equipped. -adventurebackpack:messages.already.equipped.jetpack=You are already have a Coal Jetpack equipped. +adventurebackpack:messages.already.equipped.backpack=You already have an Adventure Backpack equipped. +adventurebackpack:messages.already.equipped.copterpack=You already have a Copter Pack equipped. +adventurebackpack:messages.already.equipped.jetpack=You already have a Coal Jetpack equipped. adventurebackpack:messages.already.impossibru=You aren't wearing any backpacks. adventurebackpack:messages.backpack.cant.bag=Can't deploy the sleeping bag! Check the surrounding area. adventurebackpack:messages.cant.sleep.here=Ancient forces do not welcome sleep here.