Backport #14 to 1.18

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

build.gradle

@@ -54,9 +54,7 @@ java {
 }
 
 jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
-	}
+	from "LICENSE.txt"
 }
 
 // configure the maven publication

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.18
-	yarn_mappings=1.18+build.1
-	loader_version=0.12.6
+	minecraft_version=1.18.2
+	yarn_mappings=1.18.2+build.3
+	loader_version=0.13.3
 
 # Mod Properties
-	mod_version = 1.2+1.18
+	mod_version = 1.3+1.18
 	maven_group = re.domi
 	archives_base_name = fast-chest
 
 # Dependencies
-	fabric_version=0.43.1+1.18
+	fabric_version=0.47.8+1.18.2
 	mod_menu_version=3.0.0

src/main/java/re/domi/fastchest/config/ConfigScreen.java

@@ -49,7 +49,7 @@ public void init()
     }
 
     @Override
-    public void onClose()
+    public void close()
     {
         if (this.client != null)
         {

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);
             }

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)
         {

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)
         {

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"
   },