From ac6e5d286198fdd418f4e092f2946f3dbebf75f3 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 22 Dec 2015 23:44:35 +0100 Subject: [PATCH] Add generics information from forge where possible --- .../java/slimeknights/mantle/block/EnumBlock.java | 14 ++++++++------ .../mantle/client/model/BlockItemModelWrapper.java | 5 +++-- .../slimeknights/mantle/item/ItemBlockMeta.java | 4 ++-- .../java/slimeknights/mantle/item/ItemEdible.java | 4 ++-- .../slimeknights/mantle/item/ItemMetaDynamic.java | 4 ++-- .../mantle/property/PropertyUnlistedDirection.java | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/slimeknights/mantle/block/EnumBlock.java b/src/main/java/slimeknights/mantle/block/EnumBlock.java index 021b519..0405870 100644 --- a/src/main/java/slimeknights/mantle/block/EnumBlock.java +++ b/src/main/java/slimeknights/mantle/block/EnumBlock.java @@ -8,31 +8,33 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.IStringSerializable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class EnumBlock & EnumBlock.IEnumMeta> extends Block { - public final PropertyEnum prop; +public class EnumBlock & EnumBlock.IEnumMeta & IStringSerializable> extends Block { + public final PropertyEnum prop; private final E[] values; - private static PropertyEnum tmp; + private static PropertyEnum tmp; - public EnumBlock(Material material, PropertyEnum prop, Class clazz) { + public EnumBlock(Material material, PropertyEnum prop, Class clazz) { super(preInit(material, prop)); this.prop = prop; values = clazz.getEnumConstants(); } - private static Material preInit(Material material, PropertyEnum property) { + @SuppressWarnings("unchecked") + private static Material preInit(Material material, PropertyEnum property) { tmp=property; return material; } @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, List list) { + public void getSubBlocks(Item itemIn, CreativeTabs tab, List list) { for(E type : values) { list.add(new ItemStack(this, 1, type.getMeta())); } diff --git a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java index 032be4c..7ec36d9 100644 --- a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java +++ b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java @@ -1,5 +1,6 @@ package slimeknights.mantle.client.model; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; @@ -46,12 +47,12 @@ public class BlockItemModelWrapper implements IPerspectiveAwareModel, IFlexibleB } @Override - public List getFaceQuads(EnumFacing p_177551_1_) { + public List getFaceQuads(EnumFacing p_177551_1_) { return parent.getFaceQuads(p_177551_1_); } @Override - public List getGeneralQuads() { + public List getGeneralQuads() { return parent.getGeneralQuads(); } diff --git a/src/main/java/slimeknights/mantle/item/ItemBlockMeta.java b/src/main/java/slimeknights/mantle/item/ItemBlockMeta.java index 914274f..6e22a82 100644 --- a/src/main/java/slimeknights/mantle/item/ItemBlockMeta.java +++ b/src/main/java/slimeknights/mantle/item/ItemBlockMeta.java @@ -40,12 +40,12 @@ public class ItemBlockMeta extends ItemColored { return super.getUnlocalizedName(stack) + "." + name; } - public static void setMappingProperty(Block block, IProperty property) { + public static void setMappingProperty(Block block, IProperty property) { ((ItemBlockMeta)Item.getItemFromBlock(block)).mappingProperty = property; } @Override - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { if(StatCollector.canTranslate(this.getUnlocalizedName(stack) + ".tooltip")) { tooltip.add(EnumChatFormatting.GRAY.toString() + LocUtils.translateRecursive(this.getUnlocalizedName(stack) + ".tooltip")); diff --git a/src/main/java/slimeknights/mantle/item/ItemEdible.java b/src/main/java/slimeknights/mantle/item/ItemEdible.java index 7f67e72..877ebd6 100644 --- a/src/main/java/slimeknights/mantle/item/ItemEdible.java +++ b/src/main/java/slimeknights/mantle/item/ItemEdible.java @@ -93,13 +93,13 @@ public class ItemEdible extends ItemFood { } @Override - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { dynamic.addInformation(stack, playerIn, tooltip, advanced); } @SideOnly(Side.CLIENT) @Override - public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) { + public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) { dynamic.getSubItems(itemIn, tab, subItems); } diff --git a/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java b/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java index 5a4b1bb..fae5f15 100644 --- a/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java +++ b/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java @@ -73,7 +73,7 @@ public class ItemMetaDynamic extends Item { } @Override - public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) { + public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) { for(int i = 0; i <= availabilityMask.length; i++) { if(isValid(i)) { subItems.add(new ItemStack(itemIn, 1, i)); @@ -119,7 +119,7 @@ public class ItemMetaDynamic extends Item { } @Override - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { if(StatCollector.canTranslate(this.getUnlocalizedName(stack) + ".tooltip")) { tooltip.add(EnumChatFormatting.GRAY.toString() + LocUtils.translateRecursive(this.getUnlocalizedName(stack) + ".tooltip")); diff --git a/src/main/java/slimeknights/mantle/property/PropertyUnlistedDirection.java b/src/main/java/slimeknights/mantle/property/PropertyUnlistedDirection.java index 9a4579a..8f4bd5a 100644 --- a/src/main/java/slimeknights/mantle/property/PropertyUnlistedDirection.java +++ b/src/main/java/slimeknights/mantle/property/PropertyUnlistedDirection.java @@ -12,7 +12,7 @@ import java.util.Collection; public class PropertyUnlistedDirection extends PropertyDirection implements IUnlistedProperty { - public PropertyUnlistedDirection(String name, Collection values) { + public PropertyUnlistedDirection(String name, Collection values) { super(name, values); }