Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21

CyclopsMC · Jul 16, 2024 · 0f73048 · 0f73048
2 parents 085c4b2 + dc19a5b
commit 0f73048
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/resources/changelog/1.19.2-1.2.33.txt b/resources/changelog/1.19.2-1.2.33.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Changes:
+* Remove unsupported compats from infobook, Closes CyclopsMC/EvilCraft#1028
+
diff --git a/resources/changelog/1.20.1-1.2.40.txt b/resources/changelog/1.20.1-1.2.40.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.4 or higher.
+
+Changes:
+* Remove unsupported compats from infobook, Closes CyclopsMC/EvilCraft#1028
+
diff --git a/resources/changelog/1.20.1-1.2.41.txt b/resources/changelog/1.20.1-1.2.41.txt
@@ -0,0 +1,8 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.4 or higher.
+
+Fixes:
+* Fix missing blook entity texture, Closes #1030
+* Fix Promise of Tenacity III not showing in book, Closes #1031
+* Remove unsupported compats from infobook, Closes CyclopsMC/EvilCraft#1028
+
diff --git a/src/main/java/org/cyclops/evilcraft/client/render/blockentity/RenderBlockEntityPurifier.java b/src/main/java/org/cyclops/evilcraft/client/render/blockentity/RenderBlockEntityPurifier.java
@@ -8,11 +8,11 @@
 import net.minecraft.client.model.geom.ModelLayers;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.Sheets;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.blockentity.EnchantTableRenderer;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.Material;
 import net.minecraft.core.Direction;
@@ -41,7 +41,7 @@
  */
 public class RenderBlockEntityPurifier implements BlockEntityRenderer<BlockEntityPurifier> {
 
-    public static final Material TEXTURE_BLOOK = new Material(TextureAtlas.LOCATION_BLOCKS, ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "entity/blook"));
+    public static final Material TEXTURE_BLOOK = new Material(Sheets.CHEST_SHEET, ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "entity/blook"));
     private final BookModel enchantmentBook;
 
     public RenderBlockEntityPurifier(BlockEntityRendererProvider.Context context) {

diff --git a/src/main/resources/assets/minecraft/atlases/chests.json b/src/main/resources/assets/minecraft/atlases/chests.json
@@ -7,6 +7,10 @@
         {
             "type": "minecraft:single",
             "resource": "evilcraft:model/colossal_blood_chest"
+        },
+        {
+            "type": "minecraft:single",
+            "resource": "evilcraft:entity/blook"
         }
     ]
 }
diff --git a/src/main/resources/data/evilcraft/info/book.xml b/src/main/resources/data/evilcraft/info/book.xml
@@ -262,7 +262,7 @@
                 <appendix type="evilcraft:blood_infuser">evilcraft:blood_infuser/core/bowl_of_promises_tier3</appendix>
                 <appendix type="minecraft:crafting">evilcraft:crafting/promise_tier_1</appendix>
                 <appendix type="minecraft:crafting">evilcraft:crafting/promise_tier_2</appendix>
-                <appendix type="minecraft:crafting">evilcraft:crafting/promise_tier_2</appendix>
+                <appendix type="minecraft:crafting">evilcraft:crafting/promise_tier_3</appendix>
                 <appendix type="minecraft:crafting">evilcraft:crafting/promise_speed_0</appendix>
                 <appendix type="minecraft:crafting">evilcraft:crafting/promise_efficiency_0</appendix>
                 <appendix type="evilcraft:blood_infuser">evilcraft:blood_infuser/core/promise_acceptor_iron</appendix>