From 642cf07c5d215b2383ef701a94eb5f824ccc338b Mon Sep 17 00:00:00 2001 From: alexbegt Date: Wed, 6 Feb 2019 17:20:04 -0500 Subject: [PATCH] Update IronChests to the latest Forge Version, and fix some code issues. --- build.gradle | 21 ++++++++++--------- gradle.properties | 2 +- .../renderer/TileEntityIronChestRenderer.java | 2 +- .../ironchest/common/blocks/BlockChest.java | 2 +- .../common/blocks/BlockCopperChest.java | 6 ------ .../common/blocks/BlockCrystalChest.java | 6 ------ .../common/blocks/BlockDiamondChest.java | 6 ------ .../common/blocks/BlockDirtChest.java | 6 ------ .../common/blocks/BlockGoldChest.java | 6 ------ .../common/blocks/BlockIronChest.java | 7 ------- .../common/blocks/BlockObsidianChest.java | 6 ------ .../common/blocks/BlockSilverChest.java | 6 ------ .../packets/PacketTopStackSyncChest.java | 2 ++ .../tileentity/IronChestEntityType.java | 2 ++ .../tileentity/TileEntityIronChest.java | 3 +-- 15 files changed, 19 insertions(+), 64 deletions(-) diff --git a/build.gradle b/build.gradle index 3956ee4..3558501 100755 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,6 @@ buildscript { jcenter() mavenCentral() } - // This is only here while i'm activly developing FG, Remind me to remove when we publically release - configurations { - classpath.resolutionStrategy { - cacheDynamicVersionsFor 10, 'seconds' - cacheChangingModulesFor 0, 'seconds' - } - } dependencies { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true } @@ -40,14 +33,22 @@ archivesBaseName = "ironchest" minecraft { mappings channel: 'snapshot', version: mappings_version - + runs { client = { - workingDirectory = project.file("run").canonicalPath + // recommended logging data for a userdev environment + properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP' + // recommended logging level for the console + properties 'forge.logging.console.level': 'debug' + workingDirectory project.file('run').canonicalPath source sourceSets.main } server = { - workingDirectory = project.file("run").canonicalPath + // recommended logging data for a userdev environment + properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP' + // recommended logging level for the console + properties 'forge.logging.console.level': 'debug' + workingDirectory project.file('run').canonicalPath source sourceSets.main } } diff --git a/gradle.properties b/gradle.properties index 16d240b..02ee8eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ minecraft_version=1.13 minecraft_version_toml=13 # Forge Version Information -forge_version=24.0.96-1.13-pre +forge_version=24.0.156-1.13-pre forge_version_toml=24 forge_group=net.minecraftforge.test diff --git a/src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestRenderer.java b/src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestRenderer.java index fa806af..4d00ae2 100644 --- a/src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestRenderer.java +++ b/src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestRenderer.java @@ -69,7 +69,7 @@ public class TileEntityIronChestRenderer exten IBlockState iBlockState = tileEntity.hasWorld() ? tileEntity.getBlockState() : - (IBlockState) tileEntity.getBlockToUse().getDefaultState().with(BlockChest.FACING, EnumFacing.SOUTH); + (IBlockState) tileEntity.getBlockToUse().getDefaultState().with(BlockChest.FACING, EnumFacing.NORTH); IronChestType chestType = IronChestType.IRON; IronChestType typeNew = BlockChest.getTypeFromBlock(iBlockState.getBlock()); diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/BlockChest.java index 6c26ee6..eb6908a 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/BlockChest.java @@ -47,7 +47,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nullable; -public abstract class BlockChest extends Block implements ITileEntityProvider +public abstract class BlockChest extends Block { public static final DirectionProperty FACING = BlockHorizontal.HORIZONTAL_FACING; diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockCopperChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/BlockCopperChest.java index d09369a..eb2c362 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockCopperChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/BlockCopperChest.java @@ -27,10 +27,4 @@ public class BlockCopperChest extends BlockChest { return new TileEntityCopperChest(); } - - @Override - public TileEntity createNewTileEntity(IBlockReader worldIn) - { - return new TileEntityCopperChest(); - } } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockCrystalChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/BlockCrystalChest.java index 0e5e32d..b28db9e 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockCrystalChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/BlockCrystalChest.java @@ -27,10 +27,4 @@ public class BlockCrystalChest extends BlockChest { return new TileEntityCrystalChest(); } - - @Override - public TileEntity createNewTileEntity(IBlockReader worldIn) - { - return new TileEntityCrystalChest(); - } } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockDiamondChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/BlockDiamondChest.java index ef20e20..d42499a 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockDiamondChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/BlockDiamondChest.java @@ -28,10 +28,4 @@ public class BlockDiamondChest extends BlockChest return new TileEntityDiamondChest(); } - @Override - public TileEntity createNewTileEntity(IBlockReader worldIn) - { - return new TileEntityDiamondChest(); - } - } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockDirtChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/BlockDirtChest.java index 73e558b..233444b 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockDirtChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/BlockDirtChest.java @@ -42,10 +42,4 @@ public class BlockDirtChest extends BlockChest { return new TileEntityDirtChest(); } - - @Override - public TileEntity createNewTileEntity(IBlockReader worldIn) - { - return new TileEntityDirtChest(); - } } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockGoldChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/BlockGoldChest.java index f93364b..10cc943 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockGoldChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/BlockGoldChest.java @@ -28,10 +28,4 @@ public class BlockGoldChest extends BlockChest return new TileEntityGoldChest(); } - @Override - public TileEntity createNewTileEntity(IBlockReader worldIn) - { - return new TileEntityGoldChest(); - } - } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockIronChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/BlockIronChest.java index 60ecc16..4e5d1b5 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockIronChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/BlockIronChest.java @@ -27,11 +27,4 @@ public class BlockIronChest extends BlockChest { return new TileEntityIronChest(); } - - @Override - public TileEntity createNewTileEntity(IBlockReader worldIn) - { - return new TileEntityIronChest(); - } - } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockObsidianChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/BlockObsidianChest.java index 703e6b2..c2af242 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockObsidianChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/BlockObsidianChest.java @@ -27,10 +27,4 @@ public class BlockObsidianChest extends BlockChest { return new TileEntityObsidianChest(); } - - @Override - public TileEntity createNewTileEntity(IBlockReader worldIn) - { - return new TileEntityObsidianChest(); - } } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockSilverChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/BlockSilverChest.java index 779352a..1fd8041 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockSilverChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/BlockSilverChest.java @@ -27,10 +27,4 @@ public class BlockSilverChest extends BlockChest { return new TileEntitySilverChest(); } - - @Override - public TileEntity createNewTileEntity(IBlockReader worldIn) - { - return new TileEntitySilverChest(); - } } diff --git a/src/main/java/cpw/mods/ironchest/common/network/packets/PacketTopStackSyncChest.java b/src/main/java/cpw/mods/ironchest/common/network/packets/PacketTopStackSyncChest.java index 0946040..0240348 100644 --- a/src/main/java/cpw/mods/ironchest/common/network/packets/PacketTopStackSyncChest.java +++ b/src/main/java/cpw/mods/ironchest/common/network/packets/PacketTopStackSyncChest.java @@ -86,6 +86,8 @@ public class PacketTopStackSyncChest } } }); + + ctx.get().setPacketHandled(true); } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java b/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java index e715eea..89e30da 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java +++ b/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java @@ -14,12 +14,14 @@ import com.mojang.datafixers.DataFixUtils; import com.mojang.datafixers.types.Type; import cpw.mods.ironchest.IronChest; import cpw.mods.ironchest.common.util.TileEntityNames; +import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SharedConstants; import net.minecraft.util.datafix.DataFixesManager; import net.minecraft.util.datafix.TypeReferences; +import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityIronChest.java b/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityIronChest.java index 4fd8fc7..14017fb 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityIronChest.java +++ b/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityIronChest.java @@ -11,7 +11,6 @@ package cpw.mods.ironchest.common.tileentity; import cpw.mods.ironchest.common.blocks.BlockChest; -import cpw.mods.ironchest.common.blocks.BlockIronChest; import cpw.mods.ironchest.common.blocks.IronChestType; import cpw.mods.ironchest.common.core.IronChestBlocks; import cpw.mods.ironchest.common.gui.ContainerIronChest; @@ -291,7 +290,7 @@ public class TileEntityIronChest extends TileEntityLockableLoot implements IChes { Block block = this.getBlockState().getBlock(); - if (block instanceof BlockIronChest) + if (block instanceof BlockChest) { this.world.addBlockEvent(this.pos, block, 1, this.numPlayersUsing); this.world.notifyNeighborsOfStateChange(this.pos, block);