Merge main branch

Alpha-s-Stuff · Nov 22, 2023 · 93a9b61 · 93a9b61
1 parent c4dd6b9
commit 93a9b61
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 150 deletions.
diff --git a/src/main/java/slimeknights/tconstruct/mixin/mantle/ModelHelperMixin.java b/src/main/java/slimeknights/tconstruct/mixin/mantle/ModelHelperMixin.java
diff --git a/src/main/java/slimeknights/tconstruct/mixin/mantle/RetexturedHelperMixin.java b/src/main/java/slimeknights/tconstruct/mixin/mantle/RetexturedHelperMixin.java
diff --git a/src/main/java/slimeknights/tconstruct/mixin/mantle/RetexturedModelMixin.java b/src/main/java/slimeknights/tconstruct/mixin/mantle/RetexturedModelMixin.java
diff --git a/...in/java/slimeknights/tconstruct/tables/block/entity/table/RetexturedTableBlockEntity.java b/...in/java/slimeknights/tconstruct/tables/block/entity/table/RetexturedTableBlockEntity.java
@@ -56,7 +56,7 @@ private void textureUpdated() {
     // update the texture in BE data
     if (level != null && level.isClientSide) {
       Block normalizedTexture = texture == Blocks.AIR ? null : texture;
-      IModelData data = getRenderAttachmentData();
+      IModelData data = getRenderData();
       if (data.getData(RetexturedHelper.BLOCK_PROPERTY) != normalizedTexture) {
         data.setData(RetexturedHelper.BLOCK_PROPERTY, normalizedTexture);
 //        requestModelDataUpdate();

diff --git a/src/main/resources/hephaestus.mixins.json b/src/main/resources/hephaestus.mixins.json
@@ -9,12 +9,6 @@
     "maxShiftBy": 5
   },
   "mixins": [
-    "DataFixersMixin",
-    "mantle.ModelHelperMixin",
-    "mantle.RetexturedHelperMixin",
-    "mantle.RetexturedModelMixin"
-  ],
-  "client": [
-    "mantle.RetexturedModelMixin$RetexturedModelRetexturedOverrideMixin"
+    "DataFixersMixin"
   ]
 }