From 94aa1671d559050d8ce38e23f31b4a7cbf52afd2 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Thu, 19 May 2016 18:01:50 -0400 Subject: [PATCH] Fix some bugs from the PR. --- build.gradle | 12 ++++++++++-- .../java/cpw/mods/ironchest/ChestChangerType.java | 2 +- src/main/java/cpw/mods/ironchest/IronChest.java | 1 - src/main/java/cpw/mods/ironchest/IronChestType.java | 7 +++++++ .../java/cpw/mods/ironchest/ItemChestChanger.java | 2 +- .../java/cpw/mods/ironchest/client/ClientProxy.java | 5 ++++- .../assets/ironchest/blockstates/BlockIronChest.json | 6 ++++++ 7 files changed, 29 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 3decca0..93b00c7 100755 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,14 @@ repositories { name "fileRepo" dirs "repo" } + maven { + name 'DVS1 Maven FS' + url 'http://dvs1.progwml6.com/files/maven' + } +} + +dependencies { + deobfCompile "mezz.jei:jei_1.9:3.3.3.200" } // This is our group. I'm cpw.mods @@ -35,8 +43,8 @@ archivesBaseName = "ironchest" // Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here minecraft { - version = "1.9-12.16.0.1865-1.9" - mappings = "snapshot_20160419" + version = "1.9-12.16.1.1907" + mappings = "snapshot_20160516" runDir = "run" } diff --git a/src/main/java/cpw/mods/ironchest/ChestChangerType.java b/src/main/java/cpw/mods/ironchest/ChestChangerType.java index 7990020..07b91c5 100755 --- a/src/main/java/cpw/mods/ironchest/ChestChangerType.java +++ b/src/main/java/cpw/mods/ironchest/ChestChangerType.java @@ -53,7 +53,7 @@ public enum ChestChangerType { return from == this.source; } - + public ItemChestChanger buildItem() { this.item = new ItemChestChanger(this); diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index e672265..aba8a05 100755 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -54,7 +54,6 @@ public class IronChest ChestChangerType.buildItems(); ironChestBlock = GameRegistry.register(new BlockIronChest()); ironChestItemBlock = GameRegistry.register(new ItemIronChest(ironChestBlock)); - GameRegistry.register(ironChestItemBlock); for (IronChestType typ : IronChestType.VALUES) { diff --git a/src/main/java/cpw/mods/ironchest/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java index 1b507ec..131af19 100755 --- a/src/main/java/cpw/mods/ironchest/IronChestType.java +++ b/src/main/java/cpw/mods/ironchest/IronChestType.java @@ -73,10 +73,17 @@ public enum IronChestType implements IStringSerializable case DIRTCHEST9000: { this.breakTexture = "minecraft:blocks/dirt"; + break; } case OBSIDIAN: { this.breakTexture = "minecraft:blocks/obsidian"; + break; + } + case WOOD: + { + this.breakTexture = "minecraft:blocks/planks_oak"; + break; } default: { diff --git a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java index 8f79c8f..dce7155 100755 --- a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java +++ b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java @@ -108,7 +108,7 @@ public class ItemChestChanger extends Item worldIn.removeTileEntity(pos); worldIn.setBlockToAir(pos); - IBlockState iblockstate = IronChest.ironChestBlock.getDefaultState().withProperty(BlockIronChest.VARIANT_PROP, type.target); + IBlockState iblockstate = IronChest.ironChestBlock.getDefaultState().withProperty(BlockIronChest.VARIANT_PROP, this.type.target); worldIn.setTileEntity(pos, newchest); worldIn.setBlockState(pos, iblockstate, 3); diff --git a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java b/src/main/java/cpw/mods/ironchest/client/ClientProxy.java index 9d56e9b..9637c34 100755 --- a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java +++ b/src/main/java/cpw/mods/ironchest/client/ClientProxy.java @@ -24,7 +24,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,7 +39,9 @@ public class ClientProxy extends CommonProxy { if (type != IronChestType.WOOD) { + //@formatter:off ModelLoader.setCustomModelResourceLocation(chestItem, type.ordinal(), new ModelResourceLocation(chestItem.getRegistryName(), "variant=" + type.getName())); + //@formatter:on } ClientRegistry.bindTileEntitySpecialRenderer(type.clazz, new TileEntityIronChestRenderer()); @@ -48,7 +49,9 @@ public class ClientProxy extends CommonProxy for (ChestChangerType type : ChestChangerType.VALUES) { + //@formatter:off ModelLoader.setCustomModelResourceLocation(type.item, 0, new ModelResourceLocation(new ResourceLocation(IronChest.MOD_ID, "ItemChestUpgrade"), "variant=" + type.itemName.toLowerCase())); + //@formatter:on } } diff --git a/src/main/resources/assets/ironchest/blockstates/BlockIronChest.json b/src/main/resources/assets/ironchest/blockstates/BlockIronChest.json index f006699..96ad514 100644 --- a/src/main/resources/assets/ironchest/blockstates/BlockIronChest.json +++ b/src/main/resources/assets/ironchest/blockstates/BlockIronChest.json @@ -53,6 +53,12 @@ "particle": "minecraft:blocks/dirt", "texture": "ironchest:model/dirtchest" } + }, + "wood": { + "textures": { + "particle": "minecraft:blocks/planks_oak", + "texture": "minecraft:blocks/planks_oak" + } } } }