Backport #14 to 1.17

FakeDomi · Jun 10, 2022 · 3b0bcea · 3b0bcea
1 parent 0722eda
commit 3b0bcea
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2021 Domi
+Copyright (c) 2021 - 2022 Domi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/build.gradle b/build.gradle
@@ -62,9 +62,7 @@ java {
 }
 
 jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
-	}
+	from "LICENSE.txt"
 }
 
 // configure the maven publication

diff --git a/gradle.properties b/gradle.properties
@@ -5,10 +5,10 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
 	minecraft_version=1.17
 	yarn_mappings=1.17+build.1
-	loader_version=0.11.3
+	loader_version=0.11.6
 
 # Mod Properties
-	mod_version = 1.2+1.17
+	mod_version = 1.3+1.17
 	maven_group = re.domi
 	archives_base_name = fast-chest
 

diff --git a/src/main/java/re/domi/fastchest/mixin/BlockEntityRenderDispatcherMixin.java b/src/main/java/re/domi/fastchest/mixin/BlockEntityRenderDispatcherMixin.java
@@ -17,15 +17,16 @@
 public class BlockEntityRenderDispatcherMixin
 {
     @Inject(method = "get", at = @At("HEAD"), cancellable = true)
-    private <E extends BlockEntity> void get(E blockEntity, CallbackInfoReturnable<@Nullable BlockEntityRenderer<E>> cir)
+    private <E extends BlockEntity> void fastchest_get(E blockEntity, CallbackInfoReturnable<@Nullable BlockEntityRenderer<E>> cir)
     {
         if (Config.simplifiedChest)
         {
             Class<?> beClass = blockEntity.getClass();
 
             if (beClass == ChestBlockEntity.class ||
                 beClass == TrappedChestBlockEntity.class ||
-                beClass == EnderChestBlockEntity.class)
+                beClass == EnderChestBlockEntity.class ||
+                beClass.getSuperclass().getName().equals("io.github.cyberanner.ironchests.blocks.blockentities.GenericChestEntity"))
             {
                 cir.setReturnValue(null);
             }

diff --git a/src/main/java/re/domi/fastchest/mixin/ChestBlockMixin.java b/src/main/java/re/domi/fastchest/mixin/ChestBlockMixin.java
@@ -13,7 +13,7 @@
 public class ChestBlockMixin
 {
     @Inject(method = "getRenderType", at = @At("HEAD"), cancellable = true)
-    private void getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir)
+    private void fastchest_getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir)
     {
         if (Config.simplifiedChest)
         {

diff --git a/src/main/java/re/domi/fastchest/mixin/EnderChestBlockMixin.java b/src/main/java/re/domi/fastchest/mixin/EnderChestBlockMixin.java
@@ -13,7 +13,7 @@
 public class EnderChestBlockMixin
 {
     @Inject(method = "getRenderType", at = @At("HEAD"), cancellable = true)
-    private void getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir)
+    private void fastchest_getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir)
     {
         if (Config.simplifiedChest)
         {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -12,7 +12,7 @@
     "eeasee"
   ],
   "contact": {
-    "homepage": "https://www.curseforge.com/minecraft/mc-mods/fastchest",
+    "homepage": "https://domi.re/mc-mods/fastchest",
     "sources": "https://github.com/FakeDomi/FastChest",
     "issues": "https://github.com/FakeDomi/FastChest/issues"
   },