diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java index 48c9361b..fdab6cd3 100644 --- a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java @@ -223,7 +223,7 @@ public class ItemSlimeBoots extends ItemArmor implements ISpecialArmor { list.add("Boooounce!"); list.add("Hold " + (I18n.format( - Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyDescription(), new Object[0])) + Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyDescription())) + " to stop bouncing."); } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java index e03a163e..d2c598d7 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java @@ -88,7 +88,7 @@ public class RecipeHandlerAlloying extends RecipeHandlerBase { @Override public void loadTransferRects() { this.transferRects.add( - new RecipeTransferRect(new Rectangle(76, 21, 22, 15), this.getRecipeID(), new Object[0])); + new RecipeTransferRect(new Rectangle(76, 21, 22, 15), this.getRecipeID())); } @Override diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java index 10b81406..b084c273 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java @@ -61,7 +61,7 @@ public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase { @Override public void loadTransferRects() { this.transferRects.add( - new RecipeTransferRect(new Rectangle(76, 18, 22, 15), this.getRecipeID(), new Object[0])); + new RecipeTransferRect(new Rectangle(76, 18, 22, 15), this.getRecipeID())); } public abstract List getCastingRecipes(); diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java index cf15f1b8..b39b4b0b 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java @@ -48,7 +48,7 @@ public class RecipeHandlerDryingRack extends RecipeHandlerBase { @Override public void loadTransferRects() { this.transferRects.add( - new RecipeTransferRect(new Rectangle(68, 20, 22, 15), this.getRecipeID(), new Object[0])); + new RecipeTransferRect(new Rectangle(68, 20, 22, 15), this.getRecipeID())); } @Override diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java index 245865e1..48ee9100 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java @@ -66,7 +66,7 @@ public class RecipeHandlerMelting extends RecipeHandlerBase { @Override public void loadTransferRects() { this.transferRects.add( - new RecipeTransferRect(new Rectangle(72, 20, 16, 34), this.getRecipeID(), new Object[0])); + new RecipeTransferRect(new Rectangle(72, 20, 16, 34), this.getRecipeID())); } @Override diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java index 2dfd2d59..93360b0c 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java @@ -90,7 +90,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase { @Override public void loadTransferRects() { this.transferRects.add( - new RecipeTransferRect(new Rectangle(10, 30, 16, 16), this.getRecipeID(), new Object[0])); + new RecipeTransferRect(new Rectangle(10, 30, 16, 16), this.getRecipeID())); } @Override diff --git a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java index 322a7cf7..6c7d60d8 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java +++ b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java @@ -31,7 +31,7 @@ public class SmelteryDamageSource extends DamageSource { String s1 = s + ".player"; return entityliving1 != null && StatCollector.canTranslate(s1) ? new ChatComponentTranslation( - s1, new Object[] {par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_()}) - : new ChatComponentTranslation(s, new Object[] {par1EntityLiving.func_145748_c_()}); + s1, par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_()) + : new ChatComponentTranslation(s, par1EntityLiving.func_145748_c_()); } } diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index e1715958..dc3a5201 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -670,13 +670,11 @@ public class TinkerSmeltery { // Glass Recipes GameRegistry.addRecipe( - new ItemStack(Items.glass_bottle, 3), new Object[] {"# #", " # ", '#', TinkerSmeltery.clearGlass}); + new ItemStack(Items.glass_bottle, 3), "# #", " # ", '#', TinkerSmeltery.clearGlass); GameRegistry.addRecipe(new ShapedOreRecipe( new ItemStack(Blocks.daylight_detector), - new Object[] {"GGG", "QQQ", "WWW", 'G', "blockGlass", 'Q', "gemQuartz", 'W', "slabWood"})); - GameRegistry.addRecipe(new ItemStack(Blocks.beacon, 1), new Object[] { - "GGG", "GSG", "OOO", 'G', TinkerSmeltery.clearGlass, 'S', Items.nether_star, 'O', Blocks.obsidian - }); + "GGG", "QQQ", "WWW", 'G', "blockGlass", 'Q', "gemQuartz", 'W', "slabWood")); + GameRegistry.addRecipe(new ItemStack(Blocks.beacon, 1), "GGG", "GSG", "OOO", 'G', TinkerSmeltery.clearGlass, 'S', Items.nether_star, 'O', Blocks.obsidian); GameRegistry.addRecipe(new ShapedOreRecipe( new ItemStack(TinkerSmeltery.glassPane, 16, 0), "GGG", "GGG", 'G', TinkerSmeltery.clearGlass)); @@ -818,16 +816,14 @@ public class TinkerSmeltery { } public void addOreDictionarySmelteryRecipes() { - List exceptions = Arrays.asList(new FluidType[] { - FluidType.getFluidType("Water"), - FluidType.getFluidType("Stone"), - FluidType.getFluidType("Emerald"), - FluidType.getFluidType("Quartz"), - FluidType.getFluidType("Ender"), - FluidType.getFluidType("Glass"), - FluidType.getFluidType("Slime"), - FluidType.getFluidType("Obsidian") - }); + List exceptions = Arrays.asList(FluidType.getFluidType("Water"), + FluidType.getFluidType("Stone"), + FluidType.getFluidType("Emerald"), + FluidType.getFluidType("Quartz"), + FluidType.getFluidType("Ender"), + FluidType.getFluidType("Glass"), + FluidType.getFluidType("Slime"), + FluidType.getFluidType("Obsidian")); for (Map.Entry stringFluidTypeEntry : FluidType.fluidTypes.entrySet()) { FluidType ft = stringFluidTypeEntry.getValue(); if (exceptions.contains(ft)) continue;