diff --git a/dependencies.gradle b/dependencies.gradle index 844a64a5..5a19f8f9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { api('com.github.GTNewHorizons:ForestryMC:4.9.16:dev') implementation('com.github.GTNewHorizons:GTNHLib:0.5.11:dev') - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.36-GTNH:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.38-GTNH:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') diff --git a/gradle.properties b/gradle.properties index c5092752..391c998b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,19 +41,19 @@ developmentEnvironmentUserName = Developer # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8. # See https://github.com/bsideup/jabel for details on how this works. -enableModernJavaSyntax = false +enableModernJavaSyntax = true # Enables injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. -enableGenericInjection = false +enableGenericInjection = true # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. # If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = +generateGradleTokenClass = binnie.core.Tags # Name of the token containing the project's current version to generate/replace. -gradleTokenVersion = GRADLETOKEN_VERSION +gradleTokenVersion = VERSION # [DEPRECATED] Mod ID replacement token. gradleTokenModId = @@ -70,7 +70,7 @@ gradleTokenGroupName = # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]). # Leave these properties empty to skip individual token replacements. -replaceGradleTokenInFile = BinnieCore.java +replaceGradleTokenInFile = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 22f4931b..ff84ef0c 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -39,6 +39,7 @@ import binnie.botany.network.PacketID; import binnie.botany.proxy.Proxy; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; import binnie.core.item.ItemMisc; import binnie.core.network.BinniePacketHandler; @@ -53,12 +54,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -@Mod( - modid = "Botany", - name = "Botany", - version = BinnieCore.VERSION, - useMetadata = true, - dependencies = "after:BinnieCore") +@Mod(modid = "Botany", name = "Botany", version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore") public class Botany extends AbstractMod { @Mod.Instance("Botany") @@ -121,11 +117,6 @@ public class Botany extends AbstractMod { return BotanyGUI.values(); } - @Override - public Class[] getConfigs() { - return new Class[0]; - } - @Override public IPacketID[] getPacketIDs() { return PacketID.values(); @@ -160,9 +151,8 @@ public class Botany extends AbstractMod { if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == Items.shears) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); - if (tile instanceof TileEntityFlower) { - TileEntityFlower flower = (TileEntityFlower) tile; - flower.onShear(); + if (tile instanceof TileEntityFlower tileFlower) { + tileFlower.onShear(); event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer); } } @@ -170,11 +160,10 @@ public class Botany extends AbstractMod { if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == Botany.pollen) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); - if (tile instanceof TileEntityFlower) { - TileEntityFlower flower = (TileEntityFlower) tile; + if (tile instanceof TileEntityFlower tileFlower) { IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem()); - if (pollen != null && flower.canMateWith(pollen)) { - flower.mateWith(pollen); + if (pollen != null && tileFlower.canMateWith(pollen)) { + tileFlower.mateWith(pollen); if (!event.entityPlayer.capabilities.isCreativeMode) { ItemStack heldItem = event.entityPlayer.getHeldItem(); heldItem.stackSize--; @@ -196,10 +185,10 @@ public class Botany extends AbstractMod { int y = event.y; Block block = event.world.getBlock(event.x, y, event.z); - if (block == null || !Gardening.isSoil(block)) { + if (!Gardening.isSoil(block)) { block = event.world.getBlock(event.x, --y, event.z); } - if (block == null || !Gardening.isSoil(block)) { + if (!Gardening.isSoil(block)) { return; } diff --git a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java index f760c8bc..a8c48122 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java +++ b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java @@ -24,7 +24,7 @@ public enum EnumFlowerChromosome implements IChromosomeType { SAPPINESS(IAlleleFloat.class), STEM(IAlleleInteger.class); - private Class cls; + private final Class cls; EnumFlowerChromosome(Class cls) { this.cls = cls; diff --git a/src/main/java/binnie/botany/api/EnumFlowerStage.java b/src/main/java/binnie/botany/api/EnumFlowerStage.java index be547e57..ddafb7fd 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerStage.java +++ b/src/main/java/binnie/botany/api/EnumFlowerStage.java @@ -7,7 +7,7 @@ public enum EnumFlowerStage { POLLEN("Pollen"), NONE("NONE"); - protected String name; + private final String name; EnumFlowerStage(String name) { this.name = name; diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 04fa82c8..7716d7ab 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -81,7 +81,7 @@ public class BlockCeramic extends Block implements IBlockMetadata { } @Override - public void addBlockTooltip(ItemStack stack, List tooltip) { + public void addBlockTooltip(ItemStack stack, List tooltip) { int meta = TileEntityMetadata.getItemDamage(stack); tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName()); } @@ -92,7 +92,7 @@ public class BlockCeramic extends Block implements IBlockMetadata { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List itemList) { + public void getSubBlocks(Item item, CreativeTabs tabs, List itemList) { for (EnumFlowerColor c : EnumFlowerColor.values()) { itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal())); } diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index 25da0db2..ca328348 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -90,7 +90,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } @Override - public void addBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { int meta = TileEntityMetadata.getItemDamage(itemStack); getType(meta).addTooltip(tooltip); } @@ -101,7 +101,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { + public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { for (EnumFlowerColor c : EnumFlowerColor.values()) { BlockType type = new BlockType(c, c, TileType.Tile); itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal())); @@ -205,9 +205,9 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"), VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks"); - protected String id; - protected String name; - protected IIcon[] icons; + private final String id; + private final String name; + private final IIcon[] icons; TileType(String id, String name) { icons = new IIcon[3]; @@ -224,32 +224,15 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } public ItemStack getRecipe(List stacks) { - switch (this) { - case Tile: - return getTileRecipe(stacks); - - case Split: - return getSplitRecipe(stacks); - - case Chequered: - return getChequeredRecipe(stacks); - - case Mixed: - return getMixedRecipe(stacks); - - case LargeBrick: - return getLargeBrickRecipe(stacks); - - case Brick: - case StripeBrick: - return getBrickRecipe(stacks); - - case VerticalLargeBrick: - case VerticalBrick: - case VerticalStripeBrick: - return getVerticalBrickRecipe(stacks); - } - return null; + return switch (this) { + case Tile -> getTileRecipe(stacks); + case Split -> getSplitRecipe(stacks); + case Chequered -> getChequeredRecipe(stacks); + case Mixed -> getMixedRecipe(stacks); + case LargeBrick -> getLargeBrickRecipe(stacks); + case Brick, StripeBrick -> getBrickRecipe(stacks); + case VerticalLargeBrick, VerticalBrick, VerticalStripeBrick -> getVerticalBrickRecipe(stacks); + }; } private ItemStack getTileRecipe(List stacks) { @@ -541,7 +524,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa return I18N.localise("botany." + type.name); } - public void addTooltip(List tooltip) { + public void addTooltip(List tooltip) { String name = color1.getName(); if (type.canDouble() && color2 != color1) { name = I18N.localise("botany.colour.double", name, color2.getName()); diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java index dd47bd7a..c97eb490 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java @@ -40,7 +40,7 @@ public class BlockCeramicPatterned extends BlockDesign { } @Override - public void addBlockTooltip(ItemStack stack, List tooltip) { + public void addBlockTooltip(ItemStack stack, List tooltip) { super.addBlockTooltip(stack, tooltip); DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); tooltip.add(EnumChatFormatting.GRAY + block.getDesign().getName()); diff --git a/src/main/java/binnie/botany/ceramic/BlockStained.java b/src/main/java/binnie/botany/ceramic/BlockStained.java index 1be83881..00b5af79 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStained.java +++ b/src/main/java/binnie/botany/ceramic/BlockStained.java @@ -111,7 +111,7 @@ public class BlockStained extends Block implements IBlockMetadata { } @Override - public void addBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { int meta = TileEntityMetadata.getItemDamage(itemStack); tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName()); } @@ -122,7 +122,7 @@ public class BlockStained extends Block implements IBlockMetadata { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { + public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { for (EnumFlowerColor c : EnumFlowerColor.values()) { itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal())); } diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index 7938f644..8aa1797c 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -13,7 +13,7 @@ public class PigmentRecipe implements IRecipe { protected ItemStack cached; - private ItemStack unknown; + private final ItemStack unknown; public PigmentRecipe() { unknown = null; diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java index 4367314a..998367b7 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java @@ -6,7 +6,7 @@ import binnie.core.craftgui.controls.listbox.ControlListBox; public class ControlColorMixBox extends ControlListBox { - private Type type; + private final Type type; public ControlColorMixBox(IWidget parent, int x, int y, int width, int height, Type type) { super(parent, x, y, width, height, 12.0f); @@ -18,7 +18,7 @@ public class ControlColorMixBox extends ControlListBox { return new ControlColorMixItem(getContent(), value, y); } - enum Type { + public enum Type { Resultant, Further } diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index 2acc9852..aeef4322 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -13,11 +13,11 @@ import forestry.api.farming.IFarmHousing; public class CircuitGarden extends BinnieCircuit { - private boolean isManual; - private boolean isFertilised; - private ItemStack icon; - private EnumMoisture moisture; - private EnumAcidity acidity; + private final boolean isManual; + private final boolean isFertilised; + private final ItemStack icon; + private final EnumMoisture moisture; + private final EnumAcidity acidity; public CircuitGarden(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) { @@ -46,27 +46,27 @@ public class CircuitGarden extends BinnieCircuit { } if (acidity == EnumAcidity.ACID) { - if (info.length() > 0) { + if (!info.isEmpty()) { info += ", "; } info += EnumChatFormatting.RED + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET; } if (acidity == EnumAcidity.NEUTRAL) { - if (info.length() > 0) { + if (!info.isEmpty()) { info += ", "; } info += EnumChatFormatting.GREEN + I18N.localise("botany.ph.neutral") + EnumChatFormatting.RESET; } if (acidity == EnumAcidity.ALKALINE) { - if (info.length() > 0) { + if (!info.isEmpty()) { info += ", "; } info += EnumChatFormatting.AQUA + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET; } - if (info.length() > 0) { + if (!info.isEmpty()) { info = " (" + info + EnumChatFormatting.RESET + ")"; } addTooltipString(I18N.localise("botany.circuit.flowers") + info); @@ -101,8 +101,4 @@ public class CircuitGarden extends BinnieCircuit { ((IFarmHousing) tile).resetFarmLogic(FarmDirection.values()[slot]); } - @Override - public void onTick(int arg0, Object arg1) { - // ignored - } } diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index b366cb31..69f438bc 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -359,8 +359,7 @@ public class GardenLogic extends FarmLogic { try { IOwnable housing2 = (IOwnable) housing; - GameProfile prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile", new Class[0]) - .invoke(housing2); + GameProfile prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile").invoke(housing2); ((TileEntityFlower) tile).setOwner(prof); } catch (Exception ex) { // ignored diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index f0ae7f07..7a2a972e 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -85,7 +85,7 @@ public class BlockFlower extends BlockContainer { super.onBlockPlacedBy(world, x, y, z, entity, stack); TileEntity flower = world.getTileEntity(x, y, z); if (!BinnieCore.proxy.isSimulating(world)) { - if (flower != null && flower instanceof TileEntityFlower) { + if (flower instanceof TileEntityFlower) { IFlower f = BotanyCore.getFlowerRoot().getMember(stack); ((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower)); } @@ -93,7 +93,7 @@ public class BlockFlower extends BlockContainer { } TileEntity below = world.getTileEntity(x, y - 1, z); - if (flower != null && flower instanceof TileEntityFlower) { + if (flower instanceof TileEntityFlower) { if (below instanceof TileEntityFlower) { ((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection()); } else { @@ -108,15 +108,14 @@ public class BlockFlower extends BlockContainer { @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { TileEntity tile = world.getTileEntity(x, y, z); - if (!(tile instanceof TileEntityFlower)) { + if (!(tile instanceof TileEntityFlower tileFlower)) { return super.getIcon(world, x, y, z, side); } - TileEntityFlower f = (TileEntityFlower) tile; - EnumFlowerStage stage = (f.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER; - IFlowerType flower = f.getType(); - int section = f.getRenderSection(); - boolean flowered = f.isFlowered(); + EnumFlowerStage stage = (tileFlower.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER; + IFlowerType flower = tileFlower.getType(); + int section = tileFlower.getRenderSection(); + boolean flowered = tileFlower.isFlowered(); if (RendererBotany.pass == 0) { return flower.getStem(stage, flowered, section); } @@ -129,12 +128,11 @@ public class BlockFlower extends BlockContainer { @SideOnly(Side.CLIENT) public int colorMultiplier(IBlockAccess world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEntityFlower) { - TileEntityFlower f = (TileEntityFlower) tile; + if (tile instanceof TileEntityFlower tileFlower) { if (RendererBotany.pass == 0) { - return f.getStemColour(); + return tileFlower.getStemColour(); } - return (RendererBotany.pass == 1) ? f.getPrimaryColor() : f.getSecondaryColor(); + return (RendererBotany.pass == 1) ? tileFlower.getPrimaryColor() : tileFlower.getSecondaryColor(); } return 0xffffff; } @@ -153,14 +151,13 @@ public class BlockFlower extends BlockContainer { super.onNeighborBlockChange(world, x, y, z, block); checkAndDropBlock(world, x, y, z); TileEntity tile = world.getTileEntity(x, y, z); - if (!(tile instanceof TileEntityFlower)) { + if (!(tile instanceof TileEntityFlower tileFlower)) { return; } - TileEntityFlower flower = (TileEntityFlower) tile; - if (flower.getSection() == 0 && flower.getFlower() != null - && flower.getFlower().getAge() > 0 - && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1 + if (tileFlower.getSection() == 0 && tileFlower.getFlower() != null + && tileFlower.getFlower().getAge() > 0 + && tileFlower.getFlower().getGenome().getPrimary().getType().getSections() > 1 && world.getBlock(x, y + 1, z) != Botany.flower) { dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); world.setBlockToAir(x, y, z); @@ -212,7 +209,7 @@ public class BlockFlower extends BlockContainer { List drops = getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0); boolean hasBeenBroken = world.setBlockToAir(x, y, z); if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) - && drops.size() > 0 + && !drops.isEmpty() && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { dropBlockAsItem(world, x, y, z, drop); diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index d6f98aed..adf59c3f 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -57,11 +57,6 @@ public abstract class ItemBotany extends Item { return false; } - @Override - public boolean getShareTag() { - return true; - } - @Override public boolean hasEffect(ItemStack stack, int pass) { if (!stack.hasTagCompound()) { @@ -73,7 +68,7 @@ public abstract class ItemBotany extends Item { } @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean flag) { if (!itemstack.hasTagCompound()) { return; } @@ -138,11 +133,11 @@ public abstract class ItemBotany extends Item { } @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { addCreativeItems(itemList, true); } - public void addCreativeItems(List itemList, boolean hideSecrets) { + public void addCreativeItems(List itemList, boolean hideSecrets) { for (IIndividual individual : BotanyCore.speciesRoot.getIndividualTemplates()) { if (hideSecrets && individual.isSecret() && !Config.isDebug) { continue; @@ -199,10 +194,9 @@ public abstract class ItemBotany extends Item { if (getStage() == EnumFlowerStage.POLLEN) { IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(itemstack); TileEntity target = world.getTileEntity(x, y, z); - if (!(target instanceof IPollinatable)) { + if (!(target instanceof IPollinatable pollinatable)) { return false; } - IPollinatable pollinatable = (IPollinatable) target; if (!pollinatable.canMateWith(flower)) { return false; } diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 2d2c6567..068dd792 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -33,7 +33,7 @@ public class ItemInsulatedTube extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (Material mat : Material.values()) { for (Insulate ins : Insulate.values()) { list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); @@ -61,7 +61,7 @@ public class ItemInsulatedTube extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(Insulate.get(stack.getItemDamage()).getName()); } @@ -93,8 +93,8 @@ public class ItemInsulatedTube extends Item { Bronze(0xddc276, "bronze"), Iron(0xd8d8d8, "iron"); - protected int color; - protected String name; + private final int color; + private final String name; Material(int color, String name) { this.color = color; @@ -123,8 +123,8 @@ public class ItemInsulatedTube extends Item { Stone(0x6d6d6d, "smoothStone"), Sandstone(0xc1b989, "sandstone"); - protected int color; - protected String name; + private final int color; + private final String name; Insulate(int color, String name) { this.color = color; @@ -144,26 +144,14 @@ public class ItemInsulatedTube extends Item { } public ItemStack getStack() { - switch (this) { - case Clay: - return new ItemStack(Blocks.clay); - - case Cobble: - return new ItemStack(Blocks.cobblestone); - - case HardenedClay: - return new ItemStack(Blocks.hardened_clay); - - case Sand: - return new ItemStack(Blocks.sand); - - case Sandstone: - return new ItemStack(Blocks.sandstone); - - case Stone: - return new ItemStack(Blocks.stone); - } - return null; + return switch (this) { + case Clay -> new ItemStack(Blocks.clay); + case Cobble -> new ItemStack(Blocks.cobblestone); + case HardenedClay -> new ItemStack(Blocks.hardened_clay); + case Sand -> new ItemStack(Blocks.sand); + case Sandstone -> new ItemStack(Blocks.sandstone); + case Stone -> new ItemStack(Blocks.stone); + }; } } } diff --git a/src/main/java/binnie/botany/flower/RendererBotany.java b/src/main/java/binnie/botany/flower/RendererBotany.java index d2d57e98..43aac62e 100644 --- a/src/main/java/binnie/botany/flower/RendererBotany.java +++ b/src/main/java/binnie/botany/flower/RendererBotany.java @@ -25,9 +25,8 @@ public class RendererBotany implements ISimpleBlockRenderingHandler { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z)); double d1 = x; - double d2 = y; double d3 = z; - long i1 = x * 3129871 ^ z * 116129781L; + long i1 = x * 3129871L ^ z * 116129781L; i1 = i1 * i1 * 42317861L + i1 * 11L; d1 += ((i1 >> 16 & 0xFL) / 15.0f - 0.5) * 0.3; d3 += ((i1 >> 24 & 0xFL) / 15.0f - 0.5) * 0.3; @@ -46,7 +45,7 @@ public class RendererBotany implements ISimpleBlockRenderingHandler { } tessellator.setColorOpaque_F(f, f2, f3); IIcon iicon = block.getIcon(world, x, y, z, 0); - renderer.drawCrossedSquares(iicon, d1, d2, d3, 1.0f); + renderer.drawCrossedSquares(iicon, d1, y, d3, 1.0f); } return false; } diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index c1784ffc..6ce799da 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -213,11 +213,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return; } - if (!canTolerate || light < 1.0f) { - flower.setWilted(true); - } else { - flower.setWilted(false); - } + flower.setWilted(!canTolerate || light < 1.0f); float chanceDispersal = 0.8f; chanceDispersal += 0.2f * flower.getGenome().getFertility(); @@ -302,7 +298,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public void updateRender(boolean update) { if (update && getFlower() != null && getFlower().getGenome() != null) { RenderInfo newInfo = new RenderInfo(getFlower(), this); - if (renderInfo == null || !newInfo.equals(renderInfo)) { + if (!newInfo.equals(renderInfo)) { setRender(newInfo); } } @@ -619,8 +615,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt @Override public boolean equals(Object obj) { - if (obj instanceof RenderInfo) { - RenderInfo o = (RenderInfo) obj; + if (obj instanceof RenderInfo o) { return o.age == age && o.wilted == wilted && o.flowered == flowered && o.primary == primary diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index ed8d7287..fddf3d55 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -71,7 +71,7 @@ public class BlockPlant extends BlockBush { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (Type type : Type.values()) { list.add(type.get()); } @@ -137,7 +137,7 @@ public class BlockPlant extends BlockBush { public IIcon icon; - protected String name; + private final String name; Type(String name) { this.name = name; diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index b99b3c66..9a2671e5 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -56,7 +56,7 @@ public class BlockSoil extends Block implements IBlockSoil { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int i = 0; i < 9; ++i) { list.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 839932ca..67a5c25d 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -46,16 +46,16 @@ public class Gardening { for (int dz = -1; dz < 2; ++dz) { if (dx != 0 || dz != 0) { if (world.getBlock(x + dx, y, z + dz) == Blocks.sand) { - bias -= 1.5; + bias -= 1.5f; } else if (world.getBlock(x + dx, y, z + dz) == Blocks.water) { - bias += 1.5; + bias += 1.5f; } } } } if (world.isRaining() && world.canBlockSeeTheSky(x, y + 1, z) && world.getPrecipitationHeight(x, z) <= y + 1) { - bias += 1.5; + bias += 1.5f; } for (int dx = -1; dx < 2; ++dx) { @@ -118,13 +118,13 @@ public class Gardening { return false; } - TileEntity tileFlower = world.getTileEntity(x, y, z); - TileEntity below = world.getTileEntity(x, y - 1, z); - if (tileFlower != null && tileFlower instanceof TileEntityFlower) { - if (below instanceof TileEntityFlower) { - ((TileEntityFlower) tileFlower).setSection(((TileEntityFlower) below).getSection()); + final TileEntity tile = world.getTileEntity(x, y, z); + final TileEntity below = world.getTileEntity(x, y - 1, z); + if (tile instanceof TileEntityFlower tileFlower) { + if (below instanceof TileEntityFlower lowerFlower) { + tileFlower.setSection(lowerFlower.getSection()); } else { - ((TileEntityFlower) tileFlower).create(flower, owner); + tileFlower.create(flower, owner); } } @@ -138,7 +138,7 @@ public class Gardening { } TileEntity flower = world.getTileEntity(x, y, z); - if (flower == null || !(flower instanceof TileEntityFlower)) { + if (!(flower instanceof TileEntityFlower)) { return; } @@ -151,7 +151,7 @@ public class Gardening { world.setBlock(x, y + 1, z, Botany.flower, 0, 2); TileEntity tileFlower = world.getTileEntity(x, y + 1, z); - if (tileFlower != null && tileFlower instanceof TileEntityFlower) { + if (tileFlower instanceof TileEntityFlower) { ((TileEntityFlower) tileFlower).setSection(section + 1); } } @@ -250,14 +250,11 @@ public class Gardening { } public static Block getSoilBlock(EnumSoilType type, boolean weedkill) { - switch (type) { - case FLOWERBED: - return weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed; - - case LOAM: - return weedkill ? Botany.loamNoWeed : Botany.loam; - } - return weedkill ? Botany.soilNoWeed : Botany.soil; + return switch (type) { + case FLOWERBED -> weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed; + case LOAM -> weedkill ? Botany.loamNoWeed : Botany.loam; + default -> weedkill ? Botany.soilNoWeed : Botany.soil; + }; } public static boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp) { diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index a2f11d93..c0b12877 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -20,7 +20,7 @@ public class ItemSoil extends ItemBlock { protected EnumSoilType type; - private boolean noWeed; + private final boolean noWeed; public ItemSoil(Block block) { super(block); @@ -31,7 +31,7 @@ public class ItemSoil extends ItemBlock { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3]; EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3]; @@ -45,20 +45,20 @@ public class ItemSoil extends ItemBlock { } if (acidity == EnumAcidity.ACID) { - if (info.length() > 0) { + if (!info.isEmpty()) { info += ", "; } info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET; } if (acidity == EnumAcidity.ALKALINE) { - if (info.length() > 0) { + if (!info.isEmpty()) { info += ", "; } info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET; } - if (info.length() > 0) { + if (!info.isEmpty()) { tooltip.add(info); } diff --git a/src/main/java/binnie/botany/genetics/AlleleColor.java b/src/main/java/binnie/botany/genetics/AlleleColor.java index 891a028a..cd71bb0d 100644 --- a/src/main/java/binnie/botany/genetics/AlleleColor.java +++ b/src/main/java/binnie/botany/genetics/AlleleColor.java @@ -4,10 +4,9 @@ import forestry.api.genetics.IAlleleInteger; public class AlleleColor implements IAlleleInteger { - private String uid; - private int value; - private EnumFlowerColor color; - private boolean dominant = true; + private final String uid; + private final int value; + private final EnumFlowerColor color; public AlleleColor(EnumFlowerColor color, String uid, int value) { this.color = color; @@ -22,7 +21,7 @@ public class AlleleColor implements IAlleleInteger { @Override public boolean isDominant() { - return dominant; + return true; } @Override diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index 8da480d6..d5772751 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -93,10 +93,10 @@ public enum EnumFlowerColor implements IFlowerColor { YELLOW_GREEN("yellowGreen", 0x9acd32); private static final EnumFlowerColor[] ALL_VALUES = values(); - private int color; - private int colorDis; - private String name; - private AlleleColor allele; + private final int color; + private final int colorDis; + private final String name; + private final AlleleColor allele; EnumFlowerColor(String name, int color) { this.name = name; diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerType.java b/src/main/java/binnie/botany/genetics/EnumFlowerType.java index 7dff32e5..25a2f0c8 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerType.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerType.java @@ -57,18 +57,18 @@ public enum EnumFlowerType implements IFlowerType { DELPHINIUM(2), HOLLYHOCK(2); - protected int sections; - protected IIcon[] stem; - protected IIcon[] petal; - protected IIcon[] variant; - protected IIcon[] unflowered; - protected IIcon seedStem; - protected IIcon seedPetal; - protected IIcon seedVariant; - protected IIcon pollenStem; - protected IIcon pollenPetal; - protected IIcon pollenVariant; - protected IIcon blank; + private final int sections; + private final IIcon[] stem; + private final IIcon[] petal; + private final IIcon[] variant; + private final IIcon[] unflowered; + private IIcon seedStem; + private IIcon seedPetal; + private IIcon seedVariant; + private IIcon pollenStem; + private IIcon pollenPetal; + private IIcon pollenVariant; + private IIcon blank; EnumFlowerType() { this(1); diff --git a/src/main/java/binnie/botany/genetics/FlowerGenome.java b/src/main/java/binnie/botany/genetics/FlowerGenome.java index ffd01eda..ddb28a53 100644 --- a/src/main/java/binnie/botany/genetics/FlowerGenome.java +++ b/src/main/java/binnie/botany/genetics/FlowerGenome.java @@ -96,7 +96,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome { @Override public float getAgeChance() { - return 1.0f * (float) Math.sqrt(2.0f / getLifespan()); + return (float) Math.sqrt(2.0f / getLifespan()); } @Override diff --git a/src/main/java/binnie/botany/genetics/FlowerHelper.java b/src/main/java/binnie/botany/genetics/FlowerHelper.java index b28161af..73b4f800 100644 --- a/src/main/java/binnie/botany/genetics/FlowerHelper.java +++ b/src/main/java/binnie/botany/genetics/FlowerHelper.java @@ -39,8 +39,8 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { protected static String UID = "rootFlowers"; - private static ArrayList flowerMutations = new ArrayList<>(); - private static ArrayList colourMixes = new ArrayList<>(); + private static final ArrayList flowerMutations = new ArrayList<>(); + private static final ArrayList colourMixes = new ArrayList<>(); protected Map conversions; @@ -226,7 +226,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { } @Override - public Class getMemberClass() { + public Class getMemberClass() { return IFlower.class; } diff --git a/src/main/java/binnie/botany/genetics/FlowerSpecies.java b/src/main/java/binnie/botany/genetics/FlowerSpecies.java index 064c7595..2777b394 100644 --- a/src/main/java/binnie/botany/genetics/FlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/FlowerSpecies.java @@ -56,8 +56,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { FOXGLOVE("foxglove", "digitalis", "purpurea", EnumFlowerType.FOXGLOVE, EnumFlowerColor.HOT_PINK), ZINNIA("zinnia", "zinnia", "elegans", EnumFlowerType.ZINNIA, EnumFlowerColor.MEDIUM_VIOLET_RED, EnumFlowerColor.YELLOW), - CHRYSANTHEMUM("chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", EnumFlowerType.MUMS, - EnumFlowerColor.VIOLET), + CHRYSANTHEMUM("chrysanthemum", "chrysanthemum", "ï?? grandiflorum", EnumFlowerType.MUMS, EnumFlowerColor.VIOLET), MARIGOLD("marigold", "calendula", "officinalis", EnumFlowerType.MARIGOLD, EnumFlowerColor.GOLD, EnumFlowerColor.DARK_ORANGE), GERANIUM("geranium", "geranium", "maderense", EnumFlowerType.GERANIUM, EnumFlowerColor.DEEP_PINK), @@ -68,7 +67,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { EnumFlowerColor.WHITE), LILY("lily", "lilium", "auratum", EnumFlowerType.LILY, EnumFlowerColor.PINK, EnumFlowerColor.GOLD), YARROW("yarrow", "achillea", "millefolium", EnumFlowerType.YARROW, EnumFlowerColor.YELLOW), - PETUNIA("petunia", "petunia", "\u00ef?? atkinsiana", EnumFlowerType.PETUNIA, EnumFlowerColor.MEDIUM_VIOLET_RED, + PETUNIA("petunia", "petunia", "ï?? atkinsiana", EnumFlowerType.PETUNIA, EnumFlowerColor.MEDIUM_VIOLET_RED, EnumFlowerColor.THISTLE), AGAPANTHUS("agapanthus", "agapanthus", "praecox", EnumFlowerType.AGAPANTHUS, EnumFlowerColor.DEEP_SKY_BLUE), FUCHSIA("fuchsia", "fuchsia", "magellanica", EnumFlowerType.FUCHSIA, EnumFlowerColor.DEEP_PINK, @@ -96,24 +95,24 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { DELPHINIUM("delphinium", "delphinium", "staphisagria", EnumFlowerType.DELPHINIUM, EnumFlowerColor.DARK_SLATE_BLUE), HOLLYHOCK("hollyhock", "Alcea", "rosea", EnumFlowerType.HOLLYHOCK, EnumFlowerColor.BLACK, EnumFlowerColor.GOLD); - protected EnumFlowerColor stemColor; - protected EnumAllele.Fertility fert; - protected EnumAllele.Lifespan life; - protected EnumAllele.Sappiness sap; - protected IFlowerType type; - protected String name; - protected String binomial; - protected String branchName; - protected EnumFlowerColor primaryColor; - protected EnumFlowerColor secondaryColor; - protected EnumTemperature temperature; - protected EnumAcidity pH; - protected EnumMoisture moisture; - protected EnumTolerance tempTolerance; - protected EnumTolerance pHTolerance; - protected EnumTolerance moistureTolerance; - protected List variantTemplates; - protected IClassification branch; + private EnumFlowerColor stemColor; + private EnumAllele.Fertility fert; + private EnumAllele.Lifespan life; + private EnumAllele.Sappiness sap; + private final IFlowerType type; + private final String name; + private final String binomial; + private final String branchName; + private final EnumFlowerColor primaryColor; + private final EnumFlowerColor secondaryColor; + private EnumTemperature temperature; + private EnumAcidity pH; + private EnumMoisture moisture; + private EnumTolerance tempTolerance; + private EnumTolerance pHTolerance; + private EnumTolerance moistureTolerance; + private final List variantTemplates; + private IClassification branch; FlowerSpecies(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor colour) { this(name, branch, binomial, type, colour, colour); diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 8bba44b2..7a38f852 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -42,13 +42,13 @@ public class ItemDictionary extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); } @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); list.add(new ItemStack(item, 1, 1)); } diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/src/main/java/binnie/botany/items/BotanyItems.java index 0d4fdb8d..9340e44e 100644 --- a/src/main/java/binnie/botany/items/BotanyItems.java +++ b/src/main/java/binnie/botany/items/BotanyItems.java @@ -21,9 +21,9 @@ public enum BotanyItems implements IItemMisc { Mortar("mortar"), Weedkiller("weedkiller"); - protected IIcon icon; - protected String name; - protected String iconPath; + private IIcon icon; + private final String name; + private final String iconPath; BotanyItems(String name) { this.name = name; @@ -41,7 +41,7 @@ public enum BotanyItems implements IItemMisc { } @Override - public void addInformation(List data) { + public void addInformation(List data) { // ignored } diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index 525c1f49..bc116aea 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -25,7 +25,7 @@ public class ItemClay extends Item { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName()); } @@ -44,7 +44,7 @@ public class ItemClay extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (EnumFlowerColor c : EnumFlowerColor.values()) { list.add(new ItemStack(this, 1, c.ordinal())); } diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index 8c46a219..fe2ae787 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -25,7 +25,7 @@ public class ItemPigment extends Item { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName()); } @@ -44,7 +44,7 @@ public class ItemPigment extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (EnumFlowerColor c : EnumFlowerColor.values()) { list.add(new ItemStack(this, 1, c.ordinal())); } diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index f364c4e2..893e0666 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -47,7 +47,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { return new IBinnieGUID[0]; } - public Class[] getConfigs() { + public Class[] getConfigs() { return new Class[0]; } @@ -68,7 +68,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { } if (getConfigs() != null) { - for (Class cls : getConfigs()) { + for (Class cls : getConfigs()) { Binnie.Configuration.registerConfiguration(cls, this); } } @@ -80,7 +80,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { // TODO what does it mean? Collections.addAll(fields, getClass().getFields()); - for (Class cls : getClass().getClasses()) { + for (Class cls : getClass().getClasses()) { Collections.addAll(fields, getClass().getFields()); } for (IInitializable module : modules) { diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 7637a55f..5572f90b 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -51,7 +51,7 @@ import forestry.plugins.PluginManager; @Mod( modid = "BinnieCore", name = "Binnie Core", - version = BinnieCore.VERSION, + version = Tags.VERSION, useMetadata = true, dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)") public class BinnieCore extends AbstractMod { @@ -63,14 +63,13 @@ public class BinnieCore extends AbstractMod { public static BinnieProxy proxy; public static int multipassRenderID; - private static List modList = new ArrayList<>(); + private static final List modList = new ArrayList<>(); public static MachineGroup packageCompartment; public static ItemGenesis genesis; public static ItemFieldKit fieldKit; - public static final String VERSION = "GRADLETOKEN_VERSION"; @Mod.EventHandler - public void preInit(FMLPreInitializationEvent evt) { + public void preInit(FMLPreInitializationEvent event) { Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this); for (ManagerBase baseManager : Binnie.Managers) { addModule(baseManager); @@ -86,12 +85,12 @@ public class BinnieCore extends AbstractMod { } @Mod.EventHandler - public void init(FMLInitializationEvent evt) { + public void init(FMLInitializationEvent event) { init(); } @Mod.EventHandler - public void postInit(FMLPostInitializationEvent evt) { + public void postInit(FMLPostInitializationEvent event) { postInit(); } diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index 99359fcc..913e58bc 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -9,14 +9,15 @@ import cpw.mods.fml.common.registry.GameRegistry; public class Mods { - public static Mod forestry; - public static Mod ic2; - public static Mod botania; - public static Mod extraBiomes; + public static final Mod forestry = new Mod("Forestry"); + public static final Mod ic2 = new Mod("IC2"); + public static final Mod botania = new Mod("Botania"); + public static final Mod extraBiomes = new Mod("ExtrabiomesXL"); + public static final Mod dreamcraft = new Mod("dreamcraft"); private static Item findItem(String modId, String name) { Item stack = GameRegistry.findItem(modId, name); - if (stack == null && modId.equals("Forestry")) { + if (stack == null && forestry.matchID(modId)) { throw new RuntimeException("Item not found: " + modId + ":" + name); } return stack; @@ -24,7 +25,7 @@ public class Mods { private static ItemStack findItemStack(String modId, String name, int stackSize) { ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize); - if (stack == null && modId.equals("Forestry")) { + if (stack == null && forestry.matchID(modId)) { throw new RuntimeException("Stack not found: " + modId + ":" + name); } return stack; @@ -32,37 +33,32 @@ public class Mods { private static Block findBlock(String modId, String name) { Block stack = GameRegistry.findBlock(modId, name); - if (stack == null && modId.equals("Forestry")) { + if (stack == null && forestry.matchID(modId)) { throw new RuntimeException("Block not found: " + modId + ":" + name); } return stack; } - static { - Mods.forestry = new Mod("Forestry"); - Mods.ic2 = new Mod("IC2"); - Mods.botania = new Mod("Botania"); - Mods.extraBiomes = new Mod("ExtrabiomesXL"); - } - public static class Mod { - private String id; + private final String modid; + private final boolean isLoaded; private Mod(String id) { - this.id = id; + modid = id; + isLoaded = Loader.isModLoaded(id); } public Item item(String name) { - return findItem(id, name); + return findItem(modid, name); } public Block block(String name) { - return findBlock(id, name); + return findBlock(modid, name); } public ItemStack stack(String name, int stackSize) { - return findItemStack(id, name, stackSize); + return findItemStack(modid, name, stackSize); } public ItemStack stack(String name) { @@ -74,7 +70,11 @@ public class Mods { } public boolean active() { - return Loader.isModLoaded(id); + return isLoaded; + } + + public boolean matchID(final String id) { + return modid.equals(id); } } } diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index cb46b44c..a5054ff9 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -62,7 +62,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { } @Override - public void addBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { // ignored } @@ -97,7 +97,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { boolean hasBeenBroken = world.setBlockToAir(i, j, k); if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) - && drops.size() > 0 + && !drops.isEmpty() && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { block.dropAsStack(world, i, j, k, drop); diff --git a/src/main/java/binnie/core/block/IBlockMetadata.java b/src/main/java/binnie/core/block/IBlockMetadata.java index fd983da2..529812a0 100644 --- a/src/main/java/binnie/core/block/IBlockMetadata.java +++ b/src/main/java/binnie/core/block/IBlockMetadata.java @@ -15,7 +15,7 @@ public interface IBlockMetadata extends ITileEntityProvider { String getBlockName(ItemStack itemStack); - void addBlockTooltip(ItemStack itemStack, List tooltip); + void addBlockTooltip(ItemStack itemStack, List tooltip); void dropAsStack(World world, int x, int y, int z, ItemStack itemStack); } diff --git a/src/main/java/binnie/core/block/ItemMetadata.java b/src/main/java/binnie/core/block/ItemMetadata.java index 408643d4..d7eeb2d6 100644 --- a/src/main/java/binnie/core/block/ItemMetadata.java +++ b/src/main/java/binnie/core/block/ItemMetadata.java @@ -19,11 +19,6 @@ public class ItemMetadata extends ItemBlock { super(block); } - @Override - public int getMetadata(int damage) { - return 0; - } - @Override public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { @@ -56,7 +51,7 @@ public class ItemMetadata extends ItemBlock { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { ((IBlockMetadata) field_150939_a).addBlockTooltip(itemStack, tooltip); } diff --git a/src/main/java/binnie/core/block/MultipassItemRenderer.java b/src/main/java/binnie/core/block/MultipassItemRenderer.java index 5f9ffcda..0ea2e2c6 100644 --- a/src/main/java/binnie/core/block/MultipassItemRenderer.java +++ b/src/main/java/binnie/core/block/MultipassItemRenderer.java @@ -34,14 +34,10 @@ public class MultipassItemRenderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED: - case INVENTORY: - case EQUIPPED_FIRST_PERSON: - return true; - } - return false; + return switch (type) { + case ENTITY, EQUIPPED, INVENTORY, EQUIPPED_FIRST_PERSON -> true; + default -> false; + }; } @Override diff --git a/src/main/java/binnie/core/circuits/BinnieCircuit.java b/src/main/java/binnie/core/circuits/BinnieCircuit.java index 64ff5597..e8e6837f 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuit.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuit.java @@ -12,9 +12,9 @@ import forestry.api.circuits.ICircuitLayout; public class BinnieCircuit implements ICircuit { - private String uid; - private int limit; - private List tooltips; + private final String uid; + private final int limit; + private final List tooltips; public BinnieCircuit(String uid, int limit, ICircuitLayout layout, ItemStack itemStack) { tooltips = new ArrayList<>(); diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java index ffadbfc6..592e7660 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java @@ -9,8 +9,8 @@ import forestry.api.circuits.ICircuitSocketType; public class BinnieCircuitLayout implements ICircuitLayout { - private String uid; - private AbstractMod mod; + private final String uid; + private final AbstractMod mod; public BinnieCircuitLayout(AbstractMod mod, String uid) { this.uid = uid; diff --git a/src/main/java/binnie/core/craftgui/Tooltip.java b/src/main/java/binnie/core/craftgui/Tooltip.java index 84bc66dd..9d40efcd 100644 --- a/src/main/java/binnie/core/craftgui/Tooltip.java +++ b/src/main/java/binnie/core/craftgui/Tooltip.java @@ -39,13 +39,11 @@ public class Tooltip { } public boolean exists() { - return tooltip.size() > 0; + return !tooltip.isEmpty(); } - public void add(List list) { - for (Object obj : list) { - tooltip.add((String) obj); - } + public void add(List list) { + tooltip.addAll(list); } public List getList() { diff --git a/src/main/java/binnie/core/craftgui/Widget.java b/src/main/java/binnie/core/craftgui/Widget.java index b7a7eb4f..a9fa7683 100644 --- a/src/main/java/binnie/core/craftgui/Widget.java +++ b/src/main/java/binnie/core/craftgui/Widget.java @@ -19,17 +19,16 @@ public class Widget implements IWidget { protected int color; private IWidget parent; - private List subWidgets; - private List attributes; + private final List subWidgets; + private final List attributes; private IPoint position; private IPoint size; private IPoint offset; - private Collection globalEventHandlers; + private final Collection globalEventHandlers; private boolean enabled; private boolean visible; public Widget(IWidget parent) { - this.parent = null; subWidgets = new ArrayList<>(); attributes = new ArrayList<>(); position = new IPoint(0.0f, 0.0f); @@ -91,7 +90,7 @@ public class Widget implements IWidget { @Override public IWidget addWidget(IWidget widget) { - if (subWidgets.size() != 0 + if (!subWidgets.isEmpty() && subWidgets.get(subWidgets.size() - 1).hasAttribute(WidgetAttribute.ALWAYS_ON_TOP)) { subWidgets.add(subWidgets.size() - 1, widget); } else { diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index 15fa07dc..00fd92c2 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -51,13 +51,13 @@ public class WindowFieldKit extends Window { private float glassOffsetY; private float glassVX; private float glassVY; - private Random glassRand; + private final Random glassRand; private Control GlassControl; private ControlChromosome chromo; private ControlText text; private float analyseProgress; private boolean isAnalysing; - private Map info; + private final Map info; public WindowFieldKit(EntityPlayer player, IInventory inventory, Side side) { super(280.0f, 230.0f, player, inventory, side); diff --git a/src/main/java/binnie/core/craftgui/WindowGenesis.java b/src/main/java/binnie/core/craftgui/WindowGenesis.java index e4991772..8568081c 100644 --- a/src/main/java/binnie/core/craftgui/WindowGenesis.java +++ b/src/main/java/binnie/core/craftgui/WindowGenesis.java @@ -75,7 +75,7 @@ public class WindowGenesis extends Window { new Panel(this, one.outset(1), MinecraftGUI.PanelType.Black); new Panel(this, two.outset(1), MinecraftGUI.PanelType.Black); - geneList = new ControlListBox(this, one.x(), one.y(), one.w(), one.h(), 10.0f) { + geneList = new ControlListBox<>(this, one.x(), one.y(), one.w(), one.h(), 10.0f) { @Override public IWidget createOption(Gene value, int y) { @@ -83,7 +83,7 @@ public class WindowGenesis extends Window { } }; - geneOptions = new ControlListBox(this, two.x(), two.y(), two.w(), two.h(), 10.0f) { + geneOptions = new ControlListBox<>(this, two.x(), two.y(), two.w(), two.h(), 10.0f) { @Override public IWidget createOption(Gene value, int y) { diff --git a/src/main/java/binnie/core/craftgui/controls/ControlButton.java b/src/main/java/binnie/core/craftgui/controls/ControlButton.java index 070aa501..06ac3a98 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlButton.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlButton.java @@ -28,7 +28,7 @@ public class ControlButton extends Control { textWidget = new ControlText(this, getArea(), text, TextJustification.MIDDLE_CENTER); } - private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() { + private final EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() { @Override public void onEvent(EventMouse.Down event) { diff --git a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java index ad53b181..53ec0af7 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java @@ -23,7 +23,7 @@ public class ControlCheckbox extends Control implements IControlValue { } public ControlCheckbox(IWidget parent, float x, float y, float w, String text, boolean bool) { - super(parent, x, y, (w > 16.0f) ? w : 16.0f, 16.0f); + super(parent, x, y, Math.max(w, 16.0f), 16.0f); this.text = text; value = bool; if (w > 16.0f) { diff --git a/src/main/java/binnie/core/craftgui/controls/ControlText.java b/src/main/java/binnie/core/craftgui/controls/ControlText.java index 683879ba..3fd9eecd 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlText.java @@ -11,7 +11,7 @@ import binnie.core.craftgui.geometry.TextJustification; public class ControlText extends Control implements IControlValue { private String text; - private TextJustification align; + private final TextJustification align; public ControlText(IWidget parent, IPoint pos, String text) { this(parent, new IArea(pos, new IPoint(500.0f, 0.0f)), text, TextJustification.TOP_LEFT); diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java index d9ddcfa4..e2cfd088 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java @@ -69,11 +69,6 @@ public class ControlTextEdit extends Control implements IControlValue { }.setOrigin(EventHandler.Origin.Self, this)); } - @Override - public void onUpdateClient() { - // ignored - } - protected void onTextEdit(String value) { // ignored } diff --git a/src/main/java/binnie/core/craftgui/controls/core/Control.java b/src/main/java/binnie/core/craftgui/controls/core/Control.java index 529b18a8..51eb4780 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/core/craftgui/controls/core/Control.java @@ -38,11 +38,6 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { // ignored } - @Override - public void onUpdateClient() { - // ignored - } - public void addHelp(String string) { helpStrings.add(string); } diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java index dbdb4fd2..ce5ec999 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java @@ -37,7 +37,7 @@ public class ControlOption extends Control implements IControlValue { setColor(color); } - private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() { + private final EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() { @Override public void onEvent(EventMouse.Down event) { diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java index 15e854c6..c999d40d 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java @@ -22,7 +22,7 @@ public class ControlTextOption extends ControlOption { this(controlList, option, option.toString(), y); } - private EventWidget.ChangeColour.Handler mouseHandler = new EventWidget.ChangeColour.Handler() { + private final EventWidget.ChangeColour.Handler mouseHandler = new EventWidget.ChangeColour.Handler() { @Override public void onEvent(EventWidget.ChangeColour event) { diff --git a/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java b/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java index be533005..8db06900 100644 --- a/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java +++ b/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java @@ -15,8 +15,8 @@ public class ControlPage extends Control implements IControlValue { public ControlPage(IWidget parent, float x, float y, float w, float h, T value) { super(parent, x, y, w, h); setValue(value); - if (parent instanceof IControlValue && ((IControlValue) parent).getValue() == null) { - ((IControlValue) parent).setValue(value); + if (parent instanceof IControlValue cv && ((IControlValue) parent).getValue() == null) { + cv.setValue(value); } } diff --git a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java index accc7f2a..489c3a0c 100644 --- a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java +++ b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java @@ -41,7 +41,7 @@ public class ControlPages extends Control implements IControlValues, ICont public Collection getValues() { List list = new ArrayList<>(); for (IWidget child : getWidgets()) { - list.add((T) ((IControlValue) child).getValue()); + list.add((T) ((IControlValue) child).getValue()); } return list; } diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java index d00e801c..21146243 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java @@ -5,7 +5,7 @@ import binnie.core.craftgui.controls.core.Control; public class ControlScroll extends Control { - private IControlScrollable scrollWidget; + private final IControlScrollable scrollWidget; public ControlScroll(IWidget parent, float x, float y, float width, float height, IControlScrollable scrollWidget) { super(parent, x, y, width, height); diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java index add5a18d..77a0f799 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java @@ -30,7 +30,7 @@ public class ControlScrollBar extends Control { addSelfEventHandler(mouseDownHandler); } - private EventMouse.Down.Handler mouseDownHandler = new EventMouse.Down.Handler() { + private final EventMouse.Down.Handler mouseDownHandler = new EventMouse.Down.Handler() { @Override public void onEvent(EventMouse.Down event) { @@ -50,11 +50,6 @@ public class ControlScrollBar extends Control { } }; - @Override - public void onUpdateClient() { - // ignored - } - @Override public void onRenderBackground() { IArea renderArea = getRenderArea(); diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java index 2a52e8e6..2eab7dca 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java @@ -29,7 +29,7 @@ public class ControlScrollableContent extends Control impleme setPercentageIndex(getPercentageIndex()); } - private EventMouse.Wheel.Handler mouseWheelHandler = new EventMouse.Wheel.Handler() { + private final EventMouse.Wheel.Handler mouseWheelHandler = new EventMouse.Wheel.Handler() { @Override public void onEvent(EventMouse.Wheel event) { diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java index d6806310..af84085e 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java @@ -20,7 +20,7 @@ public class ControlTab extends Control implements ITooltip, IControlValue protected T value; - private ControlTabBar tabBar; + private final ControlTabBar tabBar; public ControlTab(ControlTabBar parent, float x, float y, float w, float h, T value) { super(parent, x, y, w, h); @@ -59,8 +59,7 @@ public class ControlTab extends Control implements ITooltip, IControlValue } CraftGUI.render.texture(iTexture, area); - if (this instanceof ControlTabIcon) { - ControlTabIcon icon = (ControlTabIcon) this; + if (this instanceof ControlTabIcon icon) { ControlItemDisplay item = (ControlItemDisplay) getWidgets().get(0); if (texture == CraftGUITexture.TabDisabled) { item.setColor(0xaaaaaaaa); diff --git a/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java b/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java index 46ced4b4..5402e3fe 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java @@ -13,9 +13,9 @@ import binnie.core.genetics.BreedingSystem; class ControlBreedingProgress extends Control { - private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2); - private float percentage; - private int colour; + private static final Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2); + private final float percentage; + private final int colour; public ControlBreedingProgress(IWidget parent, int x, int y, int width, int height, BreedingSystem system, float percentage) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java index a9d1a1b4..a42eb980 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java @@ -12,7 +12,7 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay; public class ControlItemStackOption extends ControlTextOption { - private ControlItemDisplay controlBee; + private final ControlItemDisplay controlBee; public ControlItemStackOption(ControlList controlList, ItemStack option, int y) { super(controlList, option, option.getDisplayName(), y); diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java index 25439215..dcfdd828 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java @@ -11,7 +11,7 @@ import forestry.api.genetics.IMutation; class ControlMutationBox extends ControlListBox { - private Type type; + private final Type type; private IAlleleSpecies species; @Override diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java index caa52333..28a7b8fa 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java @@ -17,11 +17,11 @@ import forestry.api.genetics.IMutation; class ControlMutationSymbol extends Control implements ITooltip { - private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); - private static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2); + private static final Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); + private static final Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2); private IMutation value; private boolean discovered; - private int type; + private final int type; @Override public void onRenderBackground() { diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java index 962d2aff..7502cfcb 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java @@ -11,7 +11,7 @@ import forestry.api.genetics.IAlleleSpecies; class ControlSpeciesBoxOption extends ControlTextOption { - private ControlDatabaseIndividualDisplay controlBee; + private final ControlDatabaseIndividualDisplay controlBee; public ControlSpeciesBoxOption(ControlList controlList, IAlleleSpecies option, int y) { super(controlList, option, option.getName(), y); diff --git a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java index b991b52d..5a950d69 100644 --- a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java +++ b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java @@ -7,8 +7,8 @@ import binnie.core.util.I18N; public class DatabaseTab implements ITooltipHelp { - private String mod; - private String unloc; + private final String mod; + private final String unloc; public DatabaseTab(AbstractMod mod, String unloc) { this.mod = mod.getModID(); diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java index 9d777442..826a3aff 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java @@ -14,10 +14,10 @@ import forestry.api.genetics.IClassification; public class PageBranchOverview extends PageBranch { - private ControlText branchName; - private ControlText branchScientific; - private ControlText branchAuthority; - private List branchDescription; + private final ControlText branchName; + private final ControlText branchScientific; + private final ControlText branchAuthority; + private final List branchDescription; public PageBranchOverview(IWidget parent, DatabaseTab tab) { super(parent, tab); diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java index 4e91525b..02f2ff13 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java @@ -10,7 +10,7 @@ import forestry.api.genetics.IClassification; public class PageBranchSpecies extends PageBranch { - private ControlSpeciesBox speciesList; + private final ControlSpeciesBox speciesList; @Mod.EventHandler public void onHandleEvent(EventValueChanged event) { diff --git a/src/main/java/binnie/core/craftgui/database/PageBreeder.java b/src/main/java/binnie/core/craftgui/database/PageBreeder.java index 974b54eb..3fa1960e 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreeder.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreeder.java @@ -13,7 +13,7 @@ import binnie.core.util.I18N; public class PageBreeder extends ControlPage { - private GameProfile player; + private final GameProfile player; public PageBreeder(IWidget parent, GameProfile player, DatabaseTab tab) { super(parent, 0.0f, 0.0f, parent.getSize().x(), parent.getSize().y(), tab); @@ -22,7 +22,7 @@ public class PageBreeder extends ControlPage { } public void onPageRefresh() { - while (getWidgets().size() > 0) { + while (!getWidgets().isEmpty()) { deleteChild(getWidgets().get(0)); } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java index 13b6706f..5ab997bd 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java @@ -11,8 +11,8 @@ import forestry.api.genetics.IClassification; public class PageSpeciesClassification extends PageSpecies { - private Map levels; - private ControlText genus; + private final Map levels; + private final ControlText genus; public PageSpeciesClassification(IWidget parent, DatabaseTab tab) { super(parent, tab); diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java index 32f55be8..3d396129 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java @@ -7,7 +7,7 @@ import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesMutations extends PageSpecies { - private ControlMutationBox list; + private final ControlMutationBox list; public PageSpeciesMutations(IWidget parent, DatabaseTab tab) { super(parent, tab); diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java index 371efa15..31b3ec5f 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java @@ -14,14 +14,14 @@ import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesOverview extends PageSpecies { - private ControlText controlName; - private ControlText controlScientific; - private ControlText controlAuthority; - private ControlText controlComplexity; - private ControlText controlDescription; - private ControlText controlSignature; - private ControlDatabaseIndividualDisplay controlInd1; - private ControlDatabaseIndividualDisplay controlInd2; + private final ControlText controlName; + private final ControlText controlScientific; + private final ControlText controlAuthority; + private final ControlText controlComplexity; + private final ControlText controlDescription; + private final ControlText controlSignature; + private final ControlDatabaseIndividualDisplay controlInd1; + private final ControlDatabaseIndividualDisplay controlInd2; public PageSpeciesOverview(IWidget parent, DatabaseTab tab) { super(parent, tab); @@ -58,23 +58,23 @@ public class PageSpeciesOverview extends PageSpecies { + EnumChatFormatting.RESET); controlComplexity.setValue(I18N.localise("extratrees.genetics.complexity", species.getComplexity())); String desc = species.getDescription(); - String descBody = EnumChatFormatting.ITALIC.toString(); + StringBuilder descBody = new StringBuilder(EnumChatFormatting.ITALIC.toString()); String descSig = ""; if (desc == null || desc.isEmpty() || desc.matches("(\\w+\\.?)+")) { - descBody += I18N.localise("binniecore.gui.database.species.noDesc"); + descBody.append(I18N.localise("binniecore.gui.database.species.noDesc")); } else { String[] descStrings = desc.split("\\|"); - descBody += descStrings[0]; + descBody.append(descStrings[0]); for (int i = 1; i < descStrings.length - 1; ++i) { - descBody = descBody + " " + descStrings[i]; + descBody.append(" ").append(descStrings[i]); } if (descStrings.length > 1) { descSig += descStrings[descStrings.length - 1]; } } - controlDescription.setValue(descBody + EnumChatFormatting.RESET); + controlDescription.setValue(descBody.toString() + EnumChatFormatting.RESET); controlSignature.setValue(descSig + EnumChatFormatting.RESET); float descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x()); controlSignature.setPosition( diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java index c8308020..5728c8e5 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java @@ -7,7 +7,7 @@ import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesResultant extends PageSpecies { - private ControlMutationBox list; + private final ControlMutationBox list; public PageSpeciesResultant(IWidget parent, DatabaseTab tab) { super(parent, tab); diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index eac253a0..9c0cdc20 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -40,8 +40,8 @@ public abstract class WindowAbstractDatabase extends Window { protected boolean isNEI; private float selectionBoxWidth; - private Map modes; - private BreedingSystem system; + private final Map modes; + private final BreedingSystem system; private Panel panelInformation; private Panel panelSearch; private ControlPages modePages; @@ -88,13 +88,12 @@ public abstract class WindowAbstractDatabase extends Window { @Override public void onEvent(EventValueChanged event) { - if (!(event.getOrigin().getParent() instanceof ControlPage)) { + if (!(event.getOrigin().getParent() instanceof ControlPage parent)) { return; } else if ((event.getValue() instanceof DatabaseTab)) { return; } - ControlPage parent = (ControlPage) event.getOrigin().getParent(); if (!(parent.getValue() instanceof IDatabaseMode)) { return; } @@ -185,7 +184,7 @@ public abstract class WindowAbstractDatabase extends Window { @Override public ControlTab createTab(float x, float y, float w, float h, IDatabaseMode value) { - return new ControlTab(this, x, y, w, h, value) { + return new ControlTab<>(this, x, y, w, h, value) { @Override public String getName() { @@ -199,7 +198,7 @@ public abstract class WindowAbstractDatabase extends Window { CraftGUIUtil.linkWidgets(tab, modePages); changeMode(Mode.Species); for (IDatabaseMode mode : modes.keySet()) { - modes.get(mode).infoTabs = new ControlTabBar( + modes.get(mode).infoTabs = new ControlTabBar<>( modes.get(mode).modePage, 8.0f, 24.0f, @@ -266,7 +265,7 @@ public abstract class WindowAbstractDatabase extends Window { public ControlPage modePage; public ControlListBox listBox; - private ControlPages infoPages; + private final ControlPages infoPages; private ControlTabBar infoTabs; public ModeWidgets(IDatabaseMode mode, WindowAbstractDatabase database) { diff --git a/src/main/java/binnie/core/craftgui/events/EventHandler.java b/src/main/java/binnie/core/craftgui/events/EventHandler.java index c9b7aa6b..3ef1943a 100644 --- a/src/main/java/binnie/core/craftgui/events/EventHandler.java +++ b/src/main/java/binnie/core/craftgui/events/EventHandler.java @@ -33,20 +33,12 @@ public abstract class EventHandler { DirectChild; public boolean isOrigin(IWidget origin, IWidget test) { - switch (this) { - case Any: - return true; - - case DirectChild: - return test.getWidgets().contains(origin); - - case Parent: - return test.getParent() == origin; - - case Self: - return test == origin; - } - return false; + return switch (this) { + case Any -> true; + case DirectChild -> test.getWidgets().contains(origin); + case Parent -> test.getParent() == origin; + case Self -> test == origin; + }; } } } diff --git a/src/main/java/binnie/core/craftgui/geometry/Position.java b/src/main/java/binnie/core/craftgui/geometry/Position.java index a8a00071..82911e8f 100644 --- a/src/main/java/binnie/core/craftgui/geometry/Position.java +++ b/src/main/java/binnie/core/craftgui/geometry/Position.java @@ -7,8 +7,8 @@ public enum Position { LEFT(-1, 0), RIGHT(1, 0); - protected int x; - protected int y; + private final int x; + private final int y; Position(int x, int y) { this.x = x; @@ -24,19 +24,11 @@ public enum Position { } public Position opposite() { - switch (this) { - case BOTTOM: - return Position.TOP; - - case LEFT: - return Position.RIGHT; - - case RIGHT: - return Position.LEFT; - - case TOP: - return Position.BOTTOM; - } - return null; + return switch (this) { + case BOTTOM -> Position.TOP; + case LEFT -> Position.RIGHT; + case RIGHT -> Position.LEFT; + case TOP -> Position.BOTTOM; + }; } } diff --git a/src/main/java/binnie/core/craftgui/geometry/TextJustification.java b/src/main/java/binnie/core/craftgui/geometry/TextJustification.java index a6c37b04..c705ee10 100644 --- a/src/main/java/binnie/core/craftgui/geometry/TextJustification.java +++ b/src/main/java/binnie/core/craftgui/geometry/TextJustification.java @@ -12,8 +12,8 @@ public enum TextJustification { BOTTOM_CENTER(0.5f, 1.0f), BOTTOM_RIGHT(1.0f, 1.0f); - protected float xOffset; - protected float yOffset; + final float xOffset; + final float yOffset; TextJustification(float xOffset, float yOffset) { this.xOffset = xOffset; diff --git a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java index f085b267..d4649b57 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java @@ -36,10 +36,10 @@ import cpw.mods.fml.relauncher.Side; public class ContainerCraftGUI extends Container { - private Window window; - private Map syncedNBT; - private Map sentNBT; - private Map syncedTanks; + private final Window window; + private final Map syncedNBT; + private final Map sentNBT; + private final Map syncedTanks; private PowerInfo syncedPower; private ProcessInfo syncedProcess; private int errorType; @@ -61,8 +61,8 @@ public class ContainerCraftGUI extends Container { return; } - inventoryItemStacks = new ListMap(); - inventorySlots = new ListMap(); + inventoryItemStacks = new ListMap<>(); + inventorySlots = new ListMap<>(); if (machine == null) { return; } @@ -89,7 +89,7 @@ public class ContainerCraftGUI extends Container { if (index < 0 || index >= inventorySlots.size()) { return null; } - return (Slot) inventorySlots.get(index); + return inventorySlots.get(index); } @Override @@ -145,9 +145,9 @@ public class ContainerCraftGUI extends Container { @Override public boolean canInteractWith(EntityPlayer player) { - if (player instanceof EntityPlayerMP) { - if (!crafters.contains(player)) { - crafters.add(player); + if (player instanceof EntityPlayerMP playerMP) { + if (!crafters.contains(playerMP)) { + crafters.add(playerMP); } sentNBT.clear(); } @@ -167,7 +167,7 @@ public class ContainerCraftGUI extends Container { } ItemStack stack = request.transfer(true); - Slot shiftClickedSlot = (Slot) inventorySlots.get(index); + Slot shiftClickedSlot = inventorySlots.get(index); shiftClickedSlot.putStack(stack); shiftClickedSlot.onSlotChanged(); return null; @@ -233,9 +233,8 @@ public class ContainerCraftGUI extends Container { int slotNumber = action.getShort("n"); getOrCreateSlot(InventoryType.values()[type % 4], index, slotNumber); - for (Object crafterObject : crafters) { - ICrafting crafter = (ICrafting) crafterObject; - crafter.sendContainerAndContentsToPlayer(this, getInventory()); + for (ICrafting crafterObject : crafters) { + crafterObject.sendContainerAndContentsToPlayer(this, getInventory()); } } } @@ -299,9 +298,8 @@ public class ContainerCraftGUI extends Container { if (shouldSend) { for (Object crafter : crafters) { - if (crafter instanceof EntityPlayerMP) { - EntityPlayerMP player = (EntityPlayerMP) crafter; - BinnieCore.proxy.sendToPlayer(new MessageContainerUpdate(nbt.getValue()), player); + if (crafter instanceof EntityPlayerMP playerMP) { + BinnieCore.proxy.sendToPlayer(new MessageContainerUpdate(nbt.getValue()), playerMP); } } sentThisTime.put(nbt.getKey(), nbt.getValue()); diff --git a/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java b/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java index e1d3096b..ed068a80 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java +++ b/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java @@ -20,9 +20,9 @@ public enum EnumColor { Yellow("Yellow", 16777045, 'e'), White("White", 16777215, 'f'); - protected int colour; - protected String name; - protected char code; + private final int colour; + private final String name; + private final char code; EnumColor(String name, int colour, char code) { this.name = name; @@ -35,7 +35,7 @@ public enum EnumColor { } public String getCode() { - return "\u00a7" + code; + return "§" + code; } @Override diff --git a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java index 505d0b50..ca7ca398 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java @@ -21,7 +21,7 @@ public enum GUIIcon { ArrowLeftDown("arrow-leftdown"), ArrowLeftUp("arrow-leftup"); - String path; + final String path; BinnieIcon icon; GUIIcon(String path) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java index aaac7be8..38584777 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java @@ -38,7 +38,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiCraftGUI extends GuiContainer { - private Window window; + private final Window window; private ItemStack draggedItem; public GuiCraftGUI(Window window) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java index aafdc578..4d38af25 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java @@ -9,7 +9,7 @@ import java.util.Map; class ListMap implements List { - private LinkedHashMap map; + private final LinkedHashMap map; ListMap() { map = new LinkedHashMap<>(); diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java index edbd6740..0edeca6e 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java @@ -33,9 +33,9 @@ public class MinecraftTooltip extends Tooltip { USER(0x962433, EnumChatFormatting.RED, EnumChatFormatting.DARK_RED), POWER(0x896e00, EnumChatFormatting.YELLOW, EnumChatFormatting.GOLD); - int outline; - String mainText; - String bodyText; + final int outline; + final String mainText; + final String bodyText; TypeColor(int outline, EnumChatFormatting mainText, EnumChatFormatting bodyText) { this.outline = outline; diff --git a/src/main/java/binnie/core/craftgui/minecraft/Window.java b/src/main/java/binnie/core/craftgui/minecraft/Window.java index 4c72284e..41f63e13 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Window.java @@ -53,15 +53,15 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG protected float titleButtonLeft; protected float titleButtonRight; private GuiCraftGUI gui; - private ContainerCraftGUI container; - private WindowInventory windowInventory; + private final ContainerCraftGUI container; + private final WindowInventory windowInventory; private ControlText title; private StandardTexture bgText1; private StandardTexture bgText2; private boolean hasBeenInitialised; private EntityPlayer player; private IInventory entityInventory; - private Side side; + private final Side side; public Window(float width, float height, EntityPlayer player, IInventory inventory, Side side) { this.side = side; diff --git a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java index 36eaec4f..69ddeac5 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java @@ -13,10 +13,10 @@ import binnie.core.machines.inventory.SlotValidator; public class WindowInventory implements IInventory { - private Window window; - private Map inventory; - private Map validators; - private List disabledAutoDispenses; + private final Window window; + private final Map inventory; + private final Map validators; + private final List disabledAutoDispenses; public WindowInventory(Window window) { inventory = new HashMap<>(); @@ -27,7 +27,7 @@ public class WindowInventory implements IInventory { @Override public int getSizeInventory() { - if (inventory.size() == 0) { + if (inventory.isEmpty()) { return 0; } @@ -61,8 +61,7 @@ public class WindowInventory implements IInventory { amount = available; } - ItemStack itemStack = item; - itemStack.stackSize -= amount; + item.stackSize -= amount; output.stackSize = amount; if (item.stackSize == 0) { setInventorySlotContents(index, null); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 73f218f1..3101b2d6 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -26,7 +26,7 @@ public class ControlEnergyBar extends Control implements ITooltip { public static boolean isError; - private Position direction; + private final Position direction; public ControlEnergyBar(IWidget parent, int x, int y, int width, int height, Position direction) { super(parent, x, y, width, height); @@ -42,8 +42,7 @@ public class ControlEnergyBar extends Control implements ITooltip { return null; } - IPoweredMachine clientPower = machine.getMachine().getInterface(IPoweredMachine.class); - return clientPower; + return machine.getMachine().getInterface(IPoweredMachine.class); } public float getPercentage() { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java index 46a5357e..d623a9ed 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java @@ -95,7 +95,7 @@ public class ControlErrorState extends Control implements ITooltip { } tooltip.add(errorState.toString()); - if (errorState.getTooltip().length() > 0) { + if (!errorState.getTooltip().isEmpty()) { tooltip.add(errorState.getTooltip()); } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java index 5e2fcac6..9634e566 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java @@ -9,7 +9,7 @@ import binnie.core.craftgui.geometry.IPoint; public class ControlIconDisplay extends Control { - private IIcon icon; + private final IIcon icon; public ControlIconDisplay(IWidget parent, float x, float y, IIcon icon) { super(parent, x, y, 16.0f, 16.0f); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java index e79a7179..9a0aed85 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java @@ -8,7 +8,7 @@ import binnie.core.craftgui.resource.Texture; public class ControlImage extends Control { - private Object key; + private final Object key; public ControlImage(IWidget parent, float x, float y, Texture text) { super(parent, x, y, text.w(), text.h()); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java index 8bb61e7c..a0bd17f9 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java @@ -11,7 +11,7 @@ import binnie.core.util.I18N; public class ControlInfo extends Control implements ITooltip { - private String info; + private final String info; public ControlInfo(IWidget parent, float x, float y, String info) { super(parent, x, y, 16.0f, 16.0f); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java index f2b796d6..e8a58fab 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java @@ -34,7 +34,7 @@ public class ControlLiquidTank extends Control implements ITooltip { public static List tankError = new ArrayList<>(); private int tankID; - private boolean horizontal; + private final boolean horizontal; public ControlLiquidTank(IWidget parent, int x, int y) { this(parent, x, y, false); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java index b9af74ec..2753d51f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java @@ -9,7 +9,7 @@ import binnie.core.craftgui.minecraft.InventoryType; public class ControlPlayerInventory extends Control { - private List slots; + private final List slots; public ControlPlayerInventory(IWidget parent, boolean wide) { super( @@ -77,8 +77,4 @@ public class ControlPlayerInventory extends Control { return slots.get(i); } - @Override - public void onUpdateClient() { - // ignored - } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java index 23204aa7..9b1deaaf 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java @@ -12,7 +12,7 @@ import binnie.core.util.I18N; public class ControlPowerSystem extends Control implements ITooltip { - private PowerSystem system; + private final PowerSystem system; public ControlPowerSystem(IWidget parent, float x, float y, PowerSystem system) { super(parent, x, y, 16.0f, 16.0f); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java index 510f47fd..993403dd 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java @@ -7,9 +7,9 @@ import binnie.core.craftgui.resource.Texture; public class ControlProgress extends ControlProgressBase { - private Texture progressBlank; - private Texture progressBar; - private Position direction; + private final Texture progressBlank; + private final Texture progressBar; + private final Position direction; public ControlProgress(IWidget parent, int x, int y, Texture progressBlank, Texture progressBar, Position dir) { super( diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java index d76b1431..0c795649 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java @@ -38,7 +38,7 @@ public class ControlProgressBase extends Control { } if (seconds > 0) { - if (ts.length() > 0) { + if (!ts.isEmpty()) { ts += " "; } if (seconds == 1) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java index bcef9f2a..3f39c239 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java @@ -16,10 +16,10 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture; public class ControlSlide extends Control { - private IArea expanded; - private IArea shrunk; + private final IArea expanded; + private final IArea shrunk; private boolean slideActive; - private Position anchor; + private final Position anchor; private String label; public ControlSlide(IWidget parent, float x, float y, float w, float h, Position anchor2) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java index dc9eccad..60ee9801 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java @@ -10,7 +10,7 @@ import binnie.core.craftgui.minecraft.InventoryType; public class ControlSlotArray extends Control implements Iterable { - private List slots; + private final List slots; public ControlSlotArray(IWidget parent, int x, int y, int columns, int rows) { super(parent, x, y, columns * 18, rows * 18); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java index f9e09628..ed9bd596 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java @@ -17,7 +17,7 @@ import binnie.core.nei.NEIHook; public abstract class ControlSlotBase extends Control implements ITooltip { - private ControlItemDisplay itemDisplay; + private final ControlItemDisplay itemDisplay; public ControlSlotBase(IWidget parent, float x, float y) { this(parent, x, y, 18); @@ -31,9 +31,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip { @Override public void onEvent(EventWidget.ChangeSize event) { - if (itemDisplay != null) { - itemDisplay.setSize(getSize().sub(new IPoint(2.0f, 2.0f))); - } + itemDisplay.setSize(getSize().sub(new IPoint(2.0f, 2.0f))); } }); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java index 2d86fe2a..01844daf 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java @@ -12,7 +12,7 @@ import binnie.core.machines.inventory.IChargedSlots; public class ControlSlotCharge extends Control { - private int slot; + private final int slot; public ControlSlotCharge(IWidget parent, int x, int y, int slot) { super(parent, x, y, 4.0f, 18.0f); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java index 14cd126a..3cbd2264 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java @@ -9,7 +9,7 @@ import binnie.core.genetics.IItemStackRepresentative; public class ControlTabIcon extends ControlTab { - private ControlItemDisplay item; + private final ControlItemDisplay item; public ControlTabIcon(ControlTabBar parent, float x, float y, float w, float h, T value) { super(parent, x, y, w, h, value); @@ -28,7 +28,7 @@ public class ControlTabIcon extends ControlTab { public void onUpdateClient() { super.onUpdateClient(); item.setItemStack(getItemStack()); - float x = ((ControlTabBar) getParent()).getDirection().x(); + float x = ((ControlTabBar) getParent()).getDirection().x(); item.setOffset(new IPoint((isCurrentSelection() || isMouseOver()) ? 0.0f : (-4.0f * x), 0.0f)); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java index 1708ac16..31b347f0 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java @@ -13,7 +13,7 @@ public class ControlUser extends Control implements ITooltip { protected String team; - private String username; + private final String username; public ControlUser(IWidget parent, float x, float y, String username) { super(parent, x, y, 16.0f, 16.0f); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java b/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java index b3d2c22a..7bba5462 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java @@ -11,19 +11,11 @@ public enum EnumHighlighting { SHIFT_CLICK; int getColour() { - switch (this) { - case ERROR: - return MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR); - - case HELP: - return MinecraftTooltip.getOutline(Tooltip.Type.HELP); - - case SHIFT_CLICK: - return 0xffff00; - - case WARNING: - return MinecraftTooltip.getOutline(MinecraftTooltip.Type.WARNING); - } - return 0; + return switch (this) { + case ERROR -> MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR); + case HELP -> MinecraftTooltip.getOutline(Tooltip.Type.HELP); + case SHIFT_CLICK -> 0xffff00; + case WARNING -> MinecraftTooltip.getOutline(MinecraftTooltip.Type.WARNING); + }; } } 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 856ef6f0..ad1e272b 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java @@ -32,8 +32,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class CraftGUIResourceManager implements IResourceManagerReloadListener { - private Map textureSheets; - private Map textures; + private final Map textureSheets; + private final Map textures; public CraftGUIResourceManager() { textureSheets = new HashMap<>(); @@ -53,8 +53,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { bufferedreader = new BufferedReader(new InputStreamReader(res.getInputStream(), Charsets.UTF_8)); jsonobject = new JsonParser().parse(bufferedreader).getAsJsonObject(); for (JsonElement el : jsonobject.get("texture-sheets").getAsJsonArray()) { - if (el instanceof JsonObject) { - JsonObject sheet = (JsonObject) el; + if (el instanceof JsonObject sheet) { String name = sheet.get("name").getAsString(); String modid = sheet.get("modid").getAsString(); String path = sheet.get("path").getAsString(); @@ -63,8 +62,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { } for (JsonElement el : jsonobject.get("textures").getAsJsonArray()) { - if (el instanceof JsonObject) { - JsonObject sheet = (JsonObject) el; + if (el instanceof JsonObject sheet) { String name = sheet.get("name").getAsString(); IBinnieTexture textureSheet = getTextureSheet(sheet.get("sheet").getAsString()); IArea uv = getArea(sheet.get("uv").getAsString()); diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java index 6cd47aa9..67006781 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java @@ -45,7 +45,7 @@ public enum CraftGUITexture { CheckboxChecked("checkbox.checked"), CheckboxCheckedHighlighted("checkbox.checked.highlighted"); - String name; + final String name; CraftGUITexture(String name) { this.name = name; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java index 21229934..c948d6e9 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java @@ -11,7 +11,7 @@ public enum CraftGUITextureSheet implements IBinnieTexture { Panel2("panels"), Slots("slots"); - String name; + final String name; CraftGUITextureSheet(String name) { this.name = name; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java b/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java index 544eaf6b..941e02e1 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java @@ -6,9 +6,9 @@ import binnie.core.resource.ResourceType; class ParsedTextureSheet implements IBinnieTexture { - private String name; - private String modid; - private String path; + private final String name; + private final String modid; + private final String path; public ParsedTextureSheet(String name, String modid, String path) { this.name = name; diff --git a/src/main/java/binnie/core/genetics/BeeModifierLogic.java b/src/main/java/binnie/core/genetics/BeeModifierLogic.java index a7f8e813..e905cb68 100644 --- a/src/main/java/binnie/core/genetics/BeeModifierLogic.java +++ b/src/main/java/binnie/core/genetics/BeeModifierLogic.java @@ -7,8 +7,8 @@ import java.util.Map; public class BeeModifierLogic { - private Map modifiers; - private List booleanModifiers; + private final Map modifiers; + private final List booleanModifiers; public BeeModifierLogic() { modifiers = new HashMap<>(); diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 45a47bd4..bdeafa12 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -131,6 +131,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative { for (IAlleleSpecies species2 : branch.getMemberSpecies()) { if (allActiveSpecies.contains(species2)) { possible = true; + break; } } if (!possible) { diff --git a/src/main/java/binnie/core/genetics/ForestryAllele.java b/src/main/java/binnie/core/genetics/ForestryAllele.java index be59d345..ed70c561 100644 --- a/src/main/java/binnie/core/genetics/ForestryAllele.java +++ b/src/main/java/binnie/core/genetics/ForestryAllele.java @@ -18,7 +18,7 @@ public class ForestryAllele { Longest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.lifespan" + toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.lifespan" + this); } } @@ -33,7 +33,7 @@ public class ForestryAllele { Fastest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.speed" + toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.speed" + this); } } @@ -45,7 +45,7 @@ public class ForestryAllele { Maximum; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.fertility" + toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.fertility" + this); } } @@ -57,7 +57,7 @@ public class ForestryAllele { Largest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.territory" + toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.territory" + this); } } @@ -72,7 +72,7 @@ public class ForestryAllele { Largest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.size" + toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.size" + this); } } @@ -82,7 +82,7 @@ public class ForestryAllele { False; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.bool" + toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.bool" + this); } public static IAllele get(boolean bool) { diff --git a/src/main/java/binnie/core/genetics/Gene.java b/src/main/java/binnie/core/genetics/Gene.java index 4e0617e8..eef348c5 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/src/main/java/binnie/core/genetics/Gene.java @@ -95,12 +95,11 @@ public class Gene implements INBTTagable, IGene { @Override public boolean equals(Object obj) { - if (!(obj instanceof Gene)) { + if (!(obj instanceof Gene gene)) { return false; } - Gene g = (Gene) obj; - return allele == g.allele && chromosome.ordinal() == g.chromosome.ordinal() && root == g.root; + return allele == gene.allele && chromosome.ordinal() == gene.chromosome.ordinal() && root == gene.root; } public String getAlleleName() { diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 830d593c..d471e6fe 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -37,9 +37,9 @@ public class ManagerGenetics extends ManagerBase { public BreedingSystem treeBreedingSystem; public BreedingSystem mothBreedingSystem; public BreedingSystem flowerBreedingSystem; - private Map breedingSystems; - private List invalidChromosomeTypes; - private Map>> chromosomeArray; + private final Map breedingSystems; + private final List invalidChromosomeTypes; + private final Map>> chromosomeArray; public ManagerGenetics() { breedingSystems = new LinkedHashMap<>(); @@ -178,11 +178,10 @@ public class ManagerGenetics extends ManagerBase { } system.addExtraAlleles(chromosome, alleles); - if (alleles.size() == 0) { + if (alleles.isEmpty()) { invalidChromosomeTypes.add(chromosome); } else { - List alleleList = new ArrayList<>(); - alleleList.addAll(alleles); + List alleleList = new ArrayList<>(alleles); chromosomeMap.put(chromosome, alleleList); } } @@ -209,11 +208,11 @@ public class ManagerGenetics extends ManagerBase { if (o1 == null || o2 == null) { throw new NullPointerException("Allele is null!"); } - if (o1 instanceof IAlleleFloat && o2 instanceof IAlleleFloat) { - return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(((IAlleleFloat) o2).getValue()); + if (o1 instanceof IAlleleFloat af1 && o2 instanceof IAlleleFloat af2) { + return Float.compare(af1.getValue(), af2.getValue()); } - if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof AlleleColor)) { - return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue()); + if (o1 instanceof IAlleleInteger ai1 && o2 instanceof IAlleleInteger ai2 && !(o1 instanceof AlleleColor)) { + return Integer.compare(ai1.getValue(), ai2.getValue()); } // if (o1.getName() != null && o2.getName() != null) { // return o1.getName().compareTo(o2.getName()); diff --git a/src/main/java/binnie/core/genetics/Tolerance.java b/src/main/java/binnie/core/genetics/Tolerance.java index 70c27f0d..26763f46 100644 --- a/src/main/java/binnie/core/genetics/Tolerance.java +++ b/src/main/java/binnie/core/genetics/Tolerance.java @@ -1,5 +1,7 @@ package binnie.core.genetics; +import net.minecraft.util.MathHelper; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; @@ -23,14 +25,15 @@ public enum Tolerance { Down4(-4, 0), Down5(-5, 0); - private int[] bounds; + private final int[] bounds; + private static final Tolerance[] VALUES = values(); Tolerance(int a, int b) { bounds = new int[] { a, b }; } public String getUID() { - return "forestry.tolerance" + toString(); + return "forestry.tolerance" + this; } public int[] getBounds() { @@ -38,7 +41,40 @@ public enum Tolerance { } public static Tolerance get(EnumTolerance tol) { - return values()[tol.ordinal()]; + return VALUES[tol.ordinal()]; + } + + public static Tolerance getHigh(int i) { + return switch (MathHelper.clamp_int(i, 0, 5)) { + case 0 -> None; + case 1 -> Up1; + case 2 -> Up2; + case 3 -> Up3; + case 4 -> Up4; + default -> Up5; + }; + } + + public static Tolerance getLow(int i) { + return switch (MathHelper.clamp_int(i, -5, 0)) { + case -0 -> None; + case -1 -> Down1; + case -2 -> Down2; + case -3 -> Down3; + case -4 -> Down4; + default -> Down5; + }; + } + + public static Tolerance getBoth(int i) { + return switch (MathHelper.clamp_int(i, 0, 5)) { + case 0 -> None; + case 1 -> Both1; + case 2 -> Both2; + case 3 -> Both3; + case 4 -> Both4; + default -> Both5; + }; } public IAllele getAllele() { diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index ea473958..cb79d0c7 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -52,8 +52,8 @@ public class TreeBreedingSystem extends BreedingSystem { public UniqueItemStackSet allFruits = new UniqueItemStackSet(); public UniqueItemStackSet allWoods = new UniqueItemStackSet(); - private UniqueItemStackSet discoveredFruits = new UniqueItemStackSet(); - private UniqueItemStackSet discoveredWoods = new UniqueItemStackSet(); + private final UniqueItemStackSet discoveredFruits = new UniqueItemStackSet(); + private final UniqueItemStackSet discoveredWoods = new UniqueItemStackSet(); public TreeBreedingSystem() { iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree"); @@ -142,7 +142,6 @@ public class TreeBreedingSystem extends BreedingSystem { // this.discoveredWoods.add(wood); // } discoveredFruits.addAll(Arrays.asList(genome.getFruitProvider().getProducts())); - for (ItemStack wood2 : discoveredWoods) {} } } diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index 05480187..73d33325 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -24,7 +24,7 @@ import forestry.core.access.FakeAccessHandler; public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier { ArrayList beeModifier = new ArrayList<>(); - private InventoryBeeHousing beeInventory; + private final InventoryBeeHousing beeInventory; public VirtualBeeHousing(EntityPlayer player) { super(player); @@ -70,11 +70,6 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB return true; } - @Override - public boolean addProduct(ItemStack product, boolean all) { - return false; - } - public void wearOutEquipment(int amount) {} public void onQueenChange(ItemStack queen) {} diff --git a/src/main/java/binnie/core/genetics/VirtualHousing.java b/src/main/java/binnie/core/genetics/VirtualHousing.java index 4f33d23c..70b3525c 100644 --- a/src/main/java/binnie/core/genetics/VirtualHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualHousing.java @@ -17,7 +17,7 @@ import forestry.api.genetics.IHousing; class VirtualHousing implements IHousing { - private EntityPlayer player; + private final EntityPlayer player; public VirtualHousing(EntityPlayer player) { this.player = player; diff --git a/src/main/java/binnie/core/gui/BinnieCoreGUI.java b/src/main/java/binnie/core/gui/BinnieCoreGUI.java index 7717e207..5b299a0a 100644 --- a/src/main/java/binnie/core/gui/BinnieCoreGUI.java +++ b/src/main/java/binnie/core/gui/BinnieCoreGUI.java @@ -18,17 +18,11 @@ public enum BinnieCoreGUI implements IBinnieGUID { Genesis; public Window getWindow(EntityPlayer player, IInventory object, Side side) throws Exception { - switch (this) { - case Compartment: - return new WindowCompartment(player, object, side); - - case FieldKit: - return new WindowFieldKit(player, null, side); - - case Genesis: - return new WindowGenesis(player, null, side); - } - return null; + return switch (this) { + case Compartment -> new WindowCompartment(player, object, side); + case FieldKit -> new WindowFieldKit(player, null, side); + case Genesis -> new WindowGenesis(player, null, side); + }; } @Override diff --git a/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/src/main/java/binnie/core/gui/BinnieGUIHandler.java index a674953e..81ea6c0b 100644 --- a/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -11,7 +11,7 @@ import cpw.mods.fml.relauncher.Side; public class BinnieGUIHandler implements IGuiHandler { - private AbstractMod mod; + private final AbstractMod mod; public BinnieGUIHandler(AbstractMod mod) { this.mod = mod; diff --git a/src/main/java/binnie/core/item/IItemMisc.java b/src/main/java/binnie/core/item/IItemMisc.java index 2e675f8a..446db40b 100644 --- a/src/main/java/binnie/core/item/IItemMisc.java +++ b/src/main/java/binnie/core/item/IItemMisc.java @@ -16,5 +16,5 @@ public interface IItemMisc extends IItemEnum { @SideOnly(Side.CLIENT) void registerIcons(IIconRegister register); - void addInformation(List data); + void addInformation(List data); } diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index edadca2c..05909bf8 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemMisc extends Item { - private IItemMisc[] items; + private final IItemMisc[] items; protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) { setCreativeTab(tab); @@ -25,7 +25,7 @@ public class ItemMisc extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs tab, List list) { + public void getSubItems(Item par1, CreativeTabs tab, List list) { for (IItemMisc item : items) { if (item.isActive()) { list.add(getStack(item, 1)); @@ -46,7 +46,7 @@ public class ItemMisc extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(itemStack, player, tooltip, advanced); IItemMisc item = getItem(itemStack.getItemDamage()); if (item != null) { diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index f4c0aa2d..187b59b2 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -60,11 +60,10 @@ public class ModuleItems implements IInitializable { && player.getHeldItem().getItem() == BinnieCore.fieldKit && player.isSneaking()) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); - if (!(tile instanceof TileEntityFlower)) { + if (!(tile instanceof TileEntityFlower tileFlower)) { return; } - TileEntityFlower tileFlower = (TileEntityFlower) tile; IFlower flower = tileFlower.getFlower(); if (flower == null) { return; diff --git a/src/main/java/binnie/core/liquid/BinnieFluid.java b/src/main/java/binnie/core/liquid/BinnieFluid.java index 173a4790..e7e1913e 100644 --- a/src/main/java/binnie/core/liquid/BinnieFluid.java +++ b/src/main/java/binnie/core/liquid/BinnieFluid.java @@ -3,11 +3,11 @@ package binnie.core.liquid; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -class BinnieFluid extends Fluid { +public class BinnieFluid extends Fluid { protected IFluidType fluidType; - private String name; + private final String name; @Override public String getLocalizedName(FluidStack stack) { diff --git a/src/main/java/binnie/core/liquid/FluidContainer.java b/src/main/java/binnie/core/liquid/FluidContainer.java index 40166fa1..f9f4bc6d 100644 --- a/src/main/java/binnie/core/liquid/FluidContainer.java +++ b/src/main/java/binnie/core/liquid/FluidContainer.java @@ -22,9 +22,9 @@ public enum FluidContainer { Glass, Cylinder; - protected IIcon bottle; - protected IIcon contents; - protected ItemFluidContainer item; + private IIcon bottle; + private IIcon contents; + ItemFluidContainer item; public int getMaxStackSize() { return (this == FluidContainer.Bucket) ? 1 : 16; @@ -65,26 +65,14 @@ public enum FluidContainer { } public ItemStack getEmpty() { - switch (this) { - case Bucket: - return new ItemStack(Items.bucket, 1, 0); - - case Can: - return Mods.forestry.stack("canEmpty"); - - case Capsule: - return Mods.forestry.stack("waxCapsule"); - - case Glass: - return new ItemStack(Items.glass_bottle, 1, 0); - - case Refractory: - return Mods.forestry.stack("refractoryEmpty"); - - case Cylinder: - return GeneticsItems.Cylinder.get(1); - } - return null; + return switch (this) { + case Bucket -> new ItemStack(Items.bucket, 1, 0); + case Can -> Mods.forestry.stack("canEmpty"); + case Capsule -> Mods.forestry.stack("waxCapsule"); + case Glass -> new ItemStack(Items.glass_bottle, 1, 0); + case Refractory -> Mods.forestry.stack("refractoryEmpty"); + case Cylinder -> GeneticsItems.Cylinder.get(1); + }; } public void registerContainerData(IFluidType fluid) { diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 1f87e638..9b3efef3 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemFluidContainer extends Item { - private FluidContainer container; + private final FluidContainer container; public static int LiquidExtraBee = 64; public static int LiquidExtraTree = 128; public static int LiquidJuice = 256; @@ -27,8 +27,8 @@ public class ItemFluidContainer extends Item { public static int LiquidLiqueuer = 640; public static int LiquidGenetics = 768; - private static Map idToFluid = new HashMap<>(); - private static Map fluidToID = new HashMap<>(); + private static final Map idToFluid = new HashMap<>(); + private static final Map fluidToID = new HashMap<>(); public static void registerFluid(IFluidType fluid, int id) { ItemFluidContainer.idToFluid.put(id, fluid.getIdentifier().toLowerCase()); @@ -69,7 +69,7 @@ public class ItemFluidContainer extends Item { } @Override - public void getSubItems(Item item, CreativeTabs tab, List itemList) { + public void getSubItems(Item item, CreativeTabs tab, List itemList) { for (IFluidType liquid : Binnie.Liquid.fluids.values()) { if (!liquid.canPlaceIn(container) || !liquid.showInCreative(container)) { continue; diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 4a019f3e..116a9073 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -53,11 +53,6 @@ public class ManagerLiquid extends ManagerBase { } } - @Override - public void init() { - // ignored - } - @Override public void postInit() { for (IFluidType fluid : fluids.values()) { diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 7760d96e..45e7284c 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -25,9 +25,9 @@ import binnie.core.machines.component.IRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -class BlockMachine extends BlockContainer implements IBlockMachine { +public class BlockMachine extends BlockContainer implements IBlockMachine { - private MachineGroup group; + private final MachineGroup group; public BlockMachine(MachineGroup group, String blockName) { super(Material.iron); @@ -37,7 +37,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { + public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { for (MachinePackage pack : group.getPackages()) { if (pack.isActive()) { itemList.add(new ItemStack(this, 1, pack.getMetadata())); @@ -134,12 +134,11 @@ class BlockMachine extends BlockContainer implements IBlockMachine { @Override public void breakBlock(World world, int x, int y, int z, Block block, int meta) { TileEntity tileentity = world.getTileEntity(x, y, z); - if (!(tileentity instanceof TileEntityMachine)) { + if (!(tileentity instanceof TileEntityMachine machine)) { return; } - TileEntityMachine entity = (TileEntityMachine) tileentity; - entity.onBlockDestroy(); + machine.onBlockDestroy(); super.breakBlock(world, x, y, z, block, meta); } diff --git a/src/main/java/binnie/core/machines/ItemMachine.java b/src/main/java/binnie/core/machines/ItemMachine.java index c71ecd8c..83371a8f 100644 --- a/src/main/java/binnie/core/machines/ItemMachine.java +++ b/src/main/java/binnie/core/machines/ItemMachine.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; public class ItemMachine extends ItemBlock { - private IBlockMachine associatedBlock; + private final IBlockMachine associatedBlock; public ItemMachine(Block block) { super(block); diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index f44e6717..78f3ea22 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -2,7 +2,7 @@ package binnie.core.machines; import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedHashMap; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -29,20 +29,15 @@ import forestry.api.core.INBTTagable; public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT { - private MachinePackage machinePackage; - private Map> componentInterfaceMap; - private Map, MachineComponent> componentMap; - private TileEntity tile; - private boolean queuedInventoryUpdate; - private int nextProgressBarID; + private final MachinePackage machinePackage; + private final Map, List> componentInterfaceMap = new HashMap<>(); + private final Map, MachineComponent> componentMap = new HashMap<>(); + private final TileEntity tile; + private boolean queuedInventoryUpdate = false; private GameProfile owner; + private final MachineUtil machineUtil = new MachineUtil(this); public Machine(MachinePackage pack, TileEntity tile) { - componentInterfaceMap = new LinkedHashMap<>(); - componentMap = new LinkedHashMap<>(); - queuedInventoryUpdate = false; - nextProgressBarID = 0; - owner = null; this.tile = tile; pack.createMachine(this); machinePackage = pack; @@ -55,7 +50,7 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack } component.setMachine(this); componentMap.put(component.getClass(), component); - for (Class inter : component.getComponentInterfaces()) { + for (Class inter : component.getComponentInterfaces()) { if (!componentInterfaceMap.containsKey(inter)) { componentInterfaceMap.put(inter, new ArrayList<>()); } @@ -123,8 +118,8 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack @Override public void writeToPacket(PacketPayload payload) { for (MachineComponent component : getComponents()) { - if (component instanceof INetworkedEntity) { - ((INetworkedEntity) component).writeToPacket(payload); + if (component instanceof INetworkedEntity ne) { + ne.writeToPacket(payload); } } } @@ -132,8 +127,8 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack @Override public void readFromPacket(PacketPayload payload) { for (MachineComponent component : getComponents()) { - if (component instanceof INetworkedEntity) { - ((INetworkedEntity) component).readFromPacket(payload); + if (component instanceof INetworkedEntity ne) { + ne.readFromPacket(payload); } } } @@ -205,14 +200,14 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack } public static IMachine getMachine(Object inventory) { - if (inventory != null && inventory instanceof IMachine) { - return (IMachine) inventory; + if (inventory instanceof IMachine m) { + return m; } - if (inventory != null && inventory instanceof TileEntityMachine) { - return ((TileEntityMachine) inventory).getMachine(); + if (inventory instanceof TileEntityMachine tem) { + return tem.getMachine(); } - if (inventory != null && inventory instanceof MachineComponent) { - return ((MachineComponent) inventory).getMachine(); + if (inventory instanceof MachineComponent mc) { + return mc.getMachine(); } return null; } @@ -230,7 +225,7 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack @Override public MachineUtil getMachineUtil() { - return new MachineUtil(this); + return machineUtil; } @Override @@ -244,10 +239,6 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack } } - public int getUniqueProgressBarID() { - return nextProgressBarID++; - } - @Override public GameProfile getOwner() { return owner; diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/src/main/java/binnie/core/machines/MachineComponent.java index d18346a3..a474ef2d 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/src/main/java/binnie/core/machines/MachineComponent.java @@ -38,7 +38,7 @@ public class MachineComponent implements INBTTagable { // ignored } - public Class[] getComponentInterfaces() { + public Class[] getComponentInterfaces() { return Binnie.Machine.getComponentInterfaces(getClass()); } diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index d8c84ae8..e1d869f3 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -12,12 +12,12 @@ import cpw.mods.fml.common.registry.GameRegistry; public class MachineGroup { - private AbstractMod mod; - private String blockName; - private String uid; - private Map packages; - private Map packagesID; - private BlockMachine block; + private final AbstractMod mod; + private final String blockName; + private final String uid; + private final Map packages; + private final Map packagesID; + private final BlockMachine block; public boolean customRenderer; private boolean renderedTileEntity; diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index 5b7bbd1b..6a2513f6 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -7,7 +7,7 @@ import binnie.core.util.I18N; public abstract class MachinePackage { - private String uid; + private final String uid; private boolean active; boolean powered; private int metadata; diff --git a/src/main/java/binnie/core/machines/MachineRendererBlock.java b/src/main/java/binnie/core/machines/MachineRendererBlock.java index 702be8a7..a510c64e 100644 --- a/src/main/java/binnie/core/machines/MachineRendererBlock.java +++ b/src/main/java/binnie/core/machines/MachineRendererBlock.java @@ -12,7 +12,7 @@ public class MachineRendererBlock { public static MachineRendererBlock instance = new MachineRendererBlock(); private BinnieResource texture; - private ModelBlock model; + private final ModelBlock model; public MachineRendererBlock() { model = new ModelBlock(); diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index d45d0476..9c377173 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -21,7 +21,8 @@ import binnie.core.util.ItemStackSet; public class MachineUtil { - private IMachine machine; + private final IMachine machine; + private final Random random = new Random(); public MachineUtil(IMachine machine) { this.machine = machine; @@ -48,7 +49,7 @@ public class MachineUtil { } public boolean spaceInTank(int id, int amount) { - IFluidTank tank = getTank(id); + final IFluidTank tank = getTank(id); int space = tank.getCapacity() - tank.getFluidAmount(); return amount <= space; } @@ -70,7 +71,7 @@ public class MachineUtil { } public void fillTank(int id, FluidStack liquidStack) { - IFluidTank tank = getTank(id); + final IFluidTank tank = getTank(id); tank.fill(liquidStack, true); } @@ -78,10 +79,9 @@ public class MachineUtil { if (isSlotEmpty(slot)) { setStack(slot, addition); } else { - ItemStack merge = getStack(slot); + final ItemStack merge = getStack(slot); if (merge.isItemEqual(addition) && merge.stackSize + addition.stackSize <= merge.getMaxStackSize()) { - ItemStack itemStack = merge; - itemStack.stackSize += addition.stackSize; + merge.stackSize += addition.stackSize; setStack(slot, merge); } } @@ -97,7 +97,7 @@ public class MachineUtil { } public void damageItem(int slot, int damage) { - ItemStack item = getStack(slot); + final ItemStack item = getStack(slot); if (damage < 0) { item.setItemDamage(Math.max(0, item.getItemDamage() + damage)); } else if (item.attemptDamageItem(damage, new Random())) { @@ -154,7 +154,7 @@ public class MachineUtil { } public Random getRandom() { - return new Random(); + return random; } public void refreshBlock() { diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 7dfcaf11..ba9571d4 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -14,20 +14,14 @@ import forestry.api.core.INBTTagable; public class ManagerMachine extends ManagerBase { - private Map, Class[]> componentInterfaceMap; - private Map machineGroups; - private Map> networkIDToComponent; - private Map, Integer> componentToNetworkID; - private int nextNetworkID; + private final Map, Class[]> componentInterfaceMap = new HashMap<>(); + private final Map machineGroups = new HashMap<>(); + private final Map> networkIDToComponent = new HashMap<>(); + private final Map, Integer> componentToNetworkID = new HashMap<>(); + private int nextNetworkID = 0; private int machineRenderID; - public ManagerMachine() { - componentInterfaceMap = new HashMap<>(); - machineGroups = new HashMap<>(); - networkIDToComponent = new HashMap<>(); - componentToNetworkID = new HashMap<>(); - nextNetworkID = 0; - } + public ManagerMachine() {} public void registerMachineGroup(MachineGroup group) { machineGroups.put(group.getUID(), group); diff --git a/src/main/java/binnie/core/machines/ModelBlock.java b/src/main/java/binnie/core/machines/ModelBlock.java index 5ad96687..e26905eb 100644 --- a/src/main/java/binnie/core/machines/ModelBlock.java +++ b/src/main/java/binnie/core/machines/ModelBlock.java @@ -5,7 +5,7 @@ import net.minecraft.client.model.ModelRenderer; class ModelBlock extends ModelBase { - private ModelRenderer block; + private final ModelRenderer block; public ModelBlock() { textureWidth = 64; diff --git a/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/src/main/java/binnie/core/machines/inventory/BaseSlot.java index e3d8326e..2d9baacc 100644 --- a/src/main/java/binnie/core/machines/inventory/BaseSlot.java +++ b/src/main/java/binnie/core/machines/inventory/BaseSlot.java @@ -13,7 +13,7 @@ public abstract class BaseSlot implements INBTTagable, IValidator { protected Validator validator; protected String unlocName; - private SidedAccess access; + private final SidedAccess access; private boolean readOnly; private int index; diff --git a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java index c187b38e..9d3a1cd7 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java @@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.Side; public class ComponentChargedSlots extends MachineComponent implements INetwork.GuiNBT, IChargedSlots { - private Map charges = new HashMap<>(); + private final Map charges = new HashMap<>(); public ComponentChargedSlots(Machine machine) { super(machine); @@ -37,7 +37,7 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork. NBTTagList chargeList = new NBTTagList(); for (Map.Entry entry : charges.entrySet()) { NBTTagCompound chargesNBT = new NBTTagCompound(); - chargesNBT.setByte("i", (byte) (0 + entry.getKey())); + chargesNBT.setByte("i", entry.getKey().byteValue()); chargesNBT.setByte("v", (byte) (entry.getValue() * 100.0f)); chargeList.appendTag(chargesNBT); } @@ -54,9 +54,7 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork. return; } - for (int i : charges.keySet()) { - charges.put(i, nbt.getShort("" + i) / 100.0f); - } + charges.replaceAll((i, v) -> nbt.getShort("" + i) / 100.0f); } @Override diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index 50aa1f04..6df30578 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -19,7 +19,7 @@ import binnie.core.machines.IMachine; public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots { - private Map inventory = new LinkedHashMap<>(); + private final Map inventory = new LinkedHashMap<>(); public ComponentInventorySlots(IMachine machine) { super(machine); diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java index 0964623f..c54daa55 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java @@ -12,7 +12,7 @@ import binnie.core.machines.transfer.TransferRequest; public class ComponentInventoryTransfer extends MachineComponent { - private List transfers = new ArrayList<>(); + private final List transfers = new ArrayList<>(); private ITransferRestockListener transferListener; public ComponentInventoryTransfer(IMachine machine) { @@ -46,7 +46,7 @@ public class ComponentInventoryTransfer extends MachineComponent { this.transferListener = transferListener; } - public abstract class Transfer { + public abstract static class Transfer { protected Condition condition; protected IMachine machine; @@ -79,9 +79,9 @@ public class ComponentInventoryTransfer extends MachineComponent { private class Restock extends Transfer { - private int[] buffer; - private int destination; - private int limit; + private final int[] buffer; + private final int destination; + private final int limit; private Restock(IMachine machine, int[] buffer, int destination, int limit) { super(machine); @@ -119,8 +119,8 @@ public class ComponentInventoryTransfer extends MachineComponent { private class Storage extends Transfer { - private int source; - private int[] destination; + private final int source; + private final int[] destination; private Storage(IMachine machine, int source, int[] destination) { super(machine); diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index ac1f25e3..31a6d30f 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -20,7 +20,7 @@ import binnie.core.machines.power.TankInfo; public class ComponentTankContainer extends MachineComponent implements ITankMachine { - private Map tanks = new LinkedHashMap<>(); + private final Map tanks = new LinkedHashMap<>(); public ComponentTankContainer(IMachine machine) { super(machine); diff --git a/src/main/java/binnie/core/machines/inventory/MachineSide.java b/src/main/java/binnie/core/machines/inventory/MachineSide.java index 48762a22..f65acdf8 100644 --- a/src/main/java/binnie/core/machines/inventory/MachineSide.java +++ b/src/main/java/binnie/core/machines/inventory/MachineSide.java @@ -1,5 +1,8 @@ package binnie.core.machines.inventory; +import static net.minecraftforge.common.util.ForgeDirection.DOWN; +import static net.minecraftforge.common.util.ForgeDirection.UP; + import java.util.Collection; import java.util.EnumSet; @@ -9,18 +12,22 @@ import binnie.core.util.I18N; public class MachineSide { - public static final EnumSet TOP_AND_BOTTOM = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN); - public static final EnumSet NONE = EnumSet.noneOf(ForgeDirection.class); - public static final EnumSet SIDES = EnumSet + private static final EnumSet SIDES = EnumSet .of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); + private static final EnumSet ALL = EnumSet + .of(UP, DOWN, ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); - private static final EnumSet ALL = EnumSet.of( - ForgeDirection.UP, - ForgeDirection.DOWN, - ForgeDirection.NORTH, - ForgeDirection.SOUTH, - ForgeDirection.EAST, - ForgeDirection.WEST); + // Spotless spams this into two lines, not great + // spotless:off + private static final String[] SIDE_NAMES = new String[] { + "binniecore.gui.side.down", + "binniecore.gui.side.up", + "binniecore.gui.side.north", + "binniecore.gui.side.south", + "binniecore.gui.side.west", + "binniecore.gui.side.east" + }; + // spotless:on public static String asString(Collection sides) { if (sides.containsAll(MachineSide.ALL)) { @@ -30,55 +37,27 @@ public class MachineSide { return I18N.localise("binniecore.gui.side.none"); } - String text = ""; - if (sides.contains(ForgeDirection.UP)) { - if (sides.size() > 0) { - text += ", "; - } - text += I18N.localise("binniecore.gui.side.up"); - } - - if (sides.contains(ForgeDirection.DOWN)) { - if (sides.size() > 0) { - text += ", "; - } - text += I18N.localise("binniecore.gui.side.down"); - } + StringBuilder text = new StringBuilder(); if (sides.containsAll(MachineSide.SIDES)) { - if (sides.size() > 0) { - text += ", "; + text.append(I18N.localise("binniecore.gui.side.sides")); + + if (sides.contains(ForgeDirection.UP)) { + text.append(", "); + text.append(I18N.localise(SIDE_NAMES[UP.ordinal()])); + } + + if (sides.contains(ForgeDirection.DOWN)) { + text.append(", "); + text.append(I18N.localise(SIDE_NAMES[DOWN.ordinal()])); } - text += I18N.localise("binniecore.gui.side.sides"); } else { - if (sides.contains(ForgeDirection.NORTH)) { - if (sides.size() > 0) { - text += ", "; - } - text += I18N.localise("binniecore.gui.side.north"); - } + for (ForgeDirection side : sides) { + if (text.length() > 0) text.append(", "); - if (sides.contains(ForgeDirection.EAST)) { - if (sides.size() > 0) { - text += ", "; - } - text += I18N.localise("binniecore.gui.side.east"); - } - - if (sides.contains(ForgeDirection.SOUTH)) { - if (sides.size() > 0) { - text += ", "; - } - text += I18N.localise("binniecore.gui.side.south"); - } - - if (sides.contains(ForgeDirection.WEST)) { - if (sides.size() > 0) { - text += ", "; - } - text += I18N.localise("binniecore.gui.side.west"); + text.append(I18N.localise(SIDE_NAMES[side.ordinal()])); } } - return text; + return text.toString(); } } diff --git a/src/main/java/binnie/core/machines/inventory/SetList.java b/src/main/java/binnie/core/machines/inventory/SetList.java index 41295504..dd6f75fb 100644 --- a/src/main/java/binnie/core/machines/inventory/SetList.java +++ b/src/main/java/binnie/core/machines/inventory/SetList.java @@ -6,7 +6,7 @@ import java.util.Set; public class SetList extends ArrayList implements Set { - private static long serialVersionUID = 1277112003159980135L; + private static final long serialVersionUID = 1277112003159980135L; @Override public boolean add(E e) { diff --git a/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/src/main/java/binnie/core/machines/inventory/SidedAccess.java index c6fd6479..81077b50 100644 --- a/src/main/java/binnie/core/machines/inventory/SidedAccess.java +++ b/src/main/java/binnie/core/machines/inventory/SidedAccess.java @@ -10,7 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection; class SidedAccess { - private Map accesses = new HashMap<>(); + private final Map accesses = new HashMap<>(); private AccessDirection base = AccessDirection.Both; private boolean insertLocked; private boolean extractLocked; diff --git a/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/src/main/java/binnie/core/machines/inventory/SlotValidator.java index 906543df..494b5403 100644 --- a/src/main/java/binnie/core/machines/inventory/SlotValidator.java +++ b/src/main/java/binnie/core/machines/inventory/SlotValidator.java @@ -12,7 +12,7 @@ public abstract class SlotValidator extends Validator { public static ValidatorIcon IconFrame; public static ValidatorIcon IconCircuit; public static ValidatorIcon IconBlock; - private ValidatorIcon icon; + private final ValidatorIcon icon; public SlotValidator(ValidatorIcon icon) { this.icon = icon; @@ -27,7 +27,7 @@ public abstract class SlotValidator extends Validator { public static class Item extends SlotValidator { - private ItemStack target; + private final ItemStack target; public Item(ItemStack target, ValidatorIcon icon) { super(icon); diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index a0e212df..3710bc92 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -13,7 +13,7 @@ public class TankSlot extends BaseSlot { public static final String NAME_WATER = "Water Tank"; public static final String NAME_CUPBOARD = "Cupboard Slot"; - private FluidTank tank; + private final FluidTank tank; public TankSlot(int index, String name, int capacity) { super(index, name); diff --git a/src/main/java/binnie/core/machines/inventory/TankValidator.java b/src/main/java/binnie/core/machines/inventory/TankValidator.java index 77956803..47ccd65d 100644 --- a/src/main/java/binnie/core/machines/inventory/TankValidator.java +++ b/src/main/java/binnie/core/machines/inventory/TankValidator.java @@ -12,7 +12,7 @@ public abstract class TankValidator extends Validator { public static class Basic extends TankValidator { - private Fluid fluid; + private final Fluid fluid; public Basic(String name) { fluid = Binnie.Liquid.getLiquidStack(name, 1).getFluid(); diff --git a/src/main/java/binnie/core/machines/inventory/TransferHandler.java b/src/main/java/binnie/core/machines/inventory/TransferHandler.java index 9c325dd2..b96bf0a3 100644 --- a/src/main/java/binnie/core/machines/inventory/TransferHandler.java +++ b/src/main/java/binnie/core/machines/inventory/TransferHandler.java @@ -67,10 +67,9 @@ public class TransferHandler { int space = merged.getMaxStackSize() - merged.stackSize; if (space > 0) { if (itemstack.stackSize > space) { - ItemStack itemStack = itemstack; - itemStack.stackSize -= space; + itemstack.stackSize -= space; merged.stackSize += space; - } else if (itemstack.stackSize <= space) { + } else { merged.stackSize += itemstack.stackSize; itemstack = null; } diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java index 80ee3b80..ded0217c 100644 --- a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java +++ b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java @@ -9,8 +9,8 @@ import binnie.core.resource.BinnieIcon; public class ValidatorIcon { - private List iconsInput; - private List iconsOutput; + private final List iconsInput; + private final List iconsOutput; public ValidatorIcon(AbstractMod mod, String pathInput, String pathOutput) { iconsInput = new ArrayList<>(); diff --git a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java index 7a7072b8..0dbed0fe 100644 --- a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java +++ b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java @@ -28,7 +28,7 @@ public class ComponentPowerReceptor extends MachineComponent public LinkedList inputs; private boolean registeredToIC2EnergyNet; - private PowerInterface container; + private final PowerInterface container; public ComponentPowerReceptor(IMachine machine) { this(machine, 1000); diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index 063e2e29..b51b4f7e 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -9,7 +9,7 @@ import binnie.core.util.I18N; public abstract class ComponentProcessIndefinate extends MachineComponent implements IProcess, INetwork.TilePacketSync { - private float energyPerTick; + private final float energyPerTick; private boolean inProgress; private float actionPauseProcess; private float actionCancelTask; diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java b/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java index c89e8f1a..03ac6bb9 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java @@ -4,8 +4,8 @@ import binnie.core.machines.IMachine; public class ComponentProcessSetCost extends ComponentProcess { - private int processLength; - private int processEnergy; + private final int processLength; + private final int processEnergy; public ComponentProcessSetCost(IMachine machine, int rfCost, int timePeriod) { super(machine); diff --git a/src/main/java/binnie/core/machines/power/ErrorState.java b/src/main/java/binnie/core/machines/power/ErrorState.java index 5e9ab54c..3842f2c1 100644 --- a/src/main/java/binnie/core/machines/power/ErrorState.java +++ b/src/main/java/binnie/core/machines/power/ErrorState.java @@ -10,7 +10,7 @@ public class ErrorState implements INBTTagable { private String name; private String desc; private int[] data; - private boolean progress; + private final boolean progress; private boolean itemError; private boolean tankError; private boolean powerError; diff --git a/src/main/java/binnie/core/machines/power/PowerInterface.java b/src/main/java/binnie/core/machines/power/PowerInterface.java index 4f95c051..78395ed7 100644 --- a/src/main/java/binnie/core/machines/power/PowerInterface.java +++ b/src/main/java/binnie/core/machines/power/PowerInterface.java @@ -6,7 +6,7 @@ import forestry.api.core.INBTTagable; public class PowerInterface implements INBTTagable { - private int capacity; + private final int capacity; private int energy; public PowerInterface(int capacity) { diff --git a/src/main/java/binnie/core/machines/power/PowerSystem.java b/src/main/java/binnie/core/machines/power/PowerSystem.java index 96333110..d338441d 100644 --- a/src/main/java/binnie/core/machines/power/PowerSystem.java +++ b/src/main/java/binnie/core/machines/power/PowerSystem.java @@ -9,7 +9,7 @@ public enum PowerSystem { RF(10.0), EU(40.0); - private double conversion; + private final double conversion; PowerSystem(double conversion) { this.conversion = conversion; diff --git a/src/main/java/binnie/core/machines/power/ProcessInfo.java b/src/main/java/binnie/core/machines/power/ProcessInfo.java index 22f42211..2501ef8d 100644 --- a/src/main/java/binnie/core/machines/power/ProcessInfo.java +++ b/src/main/java/binnie/core/machines/power/ProcessInfo.java @@ -17,11 +17,10 @@ public class ProcessInfo implements INBTTagable { processTime = 0; energyPerTick = process.getEnergyPerTick(); - if (process instanceof IProcessTimed) { - IProcessTimed time = (IProcessTimed) process; - currentProgress = time.getProgress(); - processEnergy = time.getProcessEnergy(); - processTime = time.getProcessLength(); + if (process instanceof IProcessTimed processTimed) { + currentProgress = processTimed.getProgress(); + processEnergy = processTimed.getProcessEnergy(); + processTime = processTimed.getProcessLength(); } else { currentProgress = process.isInProgress() ? 100.0f : 0.0f; } diff --git a/src/main/java/binnie/core/machines/storage/Compartment.java b/src/main/java/binnie/core/machines/storage/Compartment.java index 9adc2852..16f38c9b 100644 --- a/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/src/main/java/binnie/core/machines/storage/Compartment.java @@ -21,7 +21,7 @@ enum Compartment implements IMachineType { CompartmentGold(StandardCompartment.PackageCompartmentGold.class), CompartmentDiamond(StandardCompartment.PackageCompartmentDiamond.class); - Class clss; + final Class clss; Compartment(Class clss) { this.clss = clss; @@ -43,7 +43,7 @@ enum Compartment implements IMachineType { public abstract static class PackageCompartment extends MachinePackage { - private BinnieResource renderTexture; + private final BinnieResource renderTexture; protected PackageCompartment(String uid, IBinnieTexture renderTexture) { super(uid, false); @@ -58,7 +58,7 @@ enum Compartment implements IMachineType { @Override public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { - MachineRendererCompartment.instance.renderMachine(machine, 0xffffff, renderTexture, x, y, z, partialTick); + MachineRendererCompartment.instance.renderMachine(machine, renderTexture, x, y, z); } } } diff --git a/src/main/java/binnie/core/machines/storage/CompartmentTab.java b/src/main/java/binnie/core/machines/storage/CompartmentTab.java index 9e48eb96..6abc6a43 100644 --- a/src/main/java/binnie/core/machines/storage/CompartmentTab.java +++ b/src/main/java/binnie/core/machines/storage/CompartmentTab.java @@ -56,11 +56,7 @@ class CompartmentTab implements INBTTagable { } public void setName(String name) { - if (name == null) { - this.name = ""; - } else { - this.name = name; - } + this.name = name == null ? "" : name; } public void setIcon(ItemStack icon) { diff --git a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java index f479831a..b0820b22 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java +++ b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java @@ -11,7 +11,7 @@ import binnie.core.machines.component.IInteraction; class ComponentBinnieCoreGUI extends MachineComponent implements IInteraction.RightClick { - private BinnieCoreGUI id; + private final BinnieCoreGUI id; public ComponentBinnieCoreGUI(Machine machine, BinnieCoreGUI id) { super(machine); diff --git a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java index 4a1164fe..190fe0a4 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java +++ b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java @@ -14,9 +14,9 @@ import cpw.mods.fml.relauncher.Side; class ComponentCompartmentInventory extends ComponentInventorySlots implements INetwork.GuiNBT { - private int numberOfTabs; - private int slotsPerPage; - private Map tabs; + private final int numberOfTabs; + private final int slotsPerPage; + private final Map tabs; public ComponentCompartmentInventory(IMachine machine, int sections) { this(machine, sections, 4); diff --git a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java index 84c545c8..1dfeaf97 100644 --- a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java +++ b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java @@ -12,14 +12,13 @@ import cpw.mods.fml.relauncher.SideOnly; class MachineRendererCompartment { public static MachineRendererCompartment instance = new MachineRendererCompartment(); - private ModelCompartment model; + private final ModelCompartment model; public MachineRendererCompartment() { model = new ModelCompartment(); } - public void renderMachine(Machine machine, int colour, BinnieResource texture, double x, double y, double z, - float var8) { + public void renderMachine(Machine machine, BinnieResource texture, double x, double y, double z) { GL11.glPushMatrix(); int i1 = 0; int ix = machine.getTileEntity().xCoord; diff --git a/src/main/java/binnie/core/machines/storage/ModelCompartment.java b/src/main/java/binnie/core/machines/storage/ModelCompartment.java index 48124a02..f0190920 100644 --- a/src/main/java/binnie/core/machines/storage/ModelCompartment.java +++ b/src/main/java/binnie/core/machines/storage/ModelCompartment.java @@ -6,23 +6,23 @@ import net.minecraft.entity.Entity; class ModelCompartment extends ModelBase { - private ModelRenderer column1; - private ModelRenderer column4; - private ModelRenderer column2; - private ModelRenderer column3; - private ModelRenderer lid1; - private ModelRenderer body1; - private ModelRenderer lock1; - private ModelRenderer lid2; - private ModelRenderer body2; - private ModelRenderer lock2; - private ModelRenderer body; - private ModelRenderer lid3; - private ModelRenderer body3; - private ModelRenderer lock3; - private ModelRenderer lid4; - private ModelRenderer body4; - private ModelRenderer lock4; + private final ModelRenderer column1; + private final ModelRenderer column4; + private final ModelRenderer column2; + private final ModelRenderer column3; + private final ModelRenderer lid1; + private final ModelRenderer body1; + private final ModelRenderer lock1; + private final ModelRenderer lid2; + private final ModelRenderer body2; + private final ModelRenderer lock2; + private final ModelRenderer body; + private final ModelRenderer lid3; + private final ModelRenderer body3; + private final ModelRenderer lock3; + private final ModelRenderer lid4; + private final ModelRenderer body4; + private final ModelRenderer lock4; public ModelCompartment() { textureWidth = 128; diff --git a/src/main/java/binnie/core/machines/storage/StandardCompartment.java b/src/main/java/binnie/core/machines/storage/StandardCompartment.java index 902f1153..00b57d2d 100644 --- a/src/main/java/binnie/core/machines/storage/StandardCompartment.java +++ b/src/main/java/binnie/core/machines/storage/StandardCompartment.java @@ -1,13 +1,10 @@ package binnie.core.machines.storage; -import net.minecraft.tileentity.TileEntity; - import binnie.core.gui.BinnieCoreGUI; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.texture.BinnieCoreTexture; -class StandardCompartment { +public class StandardCompartment { public static class PackageCompartment extends Compartment.PackageCompartment { @@ -21,10 +18,6 @@ class StandardCompartment { new ComponentCompartmentInventory(machine, 4, 25); } - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } public static class PackageCompartmentCopper extends Compartment.PackageCompartment { @@ -39,10 +32,6 @@ class StandardCompartment { new ComponentCompartmentInventory(machine, 6, 25); } - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } public static class PackageCompartmentBronze extends Compartment.PackageCompartment { @@ -57,10 +46,6 @@ class StandardCompartment { new ComponentCompartmentInventory(machine, 8, 25); } - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } public static class PackageCompartmentIron extends Compartment.PackageCompartment { @@ -75,10 +60,6 @@ class StandardCompartment { new ComponentCompartmentInventory(machine, 4, 50); } - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } public static class PackageCompartmentGold extends Compartment.PackageCompartment { @@ -93,10 +74,6 @@ class StandardCompartment { new ComponentCompartmentInventory(machine, 6, 50); } - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } public static class PackageCompartmentDiamond extends Compartment.PackageCompartment { @@ -111,9 +88,5 @@ class StandardCompartment { new ComponentCompartmentInventory(machine, 8, 50); } - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } } diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 39c38632..08dafdb7 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -1,7 +1,6 @@ package binnie.core.machines.storage; import java.util.Arrays; -import java.util.Comparator; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -63,7 +62,7 @@ import cpw.mods.fml.relauncher.Side; @SuppressWarnings("Duplicates") public class WindowCompartment extends WindowMachine implements IWindowAffectsShiftClick { - private Map panels; + private final Map panels; private ControlTextEdit tabName; private ControlItemDisplay tabIcon; private ControlColourSelector tabColour; @@ -443,17 +442,11 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } if (sortByName) { - List> list = new LinkedList(slotIds.entrySet()); - list.sort(new Comparator>() { + List> list = new LinkedList<>(slotIds.entrySet()); + list.sort((o1, o2) -> -o2.getValue().compareTo(o1.getValue())); - @Override - public int compare(Entry o1, Entry o2) { - return -o2.getValue().compareTo(o1.getValue()); - } - }); - - Map result = new LinkedHashMap(); - for (Map.Entry entry : list) { + Map result = new LinkedHashMap<>(); + for (Map.Entry entry : list) { result.put(entry.getKey(), entry.getValue()); } slotIds = result; diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index 9649c1f5..a3e29dfd 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -25,8 +25,8 @@ public class TransferRequest { private int[] targetTanks; private boolean transferLiquids; private boolean ignoreReadOnly; - private List insertedSlots; - private List insertedTanks; + private final List insertedSlots; + private final List insertedTanks; public TransferRequest(ItemStack toTransfer, IInventory destination) { itemToTransfer = null; @@ -180,10 +180,9 @@ public class TransferRequest { int space = merged.getMaxStackSize() - merged.stackSize; if (space > 0) { if (itemstack.stackSize > space) { - ItemStack itemStack = itemstack; - itemStack.stackSize -= space; + itemstack.stackSize -= space; merged.stackSize += space; - } else if (itemstack.stackSize <= space) { + } else { merged.stackSize += itemstack.stackSize; itemstack = null; } @@ -201,11 +200,10 @@ public class TransferRequest { private ItemStack transferToTankUsingFluidContainer(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { - if (item == null || !(item.getItem() instanceof IFluidContainerItem)) { + if (item == null || !(item.getItem() instanceof IFluidContainerItem fluidContainer)) { return item; } - IFluidContainerItem fluidContainer = (IFluidContainerItem) item.getItem(); FluidStack fluid = fluidContainer.getFluid(item); if (fluid == null) { return item; @@ -307,11 +305,10 @@ public class TransferRequest { private ItemStack transferFromTankUsingFluidContainer(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { - if (item == null || !(item.getItem() instanceof IFluidContainerItem)) { + if (item == null || !(item.getItem() instanceof IFluidContainerItem fluidContainer)) { return item; } - IFluidContainerItem fluidContainer = (IFluidContainerItem) item.getItem(); IFluidTank tank = destination.getTanks()[tankID]; FluidStack fluid = tank.getFluid(); if (fluid == null) { diff --git a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java index b97eea85..f2ad3a0f 100644 --- a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java +++ b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java @@ -7,10 +7,10 @@ import net.minecraftforge.common.config.Configuration; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -class BinnieConfiguration extends Configuration { +public class BinnieConfiguration extends Configuration { public AbstractMod mod; - private String filename; + private final String filename; public BinnieConfiguration(String filename, AbstractMod mod) { super(new File(BinnieCore.proxy.getDirectory(), filename)); diff --git a/src/main/java/binnie/core/mod/config/BinnieItemData.java b/src/main/java/binnie/core/mod/config/BinnieItemData.java index af1ef5f8..95c518b2 100644 --- a/src/main/java/binnie/core/mod/config/BinnieItemData.java +++ b/src/main/java/binnie/core/mod/config/BinnieItemData.java @@ -3,9 +3,9 @@ package binnie.core.mod.config; // TODO Why do we need this class? class BinnieItemData { - private int item; - private BinnieConfiguration configFile; - private String configKey; + private final int item; + private final BinnieConfiguration configFile; + private final String configKey; public BinnieItemData(int item, BinnieConfiguration configFile, String configKey) { this.item = item; diff --git a/src/main/java/binnie/core/mod/config/ManagerConfig.java b/src/main/java/binnie/core/mod/config/ManagerConfig.java index a893f030..70aa0c1e 100644 --- a/src/main/java/binnie/core/mod/config/ManagerConfig.java +++ b/src/main/java/binnie/core/mod/config/ManagerConfig.java @@ -15,8 +15,8 @@ import binnie.core.ManagerBase; public class ManagerConfig extends ManagerBase { - private Map, Configuration> configurations; - private Map> itemIDs; + private final Map, Configuration> configurations; + private final Map> itemIDs; public ManagerConfig() { configurations = new LinkedHashMap<>(); diff --git a/src/main/java/binnie/core/mod/config/PropertyBase.java b/src/main/java/binnie/core/mod/config/PropertyBase.java index 89fd23c3..f2651f21 100644 --- a/src/main/java/binnie/core/mod/config/PropertyBase.java +++ b/src/main/java/binnie/core/mod/config/PropertyBase.java @@ -8,16 +8,16 @@ import java.util.List; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -abstract class PropertyBase { +public abstract class PropertyBase { protected Configuration file; protected Property property; protected ValueType defaultValue; protected AnnotationType annotatedProperty; - private ConfigProperty configProperty; - private List comments; - private Field field; + private final ConfigProperty configProperty; + private final List comments; + private final Field field; protected PropertyBase(Field field, BinnieConfiguration file, ConfigProperty configProperty, AnnotationType annotedProperty) throws IllegalArgumentException, IllegalAccessException { @@ -44,7 +44,7 @@ abstract class PropertyBase { protected abstract void addComments(); protected String getCategory() { - return configProperty.category().equals("") + return configProperty.category().isEmpty() ? annotatedProperty.annotationType().getAnnotation(ConfigProperty.Type.class).category() : configProperty.category(); } @@ -62,10 +62,10 @@ abstract class PropertyBase { } protected String getComment() { - String comment = ""; + StringBuilder comment = new StringBuilder(); for (String com : comments) { - comment = comment + com + " "; + comment.append(com).append(" "); } - return comment; + return comment.toString(); } } diff --git a/src/main/java/binnie/core/nei/PositionedStackAdv.java b/src/main/java/binnie/core/nei/PositionedStackAdv.java index cd2d6e35..b5ccc705 100644 --- a/src/main/java/binnie/core/nei/PositionedStackAdv.java +++ b/src/main/java/binnie/core/nei/PositionedStackAdv.java @@ -26,17 +26,13 @@ public class PositionedStackAdv extends PositionedStack { public List handleTooltip(GuiRecipe guiRecipe, List currenttip) { if (!this.tooltip.isEmpty()) { - for (String tip : this.tooltip) { - currenttip.add(tip); - } + currenttip.addAll(this.tooltip); } return currenttip; } public PositionedStackAdv addToTooltip(List lines) { - for (String tip : lines) { - this.tooltip.add(tip); - } + this.tooltip.addAll(lines); return this; } diff --git a/src/main/java/binnie/core/nei/RecipeHandlerBase.java b/src/main/java/binnie/core/nei/RecipeHandlerBase.java index 165d10a8..581ca809 100644 --- a/src/main/java/binnie/core/nei/RecipeHandlerBase.java +++ b/src/main/java/binnie/core/nei/RecipeHandlerBase.java @@ -196,10 +196,9 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { public void drawFluidTanks(int recipe) { CachedRecipe cachedRecipe = this.arecipes.get(recipe); - if (cachedRecipe instanceof CachedBaseRecipe) { - CachedBaseRecipe crecipe = (CachedBaseRecipe) cachedRecipe; - if (crecipe.getFluidTanks() != null) { - for (PositionedFluidTank fluidTank : crecipe.getFluidTanks()) { + if (cachedRecipe instanceof CachedBaseRecipe baseRecipe) { + if (baseRecipe.getFluidTanks() != null) { + for (PositionedFluidTank fluidTank : baseRecipe.getFluidTanks()) { fluidTank.draw(); } } diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index 03a75149..97e1c07f 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -58,8 +58,8 @@ public enum BinnieCorePacketID implements IPacketID { TileEntity tile = packet.getTarget(BinnieCore.proxy.getWorld()); if (tile != null && packet.getTagCompound() != null) { IMachine machine = Machine.getMachine(tile); - if (machine != null && machine instanceof INetwork.TilePacketSync) { - ((INetwork.TilePacketSync) machine).syncFromNBT(packet.getTagCompound()); + if (machine instanceof INetwork.TilePacketSync tps) { + tps.syncFromNBT(packet.getTagCompound()); } } } diff --git a/src/main/java/binnie/core/network/packet/MachinePayload.java b/src/main/java/binnie/core/network/packet/MachinePayload.java index 108eee4a..745d06fe 100644 --- a/src/main/java/binnie/core/network/packet/MachinePayload.java +++ b/src/main/java/binnie/core/network/packet/MachinePayload.java @@ -5,9 +5,9 @@ import java.util.List; public class MachinePayload { - private List intPayload; - private List floatPayload; - private List stringPayload; + private final List intPayload; + private final List floatPayload; + private final List stringPayload; private int id; public MachinePayload(int id) { diff --git a/src/main/java/binnie/core/network/packet/MessageTileNBT.java b/src/main/java/binnie/core/network/packet/MessageTileNBT.java index 02b4cb9a..4c3374e8 100644 --- a/src/main/java/binnie/core/network/packet/MessageTileNBT.java +++ b/src/main/java/binnie/core/network/packet/MessageTileNBT.java @@ -62,13 +62,4 @@ public class MessageTileNBT extends MessageNBT implements IPacketLocation { return posZ; } - @Override - public NBTTagCompound getTagCompound() { - return nbt; - } - - @Override - void setTagCompound(NBTTagCompound nbt) { - this.nbt = nbt; - } } diff --git a/src/main/java/binnie/core/network/packet/MessageUpdate.java b/src/main/java/binnie/core/network/packet/MessageUpdate.java index d778e4cc..7c290358 100644 --- a/src/main/java/binnie/core/network/packet/MessageUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageUpdate.java @@ -1,6 +1,7 @@ package binnie.core.network.packet; import java.io.IOException; +import java.nio.charset.StandardCharsets; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -43,7 +44,7 @@ public class MessageUpdate extends MessageCoordinates { data.writeFloat(floatData); } for (String stringData : payload.stringPayload) { - byte[] bytes = stringData.getBytes("UTF-8"); + byte[] bytes = stringData.getBytes(StandardCharsets.UTF_8); data.writeShort(bytes.length); data.writeBytes(bytes); } @@ -70,7 +71,7 @@ public class MessageUpdate extends MessageCoordinates { for (int i = 0; i < stringLength; ++i) { int length = data.readShort(); byte[] string = data.readBytes(length).array(); - payload.addString(new String(string, "UTF-8")); + payload.addString(new String(string, StandardCharsets.UTF_8)); } } diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index e6245886..aa4e3949 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -12,7 +12,7 @@ import binnie.core.network.packet.MessageBase; public class BinnieModProxy implements IBinnieModProxy { - private AbstractMod mod; + private final AbstractMod mod; public BinnieModProxy(AbstractMod mod) { this.mod = mod; diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index f18cb12f..6784007e 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -32,21 +32,6 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { uniqueTextureUID = 1200; } - @Override - public void preInit() { - // ignored - } - - @Override - public void init() { - // ignored - } - - @Override - public void postInit() { - // ignored - } - @Override public void bindTexture(BinnieResource texture) { // ignored diff --git a/src/main/java/binnie/core/resource/BinnieIcon.java b/src/main/java/binnie/core/resource/BinnieIcon.java index 2feb78cd..922090fa 100644 --- a/src/main/java/binnie/core/resource/BinnieIcon.java +++ b/src/main/java/binnie/core/resource/BinnieIcon.java @@ -11,7 +11,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BinnieIcon extends BinnieResource { - private int textureSheet; + private final int textureSheet; private IIcon icon; public BinnieIcon(AbstractMod mod, ResourceType type, String path) { diff --git a/src/main/java/binnie/core/resource/BinnieResource.java b/src/main/java/binnie/core/resource/BinnieResource.java index bc505c8f..bac4d6f6 100644 --- a/src/main/java/binnie/core/resource/BinnieResource.java +++ b/src/main/java/binnie/core/resource/BinnieResource.java @@ -7,7 +7,7 @@ import binnie.core.AbstractMod; public class BinnieResource { String mod; - private ResourceType type; + private final ResourceType type; String path; public BinnieResource(AbstractMod mod, ResourceType type, String path) { diff --git a/src/main/java/binnie/core/resource/ManagerResource.java b/src/main/java/binnie/core/resource/ManagerResource.java index 45e940cc..a1300225 100644 --- a/src/main/java/binnie/core/resource/ManagerResource.java +++ b/src/main/java/binnie/core/resource/ManagerResource.java @@ -11,7 +11,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ManagerResource { - private List icons; + private final List icons; public ManagerResource() { icons = new ArrayList<>(); diff --git a/src/main/java/binnie/core/resource/ResourceType.java b/src/main/java/binnie/core/resource/ResourceType.java index 0714b3b5..72884d57 100644 --- a/src/main/java/binnie/core/resource/ResourceType.java +++ b/src/main/java/binnie/core/resource/ResourceType.java @@ -9,7 +9,7 @@ public enum ResourceType { FX("fx"), Entity("entities"); - String name; + final String name; ResourceType(String name) { this.name = name; diff --git a/src/main/java/binnie/core/texture/BinnieCoreTexture.java b/src/main/java/binnie/core/texture/BinnieCoreTexture.java index 108a5b57..3eff4b13 100644 --- a/src/main/java/binnie/core/texture/BinnieCoreTexture.java +++ b/src/main/java/binnie/core/texture/BinnieCoreTexture.java @@ -17,8 +17,8 @@ public enum BinnieCoreTexture implements IBinnieTexture { GUIBreeding(ResourceType.GUI, "breeding"), GUIAnalyst(ResourceType.GUI, "guianalyst"); - String texture; - ResourceType type; + final String texture; + final ResourceType type; BinnieCoreTexture(ResourceType base, String texture) { this.texture = texture; diff --git a/src/main/java/binnie/core/triggers/BinnieAction.java b/src/main/java/binnie/core/triggers/BinnieAction.java index 2044fbb3..f7005b07 100644 --- a/src/main/java/binnie/core/triggers/BinnieAction.java +++ b/src/main/java/binnie/core/triggers/BinnieAction.java @@ -22,10 +22,10 @@ class BinnieAction implements IActionExternal { private static int incrementalID = 800; public static BinnieAction actionPauseProcess; public static BinnieAction actionCancelTask; - private String desc; - private BinnieIcon icon; - private String tag; - private int id; + private final String desc; + private final BinnieIcon icon; + private final String tag; + private final int id; BinnieAction(String desc, String tag, String iconFile) { this(desc, tag, BinnieCore.instance, iconFile); diff --git a/src/main/java/binnie/core/triggers/BinnieTrigger.java b/src/main/java/binnie/core/triggers/BinnieTrigger.java index ae13e80c..1c476e62 100644 --- a/src/main/java/binnie/core/triggers/BinnieTrigger.java +++ b/src/main/java/binnie/core/triggers/BinnieTrigger.java @@ -39,10 +39,10 @@ class BinnieTrigger implements ITriggerExternal { protected static BinnieTrigger triggerAcclimatiserCold; protected static BinnieTrigger triggerAcclimatiserWet; protected static BinnieTrigger triggerAcclimatiserDry; - private String desc; - private String tag; - private BinnieIcon icon; - private int id; + private final String desc; + private final String tag; + private final BinnieIcon icon; + private final int id; public BinnieTrigger(String desc, String tag, String iconFile) { this(desc, tag, BinnieCore.instance, iconFile); diff --git a/src/main/java/binnie/core/triggers/TriggerData.java b/src/main/java/binnie/core/triggers/TriggerData.java index cc4bbb58..02f91980 100644 --- a/src/main/java/binnie/core/triggers/TriggerData.java +++ b/src/main/java/binnie/core/triggers/TriggerData.java @@ -6,7 +6,7 @@ import buildcraft.api.statements.ITriggerExternal; public class TriggerData implements Map.Entry { - private ITriggerExternal key; + private final ITriggerExternal key; private Boolean value; public TriggerData(ITriggerExternal key, Boolean value) { diff --git a/src/main/java/binnie/core/triggers/TriggerPower.java b/src/main/java/binnie/core/triggers/TriggerPower.java index e3d2394a..16429624 100644 --- a/src/main/java/binnie/core/triggers/TriggerPower.java +++ b/src/main/java/binnie/core/triggers/TriggerPower.java @@ -35,7 +35,7 @@ public class TriggerPower { private static double getPercentage(Object tile) { IPoweredMachine process = Machine.getInterface(IPoweredMachine.class, tile); if (process != null) { - return (double) (process.getInterface().getEnergy() / process.getInterface().getCapacity()); + return (double) process.getInterface().getEnergy() / process.getInterface().getCapacity(); } return 0.0; } diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index a865d61d..3312ca78 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -6,6 +6,7 @@ import net.minecraft.item.Item; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; @@ -28,7 +29,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; @Mod( modid = "ExtraBees", name = "Extra Bees", - version = BinnieCore.VERSION, + version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore") public class ExtraBees extends AbstractMod { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index 19fa32b1..bf333e71 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -7,12 +7,10 @@ import java.util.List; import binnie.extrabees.genetics.requirements.DummyMutationCondition; import binnie.extrabees.genetics.requirements.IMutationRequirement; import binnie.extrabees.genetics.requirements.RequirementPerson; -import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeMutationCustom; -import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; import forestry.api.genetics.IMutation; import forestry.apiculture.genetics.BeeMutation; @@ -21,7 +19,7 @@ public class ExtraBeeMutation extends BeeMutation implements IBeeMutationCustom public static List mutations = new ArrayList<>(); - private List requirements; + private final List requirements; public ExtraBeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance) { super(bee0, bee1, result, chance); @@ -29,11 +27,6 @@ public class ExtraBeeMutation extends BeeMutation implements IBeeMutationCustom mutations.add(this); } - @Override - public IBeeRoot getRoot() { - return BeeManager.beeRoot; - } - @Override public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1) { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 193f41b9..d0743c13 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -45,7 +45,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo MYSTICAL, BEDROCK; - protected boolean dominant; + private final boolean dominant; ExtraBeesFlowers() { dominant = true; @@ -87,41 +87,20 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo } public ItemStack[] getItemStacks() { - switch (this) { - case WATER: - return new ItemStack[] { new ItemStack(Blocks.waterlily) }; - - case SUGAR: - return new ItemStack[] { new ItemStack(Blocks.reeds) }; - - case ROCK: - return new ItemStack[] { new ItemStack(Blocks.cobblestone) }; - - case BOOK: - return new ItemStack[] { new ItemStack(Blocks.bookshelf) }; - - case REDSTONE: - return new ItemStack[] { new ItemStack(Blocks.redstone_torch) }; - - case DEAD: - return new ItemStack[] { new ItemStack(Blocks.deadbush) }; - - case FRUIT: - return new ItemStack[] { new ItemStack(Items.apple) }; - - case LEAVES: - return new ItemStack[] { new ItemStack(Blocks.leaves) }; - - case SAPLING: - return new ItemStack[] { new ItemStack(Blocks.sapling) }; - - case WOOD: - return new ItemStack[] { new ItemStack(Blocks.log) }; - - case BEDROCK: - return new ItemStack[] { new ItemStack(Blocks.bedrock) }; - } - return new ItemStack[0]; + return switch (this) { + case WATER -> new ItemStack[] { new ItemStack(Blocks.waterlily) }; + case SUGAR -> new ItemStack[] { new ItemStack(Blocks.reeds) }; + case ROCK -> new ItemStack[] { new ItemStack(Blocks.cobblestone) }; + case BOOK -> new ItemStack[] { new ItemStack(Blocks.bookshelf) }; + case REDSTONE -> new ItemStack[] { new ItemStack(Blocks.redstone_torch) }; + case DEAD -> new ItemStack[] { new ItemStack(Blocks.deadbush) }; + case FRUIT -> new ItemStack[] { new ItemStack(Items.apple) }; + case LEAVES -> new ItemStack[] { new ItemStack(Blocks.leaves) }; + case SAPLING -> new ItemStack[] { new ItemStack(Blocks.sapling) }; + case WOOD -> new ItemStack[] { new ItemStack(Blocks.log) }; + case BEDROCK -> new ItemStack[] { new ItemStack(Blocks.bedrock) }; + default -> new ItemStack[0]; + }; } @Override @@ -136,57 +115,31 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo return false; } - switch (this) { - case WATER: - return block == Blocks.waterlily; - - case ROCK: - return block.getMaterial() == Material.rock; - - case SUGAR: - return block == Blocks.reeds; - - case BOOK: - return block == Blocks.bookshelf; - - case REDSTONE: - return block == Blocks.redstone_torch; - - case DEAD: - return block == Blocks.deadbush; - - case WOOD: - return block.isWood(world, x, y, z); - - case FRUIT: - return world.getTileEntity(x, y, z) instanceof IFruitBearer; - - case LEAVES: - return block.isLeaves(world, x, y, z); - - case SAPLING: - return block.getClass().getName().toLowerCase().contains("sapling"); - - case MYSTICAL: - return block == Mods.botania.block("flower"); - case BEDROCK: - return block == Blocks.bedrock; - } - return false; + return switch (this) { + case WATER -> block == Blocks.waterlily; + case ROCK -> block.getMaterial() == Material.rock; + case SUGAR -> block == Blocks.reeds; + case BOOK -> block == Blocks.bookshelf; + case REDSTONE -> block == Blocks.redstone_torch; + case DEAD -> block == Blocks.deadbush; + case WOOD -> block.isWood(world, x, y, z); + case FRUIT -> world.getTileEntity(x, y, z) instanceof IFruitBearer; + case LEAVES -> block.isLeaves(world, x, y, z); + case SAPLING -> block.getClass().getName().toLowerCase().contains("sapling"); + case MYSTICAL -> block == Mods.botania.block("flower"); + case BEDROCK -> block == Blocks.bedrock; + }; } @Override public boolean growFlower(World world, IIndividual individual, int x, int y, int z) { - switch (this) { - case WATER: - return world.isAirBlock(x, y, z) && world.getBlock(x, y - 1, z) == Blocks.water - && world.setBlock(x, y, z, Blocks.waterlily, 0, 2); - - case SUGAR: - return world.getBlock(x, y - 1, z) == Blocks.reeds && world.isAirBlock(x, y, z) - && world.setBlock(x, y, z, Blocks.reeds, 0, 0); - } - return false; + return switch (this) { + case WATER -> world.isAirBlock(x, y, z) && world.getBlock(x, y - 1, z) == Blocks.water + && world.setBlock(x, y, z, Blocks.waterlily, 0, 2); + case SUGAR -> world.getBlock(x, y - 1, z) == Blocks.reeds && world.isAirBlock(x, y, z) + && world.setBlock(x, y, z, Blocks.reeds, 0, 0); + default -> false; + }; } @Override diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index ffbb7de9..1a81b12c 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; import binnie.Binnie; +import binnie.core.Mods; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.genetics.ExtraBeesFlowers; @@ -67,18 +68,25 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { BONEMEAL_MUSHROOM, POWER; - protected static List birthdays; + private static final List birthdays = new ArrayList<>(); static { - birthdays = new ArrayList<>(); - birthdays.add(new Birthday(3, 10, "Binnie")); + + // At the time Binnie abandoned this, the month was bumped by one, the day by two, and the order flipped. + // That resulted in the actual date being Apr. 11th instead of Oct. 3rd. I fixed this, but the old behavior is + // preserved outside NH, in case someone wasn't expecting that. + if (Mods.dreamcraft.active()) { + birthdays.add(new Birthday(3, 10, "Binnie")); + } else { + birthdays.add(new Birthday(11, 4, "Binnie")); + } } - public boolean combinable; - public boolean dominant; + public final boolean combinable; + public final boolean dominant; public int id; String fx; - private String uid; + private final String uid; ExtraBeesEffect() { fx = ""; @@ -382,8 +390,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { private void onFoodEffect(IBeeGenome genome, IBeeHousing housing) { for (EntityLivingBase entity : getEntities(EntityLivingBase.class, genome, housing)) { - if (entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if (entity instanceof EntityPlayer player) { player.getFoodStats().addStats(2, 0.2f); } } @@ -391,8 +398,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { private void onHungerEffect(IBeeGenome genome, IBeeHousing housing, World world) { for (EntityLivingBase entity : getEntities(EntityLivingBase.class, genome, housing)) { - if (entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if (entity instanceof EntityPlayer player) { if (world.rand.nextInt(4) < wearsItems(player)) { continue; } @@ -405,8 +411,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { private void onPotionEffect(IBeeGenome genome, IBeeHousing housing, World world, PotionEffect potion) { for (EntityLivingBase entity : getEntities(EntityLivingBase.class, genome, housing)) { - if (entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if (entity instanceof EntityPlayer player) { if (world.rand.nextInt(4) < wearsItems(player)) { continue; } @@ -493,12 +498,12 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } List entities = getEntities(Entity.class, genome, housing); - if (entities.size() == 0) { + if (entities.isEmpty()) { return; } Entity entity = entities.get(world.rand.nextInt(entities.size())); - if (!(entity instanceof EntityLiving)) { + if (!(entity instanceof EntityLiving living)) { return; } @@ -509,7 +514,6 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return; } - EntityLiving living = (EntityLiving) entity; living.setPositionAndUpdate(x, y, z); living.addPotionEffect(new PotionEffect(Potion.confusion.id, 160, 10)); } @@ -562,21 +566,19 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } } - protected int[] getModifiedArea(IBeeGenome genome, IBeeHousing housing) { + private int[] getModifiedArea(IBeeGenome genome, IBeeHousing housing) { int[] territory; int[] area = territory = genome.getTerritory(); int n = 0; territory[n] *= (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f); - int[] array = area; int n2 = 1; - array[n2] *= (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) + area[n2] *= (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f); - int[] array2 = area; int n3 = 2; - array2[n3] *= (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) + area[n3] *= (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f); if (area[0] < 1) { @@ -609,7 +611,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { public List getEntities(Class eClass, IBeeGenome genome, IBeeHousing housing) { int[] area = genome.getTerritory(); - int[] offset = { -Math.round(area[0] / 2), -Math.round(area[1] / 2), -Math.round(area[2] / 2) }; + int[] offset = { -Math.round(area[0] / 2f), -Math.round(area[1] / 2f), -Math.round(area[2] / 2f) }; int[] min = { housing.getCoordinates().posX + offset[0], housing.getCoordinates().posY + offset[1], housing.getCoordinates().posZ + offset[2] }; int[] max = { housing.getCoordinates().posX + offset[0] + area[0], @@ -632,12 +634,13 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { private Birthday(int day, int month, String name) { this.day = day; - this.month = month + 1; + this.month = month - 1; this.name = name; } public boolean isToday() { - return Calendar.getInstance().get(5) == month && Calendar.getInstance().get(2) == day; + return Calendar.getInstance().get(Calendar.MONTH) == month + && Calendar.getInstance().get(Calendar.DATE) == day; } public String getName() { diff --git a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java index fa8ce2e4..8ea6b120 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java +++ b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java @@ -53,7 +53,7 @@ public class FireworkCreator { nbt.setBoolean("Trail", true); } - if (colors.size() == 0) { + if (colors.isEmpty()) { addColor(0xffffff); } diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index 546dbf04..bbb5df2c 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -42,7 +42,7 @@ public class ItemDictionary extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); if (stack.getItemDamage() > 0) { tooltip.add(I18N.localise("extrabees.item.database.tooltip")); @@ -51,7 +51,7 @@ public class ItemDictionary extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); list.add(new ItemStack(item, 1, 1)); } diff --git a/src/main/java/binnie/extrabees/gui/database/product/ControlProductsBox.java b/src/main/java/binnie/extrabees/gui/database/product/ControlProductsBox.java index 7a6ed559..99649bc7 100644 --- a/src/main/java/binnie/extrabees/gui/database/product/ControlProductsBox.java +++ b/src/main/java/binnie/extrabees/gui/database/product/ControlProductsBox.java @@ -19,7 +19,7 @@ public class ControlProductsBox extends ControlListBox { protected IAlleleBeeSpecies species; - private ProductType type; + private final ProductType type; public ControlProductsBox(IWidget parent, int x, int y, int width, int height, ProductType type) { super(parent, x, y, width, height, 12.0f); diff --git a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java index 723c6848..81327592 100644 --- a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java +++ b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java @@ -20,9 +20,9 @@ public enum ExtraBeeLiquid implements ILiquidType { POISON("poison", new Color(0xeb14eb)), GLACIAL("liquidnitrogen", new Color(0x96c8c8)); - protected String ident; - protected IIcon icon; - protected int color; + private final String ident; + private IIcon icon; + private final int color; ExtraBeeLiquid(String ident, Color color) { this.ident = ident; diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java index 5c4f6f1f..dd288d42 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java @@ -101,12 +101,12 @@ public enum EnumHoneyComb implements IItemEnum { CYANITE(new Color(0x27204d), new Color(0x86ed)), BLUTONIUM(new Color(0x27204d), new Color(0x1b00e6)); - public Map products; + public final Map products; public final int primaryColor; public final int secondaryColor; public final String name; - protected boolean active; + boolean active; EnumHoneyComb(Color primaryColor, Color secondaryColor) { this.primaryColor = primaryColor.getRGB(); diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java index 3474ffc5..9026172a 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java @@ -47,8 +47,8 @@ public enum EnumHoneyDrop implements IItemEnum { public final int primaryColor; public final int secondaryColor; - protected String liquidName; - protected ItemStack remenant; + private final String liquidName; + private ItemStack remenant; EnumHoneyDrop(Color primaryColor, Color secondaryColor, String liquid) { this.primaryColor = primaryColor.getRGB(); diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index 27cdf398..fbb1c0ef 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -243,43 +243,23 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyDrop drop = EnumHoneyDrop.values()[EnumHoneyDrop.RED.ordinal() + i]; int[] dyeC = { 1, 11, 4, 2, 0, 15, 3, 14, 6, 5, 8, 12, 9, 10, 13, 7 }; int k = dyeC[i]; - ItemStack dye = new ItemStack(Items.dye, 1, k); - switch (k) { - case 0: - dye = ExtraBeeItems.BlackDye.get(1); - break; - - case 1: - dye = ExtraBeeItems.RedDye.get(1); - break; - - case 2: - dye = ExtraBeeItems.GreenDye.get(1); - break; - - case 3: - dye = ExtraBeeItems.BrownDye.get(1); - break; - - case 4: - dye = ExtraBeeItems.BlueDye.get(1); - break; - - case 11: - dye = ExtraBeeItems.YellowDye.get(1); - break; - - case 15: - dye = ExtraBeeItems.WhiteDye.get(1); - break; - } + ItemStack dye = switch (k) { + case 0 -> ExtraBeeItems.BlackDye.get(1); + case 1 -> ExtraBeeItems.RedDye.get(1); + case 2 -> ExtraBeeItems.GreenDye.get(1); + case 3 -> ExtraBeeItems.BrownDye.get(1); + case 4 -> ExtraBeeItems.BlueDye.get(1); + case 11 -> ExtraBeeItems.YellowDye.get(1); + case 15 -> ExtraBeeItems.WhiteDye.get(1); + default -> new ItemStack(Items.dye, 1, k); + }; type.addProduct(drop.get(1), 1.00f); drop.addRemenant(dye); } } private static ItemStack getOreDictionary(String string) { - if (OreDictionary.getOres(string).size() > 0) { + if (!OreDictionary.getOres(string).isEmpty()) { return OreDictionary.getOres(string).get(0); } return null; diff --git a/src/main/java/binnie/extrabees/products/ItemProduct.java b/src/main/java/binnie/extrabees/products/ItemProduct.java index f59a9a1c..fed448af 100644 --- a/src/main/java/binnie/extrabees/products/ItemProduct.java +++ b/src/main/java/binnie/extrabees/products/ItemProduct.java @@ -33,7 +33,7 @@ public class ItemProduct extends Item { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (IItemEnum type : types) { if (type.isActive()) { list.add(new ItemStack(this, 1, type.ordinal())); diff --git a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java index 1f223e9c..9ee1bceb 100644 --- a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java +++ b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java @@ -36,7 +36,7 @@ public class BlockExtraBeeHive extends Block { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < 4; ++i) { itemList.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java b/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java index 7c848823..de8dc3df 100644 --- a/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java +++ b/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java @@ -12,7 +12,7 @@ public enum EnumHiveType { NETHER, MARBLE; - public List drops; + public final List drops; EnumHiveType() { drops = new ArrayList<>(); diff --git a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java index fd510127..07ddaa34 100644 --- a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java +++ b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java @@ -15,9 +15,9 @@ import forestry.api.genetics.IAllele; public class HiveDrop implements IHiveDrop { - private IAllele[] template; - private ArrayList additional; - private int chance; + private final IAllele[] template; + private final ArrayList additional; + private final int chance; public HiveDrop(IAlleleBeeSpecies species, int chance) { this(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID()), new ItemStack[0], chance); diff --git a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java index 4c51702b..35d4b1d3 100644 --- a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java @@ -25,7 +25,7 @@ public class ItemBeehive extends ItemBlock { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (int i = 0; i < 4; ++i) { list.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 7a49db04..9eb3dbdc 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -5,6 +5,7 @@ import net.minecraft.item.Item; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; @@ -32,7 +33,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; @Mod( modid = "ExtraTrees", name = "Extra Trees", - version = BinnieCore.VERSION, + version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore") public class ExtraTrees extends AbstractMod { @@ -101,7 +102,7 @@ public class ExtraTrees extends AbstractMod { } @Override - public Class[] getConfigs() { + public Class[] getConfigs() { return new Class[] { ConfigurationMain.class }; } diff --git a/src/main/java/binnie/extratrees/FakeWorld.java b/src/main/java/binnie/extratrees/FakeWorld.java index 74592e4b..7f0cb818 100644 --- a/src/main/java/binnie/extratrees/FakeWorld.java +++ b/src/main/java/binnie/extratrees/FakeWorld.java @@ -20,7 +20,7 @@ import sun.misc.Unsafe; public class FakeWorld extends World { - private static Unsafe unsafe; + private static final Unsafe unsafe; static { try { diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index bca3d30f..d40a8f41 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -40,7 +40,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { public static DoorType getDoorType(int tileMeta) { int type = (tileMeta & 0xF00) >> 8; - if (type >= 0 && type < DoorType.values().length) { + if (type < DoorType.values().length) { return DoorType.values()[type]; } return DoorType.STANDARD; @@ -226,7 +226,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { } @Override - public void addBlockTooltip(ItemStack stack, List tooltip) { + public void addBlockTooltip(ItemStack stack, List tooltip) { // ignored } @@ -236,7 +236,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { + public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { for (IPlankType type : PlankType.ExtraTreePlanks.values()) { itemList.add(WoodManager.getDoor(type, DoorType.STANDARD)); } diff --git a/src/main/java/binnie/extratrees/block/BlockETLog.java b/src/main/java/binnie/extratrees/block/BlockETLog.java index 7bd1c64e..53edd594 100644 --- a/src/main/java/binnie/extratrees/block/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/BlockETLog.java @@ -36,7 +36,7 @@ public class BlockETLog extends BlockLog implements IBlockMetadata { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int i = 0; i < ILogType.ExtraTreeLog.values().length; ++i) { list.add(TileEntityMetadata.getItemStack(this, i)); } @@ -85,11 +85,6 @@ public class BlockETLog extends BlockLog implements IBlockMetadata { ILogType.ExtraTreeLog.registerIcons(register); } - @Override - public int getRenderType() { - return 31; - } - @Override public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { dropBlockAsItem(world, x, y, z, itemStack); @@ -138,15 +133,10 @@ public class BlockETLog extends BlockLog implements IBlockMetadata { } @Override - public void addBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { // ignored } - @Override - public boolean canSustainLeaves(IBlockAccess world, int x, int y, int z) { - return true; - } - @Override public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) { return TileEntityMetadata.getItemDamage(itemStack); @@ -154,24 +144,11 @@ public class BlockETLog extends BlockLog implements IBlockMetadata { @Override public int onBlockPlaced(World world, int x, int y, int z, int side, float par6, float par7, float par8, int meta) { - byte b0 = 0; - switch (side) { - case 0: - case 1: - b0 = 0; - break; - - case 2: - case 3: - b0 = 8; - break; - - case 4: - case 5: - b0 = 4; - break; - } - return b0; + return switch (side) { + case 2, 3 -> 8; + case 4, 5 -> 4; + default -> 0; + }; } @Override @@ -180,11 +157,6 @@ public class BlockETLog extends BlockLog implements IBlockMetadata { world.removeTileEntity(x, y, z); } - @Override - public boolean isWood(IBlockAccess world, int x, int y, int z) { - return true; - } - @Override public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 20; diff --git a/src/main/java/binnie/extratrees/block/BlockETPlanks.java b/src/main/java/binnie/extratrees/block/BlockETPlanks.java index a57b37b7..1dc8603b 100644 --- a/src/main/java/binnie/extratrees/block/BlockETPlanks.java +++ b/src/main/java/binnie/extratrees/block/BlockETPlanks.java @@ -79,7 +79,7 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata { } @Override - public void addBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { // ignored } @@ -89,7 +89,7 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) { list.add(TileEntityMetadata.getItemStack(this, i)); } diff --git a/src/main/java/binnie/extratrees/block/BlockETSlab.java b/src/main/java/binnie/extratrees/block/BlockETSlab.java index 8a827e09..9fcc433e 100644 --- a/src/main/java/binnie/extratrees/block/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/BlockETSlab.java @@ -44,8 +44,8 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { @Override public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { - ArrayList drops = new ArrayList<>(); - drops.addAll(BlockMetadata.getBlockDropped((IBlockMetadata) ExtraTrees.blockSlab, world, x, y, z, blockMeta)); + ArrayList drops = new ArrayList<>( + BlockMetadata.getBlockDropped((IBlockMetadata) ExtraTrees.blockSlab, world, x, y, z, blockMeta)); if (field_150004_a) { drops.addAll( BlockMetadata.getBlockDropped((IBlockMetadata) ExtraTrees.blockSlab, world, x, y, z, blockMeta)); @@ -92,7 +92,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { } @Override - public void addBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { // ignored } @@ -102,7 +102,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { if (field_150004_a) { return; } diff --git a/src/main/java/binnie/extratrees/block/BlockETStairs.java b/src/main/java/binnie/extratrees/block/BlockETStairs.java index c1b18415..c8b97f54 100644 --- a/src/main/java/binnie/extratrees/block/BlockETStairs.java +++ b/src/main/java/binnie/extratrees/block/BlockETStairs.java @@ -42,7 +42,7 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) { list.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/binnie/extratrees/block/DoorType.java b/src/main/java/binnie/extratrees/block/DoorType.java index 371450d5..81600553 100644 --- a/src/main/java/binnie/extratrees/block/DoorType.java +++ b/src/main/java/binnie/extratrees/block/DoorType.java @@ -11,12 +11,12 @@ public enum DoorType { DOUBLE("double"), FULL("full"); - protected String id; - protected IIcon iconDoorLower; - protected IIcon iconDoorUpper; - protected IIcon iconDoorLowerFlip; - protected IIcon iconDoorUpperFlip; - protected IIcon iconItem; + final String id; + IIcon iconDoorLower; + IIcon iconDoorUpper; + IIcon iconDoorLowerFlip; + IIcon iconDoorUpperFlip; + IIcon iconItem; DoorType(String id) { this.id = id; diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index 18a31234..8dd7cd7d 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -18,8 +18,8 @@ public enum FruitPod implements IIconProvider { RedBanana, Papayimar; - protected short[] textures; - protected IIcon[] icons; + private final short[] textures; + private final IIcon[] icons; FruitPod() { textures = new short[] { BinnieCore.proxy.getUniqueTextureUID(), BinnieCore.proxy.getUniqueTextureUID(), diff --git a/src/main/java/binnie/extratrees/block/GateItemRenderer.java b/src/main/java/binnie/extratrees/block/GateItemRenderer.java index b6964286..87b19c61 100644 --- a/src/main/java/binnie/extratrees/block/GateItemRenderer.java +++ b/src/main/java/binnie/extratrees/block/GateItemRenderer.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; public class GateItemRenderer implements IItemRenderer { - private void renderStairBlock(RenderBlocks renderBlocks, ItemStack item, float f, float g, float h) { + private void renderStairBlock(RenderBlocks renderBlocks, ItemStack item) { Tessellator tessellator = Tessellator.instance; Block block = ((ItemBlock) item.getItem()).field_150939_a; for (int k = 0; k < 3; ++k) { @@ -22,7 +22,6 @@ public class GateItemRenderer implements IItemRenderer { if (k == 1) { renderBlocks.setRenderBounds(0.5f - f2, 0.30000001192092896, 1.0f - f2 * 2.0f, 0.5f + f2, 1.0, 1.0); } - f2 = 0.0625f; if (k == 2) { renderBlocks.setRenderBounds(0.5f - f2, 0.5, 0.0, 0.5f + f2, 1.0f - f2, 1.0); } @@ -87,13 +86,10 @@ public class GateItemRenderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED: - case INVENTORY: - return true; - } - return false; + return switch (type) { + case ENTITY, EQUIPPED, INVENTORY -> true; + default -> false; + }; } @Override @@ -106,15 +102,15 @@ public class GateItemRenderer implements IItemRenderer { public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) { switch (type) { case ENTITY: - renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderStairBlock((RenderBlocks) data[0], item); break; case EQUIPPED: - renderStairBlock((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); + renderStairBlock((RenderBlocks) data[0], item); break; case INVENTORY: - renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderStairBlock((RenderBlocks) data[0], item); break; } } diff --git a/src/main/java/binnie/extratrees/block/ILogType.java b/src/main/java/binnie/extratrees/block/ILogType.java index fd7fb63d..ff5da9ef 100644 --- a/src/main/java/binnie/extratrees/block/ILogType.java +++ b/src/main/java/binnie/extratrees/block/ILogType.java @@ -67,11 +67,11 @@ public interface ILogType { Cinnamon("cinnamon", 0x86583c, PlankType.VanillaPlanks.JUNGLE), PinkIvory("pinkivory", 0x7f6554, PlankType.ExtraTreePlanks.PinkIvory); - protected String name; - protected int color; - protected IDesignMaterial plank; - protected IIcon trunk; - protected IIcon bark; + private final String name; + private final int color; + private final IDesignMaterial plank; + private IIcon trunk; + private IIcon bark; ExtraTreeLog(String name, int color) { this.name = name; @@ -161,9 +161,9 @@ public interface ILogType { MAPLE(6, 2, 9078657), CITRUS(6, 3, 5983033); - protected int block; - protected int metadata; - protected int colour; + private final int block; + private final int metadata; + private final int colour; ForestryLog(int blockOffset, int meta, int colour) { block = blockOffset; @@ -197,7 +197,7 @@ public interface ILogType { Birch(6376752), Jungle(5456154); - protected int colour; + private final int colour; VanillaLog(int colour) { this.colour = colour; diff --git a/src/main/java/binnie/extratrees/block/ItemETDoor.java b/src/main/java/binnie/extratrees/block/ItemETDoor.java index 16ebcaac..1dc59c2d 100644 --- a/src/main/java/binnie/extratrees/block/ItemETDoor.java +++ b/src/main/java/binnie/extratrees/block/ItemETDoor.java @@ -46,10 +46,7 @@ public class ItemETDoor extends ItemMetadata { + (world.isBlockNormalCubeDefault(x + b0, y + 1, z + b2, false) ? 1 : 0); boolean flag = world.getBlock(x - b0, y, z - b2) == block || world.getBlock(x - b0, y + 1, z - b2) == block; boolean flag2 = world.getBlock(x + b0, y, z + b2) == block || world.getBlock(x + b0, y + 1, z + b2) == block; - boolean flag3 = false; - if (flag && !flag2 || j1 > i1) { - flag3 = true; - } + boolean flag3 = flag && !flag2 || j1 > i1; world.setBlock(x, y, z, block, meta, 2); world.setBlock(x, y + 1, z, block, 0x8 | (flag3 ? 1 : 0), 2); diff --git a/src/main/java/binnie/extratrees/block/ItemETSlab.java b/src/main/java/binnie/extratrees/block/ItemETSlab.java index eedec2d2..d089c9d2 100644 --- a/src/main/java/binnie/extratrees/block/ItemETSlab.java +++ b/src/main/java/binnie/extratrees/block/ItemETSlab.java @@ -13,9 +13,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemETSlab extends ItemMetadata { - private boolean isFullBlock; - private BlockETSlab theHalfSlab; - private BlockETSlab doubleSlab; + private final boolean isFullBlock; + private final BlockETSlab theHalfSlab; + private final BlockETSlab doubleSlab; public ItemETSlab(Block block) { super(block); @@ -54,11 +54,11 @@ public class ItemETSlab extends ItemMetadata { } return true; } - return func_77888_a(stack, player, world, x, y, z, meta) + return func_77888_a(stack, world, x, y, z, meta) || super.onItemUse(stack, player, world, x, y, z, meta, hitX, hitY, hitZ); } - private boolean func_77888_a(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) { + private boolean func_77888_a(ItemStack stack, World world, int x, int y, int z, int side) { if (side == 0) { y--; } else if (side == 1) { diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 7cd35f30..2a5db57f 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -125,9 +125,6 @@ public class ModuleBlocks implements IInitializable { ItemStack doorSplit = WoodManager.getDoor(plank2, DoorType.DOUBLE); ItemStack doorFull = WoodManager.getDoor(plank2, DoorType.FULL); if (planks2 != null) { - if (gate == null) { - continue; - } gate.stackSize = 1; GameRegistry.addRecipe(gate.copy(), "fpf", 'f', fenceNormal.copy(), 'p', planks2.copy()); fenceNormal.stackSize = 4; diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 8b751f12..8c399151 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -70,8 +70,8 @@ public class PlankType { Gingko(0xf4e7ba), PinkIvory(0xec8ca0); - protected int color; - protected IIcon icon; + private final int color; + private IIcon icon; ExtraTreePlanks(int color) { this.color = color; @@ -121,7 +121,7 @@ public class PlankType { ACACIA(0xba6337), DARKOAK(0x462d15); - protected int color; + private final int color; VanillaPlanks(int color) { this.color = color; @@ -192,7 +192,7 @@ public class PlankType { COCOBOLO(0x731302), ZEBRAWOOD(0xa6824e); - protected int color; + private final int color; ForestryPlanks(int color) { this.color = color; @@ -221,12 +221,10 @@ public class PlankType { @Override public IIcon getIcon() { - if (getStack() != null) { - int meta = getStack().getItemDamage(); - Block block = ((ItemBlock) getStack().getItem()).field_150939_a; - return block.getIcon(2, meta); - } - return null; + final ItemStack stack = getStack(); + final int meta = stack.getItemDamage(); + final Block block = ((ItemBlock) stack.getItem()).field_150939_a; + return block.getIcon(2, meta); } @Override @@ -243,7 +241,7 @@ public class PlankType { Fir(0x7e774a), Acacia(0xbfaa7e); - protected int color; + private final int color; ExtraBiomesPlank(int color) { this.color = color; @@ -274,9 +272,10 @@ public class PlankType { @Override public IIcon getIcon() { - if (getStack() != null) { - int meta = getStack().getItemDamage(); - Block block = ((ItemBlock) getStack().getItem()).field_150939_a; + final ItemStack stack = getStack(); + if (stack != null) { + int meta = stack.getItemDamage(); + Block block = ((ItemBlock) stack.getItem()).field_150939_a; return block.getIcon(2, meta); } return null; diff --git a/src/main/java/binnie/extratrees/block/StairItemRenderer.java b/src/main/java/binnie/extratrees/block/StairItemRenderer.java index bf270f8d..b1833e39 100644 --- a/src/main/java/binnie/extratrees/block/StairItemRenderer.java +++ b/src/main/java/binnie/extratrees/block/StairItemRenderer.java @@ -56,13 +56,10 @@ public class StairItemRenderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED: - case INVENTORY: - return true; - } - return false; + return switch (type) { + case ENTITY, EQUIPPED, INVENTORY -> true; + default -> false; + }; } @Override diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 859c58e7..4243b963 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -30,7 +30,7 @@ public class WoodManager { public static int getPlankTypeIndex(IPlankType type) { int index = CarpentryManager.carpentryInterface.getCarpentryWoodIndex(type); - return (index < 0) ? 0 : index; + return Math.max(index, 0); } public static FenceType getFenceType(ItemStack stack) { diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index 37653c61..4e749484 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -41,7 +41,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (IFenceProvider type : PlankType.ExtraTreePlanks.values()) { list.add(type.getFence()); } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockGate.java b/src/main/java/binnie/extratrees/block/decor/BlockGate.java index 3a13a04a..5ad5be53 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockGate.java @@ -36,12 +36,10 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) { for (IPlankType type : WoodManager.getAllPlankTypes()) { ItemStack gate = WoodManager.getGate(type); - if (gate != null) { - itemList.add(gate); - } + itemList.add(gate); } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java index af605865..e201b892 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java @@ -41,7 +41,7 @@ public class BlockHedge extends Block implements IBlockFence { } @Override - public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { boolean connectNegZ = canConnectFenceTo(world, x, y, z - 1); boolean connectPosZ = canConnectFenceTo(world, x, y, z + 1); @@ -166,7 +166,7 @@ public class BlockHedge extends Block implements IBlockFence { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int i = 0; i < 6; ++i) { for (int f = 0; f < 2; ++f) { list.add(new ItemStack(item, 1, i + f * 8)); diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 7ffe9076..a978346e 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -21,7 +21,7 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (FenceType type : FenceType.values()) { list.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1)); } diff --git a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java b/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java index 988d12d0..1187f691 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java @@ -145,8 +145,8 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler { float i = 0.0625f; FenceType fenceType = new FenceType(0); TileEntity tile = world.getTileEntity(x, y, z); - if (tile != null && tile instanceof TileEntityMetadata && block instanceof BlockMultiFence) { - fenceType = WoodManager.getFenceType(((TileEntityMetadata) tile).getTileMetadata()); + if (tile instanceof TileEntityMetadata tileMeta && block instanceof BlockMultiFence) { + fenceType = WoodManager.getFenceType(tileMeta.getTileMetadata()); } boolean rendered; @@ -203,13 +203,11 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler { if (connectAnyX) { renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos); renderer.renderStandardBlock(blockFence, x, y, z); - rendered = true; } if (connectAnyZ) { renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ); renderer.renderStandardBlock(blockFence, x, y, z); - rendered = true; } if (renderBottom) { @@ -221,12 +219,10 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler { if (connectAnyX) { renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos); renderer.renderStandardBlock(blockFence, x, y, z); - rendered = true; } if (connectAnyZ) { renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ); renderer.renderStandardBlock(blockFence, x, y, z); - rendered = true; } } @@ -237,12 +233,10 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler { if (connectAnyX) { renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos); renderer.renderStandardBlock(blockFence, x, y, z); - rendered = true; } if (connectAnyZ) { renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ); renderer.renderStandardBlock(blockFence, x, y, z); - rendered = true; } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 146ba89a..e1f2c37f 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -26,7 +26,7 @@ public class MultiFenceRecipeEmbedded implements IRecipe { type = WoodManager.getFenceType(a); FenceType type2 = WoodManager.getFenceType(c); - if (type == null || type2 == null || !type.equals(type2)) { + if (type == null || !type.equals(type2)) { continue; } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 8ead5ce9..6f343cb1 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -26,7 +26,7 @@ public class MultiFenceRecipeSolid implements IRecipe { type = WoodManager.getFenceType(a); FenceType type2 = WoodManager.getFenceType(b); FenceType type3 = WoodManager.getFenceType(c); - if (type == null || type2 == null || type3 == null || !type.equals(type2) || !type.equals(type3)) { + if (type == null || !type.equals(type2) || !type.equals(type3)) { continue; } diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java index b2f055b6..763c9a26 100644 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java +++ b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java @@ -7,7 +7,6 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class NBTShapedRecipe implements IRecipe { @@ -15,11 +14,10 @@ public class NBTShapedRecipe implements IRecipe { public int recipeWidth; public int recipeHeight; public ItemStack[] recipeItems; - private ItemStack recipeOutput; - private boolean field_92101_f; + private final ItemStack recipeOutput; public NBTShapedRecipe(ItemStack stack, Object... p_92103_2_) { - String s = ""; + StringBuilder s = new StringBuilder(); int i = 0; int j = 0; int k = 0; @@ -29,18 +27,18 @@ public class NBTShapedRecipe implements IRecipe { for (String s2 : astring) { k++; j = s2.length(); - s += s2; + s.append(s2); } } else { while (p_92103_2_[i] instanceof String) { String s3 = (String) p_92103_2_[i++]; ++k; j = s3.length(); - s += s3; + s.append(s3); } } - HashMap hashmap = new HashMap(); + HashMap hashmap = new HashMap<>(); while (i < p_92103_2_.length) { Character character = (Character) p_92103_2_[i]; ItemStack itemstack1 = null; @@ -130,17 +128,7 @@ public class NBTShapedRecipe implements IRecipe { @Override public ItemStack getCraftingResult(InventoryCrafting crafting) { - ItemStack itemstack = getRecipeOutput().copy(); - // todo unused code? - if (field_92101_f) { - for (int i = 0; i < crafting.getSizeInventory(); ++i) { - ItemStack itemstack2 = crafting.getStackInSlot(i); - if (itemstack2 != null && itemstack2.hasTagCompound()) { - itemstack.setTagCompound((NBTTagCompound) itemstack2.stackTagCompound.copy()); - } - } - } - return itemstack; + return getRecipeOutput().copy(); } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index 5d8c86e3..af7f649e 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -38,7 +38,7 @@ public class BlockCarpentryPanel extends BlockCarpentry { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { // ignored } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index ada65b17..b27e5133 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -55,28 +55,27 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo int x = event.x; int y = event.y; int z = event.z; - if (!(world.getBlock(x, y, z) instanceof BlockDesign)) { + if (!(world.getBlock(x, y, z) instanceof BlockDesign blockDesign)) { return; } - BlockDesign blockC = (BlockDesign) world.getBlock(x, y, z); ItemStack item = player.getHeldItem(); if (item == null || !(item.getItem() instanceof IToolHammer) || !((IToolHammer) item.getItem()).isActive(item)) { return; } - DesignBlock block = blockC.getCarpentryBlock(world, x, y, z); + DesignBlock carpentryBlock = blockDesign.getCarpentryBlock(world, x, y, z); TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z); - block.rotate(event.face, item, player, world, x, y, z); - int meta = block.getBlockMetadata(blockC.getDesignSystem()); + carpentryBlock.rotate(event.face, item, player, world, x, y, z); + int meta = carpentryBlock.getBlockMetadata(blockDesign.getDesignSystem()); tile.setTileMetadata(meta, true); } public abstract ItemStack getCreativeStack(IDesign design); @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (IDesign design : CarpentryManager.carpentryInterface.getSortedDesigns()) { list.add(getCreativeStack(design)); } @@ -126,7 +125,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } @Override - public void addBlockTooltip(ItemStack stack, List tooltip) { + public void addBlockTooltip(ItemStack stack, List tooltip) { DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { tooltip.add( diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 6ff46b3b..e4d0cadb 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -65,7 +65,7 @@ public class BlockStainedDesign extends BlockDesign { } @Override - public void addBlockTooltip(ItemStack stack, List tooltip) { + public void addBlockTooltip(ItemStack stack, List tooltip) { DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { tooltip.add( diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index 4e9e0821..4c0de9b9 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -82,7 +82,7 @@ public class CarpentryInterface implements ICarpentryInterface { public Collection getAllDesignCategories() { List categories = new ArrayList<>(); for (IDesignCategory category : CarpentryInterface.designCategories.values()) { - if (category.getDesigns().size() > 0) { + if (!category.getDesigns().isEmpty()) { categories.add(category); } } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index fd034890..f8f69cb6 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -119,31 +119,14 @@ public class DesignBlock { adjustedDir = adjustedDir.getRotation(ForgeDirection.DOWN); } - ILayout layout; - switch (adjustedDir) { - case EAST: - layout = getDesign().getEastPattern(); - break; - - case NORTH: - layout = getDesign().getNorthPattern(); - break; - - case SOUTH: - layout = getDesign().getSouthPattern(); - break; - - case WEST: - layout = getDesign().getWestPattern(); - break; - - case DOWN: - layout = getDesign().getBottomPattern(); - break; - - default: - layout = getDesign().getTopPattern(); - } + ILayout layout = switch (adjustedDir) { + case EAST -> getDesign().getEastPattern(); + case NORTH -> getDesign().getNorthPattern(); + case SOUTH -> getDesign().getSouthPattern(); + case WEST -> getDesign().getWestPattern(); + case DOWN -> getDesign().getBottomPattern(); + default -> getDesign().getTopPattern(); + }; // TODO remove label Label_1107: { diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index ef9ecef1..799f7b78 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -22,8 +22,8 @@ public enum DesignSystem implements IDesignSystem { Wood, Glass; - protected Map primary; - protected Map secondary; + private final Map primary; + private final Map secondary; DesignSystem() { primary = new HashMap<>(); @@ -33,85 +33,57 @@ public enum DesignSystem implements IDesignSystem { @Override public IDesignMaterial getDefaultMaterial() { - switch (this) { - case Glass: - return GlassType.get(0); - - case Wood: - return PlankType.ExtraTreePlanks.Fir; - } - return null; + return switch (this) { + case Glass -> GlassType.get(0); + case Wood -> PlankType.ExtraTreePlanks.Fir; + }; } @Override public IDesignMaterial getDefaultMaterial2() { - switch (this) { - case Glass: - return GlassType.get(1); - - case Wood: - return PlankType.ExtraTreePlanks.Whitebeam; - } - return null; + return switch (this) { + case Glass -> GlassType.get(1); + case Wood -> PlankType.ExtraTreePlanks.Whitebeam; + }; } @Override public IDesignMaterial getMaterial(int id) { - switch (this) { - case Glass: - return GlassType.get(id); - - case Wood: - return CarpentryManager.carpentryInterface.getWoodMaterial(id); - } - return null; + return switch (this) { + case Glass -> GlassType.get(id); + case Wood -> CarpentryManager.carpentryInterface.getWoodMaterial(id); + }; } @Override public int getMaterialIndex(IDesignMaterial id) { - switch (this) { - case Glass: - return GlassType.getIndex(id); - - case Wood: - return CarpentryManager.carpentryInterface.getCarpentryWoodIndex(id); - } - return 0; + return switch (this) { + case Glass -> GlassType.getIndex(id); + case Wood -> CarpentryManager.carpentryInterface.getCarpentryWoodIndex(id); + }; } public String getTexturePath() { - switch (this) { - case Glass: - return "glass"; - - case Wood: - return "patterns"; - } - return ""; + return switch (this) { + case Glass -> "glass"; + case Wood -> "patterns"; + }; } @Override public IDesignMaterial getMaterial(ItemStack stack) { - switch (this) { - case Glass: - return GlassType.get(stack); - - case Wood: - return CarpentryManager.carpentryInterface.getWoodMaterial(stack); - } - return null; + return switch (this) { + case Glass -> GlassType.get(stack); + case Wood -> CarpentryManager.carpentryInterface.getWoodMaterial(stack); + }; } @Override public ItemStack getAdhesive() { - switch (this) { - case Glass: - return ExtraTreeItems.GlassFitting.get(1); - - case Wood: - return ExtraTreeItems.WoodWax.get(1); - } - return null; + return switch (this) { + case Glass -> ExtraTreeItems.GlassFitting.get(1); + case Wood -> ExtraTreeItems.WoodWax.get(1); + }; } @Override @@ -132,7 +104,7 @@ public enum DesignSystem implements IDesignSystem { @Override public void registerIcons(IIconRegister register) { - for (EnumPattern pattern : EnumPattern.values()) { + for (final EnumPattern pattern : EnumPattern.VALUES) { primary.put( pattern.ordinal(), BinnieCore.proxy.getIcon( diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java index 1cf53dc5..a1f32afb 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java @@ -311,13 +311,13 @@ public enum EnumDesign implements IDesign { EnumDesign.OverlappedBarred.setTopPattern(EnumPattern.OverlappedBarred.layout()); } - protected String name; - protected ILayout topPattern; - protected ILayout bottomPattern; - protected ILayout northPattern; - protected ILayout southPattern; - protected ILayout eastPattern; - protected ILayout westPattern; + private String name; + private ILayout topPattern; + private ILayout bottomPattern; + private ILayout northPattern; + private ILayout southPattern; + private ILayout eastPattern; + private ILayout westPattern; EnumDesign(String name) { this.name = name; diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java b/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java index 4d5c42ff..142d045b 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java @@ -17,8 +17,8 @@ public enum EnumDesignCategory implements IDesignCategory { Letters("letters"), Diagonal("diagonals"); - protected String name; - protected List designs; + private final String name; + private final List designs; EnumDesignCategory(String name) { this.name = name; diff --git a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java index 2582e263..762edadb 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java @@ -406,8 +406,9 @@ public enum EnumPattern implements IPattern { EnumPattern.OverlappedSplitBarred2.setLeftRotation(EnumPattern.OverlappedSplitBarred, false); } - protected ILayout leftRotation; - protected ILayout horizontalFlip; + private ILayout leftRotation; + private ILayout horizontalFlip; + public static final EnumPattern[] VALUES = values(); EnumPattern() { leftRotation = Layout.get(this, false); @@ -506,7 +507,7 @@ public enum EnumPattern implements IPattern { return horizontalFlip; } - protected void setLeftRotation(EnumPattern pattern, boolean inverted) { + private void setLeftRotation(EnumPattern pattern, boolean inverted) { leftRotation = Layout.get(pattern, inverted); } diff --git a/src/main/java/binnie/extratrees/carpentry/GlassType.java b/src/main/java/binnie/extratrees/carpentry/GlassType.java index e64900c7..e8b5694d 100644 --- a/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -98,8 +98,8 @@ public class GlassType implements IDesignMaterial { Red("Red", new Color(0x993333)), Black("Black", new Color(0x191919)); - protected String name; - protected int color; + private final String name; + private final int color; StandardColor(String name, Color color) { this.name = name; diff --git a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java index 1f749484..be31347d 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java @@ -11,18 +11,18 @@ public enum ExtraTreeTexture implements IBinnieTexture { Gui(ResourceType.GUI, "gui"), Nursery(ResourceType.Tile, "Nursery"); - public static String carpenterTexture = "extratrees/carpenter_"; - public static String panelerTexture = "extratrees/paneler_"; - public static String tileworkerTexture = "extratrees/tileworker_"; - public static String incubatorTexture = "extratrees/incubator_"; - public static String lumbermillTexture = "extratrees/sawmill_"; - public static String pressTexture = "extratrees/press_"; - public static String distilleryTexture = "extratrees/distillery_"; - public static String breweryTexture = "extratrees/brewery_"; - public static String infuserTexture = "extratrees/infuser_"; + public static final String carpenterTexture = "extratrees/carpenter_"; + public static final String panelerTexture = "extratrees/paneler_"; + public static final String tileworkerTexture = "extratrees/tileworker_"; + public static final String incubatorTexture = "extratrees/incubator_"; + public static final String lumbermillTexture = "extratrees/sawmill_"; + public static final String pressTexture = "extratrees/press_"; + public static final String distilleryTexture = "extratrees/distillery_"; + public static final String breweryTexture = "extratrees/brewery_"; + public static final String infuserTexture = "extratrees/infuser_"; - protected String texture; - protected ResourceType type; + private final String texture; + private final ResourceType type; ExtraTreeTexture(ResourceType base, String texture) { this.texture = texture; diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index 61469fbb..02ce5dee 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -34,29 +34,15 @@ public enum ExtraTreesGUID implements IBinnieGUID { if (tileEntity instanceof IInventory) { object = (IInventory) tileEntity; } - switch (this) { - case Database: - case DatabaseNEI: - window = WindowArboristDatabase.create(player, side, this != ExtraTreesGUID.Database); - break; - - case Woodworker: - window = WindowWoodworker.create(player, object, side); - break; - - case Lumbermill: - window = WindowLumbermill.create(player, object, side); - break; - - case MothDatabase: - case MothDatabaseNEI: - window = WindowLepidopteristDatabase.create(player, side, this != ExtraTreesGUID.MothDatabase); - break; - - case SetSquare: - window = WindowSetSquare.create(player, world, x, y, z, side); - break; - } + window = switch (this) { + case Database, DatabaseNEI -> WindowArboristDatabase.create(player, side, this != ExtraTreesGUID.Database); + case Woodworker -> WindowWoodworker.create(player, object, side); + case Lumbermill -> WindowLumbermill.create(player, object, side); + case MothDatabase, MothDatabaseNEI -> WindowLepidopteristDatabase + .create(player, side, this != ExtraTreesGUID.MothDatabase); + case SetSquare -> WindowSetSquare.create(player, world, x, y, z, side); + default -> window; + }; return window; } } diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index e3902b96..4822f4f2 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -54,8 +54,7 @@ public class ModuleCore implements IInitializable { Queue fruitQueue = new LinkedList<>(); Collections.addAll(fruitQueue, ExtraTreeFruitGene.values()); - Queue designQueue = new LinkedList<>(); - designQueue.addAll(CarpentryManager.carpentryInterface.getSortedDesigns()); + Queue designQueue = new LinkedList<>(CarpentryManager.carpentryInterface.getSortedDesigns()); fruitQueue.remove(ExtraTreeFruitGene.Apple); outputSpecies.println(""); diff --git a/src/main/java/binnie/extratrees/craftgui/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/craftgui/ControlRecipeSlot.java index 6cdf127a..03f525d3 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlRecipeSlot.java @@ -31,7 +31,7 @@ public class ControlRecipeSlot extends ControlSlotBase { @Override public void onEvent(EventMouse.Down event) { TileEntity tile = (TileEntity) Window.get(getWidget()).getInventory(); - if (tile == null || !(tile instanceof TileEntityMachine)) { + if (!(tile instanceof TileEntityMachine)) { return; } diff --git a/src/main/java/binnie/extratrees/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/craftgui/ControlSlotFluid.java index dfea5003..1f81323a 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlSlotFluid.java @@ -40,7 +40,6 @@ public class ControlSlotFluid extends Control implements ITooltip { @Override public void onRenderBackground() { - int size = (int) getSize().x(); CraftGUI.render.texture(CraftGUITexture.Slot, getArea()); if (getSuperParent().getMousedOverWidget() == this) { CraftGUI.render.gradientRect( diff --git a/src/main/java/binnie/extratrees/craftgui/ControlTankSlot.java b/src/main/java/binnie/extratrees/craftgui/ControlTankSlot.java index 7353cd76..f3ee3966 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlTankSlot.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlTankSlot.java @@ -13,7 +13,6 @@ public class ControlTankSlot extends ControlSlotFluid { public ControlTankSlot(IWidget parent, int x, int y, int i) { super(parent, x, y, null); - tankID = 0; tankID = i; addSelfEventHandler(new EventMouse.Down.Handler() { diff --git a/src/main/java/binnie/extratrees/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/craftgui/ControlTileSelect.java index 0904b621..6d2fc338 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlTileSelect.java @@ -156,7 +156,7 @@ public class ControlTileSelect extends Control implements IControlValue public void onRenderForeground() { ItemStack image = ((WindowWoodworker) getSuperParent()).getDesignerType().getDisplayStack(getValue()); CraftGUI.render.item(new IPoint(1.0f, 1.0f), image); - if (((IControlValue) getParent()).getValue() == getValue()) { + if (((IControlValue) getParent()).getValue() == getValue()) { return; } diff --git a/src/main/java/binnie/extratrees/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/craftgui/PagePlanksOverview.java index 05940921..256e5cea 100644 --- a/src/main/java/binnie/extratrees/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/craftgui/PagePlanksOverview.java @@ -43,17 +43,11 @@ public class PagePlanksOverview extends PageAbstract { ItemStack fence = WoodManager.getFence(type, new FenceType(0), 1); ItemStack gate = WoodManager.getGate(type); ItemStack door = WoodManager.getDoor(type, DoorType.STANDARD); - if (fence != null) { - new ControlItemDisplay(this, x, 48.0f).setItemStack(fence); - x += 22; - } - if (gate != null) { - new ControlItemDisplay(this, x, 48.0f).setItemStack(gate); - x += 22; - } - if (door != null) { - new ControlItemDisplay(this, x, 48.0f).setItemStack(door); - } + new ControlItemDisplay(this, x, 48.0f).setItemStack(fence); + x += 22; + new ControlItemDisplay(this, x, 48.0f).setItemStack(gate); + x += 22; + new ControlItemDisplay(this, x, 48.0f).setItemStack(door); } ControlText controlDescription = new ControlText( @@ -71,22 +65,22 @@ public class PagePlanksOverview extends PageAbstract { desc = type.getDescription(); } - String descBody = EnumChatFormatting.ITALIC.toString(); + StringBuilder descBody = new StringBuilder(EnumChatFormatting.ITALIC.toString()); String descSig = ""; if (desc == null || desc.isEmpty() || desc.matches("(\\w+\\.?)+")) { - descBody += I18N.localise("binniecore.gui.database.nodescription"); + descBody.append(I18N.localise("binniecore.gui.database.nodescription")); } else { String[] descStrings = desc.split("\\|"); - descBody += descStrings[0]; + descBody.append(descStrings[0]); for (int i = 1; i < descStrings.length - 1; ++i) { - descBody = descBody + " " + descStrings[i]; + descBody.append(" ").append(descStrings[i]); } if (descStrings.length > 1) { descSig += descStrings[descStrings.length - 1]; } } - controlDescription.setValue(descBody + EnumChatFormatting.RESET); + controlDescription.setValue(descBody.toString() + EnumChatFormatting.RESET); controlSignature.setValue(descSig + EnumChatFormatting.RESET); float descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x()); controlSignature.setPosition( diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 66b503a7..9ad7e2bb 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -58,14 +58,14 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { public IClassification branch; - protected String name; - protected String branchName; - protected String scientific; - protected BinnieResource texture; - protected int color; + private final String name; + final String branchName; + private final String scientific; + private final BinnieResource texture; + private final int color; - private Map butterflyLoot; - private Map caterpillarLoot; + private final Map butterflyLoot; + private final Map caterpillarLoot; ButterflySpecies(String name, String scientific, Color color) { this.name = name; diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java index 63394f00..02355ffa 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java @@ -7,9 +7,9 @@ public enum ExtraTreeFruitFamily implements IFruitFamily { Berry("Berries", "berry", "berri"), Citrus("Citrus", "citrus", "citrus"); - protected String name; - protected String uid; - protected String scientific; + private final String name; + private final String uid; + private final String scientific; ExtraTreeFruitFamily(String name, String uid, String scientific) { this.name = name; diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index a76d6697..384e507a 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -95,17 +95,17 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { Gooseberry(8, 0xb99f50, 0xb9cf50, FruitSprite.Tiny), GoldenRaspberry(8, 0xbeb03b, 0xf3b03b, FruitSprite.Tiny); - protected IFruitFamily family; - protected boolean isRipening; - protected int diffR; - protected int diffG; - protected int diffB; - protected FruitPod pod; - protected int ripeningPeriod; - protected int colorUnripe; - protected int color; - protected FruitSprite index; - protected HashMap products; + private IFruitFamily family; + private boolean isRipening; + private int diffR; + private int diffG; + private int diffB; + private final FruitPod pod; + private int ripeningPeriod; + private int colorUnripe; + private int color; + private FruitSprite index; + final HashMap products; ExtraTreeFruitGene(int time, int unripe, int color, FruitSprite index) { this.color = color; diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index a2fd02a7..521b0246 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -24,10 +24,10 @@ public class ExtraTreeMutation implements ITreeMutation { protected IAlleleTreeSpecies allele1; protected IAllele[] template; - private float minTemperature; - private float maxTemperature; - private float minRainfall; - private float maxRainfall; + private final float minTemperature; + private final float maxTemperature; + private final float minRainfall; + private final float maxRainfall; private float height; public ExtraTreeMutation(IAllele allele0, IAllele allele1, IAllele result, int chance) { diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index 4380f4c0..edc0f62f 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -89,7 +89,6 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IGermlingIconProvider; -import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenerator; import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; @@ -233,19 +232,19 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm DwarfHazel("Corylus", "americana", 0x9bb552, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenShrub.class); - public ILogType wood; + public final ILogType wood; - protected ArrayList families; - protected int girth; - protected Class gen; - protected IAlleleFruit fruit; - protected IAllele[] template; - protected int color; - protected String binomial; - protected String uid; - protected String branchName; - protected IClassification branch; - protected int colorPollineted; + private final ArrayList families; + private final int girth; + private Class gen; + private final IAlleleFruit fruit; + private IAllele[] template; + private final int color; + private final String binomial; + private final String uid; + final String branchName; + IClassification branch; + private final int colorPollineted; private LeafType leafType; private SaplingType saplingType; @@ -816,7 +815,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm return new WorldGenDefault(tree); } - protected ExtraTreeSpecies setLeafType(LeafType type) { + private ExtraTreeSpecies setLeafType(LeafType type) { leafType = type; if (leafType == LeafType.CONIFER) { saplingType = SaplingType.CONIFER; @@ -828,7 +827,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm return this; } - protected ExtraTreeSpecies setSaplingType(SaplingType saplingType) { + private ExtraTreeSpecies setSaplingType(SaplingType saplingType) { this.saplingType = saplingType; return this; } @@ -886,7 +885,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm return this; } - public int getLeafColor(ITree tree) { + public int getLeafColor() { return color; } @@ -935,9 +934,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm return 0.0f; } - if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene) { - ExtraTreeFruitGene fruit = (ExtraTreeFruitGene) template[EnumTreeChromosome.FRUITS.ordinal()]; - for (ItemStack stack : fruit.products.keySet()) { + if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene fruitGene) { + for (ItemStack stack : fruitGene.products.keySet()) { if (stack.isItemEqual(itemstack)) { return 1.0f; } @@ -971,7 +969,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm ItemStack research = null; if (world.rand.nextFloat() < 10.0f / bountyLevel) { Collection combinations = getRoot().getCombinations(this); - if (combinations.size() > 0) { + if (!combinations.isEmpty()) { IMutation[] candidates = combinations.toArray(new IMutation[0]); research = AlleleManager.alleleRegistry .getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)]); @@ -982,9 +980,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm bounty.add(research); } - if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene) { - ExtraTreeFruitGene fruit = (ExtraTreeFruitGene) template[EnumTreeChromosome.FRUITS.ordinal()]; - for (ItemStack stack : fruit.products.keySet()) { + if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene fruitGene) { + for (ItemStack stack : fruitGene.products.keySet()) { ItemStack stack2 = stack.copy(); stack2.stackSize = world.rand.nextInt((int) (bountyLevel / 2.0f)) + 1; bounty.add(stack2); @@ -998,14 +995,14 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm public int getGermlingColour(EnumGermlingType type, int renderPass) { if (type == EnumGermlingType.SAPLING) { if (renderPass == 0) { - return getLeafColor(null); + return getLeafColor(); } if (getLog() == null) { return 0xffffff; } return getLog().getColour(); } - return getLeafColor(null); + return getLeafColor(); } @Override @@ -1033,7 +1030,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm highest = otherAdvance; } } - return own + ((highest < 0) ? 0 : highest); + return own + highest; } @Override diff --git a/src/main/java/binnie/extratrees/genetics/FruitSprite.java b/src/main/java/binnie/extratrees/genetics/FruitSprite.java index 1033cf9f..6dcd67e6 100644 --- a/src/main/java/binnie/extratrees/genetics/FruitSprite.java +++ b/src/main/java/binnie/extratrees/genetics/FruitSprite.java @@ -19,7 +19,7 @@ public enum FruitSprite implements IIconProvider { Larger, Pear; - protected BinnieIcon icon; + private BinnieIcon icon; public short getIndex() { return (short) (ordinal() + 4200); diff --git a/src/main/java/binnie/extratrees/genetics/LeafType.java b/src/main/java/binnie/extratrees/genetics/LeafType.java index ade49619..6fee3c05 100644 --- a/src/main/java/binnie/extratrees/genetics/LeafType.java +++ b/src/main/java/binnie/extratrees/genetics/LeafType.java @@ -9,10 +9,10 @@ public enum LeafType { MAPLE((short) 30, (short) 31, (short) 32, "Maple"), PALM((short) 35, (short) 36, (short) 37, "Palm"); - public short fancyUID; - public short plainUID; - public short changedUID; - public String description; + public final short fancyUID; + public final short plainUID; + public final short changedUID; + public final String description; LeafType(short fancyUID, short plainUID, short changedUID, String description) { this.fancyUID = fancyUID; diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 7f2eb141..39ce1114 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -88,7 +88,7 @@ public class ModuleGenetics implements IInitializable { if (set2.contains(clss.getScientific().toLowerCase())) { String nextLevel = ""; int index = set2.indexOf(clss.getScientific().toLowerCase()) + 1; - while (nextLevel.length() == 0) { + while (nextLevel.isEmpty()) { try { nextLevel = set2.get(index++); } catch (IndexOutOfBoundsException ex) { diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index e8aadcd9..62a8cc8e 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -19,9 +19,9 @@ public enum ExtraTreeItems implements IItemMisc { WoodWax("woodWax"), GlassFitting("glassFitting"); - protected String name; - protected String iconPath; - protected IIcon icon; + private final String name; + private final String iconPath; + private IIcon icon; ExtraTreeItems(String name) { this.name = name; @@ -39,7 +39,7 @@ public enum ExtraTreeItems implements IItemMisc { } @Override - public void addInformation(List tooltip) { + public void addInformation(List tooltip) { // ignored } diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java index bfe4eaed..c60b0567 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java @@ -17,11 +17,11 @@ public enum ExtraTreeLiquid implements ILiquidType { Latex("latex", 0xd8dbc9), Turpentine("turpentine", 0x79533a); - public String name; + public final String name; - protected String ident; - protected IIcon icon; - protected int color; + private final String ident; + private IIcon icon; + private final int color; ExtraTreeLiquid(String name, int color) { this.name = name; diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index ce98f71d..f8b535a7 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -79,13 +79,9 @@ public enum Food implements IItemMisc { Starfruit(2), Candlenut(0); - protected IIcon icon; - protected int hunger; - private List ores; - - Food() { - this(0); - } + private IIcon icon; + private final int hunger; + private final List ores; Food(int hunger) { ores = new ArrayList<>(); @@ -188,7 +184,7 @@ public enum Food implements IItemMisc { } @Override - public void addInformation(List tooltip) { + public void addInformation(List tooltip) { // ignored } diff --git a/src/main/java/binnie/extratrees/item/ItemDictionary.java b/src/main/java/binnie/extratrees/item/ItemDictionary.java index 6252ae06..822faff5 100644 --- a/src/main/java/binnie/extratrees/item/ItemDictionary.java +++ b/src/main/java/binnie/extratrees/item/ItemDictionary.java @@ -42,16 +42,16 @@ public class ItemDictionary extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List toltip, boolean advanced) { - super.addInformation(stack, player, toltip, advanced); + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); if (stack.getItemDamage() > 0) { - toltip.add(I18N.localise("extratrees.item.database.tooltip")); + tooltip.add(I18N.localise("extratrees.item.database.tooltip")); } } @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); list.add(new ItemStack(item, 1, 1)); } diff --git a/src/main/java/binnie/extratrees/item/ItemFood.java b/src/main/java/binnie/extratrees/item/ItemFood.java index e08f075d..712914e0 100644 --- a/src/main/java/binnie/extratrees/item/ItemFood.java +++ b/src/main/java/binnie/extratrees/item/ItemFood.java @@ -28,7 +28,7 @@ public class ItemFood extends net.minecraft.item.ItemFood { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (IItemMisc itemMisc : items) { if (itemMisc.isActive()) { list.add(getStack(itemMisc, 1)); @@ -46,7 +46,7 @@ public class ItemFood extends net.minecraft.item.ItemFood { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); IItemMisc item = getItem(stack.getItemDamage()); if (item != null) { diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 9f31e700..783e27ee 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -17,7 +17,6 @@ public class ItemHammer extends Item implements IToolHammer { protected boolean isDurableHammer; public ItemHammer(boolean durable) { - isDurableHammer = false; isDurableHammer = durable; setCreativeTab(CreativeTabs.tabTools); setUnlocalizedName(durable ? "durableHammer" : "hammer"); diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 978d33f3..46c056c2 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -42,7 +42,7 @@ public class ItemMothDatabase extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); if (stack.getItemDamage() > 0) { tooltip.add(I18N.localise("extratrees.item.mothDatabase.tooltip")); @@ -51,7 +51,7 @@ public class ItemMothDatabase extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); list.add(new ItemStack(item, 1, 1)); } diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index 5d63c9ca..b24733f5 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -92,7 +92,7 @@ public enum ExtraTreeMachine implements IMachineType { @Override public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { - MachineRendererForestry.renderMachine(textureName.getShortPath(), x, y, z, partialTick); + MachineRendererForestry.renderMachine(textureName.getShortPath(), x, y, z); } } } diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java index 84127f10..54cb502b 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java @@ -13,7 +13,7 @@ public class MachineRendererForestry { static Map instances = new HashMap<>(); static Method renderMethod; - private static void loadMethod(String file, boolean waterTank, boolean productTank) { + private static void loadMethod(String file) { try { Class cls = Class.forName("forestry.core.render.RenderMachine"); Object instance = cls.getConstructor(String.class).newInstance(file); @@ -32,9 +32,9 @@ public class MachineRendererForestry { } } - public static void renderMachine(String name, double x, double y, double z, float var8) { + public static void renderMachine(String name, double x, double y, double z) { if (!MachineRendererForestry.instances.containsKey(name)) { - loadMethod(name, false, false); + loadMethod(name); } try { diff --git a/src/main/java/binnie/extratrees/machines/designer/CarpenterPackage.java b/src/main/java/binnie/extratrees/machines/designer/CarpenterPackage.java index f1dccdaa..0a5e30b3 100644 --- a/src/main/java/binnie/extratrees/machines/designer/CarpenterPackage.java +++ b/src/main/java/binnie/extratrees/machines/designer/CarpenterPackage.java @@ -8,7 +8,7 @@ import binnie.extratrees.machines.ExtraTreeMachine; public abstract class CarpenterPackage extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { - private DesignerType type; + private final DesignerType type; public CarpenterPackage(DesignerType type) { super(type.name, type.texture, false); diff --git a/src/main/java/binnie/extratrees/machines/designer/DesignerType.java b/src/main/java/binnie/extratrees/machines/designer/DesignerType.java index 2f9bc4f5..d9866253 100644 --- a/src/main/java/binnie/extratrees/machines/designer/DesignerType.java +++ b/src/main/java/binnie/extratrees/machines/designer/DesignerType.java @@ -24,8 +24,8 @@ public enum DesignerType { GLASSWORKER(ExtraTreeTexture.panelerTexture), TILEWORKER(ExtraTreeTexture.tileworkerTexture); - public String name; - public String texture; + public final String name; + public final String texture; DesignerType(String texture) { this.name = name().toLowerCase(Locale.ENGLISH); @@ -33,17 +33,11 @@ public enum DesignerType { } public IDesignSystem getSystem() { - switch (this) { - case GLASSWORKER: { - return DesignSystem.Glass; - } - case TILEWORKER: { - return CeramicDesignSystem.instance; - } - default: { - return DesignSystem.Wood; - } - } + return switch (this) { + case GLASSWORKER -> DesignSystem.Glass; + case TILEWORKER -> CeramicDesignSystem.instance; + default -> DesignSystem.Wood; + }; } public ItemStack getBlock(IDesignMaterial type1, IDesignMaterial type2, IDesign design) { @@ -59,17 +53,12 @@ public enum DesignerType { } private BlockDesign getBlock() { - switch (this) { - case GLASSWORKER: - return ExtraTrees.blockStained; - - case PANELWORKER: - return ExtraTrees.blockPanel; - - case TILEWORKER: - return Botany.ceramicTile; - } - return ExtraTrees.blockCarpentry; + return switch (this) { + case GLASSWORKER -> ExtraTrees.blockStained; + case PANELWORKER -> ExtraTrees.blockPanel; + case TILEWORKER -> Botany.ceramicTile; + default -> ExtraTrees.blockCarpentry; + }; } public ItemStack getDisplayStack(IDesign design) { @@ -77,19 +66,11 @@ public enum DesignerType { } public String getMaterialTooltip() { - switch (this) { - case GLASSWORKER: - return I18N.localise("extratrees.machine.glassworker.material"); - - case PANELWORKER: - return I18N.localise("extratrees.machine.panelworker.material"); - - case TILEWORKER: - return I18N.localise("extratrees.machine.tileworker.material"); - - case WOODWORKER: - return I18N.localise("extratrees.machine.woodworker.material"); - } - return ""; + return switch (this) { + case GLASSWORKER -> I18N.localise("extratrees.machine.glassworker.material"); + case PANELWORKER -> I18N.localise("extratrees.machine.panelworker.material"); + case TILEWORKER -> I18N.localise("extratrees.machine.tileworker.material"); + case WOODWORKER -> I18N.localise("extratrees.machine.woodworker.material"); + }; } } diff --git a/src/main/java/binnie/extratrees/machines/designer/WoodworkerRecipeComponent.java b/src/main/java/binnie/extratrees/machines/designer/WoodworkerRecipeComponent.java index 1278c242..f032b96a 100644 --- a/src/main/java/binnie/extratrees/machines/designer/WoodworkerRecipeComponent.java +++ b/src/main/java/binnie/extratrees/machines/designer/WoodworkerRecipeComponent.java @@ -62,8 +62,7 @@ public class WoodworkerRecipeComponent extends ComponentRecipe IDesignMaterial type1 = type.getSystem().getMaterial(plank1); IDesignMaterial type2 = type.getSystem().getMaterial(plank2); IDesign design = getDesign(); - ItemStack stack = type.getBlock(type1, type2, design); - return stack; + return type.getBlock(type1, type2, design); } @Override diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java b/src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java index 0e6ae00e..f8bcf8bb 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java @@ -8,6 +8,7 @@ import java.util.Map; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -53,39 +54,36 @@ public class Lumbermill { private static Collection getRecipeResult(ItemStack output) { List list = new ArrayList<>(); - for (Object recipeO : CraftingManager.getInstance().getRecipeList()) { - if (recipeO instanceof ShapelessRecipes) { - ShapelessRecipes recipe = (ShapelessRecipes) recipeO; - if (recipe.recipeItems.size() != 1 || !(recipe.recipeItems.get(0) instanceof ItemStack)) { + for (IRecipe iRecipe : CraftingManager.getInstance().getRecipeList()) { + if (iRecipe instanceof ShapelessRecipes shapeless) { + if (shapeless.recipeItems.size() != 1 || !(shapeless.recipeItems.get(0) instanceof ItemStack)) { continue; } - ItemStack input = (ItemStack) recipe.recipeItems.get(0); - if (recipe.getRecipeOutput() != null && recipe.getRecipeOutput().isItemEqual(output)) { + ItemStack input = shapeless.recipeItems.get(0); + if (shapeless.getRecipeOutput() != null && shapeless.getRecipeOutput().isItemEqual(output)) { list.add(input); } } - if (recipeO instanceof ShapedRecipes) { - ShapedRecipes recipe2 = (ShapedRecipes) recipeO; - if (recipe2.recipeItems.length != 1) { + if (iRecipe instanceof ShapedRecipes shaped) { + if (shaped.recipeItems.length != 1) { continue; } - ItemStack input = recipe2.recipeItems[0]; - if (recipe2.getRecipeOutput() != null && recipe2.getRecipeOutput().isItemEqual(output)) { + ItemStack input = shaped.recipeItems[0]; + if (shaped.getRecipeOutput() != null && shaped.getRecipeOutput().isItemEqual(output)) { list.add(input); } } - if (recipeO instanceof ShapelessOreRecipe) { - ShapelessOreRecipe recipe3 = (ShapelessOreRecipe) recipeO; - if (recipe3.getInput().size() != 1 || !(recipe3.getInput().get(0) instanceof ItemStack)) { + if (iRecipe instanceof ShapelessOreRecipe shapelessOre) { + if (shapelessOre.getInput().size() != 1 + || !(shapelessOre.getInput().get(0) instanceof ItemStack input)) { continue; } - ItemStack input = (ItemStack) recipe3.getInput().get(0); - if (recipe3.getRecipeOutput() == null || !recipe3.getRecipeOutput().isItemEqual(output)) { + if (shapelessOre.getRecipeOutput() == null || !shapelessOre.getRecipeOutput().isItemEqual(output)) { continue; } list.add(input); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillPackage.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillPackage.java index a8b76632..ce99a343 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillPackage.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillPackage.java @@ -1,10 +1,7 @@ package binnie.extratrees.machines.lumbermill; -import net.minecraft.tileentity.TileEntity; - import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.InventorySlot; @@ -46,9 +43,4 @@ public class LumbermillPackage extends ExtraTreeMachine.PackageExtraTreeMachine new ComponentPowerReceptor(machine); new LumbermillComponentLogic(machine); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/extratrees/nei/IMCForNEI.java b/src/main/java/binnie/extratrees/nei/IMCForNEI.java index 30653ac3..22623fe1 100644 --- a/src/main/java/binnie/extratrees/nei/IMCForNEI.java +++ b/src/main/java/binnie/extratrees/nei/IMCForNEI.java @@ -12,13 +12,13 @@ public class IMCForNEI { sendCatalyst("extratrees.lumbermill", "ExtraTrees:machine:0"); } - private static void sendHandler(String aName, String aBlock) { + private static void sendHandler(String name, String block) { NBTTagCompound aNBT = new NBTTagCompound(); - aNBT.setString("handler", aName); + aNBT.setString("handler", name); aNBT.setString("modName", "Extra Trees"); aNBT.setString("modId", "ExtraTrees"); aNBT.setBoolean("modRequired", true); - aNBT.setString("itemName", aBlock); + aNBT.setString("itemName", block); aNBT.setInteger("handlerHeight", 76); aNBT.setInteger("handlerWidth", 166); aNBT.setInteger("maxRecipesPerPage", 4); @@ -26,15 +26,15 @@ public class IMCForNEI { FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); } - private static void sendCatalyst(String aName, String aStack, int aPriority) { + private static void sendCatalyst(String name, String stack, int prio) { NBTTagCompound aNBT = new NBTTagCompound(); - aNBT.setString("handlerID", aName); - aNBT.setString("itemName", aStack); - aNBT.setInteger("priority", aPriority); + aNBT.setString("handlerID", name); + aNBT.setString("itemName", stack); + aNBT.setInteger("priority", prio); FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT); } - private static void sendCatalyst(String aName, String aStack) { - sendCatalyst(aName, aStack, 0); + private static void sendCatalyst(String name, String stack) { + sendCatalyst(name, stack, 0); } } diff --git a/src/main/java/binnie/extratrees/nei/NEIExtraTreesConfig.java b/src/main/java/binnie/extratrees/nei/NEIExtraTreesConfig.java index fe3b63a8..9d04b117 100644 --- a/src/main/java/binnie/extratrees/nei/NEIExtraTreesConfig.java +++ b/src/main/java/binnie/extratrees/nei/NEIExtraTreesConfig.java @@ -1,6 +1,6 @@ package binnie.extratrees.nei; -import binnie.core.BinnieCore; +import binnie.core.Tags; import binnie.core.nei.RecipeHandlerBase; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; @@ -25,6 +25,6 @@ public class NEIExtraTreesConfig implements IConfigureNEI { @Override public String getVersion() { - return BinnieCore.VERSION; + return Tags.VERSION; } } diff --git a/src/main/java/binnie/extratrees/worldgen/DefaultTreeGenerator.java b/src/main/java/binnie/extratrees/worldgen/DefaultTreeGenerator.java index e76a59f6..422c1623 100644 --- a/src/main/java/binnie/extratrees/worldgen/DefaultTreeGenerator.java +++ b/src/main/java/binnie/extratrees/worldgen/DefaultTreeGenerator.java @@ -19,7 +19,7 @@ import forestry.plugins.PluginArboriculture; public class DefaultTreeGenerator implements ITreeGenerator { - private ExtraTreeSpecies extraTreeSpecies; + private final ExtraTreeSpecies extraTreeSpecies; public DefaultTreeGenerator(ExtraTreeSpecies extraTreeSpecies) { this.extraTreeSpecies = extraTreeSpecies; diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenDefault.java b/src/main/java/binnie/extratrees/worldgen/WorldGenDefault.java index 31cd3011..7c3aa2ba 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenDefault.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenDefault.java @@ -1,6 +1,5 @@ package binnie.extratrees.worldgen; -import binnie.extratrees.genetics.ExtraTreeSpecies; import forestry.api.world.ITreeGenData; public class WorldGenDefault extends WorldGenTree { @@ -9,24 +8,9 @@ public class WorldGenDefault extends WorldGenTree { super(tree); } - @Override - public void generate() { - generateTreeTrunk(height, girth); - int leafSpawn = height + 1; - generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.0f, 1, leaf, false); - generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, leaf, false); - generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, leaf, false); - generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, leaf, false); - } - @Override public void preGenerate() { height = determineHeight(5, 2); girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } - - @Override - public BlockType getWood() { - return new BlockTypeLog(((ExtraTreeSpecies) treeGen.getGenome().getPrimary()).getLog()); - } } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenRedMaple.java b/src/main/java/binnie/extratrees/worldgen/WorldGenRedMaple.java index ab4dfc96..fae0da7c 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenRedMaple.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenRedMaple.java @@ -23,7 +23,7 @@ public class WorldGenRedMaple extends WorldGenTree { generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width - 0.4f, 1, leaf, false); } - width += 0.6; + width += 0.6f; while (leafSpawn > bottom) { generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width, 1, leaf, false); generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width - 0.4f, 1, leaf, false); diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java b/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java index c233d6d6..82f0d196 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import java.util.Random; import net.minecraft.init.Blocks; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -73,7 +74,7 @@ public abstract class WorldGenTree extends WorldGenerator { protected int determineHeight(int required, int variation) { int determined = Math.round((required + rand.nextInt(variation)) * treeGen.getHeightModifier()); - return (determined < minHeight) ? minHeight : ((determined > maxHeight) ? maxHeight : determined); + return MathHelper.clamp_int(determined, minHeight, maxHeight); } public BlockType getLeaf() { @@ -142,7 +143,7 @@ public abstract class WorldGenTree extends WorldGenerator { for (int y2 = minPodHeight; y2 < height; ++y2) { for (int x2 = 0; x2 < girth; ++x2) { for (int z = 0; z < girth; ++z) { - if (x2 <= 0 || x2 >= girth || z <= 0 || z >= girth) { + if (x2 <= 0 || x2 >= girth || z <= 0) { treeGen.trySpawnFruitBlock(world, startX + x2 + 1, startY + y2, startZ + z); treeGen.trySpawnFruitBlock(world, startX + x2 - 1, startY + y2, startZ + z); treeGen.trySpawnFruitBlock(world, startX + x2, startY + y2, startZ + z + 1); @@ -203,7 +204,7 @@ public abstract class WorldGenTree extends WorldGenerator { } } - static class Vector { + public static class Vector { float x; float y; diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 7f299d79..3d5e6193 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -4,6 +4,7 @@ import net.minecraft.item.Item; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; import binnie.core.machines.MachineGroup; import binnie.core.network.BinniePacketHandler; @@ -27,7 +28,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; @Mod( modid = "Genetics", name = "Genetics", - version = BinnieCore.VERSION, + version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore") public class Genetics extends AbstractMod { diff --git a/src/main/java/binnie/genetics/core/GeneticsPacket.java b/src/main/java/binnie/genetics/core/GeneticsPacket.java index c732fad6..f246c251 100644 --- a/src/main/java/binnie/genetics/core/GeneticsPacket.java +++ b/src/main/java/binnie/genetics/core/GeneticsPacket.java @@ -24,8 +24,6 @@ public enum GeneticsPacket implements IPacketID { EntityPlayer player = BinnieCore.proxy.getPlayer(); GeneTracker tracker; tracker = GeneTracker.getTracker(BinnieCore.proxy.getWorld(), player.getGameProfile()); - if (tracker != null) { - tracker.readFromNBT(packet.getTagCompound()); - } + tracker.readFromNBT(packet.getTagCompound()); } } diff --git a/src/main/java/binnie/genetics/core/GeneticsTexture.java b/src/main/java/binnie/genetics/core/GeneticsTexture.java index 5f23af4a..9210a939 100644 --- a/src/main/java/binnie/genetics/core/GeneticsTexture.java +++ b/src/main/java/binnie/genetics/core/GeneticsTexture.java @@ -25,10 +25,10 @@ public enum GeneticsTexture implements IBinnieTexture { Acclimatiser(ResourceType.Tile, "Acclimatiser"), Splicer(ResourceType.Tile, "Splicer"); - public static BinnieIcon dnaIcon = Binnie.Resource.getItemIcon(Genetics.instance, "dna"); + public static final BinnieIcon dnaIcon = Binnie.Resource.getItemIcon(Genetics.instance, "dna"); - protected String texture; - protected ResourceType type; + private final String texture; + private final ResourceType type; GeneticsTexture(ResourceType base, String texture) { this.texture = texture; diff --git a/src/main/java/binnie/genetics/craftgui/ControlGene.java b/src/main/java/binnie/genetics/craftgui/ControlGene.java index a701e1e3..fa478076 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/craftgui/ControlGene.java @@ -70,11 +70,6 @@ public class ControlGene extends Control implements IControlValue, IToolt gene = value; } - @Override - public void onRenderForeground() { - // ignored - } - @Override public void onRenderBackground() { if (isMouseOver() && canFill(Window.get(this).getHeldItemStack())) { diff --git a/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java b/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java index e50f5f59..375f8441 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java @@ -56,7 +56,7 @@ public class ControlGeneScroll extends Control implements IControlValue totalList = new ArrayList<>(); + public void getInfo(List tooltip) { + List totalList = new ArrayList<>(); for (IGene gene : genes) { String chromosomeName = getBreedingSystem().getChromosomeName(gene.getChromosome()); totalList.add(EnumChatFormatting.GOLD + chromosomeName + EnumChatFormatting.GRAY + ": " + gene.getName()); @@ -64,7 +64,7 @@ public class GeneArrayItem implements INBTTagable, IGeneItem { } public BreedingSystem getBreedingSystem() { - if (genes.size() == 0) { + if (genes.isEmpty()) { return null; } BreedingSystem system = Binnie.Genetics.getSystem(genes.get(0).getSpeciesRoot().getUID()); diff --git a/src/main/java/binnie/genetics/genetics/GeneItem.java b/src/main/java/binnie/genetics/genetics/GeneItem.java index 02476271..6a51ee8f 100644 --- a/src/main/java/binnie/genetics/genetics/GeneItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneItem.java @@ -52,7 +52,7 @@ public class GeneItem implements INBTTagable, IGeneItem { } @Override - public void getInfo(List tooltip) { + public void getInfo(List tooltip) { String chromosomeName = getBreedingSystem().getChromosomeName(gene.getChromosome()); tooltip.add(EnumChatFormatting.GOLD + chromosomeName + EnumChatFormatting.GRAY + ": " + gene.getName()); } diff --git a/src/main/java/binnie/genetics/genetics/GeneTracker.java b/src/main/java/binnie/genetics/genetics/GeneTracker.java index 962ddff6..f01ad447 100644 --- a/src/main/java/binnie/genetics/genetics/GeneTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneTracker.java @@ -24,7 +24,7 @@ import forestry.api.genetics.ISpeciesRoot; public class GeneTracker extends WorldSavedData { GameProfile username; - private ArrayList discoveredGenes; + private final ArrayList discoveredGenes; public GeneTracker(String s, GameProfile username) { super(s); diff --git a/src/main/java/binnie/genetics/genetics/IGeneItem.java b/src/main/java/binnie/genetics/genetics/IGeneItem.java index 308e76db..c5318334 100644 --- a/src/main/java/binnie/genetics/genetics/IGeneItem.java +++ b/src/main/java/binnie/genetics/genetics/IGeneItem.java @@ -11,7 +11,7 @@ public interface IGeneItem { ISpeciesRoot getSpeciesRoot(); - void getInfo(List tooltip); + void getInfo(List tooltip); int getColour(int color); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java index e9e44e35..fad516ec 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java @@ -9,6 +9,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -43,8 +44,9 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { for (Map.Entry recipe : RecipeManagers.centrifugeManager.getRecipes().entrySet()) { boolean isRecipe = false; for (Object obj : recipe.getKey()) { - if (obj instanceof ItemStack && stack.isItemEqual((ItemStack) obj)) { + if (obj instanceof ItemStack i && stack.isItemEqual(i)) { isRecipe = true; + break; } } @@ -64,8 +66,9 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { for (Map.Entry recipe : RecipeManagers.squeezerManager.getRecipes().entrySet()) { boolean isRecipe = false; for (Object obj : recipe.getKey()) { - if (obj instanceof ItemStack && stack.isItemEqual((ItemStack) obj)) { + if (obj instanceof ItemStack i && stack.isItemEqual(i)) { isRecipe = true; + break; } } @@ -82,73 +85,72 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { public Collection getCrafting(ItemStack stack) { List products = new ArrayList<>(); - for (Object recipeO : CraftingManager.getInstance().getRecipeList()) { - if (recipeO instanceof ShapelessRecipes) { - ShapelessRecipes recipe = (ShapelessRecipes) recipeO; + for (IRecipe iRecipe : CraftingManager.getInstance().getRecipeList()) { + if (iRecipe instanceof ShapelessRecipes shapeless) { boolean match = true; - for (Object rec : recipe.recipeItems) { - if (rec != null && (!(rec instanceof ItemStack) || !stack.isItemEqual((ItemStack) rec))) { + for (final ItemStack rec : shapeless.recipeItems) { + if (rec != null && !stack.isItemEqual(rec)) { match = false; + break; } } if (match) { - products.add(recipe.getRecipeOutput()); + products.add(shapeless.getRecipeOutput()); } } - if (recipeO instanceof ShapedRecipes) { - ShapedRecipes recipe2 = (ShapedRecipes) recipeO; + if (iRecipe instanceof ShapedRecipes shaped) { boolean match = true; - for (Object rec2 : recipe2.recipeItems) { - if (rec2 != null && (!(rec2 instanceof ItemStack) || !stack.isItemEqual((ItemStack) rec2))) { + for (final ItemStack rec : shaped.recipeItems) { + if (rec != null && !stack.isItemEqual(rec)) { match = false; + break; } } if (match) { - products.add(recipe2.getRecipeOutput()); + products.add(shaped.getRecipeOutput()); } } - if (recipeO instanceof ShapelessOreRecipe) { - ShapelessOreRecipe recipe3 = (ShapelessOreRecipe) recipeO; + if (iRecipe instanceof ShapelessOreRecipe shapelessOre) { boolean match = true; - for (Object rec : recipe3.getInput()) { - if (rec != null && (!(rec instanceof ItemStack) || !stack.isItemEqual((ItemStack) rec))) { + for (final Object rec : shapelessOre.getInput()) { + if (rec != null && (!(rec instanceof ItemStack i) || !stack.isItemEqual(i))) { match = false; + break; } } if (!match) { continue; } - products.add(recipe3.getRecipeOutput()); + products.add(shapelessOre.getRecipeOutput()); } } return products; } public Collection getAllFluids(ItemStack stack) { - List products = new ArrayList<>(); - products.addAll(getSqueezerFluid(stack)); - return products; + return new ArrayList<>(getSqueezerFluid(stack)); } public Collection getSqueezerFluid(ItemStack stack) { List products = new ArrayList<>(); - for (Map.Entry recipe : RecipeManagers.squeezerManager.getRecipes().entrySet()) { + for (final Map.Entry recipe : RecipeManagers.squeezerManager.getRecipes().entrySet()) { boolean isRecipe = false; - for (Object obj : recipe.getKey()) { - if (obj instanceof ItemStack && stack.isItemEqual((ItemStack) obj)) { + for (final Object obj : recipe.getKey()) { + if (obj instanceof ItemStack i && stack.isItemEqual(i)) { isRecipe = true; + break; } } if (isRecipe) { - for (Object obj : recipe.getValue()) { - if (obj instanceof FluidStack) { - products.add((FluidStack) obj); + for (final Object obj : recipe.getValue()) { + if (obj instanceof FluidStack f) { + products.add(f); } } } @@ -156,41 +158,41 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { return products; } - protected Collection getAllProducts(FluidStack stack) { + protected Collection getAllProducts() { return new UniqueFluidStackSet(); } protected Collection getAllProductsAndFluids(Collection collection) { Collection products = new UniqueItemStackSet(); - for (ItemStack stack : collection) { + for (final ItemStack stack : collection) { products.addAll(getAllProducts(stack)); } Collection products2 = new UniqueItemStackSet(); - for (ItemStack stack2 : products) { + for (final ItemStack stack2 : products) { products2.addAll(getAllProducts(stack2)); } Collection products3 = new UniqueItemStackSet(); - for (ItemStack stack3 : products2) { + for (final ItemStack stack3 : products2) { products3.addAll(getAllProducts(stack3)); } products.addAll(products2); products.addAll(products3); Collection allFluids = new UniqueFluidStackSet(); - for (ItemStack stack4 : collection) { + for (final ItemStack stack4 : collection) { allFluids.addAll(getAllFluids(stack4)); } Collection fluids2 = new UniqueFluidStackSet(); - for (FluidStack stack5 : allFluids) { - fluids2.addAll(getAllProducts(stack5)); + for (FluidStack ignored : allFluids) { + fluids2.addAll(getAllProducts()); } Collection fluids3 = new UniqueFluidStackSet(); - for (FluidStack stack6 : fluids2) { - fluids3.addAll(getAllProducts(stack6)); + for (FluidStack ignored : fluids2) { + fluids3.addAll(getAllProducts()); } allFluids.addAll(fluids2); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java index 203ed905..f8345ebb 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java @@ -134,7 +134,7 @@ public class AnalystPageSoil extends ControlAnalystPage { protected void createMoisture(IWidget parent, float x, float y, float w, float h, EnumMoisture value, EnumTolerance tol) { - new ControlToleranceBar(parent, x, y, w, h, EnumMoisture.class) { + new ControlToleranceBar<>(parent, x, y, w, h, EnumMoisture.class) { @Override protected String getName(EnumMoisture value) { @@ -143,14 +143,18 @@ public class AnalystPageSoil extends ControlAnalystPage { @Override protected int getColor(EnumMoisture value) { - return (new int[] { 0xccffcc, 0x66ccff, 0x3366ff })[value.ordinal()]; + return switch (value) { + case DRY -> 0xccffcc; + case NORMAL -> 0x66ccff; + case DAMP -> 0x3366ff; + }; } }.setValues(value, tol); } protected void createAcidity(IWidget parent, float x, float y, float w, float h, EnumAcidity value, EnumTolerance tol) { - new ControlToleranceBar(parent, x, y, w, h, EnumAcidity.class) { + new ControlToleranceBar<>(parent, x, y, w, h, EnumAcidity.class) { @Override protected String getName(EnumAcidity value) { @@ -159,7 +163,11 @@ public class AnalystPageSoil extends ControlAnalystPage { @Override protected int getColor(EnumAcidity value) { - return (new int[] { 0xff0066, 0x00ff00, 0x0066ff })[value.ordinal()]; + return switch (value) { + case ACID -> 0xff0066; + case NEUTRAL -> 0x00ff00; + case ALKALINE -> 0x0066ff; + }; } }.setValues(value, tol); } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/AnalystPageWood.java index 7fafbe11..5a4d834c 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageWood.java @@ -47,15 +47,11 @@ public class AnalystPageWood extends AnalystPageProduce { products.add(stackWood); } - // for (ItemStack stack : - // ind.getGenome().getFruitProvider().getProducts()) { - // products.add(stack); - // } - - if (products.size() > 0) { + if (!products.isEmpty()) { new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.wood.logs")).setColor(getColor()); y += 10; int w = products.size() * 18 - 2; + // TODO: Is this meant to increment i? int i = 0; for (ItemStack stack : products) { ControlItemDisplay d = new ControlItemDisplay(this, (w() - w) / 2.0f + 18 * i, y); @@ -70,12 +66,12 @@ public class AnalystPageWood extends AnalystPageProduce { Collection refinedProducts = new UniqueItemStackSet(); refinedProducts.addAll(getAllProductsAndFluids(allProducts)); - if (refinedProducts.size() > 0) { + if (!refinedProducts.isEmpty()) { y = getRefined(I18N.localise("genetics.gui.analyst.wood.products"), y, refinedProducts); y += 8; } - if (products.size() == 0) { + if (products.isEmpty()) { new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.wood.noFruits")).setColor(getColor()); y += 28; } diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java index 878e238e..1c4b40e1 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java @@ -14,11 +14,6 @@ public abstract class ControlAnalystPage extends Control { hide(); } - @Override - public void onRenderBackground() { - // ignored - } - public abstract String getTitle(); protected String getTimeString(float time) { diff --git a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java index 820151f2..a44b799e 100644 --- a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java @@ -20,7 +20,7 @@ public abstract class ControlToleranceBar> extends Control imp EnumSet tolerated; EnumSet fullSet; - private Class enumClass; + private final Class enumClass; public ControlToleranceBar(IWidget parent, float x, float y, float width, float height, Class clss) { super(parent, x, y, width, height); diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index e132af76..a70c6897 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -315,7 +315,7 @@ public class WindowAnalyst extends Window { ControlAnalystPage databasePage = null; if (isDatabase && !systemChange) { - databasePage = ((analystPages.size() > 0) ? analystPages.get(0) : null); + databasePage = ((!analystPages.isEmpty()) ? analystPages.get(0) : null); } analystPages.clear(); @@ -419,8 +419,8 @@ public class WindowAnalyst extends Window { x += width; } - if (analystPages.size() > 0) { - setPage(leftPage, analystPages.get((oldLeft >= 0) ? oldLeft : 0)); + if (!analystPages.isEmpty()) { + setPage(leftPage, analystPages.get(Math.max(oldLeft, 0))); } if (analystPages.size() > 1) { setPage(rightPage, analystPages.get((oldRight >= 0) ? oldRight : 1)); diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index fb139354..9bddfad5 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -18,17 +18,15 @@ public enum GeneticLiquid implements IFluidType { RawDNA("dna.raw", 0xe63de9), BacteriaVector("bacteriaVector", 0xf38b7e); - protected String name; - protected String ident; - protected IIcon icon; - protected int color; - protected float transparency; + private final String name; + private final String ident; + private IIcon icon; + private final int color; GeneticLiquid(String name, int color) { this.name = name; this.ident = name; this.color = color; - transparency = 1.0f; } @Override diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 25b0e1c5..7a6b24db 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -25,9 +25,9 @@ public enum GeneticsItems implements IItemMisc { IntegratedCPU("integratedCPU"), IntegratedCasing("casingCircuit"); - protected IIcon icon; - protected String name; - protected String iconPath; + private IIcon icon; + private final String name; + private final String iconPath; GeneticsItems(String name) { this.name = name; @@ -45,7 +45,7 @@ public enum GeneticsItems implements IItemMisc { } @Override - public void addInformation(List data) { + public void addInformation(List data) { // ignored } diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index 48d03cfb..a2a3ab80 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -42,13 +42,13 @@ public class ItemDatabase extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); } @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); list.add(new ItemStack(item, 1, 1)); } diff --git a/src/main/java/binnie/genetics/item/ItemFieldKit.java b/src/main/java/binnie/genetics/item/ItemFieldKit.java index a2548ed9..547605c4 100644 --- a/src/main/java/binnie/genetics/item/ItemFieldKit.java +++ b/src/main/java/binnie/genetics/item/ItemFieldKit.java @@ -67,7 +67,7 @@ public class ItemFieldKit extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { int i = getMaxDamage() - itemStack.getItemDamage(); if (i == 0) { tooltip.add(I18N.localise("genetics.item.fieldKit.tooltip.noPaper")); diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index 3b96075a..b25e5238 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -34,11 +34,6 @@ public abstract class ItemGene extends Item { return icons[pass]; } - @Override - public boolean getShareTag() { - return true; - } - @Override public boolean isRepairable() { return false; @@ -73,7 +68,7 @@ public abstract class ItemGene extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); int damage = getMaxDamage() - stack.getItemDamage(); if (damage == 0) { @@ -92,7 +87,7 @@ public abstract class ItemGene extends Item { public abstract String getItemStackDisplayName(ItemStack stack); @Override - public void getSubItems(Item item, CreativeTabs tab, List itemList) { + public void getSubItems(Item item, CreativeTabs tab, List itemList) { // ignored } diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index c04d803e..4dfca467 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -56,7 +56,7 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18N.localise("genetics.item.sequence." + (5 - stack.getItemDamage() % 6))); SequencerItem gene = new SequencerItem(stack); @@ -87,7 +87,7 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry .getAllele("forestry.speciesMeadows"); list.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.Genetics.getBeeRoot()), false)); diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index d387586b..4ee173db 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -41,7 +41,7 @@ public class ItemSerum extends ItemGene implements IItemSerum { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); } @@ -51,7 +51,7 @@ public class ItemSerum extends ItemGene implements IItemSerum { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { Map> chromosomeMap = Binnie.Genetics.getChromosomeMap(root); for (Map.Entry> entry : chromosomeMap.entrySet()) { diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index ecd9a996..71bb66e6 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -43,7 +43,7 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); } @@ -73,7 +73,7 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { for (IIndividual template : root.getIndividualTemplates()) { if (template.getGenome().getPrimary().isSecret()) { diff --git a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java b/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java index 03c16957..4a123072 100644 --- a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java @@ -12,7 +12,7 @@ public enum AdvGeneticMachine implements IMachineType { Splicer(SplicerPackage.class); - protected Class cls; + private final Class cls; AdvGeneticMachine(Class cls) { this.cls = cls; diff --git a/src/main/java/binnie/genetics/machine/GeneticMachine.java b/src/main/java/binnie/genetics/machine/GeneticMachine.java index 7e778ae9..2b7ba639 100644 --- a/src/main/java/binnie/genetics/machine/GeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/GeneticMachine.java @@ -17,7 +17,7 @@ public enum GeneticMachine implements IMachineType { Polymeriser(PolymeriserPackage.class), Inoculator(InoculatorPackage.class); - protected Class clss; + private final Class clss; GeneticMachine(Class clss) { this.clss = clss; diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index fab2aedb..87065ab9 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -19,7 +19,7 @@ public enum LaboratoryMachine implements IMachineType { Genepool(GenepoolPackage.class), Acclimatiser(AcclimatiserPackage.class); - private Class clss; + private final Class clss; LaboratoryMachine(Class clss) { this.clss = clss; diff --git a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java index 94545a67..4cd75b44 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java @@ -20,7 +20,7 @@ public class MachineRendererGenetics { public RenderItem customRenderItem; - private ModelMachine model; + private final ModelMachine model; public MachineRendererGenetics() { model = new ModelMachine(); @@ -39,8 +39,7 @@ public class MachineRendererGenetics { customRenderItem.setRenderManager(RenderManager.instance); } - public void renderMachine(Machine machine, int colour, BinnieResource texture, double x, double y, double z, - float var8) { + public void renderMachine(Machine machine, BinnieResource texture, double x, double y, double z) { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 1.5, z + 0.5); GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f); diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index a4f7e8f7..cc4c0f44 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -21,11 +21,11 @@ public class MachineRendererLab { public static MachineRendererLab instance = new MachineRendererLab(); - private EntityItem dummyEntityItem; - private EntityItem[] itemSides; - private RenderItem customRenderItem; + private final EntityItem dummyEntityItem; + private final EntityItem[] itemSides; + private final RenderItem customRenderItem; private long lastTick; - private ModelMachine model; + private final ModelMachine model; public MachineRendererLab() { dummyEntityItem = new EntityItem(null); @@ -46,8 +46,7 @@ public class MachineRendererLab { }).setRenderManager(RenderManager.instance); } - public void renderMachine(Machine machine, int colour, BinnieResource texture, double x, double y, double z, - float var8) { + public void renderMachine(Machine machine, BinnieResource texture, double x, double y, double z) { GL11.glPushMatrix(); int ix = machine.getTileEntity().xCoord; int iz = machine.getTileEntity().zCoord; diff --git a/src/main/java/binnie/genetics/machine/ModelMachine.java b/src/main/java/binnie/genetics/machine/ModelMachine.java index bbb9c2cc..6ae4718f 100644 --- a/src/main/java/binnie/genetics/machine/ModelMachine.java +++ b/src/main/java/binnie/genetics/machine/ModelMachine.java @@ -5,13 +5,13 @@ import net.minecraft.client.model.ModelRenderer; public class ModelMachine extends ModelBase { - private ModelRenderer base; - private ModelRenderer body; - private ModelRenderer arm1; - private ModelRenderer arm2; - private ModelRenderer arm3; - private ModelRenderer arm4; - private ModelRenderer top; + private final ModelRenderer base; + private final ModelRenderer body; + private final ModelRenderer arm1; + private final ModelRenderer arm2; + private final ModelRenderer arm3; + private final ModelRenderer arm4; + private final ModelRenderer top; public ModelMachine() { textureWidth = 64; @@ -79,6 +79,7 @@ public class ModelMachine extends ModelBase { top.render(f5); } + @SuppressWarnings("SameParameterValue") private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; diff --git a/src/main/java/binnie/genetics/machine/PackageGeneticBase.java b/src/main/java/binnie/genetics/machine/PackageGeneticBase.java index 74b304a1..b265207b 100644 --- a/src/main/java/binnie/genetics/machine/PackageGeneticBase.java +++ b/src/main/java/binnie/genetics/machine/PackageGeneticBase.java @@ -27,6 +27,6 @@ public abstract class PackageGeneticBase extends MachinePackage { @Override public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { - MachineRendererGenetics.instance.renderMachine(machine, color, renderTexture, x, y, z, partialTick); + MachineRendererGenetics.instance.renderMachine(machine, renderTexture, x, y, z); } } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index e09be4dd..95a48e95 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -16,7 +16,6 @@ import binnie.core.Mods; import binnie.core.genetics.Tolerance; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.EnumButterflyChromosome; @@ -32,7 +31,7 @@ public class Acclimatiser { public static Map temperatureItems = new HashMap<>(); public static Map humidityItems = new HashMap<>(); - private static List toleranceSystems = new ArrayList<>(); + private static final List toleranceSystems = new ArrayList<>(); private static ToleranceSystem getToleranceSystem(ItemStack stack, ItemStack acclim) { ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); @@ -158,35 +157,17 @@ public class Acclimatiser { public static Tolerance alterTolerance(Tolerance tol, float effect) { int[] is = tol.getBounds(); - int[] range; - if (effect < 0.0f) { - range = new int[] { is[0] - 1, is[1] }; - } else { - range = new int[] { is[0], is[1] + 1 }; + int low = Math.max(effect < 0.0f ? is[0] - 1 : is[0], -5); + int high = Math.min(effect < 0.0f ? is[1] : is[1] + 1, 5); + + if (low == 0) { + return Tolerance.getHigh(high); + } + if (high == 0) { + return Tolerance.getLow(low); } - if (range[0] < -5) { - range[0] = -5; - } - if (range[1] > 5) { - range[1] = 5; - } - - EnumTolerance[] up = { EnumTolerance.NONE, EnumTolerance.UP_1, EnumTolerance.UP_2, EnumTolerance.UP_3, - EnumTolerance.UP_4, EnumTolerance.UP_5 }; - EnumTolerance[] down = { EnumTolerance.NONE, EnumTolerance.DOWN_1, EnumTolerance.DOWN_2, EnumTolerance.DOWN_3, - EnumTolerance.DOWN_4, EnumTolerance.DOWN_5 }; - EnumTolerance[] both = { EnumTolerance.NONE, EnumTolerance.BOTH_1, EnumTolerance.BOTH_2, EnumTolerance.BOTH_3, - EnumTolerance.BOTH_4, EnumTolerance.BOTH_5 }; - - if (range[0] == 0) { - return Tolerance.get(up[range[1]]); - } - if (range[1] == 0) { - return Tolerance.get(down[-range[0]]); - } - - int avg = (int) ((-range[0] + range[1]) / 2.0f + 0.6f); - return Tolerance.get(both[avg]); + int avg = (int) ((-low + high) / 2.0f + 0.6f); + return Tolerance.getBoth(avg); } } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserPackage.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserPackage.java index 436a10ae..a39cdbb8 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserPackage.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserPackage.java @@ -1,11 +1,9 @@ package binnie.genetics.machine.acclimatiser; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.InventorySlot; @@ -63,9 +61,4 @@ public class AcclimatiserPackage extends PackageGeneticBase implements IMachineI new ComponentPowerReceptor(machine, 5000); new AcclimatiserComponentLogic(machine); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java index a1d5e33a..e1a3a558 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java @@ -42,11 +42,10 @@ public class ToleranceSystem { return stack; } - IIndividual member = AlleleManager.alleleRegistry.getIndividual(stack); - IGenome genome = member.getGenome(); - IAlleleTolerance tolAllele = (IAlleleTolerance) genome.getActiveAllele(chromosomeOrdinal); - Tolerance tol = Tolerance.get(tolAllele.getValue()); - Tolerance newTol = Acclimatiser.alterTolerance(tol, effect); + final IGenome genome = AlleleManager.alleleRegistry.getIndividual(stack).getGenome(); + final IAlleleTolerance tolAllele = (IAlleleTolerance) genome.getActiveAllele(chromosomeOrdinal); + final Tolerance tol = Tolerance.get(tolAllele.getValue()); + final Tolerance newTol = Acclimatiser.alterTolerance(tol, effect); if (rand.nextFloat() > 1.0f / (-newTol.getBounds()[0] + newTol.getBounds()[1])) { return stack; } diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java index fce19cb2..d17e6165 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java @@ -5,7 +5,6 @@ import java.util.Random; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -24,7 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class AnalyserComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync { - private EntityItem dummyEntityItem; + private final EntityItem dummyEntityItem; public AnalyserComponentFX(IMachine machine) { super(machine); @@ -40,7 +39,7 @@ public class AnalyserComponentFX extends MachineComponent @SideOnly(Side.CLIENT) @Override public void onDisplayTick(World world, int x, int y, int z, Random rand) { - if (rand.nextFloat() < 1.0f && getUtil().getProcess().isInProgress()) { + if (getUtil().getProcess().isInProgress()) { BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 1.3 + rand.nextDouble() * 0.2, z + 0.5, 0.0, 0.0, 0.0) { @@ -66,11 +65,6 @@ public class AnalyserComponentFX extends MachineComponent super.onUpdate(); setAlphaF((float) Math.cos(1.57 * particleAge / particleMaxAge)); } - - @Override - public int getFXLayer() { - return 0; - } }); } } @@ -92,10 +86,6 @@ public class AnalyserComponentFX extends MachineComponent return; } - EntityPlayer player = BinnieCore.proxy.getPlayer(); - double dx = x + 0.5 - player.lastTickPosX; - double dz = z + 0.5 - player.lastTickPosZ; - double t = Math.atan2(dz, dx) * 180.0 / 3.1415; GL11.glPushMatrix(); GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f); GL11.glTranslatef(0.0f, -0.2f, 0.0f); diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserPackage.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserPackage.java index f788e26b..425e6354 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserPackage.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserPackage.java @@ -1,11 +1,9 @@ package binnie.genetics.machine.analyser; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; @@ -62,9 +60,4 @@ public class AnalyserPackage extends PackageGeneticBase implements IMachineInfor new AnalyserComponentLogic(machine); new AnalyserComponentFX(machine); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java index 2cc6778d..00d93b31 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java @@ -27,7 +27,7 @@ public class GenepoolComponentFX extends MachineComponent implements IRender.Ran @SideOnly(Side.CLIENT) @Override public void onDisplayTick(World world, int x, int y, int z, Random rand) { - if (rand.nextFloat() >= 1.0f || !getUtil().getProcess().isInProgress()) { + if (!getUtil().getProcess().isInProgress()) { return; } @@ -41,14 +41,7 @@ public class GenepoolComponentFX extends MachineComponent implements IRender.Ran 0.0, 0.0) { - double axisX = posX; - double axisZ = posZ; - double angle = rand.nextDouble() * 2.0 * 3.1415; - { - axisX = 0.0; - axisZ = 0.0; - angle = 0.0; motionX = 0.0; motionZ = 0.0; motionY = rand.nextFloat() * 0.01; @@ -66,11 +59,6 @@ public class GenepoolComponentFX extends MachineComponent implements IRender.Ran super.onUpdate(); setAlphaF((float) Math.cos(1.57 * particleAge / particleMaxAge)); } - - @Override - public int getFXLayer() { - return 0; - } }); } } diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java index 1350c1cb..e05e4c61 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java @@ -1,10 +1,7 @@ package binnie.genetics.machine.genepool; -import net.minecraft.tileentity.TileEntity; - import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; @@ -61,9 +58,4 @@ public class GenepoolPackage extends PackageGeneticBase implements IMachineInfor chargedSlots.addCharge(Genepool.SLOT_ENZYME); new GenepoolComponentFX(machine); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java index 69870125..60afaffa 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java @@ -1,10 +1,7 @@ package binnie.genetics.machine.incubator; -import net.minecraft.tileentity.TileEntity; - import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.InventorySlot; @@ -45,9 +42,4 @@ public class IncubatorPackage extends PackageGeneticBase implements IMachineInfo tanks.addTank(Incubator.TANK_OUTPUT, "output", Incubator.OUTPU_TANK_CAPACITY).setReadOnly(); new IncubatorComponentLogic(machine); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java index 847110fb..1578fd00 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class InoculatorComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync { - private EntityItem dummyEntityItem; + private final EntityItem dummyEntityItem; public InoculatorComponentFX(IMachine machine) { super(machine); @@ -78,11 +78,6 @@ public class InoculatorComponentFX extends MachineComponent particleBlue + (0.0f - particleBlue) / 10.0f); } } - - @Override - public int getFXLayer() { - return 0; - } }); } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java index aacc6f32..c0cabbb1 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java @@ -1,11 +1,9 @@ package binnie.genetics.machine.inoculator; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.ComponentTankContainer; @@ -94,9 +92,4 @@ public class InoculatorPackage extends PackageGeneticBase implements IMachineInf new ComponentTankContainer(machine).addTank(Inoculator.TANK_VECTOR, "input", Inoculator.TANK_CAPACITY) .setValidator(new BacteriaVectorValidator()); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java index 84645dfa..30cc83e8 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java @@ -53,11 +53,6 @@ public class IsolatorComponentFX extends MachineComponent implements IRender.Ran angle += 0.06; setAlphaF((float) Math.sin(3.14 * particleAge / particleMaxAge)); } - - @Override - public int getFXLayer() { - return 0; - } }); } @@ -72,14 +67,11 @@ public class IsolatorComponentFX extends MachineComponent implements IRender.Ran BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 1, z + 0.5, 0.0, 0.0, 0.0) { - double axisX = posX; - double axisZ = posZ; - double angle = 0.7 + (int) (worldObj.getTotalWorldTime() % 2L) * 3.1415; + final double axisX = 0.0; + final double axisZ = 0.0; + double angle = 0.0; { - axisX = 0.0; - axisZ = 0.0; - angle = 0.0; motionX = 0.0; motionZ = 0.0; motionY = 0.012; @@ -96,11 +88,6 @@ public class IsolatorComponentFX extends MachineComponent implements IRender.Ran setPosition(axisX + 0.26 * Math.sin(angle), posY, axisZ + 0.26 * Math.cos(angle)); setAlphaF((float) Math.cos(1.57 * particleAge / particleMaxAge)); } - - @Override - public int getFXLayer() { - return 0; - } }); } } diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java index 426cdedb..ffef9f12 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java @@ -77,21 +77,11 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I return; } - IAllele allele; - IChromosomeType chromosome; - Gene gene = null; - if (getMachine().getWorld().rand.nextFloat() < 2.0f) { - while (gene == null) { - try { - chromosome = root.getKaryotype()[rand.nextInt(root.getKaryotype().length)]; - allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome) - : individual.getGenome().getInactiveAllele(chromosome); - gene = Gene.create(allele, chromosome, root); - } catch (Exception e) { - // ignored - } - } - } + final IChromosomeType[] karyo = root.getKaryotype(); + final IChromosomeType chromosome = karyo[rand.nextInt(karyo.length)]; + final IAllele allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome) + : individual.getGenome().getInactiveAllele(chromosome); + final Gene gene = new Gene(allele, chromosome, root); ItemStack serum = ItemSequence.create(gene); getUtil().setStack(Isolator.SLOT_RESULT, serum); diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java index dbc06721..5afe5eff 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java @@ -1,10 +1,7 @@ package binnie.genetics.machine.isolator; -import net.minecraft.tileentity.TileEntity; - import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; @@ -72,9 +69,4 @@ public class IsolatorPackage extends PackageGeneticBase implements IMachineInfor new IsolatorComponentLogic(machine); new IsolatorComponentFX(machine); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java b/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java index 24a71bc1..19927846 100644 --- a/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java +++ b/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java @@ -21,6 +21,6 @@ public class LabMachinePackage extends PackageGeneticBase { @Override public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { - MachineRendererLab.instance.renderMachine(machine, color, renderTexture, x, y, z, partialTick); + MachineRendererLab.instance.renderMachine(machine, renderTexture, x, y, z); } } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java index 03264e82..8e43b6e0 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java @@ -74,11 +74,6 @@ public class PolymeriserComponentFX extends MachineComponent implements IRender. particleBlue + (1.0f - particleBlue) / 10.0f); } } - - @Override - public int getFXLayer() { - return 0; - } }); } } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java index e936b78b..0c0e469f 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java @@ -11,7 +11,7 @@ import binnie.genetics.genetics.Engineering; public class PolymeriserComponentLogic extends ComponentProcessSetCost implements IProcess { - private static float chargePerProcess = 0.4f; + private static final float chargePerProcess = 0.4f; private float dnaDrain = 0.0f; private float bacteriaDrain = 0.0f; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java index 7d7ba424..320b11fc 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java @@ -2,11 +2,9 @@ package binnie.genetics.machine.polymeriser; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; @@ -73,9 +71,4 @@ public class PolymeriserPackage extends PackageGeneticBase implements IMachineIn new PolymeriserComponentLogic(machine); new PolymeriserComponentFX(machine); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java index 93441173..1cc03f64 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java @@ -54,11 +54,6 @@ public class SequencerComponentFX extends MachineComponent implements IRender.Ra motionY = 0.0; setAlphaF((float) Math.sin(3.14 * particleAge / particleMaxAge)); } - - @Override - public int getFXLayer() { - return 0; - } }); } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java index 26714bd5..22a1cded 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java @@ -1,11 +1,8 @@ package binnie.genetics.machine.sequencer; -import net.minecraft.tileentity.TileEntity; - import binnie.Binnie; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; @@ -63,9 +60,4 @@ public class SequencerPackage extends PackageGeneticBase implements IMachineInfo SequencerComponentLogic logic = new SequencerComponentLogic(machine); transfer.setTransferListener(logic); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java index 4e1e59c2..7b943346 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class SplicerComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync { - private EntityItem dummyEntityItem; + private final EntityItem dummyEntityItem; public SplicerComponentFX(IMachine machine) { super(machine); @@ -70,11 +70,6 @@ public class SplicerComponentFX extends MachineComponent setPosition(axisX + dist * Math.sin(angle), posY, axisZ + dist * Math.cos(angle)); setAlphaF((float) Math.cos(1.57 * particleAge / particleMaxAge)); } - - @Override - public int getFXLayer() { - return 0; - } }); } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java index 027b1b5b..5d8f1055 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java @@ -72,7 +72,7 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP i++; } } - return (i < 1) ? 1 : i; + return Math.max(i, 1); } private int getFullNumberOfGenes() { @@ -191,9 +191,4 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP } getUtil().damageItem(Splicer.SLOT_SERUM_VIAL, 1); } - - @Override - protected void onTickTask() { - // ignored - } } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java b/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java index 5ccea94b..174bd616 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java @@ -1,11 +1,9 @@ package binnie.genetics.machine.splicer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.InventorySlot; @@ -90,9 +88,4 @@ public class SplicerPackage extends AdvGeneticMachine.PackageAdvGeneticBase impl new SplicerComponentLogic(machine); new SplicerComponentFX(machine); } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } } diff --git a/src/main/java/binnie/genetics/nei/NEIGeneticsConfig.java b/src/main/java/binnie/genetics/nei/NEIGeneticsConfig.java index 17062874..3b6fbdfa 100644 --- a/src/main/java/binnie/genetics/nei/NEIGeneticsConfig.java +++ b/src/main/java/binnie/genetics/nei/NEIGeneticsConfig.java @@ -1,6 +1,6 @@ package binnie.genetics.nei; -import binnie.core.BinnieCore; +import binnie.core.Tags; import binnie.core.nei.RecipeHandlerBase; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; @@ -34,6 +34,6 @@ public class NEIGeneticsConfig implements IConfigureNEI { @Override public String getVersion() { - return BinnieCore.VERSION; + return Tags.VERSION; } } diff --git a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java index f2e825cc..1248ccfd 100644 --- a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java @@ -27,7 +27,7 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { private static final List recipes = new ArrayList<>(); - private void createInoculatorRecipeForNEI(ItemStack dnaManipulable) { + private void createSplicerRecipeForNEI(ItemStack dnaManipulable) { recipes.add( new SplicerRecipe(dnaManipulable, new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE))); recipes.add( @@ -39,13 +39,13 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { @Override public void prepare() { if (BinnieCore.isApicultureActive()) - createInoculatorRecipeForNEI(Mods.forestry.stack("beeLarvaeGE", 1, OreDictionary.WILDCARD_VALUE)); + createSplicerRecipeForNEI(Mods.forestry.stack("beeLarvaeGE", 1, OreDictionary.WILDCARD_VALUE)); if (BinnieCore.isArboricultureActive()) - createInoculatorRecipeForNEI(Mods.forestry.stack("pollenFertile", 1, OreDictionary.WILDCARD_VALUE)); + createSplicerRecipeForNEI(Mods.forestry.stack("pollenFertile", 1, OreDictionary.WILDCARD_VALUE)); if (BinnieCore.isLepidopteryActive()) - createInoculatorRecipeForNEI(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); + createSplicerRecipeForNEI(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); if (BinnieCore.isBotanyActive()) - createInoculatorRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); + createSplicerRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); } @Override @@ -112,7 +112,7 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { } } - private static class SplicerRecipe { + public static class SplicerRecipe { private final ItemStack dnaManipulable; private final ItemStack serum;