From 416c4e11c534a46c9e9bb186f2410dd84b1751c8 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sun, 11 Jun 2017 13:20:07 -0400 Subject: [PATCH] Update Iron Chest's to 1.12! --- build.gradle | 6 +-- .../chest/TileEntityIronChestRenderer.java | 5 ++- .../TileEntityIronShulkerBoxRenderer.java | 5 ++- .../cpw/mods/ironchest/common/ICContent.java | 42 ++++++++++++++++--- .../common/blocks/chest/BlockIronChest.java | 5 +-- .../common/blocks/chest/IronChestType.java | 6 +-- .../blocks/shulker/BlockIronShulkerBox.java | 13 ++++-- .../blocks/shulker/IronShulkerBoxType.java | 6 +-- .../crafting/IronShulkerBoxColoring.java | 21 ++++++---- .../ironchest/common/util/ItemTooltip.java | 9 ++-- 10 files changed, 78 insertions(+), 40 deletions(-) diff --git a/build.gradle b/build.gradle index bbc6963..bcd6850 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.11.2:4.3.5.277" + deobfCompile "mezz.jei:jei_1.12:4.6.0.+" } // This is our group. I'm cpw.mods @@ -43,8 +43,8 @@ archivesBaseName = "ironchest" // Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here minecraft { - version = "1.11.2-13.20.0.2299" - mappings = "snapshot_20170519" + version = "1.12-14.21.0.2321" + mappings = "snapshot_20161220" runDir = "run" } diff --git a/src/main/java/cpw/mods/ironchest/client/renderer/chest/TileEntityIronChestRenderer.java b/src/main/java/cpw/mods/ironchest/client/renderer/chest/TileEntityIronChestRenderer.java index 45c5ab4..ef41316 100755 --- a/src/main/java/cpw/mods/ironchest/client/renderer/chest/TileEntityIronChestRenderer.java +++ b/src/main/java/cpw/mods/ironchest/client/renderer/chest/TileEntityIronChestRenderer.java @@ -51,7 +51,7 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer SHULKER_BLOCKS = Lists.newArrayList(); + public static final List SHULKER_ITEM_BLOCKS = Lists.newArrayList(); public static final List VANILLA_SHULKER_BLOCKS = Lists.newArrayList(); + public static final List VANILLA_SHULKER_COLORS = Lists.newArrayList(); public static void preInit() @@ -132,8 +161,9 @@ public class ICContent BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(block, new BehaviorDispenseIronShulkerBox()); } - GameRegistry.addRecipe(new IronShulkerBoxColoring()); - RecipeSorter.register(IronChest.MOD_ID, IronShulkerBoxColoring.class, Category.SHAPELESS, "after:forge:shapelessore"); + // CraftingManager.func_193372_a(new ResourceLocation("ironchests", "ironshulkerboxcoloring"), new IronShulkerBoxColoring()); // TEMP FIX FOR COLORING OF SHULKER BOXES. + // GameRegistry.addRecipe(new ResourceLocation("ironchests", "ironshulkerboxcoloring"), new IronShulkerBoxColoring()); // TODO RE-ADD WHEN FIXED. + // RecipeSorter.register(IronChest.MOD_ID, IronShulkerBoxColoring.class, Category.SHAPELESS, "after:forge:shapelessore"); // TODO: REMOVE WHEN FORGE REMOVES ShulkerBoxChangerType.generateRecipes(); // Shulkers End diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/chest/BlockIronChest.java b/src/main/java/cpw/mods/ironchest/common/blocks/chest/BlockIronChest.java index 7dafdba..3dbffca 100755 --- a/src/main/java/cpw/mods/ironchest/common/blocks/chest/BlockIronChest.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/chest/BlockIronChest.java @@ -26,7 +26,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -137,13 +136,13 @@ public class BlockIronChest extends Block @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (IronChestType type : IronChestType.VALUES) { if (type.isValidForCreativeMode()) { - list.add(new ItemStack(itemIn, 1, type.ordinal())); + list.add(new ItemStack(this, 1, type.ordinal())); } } } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/chest/IronChestType.java b/src/main/java/cpw/mods/ironchest/common/blocks/chest/IronChestType.java index 78de92b..dd27a0d 100755 --- a/src/main/java/cpw/mods/ironchest/common/blocks/chest/IronChestType.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/chest/IronChestType.java @@ -31,8 +31,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagByte; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapedOreRecipe; public enum IronChestType implements IStringSerializable { @@ -184,9 +182,9 @@ public enum IronChestType implements IStringSerializable public static void addRecipe(ItemStack is, Object... parts) { - ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts); + //ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts); // TODO RE-ADD WHEN FIXED. - GameRegistry.addRecipe(oreRecipe); + //GameRegistry.addRecipe(oreRecipe); // TODO RE-ADD WHEN FIXED. } public int getRowCount() diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java b/src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java index 521c341..f2ac929 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java @@ -12,6 +12,8 @@ package cpw.mods.ironchest.common.blocks.shulker; import java.util.List; +import javax.annotation.Nullable; + import cpw.mods.ironchest.IronChest; import cpw.mods.ironchest.common.ICContent; import cpw.mods.ironchest.common.tileentity.shulker.TileEntityIronShulkerBox; @@ -21,6 +23,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -52,7 +55,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockIronShulkerBox extends Block { public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", IronShulkerBoxType.class); + private final EnumDyeColor color; + private EnumFacing facingDirection; public BlockIronShulkerBox(EnumDyeColor colorIn) @@ -169,13 +174,13 @@ public class BlockIronShulkerBox extends Block @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (IronShulkerBoxType type : IronShulkerBoxType.VALUES) { if (type.isValidForCreativeMode()) { - list.add(new ItemStack(itemIn, 1, type.ordinal())); + list.add(new ItemStack(this, 1, type.ordinal())); } } } @@ -333,9 +338,9 @@ public class BlockIronShulkerBox extends Block @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, @Nullable World playerIn, List tooltip, ITooltipFlag advanced) { - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, playerIn, tooltip, advanced); NBTTagCompound nbttagcompound = stack.getTagCompound(); diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/shulker/IronShulkerBoxType.java b/src/main/java/cpw/mods/ironchest/common/blocks/shulker/IronShulkerBoxType.java index fbaf4f8..1f4d371 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/shulker/IronShulkerBoxType.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/shulker/IronShulkerBoxType.java @@ -29,8 +29,6 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapedOreRecipe; public enum IronShulkerBoxType implements IStringSerializable { @@ -178,9 +176,9 @@ public enum IronShulkerBoxType implements IStringSerializable public static void addRecipe(ItemStack is, Object... parts) { - ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts); + //ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts); // TODO RE-ADD WHEN FIXED. - GameRegistry.addRecipe(oreRecipe); + //GameRegistry.addRecipe(oreRecipe); // TODO RE-ADD WHEN FIXED. } public int getRowCount() diff --git a/src/main/java/cpw/mods/ironchest/common/crafting/IronShulkerBoxColoring.java b/src/main/java/cpw/mods/ironchest/common/crafting/IronShulkerBoxColoring.java index 6abb3c0..95527ef 100644 --- a/src/main/java/cpw/mods/ironchest/common/crafting/IronShulkerBoxColoring.java +++ b/src/main/java/cpw/mods/ironchest/common/crafting/IronShulkerBoxColoring.java @@ -101,15 +101,6 @@ public class IronShulkerBoxColoring implements IRecipe return itemstack3; } - /** - * Returns the size of the recipe area - */ - @Override - public int getRecipeSize() - { - return 10; - } - @Override public ItemStack getRecipeOutput() { @@ -133,4 +124,16 @@ public class IronShulkerBoxColoring implements IRecipe return nonnulllist; } + + @Override + public boolean func_192399_d() + { + return true; + } + + @Override + public boolean func_194133_a(int p_194133_1_, int p_194133_2_) + { + return p_194133_1_ * p_194133_2_ >= 2; + } } diff --git a/src/main/java/cpw/mods/ironchest/common/util/ItemTooltip.java b/src/main/java/cpw/mods/ironchest/common/util/ItemTooltip.java index bd47c70..cff46e5 100644 --- a/src/main/java/cpw/mods/ironchest/common/util/ItemTooltip.java +++ b/src/main/java/cpw/mods/ironchest/common/util/ItemTooltip.java @@ -12,13 +12,16 @@ package cpw.mods.ironchest.common.util; import java.util.List; +import javax.annotation.Nullable; + import com.google.common.collect.Lists; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -27,7 +30,7 @@ public class ItemTooltip extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, @Nullable World playerIn, List tooltip, ITooltipFlag advanced) { addOptionalTooltip(stack, tooltip); @@ -68,4 +71,4 @@ public class ItemTooltip extends Item return list; } -} \ No newline at end of file +}