Merge remote-tracking branch 'origin/7.1' into 7.1

Turnip-Labs · Apr 26, 2024 · df48d66 · df48d66
2 parents c3dd13a + ea5832b
commit df48d66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/turniplabs/halplibe/helper/BlockBuilder.java b/src/main/java/turniplabs/halplibe/helper/BlockBuilder.java
@@ -506,23 +506,23 @@ public <T extends Block> T build(T block) {
             block.atlasIndices[Side.TOP.getId()] = Block.texCoordToIndex(topTexture[0], topTexture[1]);
         }
 
-        if (topTexture != null) {
+        if (bottomTexture != null) {
             block.atlasIndices[Side.BOTTOM.getId()] = Block.texCoordToIndex(bottomTexture[0], bottomTexture[1]);
         }
 
-        if (topTexture != null) {
+        if (northTexture != null) {
             block.atlasIndices[Side.NORTH.getId()] = Block.texCoordToIndex(northTexture[0], northTexture[1]);
         }
 
-        if (topTexture != null) {
+        if (eastTexture != null) {
             block.atlasIndices[Side.EAST.getId()] = Block.texCoordToIndex(eastTexture[0], eastTexture[1]);
         }
 
-        if (topTexture != null) {
+        if (southTexture != null) {
             block.atlasIndices[Side.SOUTH.getId()] = Block.texCoordToIndex(southTexture[0], southTexture[1]);
         }
 
-        if (topTexture != null) {
+        if (westTexture != null) {
             block.atlasIndices[Side.WEST.getId()] = Block.texCoordToIndex(westTexture[0], westTexture[1]);
         }
 

diff --git a/src/main/java/turniplabs/halplibe/util/RecipeEntrypoint.java b/src/main/java/turniplabs/halplibe/util/RecipeEntrypoint.java
@@ -3,7 +3,5 @@
 public interface RecipeEntrypoint {
     void onRecipesReady();
 
-    default void initNamespaces(){
-
-    }
+    void initNamespaces();
 }