From 2cb880c6ca93bb60910c8fae90730d248acb59c3 Mon Sep 17 00:00:00 2001 From: Michael Zanga Date: Wed, 11 Jan 2017 14:19:21 -0500 Subject: [PATCH 1/3] Item registration updated. Tweaks to ModelManager. --- .../com/zixiken/dimdoors/ModelManager.java | 14 ++++++-------- .../zixiken/dimdoors/items/ItemDimDoor.java | 1 + .../dimdoors/items/ItemDimDoorGold.java | 1 + .../dimdoors/items/ItemDimDoorPersonal.java | 1 + .../dimdoors/items/ItemDimDoorUnstable.java | 1 + .../dimdoors/items/ItemDimDoorWarp.java | 1 + .../zixiken/dimdoors/items/ItemDoorGold.java | 1 + .../zixiken/dimdoors/items/ItemDoorQuartz.java | 1 + .../dimdoors/items/ItemStableFabric.java | 1 + .../dimdoors/items/ItemWorldThread.java | 1 + .../com/zixiken/dimdoors/items/ModItems.java | 18 +++++++++--------- 11 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zixiken/dimdoors/ModelManager.java b/src/main/java/com/zixiken/dimdoors/ModelManager.java index b7b939f8..eac4881c 100644 --- a/src/main/java/com/zixiken/dimdoors/ModelManager.java +++ b/src/main/java/com/zixiken/dimdoors/ModelManager.java @@ -1,5 +1,6 @@ package com.zixiken.dimdoors; +import com.zixiken.dimdoors.blocks.BlockDimWall; import com.zixiken.dimdoors.blocks.ModBlocks; import com.zixiken.dimdoors.items.ModItems; import net.minecraft.block.BlockDoor; @@ -15,8 +16,6 @@ import static net.minecraft.item.Item.getItemFromBlock; @SuppressWarnings({"MethodCallSideOnly", "NewExpressionSideOnly"}) public class ModelManager { - private static final String ID = DimDoors.MODID; - public static void registerModels() { //ItemBlock registration register(getItemFromBlock(ModBlocks.blockDimWall)); @@ -24,7 +23,6 @@ public class ModelManager { register(getItemFromBlock(ModBlocks.blockDimWall), 2, "Altered"); register(getItemFromBlock(ModBlocks.blockRift)); - register(getItemFromBlock(ModBlocks.blockDimDoorTransient)); register(getItemFromBlock(ModBlocks.blockDimHatch)); //Item registration @@ -41,19 +39,19 @@ public class ModelManager { public static void registerModelVariants() { ModelBakery.registerItemVariants(getItemFromBlock(ModBlocks.blockDimWall), - new ResourceLocation(ID + ":blockDimWall"), - new ResourceLocation(ID + ":blockDimWallAncient"), - new ResourceLocation(ID + ":blockDimWallAltered")); + ModBlocks.blockDimWall.getRegistryName(), + new ResourceLocation(ModBlocks.blockDimWall.getRegistryName() + "Ancient"), + new ResourceLocation(ModBlocks.blockDimWall.getRegistryName() + "Altered")); } private static void register(Item item) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, - new ModelResourceLocation(ID + ':' + item.getUnlocalizedName().substring(5), "inventory")); + new ModelResourceLocation(item.getRegistryName(), "inventory")); } private static void register(Item item, int meta, String name) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, meta, - new ModelResourceLocation(ID + ':' + item.getUnlocalizedName().substring(5) + name, "inventory")); + new ModelResourceLocation(item.getRegistryName() + name, "inventory")); } @SuppressWarnings("LocalVariableDeclarationSideOnly") diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoor.java b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoor.java index 71b10a89..928ca393 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoor.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoor.java @@ -15,6 +15,7 @@ public class ItemDimDoor extends ItemDoorBase { public ItemDimDoor() { super(ModBlocks.blockDimDoor, (ItemDoor)Items.IRON_DOOR); setUnlocalizedName(ID); + setRegistryName(ID); } @Override diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorGold.java b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorGold.java index c7370ea8..2942d9fd 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorGold.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorGold.java @@ -13,6 +13,7 @@ public class ItemDimDoorGold extends ItemDoorBase { public ItemDimDoorGold() { super(ModBlocks.blockDimDoorGold, ModItems.itemDoorGold); setUnlocalizedName(ID); + setRegistryName(ID); } @Override public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorPersonal.java b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorPersonal.java index eb93abe3..fdbb9bcd 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorPersonal.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorPersonal.java @@ -13,6 +13,7 @@ public class ItemDimDoorPersonal extends ItemDoorBase { public ItemDimDoorPersonal() { super(ModBlocks.blockDimDoorPersonal, ModItems.itemDoorQuartz); setUnlocalizedName(ID); + setRegistryName(ID); } @Override diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorUnstable.java b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorUnstable.java index aecb25d0..74f784eb 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorUnstable.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorUnstable.java @@ -13,6 +13,7 @@ public class ItemDimDoorUnstable extends ItemDoorBase { public ItemDimDoorUnstable() { super(ModBlocks.blockDimDoorChaos, null); setUnlocalizedName(ID); + setRegistryName(ID); } @Override diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorWarp.java b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorWarp.java index 9f940cb0..3a22bb17 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorWarp.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemDimDoorWarp.java @@ -16,6 +16,7 @@ public class ItemDimDoorWarp extends ItemDoorBase { public ItemDimDoorWarp() { super(ModBlocks.blockDimDoorWarp, (ItemDoor)Items.OAK_DOOR ); setUnlocalizedName(ID); + setRegistryName(ID); } @Override diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemDoorGold.java b/src/main/java/com/zixiken/dimdoors/items/ItemDoorGold.java index 777ea456..b7169f2a 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemDoorGold.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemDoorGold.java @@ -10,5 +10,6 @@ public class ItemDoorGold extends ItemDoor { super(ModBlocks.blockDoorGold); setMaxStackSize(16); setUnlocalizedName(ID); + setRegistryName(ID); } } diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemDoorQuartz.java b/src/main/java/com/zixiken/dimdoors/items/ItemDoorQuartz.java index 89ddb2a3..7a0c76c1 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemDoorQuartz.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemDoorQuartz.java @@ -9,5 +9,6 @@ public class ItemDoorQuartz extends ItemDoor { public ItemDoorQuartz() { super(ModBlocks.blockDoorQuartz); setUnlocalizedName(ID); + setRegistryName(ID); } } diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemStableFabric.java b/src/main/java/com/zixiken/dimdoors/items/ItemStableFabric.java index 7578a6bd..70c519a1 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemStableFabric.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemStableFabric.java @@ -10,5 +10,6 @@ public class ItemStableFabric extends Item { super(); setCreativeTab(DimDoors.dimDoorsCreativeTab); setUnlocalizedName(ID); + setRegistryName(ID); } } diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemWorldThread.java b/src/main/java/com/zixiken/dimdoors/items/ItemWorldThread.java index 1e998c23..c0157660 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemWorldThread.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemWorldThread.java @@ -10,5 +10,6 @@ public class ItemWorldThread extends Item { super(); setCreativeTab(DimDoors.dimDoorsCreativeTab); setUnlocalizedName(ID); + setRegistryName(ID); } } diff --git a/src/main/java/com/zixiken/dimdoors/items/ModItems.java b/src/main/java/com/zixiken/dimdoors/items/ModItems.java index 650ea363..a48602a1 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ModItems.java +++ b/src/main/java/com/zixiken/dimdoors/items/ModItems.java @@ -17,15 +17,15 @@ public class ModItems { public static ItemBlockDimWall itemBlockDimWall; public static void registerItems() { - GameRegistry.registerItem(itemDoorQuartz = new ItemDoorQuartz(), ItemDoorQuartz.ID); - GameRegistry.registerItem(itemDimDoorPersonal = new ItemDimDoorPersonal(), ItemDimDoorPersonal.ID); - GameRegistry.registerItem(itemDoorGold = new ItemDoorGold(), ItemDoorGold.ID); - GameRegistry.registerItem(itemDimDoorGold = new ItemDimDoorGold(), ItemDimDoorGold.ID); - GameRegistry.registerItem(itemDimDoor = new ItemDimDoor(), ItemDimDoor.ID); - GameRegistry.registerItem(itemDimDoorWarp = new ItemDimDoorWarp(), ItemDimDoorWarp.ID); - GameRegistry.registerItem(itemStableFabric = new ItemStableFabric(), ItemStableFabric.ID); - GameRegistry.registerItem(itemDimDoorChaos = new ItemDimDoorUnstable(), ItemDimDoorUnstable.ID); - GameRegistry.registerItem(itemWorldThread = new ItemWorldThread(), ItemWorldThread.ID); + GameRegistry.register(itemDoorQuartz = new ItemDoorQuartz()); + GameRegistry.register(itemDimDoorPersonal = new ItemDimDoorPersonal()); + GameRegistry.register(itemDoorGold = new ItemDoorGold()); + GameRegistry.register(itemDimDoorGold = new ItemDimDoorGold()); + GameRegistry.register(itemDimDoor = new ItemDimDoor()); + GameRegistry.register(itemDimDoorWarp = new ItemDimDoorWarp()); + GameRegistry.register(itemStableFabric = new ItemStableFabric()); + GameRegistry.register(itemDimDoorChaos = new ItemDimDoorUnstable()); + GameRegistry.register(itemWorldThread = new ItemWorldThread()); //ItemBlocks GameRegistry.register(itemBlockDimWall = new ItemBlockDimWall()); From 108a290c93ceee1abf75e1aa4577f1b7f380e509 Mon Sep 17 00:00:00 2001 From: Michael Zanga Date: Wed, 11 Jan 2017 14:23:14 -0500 Subject: [PATCH 2/3] Unused import... --- src/main/java/com/zixiken/dimdoors/ModelManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/zixiken/dimdoors/ModelManager.java b/src/main/java/com/zixiken/dimdoors/ModelManager.java index eac4881c..3c640cea 100644 --- a/src/main/java/com/zixiken/dimdoors/ModelManager.java +++ b/src/main/java/com/zixiken/dimdoors/ModelManager.java @@ -1,6 +1,5 @@ package com.zixiken.dimdoors; -import com.zixiken.dimdoors.blocks.BlockDimWall; import com.zixiken.dimdoors.blocks.ModBlocks; import com.zixiken.dimdoors.items.ModItems; import net.minecraft.block.BlockDoor; From 0624b9f76a2c611c77b5a1e1f02bd04b28c6b267 Mon Sep 17 00:00:00 2001 From: Michael Zanga Date: Wed, 11 Jan 2017 15:27:06 -0500 Subject: [PATCH 3/3] "Removed" deprecated code. --- .../zixiken/dimdoors/blocks/BlockDimWall.java | 22 +++++++++---------- .../zixiken/dimdoors/blocks/BlockRift.java | 1 + .../zixiken/dimdoors/items/ItemDoorBase.java | 9 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zixiken/dimdoors/blocks/BlockDimWall.java b/src/main/java/com/zixiken/dimdoors/blocks/BlockDimWall.java index 849b4280..a4019f33 100644 --- a/src/main/java/com/zixiken/dimdoors/blocks/BlockDimWall.java +++ b/src/main/java/com/zixiken/dimdoors/blocks/BlockDimWall.java @@ -27,6 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; +@SuppressWarnings("deprecation") public class BlockDimWall extends Block { public static final String ID = "blockDimWall"; public static final PropertyInteger TYPE = PropertyInteger.create("type", 0, 2); @@ -107,18 +108,15 @@ public class BlockDimWall extends Block { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, @Nullable ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { //Check if the metadata value is 0 -- we don't want the user to replace Ancient Fabric - ItemStack playerEquip = player.getHeldItemMainhand(); - if (playerEquip != null && state.getValue(TYPE) != 1) { - Block block = Block.getBlockFromItem(playerEquip.getItem()); - if (block != null) { - if (!block.isNormalCube(state) || block instanceof BlockContainer || block == this) - return false; - if (!world.isRemote) { - if (!player.capabilities.isCreativeMode) playerEquip.stackSize--; - world.setBlockState(pos, block.getStateFromMeta(playerEquip.getItemDamage())); - } - return true; - } + if (heldItem != null && state.getValue(TYPE) != 1) { + Block block = Block.getBlockFromItem(heldItem.getItem()); + if (!state.isNormalCube() || block instanceof BlockContainer || block == this) + return false; + if (!world.isRemote) { + if (!player.capabilities.isCreativeMode) heldItem.stackSize--; + world.setBlockState(pos, state); + } + return true; } return false; } diff --git a/src/main/java/com/zixiken/dimdoors/blocks/BlockRift.java b/src/main/java/com/zixiken/dimdoors/blocks/BlockRift.java index c2af8a49..d37a4716 100644 --- a/src/main/java/com/zixiken/dimdoors/blocks/BlockRift.java +++ b/src/main/java/com/zixiken/dimdoors/blocks/BlockRift.java @@ -30,6 +30,7 @@ import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +@SuppressWarnings("deprecation") public class BlockRift extends Block implements ITileEntityProvider { private static final float MIN_IMMUNE_RESISTANCE = 5000.0F; public static final String ID = "blockRift"; diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemDoorBase.java b/src/main/java/com/zixiken/dimdoors/items/ItemDoorBase.java index e86c0e65..d7bae9cf 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemDoorBase.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemDoorBase.java @@ -7,6 +7,7 @@ import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.blocks.BlockDimDoorBase; import com.zixiken.dimdoors.blocks.ModBlocks; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -75,8 +76,8 @@ public abstract class ItemDoorBase extends ItemDoor { ItemDoorBase mappedItem = doorItemMapping.get(stack.getItem()); if (mappedItem == null) return false; BlockDimDoorBase doorBlock = mappedItem.getDoorBlock(); - if (ItemDoorBase.placeDoorOnBlock(doorBlock, stack, player, world, pos, side)) return true; - return ItemDoorBase.placeDoorOnRift(doorBlock, world, player, stack); + return ItemDoorBase.placeDoorOnBlock(doorBlock, stack, player, world, pos, side) || + ItemDoorBase.placeDoorOnRift(doorBlock, world, player, stack); } /** @@ -143,9 +144,9 @@ public abstract class ItemDoorBase extends ItemDoor { } public static boolean canPlace(World world, BlockPos pos) { - Block block = world.getBlockState(pos).getBlock(); + IBlockState state = world.getBlockState(pos); - return (block == ModBlocks.blockRift || world.getBlockState(pos).equals(Blocks.AIR) || block.getMaterial(world.getBlockState(pos)).isReplaceable()); + return (state.getBlock() == ModBlocks.blockRift || state.equals(Blocks.AIR) || state.getMaterial().isReplaceable()); } /**