Ubujira
/
ironbarrels
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update IronChests to 1.18

This commit is contained in:
Alexander Behrhof 2021-11-30 22:37:09 -05:00
parent 9efc6adb89
commit 38504d2762
16 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -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

14
gradle.properties
View File

@ -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

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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

2
src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java
View File

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

2
src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java
View File

@ -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;

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

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

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

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

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

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

7
src/main/java/com/progwml6/ironchest/common/block/regular/entity/package-info.java Normal file
View File

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

2
src/main/java/com/progwml6/ironchest/common/inventory/IronChestsContainerTypes.java
View File

@ -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;

2
src/main/java/com/progwml6/ironchest/common/item/IronChestsItems.java
View File

@ -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;

2
src/main/java/com/progwml6/ironchest/common/network/InventoryTopStacksSyncPacket.java
View File

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

10
src/main/java/com/progwml6/ironchest/common/network/IronChestNetwork.java
View File

@ -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;

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

@ -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;

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

@ -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;

2
src/main/resources/pack.mcmeta
View File

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