mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 20:22:35 +00:00
Code analyze and cleanup
This commit is contained in:
1 parent
0aa95b495a
commit
6a411bb607
27 files changed
+32
-54
No files matched your search
@@ -305,7 +305,7 @@ public class Widget implements IWidget {
|
||||
}
|
||||
|
||||
onUpdateClient();
|
||||
List<IWidget> deletedWidgets = new ArrayList<IWidget>();
|
||||
List<IWidget> deletedWidgets = new ArrayList<>();
|
||||
for (IWidget widget : getWidgets()) {
|
||||
if (widget.hasAttribute(WidgetAttribute.NEEDS_DELETION)) {
|
||||
deletedWidgets.add(widget);
|
||||
|
||||
@@ -15,7 +15,7 @@ public class ControlListBox<T> extends ControlScrollableContent<ControlList<T>>
|
||||
|
||||
@Override
|
||||
public void initialise() {
|
||||
setScrollableContent(new ControlList<T>(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) {
|
||||
|
||||
@@ -119,7 +119,7 @@ public abstract class WindowAbstractDatabase extends Window {
|
||||
widgets.listBox.setValidator(new IValidator<IWidget>() {
|
||||
@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());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ class ListMap<T> implements List<T> {
|
||||
private LinkedHashMap<Integer, T> map;
|
||||
|
||||
ListMap() {
|
||||
map = new LinkedHashMap<Integer, T>();
|
||||
map = new LinkedHashMap<>();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -92,7 +92,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener {
|
||||
throw new RuntimeException("Parameter must have between one and four numbers");
|
||||
}
|
||||
|
||||
List<Float> f = new ArrayList<Float>();
|
||||
List<Float> 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<Float> f = new ArrayList<Float>();
|
||||
List<Float> f = new ArrayList<>();
|
||||
for (String string : split) {
|
||||
f.add(Float.parseFloat(string));
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -226,7 +226,7 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
Collection<IAlleleSpecies> set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player);
|
||||
List<IAlleleSpecies> found = new ArrayList<IAlleleSpecies>();
|
||||
List<IAlleleSpecies> found = new ArrayList<>();
|
||||
for (IAlleleSpecies species : set) {
|
||||
IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
|
||||
ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID()));
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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<Integer> compartmentPages = new ControlPages<Integer>(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight);
|
||||
ControlPages<Integer> 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<Entry<Integer, String>> list = new LinkedList(slotIds.entrySet());
|
||||
Collections.sort(list, new Comparator<Entry<Integer, String>>() {
|
||||
list.sort(new Comparator<Entry<Integer, String>>() {
|
||||
@Override
|
||||
public int compare(Entry<Integer, String> o1, Entry<Integer, String> o2) {
|
||||
return -o2.getValue().compareTo(o1.getValue());
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -26,7 +26,7 @@ public class TransmissionModifierComponent extends ComponentBeeModifier implemen
|
||||
}
|
||||
|
||||
TileExtraBeeAlveary tile = (TileExtraBeeAlveary) getMachine().getTileEntity();
|
||||
List<IEnergyHandler> handlers = new ArrayList<IEnergyHandler>();
|
||||
List<IEnergyHandler> handlers = new ArrayList<>();
|
||||
for (TileEntity alvearyTile : tile.getAlvearyBlocks()) {
|
||||
if (alvearyTile instanceof IEnergyHandler && alvearyTile != tile) {
|
||||
handlers.add((IEnergyHandler) alvearyTile);
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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<ItemStack> getAdditional(World world, int x, int y, int z, int fortune) {
|
||||
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
|
||||
ArrayList<ItemStack> ret = new ArrayList<>();
|
||||
for (ItemStack stack : additional) {
|
||||
ret.add(stack.copy());
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ public class FenceType {
|
||||
}
|
||||
|
||||
public static Collection<FenceType> values() {
|
||||
List<FenceType> list = new ArrayList<FenceType>();
|
||||
List<FenceType> list = new ArrayList<>();
|
||||
for (int size = 0; size < 3; ++size) {
|
||||
for (boolean solid : new boolean[]{false, true}) {
|
||||
for (boolean embedded : new boolean[]{false, true}) {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ public class CarpentryInterface implements ICarpentryInterface {
|
||||
|
||||
@Override
|
||||
public Collection<IDesignCategory> getAllDesignCategories() {
|
||||
List<IDesignCategory> categories = new ArrayList<IDesignCategory>();
|
||||
List<IDesignCategory> 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<IDesign> getSortedDesigns() {
|
||||
List<IDesign> designs = new ArrayList<IDesign>();
|
||||
List<IDesign> designs = new ArrayList<>();
|
||||
for (IDesignCategory category : getAllDesignCategories()) {
|
||||
designs.addAll(category.getDesigns());
|
||||
}
|
||||
|
||||
@@ -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<ItemStack> fruits = new ArrayList<ItemStack>();
|
||||
List<ItemStack> fruits = new ArrayList<>();
|
||||
Collections.addAll(fruits, genome.getFruitProvider().getProducts());
|
||||
|
||||
if (!fruits.isEmpty()) {
|
||||
|
||||
@@ -68,7 +68,7 @@ public class ModuleGenetics implements IInitializable {
|
||||
|
||||
private void generateBranches() {
|
||||
for (String hierarchy : branches) {
|
||||
List<String> set = new ArrayList<String>();
|
||||
List<String> set = new ArrayList<>();
|
||||
for (String string : hierarchy.split(" ", 0)) {
|
||||
set.add(string.toLowerCase());
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ public class ControlGeneScroll extends Control implements IControlValue<Breeding
|
||||
boolean isNEI = ((WindowGeneBank) Window.get(this)).isNei;
|
||||
|
||||
for (Map.Entry<IChromosomeType, List<IAllele>> entry : genes.entrySet()) {
|
||||
List<IAllele> discovered = new ArrayList<IAllele>();
|
||||
List<IAllele> 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)) {
|
||||
|
||||
@@ -83,13 +83,8 @@ public class AnalystPageFruit extends AnalystPageProduce {
|
||||
}
|
||||
|
||||
Collection<ItemStack> allProducts = new UniqueItemStackSet();
|
||||
for (ItemStack stack3 : products) {
|
||||
allProducts.add(stack3);
|
||||
}
|
||||
|
||||
for (ItemStack stack3 : specialties) {
|
||||
allProducts.add(stack3);
|
||||
}
|
||||
allProducts.addAll(products);
|
||||
allProducts.addAll(specialties);
|
||||
|
||||
Collection<ItemStack> refinedProducts = new UniqueItemStackSet();
|
||||
refinedProducts.addAll(getAllProductsAndFluids(allProducts));
|
||||
|
||||
@@ -66,9 +66,7 @@ public class AnalystPageWood extends AnalystPageProduce {
|
||||
}
|
||||
|
||||
Collection<ItemStack> allProducts = new UniqueItemStackSet();
|
||||
for (ItemStack stack2 : products) {
|
||||
allProducts.add(stack2);
|
||||
}
|
||||
allProducts.addAll(products);
|
||||
|
||||
Collection<ItemStack> refinedProducts = new UniqueItemStackSet();
|
||||
refinedProducts.addAll(getAllProductsAndFluids(allProducts));
|
||||
|
||||
Reference in new issue
Block a user