Update IronChests to 1.18

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.24', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
     }
 }
 
@@ -23,8 +23,8 @@ repositories {
 
 group = "com.progwml6.ironchest"
 
-// Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16.
+// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
     mappings channel: 'official', version: mappings_version

gradle.properties

@@ -4,19 +4,19 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Mod Version Information
-mod_version=12.0
+mod_version=13.0
 
 # Minecraft Version Information
-minecraft_version=1.17.1
+minecraft_version=1.18
-minecraft_range=[1.17.1,1.18)
+minecraft_range=[1.18,1.19)
 
 # Forge Version Information
-loader_range=[33.0,)
+loader_range=[38,)
-forge_version=37.0.126
+forge_version=38.0.4
-forge_range=[37.0.126,)
+forge_range=[38.0.4,)
 
 # Mappings Information
-mappings_version=1.17.1
+mappings_version=1.18
 
 # Build dependencies
 jei_version=1.16.4:7.6.1.65

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java

@@ -57,7 +57,7 @@ public class IronChestsModels {
 
   @SubscribeEvent
   public static void onStitch(TextureStitchEvent.Pre event) {
-    if (!event.getMap().location().equals(Sheets.CHEST_SHEET)) {
+    if (!event.getAtlas().location().equals(Sheets.CHEST_SHEET)) {
       return;
     }
 

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

@@ -21,7 +21,7 @@ import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.Material;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

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

@@ -18,9 +18,9 @@ import com.progwml6.ironchest.common.block.trapped.entity.TrappedIronChestBlockE
 import com.progwml6.ironchest.common.block.trapped.entity.TrappedObsidianChestBlockEntity;
 
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraftforge.fmllegacy.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 
 public class IronChestsBlockEntityTypes {
   public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, IronChests.MOD_ID);

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

@@ -126,7 +126,7 @@ public abstract class AbstractIronChestBlock extends BaseEntityBlock implements
   @Deprecated
   public BlockState updateShape(BlockState blockState, Direction direction, BlockState facingState, LevelAccessor levelAccessor, BlockPos currentPos, BlockPos facingPos) {
     if (blockState.getValue(WATERLOGGED)) {
-      levelAccessor.getLiquidTicks().scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickDelay(levelAccessor));
+      levelAccessor.scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickDelay(levelAccessor));
     }
 
     return super.updateShape(blockState, direction, facingState, levelAccessor, currentPos, facingPos);

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

@@ -95,14 +95,12 @@ public abstract class AbstractIronChestBlockEntity extends RandomizableContainer
   }
 
   @Override
-  public CompoundTag save(CompoundTag compoundTag) {
+  public void saveAdditional(CompoundTag compoundTag) {
-    super.save(compoundTag);
+    super.saveAdditional(compoundTag);
 
     if (!this.trySaveLootTable(compoundTag)) {
       ContainerHelper.saveAllItems(compoundTag, this.items);
     }
-
-    return compoundTag;
   }
 
   public static void lidAnimateTick(Level level, BlockPos blockPos, BlockState blockState, AbstractIronChestBlockEntity chestBlockEntity) {

src/main/java/com/progwml6/ironchest/common/block/regular/entity/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.progwml6.ironchest.common.block.regular.entity;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/progwml6/ironchest/common/inventory/IronChestsContainerTypes.java

@@ -2,7 +2,7 @@ package com.progwml6.ironchest.common.inventory;
 
 import com.progwml6.ironchest.IronChests;
 import net.minecraft.world.inventory.MenuType;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

src/main/java/com/progwml6/ironchest/common/item/IronChestsItems.java

@@ -3,7 +3,7 @@ package com.progwml6.ironchest.common.item;
 import com.google.common.collect.ImmutableMap;
 import com.progwml6.ironchest.IronChests;
 import net.minecraft.world.item.Item;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

src/main/java/com/progwml6/ironchest/common/network/InventoryTopStacksSyncPacket.java

@@ -9,7 +9,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.core.NonNullList;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 public class InventoryTopStacksSyncPacket implements IThreadsafePacket {
 

src/main/java/com/progwml6/ironchest/common/network/IronChestNetwork.java

@@ -13,11 +13,11 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.fmllegacy.network.NetworkDirection;
+import net.minecraftforge.network.NetworkDirection;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
-import net.minecraftforge.fmllegacy.network.NetworkRegistry;
+import net.minecraftforge.network.NetworkRegistry;
-import net.minecraftforge.fmllegacy.network.PacketDistributor;
+import net.minecraftforge.network.PacketDistributor;
-import net.minecraftforge.fmllegacy.network.simple.SimpleChannel;
+import net.minecraftforge.network.simple.SimpleChannel;
 
 import javax.annotation.Nullable;
 import java.util.Optional;

src/main/java/com/progwml6/ironchest/common/network/helper/ISimplePacket.java

@@ -1,7 +1,7 @@
 package com.progwml6.ironchest.common.network.helper;
 
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import java.util.function.Supplier;
 

src/main/java/com/progwml6/ironchest/common/network/helper/IThreadsafePacket.java

@@ -1,6 +1,6 @@
 package com.progwml6.ironchest.common.network.helper;
 
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import java.util.function.Supplier;
 

src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "Iron Chests Resources",
-        "pack_format": 7
+        "pack_format": 8
     }
 }