Merge branch 'master' into master

GTNewHorizons · Oct 10, 2024 · 8190eeb · 8190eeb
2 parents cae30fb + 84496e6
commit 8190eeb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git 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")
 }
diff --git 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);

diff --git 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 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.