diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index bd694f21..9fb89df0 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -23,7 +23,7 @@ public final class Binnie { public static final ManagerResource Resource; static { - Managers = new ArrayList(); + Managers = new ArrayList<>(); Language = new ManagerLanguage(); Genetics = new ManagerGenetics(); Configuration = new ManagerConfig(); diff --git a/src/main/java/binnie/botany/ceramic/CeramicColor.java b/src/main/java/binnie/botany/ceramic/CeramicColor.java index f99d826b..2896a30f 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicColor.java +++ b/src/main/java/binnie/botany/ceramic/CeramicColor.java @@ -37,7 +37,7 @@ public class CeramicColor implements IDesignMaterial { } static { - CeramicColor.map = new LinkedHashMap(); + CeramicColor.map = new LinkedHashMap<>(); for (final EnumFlowerColor c : EnumFlowerColor.values()) { CeramicColor.map.put(c, new CeramicColor(c)); } diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index 835458ca..60f40d7a 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -25,7 +25,7 @@ public class CeramicTileRecipe implements IRecipe { final Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile); final Item ceramicBrick = Item.getItemFromBlock(Botany.ceramicBrick); final Item mortar = Botany.misc; - final List stacks = new ArrayList(); + final List stacks = new ArrayList<>(); int ix = -1; int iy = -1; for (int i = 0; i < inv.getSizeInventory(); ++i) { diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index ce42614c..80abddd8 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -33,8 +33,8 @@ public class GardenLogic extends FarmLogic { public GardenLogic(final IFarmHousing housing) { super(housing); - this.produce = new ArrayList(); - (this.farmables = new ArrayList()).add(new FarmableFlower()); + this.produce = new ArrayList<>(); + (this.farmables = new ArrayList<>()).add(new FarmableFlower()); this.farmables.add(new FarmableVanillaFlower()); } diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index 65323b8d..746bc3fd 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -561,7 +561,7 @@ public class TileEntityFlower extends TileEntity //implements IPollinatable, IBu } public Set getErrorStates() { - return new HashSet(); + return new HashSet<>(); } public static class RenderInfo { diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index 25440e9b..57419261 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -25,7 +25,7 @@ public class BlockPlant extends BlockBush { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } // @Override diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 2ee9b80f..152824b3 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -251,8 +251,8 @@ public class Gardening { // } static { - Gardening.fertiliserAcid = new LinkedHashMap(); - Gardening.fertiliserAlkaline = new LinkedHashMap(); - Gardening.fertiliserNutrient = new LinkedHashMap(); + Gardening.fertiliserAcid = new LinkedHashMap<>(); + Gardening.fertiliserAlkaline = new LinkedHashMap<>(); + Gardening.fertiliserNutrient = new LinkedHashMap<>(); } } diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index c9381ab5..0fe27067 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -264,8 +264,8 @@ public class ModuleGardening implements IInitializable { } static { - ModuleGardening.queuedAcidFertilisers = new HashMap(); - ModuleGardening.queuedAlkalineFertilisers = new HashMap(); - ModuleGardening.queuedNutrientFertilisers = new HashMap(); + ModuleGardening.queuedAcidFertilisers = new HashMap<>(); + ModuleGardening.queuedAlkalineFertilisers = new HashMap<>(); + ModuleGardening.queuedNutrientFertilisers = new HashMap<>(); } } diff --git a/src/main/java/binnie/botany/genetics/FlowerHelper.java b/src/main/java/binnie/botany/genetics/FlowerHelper.java index 1df51dee..6aadd1a5 100644 --- a/src/main/java/binnie/botany/genetics/FlowerHelper.java +++ b/src/main/java/binnie/botany/genetics/FlowerHelper.java @@ -21,7 +21,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { private static ArrayList colourMixes; public FlowerHelper() { - this.conversions = new HashMap(); + this.conversions = new HashMap<>(); } @Override @@ -245,9 +245,9 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { static { FlowerHelper.flowerSpeciesCount = -1; - FlowerHelper.flowerTemplates = new ArrayList(); - FlowerHelper.flowerMutations = new ArrayList(); - FlowerHelper.colourMixes = new ArrayList(); + FlowerHelper.flowerTemplates = new ArrayList<>(); + FlowerHelper.flowerMutations = new ArrayList<>(); + FlowerHelper.colourMixes = new ArrayList<>(); } diff --git a/src/main/java/binnie/botany/genetics/FlowerMutation.java b/src/main/java/binnie/botany/genetics/FlowerMutation.java index ca9aa6b3..d183e778 100644 --- a/src/main/java/binnie/botany/genetics/FlowerMutation.java +++ b/src/main/java/binnie/botany/genetics/FlowerMutation.java @@ -79,6 +79,6 @@ public class FlowerMutation implements IFlowerMutation { @Override public Collection getSpecialConditions() { - return new ArrayList(); + return new ArrayList<>(); } } diff --git a/src/main/java/binnie/botany/genetics/FlowerSpecies.java b/src/main/java/binnie/botany/genetics/FlowerSpecies.java index 3298ee10..8171c8af 100644 --- a/src/main/java/binnie/botany/genetics/FlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/FlowerSpecies.java @@ -361,7 +361,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { this.tempTolerance = EnumTolerance.BOTH_1; this.pHTolerance = EnumTolerance.NONE; this.moistureTolerance = EnumTolerance.NONE; - this.variantTemplates = new ArrayList(); + this.variantTemplates = new ArrayList<>(); this.name = name; this.binomial = binomial; this.branchName = branch; diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index efbed258..95a3f131 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -24,8 +24,8 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { protected List modules; public AbstractMod() { - this.fields = new LinkedHashSet(); - this.modules = new ArrayList(); + this.fields = new LinkedHashSet<>(); + this.modules = new ArrayList<>(); BinnieCore.registerMod(this); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 7568da94..c19f23af 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -148,7 +148,7 @@ public final class BinnieCore extends AbstractMod { } private static List getActiveMods() { - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (final AbstractMod mod : BinnieCore.modList) { if (mod.isActive()) { list.add(mod); @@ -218,7 +218,7 @@ public final class BinnieCore extends AbstractMod { } static { - BinnieCore.modList = new ArrayList(); + BinnieCore.modList = new ArrayList<>(); } public static class PacketHandler extends BinniePacketHandler { diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index 3c0bee3c..a680b2ae 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -77,7 +77,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { } public static ArrayList getBlockDropped(final IBlockMetadata block, final IBlockAccess world, final BlockPos pos, final int blockMeta) { - final ArrayList array = new ArrayList(); + final ArrayList array = new ArrayList<>(); final TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); if (tile != null && !tile.hasDroppedBlock()) { //final int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata()); @@ -87,7 +87,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { } public static boolean breakBlock(final IBlockMetadata block, final EntityPlayer player, final World world, final BlockPos pos) { - List drops = new ArrayList(); + List drops = new ArrayList<>(); final Block block2 = (Block) block; final TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); if (tile != null && !tile.hasDroppedBlock()) { diff --git a/src/main/java/binnie/core/circuits/BinnieCircuit.java b/src/main/java/binnie/core/circuits/BinnieCircuit.java index db9ad0c9..d3a83d5b 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuit.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuit.java @@ -15,7 +15,7 @@ public class BinnieCircuit implements ICircuit { private List tooltips; public BinnieCircuit(final String uid, final int limit, final ICircuitLayout layout, final ItemStack itemStack) { - this.tooltips = new ArrayList(); + this.tooltips = new ArrayList<>(); this.uid = "binnie.circuit." + uid; this.limit = limit; ChipsetManager.circuitRegistry.registerCircuit(this); diff --git a/src/main/java/binnie/core/genetics/BeeModifierLogic.java b/src/main/java/binnie/core/genetics/BeeModifierLogic.java index b54a97fc..687dcbe8 100644 --- a/src/main/java/binnie/core/genetics/BeeModifierLogic.java +++ b/src/main/java/binnie/core/genetics/BeeModifierLogic.java @@ -10,8 +10,8 @@ public class BeeModifierLogic { private List booleanModifiers; public BeeModifierLogic() { - this.modifiers = new HashMap(); - this.booleanModifiers = new ArrayList(); + this.modifiers = new HashMap<>(); + this.booleanModifiers = new ArrayList<>(); } public float getModifier(final EnumBeeModifier modifier, final float currentModifier) { diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index b9afef5d..08af1d55 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -39,14 +39,14 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { String currentEpithet; public BreedingSystem() { - this.allBranches = new ArrayList(); - this.allActiveSpecies = new ArrayList(); - this.allSpecies = new ArrayList(); - this.allMutations = new ArrayList(); - this.resultantMutations = new HashMap>(); - this.furtherMutations = new HashMap>(); - this.allResultantMutations = new HashMap>(); - this.allFurtherMutations = new HashMap>(); + this.allBranches = new ArrayList<>(); + this.allActiveSpecies = new ArrayList<>(); + this.allSpecies = new ArrayList<>(); + this.allMutations = new ArrayList<>(); + this.resultantMutations = new HashMap<>(); + this.furtherMutations = new HashMap<>(); + this.allResultantMutations = new HashMap<>(); + this.allFurtherMutations = new HashMap<>(); Binnie.Genetics.registerBreedingSystem(this); MinecraftForge.EVENT_BUS.register(this); } @@ -95,18 +95,18 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { public void calculateArrays() { final Collection allAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles().values(); - this.resultantMutations = new HashMap>(); - this.furtherMutations = new HashMap>(); - this.allResultantMutations = new HashMap>(); - this.allFurtherMutations = new HashMap>(); - this.allActiveSpecies = new ArrayList(); - this.allSpecies = new ArrayList(); + this.resultantMutations = new HashMap<>(); + this.furtherMutations = new HashMap<>(); + this.allResultantMutations = new HashMap<>(); + this.allFurtherMutations = new HashMap<>(); + this.allActiveSpecies = new ArrayList<>(); + this.allSpecies = new ArrayList<>(); for (final IAllele species : allAlleles) { if (this.getSpeciesRoot().getTemplate(species.getUID()) != null) { - this.resultantMutations.put((IAlleleSpecies) species, new ArrayList()); - this.furtherMutations.put((IAlleleSpecies) species, new ArrayList()); - this.allResultantMutations.put((IAlleleSpecies) species, new ArrayList()); - this.allFurtherMutations.put((IAlleleSpecies) species, new ArrayList()); + this.resultantMutations.put((IAlleleSpecies) species, new ArrayList<>()); + this.furtherMutations.put((IAlleleSpecies) species, new ArrayList<>()); + this.allResultantMutations.put((IAlleleSpecies) species, new ArrayList<>()); + this.allFurtherMutations.put((IAlleleSpecies) species, new ArrayList<>()); this.allSpecies.add((IAlleleSpecies) species); if (this.isBlacklisted(species) || species.getUID().contains("speciesBotAlfheim")) { continue; @@ -114,9 +114,9 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { this.allActiveSpecies.add((IAlleleSpecies) species); } } - this.allMutations = new ArrayList(); + this.allMutations = new ArrayList<>(); final Collection allRegBranches = AlleleManager.alleleRegistry.getRegisteredClassifications().values(); - this.allBranches = new ArrayList(); + this.allBranches = new ArrayList<>(); for (final IClassification branch : allRegBranches) { if (branch.getMemberSpecies().length > 0 && this.getSpeciesRoot().getTemplate(branch.getMemberSpecies()[0].getUID()) != null) { boolean possible = false; @@ -132,14 +132,14 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } } if (this.getSpeciesRoot().getMutations(false) != null) { - final Set mutations = new LinkedHashSet(); + final Set mutations = new LinkedHashSet<>(); mutations.addAll(this.getSpeciesRoot().getMutations(false)); if (this == Binnie.Genetics.beeBreedingSystem) { mutations.addAll(ExtraBeeMutation.mutations); } for (final IMutation mutation : mutations) { this.allMutations.add(mutation); - final Set participatingSpecies = new LinkedHashSet(); + final Set participatingSpecies = new LinkedHashSet<>(); if (mutation.getAllele0() instanceof IAlleleSpecies) { participatingSpecies.add(mutation.getAllele0()); } @@ -222,7 +222,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public final Collection getDiscoveredBranches(final World world, final GameProfile player) { - final List branches = new ArrayList(); + final List branches = new ArrayList<>(); for (final IClassification branch : this.getAllBranches()) { boolean discovered = false; for (final IAlleleSpecies species : branch.getMemberSpecies()) { @@ -238,7 +238,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public final Collection getDiscoveredBranches(final IBreedingTracker tracker) { - final List branches = new ArrayList(); + final List branches = new ArrayList<>(); for (final IClassification branch : this.getAllBranches()) { boolean discovered = false; for (final IAlleleSpecies species : branch.getMemberSpecies()) { @@ -254,7 +254,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public final Collection getDiscoveredSpecies(final World world, final GameProfile player) { - final List speciesList = new ArrayList(); + final List speciesList = new ArrayList<>(); for (final IAlleleSpecies species : this.getAllSpecies()) { if (this.isSpeciesDiscovered(species, world, player)) { speciesList.add(species); @@ -264,7 +264,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public final Collection getDiscoveredSpecies(final IBreedingTracker tracker) { - final List speciesList = new ArrayList(); + final List speciesList = new ArrayList<>(); for (final IAlleleSpecies species : this.getAllSpecies()) { if (this.isSpeciesDiscovered(species, tracker)) { speciesList.add(species); @@ -274,7 +274,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public final List getDiscoveredMutations(final World world, final GameProfile player) { - final List speciesList = new ArrayList(); + final List speciesList = new ArrayList<>(); for (final IMutation species : this.getAllMutations()) { if (this.isMutationDiscovered(species, world, player)) { speciesList.add(species); @@ -284,7 +284,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public final List getDiscoveredMutations(final IBreedingTracker tracker) { - final List speciesList = new ArrayList(); + final List speciesList = new ArrayList<>(); for (final IMutation species : this.getAllMutations()) { if (this.isMutationDiscovered(species, tracker)) { speciesList.add(species); diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 7b04bef8..0a04f085 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -28,9 +28,9 @@ public class ManagerGenetics extends ManagerBase { private Map>> chromosomeArray; public ManagerGenetics() { - this.BREEDING_SYSTEMS = new LinkedHashMap(); - this.invalidChromosomeTypes = new ArrayList(); - this.chromosomeArray = new LinkedHashMap>>(); + this.BREEDING_SYSTEMS = new LinkedHashMap<>(); + this.invalidChromosomeTypes = new ArrayList<>(); + this.chromosomeArray = new LinkedHashMap<>(); } @Override @@ -147,9 +147,9 @@ public class ManagerGenetics extends ManagerBase { this.invalidChromosomeTypes.clear(); for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { final BreedingSystem system = this.getSystem(root); - final Map> chromosomeMap = new LinkedHashMap>(); + final Map> chromosomeMap = new LinkedHashMap<>(); for (final IChromosomeType chromosome : root.getKaryotype()) { - final TreeSet alleles = new TreeSet(new ComparatorAllele()); + final TreeSet alleles = new TreeSet<>(new ComparatorAllele()); for (final IIndividual individual : root.getIndividualTemplates()) { final IGenome genome = individual.getGenome(); try { @@ -169,7 +169,7 @@ public class ManagerGenetics extends ManagerBase { if (alleles.size() == 0) { this.invalidChromosomeTypes.add(chromosome); } else { - final List alleleList = new ArrayList(); + final List alleleList = new ArrayList<>(); alleleList.addAll(alleles); chromosomeMap.put(chromosome, alleleList); } diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 4fea1064..e97faeab 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -136,7 +136,7 @@ public class TreeBreedingSystem extends BreedingSystem { public Collection getTreesThatBearFruit(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); - final List found = new ArrayList(); + final List found = new ArrayList<>(); for (final IAlleleSpecies species : set) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); @@ -151,8 +151,8 @@ public class TreeBreedingSystem extends BreedingSystem { public Collection getTreesThatCanBearFruit(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); - final List found = new ArrayList(); - final Set providers = new HashSet(); + final List found = new ArrayList<>(); + final Set providers = new HashSet<>(); for (final IAlleleSpecies species : set) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); @@ -176,7 +176,7 @@ public class TreeBreedingSystem extends BreedingSystem { public Collection getTreesThatHaveWood(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); - final List found = new ArrayList(); + final List found = new ArrayList<>(); for (final IAlleleSpecies species : set) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); @@ -194,10 +194,10 @@ public class TreeBreedingSystem extends BreedingSystem { public Collection getTreesThatMakePlanks(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { if (fruit == null) { - return new ArrayList(); + return new ArrayList<>(); } final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); - final List found = new ArrayList(); + final List found = new ArrayList<>(); for (final IAlleleSpecies species : set) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index 7463b7c2..6f7d3337 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import java.util.ArrayList; public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier { - ArrayList beeModifier = new ArrayList(); + ArrayList beeModifier = new ArrayList<>(); private InventoryBeeHousing beeInventory; public VirtualBeeHousing(final EntityPlayer player) { diff --git a/src/main/java/binnie/core/language/ManagerLanguage.java b/src/main/java/binnie/core/language/ManagerLanguage.java index 6bf880d5..0f0e6a00 100644 --- a/src/main/java/binnie/core/language/ManagerLanguage.java +++ b/src/main/java/binnie/core/language/ManagerLanguage.java @@ -11,7 +11,7 @@ public class ManagerLanguage extends ManagerBase { private Map objNames; public ManagerLanguage() { - this.objNames = new HashMap(); + this.objNames = new HashMap<>(); } public void addObjectName(final Object obj, final String name) { diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index e0971c37..4b237c95 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -174,7 +174,7 @@ public class ItemFluidContainer extends ItemFood { ItemFluidContainer.LiquidSpirit = 512; ItemFluidContainer.LiquidLiqueuer = 640; ItemFluidContainer.LiquidGenetics = 768; - ItemFluidContainer.idToFluid = new HashMap(); - ItemFluidContainer.fluidToID = new HashMap(); + ItemFluidContainer.idToFluid = new HashMap<>(); + ItemFluidContainer.fluidToID = new HashMap<>(); } } diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 583dd17f..76c0801d 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -12,7 +12,7 @@ public class ManagerLiquid extends ManagerBase { Map fluids; public ManagerLiquid() { - this.fluids = new LinkedHashMap(); + this.fluids = new LinkedHashMap<>(); } public Collection getFluidTypes() { diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 0e5e2288..bc30b8a2 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -183,7 +183,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index 63d4b731..9fde64c1 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -35,8 +35,8 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN private GameProfile owner; public Machine(final MachinePackage pack, final TileEntity tile) { - this.componentInterfaceMap = new LinkedHashMap>(); - this.componentMap = new LinkedHashMap, MachineComponent>(); + this.componentInterfaceMap = new LinkedHashMap<>(); + this.componentMap = new LinkedHashMap<>(); this.queuedInventoryUpdate = false; this.nextProgressBarID = 0; this.owner = null; @@ -54,7 +54,7 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN this.componentMap.put(component.getClass(), component); for (final Class inter : component.getComponentInterfaces()) { if (!this.componentInterfaceMap.containsKey(inter)) { - this.componentInterfaceMap.put(inter, new ArrayList()); + this.componentInterfaceMap.put(inter, new ArrayList<>()); } this.componentInterfaceMap.get(inter).add(component); } @@ -86,7 +86,7 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN @Override public List getInterfaces(final Class interfaceClass) { - final ArrayList interfaces = new ArrayList(); + final ArrayList interfaces = new ArrayList<>(); if (!this.hasInterface(interfaceClass)) { return interfaces; } diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index dcda3ab3..4dbaaf0b 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -23,8 +23,8 @@ public class MachineGroup { private boolean renderedTileEntity; public MachineGroup(final AbstractMod mod, final String uid, final String blockName, final IMachineType[] types) { - this.packages = new LinkedHashMap(); - this.packagesID = new LinkedHashMap(); + this.packages = new LinkedHashMap<>(); + this.packagesID = new LinkedHashMap<>(); this.customRenderer = true; this.renderedTileEntity = true; this.mod = mod; diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index 196d5e1b..3080e207 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -164,7 +164,7 @@ public class MachineUtil { } public List getNonNullStacks(final int[] slotacclimatiser) { - final List stacks = new ArrayList(); + final List stacks = new ArrayList<>(); for (final ItemStack stack : this.getStacks(slotacclimatiser)) { if (stack != null) { stacks.add(stack); diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index eb4e51bb..bab6305b 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -21,10 +21,10 @@ public class ManagerMachine extends ManagerBase { private int machineRenderID; public ManagerMachine() { - this.componentInterfaceMap = new HashMap, Class[]>(); - this.machineGroups = new HashMap(); - this.networkIDToComponent = new HashMap>(); - this.componentToNetworkID = new HashMap, Integer>(); + this.componentInterfaceMap = new HashMap<>(); + this.machineGroups = new HashMap<>(); + this.networkIDToComponent = new HashMap<>(); + this.componentToNetworkID = new HashMap<>(); this.nextNetworkID = 0; } @@ -45,7 +45,7 @@ public class ManagerMachine extends ManagerBase { if (this.componentInterfaceMap.containsKey(component)) { return; } - final Set> interfaces = new HashSet>(); + final Set> interfaces = new HashSet<>(); for (Class currentClass = component; currentClass != null; currentClass = null) { for (final Class clss : currentClass.getInterfaces()) { interfaces.add(clss); diff --git a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java index 500028a0..0d9abf8f 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java @@ -16,7 +16,7 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork. public ComponentChargedSlots(final Machine machine) { super(machine); - this.charges = new HashMap(); + this.charges = new HashMap<>(); } @Override diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index e79b842a..b505f103 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -21,7 +21,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve public ComponentInventorySlots(final IMachine machine) { super(machine); - this.inventory = new LinkedHashMap(); + this.inventory = new LinkedHashMap<>(); } //TODO Implement @@ -188,7 +188,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve @Override public InventorySlot[] getSlots(final int[] indexes) { - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (final int i : indexes) { if (this.getSlot(i) != null) { list.add(this.getSlot(i)); @@ -237,7 +237,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve @Override public int[] getSlotsForFace(final EnumFacing var1) { - final List slots = new ArrayList(); + final List slots = new ArrayList<>(); for (final InventorySlot slot : this.inventory.values()) { if (slot.canInsert() || slot.canExtract()) { slots.add(slot.getIndex()); diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java index 119bd847..a2ac3673 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java @@ -14,7 +14,7 @@ public class ComponentInventoryTransfer extends MachineComponent { public ComponentInventoryTransfer(final IMachine machine) { super(machine); - this.transfers = new ArrayList(); + this.transfers = new ArrayList<>(); } public void addRestock(final int[] buffer, final int destination, final int limit) { diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index cda0812b..3360f718 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -22,7 +22,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac public ComponentTankContainer(final IMachine machine) { super(machine); - this.tanks = new LinkedHashMap(); + this.tanks = new LinkedHashMap<>(); } @Override @@ -147,7 +147,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac @Override public IFluidTank[] getTanks() { - final List ltanks = new ArrayList(); + final List ltanks = new ArrayList<>(); for (final TankSlot tank : this.tanks.values()) { ltanks.add(tank.getTank()); } diff --git a/src/main/java/binnie/core/machines/inventory/SetList.java b/src/main/java/binnie/core/machines/inventory/SetList.java index ef670585..a5e73ae4 100644 --- a/src/main/java/binnie/core/machines/inventory/SetList.java +++ b/src/main/java/binnie/core/machines/inventory/SetList.java @@ -26,7 +26,7 @@ public class SetList extends ArrayList implements Set { @Override public boolean addAll(final int index, final Collection c) { - final Collection copy = new ArrayList(c); + final Collection copy = new ArrayList<>(c); copy.removeAll(this); return super.addAll(index, copy); } diff --git a/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/src/main/java/binnie/core/machines/inventory/SidedAccess.java index c5e53bff..b998b9e2 100644 --- a/src/main/java/binnie/core/machines/inventory/SidedAccess.java +++ b/src/main/java/binnie/core/machines/inventory/SidedAccess.java @@ -11,7 +11,7 @@ class SidedAccess { private boolean extractLocked; public SidedAccess() { - this.accesses = new HashMap(); + this.accesses = new HashMap<>(); this.base = AccessDirection.Both; this.insertLocked = false; this.extractLocked = false; @@ -50,7 +50,7 @@ class SidedAccess { } public Collection getInsertionSides() { - final List dirs = new ArrayList(); + final List dirs = new ArrayList<>(); for (final EnumFacing dir : EnumFacing.VALUES) { if (this.getAccess(dir).canInsert()) { dirs.add(dir); @@ -60,7 +60,7 @@ class SidedAccess { } public Collection getExtractionSides() { - final List dirs = new ArrayList(); + final List dirs = new ArrayList<>(); for (final EnumFacing dir : EnumFacing.VALUES) { if (this.getAccess(dir).canExtract()) { dirs.add(dir); diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java index 0c26f8de..54beca4b 100644 --- a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java +++ b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java @@ -12,8 +12,8 @@ public class ValidatorIcon { private List iconsOutput; public ValidatorIcon(final AbstractMod mod, final String pathInput, final String pathOutput) { - this.iconsInput = new ArrayList(); - this.iconsOutput = new ArrayList(); + this.iconsInput = new ArrayList<>(); + this.iconsOutput = new ArrayList<>(); this.iconsInput.add(Binnie.Resource.getItemIcon(mod, pathInput)); this.iconsOutput.add(Binnie.Resource.getItemIcon(mod, pathOutput)); } diff --git a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java index 4b3a8938..df66a008 100644 --- a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java +++ b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java @@ -24,7 +24,7 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered super(machine); this.registeredToIC2EnergyNet = false; this.previousPower = 0.0f; - this.inputs = new LinkedList(); + this.inputs = new LinkedList<>(); this.container = new PowerInterface(storage); // if (!this.registeredToIC2EnergyNet) { // this.addToEnergyNet(); diff --git a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java index 3566faae..b0715c00 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java +++ b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java @@ -22,7 +22,7 @@ class ComponentCompartmentInventory extends ComponentInventorySlots implements I public ComponentCompartmentInventory(final IMachine machine, final int tabs, final int pageSize) { super(machine); - this.tabs = new HashMap(); + this.tabs = new HashMap<>(); this.numberOfTabs = tabs; this.slotsPerPage = pageSize; for (int i = 0; i < this.numberOfTabs * this.slotsPerPage; ++i) { diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 05e91eac..2abaea77 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -57,7 +57,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh public WindowCompartment(final EntityPlayer player, final IInventory inventory, final Side side) { super(320, 226, player, inventory, side); - this.panels = new HashMap(); + this.panels = new HashMap<>(); this.currentTab = 0; } @@ -128,7 +128,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } }.setOrigin(EventHandler.Origin.DirectChild, tab)); x += 24; - final ControlPages compartmentPages = new ControlPages(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight); + final ControlPages compartmentPages = new ControlPages<>(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight); final ControlPage[] page = new ControlPage[inv.getTabNumber()]; for (int p = 0; p < inv.getTabNumber(); ++p) { page[p] = new ControlPage(compartmentPages, Integer.valueOf(p)); @@ -336,7 +336,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } private void updateSearch() { - Map slotIds = new HashMap(); + Map slotIds = new HashMap<>(); final IInventory inv = WindowCompartment.this.getInventory(); for (int i = 0; i < inv.getSizeInventory(); ++i) { final ItemStack stack = inv.getStackInSlot(i); diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index 5364c462..fffb2f48 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -33,8 +33,8 @@ public class TransferRequest { this.targetTanks = new int[0]; this.transferLiquids = true; this.ignoreReadOnly = false; - this.insertedSlots = new ArrayList(); - this.insertedTanks = new ArrayList(); + this.insertedSlots = new ArrayList<>(); + this.insertedTanks = new ArrayList<>(); final int[] target = new int[destination.getSizeInventory()]; for (int i = 0; i < target.length; ++i) { target[i] = i; diff --git a/src/main/java/binnie/core/mod/config/ManagerConfig.java b/src/main/java/binnie/core/mod/config/ManagerConfig.java index bfa97117..296d8d86 100644 --- a/src/main/java/binnie/core/mod/config/ManagerConfig.java +++ b/src/main/java/binnie/core/mod/config/ManagerConfig.java @@ -13,8 +13,8 @@ public class ManagerConfig extends ManagerBase { private Map> itemIDs; public ManagerConfig() { - this.configurations = new LinkedHashMap, Configuration>(); - this.itemIDs = new HashMap>(); + this.configurations = new LinkedHashMap<>(); + this.itemIDs = new HashMap<>(); } public void registerConfiguration(final Class cls, final AbstractMod mod) { @@ -48,7 +48,7 @@ public class ManagerConfig extends ManagerBase { public void addItemID(final Integer configValue, final String configKey, final BinnieConfiguration configFile) { if (!this.itemIDs.containsKey(configFile.mod)) { - this.itemIDs.put(configFile.mod, new ArrayList()); + this.itemIDs.put(configFile.mod, new ArrayList<>()); } this.itemIDs.get(configFile.mod).add(new BinnieItemData(configValue + 256, configFile, configKey)); } diff --git a/src/main/java/binnie/core/mod/config/PropertyBase.java b/src/main/java/binnie/core/mod/config/PropertyBase.java index 39bfeb17..2e807b56 100644 --- a/src/main/java/binnie/core/mod/config/PropertyBase.java +++ b/src/main/java/binnie/core/mod/config/PropertyBase.java @@ -18,7 +18,7 @@ abstract class PropertyBase { private Field field; protected PropertyBase(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final AnnotationType annotedProperty) throws IllegalArgumentException, IllegalAccessException { - this.comments = new ArrayList(); + this.comments = new ArrayList<>(); this.field = field; this.file = file; this.configProperty = configProperty; diff --git a/src/main/java/binnie/core/mod/parser/FieldParser.java b/src/main/java/binnie/core/mod/parser/FieldParser.java index 11647895..a1d3d0a2 100644 --- a/src/main/java/binnie/core/mod/parser/FieldParser.java +++ b/src/main/java/binnie/core/mod/parser/FieldParser.java @@ -45,6 +45,6 @@ public abstract class FieldParser { } static { - FieldParser.parsers = new ArrayList(); + FieldParser.parsers = new ArrayList<>(); } } diff --git a/src/main/java/binnie/core/network/packet/MachinePayload.java b/src/main/java/binnie/core/network/packet/MachinePayload.java index 04069f3a..96eebb41 100644 --- a/src/main/java/binnie/core/network/packet/MachinePayload.java +++ b/src/main/java/binnie/core/network/packet/MachinePayload.java @@ -10,9 +10,9 @@ public class MachinePayload { private int id; public MachinePayload(final int id) { - this.intPayload = new ArrayList(); - this.floatPayload = new ArrayList(); - this.stringPayload = new ArrayList(); + this.intPayload = new ArrayList<>(); + this.floatPayload = new ArrayList<>(); + this.stringPayload = new ArrayList<>(); this.id = 0; this.id = id; this.intPayload.clear(); @@ -21,9 +21,9 @@ public class MachinePayload { } public MachinePayload() { - this.intPayload = new ArrayList(); - this.floatPayload = new ArrayList(); - this.stringPayload = new ArrayList(); + this.intPayload = new ArrayList<>(); + this.floatPayload = new ArrayList<>(); + this.stringPayload = new ArrayList<>(); this.id = 0; } diff --git a/src/main/java/binnie/core/network/packet/PacketPayload.java b/src/main/java/binnie/core/network/packet/PacketPayload.java index 1a521a26..0fdaf3b9 100644 --- a/src/main/java/binnie/core/network/packet/PacketPayload.java +++ b/src/main/java/binnie/core/network/packet/PacketPayload.java @@ -11,9 +11,9 @@ public class PacketPayload { public List stringPayload; public PacketPayload() { - this.intPayload = new ArrayList(); - this.floatPayload = new ArrayList(); - this.stringPayload = new ArrayList(); + this.intPayload = new ArrayList<>(); + this.floatPayload = new ArrayList<>(); + this.stringPayload = new ArrayList<>(); this.intPayload.clear(); this.floatPayload.clear(); this.stringPayload.clear(); diff --git a/src/main/java/binnie/core/resource/ManagerResource.java b/src/main/java/binnie/core/resource/ManagerResource.java index 16381dbb..30f7b793 100644 --- a/src/main/java/binnie/core/resource/ManagerResource.java +++ b/src/main/java/binnie/core/resource/ManagerResource.java @@ -10,7 +10,7 @@ public class ManagerResource { private List icons; public ManagerResource() { - this.icons = new ArrayList(); + this.icons = new ArrayList<>(); } public BinnieResource getPNG(final AbstractMod mod, final ResourceType type, final String path) { diff --git a/src/main/java/binnie/core/texture/TextureManager.java b/src/main/java/binnie/core/texture/TextureManager.java index 80bd8e68..182811e9 100644 --- a/src/main/java/binnie/core/texture/TextureManager.java +++ b/src/main/java/binnie/core/texture/TextureManager.java @@ -15,6 +15,6 @@ public class TextureManager { } static { - TextureManager.textures = new ArrayList(); + TextureManager.textures = new ArrayList<>(); } } diff --git a/src/main/java/binnie/core/util/FluidStackSet.java b/src/main/java/binnie/core/util/FluidStackSet.java index 03ee079a..c34b12ec 100644 --- a/src/main/java/binnie/core/util/FluidStackSet.java +++ b/src/main/java/binnie/core/util/FluidStackSet.java @@ -8,7 +8,7 @@ class FluidStackSet implements Set { List itemStacks; FluidStackSet() { - this.itemStacks = new ArrayList(); + this.itemStacks = new ArrayList<>(); } @Override diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index 2b4d25c3..c4d26b1d 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -8,7 +8,7 @@ public class ItemStackSet implements Set { List itemStacks; public ItemStackSet() { - this.itemStacks = new ArrayList(); + this.itemStacks = new ArrayList<>(); } @Override diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java index b8c36bb5..a575c328 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java @@ -59,7 +59,7 @@ public class WindowFieldKit extends Window { this.glassRand = new Random(); this.analyseProgress = 1.0f; this.isAnalysing = false; - this.info = new HashMap(); + this.info = new HashMap<>(); this.prev = null; } @@ -178,7 +178,7 @@ public class WindowFieldKit extends Window { for (final IChromosomeType type : root.getKaryotype()) { if (!Binnie.Genetics.isInvalidChromosome(type)) { final IAllele allele = ind.getGenome().getActiveAllele(type); - final List infos = new ArrayList(); + final List infos = new ArrayList<>(); int i = 0; for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.Language.canLocalise(pref + i); ++i) { infos.add(Binnie.Language.localise(pref + i)); diff --git a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java index 09f35695..d5982729 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java @@ -104,7 +104,7 @@ public class WindowGenesis extends Window { this.geneOptions = new ControlListBox(this, two.x(), two.y(), two.w(), two.h(), 10.0f) { @Override public IWidget createOption(final Gene value, final int y) { - return new ControlTextOption(this.getContent(), value, y); + return new ControlTextOption<>(this.getContent(), value, y); } }; tabSystems.addEventHandler(new EventValueChanged.Handler() { @@ -119,7 +119,7 @@ public class WindowGenesis extends Window { @Override public void onEvent(final EventValueChanged event) { final Map> map = Binnie.Genetics.getChromosomeMap(WindowGenesis.this.root); - final List opts = new ArrayList(); + final List opts = new ArrayList<>(); final IChromosomeType chromo = ((Gene) event.value) != null ? ((Gene) event.value).getChromosome() : null; if (chromo != null)// fix NPE for (final IAllele allele : map.get(chromo)) { @@ -147,7 +147,7 @@ public class WindowGenesis extends Window { } private void refreshTemplate(final IChromosomeType selection) { - final List genes = new ArrayList(); + final List genes = new ArrayList<>(); final IChromosomeType[] arr$; final IChromosomeType[] chromos = arr$ = Binnie.Genetics.getChromosomeMap(this.root).keySet().toArray(new IChromosomeType[0]); for (final IChromosomeType type : arr$) { @@ -162,7 +162,7 @@ public class WindowGenesis extends Window { if (selection != null) { this.geneList.setValue(new Gene(this.template[selection.ordinal()], selection, this.root)); } else { - this.geneOptions.setOptions(new ArrayList()); + this.geneOptions.setOptions(new ArrayList<>()); } this.refreshPickup(); } diff --git a/src/main/java/binnie/craftgui/botany/PageColourMix.java b/src/main/java/binnie/craftgui/botany/PageColourMix.java index 8bf06d6e..99220d87 100644 --- a/src/main/java/binnie/craftgui/botany/PageColourMix.java +++ b/src/main/java/binnie/craftgui/botany/PageColourMix.java @@ -24,7 +24,7 @@ public class PageColourMix extends PageAbstract { @Override public void onValueChanged(final IFlowerColour colour) { - final List mixes = new ArrayList(); + final List mixes = new ArrayList<>(); for (final IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) { if (mix.getColour1() == colour || mix.getColour2() == colour) { mixes.add(mix); diff --git a/src/main/java/binnie/craftgui/botany/PageColourMixResultant.java b/src/main/java/binnie/craftgui/botany/PageColourMixResultant.java index ff019e5a..fc83b50c 100644 --- a/src/main/java/binnie/craftgui/botany/PageColourMixResultant.java +++ b/src/main/java/binnie/craftgui/botany/PageColourMixResultant.java @@ -24,7 +24,7 @@ public class PageColourMixResultant extends PageAbstract { @Override public void onValueChanged(final IFlowerColour colour) { - final List mixes = new ArrayList(); + final List mixes = new ArrayList<>(); for (final IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) { if (mix.getResult() == colour) { mixes.add(mix); diff --git a/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java b/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java index 5a2a80f8..d5caed44 100644 --- a/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java +++ b/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java @@ -47,7 +47,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { return new ControlColourOption(((ControlScrollableContent>) this).getContent(), value, y); } }; - final List colors = new ArrayList(); + final List colors = new ArrayList<>(); for (final IFlowerColour c : EnumFlowerColor.values()) { colors.add(c); } diff --git a/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java b/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java index 3a9e78ae..fb574cfe 100644 --- a/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java +++ b/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java @@ -40,7 +40,7 @@ public class ControlEnumButton extends ControlButton implements IControlValue public ControlEnumButton(final IWidget parent, final float x, final float y, final float width, final float height, final T[] values) { super(parent, x, y, width, height, ""); - this.enumConstants = new ArrayList(); + this.enumConstants = new ArrayList<>(); for (final T value : values) { this.enumConstants.add(value); } diff --git a/src/main/java/binnie/craftgui/controls/core/Control.java b/src/main/java/binnie/craftgui/controls/core/Control.java index e0dfa90b..0c906e5f 100644 --- a/src/main/java/binnie/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/craftgui/controls/core/Control.java @@ -15,8 +15,8 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { public Control(final IWidget parent, final float x, final float y, final float w, final float h) { super(parent); - this.helpStrings = new ArrayList(); - this.tooltipStrings = new ArrayList(); + this.helpStrings = new ArrayList<>(); + this.tooltipStrings = new ArrayList<>(); this.extraLevel = 0; this.setPosition(new IPoint(x, y)); this.setSize(new IPoint(w, h)); diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/craftgui/controls/listbox/ControlList.java index 7393cddf..992494d2 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlList.java @@ -22,8 +22,8 @@ public class ControlList extends Control implements IControlValue { protected ControlList(final ControlListBox parent, final float x, final float y, final float w, final float h) { super(parent, x, y, w, h); this.value = null; - this.allOptions = new LinkedHashMap(); - this.optionWidgets = new LinkedHashMap(); + this.allOptions = new LinkedHashMap<>(); + this.optionWidgets = new LinkedHashMap<>(); this.creating = false; this.parent = parent; } diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java b/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java index c11d224f..85361437 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java @@ -15,7 +15,7 @@ public class ControlListBox extends ControlScrollableContent> @Override public void initialise() { - this.setScrollableContent(new ControlList(this, 1.0f, 1.0f, this.w() - 2.0f - this.scrollBarSize, this.h() - 2.0f)); + this.setScrollableContent(new ControlList<>(this, 1.0f, 1.0f, this.w() - 2.0f - this.scrollBarSize, this.h() - 2.0f)); this.addEventHandler(new EventKey.Down.Handler() { @Override public void onEvent(final EventKey.Down event) { @@ -49,7 +49,7 @@ public class ControlListBox extends ControlScrollableContent> } public IWidget createOption(final T value, final int y) { - return new ControlOption(this.getContent(), value, y); + return new ControlOption<>(this.getContent(), value, y); } public void setValidator(final IValidator validator) { diff --git a/src/main/java/binnie/craftgui/controls/page/ControlPages.java b/src/main/java/binnie/craftgui/controls/page/ControlPages.java index 1caf872e..fb26bcd2 100644 --- a/src/main/java/binnie/craftgui/controls/page/ControlPages.java +++ b/src/main/java/binnie/craftgui/controls/page/ControlPages.java @@ -42,7 +42,7 @@ public class ControlPages extends Control implements IControlValues, ICont @Override public Collection getValues() { - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (final IWidget child : this.getWidgets()) { list.add((T) ((IControlValue) child).getValue()); } diff --git a/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java b/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java index 784b60b4..78e9e8b3 100644 --- a/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java +++ b/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java @@ -49,7 +49,7 @@ public class ControlTabBar extends Control implements IControlValue { } public ControlTab createTab(final float x, final float y, final float w, final float h, final T value) { - return new ControlTab(this, x, y, w, h, value); + return new ControlTab<>(this, x, y, w, h, value); } @Override diff --git a/src/main/java/binnie/craftgui/core/Tooltip.java b/src/main/java/binnie/craftgui/core/Tooltip.java index 1e25a497..a4408b6e 100644 --- a/src/main/java/binnie/craftgui/core/Tooltip.java +++ b/src/main/java/binnie/craftgui/core/Tooltip.java @@ -13,7 +13,7 @@ public class Tooltip { public int maxWidth; public Tooltip() { - this.tooltip = new ArrayList(); + this.tooltip = new ArrayList<>(); this.type = Type.Standard; this.maxWidth = 256; } diff --git a/src/main/java/binnie/craftgui/core/TopLevelWidget.java b/src/main/java/binnie/craftgui/core/TopLevelWidget.java index 3b9a38ed..9fcb96d2 100644 --- a/src/main/java/binnie/craftgui/core/TopLevelWidget.java +++ b/src/main/java/binnie/craftgui/core/TopLevelWidget.java @@ -150,7 +150,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { } public Deque calculateMousedOverWidgets() { - final Deque list = new ArrayDeque(); + final Deque list = new ArrayDeque<>(); for (final IWidget widget : this.getQueuedWidgets(this)) { if (widget.calculateIsMouseOver()) { list.addLast(widget); @@ -160,7 +160,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { } private Collection getQueuedWidgets(final IWidget widget) { - final List widgets = new ArrayList(); + final List widgets = new ArrayList<>(); boolean addChildren = true; if (widget.isCroppedWidet()) { addChildren = widget.getCroppedZone().contains(widget.getCropWidget().getRelativeMousePosition()); diff --git a/src/main/java/binnie/craftgui/core/Widget.java b/src/main/java/binnie/craftgui/core/Widget.java index 7a9f7437..ad4ac3fc 100644 --- a/src/main/java/binnie/craftgui/core/Widget.java +++ b/src/main/java/binnie/craftgui/core/Widget.java @@ -28,14 +28,14 @@ public class Widget implements IWidget { public Widget(final IWidget parent) { this.parent = null; - this.subWidgets = new ArrayList(); - this.attributes = new ArrayList(); + this.subWidgets = new ArrayList<>(); + this.attributes = new ArrayList<>(); this.position = new IPoint(0.0f, 0.0f); this.size = new IPoint(0.0f, 0.0f); this.offset = new IPoint(0.0f, 0.0f); this.cropped = false; this.colour = 16777215; - this.globalEventHandlers = new ArrayList(); + this.globalEventHandlers = new ArrayList<>(); this.enabled = true; this.visible = true; this.parent = parent; @@ -295,7 +295,7 @@ public class Widget implements IWidget { ((ITopLevelWidget) this).updateTopLevel(); } this.onUpdateClient(); - final List deletedWidgets = new ArrayList(); + final List deletedWidgets = new ArrayList<>(); for (final IWidget widget : this.getWidgets()) { if (widget.hasAttribute(Attribute.NeedsDeletion)) { deletedWidgets.add(widget); diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java index 283a1026..2422d7d4 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java @@ -70,9 +70,9 @@ public class ControlTileSelect extends Control implements IControlValue this.deleteAllChildren(); int cx = 2; int cy = 2; - final Map> designs = new HashMap>(); + final Map> designs = new HashMap<>(); for (final IDesignCategory category : CarpentryManager.carpentryInterface.getAllDesignCategories()) { - designs.put(category, new ArrayList()); + designs.put(category, new ArrayList<>()); for (final IDesign tile : category.getDesigns()) { if (filterText == "" || tile.getName().toLowerCase().contains(filterText)) { designs.get(category).add(tile); diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java b/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java index a85f65b4..bd7c369e 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java @@ -115,7 +115,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.FERTILITY) + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft); y += th; - final List fruits = new ArrayList(); + final List fruits = new ArrayList<>(); for (final ItemStack stack : genome.getFruitProvider().getProducts().keySet()) { fruits.add(stack); } diff --git a/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java b/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java index 93bc97b3..bbc002a4 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java +++ b/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java @@ -45,7 +45,7 @@ public class ControlGeneScroll extends Control implements IControlValue> entry : genes.entrySet()) { - final List discovered = new ArrayList(); + final List discovered = new ArrayList<>(); for (final IAllele allele : entry.getValue()) { final Gene gene = new Gene(allele, entry.getKey(), this.system.getSpeciesRoot()); if ((isNEI || tracker.isSequenced(new Gene(allele, entry.getKey(), this.system.getSpeciesRoot()))) && gene.getName().toLowerCase().contains(this.filter)) { diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java b/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java index e9bec405..15c9f532 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java +++ b/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java @@ -133,7 +133,7 @@ public class WindowGeneBank extends WindowMachine { tabBar.setValues(Binnie.Genetics.getActiveSystems()); tabBar.setValue(Binnie.Genetics.beeBreedingSystem); boxX -= 8; - final ControlTabBar infoTabs = new ControlTabBar(this, boxX + 8, 160.0f, 16.0f, 50.0f, Position.Left); + final ControlTabBar infoTabs = new ControlTabBar<>(this, boxX + 8, 160.0f, 16.0f, 50.0f, Position.Left); infoTabs.setValues(Arrays.asList("Stats", "Ranking")); infoTabs.setValue("Info"); final Panel panelProject = new Panel(this, boxX + 24, 160.0f, geneBoxWidth + 20, 50.0f, MinecraftGUI.PanelType.Black); diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index 8021d1df..753de984 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -37,9 +37,9 @@ public class ContainerCraftGUI extends Container { private final Set crafters = Sets.newConcurrentHashSet(); public ContainerCraftGUI(final Window window) { - this.syncedNBT = new HashMap(); - this.sentNBT = new HashMap(); - this.syncedTanks = new HashMap(); + this.syncedNBT = new HashMap<>(); + this.sentNBT = new HashMap<>(); + this.syncedTanks = new HashMap<>(); this.syncedPower = new PowerInfo(); this.syncedProcess = new ProcessInfo(); this.errorType = 0; @@ -255,7 +255,7 @@ public class ContainerCraftGUI extends Container { if (machineSync != null) { machineSync.sendGuiNBT(this.syncedNBT); } - final Map sentThisTime = new HashMap(); + final Map sentThisTime = new HashMap<>(); for (final Map.Entry nbt : this.syncedNBT.entrySet()) { nbt.getValue().setString("type", nbt.getKey()); boolean shouldSend = true; @@ -367,7 +367,7 @@ public class ContainerCraftGUI extends Container { } public CustomSlot[] getCustomSlots() { - final List slots = new ArrayList(); + final List slots = new ArrayList<>(); for (final Object object : this.inventorySlots) { if (object instanceof CustomSlot) { slots.add((CustomSlot) object); @@ -394,7 +394,7 @@ public class ContainerCraftGUI extends Container { } request.transfer(false); final NBTTagCompound nbt = new NBTTagCompound(); - final List slots = new ArrayList(); + final List slots = new ArrayList<>(); for (final TransferRequest.TransferSlot tslot : request.getInsertedSlots()) { final Slot slot = this.getSlot(tslot.inventory, tslot.id); if (slot != null) { diff --git a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java index e531be4b..8693a770 100644 --- a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java @@ -129,7 +129,7 @@ public class GuiCraftGUI extends GuiContainer { GL11.glDisable(2896); GL11.glDisable(2929); int k = 0; - final List strings = new ArrayList(); + final List strings = new ArrayList<>(); for (final String string : tooltip.getList()) { if (string != null) { if (!string.contains("~~~")) { diff --git a/src/main/java/binnie/craftgui/minecraft/ListMap.java b/src/main/java/binnie/craftgui/minecraft/ListMap.java index 319ee11b..733b2ffe 100644 --- a/src/main/java/binnie/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/craftgui/minecraft/ListMap.java @@ -6,7 +6,7 @@ class ListMap implements List { private LinkedHashMap map; ListMap() { - this.map = new LinkedHashMap(); + this.map = new LinkedHashMap<>(); } @Override diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index f485b2f2..78480411 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -127,7 +127,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG this.setSize(new IPoint(width, height)); this.gui = new GuiCraftGUI(this); for (final EnumHighlighting h : EnumHighlighting.values()) { - ControlSlot.highlighting.put(h, new ArrayList()); + ControlSlot.highlighting.put(h, new ArrayList<>()); } (CraftGUI.Render = new Renderer(this.gui)).stylesheet(StyleSheetManager.getDefault()); this.titleButtonLeft = -14.0f; diff --git a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/craftgui/minecraft/WindowInventory.java index 6dfe47ed..45f5c747 100644 --- a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/craftgui/minecraft/WindowInventory.java @@ -20,9 +20,9 @@ public class WindowInventory implements IInventory { private List disabledAutoDispenses; public WindowInventory(final Window window) { - this.inventory = new HashMap(); - this.validators = new HashMap(); - this.disabledAutoDispenses = new ArrayList(); + this.inventory = new HashMap<>(); + this.validators = new HashMap<>(); + this.disabledAutoDispenses = new ArrayList<>(); this.window = window; } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java index 82f9eaaa..6bc9ae59 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java @@ -165,6 +165,6 @@ public class ControlLiquidTank extends Control implements ITooltip { } static { - ControlLiquidTank.tankError = new ArrayList(); + ControlLiquidTank.tankError = new ArrayList<>(); } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java index 238f5753..f69a89d6 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java @@ -14,7 +14,7 @@ public class ControlPlayerInventory extends Control { public ControlPlayerInventory(final IWidget parent, final boolean wide) { super(parent, (int) (parent.getSize().x() / 2.0f) - (wide ? 110 : 81), (int) parent.getSize().y() - (wide ? 54 : 76) - 12, wide ? 220 : 162, wide ? 54 : 76); - this.slots = new ArrayList(); + this.slots = new ArrayList<>(); for (int row = 0; row < 3; ++row) { for (int column = 0; column < 9; ++column) { final ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18); @@ -41,7 +41,7 @@ public class ControlPlayerInventory extends Control { public ControlPlayerInventory(final IWidget parent, final int x, final int y) { super(parent, x, y, 54.0f, 220.0f); - this.slots = new ArrayList(); + this.slots = new ArrayList<>(); for (int row = 0; row < 6; ++row) { for (int column = 0; column < 6; ++column) { final ControlSlot slot = new ControlSlot(this, column * 18, row * 18); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java index 8e6c5a95..45c40344 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java @@ -136,7 +136,7 @@ public class ControlSlot extends ControlSlotBase { } private List getControlSlots() { - final List slots = new ArrayList(); + final List slots = new ArrayList<>(); if (this.getParent() instanceof ControlSlotArray || this.getParent() instanceof ControlPlayerInventory) { for (final IWidget child : this.getParent().getWidgets()) { slots.add((ControlSlot) child); @@ -194,10 +194,10 @@ public class ControlSlot extends ControlSlotBase { } static { - ControlSlot.highlighting = new HashMap>(); + ControlSlot.highlighting = new HashMap<>(); ControlSlot.shiftClickActive = false; for (final EnumHighlighting h : EnumHighlighting.values()) { - ControlSlot.highlighting.put(h, new ArrayList()); + ControlSlot.highlighting.put(h, new ArrayList<>()); } } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java index 31325e2b..60653579 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java @@ -16,7 +16,7 @@ public class ControlSlotArray extends Control implements Iterable { public ControlSlotArray(final IWidget parent, final int x, final int y, final int columns, final int rows) { super(parent, x, y, columns * 18, rows * 18); - this.slots = new ArrayList(); + this.slots = new ArrayList<>(); this.rows = rows; this.columns = columns; for (int row = 0; row < rows; ++row) { diff --git a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java index fe995231..ed89e037 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java @@ -30,7 +30,7 @@ public class ControlSpeciesBox extends ControlListBox { public void setBranch(final IClassification branch) { if (branch != this.branch) { this.branch = branch; - final List speciesList2 = new ArrayList(); + final List speciesList2 = new ArrayList<>(); this.movePercentage(-100.0f); this.setOptions(speciesList2); final EntityPlayer player = Window.get(this).getPlayer(); diff --git a/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java b/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java index d0fda1ac..af5e9c92 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java +++ b/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java @@ -17,7 +17,7 @@ public class PageBranchOverview extends PageBranch { public PageBranchOverview(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.pageBranchOverview_branchDescription = new ArrayList(); + this.pageBranchOverview_branchDescription = new ArrayList<>(); this.pageBranchOverview_branchName = new ControlTextCentered(this, 8.0f, ""); this.pageBranchOverview_branchScientific = new ControlTextCentered(this, 32.0f, ""); this.pageBranchOverview_branchAuthority = new ControlTextCentered(this, 44.0f, ""); @@ -37,7 +37,7 @@ public class PageBranchOverview extends PageBranch { desc = "No Description Provided."; } String line = ""; - final List descLines = new ArrayList(); + final List descLines = new ArrayList<>(); for (final String str : desc.split(" ")) { if (CraftGUI.Render.textWidth(line + " " + str) > 134) { descLines.add("§o" + line + "§r"); diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesClassification.java b/src/main/java/binnie/craftgui/mod/database/PageSpeciesClassification.java index a65b607b..6fe11bc0 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesClassification.java +++ b/src/main/java/binnie/craftgui/mod/database/PageSpeciesClassification.java @@ -15,7 +15,7 @@ public class PageSpeciesClassification extends PageSpecies { public PageSpeciesClassification(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.levels = new LinkedHashMap(); + this.levels = new LinkedHashMap<>(); int y = 16; for (final IClassification.EnumClassLevel level : IClassification.EnumClassLevel.values()) { final ControlText text = new ControlTextCentered(this, y, ""); diff --git a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java index 7b920d15..c9d33340 100644 --- a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java @@ -55,7 +55,7 @@ public abstract class WindowAbstractDatabase extends Window { public WindowAbstractDatabase(final EntityPlayer player, final Side side, final boolean nei, final BreedingSystem system, final float wid) { super(100.0f, 192.0f, player, null, side); this.selectionBoxWidth = 95.0f; - this.modes = new HashMap(); + this.modes = new HashMap<>(); this.panelInformation = null; this.panelSearch = null; this.modePages = null; @@ -129,7 +129,7 @@ public abstract class WindowAbstractDatabase extends Window { new ControlHelp(this, 4.0f, 4.0f); (this.panelInformation = new Panel(this, 24.0f, 24.0f, 144.0f, 176.0f, MinecraftGUI.PanelType.Black)).setColour(860416); (this.panelSearch = new Panel(this, 176.0f, 24.0f, this.selectionBoxWidth, 160.0f, MinecraftGUI.PanelType.Black)).setColour(860416); - this.modePages = new ControlPages(this, 0.0f, 0.0f, this.getSize().x(), this.getSize().y()); + this.modePages = new ControlPages<>(this, 0.0f, 0.0f, this.getSize().x(), this.getSize().y()); new ControlTextEdit(this, 176.0f, 184.0f, this.selectionBoxWidth, 16.0f); this.createMode(Mode.Species, new ModeWidgets(Mode.Species, this) { @Override @@ -228,12 +228,12 @@ public abstract class WindowAbstractDatabase extends Window { public ModeWidgets(final IDatabaseMode mode, final WindowAbstractDatabase database) { this.database = database; - this.modePage = new ControlPage(database.modePages, 0.0f, 0.0f, database.getSize().x(), database.getSize().y(), mode); + this.modePage = new ControlPage<>(database.modePages, 0.0f, 0.0f, database.getSize().x(), database.getSize().y(), mode); final IArea listBoxArea = database.panelSearch.area().inset(2); this.createListBox(listBoxArea); CraftGUIUtil.alignToWidget(this.listBox, database.panelSearch); CraftGUIUtil.moveWidget(this.listBox, new IPoint(2.0f, 2.0f)); - CraftGUIUtil.alignToWidget(this.infoPages = new ControlPages(this.modePage, 0.0f, 0.0f, 144.0f, 176.0f), database.panelInformation); + CraftGUIUtil.alignToWidget(this.infoPages = new ControlPages<>(this.modePage, 0.0f, 0.0f, 144.0f, 176.0f), database.panelInformation); } public abstract void createListBox(final IArea p0); diff --git a/src/main/java/binnie/craftgui/resource/StyleSheet.java b/src/main/java/binnie/craftgui/resource/StyleSheet.java index a69bb4db..c9014c74 100644 --- a/src/main/java/binnie/craftgui/resource/StyleSheet.java +++ b/src/main/java/binnie/craftgui/resource/StyleSheet.java @@ -7,7 +7,7 @@ public class StyleSheet implements IStyleSheet { protected Map textures; public StyleSheet() { - this.textures = new HashMap(); + this.textures = new HashMap<>(); } @Override diff --git a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java b/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java index 2e7c073e..18d69ae7 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java +++ b/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java @@ -32,8 +32,8 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { private Map textures; public CraftGUIResourceManager() { - this.textureSheets = new HashMap(); - this.textures = new HashMap(); + this.textureSheets = new HashMap<>(); + this.textures = new HashMap<>(); CraftGUI.ResourceManager = this; } @@ -88,7 +88,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { if (split.length < 1 || split.length > 4) { throw new RuntimeException("Parameter must have between one and four numbers"); } - final List f = new ArrayList(); + final List f = new ArrayList<>(); for (final String string : split) { f.add(Float.parseFloat(string)); } @@ -109,7 +109,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { if (split.length < 1 || split.length > 4) { throw new RuntimeException("Parameter must have between one and four numbers"); } - final List f = new ArrayList(); + final List f = new ArrayList<>(); for (final String string : split) { f.add(Float.parseFloat(string)); } diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java index 55c67ad7..cf06eb78 100644 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java @@ -40,7 +40,7 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo } public List getAlvearyBlocks() { - LinkedList tiles = new LinkedList(); + LinkedList tiles = new LinkedList<>(); if (min != null && max != null) { for (int x = min.getX(); x <= max.getX(); ++x) { for (int z = min.getZ(); z <= max.getZ(); ++z) { diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java index 63e39a79..592e0443 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java @@ -53,7 +53,7 @@ public class AlvearyMutator { static { AlvearyMutator.slotMutator = 0; - AlvearyMutator.mutations = new HashMap(); + AlvearyMutator.mutations = new HashMap<>(); } public static class PackageAlvearyMutator extends AlvearyMachine.AlvearyPackage implements IMachineInformation { diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java index 225584a2..cee423ce 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java @@ -101,7 +101,7 @@ public class AlvearyStimulator { return new StimulatorCircuit[0]; } final ICircuit[] circuits = board.getCircuits(); - final List mod = new ArrayList(); + final List mod = new ArrayList<>(); for (final ICircuit circuit : circuits) { if (circuit instanceof StimulatorCircuit) { mod.add((IBeeModifier) circuit); diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index 3fac4348..f46faeb3 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -268,7 +268,7 @@ public class ExtraBeeMutation implements IBeeMutation { @Override public Collection getSpecialConditions() { - final List conditions = new ArrayList(); + final List conditions = new ArrayList<>(); if (this.req != null) { for (final String s : this.req.tooltip()) { conditions.add(s); @@ -283,7 +283,7 @@ public class ExtraBeeMutation implements IBeeMutation { } static { - ExtraBeeMutation.mutations = new ArrayList(); + ExtraBeeMutation.mutations = new ArrayList<>(); } abstract static class MutationRequirement { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java index 24bbded9..498b27bf 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java @@ -68,7 +68,7 @@ public enum ExtraBeesBranch implements IClassification { private ExtraBeesBranch(final String scientific) { this.uid = ""; this.scientific = ""; - this.speciesSet = new LinkedHashSet(); + this.speciesSet = new LinkedHashSet<>(); this.scientific = scientific; this.uid = this.toString().toLowerCase(); } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 4cc4e12a..47fe0c93 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -210,7 +210,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo @Override public ItemStack[] affectProducts(World world, IIndividual individual, BlockPos pos, ItemStack[] products) { if (this == ExtraBeesFlowers.Mystical) { - final List prods = new ArrayList(); + final List prods = new ArrayList<>(); for (final ItemStack stack : products) { prods.add(stack); } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index 9314678c..8660e927 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -188,10 +188,10 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { this.uid = ""; this.achievement = null; this.dominant = true; - this.products = new LinkedHashMap(); - this.specialties = new LinkedHashMap(); - this.allProducts = new LinkedHashMap(); - this.allSpecialties = new LinkedHashMap(); + this.products = new LinkedHashMap<>(); + this.specialties = new LinkedHashMap<>(); + this.allProducts = new LinkedHashMap<>(); + this.allSpecialties = new LinkedHashMap<>(); this.state = State.Active; this.nocturnal = false; this.uid = this.toString().toLowerCase(); @@ -212,10 +212,10 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { this.uid = ""; this.achievement = null; this.dominant = true; - this.products = new LinkedHashMap(); - this.specialties = new LinkedHashMap(); - this.allProducts = new LinkedHashMap(); - this.allSpecialties = new LinkedHashMap(); + this.products = new LinkedHashMap<>(); + this.specialties = new LinkedHashMap<>(); + this.allProducts = new LinkedHashMap<>(); + this.allSpecialties = new LinkedHashMap<>(); this.state = State.Active; this.nocturnal = false; this.state = State.Deprecated; @@ -1006,7 +1006,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { @Override public ItemStack[] getResearchBounty(final World world, final GameProfile researcher, final IIndividual individual, final int bountyLevel) { - final ArrayList bounty = new ArrayList(); + final ArrayList bounty = new ArrayList<>(); ItemStack research = null; if (world.rand.nextFloat() < 10.0f / bountyLevel) { final Collection combinations = this.getRoot().getCombinations(this); @@ -1040,7 +1040,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { @Override public int getComplexity() { - return 1 + this.getGeneticAdvancement(this, new ArrayList()); + return 1 + this.getGeneticAdvancement(this, new ArrayList<>()); } private int getGeneticAdvancement(final IAllele species, final ArrayList exclude) { diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index 829f1514..2b5f5e6d 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -552,7 +552,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } static { - (ExtraBeesEffect.birthdays = new ArrayList()).add(new Birthday(3, 10, "Binnie")); + (ExtraBeesEffect.birthdays = new ArrayList<>()).add(new Birthday(3, 10, "Binnie")); } public static class Birthday { diff --git a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java index 07ec8ebb..cec0803b 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java +++ b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java @@ -25,7 +25,7 @@ public class FireworkCreator { public Firework() { this.flicker = false; this.trail = false; - this.colors = new ArrayList(); + this.colors = new ArrayList<>(); this.shape = 0; } diff --git a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java index 96e61a72..9d05ec3c 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java @@ -18,7 +18,7 @@ public class ControlBiomes extends Control implements ITooltip { public ControlBiomes(final IWidget parent, final int x, final int y, final int width, final int height) { super(parent, x, y, width * 16, height * 16); - this.tolerated = new ArrayList(); + this.tolerated = new ArrayList<>(); this.addAttribute(Attribute.MouseOver); } diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index 317d5812..8a2acaca 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -23,7 +23,7 @@ public class ControlClimateBar extends Control implements ITooltip { public ControlClimateBar(final IWidget parent, final int x, final int y, final int width, final int height) { super(parent, x, y, width, height); this.isHumidity = false; - this.tolerated = new ArrayList(); + this.tolerated = new ArrayList<>(); this.tempColours = new int[]{65531, 7912447, 5242672, 16776960, 16753152, 16711680}; this.humidColours = new int[]{16770979, 1769216, 3177727}; this.addAttribute(Attribute.MouseOver); @@ -32,7 +32,7 @@ public class ControlClimateBar extends Control implements ITooltip { public ControlClimateBar(final IWidget parent, final int x, final int y, final int width, final int height, final boolean humidity) { super(parent, x, y, width, height); this.isHumidity = false; - this.tolerated = new ArrayList(); + this.tolerated = new ArrayList<>(); this.tempColours = new int[]{65531, 7912447, 5242672, 16776960, 16753152, 16711680}; this.humidColours = new int[]{16770979, 1769216, 3177727}; this.addAttribute(Attribute.MouseOver); diff --git a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java b/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java index 8f08ac64..e3575f61 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java @@ -38,7 +38,7 @@ public class ControlProductsBox extends ControlListBox strings = new ArrayList(); + final List strings = new ArrayList<>(); if (this.type == Type.Products) { for (final Map.Entry entry : species.getProductChances().entrySet()) { strings.add(new Product(entry.getKey(), speed * modeSpeed * entry.getValue())); diff --git a/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java b/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java index 79fe64a6..b412735b 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java +++ b/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java @@ -44,7 +44,7 @@ public class ControlPunnett extends Control { for (final IAllele allele1 : new IAllele[]{primary1, secondary1}) { y = 1; for (final IAllele allele2 : new IAllele[]{primary2, secondary2}) { - final List alleles = new LinkedList(); + final List alleles = new LinkedList<>(); if (allele1.isDominant() && !allele2.isDominant()) { alleles.add(allele1); } else if (allele2.isDominant() && !allele1.isDominant()) { diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java index c656a8f6..24832be0 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java @@ -110,7 +110,7 @@ public enum EnumHoneyComb implements IItemEnum { private EnumHoneyComb(final int colour, final int colour2) { this.colour = new int[0]; - this.products = new LinkedHashMap(); + this.products = new LinkedHashMap<>(); this.active = true; this.deprecated = false; this.colour = new int[]{colour, colour2}; diff --git a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java index c61360fe..287cab48 100644 --- a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java +++ b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java @@ -64,7 +64,7 @@ public class BlockExtraBeeHive extends Block { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - final ArrayList ret = new ArrayList(); + final ArrayList ret = new ArrayList<>(); final List dropList = state.getValue(hiveType).drops; Collections.shuffle(dropList); int tries = 0; diff --git a/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java b/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java index 0c204972..7a650bd5 100644 --- a/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java +++ b/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java @@ -15,7 +15,7 @@ public enum EnumHiveType implements IStringSerializable { public List drops; private EnumHiveType() { - this.drops = new ArrayList(); + this.drops = new ArrayList<>(); } @Override diff --git a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java index b486f681..fdbd9546 100644 --- a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java +++ b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java @@ -22,7 +22,7 @@ public class HiveDrop implements IHiveDrop { } public HiveDrop(IAllele[] template, final ItemStack[] bonus, final int chance) { - this.additional = new ArrayList(); + this.additional = new ArrayList<>(); if (template == null) { template = Binnie.Genetics.getBeeRoot().getDefaultTemplate(); } @@ -35,7 +35,7 @@ public class HiveDrop implements IHiveDrop { @Override public Collection getExtraItems(IBlockAccess world, BlockPos pos, int fortune) { - final ArrayList ret = new ArrayList(); + final ArrayList ret = new ArrayList<>(); for (final ItemStack stack : this.additional) { ret.add(stack.copy()); } diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/src/main/java/binnie/extratrees/alcohol/Alcohol.java index 51551287..942a6fa3 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -58,7 +58,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { } private Alcohol(final String ident, final int colour, final double transparency, final double abv) { - this.fermentationLiquid = new ArrayList(); + this.fermentationLiquid = new ArrayList<>(); this.fermentationSolid = ""; this.ident = ident; this.colour = colour; diff --git a/src/main/java/binnie/extratrees/alcohol/Cocktail.java b/src/main/java/binnie/extratrees/alcohol/Cocktail.java index 852c93c9..66c38a57 100644 --- a/src/main/java/binnie/extratrees/alcohol/Cocktail.java +++ b/src/main/java/binnie/extratrees/alcohol/Cocktail.java @@ -44,7 +44,7 @@ public enum Cocktail { public Map ingredients; private Cocktail(final String name, final Glassware glassware, final int colour) { - this.ingredients = new HashMap(); + this.ingredients = new HashMap<>(); this.name = name; this.glassware = glassware; this.colour = colour; @@ -83,7 +83,7 @@ public enum Cocktail { } static { - cocktailIngredients = new HashMap(); + cocktailIngredients = new HashMap<>(); Cocktail.Bellini.add(Alcohol.SparklingWine, 2); Cocktail.Bellini.add(Juice.Peach, 1); Cocktail.BlackRussian.add(Spirit.Vodka, 5); diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index b298feed..528c925a 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -59,7 +59,7 @@ public class ModuleAlcohol implements IInitializable { public void postInit() { for (final Juice juice : Juice.values()) { final String oreDict = juice.squeezing; - final List ores = new ArrayList(); + final List ores = new ArrayList<>(); ores.addAll(OreDictionary.getOres(oreDict)); for (final Food food : Food.values()) { if (food.getOres().contains(oreDict)) { diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java index f7ac09b2..ea5843cb 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java @@ -27,6 +27,6 @@ public class DrinkManager { } static { - DrinkManager.drinkLiquids = new HashMap(); + DrinkManager.drinkLiquids = new HashMap<>(); } } diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index bf13a5c8..5b5133a8 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -71,7 +71,7 @@ public class ModuleBlocks implements IInitializable { } }; GameRegistry.register(block); - Item wood = GameRegistry.register(new BlockETLog.LogItemBlock(block)); + Item wood = GameRegistry.register(new BlockETLog.LogItemBlock<>(block)); WoodAccess.registerWithVariants(block,WoodBlockKind.LOG, woodTypes[finalI]); ExtraTrees.proxy.setCustomStateMapper("log", block); @@ -85,7 +85,7 @@ public class ModuleBlocks implements IInitializable { }; GameRegistry.register(block2); ExtraTrees.proxy.setCustomStateMapper("log", block2); - Item woodFireproof = GameRegistry.register(new BlockETLog.LogItemBlock(block2)); + Item woodFireproof = GameRegistry.register(new BlockETLog.LogItemBlock<>(block2)); for(EnumExtraTreeLog l : woodTypes[finalI].getAllowedValues()) { BinnieCore.proxy.registermodel(wood, l.getMetadata() % BlockETLog.VARIANTS_PER_BLOCK, new ModelResourceLocation("extratrees:log","axis=y,wood_type="+l.getName())); BinnieCore.proxy.registermodel(woodFireproof, l.getMetadata() % BlockETLog.VARIANTS_PER_BLOCK, new ModelResourceLocation("extratrees:log","axis=y,wood_type="+l.getName())); diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 75502d27..977586aa 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -91,7 +91,7 @@ public class WoodManager { } public static List getAllPlankTypes() { - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (final IPlankType type : PlankType.ExtraTreePlanks.values()) { list.add(type); } diff --git a/src/main/java/binnie/extratrees/block/decor/FenceType.java b/src/main/java/binnie/extratrees/block/decor/FenceType.java index 54651e81..23f66a0b 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceType.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceType.java @@ -30,7 +30,7 @@ public class FenceType { } public static Collection values() { - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (int size = 0; size < 3; ++size) { for (final boolean solid : new boolean[]{false, true}) { for (final boolean embedded : new boolean[]{false, true}) { diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 54f06e54..9a5d25b6 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -17,7 +17,7 @@ public class MultiFenceRecipeSize implements IRecipe { @Override public boolean matches(final InventoryCrafting inv, final World world) { String pattern = ""; - final List types = new ArrayList(); + final List types = new ArrayList<>(); for (int i = 0; i < inv.getSizeInventory(); ++i) { final ItemStack stack = inv.getStackInSlot(i); final IPlankType type = (stack == null) ? null : WoodManager.get(stack); diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java index 127a64d1..c8129386 100644 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java +++ b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java @@ -52,6 +52,6 @@ public class NBTShapedRecipes implements IRecipe { } static { - NBTShapedRecipes.recipes = new ArrayList(); + NBTShapedRecipes.recipes = new ArrayList<>(); } } diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index 184a894b..ebb95660 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -67,7 +67,7 @@ public class CarpentryInterface implements ICarpentryInterface { @Override public Collection getAllDesignCategories() { - final List categories = new ArrayList(); + final List categories = new ArrayList<>(); for (final IDesignCategory category : CarpentryInterface.designCategories.values()) { if (category.getDesigns().size() > 0) { categories.add(category); @@ -78,7 +78,7 @@ public class CarpentryInterface implements ICarpentryInterface { @Override public List getSortedDesigns() { - final List designs = new ArrayList(); + final List designs = new ArrayList<>(); for (final IDesignCategory category : this.getAllDesignCategories()) { designs.addAll(category.getDesigns()); } @@ -103,8 +103,8 @@ public class CarpentryInterface implements ICarpentryInterface { } static { - CarpentryInterface.woodMap = new LinkedHashMap(); - CarpentryInterface.designMap = new LinkedHashMap(); - CarpentryInterface.designCategories = new HashMap(); + CarpentryInterface.woodMap = new LinkedHashMap<>(); + CarpentryInterface.designMap = new LinkedHashMap<>(); + CarpentryInterface.designCategories = new HashMap<>(); } } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java index 12da4298..18a3604c 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java @@ -11,7 +11,7 @@ public class DesignerManager { List systems; public DesignerManager() { - this.systems = new ArrayList(); + this.systems = new ArrayList<>(); } public void registerDesignSystem(final IDesignSystem system) { diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java index 379d0c9f..a3db2887 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java @@ -488,7 +488,7 @@ public enum EnumDesign implements IDesign { List designs; private Category(final String name) { - this.designs = new ArrayList(); + this.designs = new ArrayList<>(); this.name = name; CarpentryManager.carpentryInterface.registerDesignCategory(this); } diff --git a/src/main/java/binnie/extratrees/carpentry/GlassType.java b/src/main/java/binnie/extratrees/carpentry/GlassType.java index 23570f8f..944855de 100644 --- a/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -66,7 +66,7 @@ public class GlassType implements IDesignMaterial { } static { - GlassType.types = new LinkedHashMap(); + GlassType.types = new LinkedHashMap<>(); for (final StandardColor c : StandardColor.values()) { GlassType.types.put(c.ordinal(), new GlassType(c.ordinal(), c.name, c.colour)); } diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index 10f1e535..4d546e7d 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -37,23 +37,23 @@ public class ModuleCore implements IInitializable { final PrintWriter outputPlanks = new PrintWriter(new FileWriter("data/planks.html")); final PrintWriter outputFruit = new PrintWriter(new FileWriter("data/fruit.html")); final PrintWriter outputDesigns = new PrintWriter(new FileWriter("data/designs.html")); - final Queue speciesQueue = new LinkedList(); + final Queue speciesQueue = new LinkedList<>(); for (final IAlleleTreeSpecies s : ExtraTreeSpecies.values()) { speciesQueue.add(s); } - final Queue logQueue = new LinkedList(); + final Queue logQueue = new LinkedList<>(); for (final IWoodType wood : EnumExtraTreeLog.values()) { logQueue.add(wood); } - final Queue plankQueue = new LinkedList(); + final Queue plankQueue = new LinkedList<>(); for (final IDesignMaterial wood2 : PlankType.ExtraTreePlanks.values()) { plankQueue.add(wood2); } - final Queue fruitQueue = new LinkedList(); + final Queue fruitQueue = new LinkedList<>(); for (final ExtraTreeFruitGene wood3 : ExtraTreeFruitGene.values()) { fruitQueue.add(wood3); } - final Queue designQueue = new LinkedList(); + final Queue designQueue = new LinkedList<>(); for (final IDesign wood4 : CarpentryManager.carpentryInterface.getSortedDesigns()) { designQueue.add(wood4); } diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index a205b2ba..6105153c 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -58,8 +58,8 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { private Map caterpillarLoot; private ButterflySpecies(final String name, final String scientific, final int colour) { - this.butterflyLoot = new HashMap(); - this.caterpillarLoot = new HashMap(); + this.butterflyLoot = new HashMap<>(); + this.caterpillarLoot = new HashMap<>(); this.name = name; this.branchName = scientific.split(" ")[0].toLowerCase(); this.scientific = scientific.split(" ")[1]; @@ -185,12 +185,12 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { @Override public Map getButterflyLoot() { - return new HashMap(); + return new HashMap<>(); } @Override public Map getCaterpillarLoot() { - return new HashMap(); + return new HashMap<>(); } @Override diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index 054599fd..05e03c6e 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -280,7 +280,7 @@ public class ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { this.diffB = 0; this.pod = null; this.ripeningPeriod = 0; - this.products = new HashMap(); + this.products = new HashMap<>(); this.colour = colour; this.index = index; this.setRipening(time, unripe); @@ -292,7 +292,7 @@ public class ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { this.diffB = 0; this.pod = null; this.ripeningPeriod = 0; - this.products = new HashMap(); + this.products = new HashMap<>(); this.pod = pod; this.ripeningPeriod = 2; this.uuid = uuid; diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index 4a4f06a6..b5362486 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -224,7 +224,7 @@ public class ExtraTreeMutation implements ITreeMutation { @Override public Collection getSpecialConditions() { - final List conditions = new ArrayList(); + final List conditions = new ArrayList<>(); if (this.height > 0.0f) { conditions.add("Minimum height from bedrock of " + this.height); } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index a53f18cf..297f6c3d 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -584,7 +584,7 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG private ExtraTreeSpecies(final String branch, final String binomial, final int color, final int polColor, final int woodColor, final IWoodType wood, final IAlleleFruit fruit, SaplingType saplingType, final Class gen) { this.leafType = LeafType.Normal; this.saplingType = saplingType; - this.families = new ArrayList(); + this.families = new ArrayList<>(); this.girth = 1; this.fruit = null; this.color = color; @@ -962,7 +962,7 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG @Override public ItemStack[] getResearchBounty(final World world, final GameProfile researcher, final IIndividual individual, final int bountyLevel) { - final ArrayList bounty = new ArrayList(); + final ArrayList bounty = new ArrayList<>(); ItemStack research = null; if (world.rand.nextFloat() < 10.0f / bountyLevel) { final Collection combinations = this.getRoot().getCombinations(this); @@ -996,7 +996,7 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG @Override public int getComplexity() { - return 1 + this.getGeneticAdvancement(this, new ArrayList()); + return 1 + this.getGeneticAdvancement(this, new ArrayList<>()); } private int getGeneticAdvancement(final IAllele species, final ArrayList exclude) { diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index f044e78f..b2b59ee8 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -16,7 +16,7 @@ public class ModuleGenetics implements IInitializable { public ModuleGenetics() { this.branches = new String[]{"Malus Maleae Amygdaloideae Rosaceae", "Musa Musaceae Zingiberales Commelinids Angiosperms", "Sorbus Maleae", "Tsuga Pinaceae", "Fraxinus Oleeae Oleaceae Lamiales Asterids Angiospems"}; - this.classifications = new ArrayList>(); + this.classifications = new ArrayList<>(); } @Override @@ -55,7 +55,7 @@ public class ModuleGenetics implements IInitializable { private void generateBranches() { for (final String hierarchy : this.branches) { - final List set = new ArrayList(); + final List set = new ArrayList<>(); for (final String string : hierarchy.split(" ", 0)) { set.add(string.toLowerCase()); } diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index d251663c..39a4b34d 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -84,7 +84,7 @@ public enum Food implements IItemMisc { } private Food(final int hunger) { - this.ores = new ArrayList(); + this.ores = new ArrayList<>(); this.hunger = hunger; } diff --git a/src/main/java/binnie/extratrees/machines/Brewery.java b/src/main/java/binnie/extratrees/machines/Brewery.java index 36e4e894..e7bc9d1f 100644 --- a/src/main/java/binnie/extratrees/machines/Brewery.java +++ b/src/main/java/binnie/extratrees/machines/Brewery.java @@ -134,7 +134,7 @@ public class Brewery { Brewery.slotInventory = new int[]{5, 6, 7, 8, 9, 10, 11, 12, 13}; Brewery.tankInput = 0; Brewery.tankOutput = 1; - Brewery.recipes = new ArrayList(); + Brewery.recipes = new ArrayList<>(); } public static class PackageBrewery extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { @@ -458,8 +458,8 @@ public class Brewery { ItemStack hops; public BeerRecipe() { - this.grainCrops = new HashMap(); - this.outputs = new ArrayList(); + this.grainCrops = new HashMap<>(); + this.outputs = new ArrayList<>(); this.grains = new String[]{BeerRecipe.barley, BeerRecipe.wheat, BeerRecipe.rye, BeerRecipe.corn, BeerRecipe.roasted}; for (final String grainType : this.grains) { for (final ItemStack stack : OreDictionary.getOres(grainType)) { diff --git a/src/main/java/binnie/extratrees/machines/Distillery.java b/src/main/java/binnie/extratrees/machines/Distillery.java index 1ddb3167..5aa2b5d5 100644 --- a/src/main/java/binnie/extratrees/machines/Distillery.java +++ b/src/main/java/binnie/extratrees/machines/Distillery.java @@ -65,9 +65,9 @@ public class Distillery { static { Distillery.tankInput = 0; Distillery.tankOutput = 1; - (Distillery.recipes = new ArrayList>()).add(new HashMap()); - Distillery.recipes.add(new HashMap()); - Distillery.recipes.add(new HashMap()); + (Distillery.recipes = new ArrayList<>()).add(new HashMap<>()); + Distillery.recipes.add(new HashMap<>()); + Distillery.recipes.add(new HashMap<>()); } public static class PackageDistillery extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { diff --git a/src/main/java/binnie/extratrees/machines/Infuser.java b/src/main/java/binnie/extratrees/machines/Infuser.java index 0c993c62..10563d7e 100644 --- a/src/main/java/binnie/extratrees/machines/Infuser.java +++ b/src/main/java/binnie/extratrees/machines/Infuser.java @@ -53,7 +53,7 @@ public class Infuser { static { Infuser.tankInput = 0; Infuser.tankOutput = 1; - Infuser.recipes = new HashMap(); + Infuser.recipes = new HashMap<>(); } public static class PackageInfuser extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { diff --git a/src/main/java/binnie/extratrees/machines/Lumbermill.java b/src/main/java/binnie/extratrees/machines/Lumbermill.java index 2749f691..7fa47884 100644 --- a/src/main/java/binnie/extratrees/machines/Lumbermill.java +++ b/src/main/java/binnie/extratrees/machines/Lumbermill.java @@ -60,7 +60,7 @@ public class Lumbermill { } private static Collection getRecipeResult(final ItemStack output) { - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (final Object recipeO : CraftingManager.getInstance().getRecipeList()) { if (recipeO instanceof ShapelessRecipes) { final ShapelessRecipes recipe = (ShapelessRecipes) recipeO; @@ -109,7 +109,7 @@ public class Lumbermill { Lumbermill.slotBark = 2; Lumbermill.slotSawdust = 3; Lumbermill.tankWater = 0; - Lumbermill.recipes = new HashMap(); + Lumbermill.recipes = new HashMap<>(); } public static class PackageLumbermill extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java index 0798196b..1b12a5f5 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java @@ -35,6 +35,6 @@ public class MachineRendererForestry { } static { - MachineRendererForestry.instances = new HashMap(); + MachineRendererForestry.instances = new HashMap<>(); } } diff --git a/src/main/java/binnie/extratrees/machines/Press.java b/src/main/java/binnie/extratrees/machines/Press.java index 792e2d3d..63e6859a 100644 --- a/src/main/java/binnie/extratrees/machines/Press.java +++ b/src/main/java/binnie/extratrees/machines/Press.java @@ -53,7 +53,7 @@ public class Press { Press.slotFruit = 0; Press.slotCurrent = 1; Press.tankWater = 0; - Press.pressRecipes = new HashMap(); + Press.pressRecipes = new HashMap<>(); } public static class PackagePress extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { diff --git a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java index 80f05f26..4fd9e21c 100644 --- a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java +++ b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java @@ -83,7 +83,7 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu } public Set getErrorStates() { - return new HashSet(); + return new HashSet<>(); } public int getBiomeId() { diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index 2c5d9b74..579b3bb3 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -19,7 +19,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { List genes; public GeneArrayItem(final ItemStack stack) { - this.genes = new ArrayList(); + this.genes = new ArrayList<>(); if (stack == null) { return; } @@ -27,12 +27,12 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { } public GeneArrayItem(final IGene gene) { - this.genes = new ArrayList(); + this.genes = new ArrayList<>(); this.addGene(gene); } public GeneArrayItem() { - this.genes = new ArrayList(); + this.genes = new ArrayList<>(); } @Override @@ -45,7 +45,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { @Override public void getInfo(final List list) { - final List totalList = new ArrayList(); + final List totalList = new ArrayList<>(); for (final IGene gene : this.genes) { final String chromosomeName = this.getBreedingSystem().getChromosomeName(gene.getChromosome()); totalList.add("§6" + chromosomeName + "§7: " + gene.getName()); diff --git a/src/main/java/binnie/genetics/genetics/GeneProject.java b/src/main/java/binnie/genetics/genetics/GeneProject.java index 7157786e..07be03a9 100644 --- a/src/main/java/binnie/genetics/genetics/GeneProject.java +++ b/src/main/java/binnie/genetics/genetics/GeneProject.java @@ -14,7 +14,7 @@ public class GeneProject { public GeneProject(final int id, final String name, final GameProfile leader) { this.id = 0; this.leader = null; - this.members = new ArrayList(); + this.members = new ArrayList<>(); this.setID(id); this.setName(name); this.setLeader(leader); diff --git a/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java b/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java index 091dca22..040d1b70 100644 --- a/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java @@ -16,8 +16,8 @@ public class GeneProjectTracker extends WorldSavedData { public GeneProjectTracker(final String s) { super(s); - this.projects = new HashMap(); - this.TeamInvites = new HashMap>(); + this.projects = new HashMap<>(); + this.TeamInvites = new HashMap<>(); } public static GeneProjectTracker getTracker(final World world) { @@ -101,7 +101,7 @@ public class GeneProjectTracker extends WorldSavedData { public void invitePlayer(final int id, final GameProfile player) { if (!this.TeamInvites.containsKey(player)) { - this.TeamInvites.put(player, new LinkedHashSet()); + this.TeamInvites.put(player, new LinkedHashSet<>()); } this.TeamInvites.get(player).add(id); this.markDirty(); @@ -109,7 +109,7 @@ public class GeneProjectTracker extends WorldSavedData { public void revokeInvite(final int id, final GameProfile player) { if (!this.TeamInvites.containsKey(player)) { - this.TeamInvites.put(player, new LinkedHashSet()); + this.TeamInvites.put(player, new LinkedHashSet<>()); } this.TeamInvites.get(player).add(id); this.markDirty(); diff --git a/src/main/java/binnie/genetics/genetics/GeneTracker.java b/src/main/java/binnie/genetics/genetics/GeneTracker.java index b41ea349..efcf8951 100644 --- a/src/main/java/binnie/genetics/genetics/GeneTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneTracker.java @@ -25,13 +25,13 @@ public class GeneTracker extends WorldSavedData { public GeneTracker(final String s, final GameProfile username) { super(s); - this.discoveredGenes = new ArrayList(); + this.discoveredGenes = new ArrayList<>(); this.username = username; } public GeneTracker(final String s) { super(s); - this.discoveredGenes = new ArrayList(); + this.discoveredGenes = new ArrayList<>(); } protected static GeneTracker getCommonTracker(final EntityPlayer player) { diff --git a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java index 51603a55..9fc7fe0c 100644 --- a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java +++ b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java @@ -11,12 +11,12 @@ public class GeneticEngineeringSystem { static List speciesList; public GeneticEngineeringSystem(final BreedingSystem system) { - this.chromosomeMap = new HashMap>(); + this.chromosomeMap = new HashMap<>(); this.breedingSystem = system; for (final IIndividual indiv : this.breedingSystem.getSpeciesRoot().getIndividualTemplates()) { for (final IChromosomeType chromosome : this.breedingSystem.getSpeciesRoot().getKaryotype()) { if (!this.chromosomeMap.containsKey(chromosome)) { - this.chromosomeMap.put(chromosome, new ArrayList()); + this.chromosomeMap.put(chromosome, new ArrayList<>()); } try { final IAllele a1 = indiv.getGenome().getActiveAllele(chromosome); @@ -33,9 +33,9 @@ public class GeneticEngineeringSystem { } for (final IChromosomeType chromosome2 : this.breedingSystem.getSpeciesRoot().getKaryotype()) { final List alleles = this.getAlleles(chromosome2); - final TreeSet set = new TreeSet(new ComparatorAllele()); + final TreeSet set = new TreeSet<>(new ComparatorAllele()); set.addAll(alleles); - final List list = new ArrayList(); + final List list = new ArrayList<>(); list.addAll(set); this.chromosomeMap.put(chromosome2, list); } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/AnalystPageClimate.java index c9744bd4..74b75b49 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageClimate.java @@ -60,7 +60,7 @@ public class AnalystPageClimate extends ControlAnalystPage { } new ControlText(this, new IArea(4.0f, y, this.w() - 8.0f, 14.0f), "Biomes", TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; - final List biomes = new ArrayList(); + final List biomes = new ArrayList<>(); for (final Biome biome : Biome.EXPLORATION_BIOMES_LIST) { //TODO check if (biome != null) { if (BiomeDictionary.isBiomeRegistered(biome)) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index 5e0e7f6b..090e6c7d 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -48,7 +48,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { new ControlTextEdit(this, 20.0f, y, this.w() - 40.0f, 16.0f) { @Override public void onTextEdit(final String value) { - final Collection options = new ArrayList(); + final Collection options = new ArrayList<>(); AnalystPageDatabase.this.getSpecies(system); for (final IAlleleSpecies species : AnalystPageDatabase.this.getSpecies(system)) { if (value != null) { @@ -173,7 +173,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { } private Collection getSpecies(final BreedingSystem system) { - final Collection species = new ArrayList(); + final Collection species = new ArrayList<>(); species.addAll(this.isMaster ? system.getAllSpecies() : system.getDiscoveredSpecies(this.getWindow().getWorld(), this.getWindow().getPlayer().getGameProfile())); return species; } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java index fb4fbcbc..bf6c296d 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java @@ -41,7 +41,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { } public Collection getCentrifuge(final ItemStack stack) { - final List products = new ArrayList(); + final List products = new ArrayList<>(); for (final ICentrifugeRecipe recipe : RecipeManagers.centrifugeManager.recipes()) { boolean isRecipe = false; if (recipe.getInput() instanceof ItemStack && stack.isItemEqual((ItemStack) recipe.getInput())) { @@ -59,7 +59,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { } public Collection getSqueezer(final ItemStack stack) { - final List products = new ArrayList(); + final List products = new ArrayList<>(); for (ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { boolean isRecipe = false; for (final Object obj : recipe.getResources()) { @@ -77,7 +77,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { } public Collection getCrafting(final ItemStack stack) { - final List products = new ArrayList(); + final List products = new ArrayList<>(); for (final Object recipeO : CraftingManager.getInstance().getRecipeList()) { if (recipeO instanceof ShapelessRecipes) { final ShapelessRecipes recipe = (ShapelessRecipes) recipeO; @@ -121,7 +121,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { } public Collection getAllFluids(final ItemStack stack) { - final List products = new ArrayList(); + final List products = new ArrayList<>(); products.addAll(this.getSqueezerFluid(stack)); if (Press.getOutput(stack) != null) { products.add(Press.getOutput(stack)); @@ -130,7 +130,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { } public Collection getSqueezerFluid(final ItemStack stack) { - final List products = new ArrayList(); + final List products = new ArrayList<>(); for (final ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { boolean isRecipe = false; for (final Object obj : recipe.getResources()) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java index 9ff2d128..2ec8c3ea 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java @@ -42,7 +42,7 @@ public class AnalystPageProducts extends AnalystPageProduce { final Collection refinedProducts = new UniqueItemStackSet(); final Collection productList = new UniqueItemStackSet(); final Collection specialtyList = new UniqueItemStackSet(); - Map products = new HashMap(); + Map products = new HashMap<>(); products.putAll(genome.getPrimary().getProductChances()); products.putAll(genome.getSecondary().getProductChances()); if (!products.isEmpty()) { @@ -81,7 +81,7 @@ public class AnalystPageProducts extends AnalystPageProduce { level2Products.addAll(this.getAllProducts(stack)); } refinedProducts.addAll(level2Products); - final Collection allFluids = new ArrayList(); + final Collection allFluids = new ArrayList<>(); for (final ItemStack stack2 : refinedProducts) { for (final FluidStack addition : this.getAllFluids(stack2)) { boolean alreadyIn = false; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java index 6f4d3475..315c77ef 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java @@ -84,7 +84,7 @@ public class AnalystPageSoil extends ControlAnalystPage { y += 32; new ControlText(this, new IArea(4.0f, y, this.w() - 8.0f, 14.0f), "Other Soils", TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; - final List stacks = new ArrayList(); + final List stacks = new ArrayList<>(); for (final EnumAcidity a : EnumSet.range(EnumAcidity.Acid, EnumAcidity.Alkaline)) { for (final EnumMoisture b : EnumSet.range(EnumMoisture.Dry, EnumMoisture.Damp)) { if (Tolerance.canTolerate(pH, a, pHTol) && Tolerance.canTolerate(moisture, b, moistureTol) && (a != recomPH || b != recomMoisture)) { diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index 65396094..97a31d3d 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -36,7 +36,7 @@ public class ControlChromoPicker extends Control implements ITooltip { this.addSelfEventHandler(new EventWidget.EndMouseOver.Handler() { @Override public void onEvent(final EventWidget.EndMouseOver event) { - ControlChromoPicker.this.callEvent(new EventValueChanged(ControlChromoPicker.this.getWidget(), null)); + ControlChromoPicker.this.callEvent(new EventValueChanged<>(ControlChromoPicker.this.getWidget(), null)); } }); } diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index a5d94ec2..f2158e16 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -61,7 +61,7 @@ public class WindowAnalyst extends Window { super(312.0f, 230.0f, player, inventory, side); this.baseWidget = null; this.tabBar = null; - this.analystPages = new ArrayList(); + this.analystPages = new ArrayList<>(); this.analystPageSize = null; this.isDatabase = false; this.isMaster = false; diff --git a/src/main/java/binnie/genetics/machine/Acclimatiser.java b/src/main/java/binnie/genetics/machine/Acclimatiser.java index f473b310..66d44228 100644 --- a/src/main/java/binnie/genetics/machine/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/Acclimatiser.java @@ -169,9 +169,9 @@ public class Acclimatiser { slotReserve = new int[]{0, 1, 2, 3}; slotAcclimatiser = new int[]{5, 6, 7}; slotDone = new int[]{8, 9, 10, 11}; - Acclimatiser.toleranceSystems = new ArrayList(); - Acclimatiser.temperatureItems = new HashMap(); - Acclimatiser.humidityItems = new HashMap(); + Acclimatiser.toleranceSystems = new ArrayList<>(); + Acclimatiser.temperatureItems = new HashMap<>(); + Acclimatiser.humidityItems = new HashMap<>(); } public static class PackageAcclimatiser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { @@ -258,7 +258,7 @@ public class Acclimatiser { } protected void attemptAcclimatisation() { - final List acclms = new ArrayList(); + final List acclms = new ArrayList<>(); for (final ItemStack s : this.getUtil().getNonNullStacks(Acclimatiser.slotAcclimatiser)) { if (Acclimatiser.canAcclimatise(this.getUtil().getStack(4), s)) { acclms.add(s); diff --git a/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java b/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java index ef8a4f74..608b7d0c 100644 --- a/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java +++ b/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java @@ -30,8 +30,8 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im super(machine); this.indexerSize = -1; this.guiRefreshCounter = 0; - this.indexerInventory = new SetList(); - this.sortedInventory = new SetList(); + this.indexerInventory = new SetList<>(); + this.sortedInventory = new SetList<>(); this.needsSorting = true; } @@ -173,17 +173,17 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im public List bees; SpeciesList() { - this.drones = new ArrayList(); - this.queens = new ArrayList(); - this.princesses = new ArrayList(); - this.bees = new ArrayList(); + this.drones = new ArrayList<>(); + this.queens = new ArrayList<>(); + this.princesses = new ArrayList<>(); + this.bees = new ArrayList<>(); } public void add(final ItemStack stack) { this.bees.add(stack); } } - final Map speciesList = new HashMap(); + final Map speciesList = new HashMap<>(); for (final ItemStack itemStack : this.indexerInventory) { final int species = itemStack.getItemDamage(); if (!speciesList.containsKey(species)) { @@ -202,7 +202,7 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } } } - this.sortedInventory = new SetList(); + this.sortedInventory = new SetList<>(); switch (this.sortingMode) { case Species: { for (int j = 0; j < 1024; ++j) { diff --git a/src/main/java/binnie/genetics/machine/Incubator.java b/src/main/java/binnie/genetics/machine/Incubator.java index 86adb16d..67ecec24 100644 --- a/src/main/java/binnie/genetics/machine/Incubator.java +++ b/src/main/java/binnie/genetics/machine/Incubator.java @@ -107,7 +107,7 @@ public class Incubator { static { slotQueue = new int[]{0, 1, 2}; slotOutput = new int[]{4, 5, 6}; - Incubator.RECIPES = new ArrayList(); + Incubator.RECIPES = new ArrayList<>(); } public static class PackageIncubator extends GeneticMachine.PackageGeneticBase implements IMachineInformation {