diff --git a/src/main/java/tconstruct/achievements/TAchievements.java b/src/main/java/tconstruct/achievements/TAchievements.java index da14cbdf..adf40555 100644 --- a/src/main/java/tconstruct/achievements/TAchievements.java +++ b/src/main/java/tconstruct/achievements/TAchievements.java @@ -13,7 +13,7 @@ import tconstruct.util.config.PHConstruct; public class TAchievements { private static AchievementPage achievementsPage; - private static HashMap achievementsList = new HashMap(); + private static HashMap achievementsList = new HashMap<>(); /** * Adds an achievement and registers it, so there is no need to call .registerStat diff --git a/src/main/java/tconstruct/armor/model/RenderArmorCast.java b/src/main/java/tconstruct/armor/model/RenderArmorCast.java index b37dac10..36d4bd9f 100644 --- a/src/main/java/tconstruct/armor/model/RenderArmorCast.java +++ b/src/main/java/tconstruct/armor/model/RenderArmorCast.java @@ -66,7 +66,7 @@ public class RenderArmorCast implements IItemRenderer { renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F); renderCube(tessellator, renderer, baseIcon); renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 1.0F, 0.9F); - ArrayList sides = new ArrayList(); + ArrayList sides = new ArrayList<>(); sides.add(ForgeDirection.NORTH); sides.add(ForgeDirection.SOUTH); sides.add(ForgeDirection.EAST); diff --git a/src/main/java/tconstruct/armor/player/ArmorExtended.java b/src/main/java/tconstruct/armor/player/ArmorExtended.java index 33ba1f34..38e306b5 100644 --- a/src/main/java/tconstruct/armor/player/ArmorExtended.java +++ b/src/main/java/tconstruct/armor/player/ArmorExtended.java @@ -24,7 +24,7 @@ public class ArmorExtended implements IInventory { public UUID globalID = UUID.fromString("B243BE32-DC1B-4C53-8D13-8752D5C69D5B"); public void init(EntityPlayer player) { - parent = new WeakReference(player); + parent = new WeakReference<>(player); } @Override diff --git a/src/main/java/tconstruct/armor/player/KnapsackInventory.java b/src/main/java/tconstruct/armor/player/KnapsackInventory.java index b929ad32..7bd278e4 100644 --- a/src/main/java/tconstruct/armor/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/armor/player/KnapsackInventory.java @@ -17,7 +17,7 @@ public class KnapsackInventory implements IInventory { public WeakReference parent; public void init(EntityPlayer player) { - parent = new WeakReference(player); + parent = new WeakReference<>(player); } @Override diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index 207ec95a..13ad093b 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -30,7 +30,7 @@ public class TPlayerHandler { /* Player */ // public int hunger; - private ConcurrentHashMap playerStats = new ConcurrentHashMap(); + private ConcurrentHashMap playerStats = new ConcurrentHashMap<>(); @SubscribeEvent public void PlayerLoggedInEvent(PlayerLoggedInEvent event) { @@ -284,7 +284,7 @@ public class TPlayerHandler { private final String serverLocation = "https://dl.dropboxusercontent.com/u/42769935/sticks.txt"; private final int timeout = 1000; - private HashSet stickUsers = new HashSet(); + private HashSet stickUsers = new HashSet<>(); public void buildStickURLDatabase(String location) { URL url; diff --git a/src/main/java/tconstruct/armor/player/TPlayerStats.java b/src/main/java/tconstruct/armor/player/TPlayerStats.java index c4db35d5..3d168474 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerStats.java +++ b/src/main/java/tconstruct/armor/player/TPlayerStats.java @@ -44,7 +44,7 @@ public class TPlayerStats } public TPlayerStats(EntityPlayer entityplayer) { - this.player = new WeakReference(entityplayer); + this.player = new WeakReference<>(entityplayer); this.armor = new ArmorExtended(); this.armor.init(entityplayer); @@ -85,7 +85,7 @@ public class TPlayerStats @Override public void init(Entity entity, World world) { - this.player = new WeakReference((EntityPlayer) entity); + this.player = new WeakReference<>((EntityPlayer) entity); this.armor.init((EntityPlayer) entity); this.knapsack.init((EntityPlayer) entity); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index f53e0b67..b2e78ee8 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -86,7 +86,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable { @Override public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); if (world.rand.nextInt(8) != 0) { return ret; } @@ -105,7 +105,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable { @Override public ArrayList onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z))); return ret; } diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index 694ed7d4..1ab11006 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -29,8 +29,8 @@ public class ModifierPage extends BookPage { icons = MantleClientRegistry.getRecipeIcons(recipe); if (type.equals("travelmulti")) { - List stacks = new LinkedList(); - List tools = new LinkedList(); + List stacks = new LinkedList<>(); + List tools = new LinkedList<>(); String[] suffixes = new String[] {"goggles", "vest", "wings", "boots", "glove", "belt"}; for (String suffix : suffixes) { ItemStack[] icons2 = diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index 1773415b..12259567 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -13,7 +13,7 @@ import net.minecraft.network.play.client.C0DPacketCloseWindow; import net.minecraftforge.client.event.GuiScreenEvent; public class TabRegistry { - private static ArrayList tabList = new ArrayList(); + private static ArrayList tabList = new ArrayList<>(); public static void registerTab(AbstractTab tab) { tabList.add(tab); diff --git a/src/main/java/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java index 01d14dd6..e1013ee9 100644 --- a/src/main/java/tconstruct/common/TProxyCommon.java +++ b/src/main/java/tconstruct/common/TProxyCommon.java @@ -22,8 +22,8 @@ public class TProxyCommon implements IGuiHandler { return null; } - private static HashMap serverGuiHandlers = new HashMap(); - private static HashMap clientGuiHandlers = new HashMap(); + private static HashMap serverGuiHandlers = new HashMap<>(); + private static HashMap clientGuiHandlers = new HashMap<>(); public static void registerServerGuiHandler(int gui, IGuiHandler handler) { serverGuiHandlers.put(gui, handler); diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index abd5b375..0dbba2a1 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -428,23 +428,23 @@ public abstract class BowBase extends ToolCore { public IIcon arrow2; public IIcon arrow3; - public HashMap headIcons1 = new HashMap(); - public HashMap handleIcons1 = new HashMap(); - public HashMap accessoryIcons1 = new HashMap(); - public HashMap extraIcons1 = new HashMap(); - public HashMap effectIcons1 = new HashMap(); + public HashMap headIcons1 = new HashMap<>(); + public HashMap handleIcons1 = new HashMap<>(); + public HashMap accessoryIcons1 = new HashMap<>(); + public HashMap extraIcons1 = new HashMap<>(); + public HashMap effectIcons1 = new HashMap<>(); - public HashMap headIcons2 = new HashMap(); - public HashMap handleIcons2 = new HashMap(); - public HashMap accessoryIcons2 = new HashMap(); - public HashMap extraIcons2 = new HashMap(); - public HashMap effectIcons2 = new HashMap(); + public HashMap headIcons2 = new HashMap<>(); + public HashMap handleIcons2 = new HashMap<>(); + public HashMap accessoryIcons2 = new HashMap<>(); + public HashMap extraIcons2 = new HashMap<>(); + public HashMap effectIcons2 = new HashMap<>(); - public HashMap headIcons3 = new HashMap(); - public HashMap handleIcons3 = new HashMap(); - public HashMap accessoryIcons3 = new HashMap(); - public HashMap extraIcons3 = new HashMap(); - public HashMap effectIcons3 = new HashMap(); + public HashMap headIcons3 = new HashMap<>(); + public HashMap handleIcons3 = new HashMap<>(); + public HashMap accessoryIcons3 = new HashMap<>(); + public HashMap extraIcons3 = new HashMap<>(); + public HashMap effectIcons3 = new HashMap<>(); @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { diff --git a/src/main/java/tconstruct/library/SlimeBounceHandler.java b/src/main/java/tconstruct/library/SlimeBounceHandler.java index bbce654e..9feee233 100644 --- a/src/main/java/tconstruct/library/SlimeBounceHandler.java +++ b/src/main/java/tconstruct/library/SlimeBounceHandler.java @@ -21,7 +21,7 @@ public class SlimeBounceHandler { private static final double[] ASINE_TAB; private static final double[] COS_TAB; public static final IdentityHashMap BOUNCING_ENTITIES = - new IdentityHashMap(); + new IdentityHashMap<>(); static { for (int i = 0; i < 65536; ++i) { diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index f0071ba9..3627fee6 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -45,7 +45,7 @@ public class TConstructRegistry { * chiselHead scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, * hammerHead bowstring, fletching, arrowhead */ - public static HashMap itemDirectory = new HashMap(); + public static HashMap itemDirectory = new HashMap<>(); /** * Adds an item to the directory @@ -95,7 +95,7 @@ public class TConstructRegistry { * scytheHead, excavatorHead, largeBlade, hammerHead, fullGuard, bowString, * fletching, arrowHead */ - static HashMap itemstackDirectory = new HashMap(); + static HashMap itemstackDirectory = new HashMap<>(); /** * Adds an itemstack to the directory @@ -126,7 +126,7 @@ public class TConstructRegistry { return ret; } - public static ArrayList tools = new ArrayList(20); + public static ArrayList tools = new ArrayList<>(20); // Parts @@ -134,7 +134,7 @@ public class TConstructRegistry { * List: Item ID, metadata, material ID ItemStack: Output. Ex: Cactus * Binding */ - public static HashMap patternPartMapping = new HashMap(); + public static HashMap patternPartMapping = new HashMap<>(); /** * Maps an item and a material ID to an output part @@ -197,10 +197,10 @@ public class TConstructRegistry { } // Materials - public static HashMap toolMaterials = new HashMap(40); - public static HashMap toolMaterialStrings = new HashMap(40); - public static List defaultToolPartMaterials = new LinkedList(); - public static List defaultShardMaterials = new LinkedList(); + public static HashMap toolMaterials = new HashMap<>(40); + public static HashMap toolMaterialStrings = new HashMap<>(40); + public static List defaultToolPartMaterials = new LinkedList<>(); + public static List defaultShardMaterials = new LinkedList<>(); public static void addDefaultToolPartMaterial(int materialID) { if (!toolMaterials.containsKey(materialID)) @@ -465,7 +465,7 @@ public class TConstructRegistry { } // Bow materials - public static HashMap bowMaterials = new HashMap(40); + public static HashMap bowMaterials = new HashMap<>(40); @Deprecated public static void addBowMaterial(int materialID, int durability, int drawSpeed, float speedMax) { @@ -488,7 +488,7 @@ public class TConstructRegistry { return bowMaterials.get(materialID); } - public static HashMap arrowMaterials = new HashMap(40); + public static HashMap arrowMaterials = new HashMap<>(40); @Deprecated public static void addArrowMaterial(int materialID, float mass, float breakChance, float accuracy) { @@ -513,7 +513,7 @@ public class TConstructRegistry { } // Custom materials - bowstrings, fletching, etc - public static ArrayList customMaterials = new ArrayList(); + public static ArrayList customMaterials = new ArrayList<>(); public static void addCustomMaterial(CustomMaterial mat) { if (mat != null) customMaterials.add(mat); @@ -658,8 +658,8 @@ public class TConstructRegistry { } } - public static ArrayList activeModifiers = new ArrayList(); - public static LinkedList activeArmorModifiers = new LinkedList(); + public static ArrayList activeModifiers = new ArrayList<>(); + public static LinkedList activeArmorModifiers = new LinkedList<>(); public static void registerActiveToolMod(ActiveToolMod mod) { activeModifiers.add(mod); diff --git a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java index 138ac21f..99e5ca9d 100644 --- a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java +++ b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java @@ -11,7 +11,7 @@ public abstract class ArmorModTypeFilter extends ArmorMod { super(effect, dataKey, armorTypes, items); assert items.length == values.length : "Itemstacks and their values for armor modifiers must be the same length"; - this.increase = new ArrayList(); + this.increase = new ArrayList<>(); for (int i = 0; i < values.length; i++) { increase.add(values[i]); } diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java index ee2dc5e9..be87374e 100644 --- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java +++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java @@ -9,11 +9,11 @@ import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.tools.ToolCore; public class TConstructClientRegistry { - public static ArrayList stencilButtons = new ArrayList(); - public static ArrayList stencilButtons2 = new ArrayList(); - public static ArrayList toolButtons = new ArrayList(20); - public static ArrayList tierTwoButtons = new ArrayList(); - public static Map manualIcons = new HashMap(); + public static ArrayList stencilButtons = new ArrayList<>(); + public static ArrayList stencilButtons2 = new ArrayList<>(); + public static ArrayList toolButtons = new ArrayList<>(20); + public static ArrayList tierTwoButtons = new ArrayList<>(); + public static Map manualIcons = new HashMap<>(); public static ItemStack defaultStack = new ItemStack(Items.iron_ingot); public static void addMaterialRenderMapping( diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java index c0fdf1c6..1ae99239 100644 --- a/src/main/java/tconstruct/library/component/MultiFluidTank.java +++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java @@ -6,7 +6,7 @@ import net.minecraftforge.fluids.*; import tconstruct.library.crafting.Smeltery; public class MultiFluidTank extends LogicComponent implements IFluidTank { - public ArrayList fluidlist = new ArrayList(); + public ArrayList fluidlist = new ArrayList<>(); protected int maxLiquid; protected int currentLiquid; diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 71ffeaa2..d19955d8 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -19,12 +19,12 @@ public class TankLayerScan extends LogicComponent { protected int bricks = 0; protected int airBlocks = 0; protected int structureTop = 0; - protected HashSet layerBlockCoords = new HashSet(); - protected HashSet layerAirCoords = new HashSet(); + protected HashSet layerBlockCoords = new HashSet<>(); + protected HashSet layerAirCoords = new HashSet<>(); - public ArrayList blockCoords = new ArrayList(); - public ArrayList airCoords = new ArrayList(); - protected ArrayList validAirCoords = new ArrayList(); + public ArrayList blockCoords = new ArrayList<>(); + public ArrayList airCoords = new ArrayList<>(); + protected ArrayList validAirCoords = new ArrayList<>(); protected CoordTuple returnStone; private static boolean debug = System.getenv("DBG_MANTLE_TankLayerScan") != null; @@ -110,8 +110,8 @@ public class TankLayerScan extends LogicComponent { if (sealed) { blockCoords.add(new CoordTuple(master.xCoord, master.yCoord, master.zCoord)); // Don't forget me! - layerAirCoords = new HashSet(airCoords); - layerBlockCoords = new HashSet(blockCoords); + layerAirCoords = new HashSet<>(airCoords); + layerBlockCoords = new HashSet<>(blockCoords); int lowY = recurseStructureDown(master.yCoord - 1); if (lowY != -1) { diff --git a/src/main/java/tconstruct/library/crafting/Detailing.java b/src/main/java/tconstruct/library/crafting/Detailing.java index 92655d11..59d1e372 100644 --- a/src/main/java/tconstruct/library/crafting/Detailing.java +++ b/src/main/java/tconstruct/library/crafting/Detailing.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; public class Detailing { - public List detailing = new ArrayList(); + public List detailing = new ArrayList<>(); public void addDetailing(Object input, int inputMeta, Object output, int outputMeta, ToolCore tool) { ItemStack iID, oID; diff --git a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java index 12d5005c..28e383a8 100644 --- a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java +++ b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java @@ -5,7 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.item.*; public class DryingRackRecipes { - public static ArrayList recipes = new ArrayList(); + public static ArrayList recipes = new ArrayList<>(); public static void addDryingRecipe(Object input, int time, Object output) { ItemStack inputItem = null; diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index 47b9f3cd..9c6afe8c 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -11,7 +11,7 @@ public class FluidType { public final Fluid fluid; public final boolean isToolpart; - public static HashMap fluidTypes = new HashMap(); + public static HashMap fluidTypes = new HashMap<>(); public FluidType(Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) { this.renderBlock = block; diff --git a/src/main/java/tconstruct/library/crafting/LiquidCasting.java b/src/main/java/tconstruct/library/crafting/LiquidCasting.java index 54a9a5ba..e4652a82 100644 --- a/src/main/java/tconstruct/library/crafting/LiquidCasting.java +++ b/src/main/java/tconstruct/library/crafting/LiquidCasting.java @@ -8,7 +8,7 @@ import tconstruct.library.client.FluidRenderProperties; /* Melting becomes hardened */ public class LiquidCasting { // public static LiquidCasting instance = new LiquidCasting(); - private final ArrayList casts = new ArrayList(); + private final ArrayList casts = new ArrayList<>(); private boolean contains(CastingRecipe recipe) { for (CastingRecipe c : casts) { diff --git a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java index 91d6d313..9bd8d247 100644 --- a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java @@ -8,7 +8,7 @@ import tconstruct.library.modifier.*; public class ModifyBuilder { public static ModifyBuilder instance = new ModifyBuilder(); - public List itemModifiers = new ArrayList(); + public List itemModifiers = new ArrayList<>(); public ItemStack modifyItem(ItemStack input, ItemStack[] modifiers) { ItemStack copy = input.copy(); // Prevent modifying the original diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java index 712382cd..535753ed 100644 --- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java +++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java @@ -14,11 +14,11 @@ import tconstruct.library.util.IPattern; public class PatternBuilder { public static PatternBuilder instance = new PatternBuilder(); // Map items to their parts with a hashmap - public List materials = new ArrayList(); - public HashMap materialSets = new HashMap(); + public List materials = new ArrayList<>(); + public HashMap materialSets = new HashMap<>(); // We could use IRecipe if it wasn't tied to InventoryCrafting - public List toolPatterns = new ArrayList(); + public List toolPatterns = new ArrayList<>(); /* Register methods */ public void registerMaterial(ItemStack material, int value, String key) { diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index b41913cc..b9acd767 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -11,11 +11,11 @@ import net.minecraftforge.oredict.OreDictionary; public class Smeltery { public static Smeltery instance = new Smeltery(); - private final Map smeltingList = new HashMap(); - private final Map temperatureList = new HashMap(); - private final Map renderIndex = new HashMap(); - private final List alloys = new ArrayList(); - private final Map smelteryFuels = new HashMap(); // fluid -> [power, duration] + private final Map smeltingList = new HashMap<>(); + private final Map temperatureList = new HashMap<>(); + private final Map renderIndex = new HashMap<>(); + private final List alloys = new ArrayList<>(); + private final Map smelteryFuels = new HashMap<>(); // fluid -> [power, duration] /** * Add a new fluid as a valid Smeltery fuel. diff --git a/src/main/java/tconstruct/library/crafting/StencilBuilder.java b/src/main/java/tconstruct/library/crafting/StencilBuilder.java index a2cfdc98..b22d3e1d 100644 --- a/src/main/java/tconstruct/library/crafting/StencilBuilder.java +++ b/src/main/java/tconstruct/library/crafting/StencilBuilder.java @@ -8,8 +8,8 @@ public class StencilBuilder { public static StencilBuilder instance = new StencilBuilder(); public List blanks = - new LinkedList(); // i wish ItemStack would support equals so i could use a Set here... - public Map stencils = new TreeMap(); + new LinkedList<>(); // i wish ItemStack would support equals so i could use a Set here... + public Map stencils = new TreeMap<>(); /** * Returns whether the given ItemStack is a blank pattern and therefore usable for stencil crafting. diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index 80515ad2..80280650 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -16,9 +16,9 @@ import tconstruct.library.util.IToolPart; public class ToolBuilder { public static ToolBuilder instance = new ToolBuilder(); - public HashMap recipeList = new HashMap(); - public List combos = new ArrayList(); - public HashMap modifiers = new HashMap(); + public HashMap recipeList = new HashMap<>(); + public List combos = new ArrayList<>(); + public HashMap modifiers = new HashMap<>(); /* Build tools */ public static void addNormalToolRecipe(ToolCore output, Item head, Item handle) { diff --git a/src/main/java/tconstruct/library/crafting/ToolRecipe.java b/src/main/java/tconstruct/library/crafting/ToolRecipe.java index 07a8aac2..8ca0ab76 100644 --- a/src/main/java/tconstruct/library/crafting/ToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ToolRecipe.java @@ -11,10 +11,10 @@ import tconstruct.library.tools.ToolCore; */ public class ToolRecipe { - protected LinkedList headList = new LinkedList(); - protected LinkedList handleList = new LinkedList(); - protected LinkedList accessoryList = new LinkedList(); - protected LinkedList extraList = new LinkedList(); + protected LinkedList headList = new LinkedList<>(); + protected LinkedList handleList = new LinkedList<>(); + protected LinkedList accessoryList = new LinkedList<>(); + protected LinkedList extraList = new LinkedList<>(); protected ToolCore result; protected Item toolRod = TConstructRegistry.getItem("toolRod"); diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 2181157d..2e7ba11b 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -93,7 +93,7 @@ public abstract class HarvestTool extends ToolCore { @Override public Set getToolClasses(ItemStack stack) { - Set set = new HashSet(); + Set set = new HashSet<>(); if (stack != null && stack.getItem() instanceof HarvestTool) { set.add(((HarvestTool) stack.getItem()).getHarvestType()); diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index b1f6eb14..9a7b2916 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -110,20 +110,20 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq /* Rendering */ - public HashMap headIcons = new HashMap(); - public HashMap brokenIcons = new HashMap(); - public HashMap handleIcons = new HashMap(); - public HashMap accessoryIcons = new HashMap(); - public HashMap effectIcons = new HashMap(); - public HashMap extraIcons = new HashMap(); + public HashMap headIcons = new HashMap<>(); + public HashMap brokenIcons = new HashMap<>(); + public HashMap handleIcons = new HashMap<>(); + public HashMap accessoryIcons = new HashMap<>(); + public HashMap effectIcons = new HashMap<>(); + public HashMap extraIcons = new HashMap<>(); // Not liking this - public HashMap headStrings = new HashMap(); - public HashMap brokenPartStrings = new HashMap(); - public HashMap handleStrings = new HashMap(); - public HashMap accessoryStrings = new HashMap(); - public HashMap effectStrings = new HashMap(); - public HashMap extraStrings = new HashMap(); + public HashMap headStrings = new HashMap<>(); + public HashMap brokenPartStrings = new HashMap<>(); + public HashMap handleStrings = new HashMap<>(); + public HashMap accessoryStrings = new HashMap<>(); + public HashMap effectStrings = new HashMap<>(); + public HashMap extraStrings = new HashMap<>(); @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/tconstruct/library/util/HarvestLevels.java b/src/main/java/tconstruct/library/util/HarvestLevels.java index 3925cde3..d44f0151 100644 --- a/src/main/java/tconstruct/library/util/HarvestLevels.java +++ b/src/main/java/tconstruct/library/util/HarvestLevels.java @@ -9,7 +9,7 @@ import net.minecraft.util.StatCollector; public final class HarvestLevels { private HarvestLevels() {} // non-instantiable - public static final Map harvestLevelNames = new HashMap(); + public static final Map harvestLevelNames = new HashMap<>(); public static String getHarvestLevelName(int num) { return harvestLevelNames.containsKey(num) ? harvestLevelNames.get(num) : String.valueOf(num); diff --git a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java index fda662c1..2938cf49 100644 --- a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java @@ -207,11 +207,11 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe public abstract void playFiringSound( World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy); - public HashMap animationHeadIcons = new HashMap(); - public HashMap animationHandleIcons = new HashMap(); - public HashMap animationAccessoryIcons = new HashMap(); - public HashMap animationExtraIcons = new HashMap(); - public HashMap animationEffectIcons = new HashMap(); + public HashMap animationHeadIcons = new HashMap<>(); + public HashMap animationHandleIcons = new HashMap<>(); + public HashMap animationAccessoryIcons = new HashMap<>(); + public HashMap animationExtraIcons = new HashMap<>(); + public HashMap animationEffectIcons = new HashMap<>(); /** * return true if the current renderpass should use animations. diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java index 8440b1a9..d8be7e8c 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java @@ -17,8 +17,8 @@ import tconstruct.mechworks.landmine.*; */ public abstract class Behavior { - public static HashMap behaviorsListItems = new HashMap(); - public static HashMap behaviorsListBlocks = new HashMap(); + public static HashMap behaviorsListItems = new HashMap<>(); + public static HashMap behaviorsListBlocks = new HashMap<>(); protected static Behavior defaultBehavior; public static Behavior dummy = new BehaviorDummy(); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java index fee30cbb..df0f981d 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java @@ -17,7 +17,7 @@ import tconstruct.mechworks.logic.TileEntityLandmine; */ public abstract class SpecialStackHandler { - public static ArrayList handlers = new ArrayList(); + public static ArrayList handlers = new ArrayList<>(); public static void registerBuiltInStackHandlers() { addSpecialBehavior(new SpecialStackHandlerRocketFireball()); diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java index 5dc9bd60..3b12809e 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java @@ -39,7 +39,7 @@ public class LandmineExplodeLogic { boolean isOffensive = true; boolean cancelDefault = false; - ArrayList stacks = new ArrayList(); + ArrayList stacks = new ArrayList<>(); boolean hasExploded = false; if (tileEntity == null) { diff --git a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java index 7fb67c28..6e252856 100644 --- a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java +++ b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java @@ -10,7 +10,7 @@ public abstract class ItemModTypeFilter extends ItemModifier { public ItemModTypeFilter(int effect, String dataKey, ItemStack[] items, int[] values) { super(items, effect, dataKey); assert items.length == values.length : "Itemstacks and their values for tool modifiers must be the same length"; - this.increase = new ArrayList(); + this.increase = new ArrayList<>(); for (int i = 0; i < values.length; i++) { increase.add(values[i]); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java b/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java index ec6fdfd9..daa6dc75 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java @@ -34,7 +34,7 @@ public class ModAmmoRestock extends ItemModifier { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); // correct material? - Set materials = new HashSet(); + Set materials = new HashSet<>(); materials.add(tags.getInteger("Head")); // shuriken allow all their components if (tool.getItem() instanceof Shuriken) { diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java index 02b5f5bd..5681247f 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -11,7 +11,7 @@ import tconstruct.util.config.PHConstruct; /* TE3 support */ public class ModFlux extends ModBoolean { - public ArrayList batteries = new ArrayList(); + public ArrayList batteries = new ArrayList<>(); public int modifiersRequired = 1; // LALALALA totally not hidden IguanaTweaks Support LALALALA public ModFlux() { diff --git a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java index 1d5b931f..7449c3ff 100644 --- a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java +++ b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java @@ -16,7 +16,7 @@ public class GrindableHorse implements IFactoryGrindable { @Override public List grind(World world, EntityLivingBase entity, Random random) { - List drops = new ArrayList(); + List drops = new ArrayList<>(); drops.add(new MobDrop(10, new ItemStack(TinkerTools.materials, random.nextInt(4) + 1, 36))); diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java index 84f52174..e03a163e 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java @@ -21,7 +21,7 @@ public class RecipeHandlerAlloying extends RecipeHandlerBase { private int minAmount; public CachedAlloyingRecipe(AlloyMix recipe) { - this.fluidTanks = new ArrayList(); + this.fluidTanks = new ArrayList<>(); int maxAmount = recipe.mixers.get(0).amount; int mult = 1; diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java index 72a2a63b..10b81406 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java @@ -21,7 +21,7 @@ public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase { public CachedCastingRecipe(CastingRecipe recipe) { this.metal = new FluidTankElement(MOLTEN_FLOW, recipe.castingMetal.amount, recipe.castingMetal); this.metal.flowingTexture = true; - this.resources = new ArrayList(); + this.resources = new ArrayList<>(); if (recipe.cast != null) { this.resources.add(new PositionedStack(recipe.cast, 55, 19)); } else { @@ -42,7 +42,7 @@ public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase { @Override public List getFluidTanks() { - List res = new ArrayList(); + List res = new ArrayList<>(); res.add(this.metal); return res; } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java index d9847805..8d0f214d 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java @@ -27,7 +27,7 @@ public class RecipeHandlerCastingBasin extends RecipeHandlerCastingBase { public List getCastingRecipes() { LiquidCasting casting = TConstructRegistry.getBasinCasting(); if (casting == null) { - return new ArrayList(); + return new ArrayList<>(); } return casting.getCastingRecipes(); } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java index b9b58927..c74b3018 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java @@ -27,7 +27,7 @@ public class RecipeHandlerCastingTable extends RecipeHandlerCastingBase { public List getCastingRecipes() { LiquidCasting casting = TConstructRegistry.getTableCasting(); if (casting == null) { - return new ArrayList(); + return new ArrayList<>(); } return casting.getCastingRecipes(); } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java index 5411c0bb..245865e1 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java @@ -42,7 +42,7 @@ public class RecipeHandlerMelting extends RecipeHandlerBase { @Override public List getFluidTanks() { - List tanks = new ArrayList(); + List tanks = new ArrayList<>(); tanks.add(this.output); return tanks; } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java index 9091c003..2dfd2d59 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java @@ -33,7 +33,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase { public ArrowMaterial arrowMaterial; public CachedToolMaterialsRecipe(List toolParts, int materialID) { - this.toolParts = new ArrayList(); + this.toolParts = new ArrayList<>(); for (ItemStack stack : toolParts) { this.toolParts.add(new PositionedStack(stack, 10, 10)); } @@ -41,7 +41,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase { } public CachedToolMaterialsRecipe(List toolParts, int materialID, boolean arrowBow) { - this.toolParts = new ArrayList(); + this.toolParts = new ArrayList<>(); for (ItemStack stack : toolParts) { this.toolParts.add(new PositionedStack(stack, 10, 10)); } @@ -214,7 +214,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase { if (outputId.equals(this.getRecipeID())) { ToolMaterial mat; for (int matID : TConstructRegistry.toolMaterials.keySet()) { - List toolParts = new ArrayList(); + List toolParts = new ArrayList<>(); mat = TConstructRegistry.toolMaterials.get(matID); for (ItemKey key : PatternBuilder.instance.materials) { diff --git a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java index 82492ff8..7cb598c5 100644 --- a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java @@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; public class ActiveContainer extends Container { - public List activeInventorySlots = new ArrayList(); + public List activeInventorySlots = new ArrayList<>(); @Override public boolean canInteractWith(EntityPlayer entityplayer) { diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index a3bde0bd..3c4be30a 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -73,7 +73,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci public int[] meltingTemps; // values are multiplied by 10 private int tick; - public ArrayList moltenMetal = new ArrayList(); + public ArrayList moltenMetal = new ArrayList<>(); public int maxLiquid; public int currentLiquid; diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java index ff35182c..51a7e284 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java @@ -45,7 +45,7 @@ public final class ToolStationGuiHelper { : stack.getDisplayName(); Item item = stack.getItem(); NBTTagCompound tags = stack.getTagCompound(); - Collection categories = new LinkedList(); + Collection categories = new LinkedList<>(); // initialize drawing variables xPos = x; diff --git a/src/main/java/tconstruct/tools/items/Pattern.java b/src/main/java/tconstruct/tools/items/Pattern.java index ff6e5977..446a9821 100644 --- a/src/main/java/tconstruct/tools/items/Pattern.java +++ b/src/main/java/tconstruct/tools/items/Pattern.java @@ -73,7 +73,7 @@ public class Pattern extends CraftingItem implements IPattern { // 2 for full material, 1 for half. private static Map buildPatternCostMap() { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(0, 2); map.put(1, 1); diff --git a/src/main/java/tconstruct/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java index d466edbf..7d3990aa 100644 --- a/src/main/java/tconstruct/util/EnvironmentChecks.java +++ b/src/main/java/tconstruct/util/EnvironmentChecks.java @@ -15,12 +15,12 @@ public class EnvironmentChecks { * logs if so. Note: This code adds additional data to crashlogs. It does * not trigger any crashes. */ - private static List incompatibilities = new ArrayList(); + private static List incompatibilities = new ArrayList<>(); private static EnvironmentChecks instance = new EnvironmentChecks(); public static void verifyEnvironmentSanity() { - List modIds = new ArrayList(); + List modIds = new ArrayList<>(); // Bukkit/Magic Launcher/Optifine are caught by Mantle, so we no longer // check for those. diff --git a/src/main/java/tconstruct/util/IMCHandler.java b/src/main/java/tconstruct/util/IMCHandler.java index 10b6623f..4d4c52c7 100644 --- a/src/main/java/tconstruct/util/IMCHandler.java +++ b/src/main/java/tconstruct/util/IMCHandler.java @@ -102,9 +102,9 @@ public final class IMCHandler { PatternBuilder.instance.registerFullMaterial( item, value, TConstructRegistry.getMaterial(matID).materialName, shard, rod, matID); - List addItems = new LinkedList(); - List addMetas = new LinkedList(); - List addOUtputs = new LinkedList(); + List addItems = new LinkedList<>(); + List addMetas = new LinkedList<>(); + List addOUtputs = new LinkedList<>(); // add mappings for everything that has stone tool mappings for (Map.Entry mappingEntry : TConstructRegistry.patternPartMapping.entrySet()) { @@ -161,7 +161,7 @@ public final class IMCHandler { } // we add the toolpart to all smeltery recipies that use iron and create a toolpart - List newRecipies = new LinkedList(); + List newRecipies = new LinkedList<>(); for (CastingRecipe recipe : TConstructRegistry.getTableCasting().getCastingRecipes()) { if (recipe.castingMetal.getFluid() != TinkerSmeltery.moltenIronFluid) continue; if (recipe.cast == null || !(recipe.cast.getItem() instanceof IPattern)) continue; diff --git a/src/main/java/tconstruct/util/config/DimensionBlacklist.java b/src/main/java/tconstruct/util/config/DimensionBlacklist.java index 238bf371..57d02eb7 100644 --- a/src/main/java/tconstruct/util/config/DimensionBlacklist.java +++ b/src/main/java/tconstruct/util/config/DimensionBlacklist.java @@ -7,8 +7,8 @@ import net.minecraftforge.common.config.Configuration; import tconstruct.TConstruct; public class DimensionBlacklist { - public static ArrayList blacklistedDims = new ArrayList(); - public static ArrayList noPoolDims = new ArrayList(); + public static ArrayList blacklistedDims = new ArrayList<>(); + public static ArrayList noPoolDims = new ArrayList<>(); public static int promisedLandDimensionID = -100; public static int twilightForestDimensionID = -100; diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index bf94e09a..57d2279c 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -23,7 +23,7 @@ import net.minecraft.network.*; public class PacketPipeline extends MessageToMessageCodec { private EnumMap channels; - private LinkedList> packets = new LinkedList>(); + private LinkedList> packets = new LinkedList<>(); private boolean isPostInitialised = false; /** diff --git a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java index cb16a7b3..a88d46ca 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java @@ -61,7 +61,7 @@ public class WeaponryClientProxy extends WeaponryCommonProxy { } private void registerEntityRendering() { - ProjectileBaseRenderer defaultRenderer = new ProjectileBaseRenderer(); + ProjectileBaseRenderer defaultRenderer = new ProjectileBaseRenderer<>(); RenderingRegistry.registerEntityRenderingHandler(ShurikenEntity.class, new ShurikenEntityRenderer()); RenderingRegistry.registerEntityRenderingHandler(ThrowingKnifeEntity.class, defaultRenderer); RenderingRegistry.registerEntityRenderingHandler(JavelinEntity.class, new JavelinEntityRenderer()); diff --git a/src/main/java/tconstruct/world/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java index 3570b0a0..73f409b7 100644 --- a/src/main/java/tconstruct/world/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -990,7 +990,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS * break; case 2: items.add(new ItemStack(Block.stoneOvenIdle)); break; * } return items; */ - return new ArrayList(); + return new ArrayList<>(); } /** diff --git a/src/main/java/tconstruct/world/village/TVillageTrades.java b/src/main/java/tconstruct/world/village/TVillageTrades.java index 6acb7bc6..db7e720b 100644 --- a/src/main/java/tconstruct/world/village/TVillageTrades.java +++ b/src/main/java/tconstruct/world/village/TVillageTrades.java @@ -12,7 +12,7 @@ import tconstruct.world.TinkerWorld; public class TVillageTrades implements IVillageTradeHandler { - private final List allowedIngredients = new ArrayList(); + private final List allowedIngredients = new ArrayList<>(); private final int max = 17; private final int min = 7;