From 38504d2762f3a8168dbcaf46fe673460c7c792cb Mon Sep 17 00:00:00 2001 From: Alexander Behrhof Date: Tue, 30 Nov 2021 22:37:09 -0500 Subject: [PATCH] Update IronChests to 1.18 --- build.gradle | 6 +++--- gradle.properties | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../ironchest/client/model/IronChestsModels.java | 2 +- .../ironchest/common/block/IronChestsBlocks.java | 2 +- .../block/entity/IronChestsBlockEntityTypes.java | 2 +- .../block/regular/AbstractIronChestBlock.java | 2 +- .../entity/AbstractIronChestBlockEntity.java | 6 ++---- .../common/block/regular/entity/package-info.java | 7 +++++++ .../common/inventory/IronChestsContainerTypes.java | 2 +- .../ironchest/common/item/IronChestsItems.java | 2 +- .../network/InventoryTopStacksSyncPacket.java | 2 +- .../ironchest/common/network/IronChestNetwork.java | 10 +++++----- .../common/network/helper/ISimplePacket.java | 2 +- .../common/network/helper/IThreadsafePacket.java | 2 +- src/main/resources/pack.mcmeta | 2 +- 16 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 src/main/java/com/progwml6/ironchest/common/block/regular/entity/package-info.java diff --git a/build.gradle b/build.gradle index a0c7065..71e111a 100755 --- a/build.gradle +++ b/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. -java.toolchain.languageVersion = JavaLanguageVersion.of(16) +// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +java.toolchain.languageVersion = JavaLanguageVersion.of(17) minecraft { mappings channel: 'official', version: mappings_version diff --git a/gradle.properties b/gradle.properties index d930762..4084ef8 100644 --- a/gradle.properties +++ b/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_range=[1.17.1,1.18) +minecraft_version=1.18 +minecraft_range=[1.18,1.19) # Forge Version Information -loader_range=[33.0,) -forge_version=37.0.126 -forge_range=[37.0.126,) +loader_range=[38,) +forge_version=38.0.4 +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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..e750102 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java b/src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java index f4d9482..f5ded0c 100644 --- a/src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java +++ b/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; } diff --git a/src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java b/src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java index ea79430..38c249f 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java +++ b/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; diff --git a/src/main/java/com/progwml6/ironchest/common/block/entity/IronChestsBlockEntityTypes.java b/src/main/java/com/progwml6/ironchest/common/block/entity/IronChestsBlockEntityTypes.java index 7ddecfa..d189535 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/entity/IronChestsBlockEntityTypes.java +++ b/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> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, IronChests.MOD_ID); diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/AbstractIronChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/regular/AbstractIronChestBlock.java index 16fd060..61f6b10 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/AbstractIronChestBlock.java +++ b/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); diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/AbstractIronChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/regular/entity/AbstractIronChestBlockEntity.java index 8ceb9d6..0856aae 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/AbstractIronChestBlockEntity.java +++ b/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) { - super.save(compoundTag); + public void saveAdditional(CompoundTag 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) { diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/package-info.java b/src/main/java/com/progwml6/ironchest/common/block/regular/entity/package-info.java new file mode 100644 index 0000000..67249c2 --- /dev/null +++ b/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; diff --git a/src/main/java/com/progwml6/ironchest/common/inventory/IronChestsContainerTypes.java b/src/main/java/com/progwml6/ironchest/common/inventory/IronChestsContainerTypes.java index 57721f1..02185c1 100644 --- a/src/main/java/com/progwml6/ironchest/common/inventory/IronChestsContainerTypes.java +++ b/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; diff --git a/src/main/java/com/progwml6/ironchest/common/item/IronChestsItems.java b/src/main/java/com/progwml6/ironchest/common/item/IronChestsItems.java index 5bd40f1..5a5a5c8 100644 --- a/src/main/java/com/progwml6/ironchest/common/item/IronChestsItems.java +++ b/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; diff --git a/src/main/java/com/progwml6/ironchest/common/network/InventoryTopStacksSyncPacket.java b/src/main/java/com/progwml6/ironchest/common/network/InventoryTopStacksSyncPacket.java index ce6741a..71d1a8f 100644 --- a/src/main/java/com/progwml6/ironchest/common/network/InventoryTopStacksSyncPacket.java +++ b/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 { diff --git a/src/main/java/com/progwml6/ironchest/common/network/IronChestNetwork.java b/src/main/java/com/progwml6/ironchest/common/network/IronChestNetwork.java index 207002f..135653b 100644 --- a/src/main/java/com/progwml6/ironchest/common/network/IronChestNetwork.java +++ b/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.fmllegacy.network.NetworkEvent; -import net.minecraftforge.fmllegacy.network.NetworkRegistry; -import net.minecraftforge.fmllegacy.network.PacketDistributor; -import net.minecraftforge.fmllegacy.network.simple.SimpleChannel; +import net.minecraftforge.network.NetworkDirection; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.NetworkRegistry; +import net.minecraftforge.network.PacketDistributor; +import net.minecraftforge.network.simple.SimpleChannel; import javax.annotation.Nullable; import java.util.Optional; diff --git a/src/main/java/com/progwml6/ironchest/common/network/helper/ISimplePacket.java b/src/main/java/com/progwml6/ironchest/common/network/helper/ISimplePacket.java index a2411d3..300d1df 100644 --- a/src/main/java/com/progwml6/ironchest/common/network/helper/ISimplePacket.java +++ b/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; diff --git a/src/main/java/com/progwml6/ironchest/common/network/helper/IThreadsafePacket.java b/src/main/java/com/progwml6/ironchest/common/network/helper/IThreadsafePacket.java index fa7ad06..12063f0 100644 --- a/src/main/java/com/progwml6/ironchest/common/network/helper/IThreadsafePacket.java +++ b/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; diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 6cbad81..9f9b54c 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Iron Chests Resources", - "pack_format": 7 + "pack_format": 8 } }