diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index abfa62ab..7dee8aa3 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -24,8 +24,8 @@ public class CeramicDesignSystem implements IDesignSystem { Map secondary; CeramicDesignSystem() { - this.primary = new HashMap(); - this.secondary = new HashMap(); + this.primary = new HashMap<>(); + this.secondary = new HashMap<>(); DesignerManager.instance.registerDesignSystem(this); } diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index ff29c1f6..70d1fe76 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -69,7 +69,7 @@ public class GardenLogic extends FarmLogic { @Override public Collection collect(World world, IFarmHousing farmHousing) { final Collection products = this.produce; - this.produce = new ArrayList(); + this.produce = new ArrayList<>(); return products; } diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 9e80d314..24fc30cd 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -243,7 +243,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList drops = new ArrayList(); + ArrayList drops = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() == 0) { ItemStack flower = ((TileEntityFlower) tile).getItemStack(); diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 9c1a6f2f..2f227e3d 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -210,7 +210,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister pos = pos.offset(facing); } - if (stack.stackSize != 0 && player.canPlayerEdit(pos, facing, stack) && world.canBlockBePlaced(Botany.flower, pos, false, facing, (Entity) null, stack)) { + if (stack.stackSize != 0 && player.canPlayerEdit(pos, facing, stack) && world.canBlockBePlaced(Botany.flower, pos, false, facing, null, stack)) { int i = this.getMetadata(stack.getMetadata()); IBlockState iblockstate1 = Botany.flower.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, i, player, stack); diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 2f0a7456..109a7ef4 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -203,7 +203,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh @Override public void onEvent(final EventValueChanged event) { final NBTTagCompound nbt = new NBTTagCompound(); - final int i = ((Integer) event.getValue()).intValue(); + final int i = (Integer) event.getValue(); nbt.setByte("i", (byte) i); Window.get(tab).sendClientAction("tab-change", nbt); WindowCompartment.this.currentTab = i; @@ -368,15 +368,10 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } } if (this.sortByName) { - final List> list = new LinkedList(slotIds.entrySet()); - Collections.sort(list, new Comparator>() { - @Override - public int compare(Entry o1, Entry o2) { - return -o2.getValue().compareTo(o1.getValue()); - } - }); - final Map result = new LinkedHashMap(); - for (final Map.Entry entry : list) { + final List> list = new LinkedList<>(slotIds.entrySet()); + list.sort((o1, o2) -> -o2.getValue().compareTo(o1.getValue())); + final Map result = new LinkedHashMap<>(); + for (final Map.Entry entry : list) { result.put(entry.getKey(), entry.getValue()); } slotIds = result; diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index e834cc68..bad8f1dc 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -17,6 +17,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.registry.GameRegistry; +import javax.annotation.Nullable; import java.io.File; public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { @@ -104,7 +105,7 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { } @Override - public void registerTileEntity(final Class tile, final String id, final Object renderer) { + public void registerTileEntity(final Class tile, final String id, @Nullable final Object renderer) { GameRegistry.registerTileEntity(tile, id); } diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 43d012e4..fc3313ea 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -24,6 +24,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; @@ -129,7 +130,7 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy } @Override - public void registerTileEntity(final Class tile, final String id, final Object renderer) { + public void registerTileEntity(final Class tile, final String id, @Nullable final Object renderer) { if (renderer != null && renderer instanceof TileEntitySpecialRenderer) { ClientRegistry.registerTileEntity(tile, id, (TileEntitySpecialRenderer) renderer); } else { diff --git a/src/main/java/binnie/core/proxy/IBinnieProxy.java b/src/main/java/binnie/core/proxy/IBinnieProxy.java index 937d7148..5898c0b1 100644 --- a/src/main/java/binnie/core/proxy/IBinnieProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieProxy.java @@ -11,6 +11,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.io.File; public interface IBinnieProxy extends IProxyCore { @@ -40,7 +41,7 @@ public interface IBinnieProxy extends IProxyCore { Object createObject(final String p0); - void registerTileEntity(final Class p0, final String p1, final Object p2); + void registerTileEntity(final Class tile, final String id, @Nullable final Object renderer); void createPipe(final Item p0); diff --git a/src/main/java/binnie/core/util/FluidStackSet.java b/src/main/java/binnie/core/util/FluidStackSet.java index ff7370e8..c259db16 100644 --- a/src/main/java/binnie/core/util/FluidStackSet.java +++ b/src/main/java/binnie/core/util/FluidStackSet.java @@ -2,6 +2,7 @@ package binnie.core.util; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -74,6 +75,7 @@ class FluidStackSet implements Set { return this.itemStacks.isEmpty(); } + @Nonnull @Override public Iterator iterator() { return this.itemStacks.iterator(); @@ -85,8 +87,7 @@ class FluidStackSet implements Set { final FluidStack r = (FluidStack) o; final FluidStack existing = this.getExisting(r); if (existing.amount > r.amount) { - final FluidStack fluidStack = existing; - fluidStack.amount -= r.amount; + existing.amount -= r.amount; } else { this.itemStacks.remove(existing); } @@ -95,7 +96,7 @@ class FluidStackSet implements Set { } @Override - public boolean removeAll(final Collection c) { + public boolean removeAll(@Nonnull final Collection c) { boolean addedAll = true; for (final Object o : c) { final boolean removed = this.remove(o); @@ -105,7 +106,7 @@ class FluidStackSet implements Set { } @Override - public boolean retainAll(final Collection c) { + public boolean retainAll(@Nonnull final Collection c) { return this.itemStacks.retainAll(c); } @@ -114,13 +115,15 @@ class FluidStackSet implements Set { return this.itemStacks.size(); } + @Nonnull @Override public Object[] toArray() { return this.itemStacks.toArray(); } + @Nonnull @Override - public T[] toArray(final T[] a) { + public T[] toArray(@Nonnull final T[] a) { return this.itemStacks.toArray(a); } } diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index b57f2ff7..b2548afe 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -47,7 +47,7 @@ public class ContainerCraftGUI extends Container { private int errorType; private ErrorState error; private int mousedOverSlotNumber; - private final Set crafters = Sets.newConcurrentHashSet(); + private final Set crafters = Sets.newConcurrentHashSet(); public ContainerCraftGUI(final Window window) { this.syncedNBT = new HashMap<>(); diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 4beaa497..8c815a0e 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -61,7 +61,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo @Override public String getDescription() { - return ExtraBees.proxy.localise("flowers." + this.name().toString().toLowerCase() + ".name"); + return ExtraBees.proxy.localise("flowers." + this.name().toLowerCase() + ".name"); } public void register() { diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index 389bb1b6..be1b1fca 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -120,7 +120,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { @Override public String getName() { - return ExtraBees.proxy.localise("effect." + this.name().toString().toLowerCase() + ".name"); + return ExtraBees.proxy.localise("effect." + this.name().toLowerCase() + ".name"); } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index d306d441..7f0f5296 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -24,8 +24,8 @@ public enum DesignSystem implements IDesignSystem { Map secondary; DesignSystem() { - this.primary = new HashMap(); - this.secondary = new HashMap(); + this.primary = new HashMap<>(); + this.secondary = new HashMap<>(); DesignerManager.instance.registerDesignSystem(this); } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index 2979d201..a2241cea 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -189,18 +189,22 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG private EnumLeafType leafType; private SaplingType saplingType; - ArrayList families; - int girth; - Class gen; - IAlleleFruit fruit; - IAllele[] template; - int color; - String binomial; + @Nonnull + private List families; + private int girth; + private Class gen; + private IAlleleFruit fruit; + private IAllele[] template; + private int color; + private String binomial; //String uid; - IWoodType wood; - IWoodProvider woodProvider; - String branchName; - IClassification branch; + private IWoodType wood; + private IWoodProvider woodProvider; + private String branchName; + private IClassification branch; + private ExtraTreeGenerator generator; + private int colorPollineted; + private int woodColor; private static LinkedList list; private static BiMap namesMap; @@ -225,7 +229,7 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG public static Map names() { if (revNamesMap == null) { - TreeMap m = new TreeMap(String.CASE_INSENSITIVE_ORDER); + Map m = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); m.putAll(namesMap.inverse()); revNamesMap = m; } @@ -602,7 +606,7 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG static final ItemStack getEBXLStack(final String name) { try { - final Class elements = Class.forName("extrabiomes.lib.Element"); + final Class elements = Class.forName("extrabiomes.lib.Element"); final Method getElementMethod = elements.getMethod("valueOf", String.class); final Method getItemStack = elements.getMethod("get"); final Object element = getElementMethod.invoke(null, "SAPLING_AUTUMN_YELLOW"); @@ -636,9 +640,6 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG } - int colorPollineted; - int woodColor; - 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 = EnumLeafType.DECIDUOUS; this.saplingType = saplingType; @@ -655,6 +656,7 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG this.woodProvider = new WoodProvider(this.wood); this.woodColor = woodColor; this.colorPollineted = polColor; + this.generator = new ExtraTreeGenerator(this); //this.uid = getSpeciesName().toLowerCase().trim(); } ///TODO @@ -781,6 +783,7 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG return true; } + @Nonnull @Override public EnumPlantType getPlantType() { return EnumPlantType.Plains; @@ -789,60 +792,10 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG WoodAccess woodAccess = new WoodAccess(); + @Nonnull @Override public ITreeGenerator getGenerator() { - return new ITreeGenerator() { - @Override - public WorldGenerator getWorldGenerator(ITreeGenData tree) { - return ExtraTreeSpecies.this.getGenerator(tree); - } - - @Override - public boolean setLogBlock(ITreeGenome genome, World world, BlockPos pos, EnumFacing facing) { - if (ExtraTreeSpecies.this.wood != null) { - //ItemStack block = woodProvider.getWoodStack(); //TreeManager.woodAccess.getBlock(wood, WoodBlockKind.LOG, false); - return world.setBlockState(pos, woodAccess.getBlock(wood, WoodBlockKind.LOG, false), 2); - } - return false; - } - - @Override - public boolean setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos) { - boolean placed = world.setBlockState(pos, PluginArboriculture.blocks.leaves.getDefaultState()); - if (!placed) { - return false; - } - - Block block = world.getBlockState(pos).getBlock(); - if (PluginArboriculture.blocks.leaves != block) { - world.setBlockToAir(pos); - return false; - } - - TileLeaves tileLeaves = TileUtil.getTile(world, pos, TileLeaves.class); - if (tileLeaves == null) { - world.setBlockToAir(pos); - return false; - } - - tileLeaves.getOwnerHandler().setOwner(owner); - tileLeaves.setTree(new Tree(genome)); - - world.markBlockRangeForRenderUpdate(pos, pos); - return true; - } - - }; - } - - public WorldGenerator getGenerator(final ITreeGenData tree) { - if (this.gen != null) { - try { - return this.gen.getConstructor(ITree.class).newInstance(tree); - } catch (Exception ex) { - } - } - return new WorldGenDefault(tree); + return generator; } void setLeafType(final EnumLeafType type) { @@ -862,8 +815,9 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG return this.template; } + @Nonnull @Override - public ArrayList getSuitableFruit() { + public List getSuitableFruit() { return this.families; } @@ -922,11 +876,6 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG } - - public int getLeafColour(final ITree tree) { - return this.color; - } - // public short getLeafIconIndex(final ITree tree, final boolean fancy) { // if (!fancy) { // return this.leafType.plainUID; @@ -1037,9 +986,9 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG @SideOnly(Side.CLIENT) public int getGermlingColour(final EnumGermlingType type, int renderPass) { if (type == EnumGermlingType.SAPLING) { - return (renderPass != 0) ? this.getLeafColour(null) : ((this.getLog() == null) ? 16777215 : woodColor); + return (renderPass != 0) ? this.color : ((this.getLog() == null) ? 16777215 : woodColor); } - return this.getLeafColour(null); + return this.color; } @Override @@ -1068,19 +1017,20 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG } return own + ((highest < 0) ? 0 : highest); } -//never used -// public ItemStack[] getLogStacks() { -// if (this.wood == null) { -// return new ItemStack[0]; -// } -// return new ItemStack[] { this.wood.getItemStack() }; -// } @Override public String getUnlocalizedName() { return "extratrees.species." + this.getUID() + ".name"; } + public String getBranchName() { + return branchName; + } + + public void setBranch(IClassification branch) { + this.branch = branch; + } + public enum SaplingType { Default, Jungle, @@ -1100,6 +1050,61 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG //IIcon[] icon; } + private static class ExtraTreeGenerator implements ITreeGenerator { + private ExtraTreeSpecies extraTreeSpecies; + + public ExtraTreeGenerator(ExtraTreeSpecies extraTreeSpecies) { + this.extraTreeSpecies = extraTreeSpecies; + } + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + if (extraTreeSpecies.gen != null) { + try { + return extraTreeSpecies.gen.getConstructor(ITree.class).newInstance(tree); + } catch (Exception ex) { + } + } + return new WorldGenDefault(tree); + } + + @Override + public boolean setLogBlock(ITreeGenome genome, World world, BlockPos pos, EnumFacing facing) { + if (extraTreeSpecies.wood != null) { + //ItemStack block = woodProvider.getWoodStack(); //TreeManager.woodAccess.getBlock(wood, WoodBlockKind.LOG, false); + return world.setBlockState(pos, extraTreeSpecies.woodAccess.getBlock(extraTreeSpecies.wood, WoodBlockKind.LOG, false), 2); + } + return false; + } + + @Override + public boolean setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos) { + boolean placed = world.setBlockState(pos, PluginArboriculture.blocks.leaves.getDefaultState()); + if (!placed) { + return false; + } + + Block block = world.getBlockState(pos).getBlock(); + if (PluginArboriculture.blocks.leaves != block) { + world.setBlockToAir(pos); + return false; + } + + TileLeaves tileLeaves = TileUtil.getTile(world, pos, TileLeaves.class); + if (tileLeaves == null) { + world.setBlockToAir(pos); + return false; + } + + tileLeaves.getOwnerHandler().setOwner(owner); + tileLeaves.setTree(new Tree(genome)); + + world.markBlockRangeForRenderUpdate(pos, pos); + return true; + } + + } + // @Override // public int getLeafColour(boolean pollinated) { // return pollinated ? colorPollineted : color; diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 2fb22587..67049a39 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -62,9 +62,9 @@ public class ModuleGenetics implements IInitializable { this.classifications.add(set); } for (final ExtraTreeSpecies species : ExtraTreeSpecies.values()) { - final IClassification branch = this.getOrCreateClassification(IClassification.EnumClassLevel.GENUS, species.branchName); + final IClassification branch = this.getOrCreateClassification(IClassification.EnumClassLevel.GENUS, species.getBranchName()); branch.addMemberSpecies(species); - species.branch = branch; + species.setBranch(branch); IClassification clss = branch; int currentLevel = IClassification.EnumClassLevel.GENUS.ordinal(); while (clss.getParent() == null) {