Update Iron Chests to 1.20.2

.gitignore

@@ -17,9 +17,12 @@ out
 build
 .gradle
 
+# vscode
+.vscode
+
 # other
 eclipse
 run
 
 repo
-generated
+generated

gradle.properties

@@ -4,17 +4,17 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 ## Environment Properties
 # The Minecraft version must agree with the Forge version to get a valid artifact
-minecraft_version=1.20.1
+minecraft_version=1.20.2
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.20.1,1.21)
+minecraft_version_range=[1.20.2,1.21)
 # The Forge version must agree with the Minecraft version to get a valid artifact
-forge_version=47.0.3
+forge_version=48.1.0
 # The Forge version range can use any version of Forge as bounds or match the loader version range
-forge_version_range=[47,)
+forge_version_range=[48,)
 # The loader version range can only use the major version of Forge/FML as bounds
-loader_version_range=[47,)
+loader_version_range=[48,)
 # The mapping channel to use for mappings.
 # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
 # Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
@@ -29,10 +29,10 @@ loader_version_range=[47,)
 #
 # Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
 # Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
-mapping_channel=official
+mapping_channel=parchment
 # The mapping version to query from the mapping channel.
 # This must match the format required by the mapping channel.
-mapping_version=1.20.1
+mapping_version=2023.10.22-1.20.2
 ## Mod Properties
 # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
 # Must match the String constant located in the main mod class annotated with @Mod.
@@ -56,4 +56,4 @@ mod_issue_tracker=https://github.com/progwml6/ironchest/issues
 # The mod display URL
 mod_display_url=https://minecraft.curseforge.com/projects/iron-chests
 # Build dependencies
-jei_version=15.0.0.17
+jei_version=16.0.0.28

settings.gradle

@@ -16,11 +16,15 @@ pluginManagement {
             name = 'MinecraftForge'
             url = 'https://maven.minecraftforge.net/'
         }
+        maven {
+            name = 'ParchmentMC'
+            url = 'https://maven.parchmentmc.org'
+        }
     }
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }
 
 rootProject.name = 'ironchest'

src/main/java/com/progwml6/ironchest/client/model/inventory/IronChestItemStackRenderer.java

@@ -2,8 +2,8 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.model.geom.EntityModelSet;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;

src/main/java/com/progwml6/ironchest/client/model/inventory/ModelItem.java

@@ -1,15 +1,19 @@
 package com.progwml6.ironchest.client.model.inventory;
 
 import org.joml.Vector3f;
-import org.joml.Vector3fc;
 
 public class ModelItem {
+
   private final Vector3f center;
   private final float size;
 
-  /** Item center location in percentages, lazy loaded */
+  /**
+   * Item center location in percentages, lazy loaded
+   */
   private Vector3f centerScaled;
-  /** Item size in percentages, lazy loaded */
+  /**
+   * Item size in percentages, lazy loaded
+   */
   private Float sizeScaled;
 
   public ModelItem(Vector3f center, float size) {
@@ -19,6 +23,7 @@ public ModelItem(Vector3f center, float size) {
 
   /**
    * Gets the center for rendering this item, scaled for renderer
+   *
    * @return Scaled center
    */
   public Vector3f getCenterScaled() {
@@ -32,6 +37,7 @@ public Vector3f getCenterScaled() {
 
   /**
    * Gets the size to render this item, scaled for the renderer
+   *
    * @return Size scaled
    */
   public float getSizeScaled() {
@@ -44,6 +50,7 @@ public float getSizeScaled() {
 
   /**
    * Gets the center for rendering this item
+   *
    * @return Center
    */
   public Vector3f getCenter() {
@@ -52,6 +59,7 @@ public Vector3f getCenter() {
 
   /**
    * Gets the size to render this item
+   *
    * @return Size
    */
   public float getSize() {

src/main/java/com/progwml6/ironchest/client/render/IronChestRenderer.java

@@ -6,40 +6,39 @@
 import com.progwml6.ironchest.IronChestsClientEvents;
 import com.progwml6.ironchest.client.model.IronChestsModels;
 import com.progwml6.ironchest.client.model.inventory.ModelItem;
-import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock;
 import com.progwml6.ironchest.common.block.IronChestsTypes;
-import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity;
 import com.progwml6.ironchest.common.block.entity.ICrystalChest;
+import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock;
+import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity;
 import com.progwml6.ironchest.common.block.trapped.entity.AbstractTrappedIronChestBlockEntity;
 import it.unimi.dsi.fastutil.floats.Float2FloatFunction;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.CubeListBuilder;
 import net.minecraft.client.model.geom.builders.LayerDefinition;
 import net.minecraft.client.model.geom.builders.MeshDefinition;
 import net.minecraft.client.model.geom.builders.PartDefinition;
-import net.minecraft.client.renderer.block.model.ItemTransforms;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.Sheets;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.client.renderer.blockentity.BrightnessCombiner;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.Sheets;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.resources.model.Material;
-import net.minecraft.client.renderer.blockentity.BrightnessCombiner;
-import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
+import net.minecraft.core.Direction;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.LidBlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.DoubleBlockCombiner;
-import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.LidBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.Level;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.joml.Vector3f;

src/main/java/com/progwml6/ironchest/client/screen/IronChestScreen.java

@@ -4,11 +4,11 @@
 import com.progwml6.ironchest.common.block.IronChestsTypes;
 import com.progwml6.ironchest.common.inventory.IronChestMenu;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
@@ -33,7 +33,7 @@ public IronChestScreen(IronChestMenu container, Inventory playerInventory, Compo
 
   @Override
   public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
-    this.renderBackground(guiGraphics);
+    this.renderBackground(guiGraphics, mouseX, mouseY, partialTicks);
     super.render(guiGraphics, mouseX, mouseY, partialTicks);
     this.renderTooltip(guiGraphics, mouseX, mouseY);
   }

src/main/java/com/progwml6/ironchest/common/ai/IronChestCatSitOnBlockGoal.java

@@ -2,12 +2,12 @@
 
 import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock;
 import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.ai.goal.CatSitOnBlockGoal;
 import net.minecraft.world.entity.animal.Cat;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 
 public class IronChestCatSitOnBlockGoal extends CatSitOnBlockGoal {
 

src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java

@@ -21,9 +21,9 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.MapColor;
-import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 
 import java.util.concurrent.Callable;
 import java.util.function.Function;

src/main/java/com/progwml6/ironchest/common/block/IronChestsTypes.java

@@ -17,10 +17,10 @@
 import com.progwml6.ironchest.common.block.trapped.entity.TrappedIronChestBlockEntity;
 import com.progwml6.ironchest.common.block.trapped.entity.TrappedObsidianChestBlockEntity;
 import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.StringRepresentable;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.util.StringRepresentable;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
 
 import javax.annotation.Nullable;
@@ -99,7 +99,7 @@ public static List<Block> get(IronChestsTypes type) {
 
   @Nullable
   public AbstractIronChestBlockEntity makeEntity(BlockPos blockPos, BlockState blockState, boolean trapped) {
-    if(trapped) {
+    if (trapped) {
       return switch (this) {
         case IRON -> new TrappedIronChestBlockEntity(blockPos, blockState);
         case GOLD -> new TrappedGoldChestBlockEntity(blockPos, blockState);

src/main/java/com/progwml6/ironchest/common/block/entity/ICrystalChest.java

@@ -1,14 +1,15 @@
 package com.progwml6.ironchest.common.block.entity;
 
 import com.progwml6.ironchest.common.block.IronChestsTypes;
-import com.progwml6.ironchest.common.network.InventoryTopStacksSyncPacket;
 import com.progwml6.ironchest.common.network.IronChestNetwork;
+import com.progwml6.ironchest.common.network.PacketTopStacksSync;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.network.PacketDistributor;
 
 import javax.annotation.Nullable;
 
@@ -42,7 +43,7 @@ default void sendTopStacksPacket() {
     NonNullList<ItemStack> stacks = this.buildItemStackDataList();
 
     if (this.getChestLevel() != null && this.getChestLevel() instanceof ServerLevel && !this.getChestLevel().isClientSide) {
-      IronChestNetwork.getInstance().sendToClientsAround(new InventoryTopStacksSyncPacket(stacks, this.getChestWorldPosition()), (ServerLevel) this.getChestLevel(), this.getChestWorldPosition());
+      IronChestNetwork.INSTANCE.send(new PacketTopStacksSync(this.getChestWorldPosition(), stacks), PacketDistributor.TRACKING_CHUNK.with(this.getChestLevel().getChunkAt(this.getChestWorldPosition())));
     }
   }
 

src/main/java/com/progwml6/ironchest/common/block/entity/IronChestsBlockEntityTypes.java

@@ -16,7 +16,6 @@
 import com.progwml6.ironchest.common.block.trapped.entity.TrappedGoldChestBlockEntity;
 import com.progwml6.ironchest.common.block.trapped.entity.TrappedIronChestBlockEntity;
 import com.progwml6.ironchest.common.block.trapped.entity.TrappedObsidianChestBlockEntity;
-
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -25,6 +24,7 @@
 import net.minecraftforge.registries.RegistryObject;
 
 public class IronChestsBlockEntityTypes {
+
   public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, IronChests.MOD_ID);
 
   public static final RegistryObject<BlockEntityType<IronChestBlockEntity>> IRON_CHEST = BLOCK_ENTITIES.register(

src/main/java/com/progwml6/ironchest/common/block/regular/CopperChestBlock.java

@@ -1,8 +1,8 @@
 package com.progwml6.ironchest.common.block.regular;
 
 import com.progwml6.ironchest.common.block.IronChestsTypes;
-import com.progwml6.ironchest.common.block.regular.entity.CopperChestBlockEntity;
 import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes;
+import com.progwml6.ironchest.common.block.regular.entity.CopperChestBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/com/progwml6/ironchest/common/block/regular/CrystalChestBlock.java

@@ -1,9 +1,9 @@
 package com.progwml6.ironchest.common.block.regular;
 
 import com.progwml6.ironchest.common.block.IronChestsTypes;
+import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes;
 import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity;
 import com.progwml6.ironchest.common.block.regular.entity.CrystalChestBlockEntity;
-import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;

src/main/java/com/progwml6/ironchest/common/block/regular/DiamondChestBlock.java

@@ -1,8 +1,8 @@
 package com.progwml6.ironchest.common.block.regular;
 
 import com.progwml6.ironchest.common.block.IronChestsTypes;
-import com.progwml6.ironchest.common.block.regular.entity.DiamondChestBlockEntity;
 import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes;
+import com.progwml6.ironchest.common.block.regular.entity.DiamondChestBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/com/progwml6/ironchest/common/block/regular/DirtChestBlock.java

@@ -1,8 +1,8 @@
 package com.progwml6.ironchest.common.block.regular;
 
 import com.progwml6.ironchest.common.block.IronChestsTypes;
-import com.progwml6.ironchest.common.block.regular.entity.DirtChestBlockEntity;
 import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes;
+import com.progwml6.ironchest.common.block.regular.entity.DirtChestBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/com/progwml6/ironchest/common/block/regular/GoldChestBlock.java

@@ -1,8 +1,8 @@
 package com.progwml6.ironchest.common.block.regular;
 
 import com.progwml6.ironchest.common.block.IronChestsTypes;
-import com.progwml6.ironchest.common.block.regular.entity.GoldChestBlockEntity;
 import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes;
+import com.progwml6.ironchest.common.block.regular.entity.GoldChestBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/com/progwml6/ironchest/common/block/regular/IronChestBlock.java

@@ -1,8 +1,8 @@
 package com.progwml6.ironchest.common.block.regular;
 
 import com.progwml6.ironchest.common.block.IronChestsTypes;
-import com.progwml6.ironchest.common.block.regular.entity.IronChestBlockEntity;
 import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes;
+import com.progwml6.ironchest.common.block.regular.entity.IronChestBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/com/progwml6/ironchest/common/block/regular/entity/AbstractIronChestBlockEntity.java

@@ -1,8 +1,8 @@
 package com.progwml6.ironchest.common.block.regular.entity;
 
 import com.progwml6.ironchest.IronChests;
-import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock;
 import com.progwml6.ironchest.common.block.IronChestsTypes;
+import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock;
 import com.progwml6.ironchest.common.inventory.IronChestMenu;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;

src/main/java/com/progwml6/ironchest/common/block/trapped/AbstractTrappedIronChestBlock.java

@@ -1,7 +1,7 @@
 package com.progwml6.ironchest.common.block.trapped;
 
-import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock;
 import com.progwml6.ironchest.common.block.IronChestsTypes;
+import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock;
 import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity;
 import com.progwml6.ironchest.common.block.trapped.entity.AbstractTrappedIronChestBlockEntity;
 import net.minecraft.core.BlockPos;