diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
10 files changed, 21 insertions, 21 deletions
diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java index cf1811781a..10c09390d9 100644 --- a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java +++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java @@ -6,8 +6,8 @@ import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; public class Gui_ID_Registry { - private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap(); - private static final Map<Integer, MU_GuiId> idMap = new HashMap(); + private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap<Class<? extends IGuiManagerMiscUtils>, MU_GuiId>(); + private static final Map<Integer, MU_GuiId> idMap = new HashMap<Integer, MU_GuiId>(); private static int nextId = 0; static @@ -33,7 +33,7 @@ public class Gui_ID_Registry MU_GuiId guiId = classMap.get(guiHandlerClass); if (guiId == null) { for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry : classMap.entrySet()) { - if (((Class)classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) + if (((Class<?>)classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) { guiId = classGuiIdEntry.getValue(); break; diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java index 289446eb07..951f69723c 100644 --- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java +++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; public class Workbench_CraftingHandler { private static final Workbench_CraftingHandler instance = new Workbench_CraftingHandler(); - private final List recipes = new ArrayList(); + private final List<IRecipe> recipes = new ArrayList<IRecipe>(); public static final Workbench_CraftingHandler getInstance() { return instance; @@ -66,7 +66,7 @@ public class Workbench_CraftingHandler { } } - final HashMap hashmap = new HashMap(); + final HashMap<Character, ItemStack> hashmap = new HashMap<Character, ItemStack>(); for (; i < par2ArrayOfObj.length; i += 2) { @@ -110,7 +110,7 @@ public class Workbench_CraftingHandler { public void addShapelessRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) { - final ArrayList arraylist = new ArrayList(); + final ArrayList<ItemStack> arraylist = new ArrayList<ItemStack>(); final Object aobj[] = par2ArrayOfObj; final int i = aobj.length; @@ -146,9 +146,6 @@ public class Workbench_CraftingHandler { public ItemStack findMatchingRecipe(final InventoryCrafting par1InventoryCrafting, final World par2World) { int i = 0; - ItemStack itemstack = null; - ItemStack itemstack1 = null; - for (int j = 0; j < par1InventoryCrafting.getSizeInventory(); j++) { final ItemStack itemstack2 = par1InventoryCrafting.getStackInSlot(j); @@ -160,12 +157,10 @@ public class Workbench_CraftingHandler { if (i == 0) { - itemstack = itemstack2; } if (i == 1) { - itemstack1 = itemstack2; } i++; @@ -202,7 +197,7 @@ public class Workbench_CraftingHandler { } - public List getRecipeList() + public List<IRecipe> getRecipeList() { return this.recipes; } diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java index b68ae89e5c..92a7dd56d3 100644 --- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java +++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java @@ -4,7 +4,7 @@ import java.util.Comparator; import net.minecraft.item.crafting.*; -public class Workbench_RecipeSorter implements Comparator +public class Workbench_RecipeSorter implements Comparator<Object> { final Workbench_CraftingHandler CraftingManagerCrafter; diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 0faec7ff88..30d85628b9 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -587,6 +587,7 @@ public final class ModItems { CoalTar.run(); //Misc Items + @SuppressWarnings("unused") Item tI; tI = new BaseItemMisc("Chilly", new short[]{0,64,196}, 32, MiscTypes.POTION, new String[]{"It's Blue"}); tI = new BaseItemMisc("4000DC's", new short[]{180,100,30}, 1, MiscTypes.BIGKEY, new String[]{"It opens things."}); @@ -704,7 +705,7 @@ public final class ModItems { RfEuBattery = new RF2EU_Battery(); //Baubles Mod Test - try {final Class baublesTest = Class.forName("baubles.api.IBauble"); + try {final Class<?> baublesTest = Class.forName("baubles.api.IBauble"); if (baublesTest != null){ COMPAT_Baubles.run(); } diff --git a/src/Java/gtPlusPlus/core/util/ClassUtils.java b/src/Java/gtPlusPlus/core/util/ClassUtils.java index 20ca894211..498362e817 100644 --- a/src/Java/gtPlusPlus/core/util/ClassUtils.java +++ b/src/Java/gtPlusPlus/core/util/ClassUtils.java @@ -20,6 +20,7 @@ public class ClassUtils { } } + @SuppressWarnings("rawtypes") public static Method getMethodViaReflection(final Class<?> lookupClass, final String methodName, final boolean invoke) throws Exception{ final Class<? extends Class> lookup = lookupClass.getClass(); final Method m = lookup.getDeclaredMethod(methodName); @@ -30,7 +31,7 @@ public class ClassUtils { return m; } - public static Class getNonPublicClass(final String className){ + public static Class<?> getNonPublicClass(final String className){ Class<?> c = null; try { c = Class.forName(className); @@ -60,7 +61,7 @@ public class ClassUtils { try { final Object o = constructor.newInstance(); - return (Class) o; + return (Class<?>) o; } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { // TODO Auto-generated catch block diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index 863ba2b3b8..010f7b0bf0 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -14,6 +14,7 @@ public class MaterialUtils { public static short firstID = 791; + @SuppressWarnings({ "rawtypes", "unused" }) private static Class[][] commonTypes = {{Materials.class, int.class, TextureSet.class, float.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, @@ -32,6 +33,7 @@ public class MaterialUtils { } public static Material generateMaterialFromGtENUM(final Materials material){ + @SuppressWarnings("deprecation") String name = material.name(); final short[] rgba = material.mRGBa; final int melting = material.mMeltingPoint; diff --git a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java index c1d0279f72..99a9bf2fa9 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java @@ -12,7 +12,7 @@ public class ClientProxyFinder { final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class); final Object fieldValue = field.get(modInstance); try { - final Class clientSideClass = Class.forName(sidedProxy.clientSide()); + final Class<?> clientSideClass = Class.forName(sidedProxy.clientSide()); if(clientSideClass.isAssignableFrom(fieldValue.getClass())) { final Object clientProxy = clientSideClass.cast(fieldValue); //do what you want with client proxy instance diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index c789871b6f..f88f8e32e0 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -102,7 +102,7 @@ public class ReflectionUtils { /** * Allows to change the state of an immutable instance. Huh?!? */ - public static void setFieldValue(Class clazz, String fieldName, Object newValue) throws Exception { + public static void setFieldValue(Class<?> clazz, String fieldName, Object newValue) throws Exception { Field nameField = getField(clazz, fieldName); setValue(clazz, nameField, newValue); } @@ -110,7 +110,7 @@ public class ReflectionUtils { /** * Allows to change the state of final statics. Huh?!? */ - public static void setDefault(Class clazz, String fieldName, Object newValue) throws Exception { + public static void setDefault(Class<?> clazz, String fieldName, Object newValue) throws Exception { Field staticField = clazz.getDeclaredField(fieldName); setValue(null, staticField, newValue); } diff --git a/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java index 2fae02a9fd..38382b4a46 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java @@ -12,7 +12,7 @@ public class ServerProxyFinder { final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class); final Object fieldValue = field.get(modInstance); try { - final Class serverSideClass = Class.forName(sidedProxy.serverSide()); + final Class<?> serverSideClass = Class.forName(sidedProxy.serverSide()); if(serverSideClass.isAssignableFrom(fieldValue.getClass())) { final Object serverProxy = serverSideClass.cast(fieldValue); //do what you want with server proxy instance diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java index 3eadb6116e..ed8b3f38b7 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java @@ -113,7 +113,8 @@ public class Biome_DarkWorld { return 0xF67A14; } - private boolean addToMonsterSpawnLists(Class EntityClass, int a, int b, int c){ + @SuppressWarnings("unchecked") + private boolean addToMonsterSpawnLists(Class<?> EntityClass, int a, int b, int c){ this.spawnableMonsterList.add(new SpawnListEntry(EntityClass, a, b, c)); this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c)); return true; |