diff --git a/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java b/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java index 292edbb61..56d7407e0 100644 --- a/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java +++ b/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java @@ -4,10 +4,8 @@ import binnie.botany.api.BotanyAPI; import binnie.botany.api.IBotanyColored; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; public enum EnumFlowerColor implements IBotanyColored { Aquamarine("aquamarine", new Color(8388564)), diff --git a/botany/src/main/java/binnie/botany/blocks/BlockFlower.java b/botany/src/main/java/binnie/botany/blocks/BlockFlower.java index fef2d9cc0..d3bda5dea 100644 --- a/botany/src/main/java/binnie/botany/blocks/BlockFlower.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockFlower.java @@ -155,7 +155,7 @@ public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, Entity IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot(); TileEntity flower = world.getTileEntity(pos); if (world.isRemote) { - if (flower != null && flower instanceof TileEntityFlower) { + if (flower instanceof TileEntityFlower) { IFlower f = flowerRoot.getMember(stack); if (f != null) { ((TileEntityFlower) flower).setRender(new FlowerRenderInfo(f, (TileEntityFlower) flower)); @@ -165,7 +165,7 @@ public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, Entity } TileEntity below = world.getTileEntity(pos.down()); - if (flower != null && flower instanceof TileEntityFlower) { + if (flower instanceof TileEntityFlower) { if (below instanceof TileEntityFlower) { ((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection()); } else { diff --git a/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java b/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java index fa3fcc2df..10806694b 100644 --- a/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -305,7 +305,7 @@ public boolean plant(World world, BlockPos pos, IFlower flower, GameProfile owne TileEntity tile = world.getTileEntity(pos); TileEntity below = world.getTileEntity(pos.down()); - if (tile != null && tile instanceof TileEntityFlower) { + if (tile instanceof TileEntityFlower) { TileEntityFlower tileFlower = (TileEntityFlower) tile; if (below instanceof TileEntityFlower) { tileFlower.setSection(((TileEntityFlower) below).getSection()); @@ -325,7 +325,7 @@ public void tryGrowSection(World world, BlockPos pos) { } TileEntity tileFlower = world.getTileEntity(pos); - if (tileFlower == null || !(tileFlower instanceof TileEntityFlower)) { + if (!(tileFlower instanceof TileEntityFlower)) { return; } @@ -340,7 +340,7 @@ public void tryGrowSection(World world, BlockPos pos) { if (blockAbove.getBlock().isReplaceable(world, up)) { world.setBlockState(up, ModuleFlowers.flower.getDefaultState()); TileEntity flowerAbove = world.getTileEntity(up); - if (flowerAbove != null && flowerAbove instanceof TileEntityFlower) { + if (flowerAbove instanceof TileEntityFlower) { ((TileEntityFlower) flowerAbove).setSection(section + 1); } } diff --git a/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java index e2b955b1f..42f824ab9 100644 --- a/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java +++ b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java @@ -59,7 +59,7 @@ private static class FlowerIconDisplay extends ControlIconDisplay { private final IFlowerType type; public FlowerIconDisplay(AnalystPageAppearance analystPageAppearance, int width, int y, int sections, IFlower flower, IFlowerType type) { - super(analystPageAppearance, (analystPageAppearance.getWidth() - width) / 2, y - ((sections == 1) ? 0 : 0)); + super(analystPageAppearance, (analystPageAppearance.getWidth() - width) / 2, y ); this.width = width; this.sections = sections; this.flower = flower; diff --git a/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java b/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java index e51c1c953..7c3cf3cfe 100644 --- a/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java +++ b/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java @@ -356,7 +356,7 @@ public SPacketUpdateTileEntity getUpdatePacket() { public void updateRender(boolean update) { if (update && getFlower() != null && getFlower().getGenome() != null) { FlowerRenderInfo newInfo = new FlowerRenderInfo(getFlower(), this); - if (renderInfo == null || !newInfo.equals(renderInfo)) { + if (!newInfo.equals(renderInfo)) { setRender(newInfo); } } diff --git a/core-api/src/main/java/binnie/core/api/gui/ITopLevelWidget.java b/core-api/src/main/java/binnie/core/api/gui/ITopLevelWidget.java index 823b8b41f..d9e49d479 100644 --- a/core-api/src/main/java/binnie/core/api/gui/ITopLevelWidget.java +++ b/core-api/src/main/java/binnie/core/api/gui/ITopLevelWidget.java @@ -2,9 +2,6 @@ import javax.annotation.Nullable; -import binnie.core.api.gui.IPoint; -import binnie.core.api.gui.IWidget; - public interface ITopLevelWidget extends IWidget { IPoint getAbsoluteMousePosition(); diff --git a/core/src/main/java/binnie/core/Binnie.java b/core/src/main/java/binnie/core/Binnie.java index ebc67f232..2379e30f8 100644 --- a/core/src/main/java/binnie/core/Binnie.java +++ b/core/src/main/java/binnie/core/Binnie.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import binnie.core.ManagerBase; import binnie.core.genetics.ManagerGenetics; import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.ManagerMachine; diff --git a/core/src/main/java/binnie/core/genetics/AlleleHelper.java b/core/src/main/java/binnie/core/genetics/AlleleHelper.java index abf55b7e8..afd341ad8 100644 --- a/core/src/main/java/binnie/core/genetics/AlleleHelper.java +++ b/core/src/main/java/binnie/core/genetics/AlleleHelper.java @@ -1,7 +1,9 @@ package binnie.core.genetics; import java.util.Locale; +import java.util.regex.Pattern; +import binnie.core.util.EmptyHelper; import org.apache.commons.lang3.text.WordUtils; import forestry.api.core.EnumHumidity; @@ -13,6 +15,8 @@ import binnie.core.util.I18N; +import javax.annotation.Nullable; + public class AlleleHelper extends forestry.core.genetics.alleles.AlleleHelper { public static IAllele getAllele(EnumTemperature temperature) { return getAllele(getUid(temperature)); @@ -195,16 +199,18 @@ protected static String getUid(String key, String valueName) { return getUid(key, valueName, true); } + private static final Pattern PATTERN_REPLACEMENT = Pattern.compile("_"); + private static String getUid(String key, String valueName, boolean needCapitalize) { if (needCapitalize) { valueName = WordUtils.capitalize(valueName.toLowerCase(Locale.ENGLISH)); } - valueName = valueName.replace("_", ""); + valueName = PATTERN_REPLACEMENT.matcher(valueName).replaceAll(EmptyHelper.EMPTY_STRING); return "forestry." + key + valueName; } - private static String toAlleleDisplay(String key, String valueName) { - String name = valueName.toLowerCase().replace("_", ""); + private static String toAlleleDisplay(@Nullable String key, String valueName) { + String name = PATTERN_REPLACEMENT.matcher(valueName.toLowerCase()).replaceAll(EmptyHelper.EMPTY_STRING); if (key == null) { return I18N.localise("forestry.allele." + name); } diff --git a/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java b/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java index 8ce903ca0..aec5a9fcb 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java +++ b/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java @@ -5,11 +5,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.regex.Pattern; import binnie.core.api.gui.IPoint; import binnie.core.gui.KeyBindings; import binnie.core.gui.geometry.Point; import binnie.core.util.Log; +import binnie.core.util.EmptyHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; @@ -129,6 +131,8 @@ public void drawScreen(final int mouseX, final int mouseY, final float partialTi GlStateManager.enableDepth(); } + private static final Pattern PATTERN_NBT_CONTENT = Pattern.compile(Tooltip.NBT_SEPARATOR + "(.*?)" + Tooltip.NBT_SEPARATOR); + public void renderTooltip(final Point mousePosition, final MinecraftTooltip tooltip) { final int mouseX = mousePosition.xPos(); final int mouseY = mousePosition.yPos(); @@ -152,7 +156,7 @@ public void renderTooltip(final Point mousePosition, final MinecraftTooltip tool for (String textLine : textLines) { int textLineWidth = font.getStringWidth(textLine); if (textLine.contains(Tooltip.NBT_SEPARATOR)) { - textLineWidth = 12 + font.getStringWidth(textLine.replaceAll(Tooltip.NBT_SEPARATOR + "(.*?)" + Tooltip.NBT_SEPARATOR, "")); + textLineWidth = 12 + font.getStringWidth(PATTERN_NBT_CONTENT.matcher(textLine).replaceAll(EmptyHelper.EMPTY_STRING)); } if (textLineWidth > tooltipTextWidth) { tooltipTextWidth = textLineWidth; @@ -207,7 +211,7 @@ private void drawHoveringText(@Nonnull ItemStack itemStack, List textLin for (String line : wrappedLine) { int lineWidth = font.getStringWidth(line); if (textLine.contains(Tooltip.NBT_SEPARATOR)) { - lineWidth = 12 + font.getStringWidth(textLine.replaceAll(Tooltip.NBT_SEPARATOR + "(.*?)" + Tooltip.NBT_SEPARATOR, "")); + lineWidth = 12 + font.getStringWidth(PATTERN_NBT_CONTENT.matcher(textLine).replaceAll(EmptyHelper.EMPTY_STRING)); } if (lineWidth > wrappedTooltipWidth) { wrappedTooltipWidth = lineWidth; @@ -262,7 +266,7 @@ private void drawHoveringText(@Nonnull ItemStack itemStack, List textLin } if (line.contains(Tooltip.NBT_SEPARATOR)) { drawItem(line, tooltipX, tooltipY); - line = " " + line.replaceAll(Tooltip.NBT_SEPARATOR + "(.*?)" + Tooltip.NBT_SEPARATOR, ""); + line = " " + PATTERN_NBT_CONTENT.matcher(line).replaceAll(EmptyHelper.EMPTY_STRING); } font.drawStringWithShadow(line, tooltipX, tooltipY, -1); if (lineNumber + 1 == titleLinesCount) { diff --git a/core/src/main/java/binnie/core/network/BinnieCorePacketID.java b/core/src/main/java/binnie/core/network/BinnieCorePacketID.java index 16249284b..32e5ca88b 100644 --- a/core/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/core/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -58,7 +58,7 @@ public void onMessage(final MessageBinnie message, final MessageContext context) final TileEntity tile = packet4.getTarget(BinnieCore.getBinnieProxy().getWorld()); if (tile != null && packet4.getTagCompound() != null) { final IMachine machine = Machine.getMachine(tile); - if (machine != null && machine instanceof INetwork.TilePacketSync) { + if (machine instanceof INetwork.TilePacketSync) { ((INetwork.TilePacketSync) machine).syncFromNBT(packet4.getTagCompound()); } } diff --git a/core/src/main/java/binnie/core/proxy/I18NClient.java b/core/src/main/java/binnie/core/proxy/I18NClient.java index 82bbd3184..c931a1d3a 100644 --- a/core/src/main/java/binnie/core/proxy/I18NClient.java +++ b/core/src/main/java/binnie/core/proxy/I18NClient.java @@ -8,8 +8,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.IllegalFormatException; - @SideOnly(Side.CLIENT) public class I18NClient implements I18NProxy { diff --git a/core/src/main/java/binnie/core/util/EmptyHelper.java b/core/src/main/java/binnie/core/util/EmptyHelper.java new file mode 100644 index 000000000..41bccfa45 --- /dev/null +++ b/core/src/main/java/binnie/core/util/EmptyHelper.java @@ -0,0 +1,7 @@ +package binnie.core.util; + +public final class EmptyHelper { + private EmptyHelper() {} + + public static final String EMPTY_STRING = ""; +} diff --git a/design/src/main/java/binnie/design/gui/ControlRecipeSlot.java b/design/src/main/java/binnie/design/gui/ControlRecipeSlot.java index 5d1cec926..9f8a6fcab 100644 --- a/design/src/main/java/binnie/design/gui/ControlRecipeSlot.java +++ b/design/src/main/java/binnie/design/gui/ControlRecipeSlot.java @@ -17,7 +17,7 @@ public ControlRecipeSlot(final IWidget parent, final int x, final int y) { super(parent, x, y, 50); this.addSelfEventHandler(EventMouse.Down.class, event -> { final TileEntity tile = (TileEntity) Window.get(ControlRecipeSlot.this.getWidget()).getInventory(); - if (tile == null || !(tile instanceof TileEntityMachine)) { + if (!(tile instanceof TileEntityMachine)) { return; } final NBTTagCompound nbt = new NBTTagCompound(); diff --git a/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java index 2dab22728..47b13b244 100644 --- a/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java +++ b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java @@ -5,7 +5,6 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java b/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java index 073a9a982..aa2bd5928 100644 --- a/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java +++ b/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java @@ -14,7 +14,6 @@ import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeEmbedded.java b/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeEmbedded.java index 3e305455a..58ab74166 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeEmbedded.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeEmbedded.java @@ -31,7 +31,7 @@ public boolean matches(final InventoryCrafting inv, final World world) { if (!a.isEmpty() && !b.isEmpty() && !c.isEmpty()) { FenceType type = WoodManager.getFenceType(a); FenceType typeSecond = WoodManager.getFenceType(c); - if (type != null && typeSecond != null && type.equals(typeSecond)) { + if (type != null && type.equals(typeSecond)) { FenceDescription fenceDescription = WoodManager.getFenceDescription(a); if (fenceDescription != null) { IPlankType descPlankType = fenceDescription.getPlankType(); diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeSolid.java b/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeSolid.java index a215d6381..06162982e 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeSolid.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeSolid.java @@ -31,7 +31,7 @@ public boolean matches(final InventoryCrafting inv, final World world) { FenceType 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)) { FenceDescription fenceDescription = WoodManager.getFenceDescription(a); if (fenceDescription != null) { FenceType fenceType = new FenceType(type.getSize(), true, type.isSolid()); diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderNone.java b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderNone.java index 97b53723f..eb1b4f783 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderNone.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderNone.java @@ -75,7 +75,7 @@ public IFruitFamily getFamily() { @Override public int getRipeningPeriod() { - return this.RIPENING_PERIOD; + return RIPENING_PERIOD; } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java b/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java index cb705aa93..e27b7de8f 100644 --- a/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java @@ -6,7 +6,6 @@ import binnie.core.machines.IMachineType; import binnie.core.machines.MachinePackage; -import binnie.genetics.Genetics; import binnie.genetics.machine.splicer.PackageSplicer; public enum AdvGeneticMachine implements IMachineType { diff --git a/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java b/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java index de500589d..3834c8779 100644 --- a/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java @@ -1,17 +1,13 @@ package binnie.genetics.machine; -import javax.annotation.Resource; import java.util.function.Supplier; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import binnie.core.Constants; import binnie.core.machines.IMachineType; import binnie.core.machines.MachinePackage; import binnie.core.machines.TileEntityMachine; -import binnie.genetics.Genetics; import binnie.genetics.machine.inoculator.PackageInoculator; import binnie.genetics.machine.isolator.PackageIsolator; import binnie.genetics.machine.polymeriser.PackagePolymeriser; diff --git a/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java b/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java index b684a8b38..797390106 100644 --- a/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java @@ -58,7 +58,7 @@ public ErrorState canProgress() { @Override protected void onTickTask() { - if (this.rand.nextInt(20) == 0 && this.recipe != null && this.rand.nextFloat() < this.recipe.getChance()) { + if (this.recipe != null && this.rand.nextInt(20) == 0 && this.rand.nextFloat() < this.recipe.getChance()) { this.recipe.doTask(this.getUtil()); } }