diff --git a/build.gradle b/build.gradle index e34e29ad..be93df2a 100644 --- a/build.gradle +++ b/build.gradle @@ -64,5 +64,5 @@ task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask untaggedName = "Current release ${project.version}" fromCommit = "dbc5c1a564c39e4a9c042411d1bdbe450985ce2c" toRef = "HEAD" - templateContent = file('changelog.mustache').getText('UTF-8'); + templateContent = file('changelog.mustache').getText('UTF-8') } diff --git a/src/main/java/binnie/core/craftgui/Widget.java b/src/main/java/binnie/core/craftgui/Widget.java index c8c7f185..01222dd3 100644 --- a/src/main/java/binnie/core/craftgui/Widget.java +++ b/src/main/java/binnie/core/craftgui/Widget.java @@ -305,7 +305,7 @@ public class Widget implements IWidget { } onUpdateClient(); - List deletedWidgets = new ArrayList(); + List deletedWidgets = new ArrayList<>(); for (IWidget widget : getWidgets()) { if (widget.hasAttribute(WidgetAttribute.NEEDS_DELETION)) { deletedWidgets.add(widget); diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java index cbfead87..c480d182 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java @@ -15,7 +15,7 @@ public class ControlListBox extends ControlScrollableContent> @Override public void initialise() { - setScrollableContent(new ControlList(this, 1.0f, 1.0f, w() - 2.0f - scrollBarSize, h() - 2.0f)); + setScrollableContent(new ControlList<>(this, 1.0f, 1.0f, w() - 2.0f - scrollBarSize, h() - 2.0f)); addEventHandler(new EventKey.Down.Handler() { @Override public void onEvent(EventKey.Down event) { diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index 87d08477..3695a079 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -119,7 +119,7 @@ public abstract class WindowAbstractDatabase extends Window { widgets.listBox.setValidator(new IValidator() { @Override public boolean isValid(IWidget object) { - return event.getValue() == "" || ((ControlTextOption) object).getText().toLowerCase().contains(event.getValue().toLowerCase()); + return event.getValue().isEmpty() || ((ControlTextOption) object).getText().toLowerCase().contains(event.getValue().toLowerCase()); } }); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java index 54862290..e8fdf4c2 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java @@ -11,7 +11,7 @@ class ListMap implements List { private LinkedHashMap map; ListMap() { - map = new LinkedHashMap(); + map = new LinkedHashMap<>(); } @Override diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java index 030a084d..7d84967b 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java @@ -92,7 +92,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { throw new RuntimeException("Parameter must have between one and four numbers"); } - List f = new ArrayList(); + List f = new ArrayList<>(); for (String string : split) { f.add(Float.parseFloat(string)); } @@ -113,7 +113,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { if (split.length < 1 || split.length > 4) { throw new RuntimeException("Parameter must have between one and four numbers"); } - List f = new ArrayList(); + List f = new ArrayList<>(); for (String string : split) { f.add(Float.parseFloat(string)); } diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 1db0b64f..9194b73f 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -207,10 +207,10 @@ public class ManagerGenetics extends ManagerBase { throw new NullPointerException("Allele is null!"); } if (o1 instanceof IAlleleFloat && o2 instanceof IAlleleFloat) { - return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(Float.valueOf(((IAlleleFloat) o2).getValue())); + return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(((IAlleleFloat) o2).getValue()); } if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof AlleleColor)) { - return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(Integer.valueOf(((IAlleleInteger) o2).getValue())); + return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue()); } if (o1.getName() != null && o2.getName() != null) { return o1.getName().compareTo(o2.getName()); diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 778e8013..e69c8063 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -226,7 +226,7 @@ public class TreeBreedingSystem extends BreedingSystem { return new ArrayList<>(); } Collection set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player); - List found = new ArrayList(); + List found = new ArrayList<>(); for (IAlleleSpecies species : set) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); diff --git a/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/src/main/java/binnie/core/machines/inventory/SidedAccess.java index ede7d198..41bb8bd3 100644 --- a/src/main/java/binnie/core/machines/inventory/SidedAccess.java +++ b/src/main/java/binnie/core/machines/inventory/SidedAccess.java @@ -19,7 +19,7 @@ class SidedAccess { } public AccessDirection getAccess(ForgeDirection side) { - return accesses.containsKey(side) ? accesses.get(side) : base; + return accesses.getOrDefault(side, base); } public boolean canInsert(ForgeDirection side) { diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 589892c5..2a605f89 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -142,7 +142,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh @Override public void onEvent(EventValueChanged event) { NBTTagCompound nbt = new NBTTagCompound(); - int i = ((Integer) event.getValue()).intValue(); + int i = (Integer) event.getValue(); nbt.setByte("i", (byte) i); Window.get(tab).sendClientAction("tab-change", nbt); currentTab = i; @@ -150,10 +150,10 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh }.setOrigin(EventHandler.Origin.DirectChild, tab)); x += 24; - ControlPages compartmentPages = new ControlPages(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight); + ControlPages compartmentPages = new ControlPages<>(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight); ControlPage[] page = new ControlPage[inv.getTabNumber()]; for (int p = 0; p < inv.getTabNumber(); ++p) { - page[p] = new ControlPage(compartmentPages, Integer.valueOf(p)); + page[p] = new ControlPage(compartmentPages, p); } CraftGUIUtil.linkWidgets(tab, compartmentPages); int i = 0; @@ -210,7 +210,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh @Override public void onEvent(EventValueChanged event) { NBTTagCompound nbt = new NBTTagCompound(); - int i = ((Integer) event.getValue()).intValue(); + int i = (Integer) event.getValue(); nbt.setByte("i", (byte) i); Window.get(tab).sendClientAction("tab-change", nbt); currentTab = i; @@ -374,7 +374,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh if (sortByName) { List> list = new LinkedList(slotIds.entrySet()); - Collections.sort(list, new Comparator>() { + list.sort(new Comparator>() { @Override public int compare(Entry o1, Entry o2) { return -o2.getValue().compareTo(o1.getValue()); diff --git a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java b/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java index 149c32da..32509298 100644 --- a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java +++ b/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java @@ -69,11 +69,6 @@ public class ComponentBeeModifier extends MachineComponent implements IBeeModifi // ignored } - // TODO unused method? - public void onPostQueenDeath(IBee queen) { - // ignored - } - // TODO unused method? public boolean onEggLaid(IBee queen) { return false; diff --git a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java index d8bccd95..4d27e97b 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java @@ -25,7 +25,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier { } @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { + public String getItemStackDisplayName(ItemStack stack) { return frame.getName(); } diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java index 391f66c6..aba40a05 100644 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java @@ -77,7 +77,6 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements public void onMachineBroken() { min = null; max = null; - } @Override @@ -93,13 +92,11 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements @Override public void updateClient(int arg0) { super.updateEntity(); - } @Override public void updateServer(int arg0) { super.updateEntity(); - } @Override diff --git a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java index 42bb9897..3911e392 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java +++ b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java @@ -2,7 +2,6 @@ package binnie.extrabees.apiary.machine.mutator; import binnie.core.machines.Machine; import binnie.extrabees.apiary.ComponentBeeModifier; -import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; @@ -24,7 +23,6 @@ public class MutatorModifierComponent extends ComponentBeeModifier implements IB @Override public void onQueenDeath() { - super.onQueenDeath(); getUtil().decreaseStack(AlvearyMutator.SLOT_MUTATOR, 1); } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java index 18b903b9..b8b93da6 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java +++ b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java @@ -26,7 +26,7 @@ public class TransmissionModifierComponent extends ComponentBeeModifier implemen } TileExtraBeeAlveary tile = (TileExtraBeeAlveary) getMachine().getTileEntity(); - List handlers = new ArrayList(); + List handlers = new ArrayList<>(); for (TileEntity alvearyTile : tile.getAlvearyBlocks()) { if (alvearyTile instanceof IEnergyHandler && alvearyTile != tile) { handlers.add((IEnergyHandler) alvearyTile); diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 4f5073f5..9c570836 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -71,7 +71,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo @Override public String getDescription() { - return I18N.localise("extrabees.flowers." + name().toString().toLowerCase() + ".name"); + return I18N.localise("extrabees.flowers." + name().toLowerCase() + ".name"); } public void register() { diff --git a/src/main/java/binnie/extrabees/products/ModuleProducts.java b/src/main/java/binnie/extrabees/products/ModuleProducts.java index ae05e002..dd620ffb 100644 --- a/src/main/java/binnie/extrabees/products/ModuleProducts.java +++ b/src/main/java/binnie/extrabees/products/ModuleProducts.java @@ -1,11 +1,8 @@ package binnie.extrabees.products; import binnie.core.IInitializable; -import binnie.core.Mods; import binnie.extrabees.ExtraBees; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; public class ModuleProducts implements IInitializable { diff --git a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java index 91964155..8e61c336 100644 --- a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java +++ b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import java.util.ArrayList; +import java.util.Collections; public class HiveDrop implements IHiveDrop { private IAllele[] template; @@ -27,9 +28,7 @@ public class HiveDrop implements IHiveDrop { } this.template = template; this.chance = chance; - for (ItemStack stack : bonus) { - additional.add(stack); - } + Collections.addAll(additional, bonus); } @Override @@ -48,7 +47,7 @@ public class HiveDrop implements IHiveDrop { @Override public ArrayList getAdditional(World world, int x, int y, int z, int fortune) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); for (ItemStack stack : additional) { ret.add(stack.copy()); } diff --git a/src/main/java/binnie/extratrees/block/GateItemRenderer.java b/src/main/java/binnie/extratrees/block/GateItemRenderer.java index 98141302..7986ec41 100644 --- a/src/main/java/binnie/extratrees/block/GateItemRenderer.java +++ b/src/main/java/binnie/extratrees/block/GateItemRenderer.java @@ -5,7 +5,6 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/binnie/extratrees/block/decor/FenceType.java b/src/main/java/binnie/extratrees/block/decor/FenceType.java index 1d4a56f9..3ec25ea1 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceType.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceType.java @@ -22,7 +22,7 @@ public class FenceType { } public static Collection values() { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int size = 0; size < 3; ++size) { for (boolean solid : new boolean[]{false, true}) { for (boolean embedded : new boolean[]{false, true}) { diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java index 84bce7fc..c4e1c4a9 100644 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java +++ b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java @@ -60,7 +60,7 @@ public class NBTShapedRecipe implements IRecipe { for (int i2 = 0; i2 < j * k; ++i2) { char c0 = s.charAt(i2); if (hashmap.containsKey(c0)) { - aitemstack[i2] = ((ItemStack) hashmap.get(Character.valueOf(c0))).copy(); + aitemstack[i2] = ((ItemStack) hashmap.get(c0)).copy(); } else { aitemstack[i2] = null; } diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index ea833bd8..9e83ae49 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -81,7 +81,7 @@ public class CarpentryInterface implements ICarpentryInterface { @Override public Collection getAllDesignCategories() { - List categories = new ArrayList(); + List categories = new ArrayList<>(); for (IDesignCategory category : CarpentryInterface.designCategories.values()) { if (category.getDesigns().size() > 0) { categories.add(category); @@ -92,7 +92,7 @@ public class CarpentryInterface implements ICarpentryInterface { @Override public List getSortedDesigns() { - List designs = new ArrayList(); + List designs = new ArrayList<>(); for (IDesignCategory category : getAllDesignCategories()) { designs.addAll(category.getDesigns()); } diff --git a/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java index 0c0c3027..d00eabd0 100644 --- a/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java @@ -117,7 +117,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.FERTILITY) + " : ", TextJustification.MIDDLE_RIGHT); new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT); y += th; - List fruits = new ArrayList(); + List fruits = new ArrayList<>(); Collections.addAll(fruits, genome.getFruitProvider().getProducts()); if (!fruits.isEmpty()) { diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index f5cda236..159ed19f 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -68,7 +68,7 @@ public class ModuleGenetics implements IInitializable { private void generateBranches() { for (String hierarchy : branches) { - List set = new ArrayList(); + List set = new ArrayList<>(); for (String string : hierarchy.split(" ", 0)) { set.add(string.toLowerCase()); } diff --git a/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java b/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java index e4eb10f0..6d3d31e7 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java @@ -46,7 +46,7 @@ public class ControlGeneScroll extends Control implements IControlValue> entry : genes.entrySet()) { - List discovered = new ArrayList(); + List discovered = new ArrayList<>(); for (IAllele allele : entry.getValue()) { Gene gene = new Gene(allele, entry.getKey(), system.getSpeciesRoot()); if ((isNEI || tracker.isSequenced(new Gene(allele, entry.getKey(), system.getSpeciesRoot()))) && gene.getName().toLowerCase().contains(filter)) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java index 10efc6db..5e132aa8 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java @@ -83,13 +83,8 @@ public class AnalystPageFruit extends AnalystPageProduce { } Collection allProducts = new UniqueItemStackSet(); - for (ItemStack stack3 : products) { - allProducts.add(stack3); - } - - for (ItemStack stack3 : specialties) { - allProducts.add(stack3); - } + allProducts.addAll(products); + allProducts.addAll(specialties); Collection refinedProducts = new UniqueItemStackSet(); refinedProducts.addAll(getAllProductsAndFluids(allProducts)); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/AnalystPageWood.java index d1148130..3a1642ed 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageWood.java @@ -66,9 +66,7 @@ public class AnalystPageWood extends AnalystPageProduce { } Collection allProducts = new UniqueItemStackSet(); - for (ItemStack stack2 : products) { - allProducts.add(stack2); - } + allProducts.addAll(products); Collection refinedProducts = new UniqueItemStackSet(); refinedProducts.addAll(getAllProductsAndFluids(allProducts));