diff --git a/botany-api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java b/botany-api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java index 50343997..3ac3554a 100644 --- a/botany-api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java +++ b/botany-api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java @@ -12,6 +12,7 @@ public enum EnumAcidity implements IStringSerializable { ALKALINE(TextFormatting.AQUA); @Nullable + private final TextFormatting color; EnumAcidity(@Nullable TextFormatting color) { diff --git a/botany-api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java b/botany-api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java index aa8f154a..cb29b86b 100644 --- a/botany-api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java +++ b/botany-api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java @@ -13,7 +13,7 @@ public enum EnumMoisture implements IStringSerializable { DAMP(TextFormatting.DARK_BLUE); @Nullable - final TextFormatting color; + private final TextFormatting color; EnumMoisture(@Nullable TextFormatting color) { this.color = color; diff --git a/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java b/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java index 211e8693..76462a06 100644 --- a/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java +++ b/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java @@ -25,7 +25,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/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java b/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java index cde1ba79..2c3469a6 100644 --- a/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java +++ b/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java @@ -8,7 +8,7 @@ public enum EnumFlowerStage implements ISpeciesType { POLLEN("Pollen"); public static final EnumFlowerStage[] VALUES = values(); - String name; + private final String name; EnumFlowerStage(String name) { this.name = name; diff --git a/botany/src/main/java/binnie/botany/CreativeTabBotany.java b/botany/src/main/java/binnie/botany/CreativeTabBotany.java index 243b964d..6116aa4d 100644 --- a/botany/src/main/java/binnie/botany/CreativeTabBotany.java +++ b/botany/src/main/java/binnie/botany/CreativeTabBotany.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.util.I18N; public class CreativeTabBotany extends CreativeTabs { - public static CreativeTabs instance = new CreativeTabBotany(); + public static final CreativeTabs INSTANCE = new CreativeTabBotany(); public CreativeTabBotany() { super("Botany"); diff --git a/botany/src/main/java/binnie/botany/blocks/BlockCeramic.java b/botany/src/main/java/binnie/botany/blocks/BlockCeramic.java index bd56e746..b91c3a9e 100644 --- a/botany/src/main/java/binnie/botany/blocks/BlockCeramic.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockCeramic.java @@ -38,7 +38,7 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi setHardness(1.0f); setResistance(5.0f); setRegistryName("ceramic"); - setCreativeTab(CreativeTabBotany.instance); + setCreativeTab(CreativeTabBotany.INSTANCE); } @Override diff --git a/botany/src/main/java/binnie/botany/blocks/BlockCeramicBrick.java b/botany/src/main/java/binnie/botany/blocks/BlockCeramicBrick.java index eceb8814..4c21d33f 100644 --- a/botany/src/main/java/binnie/botany/blocks/BlockCeramicBrick.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockCeramicBrick.java @@ -71,7 +71,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock primary; - Map secondary; + public static final CeramicDesignSystem instance = new CeramicDesignSystem(); + private final Map primary; + private final Map secondary; CeramicDesignSystem() { primary = new HashMap<>(); @@ -52,7 +52,7 @@ public class CeramicDesignSystem implements IDesignSystem { @Override public int getMaterialIndex(IDesignMaterial id) { - return ((CeramicColor) id).color.ordinal(); + return ((CeramicColor) id).getMaterialIndex(); } public String getTexturePath() { diff --git a/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java index 89eb2dae..f7a1c339 100644 --- a/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java +++ b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java @@ -17,11 +17,11 @@ import binnie.core.util.I18N; public class CeramicBrickPair { public static final CeramicBrickPair EMPTY = new CeramicBrickPair(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkSeaGreen, CeramicBrickType.TILE); - public final EnumFlowerColor colorFirst; - public final EnumFlowerColor colorSecond; + private final EnumFlowerColor colorFirst; + private final EnumFlowerColor colorSecond; - public CeramicBrickType type; - public int ordinal; + private CeramicBrickType type; + private int ordinal; public CeramicBrickPair(EnumFlowerColor colorFirst, EnumFlowerColor colorSecond, CeramicBrickType type) { this.colorFirst = colorFirst; @@ -63,7 +63,7 @@ public class CeramicBrickPair { if (type.canDouble() && colorSecond != colorFirst) { name = name + " & " + colorSecond.getFlowerColorAllele().getColorName(); } - return I18N.localise("botany.ceramic.type." + type.id + ".name", name); + return I18N.localise("botany.ceramic.type." + type.getId() + ".name", name); } public int ordinal() { @@ -72,7 +72,7 @@ public class CeramicBrickPair { @SideOnly(Side.CLIENT) public TextureAtlasSprite getSprite(int pass) { - TextureAtlasSprite[] sprites = type.sprites; + TextureAtlasSprite[] sprites = type.getSprites(); Preconditions.checkState(sprites != null, "Sprites have not been registered."); return sprites[pass]; } @@ -87,4 +87,20 @@ public class CeramicBrickPair { return obj instanceof CeramicBrickPair && ((CeramicBrickPair) obj).type == type; } + + public EnumFlowerColor getColorFirst() { + return colorFirst; + } + + public EnumFlowerColor getColorSecond() { + return colorSecond; + } + + public CeramicBrickType getType() { + return type; + } + + public void setType(CeramicBrickType type) { + this.type = type; + } } diff --git a/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java index 66f46a9d..241e0147 100644 --- a/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java +++ b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java @@ -69,8 +69,8 @@ public enum CeramicBrickType implements IStringSerializable { if (stacks.size() == 1) { ItemStack stack3 = stacks.get(0); CeramicBrickPair type3 = new CeramicBrickPair(stack3); - if (type3.type == CeramicBrickType.VERTICAL_LARGE_BRICK) { - type3.type = this; + if (type3.getType() == CeramicBrickType.VERTICAL_LARGE_BRICK) { + type3.setType(this); return type3.getStack(1); } return ItemStack.EMPTY; @@ -86,10 +86,10 @@ public enum CeramicBrickType implements IStringSerializable { return ItemStack.EMPTY; } CeramicBrickPair type4 = new CeramicBrickPair(stack4); - if (type4.type != CeramicBrickType.TILE) { + if (type4.getType() != CeramicBrickType.TILE) { return ItemStack.EMPTY; } - int color5 = type4.colorFirst.ordinal(); + int color5 = type4.getColorFirst().ordinal(); if (colors[0] == -1) { colors[0] = color5; a++; @@ -126,10 +126,10 @@ public enum CeramicBrickType implements IStringSerializable { return ItemStack.EMPTY; } CeramicBrickPair type = new CeramicBrickPair(stack2); - if (type.type != CeramicBrickType.TILE) { + if (type.getType() != CeramicBrickType.TILE) { return ItemStack.EMPTY; } - int color2 = type.colorFirst.ordinal(); + int color2 = type.getColorFirst().ordinal(); if (colors[alt] == -1) { colors[alt] = color2; } else if (colors[alt] != color2) { @@ -152,11 +152,11 @@ public enum CeramicBrickType implements IStringSerializable { return ItemStack.EMPTY; } CeramicBrickPair type2 = new CeramicBrickPair(stack2); - if (type2.type != CeramicBrickType.SPLIT) { + if (type2.getType() != CeramicBrickType.SPLIT) { return ItemStack.EMPTY; } - int color3 = type2.colorFirst.ordinal(); - int color4 = type2.colorSecond.ordinal(); + int color3 = type2.getColorFirst().ordinal(); + int color4 = type2.getColorSecond().ordinal(); if (colors[0] == -1) { colors[0] = color3; colors[1] = color4; @@ -184,14 +184,14 @@ public enum CeramicBrickType implements IStringSerializable { if (type2.isTwoColors()) { return ItemStack.EMPTY; } - int color3 = type2.colorFirst.ordinal(); - if (type2.type == CeramicBrickType.SPLIT) { + int color3 = type2.getColorFirst().ordinal(); + if (type2.getType() == CeramicBrickType.SPLIT) { if (colors[1] != -1) { return ItemStack.EMPTY; } colors[1] = color3; } else { - if (type2.type != CeramicBrickType.CHEQUERED) { + if (type2.getType() != CeramicBrickType.CHEQUERED) { return ItemStack.EMPTY; } if (colors[0] == -1) { @@ -200,7 +200,7 @@ public enum CeramicBrickType implements IStringSerializable { return ItemStack.EMPTY; } } - int color4 = type2.colorSecond.ordinal(); + int color4 = type2.getColorSecond().ordinal(); } if (colors[0] == -1 || colors[1] == -1) { return ItemStack.EMPTY; @@ -229,11 +229,11 @@ public enum CeramicBrickType implements IStringSerializable { public static final CeramicBrickType[] VALUES = values(); - public String id; + private final String id; @SideOnly(Side.CLIENT) @Nullable - public TextureAtlasSprite[] sprites; + private TextureAtlasSprite[] sprites; CeramicBrickType(String id) { this.id = id; @@ -255,18 +255,18 @@ public enum CeramicBrickType implements IStringSerializable { } ItemStack stack5 = stacks.get(0); CeramicBrickPair type = new CeramicBrickPair(stack5); - if (type.type == CeramicBrickType.LARGE_BRICK) { - type.type = CeramicBrickType.VERTICAL_LARGE_BRICK; + if (type.getType() == CeramicBrickType.LARGE_BRICK) { + type.setType(CeramicBrickType.VERTICAL_LARGE_BRICK); return type.getStack(1); } - if (type.type == CeramicBrickType.BRICK) { - type.type = CeramicBrickType.VERTICAL_BRICK; + if (type.getType() == CeramicBrickType.BRICK) { + type.setType(CeramicBrickType.VERTICAL_BRICK); return type.getStack(1); } - if (type.type == CeramicBrickType.STRIPE_BRICK) { - type.type = CeramicBrickType.VERTICAL_STRIPE_BRICK; + if (type.getType() == CeramicBrickType.STRIPE_BRICK) { + type.setType(CeramicBrickType.VERTICAL_STRIPE_BRICK); return type.getStack(1); } return ItemStack.EMPTY; @@ -276,13 +276,13 @@ public enum CeramicBrickType implements IStringSerializable { if (stacks.size() == 1) { ItemStack stack5 = stacks.get(0); CeramicBrickPair type = new CeramicBrickPair(stack5); - if (type.type == CeramicBrickType.VERTICAL_BRICK) { - type.type = ceramicType; + if (type.getType() == CeramicBrickType.VERTICAL_BRICK) { + type.setType(ceramicType); return type.getStack(1); } - if (type.type == CeramicBrickType.STRIPE_BRICK) { - type.type = ceramicType; + if (type.getType() == CeramicBrickType.STRIPE_BRICK) { + type.setType(ceramicType); return type.getStack(1); } return ItemStack.EMPTY; @@ -295,12 +295,12 @@ public enum CeramicBrickType implements IStringSerializable { } CeramicBrickPair type4 = new CeramicBrickPair(stack4); - if (type4.type != CeramicBrickType.LARGE_BRICK) { + if (type4.getType() != CeramicBrickType.LARGE_BRICK) { return ItemStack.EMPTY; } - int color5 = type4.colorFirst.ordinal(); - int color6 = type4.colorSecond.ordinal(); + int color5 = type4.getColorFirst().ordinal(); + int color6 = type4.getColorSecond().ordinal(); int alt2 = (index2 != 0 && index2 != 3) ? 1 : 0; if (ceramicType == CeramicBrickType.STRIPE_BRICK) { alt2 = 0; @@ -326,4 +326,19 @@ public enum CeramicBrickType implements IStringSerializable { public String getName() { return id; } + + public String getId() { + return id; + } + + @Nullable + @SideOnly(Side.CLIENT) + public TextureAtlasSprite[] getSprites() { + return sprites; + } + + @SideOnly(Side.CLIENT) + public void setSprites(TextureAtlasSprite[] sprites) { + this.sprites = sprites; + } } diff --git a/botany/src/main/java/binnie/botany/farming/CircuitGarden.java b/botany/src/main/java/binnie/botany/farming/CircuitGarden.java index 7756191e..a8cb4ff5 100644 --- a/botany/src/main/java/binnie/botany/farming/CircuitGarden.java +++ b/botany/src/main/java/binnie/botany/farming/CircuitGarden.java @@ -19,7 +19,7 @@ import binnie.core.util.I18N; public class CircuitGarden extends BinnieCircuit { private boolean isManual; - private GardenLogic logic; + private final GardenLogic logic; public CircuitGarden(EnumMoisture moisture, @Nullable EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) { super(getName(moisture, ph, manual, fertilised), 4, getLayout(manual), recipe); diff --git a/botany/src/main/java/binnie/botany/farming/FarmLogic.java b/botany/src/main/java/binnie/botany/farming/FarmLogic.java index 3985244d..cbabacb1 100644 --- a/botany/src/main/java/binnie/botany/farming/FarmLogic.java +++ b/botany/src/main/java/binnie/botany/farming/FarmLogic.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; import forestry.api.farming.IFarmLogic; public abstract class FarmLogic implements IFarmLogic { - boolean isManual; + private boolean isManual; @Override public IFarmLogic setManual(boolean flag) { @@ -46,4 +46,8 @@ public abstract class FarmLogic implements IFarmLogic { protected final void setBlock(World world, BlockPos pos, Block block, int meta) { world.setBlockState(pos, block.getStateFromMeta(meta), 2); } + + public boolean isManual() { + return isManual; + } } diff --git a/botany/src/main/java/binnie/botany/farming/FlowerCrop.java b/botany/src/main/java/binnie/botany/farming/FlowerCrop.java index e6630ed3..00d12dae 100644 --- a/botany/src/main/java/binnie/botany/farming/FlowerCrop.java +++ b/botany/src/main/java/binnie/botany/farming/FlowerCrop.java @@ -10,8 +10,8 @@ import net.minecraft.util.math.BlockPos; import forestry.api.farming.ICrop; public class FlowerCrop implements ICrop { - NonNullList drops = NonNullList.create(); - BlockPos position; + private final NonNullList drops = NonNullList.create(); + private final BlockPos position; public FlowerCrop(BlockPos pos, ItemStack... drops) { Collections.addAll(this.drops, drops); diff --git a/botany/src/main/java/binnie/botany/farming/GardenLogic.java b/botany/src/main/java/binnie/botany/farming/GardenLogic.java index 96b8e59b..27f6489e 100644 --- a/botany/src/main/java/binnie/botany/farming/GardenLogic.java +++ b/botany/src/main/java/binnie/botany/farming/GardenLogic.java @@ -43,17 +43,17 @@ import binnie.botany.tile.TileEntityFlower; import binnie.core.liquid.ManagerLiquid; public class GardenLogic extends FarmLogic { - List farmables; - private EnumMoisture moisture; + private final List farmables; + private final EnumMoisture moisture; @Nullable - private EnumAcidity acidity; - private boolean fertilised; - private String name; + private final EnumAcidity acidity; + private final boolean fertilised; + private final String name; private NonNullList produce; private ItemStack icon; public GardenLogic(EnumMoisture moisture, @Nullable EnumAcidity acidity, boolean isManual, boolean isFertilised, ItemStack icon, String name) { - this.isManual = isManual; + this.setManual(isManual); this.moisture = moisture; this.acidity = acidity; this.fertilised = isFertilised; @@ -96,7 +96,7 @@ public class GardenLogic extends FarmLogic { @Override public boolean cultivate(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) { return maintainSoil(world, pos, direction, extent, farmHousing) || - (!isManual && maintainWater(world, pos, direction, extent, farmHousing)) || + (!isManual() && maintainWater(world, pos, direction, extent, farmHousing)) || maintainCrops(world, pos.up(), direction, extent, farmHousing); } @@ -150,7 +150,7 @@ public class GardenLogic extends FarmLogic { setBlock(world, position, Blocks.AIR, 0); return trySetSoil(world, position, loam, housing); } - } else if (!isManual) { + } else if (!isManual()) { if (!isWaterBlock(world, position)) { if (i % 2 == 0) { return trySetSoil(world, position, housing); @@ -317,7 +317,7 @@ public class GardenLogic extends FarmLogic { @Override public Collection harvest(World world, BlockPos pos, FarmDirection direction, int extent) { - if (isManual) { + if (isManual()) { return Collections.emptyList(); } return farmables.stream().map(farmable -> farmable.getCropAt(world, pos.up(), world.getBlockState(pos.up()))) diff --git a/botany/src/main/java/binnie/botany/genetics/AlleleFlowerColor.java b/botany/src/main/java/binnie/botany/genetics/AlleleFlowerColor.java index e3bd7ef7..3d2ac462 100644 --- a/botany/src/main/java/binnie/botany/genetics/AlleleFlowerColor.java +++ b/botany/src/main/java/binnie/botany/genetics/AlleleFlowerColor.java @@ -7,13 +7,13 @@ import binnie.core.util.I18N; import forestry.api.genetics.IAlleleInteger; public class AlleleFlowerColor implements IAlleleFlowerColor { - private int color; - private String uid; - private boolean isDominant; - private String name; - private String unlocalizedName; - private int colorWilted; - private int id; + private final int color; + private final String uid; + private final boolean isDominant; + private final String name; + private final String unlocalizedName; + private final int colorWilted; + private final int id; public AlleleFlowerColor(String uid, int id, Color color, Color colorWilted, String name, String unlocalizedName, boolean isDominant) { this.color = color.getRGB(); diff --git a/botany/src/main/java/binnie/botany/genetics/EnumFlowerType.java b/botany/src/main/java/binnie/botany/genetics/EnumFlowerType.java index d8f0a03a..e3498ce7 100644 --- a/botany/src/main/java/binnie/botany/genetics/EnumFlowerType.java +++ b/botany/src/main/java/binnie/botany/genetics/EnumFlowerType.java @@ -67,10 +67,10 @@ public enum EnumFlowerType implements IFlowerType { public static EnumFlowerType[] VALUES = values(); public static int highestSection = 2; - int sections; - ModelResourceLocation flower; - ModelResourceLocation seed; - ModelResourceLocation pollen; + private final int sections; + private ModelResourceLocation flower; + private ModelResourceLocation seed; + private ModelResourceLocation pollen; EnumFlowerType() { this(1); diff --git a/botany/src/main/java/binnie/botany/genetics/Flower.java b/botany/src/main/java/binnie/botany/genetics/Flower.java index f34856af..901fc13a 100644 --- a/botany/src/main/java/binnie/botany/genetics/Flower.java +++ b/botany/src/main/java/binnie/botany/genetics/Flower.java @@ -25,10 +25,10 @@ import binnie.botany.core.BotanyCore; import binnie.core.util.I18N; public class Flower extends Individual implements IFlower { - public IFlowerGenome genome; + private final IFlowerGenome genome; @Nullable - public IFlowerGenome mate; + private IFlowerGenome mate; private int age; private boolean wilting; diff --git a/botany/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java b/botany/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java index 2112f40c..33bb3b6e 100644 --- a/botany/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java +++ b/botany/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java @@ -51,11 +51,11 @@ public class FlowerAlyzerPlugin implements IAlyzerPlugin { EnumFlowerChromosome.PH_TOLERANCE }; private int lastTopOffset; - private int rowSize = 12; - private int margin = 10; + private final int rowSize = 12; + private final int margin = 10; private int guiLeft; private int guiTop; - private HashMap iconStacks = new HashMap<>(); + private final HashMap iconStacks = new HashMap<>(); public FlowerAlyzerPlugin() { @@ -65,10 +65,12 @@ public class FlowerAlyzerPlugin implements IAlyzerPlugin { } + @SideOnly(Side.CLIENT) public void drawLine(GuiScreen gui, int xOffset, String msg, int color) { gui.mc.fontRenderer.drawString(msg, guiLeft + xOffset, guiTop + lastTopOffset + margin, color); } + @SideOnly(Side.CLIENT) public void drawChromosome(GuiScreen gui, EnumFlowerChromosome chromosome, IFlower flower) { drawLine(gui, COLUMN_0, StringUtils.capitalize(chromosome.getName()), 0xEEEEEE); drawLine(gui, COLUMN_1, I18N.localise(flower.getGenome().getActiveAllele(chromosome).getUnlocalizedName()), 0xEEEEEE); diff --git a/botany/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/botany/src/main/java/binnie/botany/genetics/FlowerDefinition.java index 02edaf92..154e1b3a 100644 --- a/botany/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/botany/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -944,14 +944,15 @@ public enum FlowerDefinition implements IFlowerDefinition { public static FlowerDefinition[] VALUES = values(); private final IAlleleFlowerSpecies species; - IFlowerType type; - String name; - String binomial; - String branchName; - List variantTemplates; + private final IFlowerType type; + private final String name; + private final String binomial; + private final String branchName; + private final List variantTemplates; @Nullable - IClassification branch; - EnumFlowerColor primaryColor, secondaryColor; + private IClassification branch; + private final EnumFlowerColor primaryColor; + private final EnumFlowerColor secondaryColor; private IAllele[] template; private IFlowerGenome genome; diff --git a/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java b/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java index d9f37568..37cf3f23 100644 --- a/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -42,12 +42,12 @@ import binnie.botany.modules.ModuleFlowers; import binnie.botany.tile.TileEntityFlower; public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { - static final String UID = "rootFlowers"; - public static int flowerSpeciesCount = -1; - public static ArrayList flowerTemplates = new ArrayList<>(); - private static ArrayList flowerMutations = new ArrayList<>(); - private static ArrayList colourMixes = new ArrayList<>(); - Map conversions; + private static final String UID = "rootFlowers"; + private static int flowerSpeciesCount = -1; + private static final ArrayList flowerTemplates = new ArrayList<>(); + private static final ArrayList flowerMutations = new ArrayList<>(); + private static final ArrayList colourMixes = new ArrayList<>(); + private final Map conversions; public FlowerRoot() { conversions = new HashMap<>(); diff --git a/botany/src/main/java/binnie/botany/gui/database/ControlColorMixBox.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixBox.java index f6979b7d..59a4165c 100644 --- a/botany/src/main/java/binnie/botany/gui/database/ControlColorMixBox.java +++ b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixBox.java @@ -6,7 +6,7 @@ import binnie.core.gui.controls.listbox.ControlListBox; public class ControlColorMixBox extends ControlListBox { private int index; - 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); diff --git a/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java index 0d3c46f2..c142ea71 100644 --- a/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java +++ b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java @@ -19,10 +19,10 @@ import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.util.I18N; public class ControlColorMixSymbol extends Control implements ITooltip { - static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.CONTROLS); - static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.CONTROLS); - IColorMix value; - int type; + private static final Texture MUTATION_PLUS = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.CONTROLS); + private static final Texture MUTATION_ARROW = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.CONTROLS); + private final IColorMix value; + private final int type; protected ControlColorMixSymbol(IWidget parent, int x, int y, int type, IColorMix value) { super(parent, x, y, 16 + type * 16, 16); @@ -36,9 +36,9 @@ public class ControlColorMixSymbol extends Control implements ITooltip { public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); if (type == 0) { - CraftGUI.RENDER.texture(ControlColorMixSymbol.MutationPlus, Point.ZERO); + CraftGUI.RENDER.texture(ControlColorMixSymbol.MUTATION_PLUS, Point.ZERO); } else { - CraftGUI.RENDER.texture(ControlColorMixSymbol.MutationArrow, Point.ZERO); + CraftGUI.RENDER.texture(ControlColorMixSymbol.MUTATION_ARROW, Point.ZERO); } } diff --git a/botany/src/main/java/binnie/botany/gui/database/ControlColorOption.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorOption.java index e9c43248..b5c72493 100644 --- a/botany/src/main/java/binnie/botany/gui/database/ControlColorOption.java +++ b/botany/src/main/java/binnie/botany/gui/database/ControlColorOption.java @@ -13,8 +13,8 @@ import binnie.core.gui.geometry.Point; @SideOnly(Side.CLIENT) public class ControlColorOption extends ControlTextOption { - private ControlColorDisplay controlBee; - private Point boxPosition; + private final ControlColorDisplay controlBee; + private final Point boxPosition; public ControlColorOption(ControlList controlList, IFlowerColor option, int y) { super(controlList, option, option.getColorName(), y); diff --git a/botany/src/main/java/binnie/botany/gui/database/PageColorMix.java b/botany/src/main/java/binnie/botany/gui/database/PageColorMix.java index 3422ea8e..e09cf659 100644 --- a/botany/src/main/java/binnie/botany/gui/database/PageColorMix.java +++ b/botany/src/main/java/binnie/botany/gui/database/PageColorMix.java @@ -15,8 +15,8 @@ import binnie.core.gui.database.PageAbstract; import binnie.core.util.I18N; public class PageColorMix extends PageAbstract { - ControlText title; - ControlColorMixBox list; + private final ControlText title; + private final ControlColorMixBox list; public PageColorMix(IWidget parent, DatabaseTab tab) { super(parent, tab); diff --git a/botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java b/botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java index 3b36e285..4b07f2f6 100644 --- a/botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java +++ b/botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java @@ -15,13 +15,13 @@ import binnie.core.gui.database.PageAbstract; import binnie.core.util.I18N; public class PageColorMixResultant extends PageAbstract { - ControlText pageSpeciesFurther_Title; - ControlColorMixBox pageSpeciesFurther_List; + private final ControlText pageSpeciesFurtherTitle; + private final ControlColorMixBox pageSpeciesFurtherList; public PageColorMixResultant(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.BOTANY_PAGES_KEY + ".species_further.title")); - pageSpeciesFurther_List = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.RESULTANT); + pageSpeciesFurtherTitle = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.BOTANY_PAGES_KEY + ".species_further.title")); + pageSpeciesFurtherList = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.RESULTANT); } @Override @@ -32,6 +32,6 @@ public class PageColorMixResultant extends PageAbstract { mixes.add(mix); } } - pageSpeciesFurther_List.setOptions(mixes); + pageSpeciesFurtherList.setOptions(mixes); } } diff --git a/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java b/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java index 893683b5..4ce119bd 100644 --- a/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java +++ b/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import binnie.core.api.gui.IArea; import binnie.core.gui.controls.page.ControlPage; +import binnie.core.gui.database.ModeWidgets; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; diff --git a/botany/src/main/java/binnie/botany/items/BotanyItems.java b/botany/src/main/java/binnie/botany/items/BotanyItems.java index a20ed97d..9f3df2b7 100644 --- a/botany/src/main/java/binnie/botany/items/BotanyItems.java +++ b/botany/src/main/java/binnie/botany/items/BotanyItems.java @@ -22,7 +22,7 @@ public enum BotanyItems implements IItemMiscProvider { MORTAR, WEEDKILLER; - String name; + private final String name; BotanyItems() { name = name().toLowerCase(Locale.ENGLISH); diff --git a/botany/src/main/java/binnie/botany/items/CeramicItems.java b/botany/src/main/java/binnie/botany/items/CeramicItems.java index 07b552ef..187ac017 100644 --- a/botany/src/main/java/binnie/botany/items/CeramicItems.java +++ b/botany/src/main/java/binnie/botany/items/CeramicItems.java @@ -15,7 +15,7 @@ import binnie.core.util.I18N; public enum CeramicItems implements IItemMiscProvider { MORTAR; - String name; + private final String name; CeramicItems() { name = name().toLowerCase(Locale.ENGLISH); diff --git a/botany/src/main/java/binnie/botany/items/EnumTubeInsulate.java b/botany/src/main/java/binnie/botany/items/EnumTubeInsulate.java index 68a4df22..9a1efd9b 100644 --- a/botany/src/main/java/binnie/botany/items/EnumTubeInsulate.java +++ b/botany/src/main/java/binnie/botany/items/EnumTubeInsulate.java @@ -15,8 +15,8 @@ public enum EnumTubeInsulate { public static final EnumTubeInsulate[] VALUES = values(); - int color; - String uid; + private final int color; + private final String uid; EnumTubeInsulate(int color, String uid) { this.color = color; diff --git a/botany/src/main/java/binnie/botany/items/EnumTubeMaterial.java b/botany/src/main/java/binnie/botany/items/EnumTubeMaterial.java index 01e3d2a1..28c5e660 100644 --- a/botany/src/main/java/binnie/botany/items/EnumTubeMaterial.java +++ b/botany/src/main/java/binnie/botany/items/EnumTubeMaterial.java @@ -10,8 +10,8 @@ public enum EnumTubeMaterial { public static final EnumTubeMaterial[] VALUES = values(); - int color; - String uid; + private final int color; + private final String uid; EnumTubeMaterial(int color, String uid) { this.color = color; diff --git a/botany/src/main/java/binnie/botany/items/ItemBotany.java b/botany/src/main/java/binnie/botany/items/ItemBotany.java index 4420c1f1..e3d52358 100644 --- a/botany/src/main/java/binnie/botany/items/ItemBotany.java +++ b/botany/src/main/java/binnie/botany/items/ItemBotany.java @@ -15,7 +15,7 @@ public class ItemBotany extends Item implements IItemModelRegister { public ItemBotany(String registryName) { setRegistryName(registryName); setUnlocalizedName(registryName); - setCreativeTab(CreativeTabBotany.instance); + setCreativeTab(CreativeTabBotany.INSTANCE); } @SideOnly(Side.CLIENT) diff --git a/botany/src/main/java/binnie/botany/items/ItemCeramicBrick.java b/botany/src/main/java/binnie/botany/items/ItemCeramicBrick.java index 51f6eb1f..21e58a89 100644 --- a/botany/src/main/java/binnie/botany/items/ItemCeramicBrick.java +++ b/botany/src/main/java/binnie/botany/items/ItemCeramicBrick.java @@ -27,9 +27,9 @@ public class ItemCeramicBrick extends ItemBlock implements IColoredItem { public int getColorFromItemstack(ItemStack stack, int tintIndex) { CeramicBrickPair ceramic = new CeramicBrickPair(stack); if (tintIndex == 1) { - return ceramic.colorFirst.getFlowerColorAllele().getColor(false); + return ceramic.getColorFirst().getFlowerColorAllele().getColor(false); } else if (tintIndex == 2) { - return ceramic.colorSecond.getFlowerColorAllele().getColor(false); + return ceramic.getColorSecond().getFlowerColorAllele().getColor(false); } return 0xffffff; } diff --git a/botany/src/main/java/binnie/botany/items/ItemFlowerGE.java b/botany/src/main/java/binnie/botany/items/ItemFlowerGE.java index 02b889fc..31e411ea 100644 --- a/botany/src/main/java/binnie/botany/items/ItemFlowerGE.java +++ b/botany/src/main/java/binnie/botany/items/ItemFlowerGE.java @@ -53,13 +53,13 @@ import binnie.botany.modules.ModuleFlowers; import binnie.core.util.I18N; public class ItemFlowerGE extends Item implements IColoredItem, IItemModelRegister { - private EnumFlowerStage type; - private String tag; + private final EnumFlowerStage type; + private final String tag; public ItemFlowerGE(String name, EnumFlowerStage type, String tag) { this.type = type; this.tag = tag; - setCreativeTab(CreativeTabBotany.instance); + setCreativeTab(CreativeTabBotany.INSTANCE); setUnlocalizedName(name); setRegistryName(name); hasSubtypes = true; diff --git a/botany/src/main/java/binnie/botany/items/ItemInsulatedTube.java b/botany/src/main/java/binnie/botany/items/ItemInsulatedTube.java index e01a03b9..4a81b479 100644 --- a/botany/src/main/java/binnie/botany/items/ItemInsulatedTube.java +++ b/botany/src/main/java/binnie/botany/items/ItemInsulatedTube.java @@ -35,7 +35,7 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { public ItemInsulatedTube() { super("insulated_tube"); setUnlocalizedName("botany.insulated_tube"); - setCreativeTab(CreativeTabBotany.instance); + setCreativeTab(CreativeTabBotany.INSTANCE); setHasSubtypes(true); } diff --git a/botany/src/main/java/binnie/botany/items/ItemPigment.java b/botany/src/main/java/binnie/botany/items/ItemPigment.java index 81ee5be9..4874c483 100644 --- a/botany/src/main/java/binnie/botany/items/ItemPigment.java +++ b/botany/src/main/java/binnie/botany/items/ItemPigment.java @@ -20,7 +20,7 @@ public class ItemPigment extends Item implements IItemModelRegister, IColoredIte public ItemPigment() { setUnlocalizedName("botany.pigment"); setHasSubtypes(true); - setCreativeTab(CreativeTabBotany.instance); + setCreativeTab(CreativeTabBotany.INSTANCE); setRegistryName("pigment"); } diff --git a/botany/src/main/java/binnie/botany/items/ItemSoilMeter.java b/botany/src/main/java/binnie/botany/items/ItemSoilMeter.java index ec3f56cc..91fc2490 100644 --- a/botany/src/main/java/binnie/botany/items/ItemSoilMeter.java +++ b/botany/src/main/java/binnie/botany/items/ItemSoilMeter.java @@ -29,7 +29,7 @@ import binnie.core.util.I18N; public class ItemSoilMeter extends Item implements IItemModelRegister { public ItemSoilMeter() { - setCreativeTab(CreativeTabBotany.instance); + setCreativeTab(CreativeTabBotany.INSTANCE); setUnlocalizedName("botany.soil_meter"); setMaxStackSize(1); setRegistryName("soil_meter"); diff --git a/botany/src/main/java/binnie/botany/items/ItemTrowel.java b/botany/src/main/java/binnie/botany/items/ItemTrowel.java index db4a0dac..496e729e 100644 --- a/botany/src/main/java/binnie/botany/items/ItemTrowel.java +++ b/botany/src/main/java/binnie/botany/items/ItemTrowel.java @@ -47,7 +47,7 @@ public class ItemTrowel extends Item implements IItemModelRegister { theToolMaterial = toolMaterial; setMaxStackSize(1); setMaxDamage(toolMaterial.getMaxUses()); - setCreativeTab(CreativeTabBotany.instance); + setCreativeTab(CreativeTabBotany.INSTANCE); modelName = "trowel_" + materialName; setUnlocalizedName("botany." + modelName); setRegistryName(modelName); diff --git a/botany/src/main/java/binnie/botany/machines/BotanyMachine.java b/botany/src/main/java/binnie/botany/machines/BotanyMachine.java index 607ace74..ebd05f47 100644 --- a/botany/src/main/java/binnie/botany/machines/BotanyMachine.java +++ b/botany/src/main/java/binnie/botany/machines/BotanyMachine.java @@ -20,7 +20,7 @@ public enum BotanyMachine implements IMachineType { return null; }); - Supplier supplier; + private final Supplier supplier; BotanyMachine(final Supplier supplier) { this.supplier = supplier; diff --git a/botany/src/main/java/binnie/botany/machines/ComponentBotanyGUI.java b/botany/src/main/java/binnie/botany/machines/ComponentBotanyGUI.java index 396a5ff5..2d1617c4 100644 --- a/botany/src/main/java/binnie/botany/machines/ComponentBotanyGUI.java +++ b/botany/src/main/java/binnie/botany/machines/ComponentBotanyGUI.java @@ -10,7 +10,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ComponentBotanyGUI extends MachineComponent implements IInteraction.RightClick { - BotanyGUI id; + private final BotanyGUI id; public ComponentBotanyGUI(final Machine machine, final BotanyGUI id) { super(machine); diff --git a/botany/src/main/java/binnie/botany/machines/designer/PackageDesigner.java b/botany/src/main/java/binnie/botany/machines/designer/PackageDesigner.java index 15b25321..5b0e376b 100644 --- a/botany/src/main/java/binnie/botany/machines/designer/PackageDesigner.java +++ b/botany/src/main/java/binnie/botany/machines/designer/PackageDesigner.java @@ -21,7 +21,7 @@ public final class PackageDesigner extends MachinePackage implements IMachineInf private final IDesignerType type; public PackageDesigner(final IDesignerType type) { - super(type.getName(), false); + super(type.getName()); this.type = type; } @@ -43,7 +43,4 @@ public final class PackageDesigner extends MachinePackage implements IMachineInf new ComponentDesignerRecipe(machine, this.type); } - @Override - public void register() { - } } diff --git a/botany/src/main/java/binnie/botany/models/FlowerSpriteManager.java b/botany/src/main/java/binnie/botany/models/FlowerSpriteManager.java index d8fd80b7..039d6fbb 100644 --- a/botany/src/main/java/binnie/botany/models/FlowerSpriteManager.java +++ b/botany/src/main/java/binnie/botany/models/FlowerSpriteManager.java @@ -55,11 +55,11 @@ public class FlowerSpriteManager { } private static class FlowerSprites { - private BinnieSprite[] stem; - private BinnieSprite[] variant; - private BinnieSprite[] petal; - private BinnieSprite[] unflowered; - private int sections; + private final BinnieSprite[] stem; + private final BinnieSprite[] variant; + private final BinnieSprite[] petal; + private final BinnieSprite[] unflowered; + private final int sections; public FlowerSprites(IFlowerType type) { sections = type.getSections(); diff --git a/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java b/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java index 1683c698..948cedda 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java @@ -53,7 +53,7 @@ public class ModuleCeramic implements Module { ceramicTile = new BlockCeramicPatterned(); ceramicBrick = new BlockCeramicBrick(); - misc = new ItemMisc(CreativeTabBotany.instance, CeramicItems.values(), "misc_ceramic"); + misc = new ItemMisc(CreativeTabBotany.INSTANCE, CeramicItems.values(), "misc_ceramic"); pigment = new ItemPigment(); clay = new ItemClay(); diff --git a/botany/src/main/java/binnie/botany/modules/ModuleCore.java b/botany/src/main/java/binnie/botany/modules/ModuleCore.java index a1346570..beb19559 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleCore.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleCore.java @@ -7,21 +7,6 @@ import binnie.core.modules.Module; @BinnieModule(moduleID = BotanyModuleUIDs.CORE, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Core", coreModule = true) public class ModuleCore implements Module { - @Override - public void preInit() { - // ignored - } - - @Override - public void init() { - // ignored - } - - @Override - public void postInit() { - // ignored - } - @Override public boolean canBeDisabled() { return false; diff --git a/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java b/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java index 27443ab3..f738c983 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java @@ -60,7 +60,7 @@ import binnie.core.util.TileUtil; @BinnieModule(moduleID = BotanyModuleUIDs.FLOWERS, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Flowers", unlocalizedDescription = "botany.module.flowers") public class ModuleFlowers implements Module { - public static AlleleEffectNone alleleEffectNone = new AlleleEffectNone(); + public static final AlleleEffectNone alleleEffectNone = new AlleleEffectNone(); @Nullable public static Item botanistBackpack; /* MODULE GENETIC */ @@ -89,7 +89,7 @@ public class ModuleFlowers implements Module { BackpackManager.backpackInterface.registerBackpackDefinition("botanist", definition); botanistBackpack = backpackInterface.createNaturalistBackpack("botanist", BotanyAPI.flowerRoot).setRegistryName("botanist_bag").setUnlocalizedName("botany.botanist_bag"); Botany.proxy.registerItem(botanistBackpack); - botanistBackpack.setCreativeTab(CreativeTabBotany.instance); + botanistBackpack.setCreativeTab(CreativeTabBotany.INSTANCE); } else { botanistBackpack = null; } diff --git a/botany/src/main/java/binnie/botany/modules/ModuleGardening.java b/botany/src/main/java/binnie/botany/modules/ModuleGardening.java index d653561e..e6863f83 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleGardening.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleGardening.java @@ -80,7 +80,7 @@ public class ModuleGardening implements Module { trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "iron"); trowelDiamond = new ItemTrowel(Item.ToolMaterial.DIAMOND, "diamond"); trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "gold"); - misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values()); + misc = new ItemMisc(CreativeTabBotany.INSTANCE, BotanyItems.values()); Botany.proxy.registerBlock(plant, new ItemWeed(plant)); Botany.proxy.registerBlock(soil, new ItemSoil(soil)); diff --git a/botany/src/main/java/binnie/botany/proxy/ProxyClient.java b/botany/src/main/java/binnie/botany/proxy/ProxyClient.java index 2514416b..792a319a 100644 --- a/botany/src/main/java/binnie/botany/proxy/ProxyClient.java +++ b/botany/src/main/java/binnie/botany/proxy/ProxyClient.java @@ -11,27 +11,27 @@ import binnie.core.models.ModelManager; @SideOnly(Side.CLIENT) public class ProxyClient extends Proxy implements IBotanyProxy { - public static ModelManager modelManager = new ModelManager(Constants.BOTANY_MOD_ID); + public static final ModelManager MODEL_MANAGER = new ModelManager(Constants.BOTANY_MOD_ID); @Override public Item registerItem(Item item) { - modelManager.registerItemClient(item); + MODEL_MANAGER.registerItemClient(item); return super.registerItem(item); } @Override public Block registerBlock(Block block) { - modelManager.registerBlockClient(block); + MODEL_MANAGER.registerBlockClient(block); return super.registerBlock(block); } @Override public void registerModels() { - modelManager.registerModels(); + MODEL_MANAGER.registerModels(); } @Override public void registerItemAndBlockColors() { - modelManager.registerItemAndBlockColors(); + MODEL_MANAGER.registerItemAndBlockColors(); } } diff --git a/botany/src/main/java/binnie/botany/tile/FlowerRenderInfo.java b/botany/src/main/java/binnie/botany/tile/FlowerRenderInfo.java new file mode 100644 index 00000000..b0590aa1 --- /dev/null +++ b/botany/src/main/java/binnie/botany/tile/FlowerRenderInfo.java @@ -0,0 +1,96 @@ +package binnie.botany.tile; + +import binnie.botany.api.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.IFlower; +import binnie.botany.api.genetics.IFlowerColor; +import binnie.botany.api.genetics.IFlowerType; +import binnie.botany.genetics.EnumFlowerType; +import forestry.api.core.INbtWritable; +import net.minecraft.nbt.NBTTagCompound; + +public class FlowerRenderInfo implements INbtWritable { + private final IFlowerColor primary; + private final IFlowerColor secondary; + private final IFlowerColor stem; + private final IFlowerType type; + private final byte age; + private final boolean wilted; + private final boolean flowered; + private final byte section; + + public FlowerRenderInfo(IFlower flower, TileEntityFlower tile) { + this.section = (byte) tile.getSection(); + this.primary = flower.getGenome().getPrimaryColor(); + this.secondary = flower.getGenome().getSecondaryColor(); + this.stem = flower.getGenome().getStemColor(); + this.age = (byte) flower.getAge(); + this.wilted = flower.isWilted(); + this.flowered = flower.hasFlowered(); + this.type = flower.getGenome().getType(); + } + + public FlowerRenderInfo(NBTTagCompound nbt) { + this.primary = EnumFlowerColor.values()[nbt.getByte("primary")].getFlowerColorAllele(); + this.secondary = EnumFlowerColor.values()[nbt.getByte("secondary")].getFlowerColorAllele(); + this.stem = EnumFlowerColor.values()[nbt.getByte("stem")].getFlowerColorAllele(); + this.type = EnumFlowerType.values()[nbt.getByte("type")]; + this.age = nbt.getByte("age"); + this.section = nbt.getByte("section"); + this.wilted = nbt.getBoolean("wilted"); + this.flowered = nbt.getBoolean("flowered"); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof FlowerRenderInfo) { + FlowerRenderInfo o = (FlowerRenderInfo) obj; + return o.age == age && o.wilted == wilted && o.flowered == flowered && o.primary == primary && o.secondary == secondary && o.stem == stem && o.type == type; + } + return super.equals(obj); + } + + public IFlowerColor getPrimary() { + return primary; + } + + public IFlowerColor getSecondary() { + return secondary; + } + + public IFlowerColor getStem() { + return stem; + } + + public IFlowerType getType() { + return type; + } + + public byte getAge() { + return age; + } + + public boolean isWilted() { + return wilted; + } + + public boolean isFlowered() { + return flowered; + } + + public byte getSection() { + return section; + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + nbt.setByte("primary", (byte) primary.getID()); + nbt.setByte("secondary", (byte) secondary.getID()); + nbt.setByte("stem", (byte) stem.getID()); + nbt.setByte("type", (byte) type.ordinal()); + nbt.setByte("age", age); + nbt.setByte("section", section); + nbt.setBoolean("wilted", wilted); + nbt.setBoolean("flowered", flowered); + return nbt; + } +} diff --git a/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java b/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java index 66a3cf23..b2cc4ced 100644 --- a/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java +++ b/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java @@ -38,7 +38,6 @@ import binnie.botany.api.gardening.IGardeningManager; import binnie.botany.api.genetics.EnumFlowerStage; import binnie.botany.api.genetics.IAlleleFlowerSpecies; import binnie.botany.api.genetics.IFlower; -import binnie.botany.api.genetics.IFlowerColor; import binnie.botany.api.genetics.IFlowerGenome; import binnie.botany.api.genetics.IFlowerRoot; import binnie.botany.api.genetics.IFlowerType; @@ -52,15 +51,15 @@ import binnie.core.BinnieCore; public class TileEntityFlower extends TileEntity implements IPollinatable, IButterflyNursery { @Nullable - IFlower flower; + private IFlower flower; @Nullable - GameProfile owner; - int section; + private GameProfile owner; + private int section; @Nullable - RenderInfo renderInfo; + private FlowerRenderInfo renderInfo; @Nullable - IButterfly caterpillar; - int matureTime; + private IButterfly caterpillar; + private int matureTime; public TileEntityFlower() { flower = null; @@ -327,14 +326,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt private NBTTagCompound writeRenderInfo(NBTTagCompound tag) { if (renderInfo != null) { NBTTagCompound nbtRenderInfo = new NBTTagCompound(); - nbtRenderInfo.setByte("primary", (byte) renderInfo.primary.getID()); - nbtRenderInfo.setByte("secondary", (byte) renderInfo.secondary.getID()); - nbtRenderInfo.setByte("stem", (byte) renderInfo.stem.getID()); - nbtRenderInfo.setByte("type", (byte) renderInfo.type.ordinal()); - nbtRenderInfo.setByte("age", renderInfo.age); - nbtRenderInfo.setByte("section", renderInfo.section); - nbtRenderInfo.setBoolean("wilted", renderInfo.wilted); - nbtRenderInfo.setBoolean("flowered", renderInfo.flowered); + renderInfo.writeToNBT(nbtRenderInfo); tag.setTag("renderinfo", nbtRenderInfo); } return tag; @@ -343,15 +335,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt private void readRenderInfo(NBTTagCompound tag) { if (tag.hasKey("renderinfo")) { NBTTagCompound infotag = tag.getCompoundTag("renderinfo"); - RenderInfo info = new RenderInfo(); - info.primary = EnumFlowerColor.values()[infotag.getByte("primary")].getFlowerColorAllele(); - info.secondary = EnumFlowerColor.values()[infotag.getByte("secondary")].getFlowerColorAllele(); - info.stem = EnumFlowerColor.values()[infotag.getByte("stem")].getFlowerColorAllele(); - info.type = EnumFlowerType.values()[infotag.getByte("type")]; - info.age = infotag.getByte("age"); - info.section = infotag.getByte("section"); - info.wilted = infotag.getBoolean("wilted"); - info.flowered = infotag.getBoolean("flowered"); + FlowerRenderInfo info = new FlowerRenderInfo(infotag); setRender(info); } } @@ -359,7 +343,6 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { super.onDataPacket(net, pkt); - // TODO client only call? readRenderInfo(pkt.getNbtCompound()); } @@ -372,14 +355,14 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt @Override public SPacketUpdateTileEntity getUpdatePacket() { if (renderInfo == null && getFlower() != null) { - renderInfo = new RenderInfo(getFlower(), this); + renderInfo = new FlowerRenderInfo(getFlower(), this); } return (renderInfo != null) ? new SPacketUpdateTileEntity(pos, 0, getUpdateTag()) : null; } public void updateRender(boolean update) { if (update && getFlower() != null && getFlower().getGenome() != null) { - RenderInfo newInfo = new RenderInfo(getFlower(), this); + FlowerRenderInfo newInfo = new FlowerRenderInfo(getFlower(), this); if (renderInfo == null || !newInfo.equals(renderInfo)) { setRender(newInfo); } @@ -578,17 +561,6 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return EnumHumidity.getFromValue(world.getBiome(getPos()).getRainfall()); } - public void setErrorState(int state) { - } - - public int getErrorOrdinal() { - return 0; - } - - public boolean addProduct(ItemStack product, boolean all) { - return false; - } - @Override @Nullable public IButterfly getCaterpillar() { @@ -637,9 +609,9 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt }*/ } - public void setRender(RenderInfo render) { + public void setRender(FlowerRenderInfo render) { renderInfo = render; - section = renderInfo.section; + section = renderInfo.getSection(); if (!world.isRemote) { IBlockState blockState = world.getBlockState(pos); world.notifyBlockUpdate(pos, blockState, blockState, 0); @@ -649,43 +621,43 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } public int getAge() { - return (renderInfo == null) ? 1 : renderInfo.age; + return (renderInfo == null) ? 1 : renderInfo.getAge(); } public int getRenderSection() { - return (renderInfo == null) ? 1 : renderInfo.section; + return (renderInfo == null) ? 1 : renderInfo.getSection(); } public boolean isWilted() { - return renderInfo != null && renderInfo.wilted; + return renderInfo != null && renderInfo.isWilted(); } public boolean isFlowered() { - return renderInfo == null || renderInfo.flowered; + return renderInfo == null || renderInfo.isFlowered(); } public int getPrimaryColour() { return (renderInfo == null) ? EnumFlowerColor.Red.getFlowerColorAllele().getColor(false) - : renderInfo.primary.getColor(isWilted()); + : renderInfo.getPrimary().getColor(isWilted()); } public int getSecondaryColour() { return (renderInfo == null) ? EnumFlowerColor.Red.getFlowerColorAllele().getColor(false) - : renderInfo.secondary.getColor(isWilted()); + : renderInfo.getSecondary().getColor(isWilted()); } public int getStemColour() { return (renderInfo == null) ? EnumFlowerColor.Green.getFlowerColorAllele().getColor(false) - : renderInfo.stem.getColor(isWilted()); + : renderInfo.getStem().getColor(isWilted()); } public IFlowerType getType() { return (renderInfo == null) ? EnumFlowerType.POPPY - : renderInfo.type; + : renderInfo.getType(); } @Override @@ -693,22 +665,6 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return getWorld().getBiome(getPos()); } - @Nullable - public IErrorState getErrorState() { - return null; - } - - public void setErrorState(IErrorState state) { - } - - public boolean setErrorCondition(boolean condition, IErrorState errorState) { - return false; - } - - public Set getErrorStates() { - return new HashSet<>(); - } - @Override public BlockPos getCoordinates() { return getPos(); @@ -724,37 +680,4 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return world; } - public static class RenderInfo { - public IFlowerColor primary; - public IFlowerColor secondary; - public IFlowerColor stem; - public IFlowerType type; - public byte age; - public boolean wilted; - public boolean flowered; - public byte section; - - public RenderInfo() { - } - - public RenderInfo(IFlower flower, TileEntityFlower tile) { - section = (byte) tile.getSection(); - primary = flower.getGenome().getPrimaryColor(); - secondary = flower.getGenome().getSecondaryColor(); - stem = flower.getGenome().getStemColor(); - age = (byte) flower.getAge(); - wilted = flower.isWilted(); - flowered = flower.hasFlowered(); - type = flower.getGenome().getType(); - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof RenderInfo) { - RenderInfo o = (RenderInfo) obj; - return o.age == age && o.wilted == wilted && o.flowered == flowered && o.primary == primary && o.secondary == secondary && o.stem == stem && o.type == type; - } - return super.equals(obj); - } - } } diff --git a/core-api/src/main/java/binnie/core/api/gui/Alignment.java b/core-api/src/main/java/binnie/core/api/gui/Alignment.java index 0ac17d44..8d1a48a2 100644 --- a/core-api/src/main/java/binnie/core/api/gui/Alignment.java +++ b/core-api/src/main/java/binnie/core/api/gui/Alignment.java @@ -6,8 +6,8 @@ public enum Alignment { LEFT(-1, 0), RIGHT(1, 0); - int x; - int y; + private final int x; + private final int y; Alignment(int x, final int y) { this.x = x; diff --git a/core-api/src/main/java/binnie/core/api/gui/events/Event.java b/core-api/src/main/java/binnie/core/api/gui/events/Event.java index 191bee3f..d65f325b 100644 --- a/core-api/src/main/java/binnie/core/api/gui/events/Event.java +++ b/core-api/src/main/java/binnie/core/api/gui/events/Event.java @@ -3,7 +3,7 @@ package binnie.core.api.gui.events; import binnie.core.api.gui.IWidget; public class Event { - IWidget origin; + private final IWidget origin; public Event(final IWidget origin) { this.origin = origin; diff --git a/core/src/main/java/binnie/core/AbstractMod.java b/core/src/main/java/binnie/core/AbstractMod.java index 1e6e530d..56be5ca6 100644 --- a/core/src/main/java/binnie/core/AbstractMod.java +++ b/core/src/main/java/binnie/core/AbstractMod.java @@ -21,7 +21,7 @@ import binnie.core.network.packet.MessageBinnie; import binnie.core.proxy.IProxyCore; public abstract class AbstractMod implements IPacketProvider, IInitializable { - protected List modules; + protected final List modules; @Nullable private SimpleNetworkWrapper wrapper; diff --git a/core/src/main/java/binnie/core/ManagerBase.java b/core/src/main/java/binnie/core/ManagerBase.java index a47ba1b0..f8db850d 100644 --- a/core/src/main/java/binnie/core/ManagerBase.java +++ b/core/src/main/java/binnie/core/ManagerBase.java @@ -4,16 +4,4 @@ public abstract class ManagerBase implements IInitializable { public ManagerBase() { Binnie.MANAGERS.add(this); } - - @Override - public void preInit() { - } - - @Override - public void init() { - } - - @Override - public void postInit() { - } } diff --git a/core/src/main/java/binnie/core/Mods.java b/core/src/main/java/binnie/core/Mods.java index 0c111a26..8be7ec92 100644 --- a/core/src/main/java/binnie/core/Mods.java +++ b/core/src/main/java/binnie/core/Mods.java @@ -12,9 +12,9 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; public class Mods { - public static ModNonnull Forestry = new ModNonnull("forestry"); - public static Mod IC2 = new Mod("ic2"); - public static Mod Botania = new Mod("botania"); + public static final ModNonnull Forestry = new ModNonnull("forestry"); + public static final Mod IC2 = new Mod("ic2"); + public static final Mod Botania = new Mod("botania"); public static class Mod { protected final String id; diff --git a/core/src/main/java/binnie/core/circuits/BinnieCircuit.java b/core/src/main/java/binnie/core/circuits/BinnieCircuit.java index feaffd42..88d345e1 100644 --- a/core/src/main/java/binnie/core/circuits/BinnieCircuit.java +++ b/core/src/main/java/binnie/core/circuits/BinnieCircuit.java @@ -10,9 +10,9 @@ import forestry.api.circuits.ICircuit; 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(final String uid, final int limit, final ICircuitLayout layout, final ItemStack itemStack) { this.tooltips = new ArrayList<>(); diff --git a/core/src/main/java/binnie/core/config/BinnieConfiguration.java b/core/src/main/java/binnie/core/config/BinnieConfiguration.java index 6b1eb022..7503c99e 100644 --- a/core/src/main/java/binnie/core/config/BinnieConfiguration.java +++ b/core/src/main/java/binnie/core/config/BinnieConfiguration.java @@ -9,7 +9,7 @@ import binnie.core.BinnieCore; class BinnieConfiguration extends Configuration { public AbstractMod mod; - private String filename; + private final String filename; public BinnieConfiguration(final String filename, final AbstractMod mod) { super(new File(BinnieCore.getBinnieProxy().getDirectory(), filename)); diff --git a/core/src/main/java/binnie/core/config/ManagerConfig.java b/core/src/main/java/binnie/core/config/ManagerConfig.java index a6cfb963..b79e16ab 100644 --- a/core/src/main/java/binnie/core/config/ManagerConfig.java +++ b/core/src/main/java/binnie/core/config/ManagerConfig.java @@ -1,18 +1,20 @@ package binnie.core.config; import java.lang.annotation.Annotation; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.LinkedHashMap; import java.util.Map; +import binnie.core.util.Log; import net.minecraftforge.common.config.Configuration; import binnie.core.AbstractMod; import binnie.core.ManagerBase; public class ManagerConfig extends ManagerBase { - private Map, Configuration> configurations; + private final Map, Configuration> configurations; public ManagerConfig() { this.configurations = new LinkedHashMap<>(); @@ -35,9 +37,11 @@ public class ManagerConfig extends ManagerBase { if (annotation.annotationType().isAnnotationPresent(ConfigProperty.Type.class)) { final Class propertyClass = annotation.annotationType().getAnnotation(ConfigProperty.Type.class).propertyClass(); try { - final PropertyBase property = (PropertyBase) propertyClass.getConstructor(Field.class, BinnieConfiguration.class, ConfigProperty.class, annotation.annotationType()).newInstance(field, config, propertyAnnot, annotation.annotationType().cast(annotation)); + Constructor constructor = propertyClass.getConstructor(Field.class, BinnieConfiguration.class, ConfigProperty.class, annotation.annotationType()); + Annotation cast = annotation.annotationType().cast(annotation); + final PropertyBase property = (PropertyBase) constructor.newInstance(field, config, propertyAnnot, cast); } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { - e.printStackTrace(); + Log.error("Failed to load configuration for property {}", propertyClass, e); } } } diff --git a/core/src/main/java/binnie/core/config/PropBoolean.java b/core/src/main/java/binnie/core/config/PropBoolean.java index 67d3c15a..ed07899f 100644 --- a/core/src/main/java/binnie/core/config/PropBoolean.java +++ b/core/src/main/java/binnie/core/config/PropBoolean.java @@ -16,17 +16,17 @@ public @interface PropBoolean { @Override protected Property getProperty() { - return this.file.get(this.getCategory(), this.getKey(), this.defaultValue); + return this.getFile().get(this.getCategory(), this.getKey(), this.getDefaultValue()); } @Override protected Boolean getConfigValue() { - return this.property.getBoolean(this.defaultValue); + return super.getProperty().getBoolean(this.getDefaultValue()); } @Override protected void addComments() { - this.addComment("Default value is " + this.defaultValue + "."); + this.addComment("Default value is " + this.getDefaultValue() + "."); } } } diff --git a/core/src/main/java/binnie/core/config/PropDouble.java b/core/src/main/java/binnie/core/config/PropDouble.java index de568cc8..4d2f5651 100644 --- a/core/src/main/java/binnie/core/config/PropDouble.java +++ b/core/src/main/java/binnie/core/config/PropDouble.java @@ -16,17 +16,17 @@ public @interface PropDouble { @Override protected Property getProperty() { - return this.file.get(this.getCategory(), this.getKey(), this.defaultValue); + return this.getFile().get(this.getCategory(), this.getKey(), this.getDefaultValue()); } @Override protected Double getConfigValue() { - return this.property.getDouble(this.defaultValue); + return super.getProperty().getDouble(this.getDefaultValue()); } @Override protected void addComments() { - this.addComment("Default value is " + this.defaultValue + "."); + this.addComment("Default value is " + this.getDefaultValue() + "."); } } } diff --git a/core/src/main/java/binnie/core/config/PropInteger.java b/core/src/main/java/binnie/core/config/PropInteger.java index 18b14d25..4d57eca0 100644 --- a/core/src/main/java/binnie/core/config/PropInteger.java +++ b/core/src/main/java/binnie/core/config/PropInteger.java @@ -16,17 +16,17 @@ public @interface PropInteger { @Override protected Property getProperty() { - return this.file.get(this.getCategory(), this.getKey(), this.defaultValue); + return this.getFile().get(this.getCategory(), this.getKey(), this.getDefaultValue()); } @Override protected Integer getConfigValue() { - return this.property.getInt(this.defaultValue); + return super.getProperty().getInt(this.getDefaultValue()); } @Override protected void addComments() { - this.addComment("Default value is " + this.defaultValue + "."); + this.addComment("Default value is " + this.getDefaultValue() + "."); } } } diff --git a/core/src/main/java/binnie/core/config/PropPercentage.java b/core/src/main/java/binnie/core/config/PropPercentage.java index 314c3a88..00db8acb 100644 --- a/core/src/main/java/binnie/core/config/PropPercentage.java +++ b/core/src/main/java/binnie/core/config/PropPercentage.java @@ -20,18 +20,18 @@ public @interface PropPercentage { @Override protected Integer getConfigValue() { - return this.property.getInt(this.defaultValue); + return super.getProperty().getInt(this.getDefaultValue()); } @Override protected void addComments() { - this.addComment("Default value is " + this.defaultValue + "%."); - this.addComment("Range is " + this.annotatedProperty.lower() + "-" + this.annotatedProperty.upper() + "%."); + this.addComment("Default value is " + this.getDefaultValue() + "%."); + this.addComment("Range is " + this.getAnnotatedProperty().lower() + "-" + this.getAnnotatedProperty().upper() + "%."); } @Override protected Property getProperty() { - return this.file.get(this.getCategory(), this.getKey(), this.defaultValue); + return this.getFile().get(this.getCategory(), this.getKey(), this.getDefaultValue()); } } } diff --git a/core/src/main/java/binnie/core/config/PropertyBase.java b/core/src/main/java/binnie/core/config/PropertyBase.java index 92934efb..28670899 100644 --- a/core/src/main/java/binnie/core/config/PropertyBase.java +++ b/core/src/main/java/binnie/core/config/PropertyBase.java @@ -9,13 +9,13 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; abstract class PropertyBase { - Configuration file; - Property property; - ValueType defaultValue; - AnnotationType annotatedProperty; - private ConfigProperty configProperty; - private List comments; - private Field field; + private final Configuration file; + private final Property property; + private final ValueType defaultValue; + private final AnnotationType annotatedProperty; + private final ConfigProperty configProperty; + private final List comments; + private final Field field; protected PropertyBase(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final AnnotationType annotedProperty) throws IllegalArgumentException, IllegalAccessException { this.comments = new ArrayList<>(); @@ -33,7 +33,9 @@ abstract class PropertyBase { field.set(null, this.getConfigValue()); } - protected abstract Property getProperty(); + protected Property getProperty() { + return property; + } protected abstract ValueType getConfigValue(); @@ -62,4 +64,16 @@ abstract class PropertyBase { } return comment.toString(); } + + public Configuration getFile() { + return file; + } + + public ValueType getDefaultValue() { + return defaultValue; + } + + public AnnotationType getAnnotatedProperty() { + return annotatedProperty; + } } diff --git a/core/src/main/java/binnie/core/genetics/ManagerGenetics.java b/core/src/main/java/binnie/core/genetics/ManagerGenetics.java index b4d6babc..6e511812 100644 --- a/core/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/core/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -39,8 +39,8 @@ import binnie.core.ManagerBase; public class ManagerGenetics extends ManagerBase { private final Map BREEDING_SYSTEMS; - private List invalidChromosomeTypes; - private Map>> chromosomeArray; + private final List invalidChromosomeTypes; + private final Map>> chromosomeArray; public ManagerGenetics() { this.BREEDING_SYSTEMS = new LinkedHashMap<>(); diff --git a/core/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/core/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index 31f2d762..95e66695 100644 --- a/core/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/core/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -3,16 +3,15 @@ package binnie.core.genetics; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Biomes; -import net.minecraft.item.ItemStack; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeHousingInventory; @@ -20,14 +19,13 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.core.IErrorLogic; -import forestry.api.genetics.IIndividual; import forestry.apiculture.FakeBeekeepingLogic; import forestry.apiculture.InventoryBeeHousing; import forestry.core.errors.FakeErrorLogic; public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier { - ArrayList beeModifier = new ArrayList<>(); - private InventoryBeeHousing beeInventory; + private final List beeModifier = new ArrayList<>(); + private final InventoryBeeHousing beeInventory; public VirtualBeeHousing(final EntityPlayer player) { super(player); @@ -55,35 +53,6 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB return 1.0f; } - public ItemStack getQueen() { - return ItemStack.EMPTY; - } - - public void setQueen(final ItemStack itemstack) { - } - - public ItemStack getDrone() { - return ItemStack.EMPTY; - } - - public void setDrone(final ItemStack itemstack) { - } - - public boolean canBreed() { - return true; - } - - @Override - public boolean addProduct(final ItemStack product, final boolean all) { - return false; - } - - public void wearOutEquipment(final int amount) { - } - - public void onQueenChange(final ItemStack queen) { - } - @Override public boolean isSealed() { return false; @@ -109,20 +78,6 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB return 1.0f; } - public void onQueenDeath(final IBee queen) { - } - - public void onPostQueenDeath(final IBee queen) { - } - - public boolean onPollenRetrieved(final IBee queen, final IIndividual pollen, final boolean isHandled) { - return false; - } - - public boolean onEggLaid(final IBee queen) { - return false; - } - @Override public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) { return 1.0f; diff --git a/core/src/main/java/binnie/core/genetics/VirtualHousing.java b/core/src/main/java/binnie/core/genetics/VirtualHousing.java index 92a3ba79..c6f4edef 100644 --- a/core/src/main/java/binnie/core/genetics/VirtualHousing.java +++ b/core/src/main/java/binnie/core/genetics/VirtualHousing.java @@ -1,10 +1,6 @@ package binnie.core.genetics; -import java.util.Collections; -import java.util.Set; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; @@ -13,11 +9,10 @@ import com.mojang.authlib.GameProfile; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.core.IErrorState; import forestry.api.genetics.IHousing; class VirtualHousing implements IHousing { - private EntityPlayer player; + private final EntityPlayer player; public VirtualHousing(final EntityPlayer player) { this.player = player; @@ -47,17 +42,6 @@ class VirtualHousing implements IHousing { return this.player.world; } - public void setErrorState(final int state) { - } - - public int getErrorOrdinal() { - return 0; - } - - public boolean addProduct(final ItemStack product, final boolean all) { - return false; - } - public GameProfile getOwnerName() { return this.player.getGameProfile(); } @@ -66,21 +50,6 @@ class VirtualHousing implements IHousing { return this.player.world.getBiome(getCoordinates()); } - /*public EnumErrorCode getErrorState() { - return null; - }*/ - - public void setErrorState(final IErrorState state) { - } - - public boolean setErrorCondition(final boolean condition, final IErrorState errorState) { - return false; - } - - public Set getErrorStates() { - return Collections.emptySet(); - } - @Override public BlockPos getCoordinates() { return new BlockPos(getXCoord(), getYCoord(), getZCoord()); diff --git a/core/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/core/src/main/java/binnie/core/gui/BinnieGUIHandler.java index 9489e89e..4f804e49 100644 --- a/core/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/core/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -12,7 +12,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.minecraft.Window; public final class BinnieGUIHandler implements IGuiHandler { - private IBinnieGUID[] guiIds; + private final IBinnieGUID[] guiIds; public BinnieGUIHandler(final IBinnieGUID[] guiIds) { this.guiIds = guiIds; diff --git a/core/src/main/java/binnie/core/gui/Tooltip.java b/core/src/main/java/binnie/core/gui/Tooltip.java index 1814a881..d089805f 100644 --- a/core/src/main/java/binnie/core/gui/Tooltip.java +++ b/core/src/main/java/binnie/core/gui/Tooltip.java @@ -14,9 +14,9 @@ public class Tooltip { public static final byte TYPE_ITEM = 105; public static final byte TYPE_FLUID = 102; - public int maxWidth; - List tooltip; - ITooltipType type; + private int maxWidth; + private final List tooltip; + private ITooltipType type; private ItemStack itemStack = ItemStack.EMPTY; public Tooltip() { @@ -87,6 +87,10 @@ public class Tooltip { this.add(NBT_SEPARATOR + nbt.toString() + NBT_SEPARATOR + string); } + public int getMaxWidth() { + return maxWidth; + } + public enum Type implements ITooltipType { STANDARD, HELP, diff --git a/core/src/main/java/binnie/core/gui/TopLevelWidget.java b/core/src/main/java/binnie/core/gui/TopLevelWidget.java index cfa313fe..4984945c 100644 --- a/core/src/main/java/binnie/core/gui/TopLevelWidget.java +++ b/core/src/main/java/binnie/core/gui/TopLevelWidget.java @@ -21,12 +21,12 @@ import binnie.core.gui.events.EventWidget; public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { protected IPoint mousePosition; @Nullable - IWidget mousedOverWidget; + private IWidget mousedOverWidget; @Nullable - IWidget draggedWidget; + private IWidget draggedWidget; @Nullable - IWidget focusedWidget; - IPoint dragStart; + private IWidget focusedWidget; + private IPoint dragStart; public TopLevelWidget() { super(null); @@ -36,12 +36,12 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { this.mousePosition = Point.ZERO; this.dragStart = Point.ZERO; this.addEventHandler(EventMouse.Down.class, event -> { - TopLevelWidget.this.setDraggedWidget(TopLevelWidget.this.mousedOverWidget, event.getButton()); - TopLevelWidget.this.setFocusedWidget(TopLevelWidget.this.mousedOverWidget); + this.setDraggedWidget(this.mousedOverWidget, event.getButton()); + this.setFocusedWidget(this.mousedOverWidget); }); - this.addEventHandler(EventMouse.Up.class, event -> TopLevelWidget.this.setDraggedWidget(null)); + this.addEventHandler(EventMouse.Up.class, event -> this.setDraggedWidget(null)); this.addEventHandler(EventWidget.StartDrag.class, event -> { - TopLevelWidget.this.dragStart = TopLevelWidget.this.getRelativeMousePosition(); + this.dragStart = this.getRelativeMousePosition(); }); } diff --git a/core/src/main/java/binnie/core/gui/Widget.java b/core/src/main/java/binnie/core/gui/Widget.java index b9deb22b..7170f18d 100644 --- a/core/src/main/java/binnie/core/gui/Widget.java +++ b/core/src/main/java/binnie/core/gui/Widget.java @@ -32,12 +32,12 @@ public class Widget implements IWidget { private IWidget cropWidget; private boolean cropped; private int color; - private List children; - private List attributes; + private final List children; + private final List attributes; protected IPoint position; protected IPoint size; private IPoint offset; - private Collection> eventHandlers; + private final Collection> eventHandlers; private boolean visible; public Widget(@Nullable final IWidget parent) { @@ -391,10 +391,7 @@ public class Widget implements IWidget { @Override public boolean isEnabled() { IWidget parent = this.getParent(); - if (parent != null && !parent.isEnabled()) { - return false; - } - return true; + return parent == null || parent.isEnabled(); } @Override diff --git a/core/src/main/java/binnie/core/gui/controls/ControlText.java b/core/src/main/java/binnie/core/gui/controls/ControlText.java index f065ffc0..636d0c45 100644 --- a/core/src/main/java/binnie/core/gui/controls/ControlText.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlText.java @@ -15,7 +15,7 @@ import binnie.core.gui.renderer.RenderUtil; public class ControlText extends Control implements IControlValue { private String text; - private TextJustification align; + private final TextJustification align; public ControlText(final IWidget parent, final IPoint pos, final String text) { this(parent, new Area(pos, new Point(500, 0)), text, TextJustification.TOP_LEFT); diff --git a/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java b/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java index 8f1a437f..5f1fe938 100644 --- a/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java @@ -18,7 +18,7 @@ import binnie.core.gui.resource.textures.CraftGUITexture; @SideOnly(Side.CLIENT) public class ControlTextEdit extends Control implements IControlValue { - private GuiTextField field; + private final GuiTextField field; private String cachedValue; public ControlTextEdit(final IWidget parent, final int x, final int y, final int width, final int height) { @@ -29,22 +29,22 @@ public class ControlTextEdit extends Control implements IControlValue { this.addAttribute(Attribute.MOUSE_OVER); this.field.setEnableBackgroundDrawing(false); this.addSelfEventHandler(EventKey.Down.class, event -> { - ControlTextEdit.this.field.textboxKeyTyped(event.getCharacter(), event.getKey()); - final String text = ControlTextEdit.this.getValue(); - if (!text.equals(ControlTextEdit.this.cachedValue)) { - ControlTextEdit.this.cachedValue = text; - ControlTextEdit.this.callEvent(new EventTextEdit(ControlTextEdit.this, ControlTextEdit.this.cachedValue)); - ControlTextEdit.this.onTextEdit(ControlTextEdit.this.cachedValue); + this.field.textboxKeyTyped(event.getCharacter(), event.getKey()); + final String text = this.getValue(); + if (!text.equals(this.cachedValue)) { + this.cachedValue = text; + this.callEvent(new EventTextEdit(ControlTextEdit.this, this.cachedValue)); + this.onTextEdit(this.cachedValue); } }); this.addSelfEventHandler(EventMouse.Down.class, event -> { - ControlTextEdit.this.field.mouseClicked(ControlTextEdit.this.getRelativeMousePosition().xPos(), ControlTextEdit.this.getRelativeMousePosition().yPos(), event.getButton()); + this.field.mouseClicked(this.getRelativeMousePosition().xPos(), this.getRelativeMousePosition().yPos(), event.getButton()); }); this.addSelfEventHandler(EventWidget.GainFocus.class, event -> { - ControlTextEdit.this.field.setFocused(true); + this.field.setFocused(true); }); this.addSelfEventHandler(EventWidget.LoseFocus.class, event -> { - ControlTextEdit.this.field.setFocused(false); + this.field.setFocused(false); }); } @@ -61,10 +61,6 @@ public class ControlTextEdit extends Control implements IControlValue { } } - @Override - public void onUpdateClient() { - } - protected void onTextEdit(final String value) { } diff --git a/core/src/main/java/binnie/core/gui/controls/ControlToleranceBar.java b/core/src/main/java/binnie/core/gui/controls/ControlToleranceBar.java index d0f8940f..b1a547c5 100644 --- a/core/src/main/java/binnie/core/gui/controls/ControlToleranceBar.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlToleranceBar.java @@ -21,9 +21,9 @@ import binnie.core.gui.geometry.Border; import binnie.core.gui.renderer.RenderUtil; public abstract class ControlToleranceBar> extends Control implements ITooltip { - EnumSet tolerated; - EnumSet fullSet; - private Class enumClass; + private final EnumSet tolerated; + private final EnumSet fullSet; + private final Class enumClass; public ControlToleranceBar(IWidget parent, int x, int y, int width, int height, Class clss) { super(parent, x, y, width, height); diff --git a/core/src/main/java/binnie/core/gui/controls/core/Control.java b/core/src/main/java/binnie/core/gui/controls/core/Control.java index add22e3b..c0abd1f6 100644 --- a/core/src/main/java/binnie/core/gui/controls/core/Control.java +++ b/core/src/main/java/binnie/core/gui/controls/core/Control.java @@ -18,15 +18,13 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.Window; public class Control extends Widget implements ITooltipHelp, ITooltip { - public int extraLevel; - private List helpStrings; - private List tooltipStrings; + private final List helpStrings; + private final List tooltipStrings; public Control(IWidget parent, int xPos, int yPos, int width, int height) { super(parent); this.helpStrings = new ArrayList<>(); this.tooltipStrings = new ArrayList<>(); - this.extraLevel = 0; this.position = new Point(xPos, yPos); this.size = new Point(width, height); } diff --git a/core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java b/core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java index 971c5567..35ca023f 100644 --- a/core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java +++ b/core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java @@ -13,14 +13,14 @@ import binnie.core.gui.geometry.Point; import binnie.core.util.IValidator; public class ControlList extends Control implements IControlValue { - ControlListBox parent; - Map allOptions; - Map optionWidgets; - boolean creating; + private final ControlListBox parent; + private final Map allOptions; + private final Map optionWidgets; @Nullable + private IValidator validator; @Nullable - private T defaultValue; + private final T defaultValue; @Nullable private T value; @@ -30,7 +30,6 @@ public class ControlList extends Control implements IControlValue { this.defaultValue = defaultValue; this.allOptions = new LinkedHashMap<>(); this.optionWidgets = new LinkedHashMap<>(); - this.creating = false; this.parent = parent; } @@ -71,7 +70,6 @@ public class ControlList extends Control implements IControlValue { entry.getValue().hide(); } } - this.creating = true; this.setValue(this.getValue()); this.setSize(new Point(this.getSize().xPos(), height)); } @@ -127,4 +125,10 @@ public class ControlList extends Control implements IControlValue { this.filterOptions(); } } + + @Nullable + @Override + public ControlListBox getParent() { + return parent; + } } diff --git a/core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java b/core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java index 39a91f1e..9eaee257 100644 --- a/core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java +++ b/core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java @@ -14,19 +14,19 @@ public class ControlListBox extends ControlScrollableContent> ControlList content = this.getContent(); T defaultValue = content == null ? null : content.getDefaultValue(); - ControlList child = new ControlList<>(this, 1, 1, this.getWidth() - 2 - this.scrollBarSize, this.getHeight() - 2, defaultValue); + ControlList child = new ControlList<>(this, 1, 1, this.getWidth() - 2 - this.getScrollBarSize(), this.getHeight() - 2, defaultValue); this.setScrollableContent(child); this.addEventHandler(EventKey.Down.class, event -> { - if (ControlListBox.this.calculateIsMouseOver()) { - int currentIndex = ControlListBox.this.getContent().getCurrentIndex(); + if (this.calculateIsMouseOver()) { + int currentIndex = this.getContent().getCurrentIndex(); if (event.getKey() == 208) { - if (++currentIndex >= ControlListBox.this.getContent().getOptions().size()) { + if (++currentIndex >= this.getContent().getOptions().size()) { currentIndex = 0; } } else if (event.getKey() == 200 && --currentIndex < 0) { - currentIndex = ControlListBox.this.getContent().getOptions().size() - 1; + currentIndex = this.getContent().getOptions().size() - 1; } - ControlListBox.this.getContent().setIndex(currentIndex); + this.getContent().setIndex(currentIndex); } }); } diff --git a/core/src/main/java/binnie/core/gui/controls/page/ControlPages.java b/core/src/main/java/binnie/core/gui/controls/page/ControlPages.java index ab70dbc4..c91805d0 100644 --- a/core/src/main/java/binnie/core/gui/controls/page/ControlPages.java +++ b/core/src/main/java/binnie/core/gui/controls/page/ControlPages.java @@ -11,7 +11,7 @@ import binnie.core.gui.controls.core.IControlValues; import binnie.core.gui.events.EventValueChanged; public class ControlPages extends Control implements IControlValues, IControlValue { - T value; + private T value; public ControlPages(final IWidget parent, final int x, final int y, final int w, final int h) { super(parent, x, y, w, h); diff --git a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java index 05c85955..0a0fdccf 100644 --- a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java +++ b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java @@ -4,7 +4,7 @@ import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; public class ControlScroll extends Control { - private IControlScrollable scrollWidget; + private final IControlScrollable scrollWidget; public ControlScroll(final IWidget parent, final int x, final int y, final int width, final int height, final IControlScrollable scrollWidget) { super(parent, x, y, width, height); diff --git a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java index cbc12675..b23fb76e 100644 --- a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java +++ b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java @@ -41,10 +41,6 @@ public class ControlScrollBar extends Control { }); } - @Override - public void onUpdateClient() { - } - @Override public boolean isEnabled() { return this.scrollable.getPercentageShown() < 0.99f; diff --git a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java index abb8546e..e12817be 100644 --- a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java +++ b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java @@ -11,9 +11,9 @@ import binnie.core.gui.geometry.Point; public class ControlScrollableContent extends Control implements IControlScrollable { @Nullable - protected T controlChild; - protected int scrollBarSize; - float percentageIndex; + private T controlChild; + private final int scrollBarSize; + private float percentageIndex; public ControlScrollableContent(final IWidget parent, final int x, final int y, final int w, final int h, final int scrollBarSize) { super(parent, x, y, w, h); @@ -118,4 +118,8 @@ public class ControlScrollableContent extends Control impleme this.setPercentageIndex(minY / (1 - shownPercentage)); } } + + public int getScrollBarSize() { + return scrollBarSize; + } } diff --git a/core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java b/core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java index 0d63bb33..6939c6b3 100644 --- a/core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java +++ b/core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java @@ -17,7 +17,7 @@ public class ControlTabBar extends Control implements IControlValue { } private T value; - private Alignment alignment; + private final Alignment alignment; public ControlTabBar(IWidget parent, int x, int y, int width, int height, Alignment alignment, Collection values) { this(parent, x, y, width, height, alignment, Iterables.get(values, 0)); diff --git a/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java b/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java index 50e4dee0..5e87de45 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java +++ b/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java @@ -16,9 +16,9 @@ import binnie.core.gui.resource.textures.CraftGUITextureSheet; import binnie.core.gui.resource.textures.StandardTexture; class ControlBreedingProgress extends Control { - private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.CONTROLS); - private float percentage; - private int colour; + private static final Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.CONTROLS); + private final float percentage; + private final int colour; public ControlBreedingProgress(final IWidget parent, final int x, final int y, final int width, final int height, final IBreedingSystem system, final float percentage) { super(parent, x, y, width, height); diff --git a/core/src/main/java/binnie/core/gui/database/ControlItemStackOption.java b/core/src/main/java/binnie/core/gui/database/ControlItemStackOption.java index 088c8185..de81731c 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlItemStackOption.java +++ b/core/src/main/java/binnie/core/gui/database/ControlItemStackOption.java @@ -15,7 +15,7 @@ import binnie.core.gui.minecraft.control.ControlItemDisplay; @SideOnly(Side.CLIENT) public class ControlItemStackOption extends ControlTextOption { - private ControlItemDisplay controlBee; + private final ControlItemDisplay controlBee; public ControlItemStackOption(final ControlList controlList, final ItemStack option, final int y) { super(controlList, option, option.getDisplayName(), y); diff --git a/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java b/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java index 10946694..fac4c18c 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java +++ b/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java @@ -12,7 +12,7 @@ import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.minecraft.Window; class ControlMutationBox extends ControlListBox { - private Type type; + private final Type type; @Nullable private IAlleleSpecies species; diff --git a/core/src/main/java/binnie/core/gui/database/ControlMutationItem.java b/core/src/main/java/binnie/core/gui/database/ControlMutationItem.java index 0aa6a445..b81f6d9b 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlMutationItem.java +++ b/core/src/main/java/binnie/core/gui/database/ControlMutationItem.java @@ -19,18 +19,18 @@ class ControlMutationItem extends ControlOption { ControlIndividualDisplay resultIndividual = new ControlIndividualDisplay(this, 104, 4); ControlMutationSymbol addSymbol = new ControlMutationSymbol(this, 24, 4, 0); ControlMutationSymbol arrowSymbol = new ControlMutationSymbol(this, 64, 4, 1); - final boolean isNEI = ((WindowAbstractDatabase) this.getTopParent()).isMaster(); + final boolean isMaster = ((WindowAbstractDatabase) this.getTopParent()).isMaster(); final IBreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); if (this.getValue() != null) { final boolean isMutationDiscovered = system.isMutationDiscovered(this.getValue(), Window.get(this).getWorld(), Window.get(this).getUsername()); IAlleleSpecies allele = this.getValue().getAllele0(); - EnumDiscoveryState state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species.equals(allele)) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); + EnumDiscoveryState state = ((isMaster || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species.equals(allele)) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); firstIndividual.setSpecies(allele, state); allele = this.getValue().getAllele1(); - state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species.equals(allele)) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); + state = ((isMaster || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species.equals(allele)) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); secondIndividual.setSpecies(allele, state); allele = (IAlleleSpecies) this.getValue().getTemplate()[0]; - state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species.equals(allele)) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); + state = ((isMaster || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species.equals(allele)) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); resultIndividual.setSpecies(allele, state); addSymbol.setValue(this.getValue()); arrowSymbol.setValue(this.getValue()); diff --git a/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java b/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java index 37c85096..0b7419aa 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java +++ b/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java @@ -23,11 +23,11 @@ import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.util.I18N; class ControlMutationSymbol extends Control implements ITooltip { - private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.CONTROLS); - private static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.CONTROLS); + private static final Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.CONTROLS); + private static final Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.CONTROLS); private IMutation value; private boolean discovered; - private int type; + private final int type; protected ControlMutationSymbol(final IWidget parent, final int x, final int y, final int type) { super(parent, x, y, 16 + type * 16, 16); @@ -49,9 +49,9 @@ class ControlMutationSymbol extends Control implements ITooltip { public void setValue(final IMutation value) { this.value = value; - final boolean isNEI = ((WindowAbstractDatabase) this.getTopParent()).isMaster(); + final boolean isMaster = ((WindowAbstractDatabase) this.getTopParent()).isMaster(); final IBreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); - this.discovered = (isNEI || system.isMutationDiscovered(value, Window.get(this).getWorld(), Window.get(this).getUsername())); + this.discovered = (isMaster || system.isMutationDiscovered(value, Window.get(this).getWorld(), Window.get(this).getUsername())); if (this.discovered) { this.setColor(16777215); } else { diff --git a/core/src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java b/core/src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java index f43f8ff3..cd55d436 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java +++ b/core/src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java @@ -14,7 +14,7 @@ import binnie.core.gui.geometry.Point; @SideOnly(Side.CLIENT) class ControlSpeciesBoxOption extends ControlTextOption { - private ControlIndividualDisplay controlBee; + private final ControlIndividualDisplay controlBee; public ControlSpeciesBoxOption(final ControlList controlList, final IAlleleSpecies option, final int y) { super(controlList, option, option.getAlleleName(), y); diff --git a/core/src/main/java/binnie/core/gui/database/DatabaseTab.java b/core/src/main/java/binnie/core/gui/database/DatabaseTab.java index 5052f850..d5a03c2b 100644 --- a/core/src/main/java/binnie/core/gui/database/DatabaseTab.java +++ b/core/src/main/java/binnie/core/gui/database/DatabaseTab.java @@ -6,8 +6,8 @@ import binnie.core.gui.Tooltip; import binnie.core.util.I18N; public class DatabaseTab implements ITooltipHelp { - private String modId; - private String unloc; + private final String modId; + private final String unloc; public DatabaseTab(final AbstractMod mod, final String unloc) { this.modId = mod.getModId(); diff --git a/core/src/main/java/binnie/core/gui/database/ModeWidgets.java b/core/src/main/java/binnie/core/gui/database/ModeWidgets.java new file mode 100644 index 00000000..4d6edc7f --- /dev/null +++ b/core/src/main/java/binnie/core/gui/database/ModeWidgets.java @@ -0,0 +1,50 @@ +package binnie.core.gui.database; + +import binnie.core.api.gui.IArea; +import binnie.core.gui.controls.listbox.ControlListBox; +import binnie.core.gui.controls.page.ControlPage; +import binnie.core.gui.controls.page.ControlPages; +import binnie.core.gui.controls.tab.ControlTabBar; +import binnie.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Point; + +public final class ModeWidgets { + public ControlPage getModePage() { + return modePage; + } + + public ControlListBox getListBox() { + return listBox; + } + + @FunctionalInterface + public interface IListBoxCreator { + ControlListBox createListBox(IArea area, ControlPage modePage); + } + + private final ControlPage modePage; + private final ControlListBox listBox; + private final ControlPages infoPages; + private ControlTabBar infoTabs; + + public ModeWidgets(IDatabaseMode mode, WindowAbstractDatabase database, IListBoxCreator listBoxCreator) { + this.modePage = new ControlPage<>(database.getModePages(), 0, 0, database.getSize().xPos(), database.getSize().yPos(), mode); + final IArea listBoxArea = database.getPanelSearch().getArea().inset(2); + this.listBox = listBoxCreator.createListBox(listBoxArea, this.modePage); + CraftGUIUtil.alignToWidget(this.listBox, database.getPanelSearch()); + CraftGUIUtil.moveWidget(this.listBox, new Point(2, 2)); + CraftGUIUtil.alignToWidget(this.infoPages = new ControlPages<>(this.modePage, 0, 0, 144, 176), database.getPanelInformation()); + } + + public ControlPages getInfoPages() { + return infoPages; + } + + public ControlTabBar getInfoTabs() { + return infoTabs; + } + + public void setInfoTabs(ControlTabBar infoTabs) { + this.infoTabs = infoTabs; + } +} diff --git a/core/src/main/java/binnie/core/gui/database/PageBranchOverview.java b/core/src/main/java/binnie/core/gui/database/PageBranchOverview.java index b999004c..c39295f8 100644 --- a/core/src/main/java/binnie/core/gui/database/PageBranchOverview.java +++ b/core/src/main/java/binnie/core/gui/database/PageBranchOverview.java @@ -19,10 +19,10 @@ import binnie.core.util.I18N; @SideOnly(Side.CLIENT) 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(final IWidget parent, final DatabaseTab tab) { super(parent, tab); diff --git a/core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java b/core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java index 68891d83..28823c67 100644 --- a/core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java +++ b/core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java @@ -14,8 +14,8 @@ import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class PageBranchSpecies extends PageBranch { - private ControlText pageBranchSpecies_title; - private ControlSpeciesBox pageBranchSpecies_speciesList; + private final ControlText pageBranchSpecies_title; + private final ControlSpeciesBox pageBranchSpecies_speciesList; /*@Mod.EventHandler public void onHandleEvent(final EventValueChanged event) { diff --git a/core/src/main/java/binnie/core/gui/database/PageBreeder.java b/core/src/main/java/binnie/core/gui/database/PageBreeder.java index 801b1137..b043b72a 100644 --- a/core/src/main/java/binnie/core/gui/database/PageBreeder.java +++ b/core/src/main/java/binnie/core/gui/database/PageBreeder.java @@ -12,7 +12,7 @@ import binnie.core.gui.minecraft.Window; import binnie.core.util.I18N; public class PageBreeder extends ControlPage { - private GameProfile player; + private final GameProfile player; public PageBreeder(final IWidget parent, final GameProfile player, final DatabaseTab tab) { super(parent, 0, 0, parent.getSize().xPos(), parent.getSize().yPos(), tab); diff --git a/core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java index 9b7e824a..616f163f 100644 --- a/core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java +++ b/core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java @@ -11,8 +11,8 @@ import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; public class PageSpeciesClassification extends PageSpecies { - private Map levels; - private ControlText genus; + private final Map levels; + private final ControlText genus; public PageSpeciesClassification(final IWidget parent, final DatabaseTab tab) { super(parent, tab); diff --git a/core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java index 2990411b..dc616802 100644 --- a/core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java +++ b/core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java @@ -8,8 +8,8 @@ import binnie.core.gui.controls.ControlTextCentered; import binnie.core.util.I18N; public class PageSpeciesMutations extends PageSpecies { - private ControlText title; - private ControlMutationBox list; + private final ControlText title; + private final ControlMutationBox list; public PageSpeciesMutations(final IWidget parent, final DatabaseTab tab) { super(parent, tab); diff --git a/core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java index 0fb9fad9..a1ea4cea 100644 --- a/core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java +++ b/core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java @@ -20,14 +20,14 @@ import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class PageSpeciesOverview extends PageSpecies { - private ControlText controlName; - private ControlText controlScientific; - private ControlText controlAuthority; - private ControlText controlComplexity; - private ControlText controlDescription; - private ControlText controlSignature; - private ControlIndividualDisplay controlInd1; - private ControlIndividualDisplay 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 ControlIndividualDisplay controlInd1; + private final ControlIndividualDisplay controlInd2; public PageSpeciesOverview(final IWidget parent, final DatabaseTab tab) { super(parent, tab); diff --git a/core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java index de48af0f..43815e1b 100644 --- a/core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java +++ b/core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java @@ -8,8 +8,8 @@ import binnie.core.gui.controls.ControlTextCentered; import binnie.core.util.I18N; public class PageSpeciesResultant extends PageSpecies { - private ControlText title; - private ControlMutationBox list; + private final ControlText title; + private final ControlMutationBox list; public PageSpeciesResultant(final IWidget parent, final DatabaseTab tab) { super(parent, tab); diff --git a/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java b/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java index dcbe639d..e5f9874c 100644 --- a/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java +++ b/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java @@ -7,7 +7,6 @@ import java.util.Map; import java.util.Objects; import binnie.core.api.genetics.IBreedingSystem; -import binnie.core.api.gui.IArea; import binnie.core.api.gui.events.EventHandlerOrigin; import binnie.core.gui.geometry.Point; import net.minecraft.entity.player.EntityPlayer; @@ -42,8 +41,8 @@ import binnie.core.util.I18N; public abstract class WindowAbstractDatabase extends Window { private final boolean master; private int selectionBoxWidth; - private Map modes; - private IBreedingSystem system; + private final Map modes; + private final IBreedingSystem system; @Nullable private Panel panelInformation; @Nullable @@ -71,7 +70,23 @@ public abstract class WindowAbstractDatabase extends Window { } public ControlPages getInfoPages(final IDatabaseMode mode) { - return this.modes.get(mode).infoPages; + ModeWidgets modeWidgets = this.modes.get(mode); + return modeWidgets.getInfoPages(); + } + + @Nullable + public ControlPages getModePages() { + return modePages; + } + + @Nullable + public Panel getPanelSearch() { + return panelSearch; + } + + @Nullable + public Panel getPanelInformation() { + return panelInformation; } public boolean isMaster() { @@ -117,14 +132,12 @@ public abstract class WindowAbstractDatabase extends Window { }); this.addEventHandler(EventTextEdit.class, EventHandlerOrigin.DIRECT_CHILD, this, event -> { for (final ModeWidgets widgets : WindowAbstractDatabase.this.modes.values()) { - widgets.listBox.setValidator(object -> { + widgets.getListBox().setValidator(object -> { if (Objects.equals(event.getValue(), "")) { return true; } - if (((ControlTextOption) object).getText().toLowerCase().contains(event.getValue().toLowerCase())) { - return true; - } - return false; + ControlTextOption controlTextOption = (ControlTextOption) object; + return controlTextOption.getText().toLowerCase().contains(event.getValue().toLowerCase()); }); } }); @@ -156,8 +169,9 @@ public abstract class WindowAbstractDatabase extends Window { CraftGUIUtil.linkWidgets(tab, this.modePages); this.changeMode(Mode.SPECIES); for (final IDatabaseMode mode : this.modes.keySet()) { - this.modes.get(mode).infoTabs = new ControlTabBar<>(this.modes.get(mode).modePage, 8, 24, 16, 176, Alignment.LEFT, this.modes.get(mode).infoPages.getValues()); - CraftGUIUtil.linkWidgets(this.modes.get(mode).infoTabs, this.modes.get(mode).infoPages); + ModeWidgets modeWidgets = this.modes.get(mode); + modeWidgets.setInfoTabs(new ControlTabBar<>(modeWidgets.getModePage(), 8, 24, 16, 176, Alignment.LEFT, modeWidgets.getInfoPages().getValues())); + CraftGUIUtil.linkWidgets(modeWidgets.getInfoTabs(), modeWidgets.getInfoPages()); } } @@ -177,7 +191,7 @@ public abstract class WindowAbstractDatabase extends Window { if (value != null) { this.modePages.setValue(Mode.SPECIES); this.changeMode(Mode.SPECIES); - this.modes.get(this.modePages.getValue()).listBox.setValue(value); + this.modes.get(this.modePages.getValue()).getListBox().setValue(value); } } @@ -206,29 +220,6 @@ public abstract class WindowAbstractDatabase extends Window { } } - public static final class ModeWidgets { - @FunctionalInterface - public interface IListBoxCreator { - ControlListBox createListBox(IArea area, ControlPage modePage); - } - - public WindowAbstractDatabase database; - public ControlPage modePage; - public ControlListBox listBox; - private ControlPages infoPages; - private ControlTabBar infoTabs; - - public ModeWidgets(IDatabaseMode mode, WindowAbstractDatabase database, IListBoxCreator listBoxCreator) { - this.database = database; - this.modePage = new ControlPage<>(database.modePages, 0, 0, database.getSize().xPos(), database.getSize().yPos(), mode); - final IArea listBoxArea = database.panelSearch.getArea().inset(2); - this.listBox = listBoxCreator.createListBox(listBoxArea, this.modePage); - CraftGUIUtil.alignToWidget(this.listBox, database.panelSearch); - CraftGUIUtil.moveWidget(this.listBox, new Point(2, 2)); - CraftGUIUtil.alignToWidget(this.infoPages = new ControlPages<>(this.modePage, 0, 0, 144, 176), database.panelInformation); - } - } - private static class DatabaseControlTab extends ControlTab { public DatabaseControlTab(int x, int y, int w, int h, IDatabaseMode value) { super(x, y, w, h, value); diff --git a/core/src/main/java/binnie/core/gui/events/EventKey.java b/core/src/main/java/binnie/core/gui/events/EventKey.java index 17b8b583..c2c0608e 100644 --- a/core/src/main/java/binnie/core/gui/events/EventKey.java +++ b/core/src/main/java/binnie/core/gui/events/EventKey.java @@ -4,8 +4,8 @@ import binnie.core.api.gui.IWidget; import binnie.core.api.gui.events.Event; public abstract class EventKey extends Event { - char character; - int key; + private final char character; + private final int key; public EventKey(final IWidget origin, final char character, final int key) { super(origin); diff --git a/core/src/main/java/binnie/core/gui/events/EventMouse.java b/core/src/main/java/binnie/core/gui/events/EventMouse.java index 751a6644..f607ce26 100644 --- a/core/src/main/java/binnie/core/gui/events/EventMouse.java +++ b/core/src/main/java/binnie/core/gui/events/EventMouse.java @@ -9,9 +9,9 @@ public abstract class EventMouse extends Event { } public static class Button extends EventMouse { - private int x; - private int y; - private int button; + private final int x; + private final int y; + private final int button; public Button(final IWidget currentMousedOverWidget, final int x, final int y, final int button) { super(currentMousedOverWidget); @@ -46,8 +46,8 @@ public abstract class EventMouse extends Event { } public static class Move extends EventMouse { - private float dx; - private float dy; + private final float dx; + private final float dy; public Move(final IWidget origin, final float dx, final float dy) { super(origin); diff --git a/core/src/main/java/binnie/core/gui/events/EventValueChanged.java b/core/src/main/java/binnie/core/gui/events/EventValueChanged.java index 39703010..810267ee 100644 --- a/core/src/main/java/binnie/core/gui/events/EventValueChanged.java +++ b/core/src/main/java/binnie/core/gui/events/EventValueChanged.java @@ -7,7 +7,7 @@ import binnie.core.api.gui.events.Event; public class EventValueChanged extends Event { @Nullable - private T value; + private final T value; public EventValueChanged(final IWidget origin, @Nullable final T value) { super(origin); diff --git a/core/src/main/java/binnie/core/gui/events/EventWidget.java b/core/src/main/java/binnie/core/gui/events/EventWidget.java index 2604673f..37176f98 100644 --- a/core/src/main/java/binnie/core/gui/events/EventWidget.java +++ b/core/src/main/java/binnie/core/gui/events/EventWidget.java @@ -57,7 +57,7 @@ public class EventWidget extends Event { } public static class StartDrag extends EventWidget { - int button; + private final int button; public StartDrag(final IWidget origin, final int button) { super(origin); diff --git a/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java index 08edf5d5..c329cd01 100644 --- a/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java +++ b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java @@ -1,5 +1,7 @@ package binnie.core.gui.fieldkit; +import javax.annotation.Nullable; + import binnie.core.Binnie; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; @@ -18,15 +20,15 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ControlChromoPicker extends Control implements ITooltip { - Texture Selected; - Texture Texture; - IChromosomeType type; - ControlChromosome parent; + private final Texture selected; + private final Texture texture; + private final IChromosomeType type; + private final ControlChromosome parent; public ControlChromoPicker(ControlChromosome parent, int x, int y, IChromosomeType chromo) { super(parent, x, y, 16, 16); - Selected = new StandardTexture(160, 18, 16, 16, BinnieCoreTexture.GUI_PUNNETT); - Texture = new StandardTexture(160, 34, 16, 16, BinnieCoreTexture.GUI_PUNNETT); + selected = new StandardTexture(160, 18, 16, 16, BinnieCoreTexture.GUI_PUNNETT); + texture = new StandardTexture(160, 34, 16, 16, BinnieCoreTexture.GUI_PUNNETT); type = chromo; addAttribute(Attribute.MOUSE_OVER); this.parent = parent; @@ -43,7 +45,7 @@ public class ControlChromoPicker extends Control implements ITooltip { public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); boolean selected = isMouseOver(); - Texture text = selected ? Selected : Texture; + Texture text = selected ? this.selected : texture; CraftGUI.RENDER.texture(text, Point.ZERO); } @@ -51,4 +53,10 @@ public class ControlChromoPicker extends Control implements ITooltip { public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(Binnie.GENETICS.getSystem(parent.getRoot()).getChromosomeName(type)); } + + @Nullable + @Override + public ControlChromosome getParent() { + return parent; + } } diff --git a/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java b/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java index c73489eb..87499d5a 100644 --- a/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java +++ b/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java @@ -54,13 +54,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(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { super(280, 230, player, inventory, side); diff --git a/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java b/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java index eff3a849..c423cb73 100644 --- a/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java +++ b/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java @@ -42,6 +42,7 @@ import binnie.core.gui.minecraft.control.ControlTabIcon; import binnie.core.gui.window.Panel; import binnie.core.util.I18N; import binnie.core.gui.ControlGenesisOption; +import net.minecraftforge.fml.relauncher.SideOnly; public class WindowGenesis extends Window { private static final String ACTION_GENESIS = "genesis"; @@ -67,6 +68,7 @@ public class WindowGenesis extends Window { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { new ControlPlayerInventory(this); this.setTitle(I18N.localise("binniecore.gui.genesis.title")); @@ -178,9 +180,8 @@ public class WindowGenesis extends Window { } else if (playerStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(playerStack, stack)) { final int fit = stack.getMaxStackSize() - (stack.getCount() + playerStack.getCount()); if (fit >= 0) { - ItemStack itemStack = stack; - itemStack.grow(playerStack.getCount()); - inventoryPlayer.setItemStack(itemStack); + stack.grow(playerStack.getCount()); + inventoryPlayer.setItemStack(stack); } } player.openContainer.detectAndSendChanges(); diff --git a/core/src/main/java/binnie/core/gui/geometry/Border.java b/core/src/main/java/binnie/core/gui/geometry/Border.java index ec1779d1..1f055a95 100644 --- a/core/src/main/java/binnie/core/gui/geometry/Border.java +++ b/core/src/main/java/binnie/core/gui/geometry/Border.java @@ -5,10 +5,11 @@ import binnie.core.api.gui.IBorder; public class Border implements IBorder { public static final Border ZERO = new Border(0); - int t; - int b; - int l; - int r; + + private int t; + private int b; + private int l; + private int r; public Border(final int pad) { this(pad, pad, pad, pad); diff --git a/core/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java b/core/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java index d9bf313a..dea6274c 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java +++ b/core/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java @@ -45,10 +45,10 @@ import binnie.core.network.packet.MessageContainerUpdate; public class ContainerCraftGUI extends Container { private final Set crafters = Sets.newConcurrentHashSet(); - 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; @@ -392,7 +392,7 @@ public class ContainerCraftGUI extends Container { final NBTTagCompound nbt = new NBTTagCompound(); final List slots = new ArrayList<>(); for (final TransferRequest.TransferSlot tslot : request.getInsertedSlots()) { - final Slot slot = this.getSlot(tslot.inventory, tslot.id); + final Slot slot = this.getSlot(tslot.getInventory(), tslot.getId()); if (slot != null) { slots.add(slot.slotNumber); } diff --git a/core/src/main/java/binnie/core/gui/minecraft/Dialog.java b/core/src/main/java/binnie/core/gui/minecraft/Dialog.java index 6b1bde16..6aaad586 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/Dialog.java +++ b/core/src/main/java/binnie/core/gui/minecraft/Dialog.java @@ -21,15 +21,12 @@ public abstract class Dialog extends Control { this.addAttribute(Attribute.ALWAYS_ON_TOP); this.addAttribute(Attribute.BLOCK_TOOLTIP); this.addEventHandler(EventMouse.Down.class, EventHandlerOrigin.ANY, this, event -> { - if (!Dialog.this.getArea().contains(Dialog.this.getRelativeMousePosition())) { - Dialog.this.onClose(); - Dialog.this.getParent().deleteChild(Dialog.this); + if (!this.getArea().contains(this.getRelativeMousePosition())) { + this.getParent().deleteChild(this); } }); } - public abstract void onClose(); - @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { diff --git a/core/src/main/java/binnie/core/gui/minecraft/EnumColor.java b/core/src/main/java/binnie/core/gui/minecraft/EnumColor.java index ca97cbcb..e9aa44ef 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/EnumColor.java +++ b/core/src/main/java/binnie/core/gui/minecraft/EnumColor.java @@ -18,9 +18,9 @@ public enum EnumColor { YELLOW("Yellow", 0xffff55,'e'), WHITE("White", 0xffffff,'f'); - int color; - String name; - char code; + private final int color; + private final String name; + private final char code; EnumColor(final String name, int color, final char code) { this.name = name; diff --git a/core/src/main/java/binnie/core/gui/minecraft/GUIIcon.java b/core/src/main/java/binnie/core/gui/minecraft/GUIIcon.java index fc7e5225..51c969ad 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/GUIIcon.java +++ b/core/src/main/java/binnie/core/gui/minecraft/GUIIcon.java @@ -7,19 +7,19 @@ import binnie.core.resource.BinnieSprite; public enum GUIIcon { ARROW_UP("arrow-up"), ARROW_DOWN("arrow-down"), - ArrowLeft("arrow-left"), + ARROW_LEFT("arrow-left"), ARROW_RIGHT("arrow-right"), ARROW_UP_LEFT("arrow-upleft"), - ArrowUpRight("arrow-upright"), - ArrowRightUp("arrow-rightup"), - ArrowRightDown("arrow-rightdown"), - ArrowDownRight("arrow-downright"), - ArrowDownLeft("arrow-downleft"), + ARROW_UP_RIGHT("arrow-upright"), + ARROW_RIGHT_UP("arrow-rightup"), + ARROW_RIGHT_DOWN("arrow-rightdown"), + ARROW_DOWN_RIGHT("arrow-downright"), + ARROW_DOWN_LEFT("arrow-downleft"), ARROW_LEFT_DOWN("arrow-leftdown"), - ArrowLeftUp("arrow-leftup"); + ARROW_LEFT_UP("arrow-leftup"); - String path; - BinnieSprite icon; + private final String path; + private BinnieSprite icon; GUIIcon(final String path) { this.path = path; 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 0f25de24..577b7a02 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java +++ b/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java @@ -7,6 +7,7 @@ import java.util.List; import binnie.core.api.gui.IPoint; import binnie.core.gui.geometry.Point; +import binnie.core.util.Log; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; @@ -35,8 +36,8 @@ import binnie.core.gui.renderer.RenderUtil; @SideOnly(Side.CLIENT) public class GuiCraftGUI extends GuiContainer { - private Point mousePos; - private Window window; + private final Point mousePos; + private final Window window; private ItemStack draggedItem; public GuiCraftGUI(final Window window) { @@ -133,7 +134,7 @@ public class GuiCraftGUI extends GuiContainer { for (final String string : tooltip.getList()) { if (string != null) { if (!string.contains(Tooltip.NBT_SEPARATOR)) { - textLines.addAll(font.listFormattedStringToWidth(string, tooltip.maxWidth)); + textLines.addAll(font.listFormattedStringToWidth(string, tooltip.getMaxWidth())); } else { textLines.add(string); containsItemRender = true; @@ -152,7 +153,7 @@ public class GuiCraftGUI extends GuiContainer { } if (!containsItemRender) { - GuiUtils.drawHoveringText(itemStack, textLines, mouseX, mouseY, width, height, tooltip.maxWidth, font); + GuiUtils.drawHoveringText(itemStack, textLines, mouseX, mouseY, width, height, tooltip.getMaxWidth(), font); } else { drawHoveringText(itemStack, textLines, mouseX, mouseY, font, tooltipTextWidth, tooltip); } @@ -166,7 +167,7 @@ public class GuiCraftGUI extends GuiContainer { boolean needsWrap = false; - int maxTextWidth = tooltip.maxWidth; + int maxTextWidth = tooltip.getMaxWidth(); int titleLinesCount = 1; int tooltipX = mouseX + 12; if (tooltipX + tooltipTextWidth + 4 > width) { @@ -188,7 +189,7 @@ public class GuiCraftGUI extends GuiContainer { if (needsWrap) { int wrappedTooltipWidth = 0; - List wrappedTextLines = new ArrayList(); + List wrappedTextLines = new ArrayList<>(); for (int i = 0; i < textLines.size(); i++) { String textLine = textLines.get(i); List wrappedLine = font.listFormattedStringToWidth(textLine, tooltipTextWidth); @@ -280,7 +281,7 @@ public class GuiCraftGUI extends GuiContainer { RenderUtil.drawItem(Point.ZERO, stack, false); GlStateManager.popMatrix(); } catch (NBTException e) { - e.printStackTrace(); + Log.error("Failed to draw item for line: '{}'", line, e); } } diff --git a/core/src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java b/core/src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java index 83f6d2f6..c41d25e0 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java +++ b/core/src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java @@ -31,9 +31,9 @@ public class MinecraftTooltip extends Tooltip { USER(9839667, TextFormatting.RED, TextFormatting.DARK_RED), POWER(9006592, TextFormatting.YELLOW, TextFormatting.GOLD); - int outline; - String mainText; - String bodyText; + private final int outline; + private final String mainText; + private final String bodyText; TypeColour(final int outline, final TextFormatting mainText, final TextFormatting bodyText) { this.outline = outline; diff --git a/core/src/main/java/binnie/core/gui/minecraft/Window.java b/core/src/main/java/binnie/core/gui/minecraft/Window.java index b672da01..c43ddd5d 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/Window.java +++ b/core/src/main/java/binnie/core/gui/minecraft/Window.java @@ -57,8 +57,8 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG protected int titleButtonRight; @Nullable // client side only private GuiCraftGUI gui; - private ContainerCraftGUI container; - private WindowInventory windowInventory; + private final ContainerCraftGUI container; + private final WindowInventory windowInventory; @Nullable private ControlText title; @Nullable @@ -66,9 +66,9 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG @Nullable private StandardTexture bgText2; private boolean hasBeenInitialised; - private EntityPlayer player; + private final EntityPlayer player; @Nullable - private IInventory entityInventory; + private final IInventory entityInventory; public Window(final int width, final int height, final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { this.titleButtonLeft = 8; @@ -318,7 +318,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG private static class BackgroundTexture implements IBinnieTexture { private final int i; - private Window window; + private final Window window; public BackgroundTexture(Window window, int i) { this.i = i; diff --git a/core/src/main/java/binnie/core/gui/minecraft/WindowInventory.java b/core/src/main/java/binnie/core/gui/minecraft/WindowInventory.java index 654bf668..32e87a0c 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/WindowInventory.java +++ b/core/src/main/java/binnie/core/gui/minecraft/WindowInventory.java @@ -15,10 +15,10 @@ import net.minecraft.util.text.TextComponentString; 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(final Window window) { this.inventory = new HashMap<>(); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java index e61bdfbe..0c14ed0b 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java @@ -29,7 +29,7 @@ import binnie.core.machines.power.IProcess; public class ControlEnergyBar extends Control implements ITooltip { public static boolean isError; - private Alignment direction; + private final Alignment direction; public ControlEnergyBar(final IWidget parent, final int x, final int y, final int width, final int height, final Alignment direction) { super(parent, x, y, width, height); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java index e59b5965..4efa3e4b 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java @@ -51,6 +51,7 @@ public class ControlErrorState extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public final void onUpdateClient() { this.errorState = this.getError(); this.type = Window.get(this).getContainer().getErrorType(); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java index 0bdc38f9..7f7b9677 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java @@ -10,7 +10,7 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.resource.textures.Texture; public class ControlImage extends Control { - private Object key; + private final Object key; public ControlImage(final IWidget parent, final int x, final int y, final Texture text) { super(parent, x, y, text.width(), text.height()); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java index 7c3b4122..5021aaa1 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java @@ -13,7 +13,7 @@ import binnie.core.gui.controls.core.Control; import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlInfo extends Control implements ITooltip { - private String info; + private final String info; public ControlInfo(final IWidget parent, final int x, final int y, final String info) { super(parent, x, y, 16, 16); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java index 6285c44a..20853bc8 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java @@ -20,7 +20,7 @@ import binnie.core.gui.minecraft.Window; import binnie.core.gui.renderer.RenderUtil; public class ControlItemDisplay extends Control implements ITooltip { - public boolean hastooltip; + private boolean hasTooltip; private ItemStack itemStack; private boolean rotating; @@ -39,12 +39,12 @@ public class ControlItemDisplay extends Control implements ITooltip { public ControlItemDisplay(final IWidget parent, final int x, final int y, final int size) { super(parent, x, y, size, size); this.itemStack = ItemStack.EMPTY; - this.hastooltip = false; + this.hasTooltip = false; this.rotating = false; } public void setTooltip() { - this.hastooltip = true; + this.hasTooltip = true; this.addAttribute(Attribute.MOUSE_OVER); } @@ -84,7 +84,7 @@ public class ControlItemDisplay extends Control implements ITooltip { @Override @SideOnly(Side.CLIENT) public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { - if (this.hastooltip && !this.itemStack.isEmpty()) { + if (this.hasTooltip && !this.itemStack.isEmpty()) { List itemStackTooltip = this.itemStack.getTooltip(((Window) this.getTopParent()).getPlayer(), tooltipFlag); tooltip.add(itemStackTooltip); tooltip.setItemStack(this.itemStack); @@ -95,4 +95,8 @@ public class ControlItemDisplay extends Control implements ITooltip { public void setRotating() { this.rotating = true; } + + public void setHasTooltip(boolean hasTooltip) { + this.hasTooltip = hasTooltip; + } } diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java index 2e1439c3..79e315a7 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java @@ -41,7 +41,7 @@ import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.TankInfo; public class ControlLiquidTank extends Control implements ITooltip { - public static List tankError = new ArrayList<>(); + public static final List tankError = new ArrayList<>(); private int tankID; private boolean horizontal; @@ -103,8 +103,8 @@ public class ControlLiquidTank extends Control implements ITooltip { final int height = this.horizontal ? 16 : 58; final int squaled = Math.round(height * (this.getTank().getAmount() / this.getTank().getCapacity())); final int yPos = height + 1; - final Fluid fluid = this.getTank().liquid.getFluid(); - final int hex = fluid.getColor(this.getTank().liquid); + final Fluid fluid = this.getTank().getLiquid().getFluid(); + final int hex = fluid.getColor(this.getTank().getLiquid()); final int r = (hex & 0xFF0000) >> 16; final int g = (hex & 0xFF00) >> 8; final int b = hex & 0xFF; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java index 91f7bc70..17b12969 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java @@ -6,7 +6,10 @@ import java.util.List; import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.InventoryType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ControlPlayerInventory extends Control { private final List slots; @@ -46,8 +49,4 @@ public class ControlPlayerInventory extends Control { } } } - - @Override - public void onUpdateClient() { - } } diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java index 97a7d49a..a81781b7 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java @@ -14,7 +14,7 @@ import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.machines.power.PowerSystem; public class ControlPowerSystem extends Control implements ITooltip { - private PowerSystem system; + private final PowerSystem system; public ControlPowerSystem(final IWidget parent, final int x, final int y, final PowerSystem system) { super(parent, x, y, 16, 16); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java index c410df15..83b81fa8 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java @@ -9,9 +9,9 @@ import binnie.core.api.gui.Alignment; import binnie.core.gui.resource.textures.Texture; public class ControlProgress extends ControlProgressBase { - private Texture progressBlank; - private Texture progressBar; - private Alignment direction; + private final Texture progressBlank; + private final Texture progressBar; + private final Alignment direction; public ControlProgress(final IWidget parent, final int x, final int y, final Texture progressBlank, final Texture progressBar, final Alignment dir) { super(parent, x, y, (progressBlank == null) ? 0 : progressBlank.width(), (progressBlank == null) ? 0 : progressBlank.height()); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java index 0616bd23..3f6b3f61 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java @@ -21,10 +21,10 @@ import binnie.core.gui.renderer.RenderUtil; import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlSlide extends Control { - private IArea expanded; - private IArea shrunk; + private final IArea expanded; + private final IArea shrunk; private boolean slideActive; - private Alignment anchor; + private final Alignment anchor; private String label; public ControlSlide(final IWidget parent, final int x, final int y, final int w, final int h, final Alignment anchor2) { diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java index 2b6ac074..331d06c2 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java @@ -37,9 +37,10 @@ import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.SlotValidator; +@SideOnly(Side.CLIENT) public class ControlSlot extends ControlSlotBase { public static final Map> highlighting = new EnumMap<>(EnumHighlighting.class); - public static boolean shiftClickActive = false; + public static boolean shiftClickActive; static { for (final EnumHighlighting h : EnumHighlighting.values()) { @@ -58,9 +59,9 @@ public class ControlSlot extends ControlSlotBase { Minecraft mc = superParentGui.getMinecraft(); final PlayerControllerMP playerController = mc.playerController; final int windowId = superParent.getContainer().windowId; - final int slotNumber = ControlSlot.this.slot.slotNumber; + final int slotNumber = this.slot.slotNumber; final int button = event.getButton(); - Window.get(ControlSlot.this.getWidget()).getGui(); + Window.get(this.getWidget()).getGui(); if (playerController != null) { boolean clone = mc.gameSettings.keyBindPickBlock.isActiveAndMatches(button - 100); playerController.windowClick(windowId, slotNumber, button, clone ? ClickType.CLONE : GuiScreen.isShiftKeyDown() ? ClickType.QUICK_MOVE : ClickType.PICKUP, mc.player); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java index 96fbbf8f..1411bcfb 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java @@ -10,7 +10,10 @@ import net.minecraft.item.ItemStack; import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.InventoryType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ControlSlotArray extends Control implements Iterable { private List slots = new ArrayList<>(); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java index 8e1ecaec..f36f4e1d 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java @@ -23,7 +23,7 @@ import binnie.core.gui.renderer.RenderUtil; import binnie.core.gui.resource.textures.CraftGUITexture; public abstract class ControlSlotBase extends Control implements ITooltip { - private ControlItemDisplay itemDisplay; + private final ControlItemDisplay itemDisplay; public ControlSlotBase(final IWidget parent, final int x, final int y) { this(parent, x, y, 18); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java index 99ea5a95..3ad7c754 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java @@ -14,7 +14,7 @@ import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; public class ControlSlotCharge extends Control { - private int slot; + private final int slot; public ControlSlotCharge(final IWidget parent, final int x, final int y, final int slot) { super(parent, x, y, 4, 18); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java index 7e6803a8..d5c9611e 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java @@ -11,12 +11,12 @@ import binnie.core.gui.controls.tab.ControlTabBar; import binnie.core.gui.geometry.Point; public class ControlTabIcon extends ControlTab { - private ControlItemDisplay item; + private final ControlItemDisplay item; public ControlTabIcon(final int x, final int y, final int w, final int h, final T value) { super(x, y, w, h, value); this.item = new ControlItemDisplay(this, -8 + w / 2, -8 + h / 2); - this.item.hastooltip = false; + this.item.setHasTooltip(false); } public ItemStack getItemStack() { diff --git a/core/src/main/java/binnie/core/gui/resource/stylesheet/ParsedTextureSheet.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/ParsedTextureSheet.java index e236295b..c91e664f 100644 --- a/core/src/main/java/binnie/core/gui/resource/stylesheet/ParsedTextureSheet.java +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/ParsedTextureSheet.java @@ -10,8 +10,8 @@ import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; class ParsedTextureSheet implements IBinnieTexture { - private String modid; - private String path; + private final String modid; + private final String path; @SideOnly(Side.CLIENT) @Nullable diff --git a/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheet.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheet.java index bbabdff5..8592589e 100644 --- a/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheet.java +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheet.java @@ -9,14 +9,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.resource.textures.Texture; public class StyleSheet implements IStyleSheet { - protected Map textures; - - public StyleSheet() { - this.textures = new HashMap<>(); - } + protected final Map textures = new HashMap<>(); public StyleSheet(Map textures) { - this.textures = new HashMap<>(); this.textures.putAll(textures); } diff --git a/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetManager.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetManager.java index c8666d48..2902ed66 100644 --- a/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetManager.java +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetManager.java @@ -24,14 +24,15 @@ public class StyleSheetManager implements IResourceManagerReloadListener { private static Map sheetLocations; public StyleSheetManager() { - this.sheets = new HashMap<>(); - this.sheetLocations = new HashMap<>(); + sheets = new HashMap<>(); + sheetLocations = new HashMap<>(); CraftGUI.styleSheetManager = this; registerLocation(DEFAULT_SHEET, new ResourceLocation(Constants.CORE_MOD_ID, "gui/stylesheet.json")); registerLocation(PUNNETT_SHEET, new ResourceLocation(Constants.CORE_MOD_ID, "gui/punnett_stylesheet.json")); } @Override + @SideOnly(Side.CLIENT) public void onResourceManagerReload(final IResourceManager manager) { sheets.clear(); try { diff --git a/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetParser.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetParser.java index ae2fdbf7..eb37c1f3 100644 --- a/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetParser.java +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetParser.java @@ -14,6 +14,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.io.IOUtils; import net.minecraft.client.resources.IResource; @@ -38,6 +40,7 @@ public class StyleSheetParser { public static final String PADDING_KEY = "padding"; public static final String TEXTURES_KEY = "textures"; + @SideOnly(Side.CLIENT) public static StyleSheet parseSheet(IResourceManager manager, ResourceLocation location) { try { IResource res = manager.getResource(location); diff --git a/core/src/main/java/binnie/core/gui/resource/textures/CraftGUITexture.java b/core/src/main/java/binnie/core/gui/resource/textures/CraftGUITexture.java index 82442701..6e2ce37c 100644 --- a/core/src/main/java/binnie/core/gui/resource/textures/CraftGUITexture.java +++ b/core/src/main/java/binnie/core/gui/resource/textures/CraftGUITexture.java @@ -44,7 +44,7 @@ public enum CraftGUITexture { CHECKBOX_CHECKED("checkbox.checked"), CHECKBOX_CHECKED_HIGHLIGHTED("checkbox.checked.highlighted"); - String name; + private final String name; CraftGUITexture(final String name) { this.name = name; diff --git a/core/src/main/java/binnie/core/gui/resource/textures/PunnettGUITexture.java b/core/src/main/java/binnie/core/gui/resource/textures/PunnettGUITexture.java index d0b77a4b..3c8c4242 100644 --- a/core/src/main/java/binnie/core/gui/resource/textures/PunnettGUITexture.java +++ b/core/src/main/java/binnie/core/gui/resource/textures/PunnettGUITexture.java @@ -3,9 +3,9 @@ package binnie.core.gui.resource.textures; public enum PunnettGUITexture { CHROMOSOME("chromosome"), CHROMOSOME_OVERLAY("chromosome_overlay"); - String name; + private final String name; - private PunnettGUITexture(final String name) { + PunnettGUITexture(final String name) { this.name = name; } diff --git a/core/src/main/java/binnie/core/gui/window/Panel.java b/core/src/main/java/binnie/core/gui/window/Panel.java index 90b03981..37e37969 100644 --- a/core/src/main/java/binnie/core/gui/window/Panel.java +++ b/core/src/main/java/binnie/core/gui/window/Panel.java @@ -11,7 +11,7 @@ import binnie.core.gui.minecraft.MinecraftGUI; import binnie.core.gui.resource.textures.CraftGUITexture; public class Panel extends Control { - IPanelType type; + private final IPanelType type; public Panel(final IWidget parent, final int x, final int y, final int width, final int height, final IPanelType type) { super(parent, x, y, width, height); diff --git a/core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java b/core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java index fa4c4f24..48ab9186 100644 --- a/core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java +++ b/core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java @@ -18,8 +18,11 @@ import binnie.core.IInitializable; public class ExtraBeesIntegration implements IInitializable { private static final boolean loaded; - public static IAlleleBeeSpecies water, rock, basalt, marble; - public static Block hive; + private static IAlleleBeeSpecies water; + private static IAlleleBeeSpecies rock; + private static IAlleleBeeSpecies basalt; + private static IAlleleBeeSpecies marble; + private static Block hive; static { loaded = Loader.isModLoaded("extrabees"); diff --git a/core/src/main/java/binnie/core/item/ItemMisc.java b/core/src/main/java/binnie/core/item/ItemMisc.java index 85d85fca..86cc9ed7 100644 --- a/core/src/main/java/binnie/core/item/ItemMisc.java +++ b/core/src/main/java/binnie/core/item/ItemMisc.java @@ -16,7 +16,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; public class ItemMisc extends ItemCore { - private IItemMiscProvider[] items; + private final IItemMiscProvider[] items; public ItemMisc(final CreativeTabs tab, final IItemMiscProvider[] items, String name) { super(name); diff --git a/core/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/core/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 8b844f8e..42a1cf33 100644 --- a/core/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/core/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -102,7 +102,7 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { if (entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entityLiving; player.getFoodStats().addStats(this, stack); - world.playSound((EntityPlayer) null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); onFoodEaten(stack, world, player); return this.container.getEmpty(); } @@ -185,8 +185,8 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { @SideOnly(Side.CLIENT) private class FluidContainerMeshDefinition implements ItemMeshDefinition { - final ModelResourceLocation location; - final ModelResourceLocation empty; + private final ModelResourceLocation location; + private final ModelResourceLocation empty; public FluidContainerMeshDefinition() { ResourceLocation location = getRegistryName(); diff --git a/core/src/main/java/binnie/core/liquid/ManagerLiquid.java b/core/src/main/java/binnie/core/liquid/ManagerLiquid.java index a714bb44..becc8759 100644 --- a/core/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/core/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -30,7 +30,7 @@ public class ManagerLiquid extends ManagerBase { //TODO: test if the name is "Creosote Oil" and not "fluid.creosote" public static final String CREOSOTE = "fluid.creosote"; - private Map fluids; + private final Map fluids; public ManagerLiquid() { this.fluids = new LinkedHashMap<>(); diff --git a/core/src/main/java/binnie/core/machines/BlockMachine.java b/core/src/main/java/binnie/core/machines/BlockMachine.java index a6cefbaa..11127f45 100644 --- a/core/src/main/java/binnie/core/machines/BlockMachine.java +++ b/core/src/main/java/binnie/core/machines/BlockMachine.java @@ -42,7 +42,7 @@ import binnie.core.util.TileUtil; class BlockMachine extends Block implements IBlockMachine, ITileEntityProvider { public static final PropertyInteger MACHINE_TYPE = PropertyInteger.create("machine_type", 0, 15); - private MachineGroup group; + private final MachineGroup group; public BlockMachine(MachineGroup group, String blockName) { super(Material.IRON); diff --git a/core/src/main/java/binnie/core/machines/ItemMachine.java b/core/src/main/java/binnie/core/machines/ItemMachine.java index f2de0e62..09e0a315 100644 --- a/core/src/main/java/binnie/core/machines/ItemMachine.java +++ b/core/src/main/java/binnie/core/machines/ItemMachine.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemMachine extends ItemBlock { - private IBlockMachine associatedBlock; + private final IBlockMachine associatedBlock; public ItemMachine(final Block block) { super(block); diff --git a/core/src/main/java/binnie/core/machines/Machine.java b/core/src/main/java/binnie/core/machines/Machine.java index f9ac8027..1b03220d 100644 --- a/core/src/main/java/binnie/core/machines/Machine.java +++ b/core/src/main/java/binnie/core/machines/Machine.java @@ -34,10 +34,10 @@ import binnie.core.network.packet.MessageSyncTile; import binnie.core.network.packet.PacketPayload; public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT { - private MachinePackage machinePackage; - private Map, List> componentInterfaceMap; - private Map, MachineComponent> componentMap; - private TileEntity tile; + private final MachinePackage machinePackage; + private final Map, List> componentInterfaceMap; + private final Map, MachineComponent> componentMap; + private final TileEntity tile; private boolean queuedInventoryUpdate; @Nullable private GameProfile owner; diff --git a/core/src/main/java/binnie/core/machines/MachineGroup.java b/core/src/main/java/binnie/core/machines/MachineGroup.java index 8172c0fc..98aace32 100644 --- a/core/src/main/java/binnie/core/machines/MachineGroup.java +++ b/core/src/main/java/binnie/core/machines/MachineGroup.java @@ -14,11 +14,11 @@ import binnie.core.AbstractMod; import binnie.core.BinnieCore; public class MachineGroup { - private AbstractMod mod; - private String uid; - private Map packages; - private Map packagesID; - private BlockMachine block; + private final AbstractMod mod; + private final String uid; + private final Map packages; + private final Map packagesID; + private final BlockMachine block; public MachineGroup(final AbstractMod mod, final String uid, final String blockName, final IMachineType[] types) { this.packages = new LinkedHashMap<>(); @@ -33,10 +33,6 @@ public class MachineGroup { for (int j = 0; j < types.length; j++) { BinnieCore.getBinnieProxy().registerModel(i, j, new ModelResourceLocation(i.getRegistryName(), "machine_type=" + j)); } - - for (final MachinePackage pack : this.getPackages()) { - pack.register(); - } } private void createPackages(IMachineType[] types) { diff --git a/core/src/main/java/binnie/core/machines/MachinePackage.java b/core/src/main/java/binnie/core/machines/MachinePackage.java index b7d115c0..f4d08afd 100644 --- a/core/src/main/java/binnie/core/machines/MachinePackage.java +++ b/core/src/main/java/binnie/core/machines/MachinePackage.java @@ -5,17 +5,15 @@ import net.minecraft.tileentity.TileEntity; import binnie.core.util.I18N; public abstract class MachinePackage { - boolean powered; - private String uid; + private final String uid; private boolean active; private int metadata; private MachineGroup group; - protected MachinePackage(final String uid, final boolean powered) { + protected MachinePackage(final String uid) { this.active = true; this.metadata = -1; this.uid = uid; - this.powered = powered; } public String getUID() { @@ -26,8 +24,6 @@ public abstract class MachinePackage { public abstract TileEntity createTileEntity(); - public abstract void register(); - public final String getDisplayName() { return I18N.localise(this.group.getMod().getModId() + '.' + "machine." + this.group.getShortUID() + "." + this.getUID()); } diff --git a/core/src/main/java/binnie/core/machines/MachineUtil.java b/core/src/main/java/binnie/core/machines/MachineUtil.java index aaef1a28..20281003 100644 --- a/core/src/main/java/binnie/core/machines/MachineUtil.java +++ b/core/src/main/java/binnie/core/machines/MachineUtil.java @@ -24,7 +24,7 @@ import binnie.core.util.ItemStackSet; public class MachineUtil { private static final Random DAMAGE_RANDOM = new Random(); - private IMachine machine; + private final IMachine machine; public MachineUtil(final IMachine machine) { this.machine = machine; diff --git a/core/src/main/java/binnie/core/machines/ManagerMachine.java b/core/src/main/java/binnie/core/machines/ManagerMachine.java index fef945db..686bc6ac 100644 --- a/core/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/core/src/main/java/binnie/core/machines/ManagerMachine.java @@ -12,12 +12,15 @@ import forestry.api.core.INbtWritable; import binnie.core.BinnieCore; import binnie.core.ManagerBase; -import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.ValidatorSprite; public class ManagerMachine extends ManagerBase { - private Map, Class[]> componentInterfaceMap; - private Map machineGroups; + private static ValidatorSprite spriteBee; + private static ValidatorSprite spriteFrame; + private static ValidatorSprite spriteCircuit; + private static ValidatorSprite spriteBlock; + private final Map, Class[]> componentInterfaceMap; + private final Map machineGroups; private int nextNetworkID; public ManagerMachine() { @@ -26,6 +29,22 @@ public class ManagerMachine extends ManagerBase { this.nextNetworkID = 0; } + public static ValidatorSprite getSpriteBee() { + return spriteBee; + } + + public static ValidatorSprite getSpriteFrame() { + return spriteFrame; + } + + public static ValidatorSprite getSpriteCircuit() { + return spriteCircuit; + } + + public static ValidatorSprite getSpriteBlock() { + return spriteBlock; + } + public void registerMachineGroup(final MachineGroup group) { this.machineGroups.put(group.getUID(), group); } @@ -56,10 +75,10 @@ public class ManagerMachine extends ManagerBase { @Override public void preInit() { - SlotValidator.spriteBee = new ValidatorSprite(BinnieCore.getInstance(), "validator/bee.0", "validator/bee.1"); - SlotValidator.spriteFrame = new ValidatorSprite(BinnieCore.getInstance(), "validator/frame.0", "validator/frame.1"); - SlotValidator.spriteCircuit = new ValidatorSprite(BinnieCore.getInstance(), "validator/circuit.0", "validator/circuit.1"); - SlotValidator.spriteBlock = new ValidatorSprite(BinnieCore.getInstance(), "validator/block.0", "validator/block.1"); + spriteBee = new ValidatorSprite(BinnieCore.getInstance(), "validator/bee.0", "validator/bee.1"); + spriteFrame = new ValidatorSprite(BinnieCore.getInstance(), "validator/frame.0", "validator/frame.1"); + spriteCircuit = new ValidatorSprite(BinnieCore.getInstance(), "validator/circuit.0", "validator/circuit.1"); + spriteBlock = new ValidatorSprite(BinnieCore.getInstance(), "validator/block.0", "validator/block.1"); } @Override diff --git a/core/src/main/java/binnie/core/machines/errors/CoreErrorCode.java b/core/src/main/java/binnie/core/machines/errors/CoreErrorCode.java index d5b7774a..6e70b808 100644 --- a/core/src/main/java/binnie/core/machines/errors/CoreErrorCode.java +++ b/core/src/main/java/binnie/core/machines/errors/CoreErrorCode.java @@ -22,11 +22,9 @@ public enum CoreErrorCode implements IErrorStateDefinition { TASK_CANCELLED("task.cancelled"), TASK_PAUSED("task.paused"); - String name; - @Nullable - IErrorStateDefinition parent; - @Nullable - EnumErrorType type; + private final String name; + private final IErrorStateDefinition parent; + private final EnumErrorType type; CoreErrorCode(String name) { this(name, null, EnumErrorType.NONE); @@ -40,7 +38,7 @@ public enum CoreErrorCode implements IErrorStateDefinition { this(name, parent, EnumErrorType.NONE); } - CoreErrorCode(String name, IErrorStateDefinition parent, EnumErrorType type) { + CoreErrorCode(String name, @Nullable IErrorStateDefinition parent, EnumErrorType type) { this.name = name; this.parent = parent; this.type = type; diff --git a/core/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/core/src/main/java/binnie/core/machines/inventory/BaseSlot.java index e33fb420..75cb858a 100644 --- a/core/src/main/java/binnie/core/machines/inventory/BaseSlot.java +++ b/core/src/main/java/binnie/core/machines/inventory/BaseSlot.java @@ -14,10 +14,10 @@ import net.minecraft.util.ResourceLocation; public abstract class BaseSlot implements INbtWritable, INbtReadable, IValidator { @Nullable - protected ResourceLocation unlocLocation; + protected final ResourceLocation unlocLocation; @Nullable - Validator validator; - private SidedAccess access; + private Validator validator; + private final SidedAccess access; private boolean readOnly; private int index; diff --git a/core/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java b/core/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java index 388e109d..1cbf56ba 100644 --- a/core/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java +++ b/core/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java @@ -12,7 +12,7 @@ import binnie.core.machines.MachineComponent; import binnie.core.machines.network.INetwork; public class ComponentChargedSlots extends MachineComponent implements INetwork.GuiNBT, IChargedSlots { - private Map charges; + private final Map charges; public ComponentChargedSlots(final Machine machine) { super(machine); diff --git a/core/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/core/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index 91bac191..7a60206e 100644 --- a/core/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/core/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -20,7 +20,7 @@ import net.minecraft.util.text.TextComponentString; import binnie.core.machines.IMachine; public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots { - private Map inventory; + private final Map inventory; public ComponentInventorySlots(final IMachine machine) { super(machine); diff --git a/core/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/core/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java index 7ac1493a..fc40313a 100644 --- a/core/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java +++ b/core/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java @@ -12,7 +12,7 @@ import binnie.core.machines.MachineComponent; import binnie.core.machines.transfer.TransferRequest; public class ComponentInventoryTransfer extends MachineComponent { - private List transfers; + private final List transfers; public ComponentInventoryTransfer(final IMachine machine) { super(machine); @@ -90,9 +90,9 @@ public class ComponentInventoryTransfer extends MachineComponent { } private class Restock extends Transfer { - int[] buffer; - int destination; - int limit; + private final int[] buffer; + private final int destination; + private final int limit; private Restock(final IMachine machine, final int[] buffer, final int destination, final int limit) { super(machine); @@ -122,8 +122,8 @@ public class ComponentInventoryTransfer extends MachineComponent { } private class Storage extends Transfer { - int source; - int[] destination; + private final int source; + private final int[] destination; private Storage(final IMachine machine, final int source, final int[] destination) { super(machine); diff --git a/core/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/core/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 075b3b4d..3c61f991 100644 --- a/core/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/core/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -25,8 +25,8 @@ import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.TankInfo; public class ComponentTankContainer extends MachineComponent implements ITankMachine { - private Map tanks; - private EnumMap handlers; + private final Map tanks; + private final EnumMap handlers; public ComponentTankContainer(final IMachine machine) { super(machine); @@ -178,7 +178,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac } private class TankContainer implements IFluidHandler { - EnumFacing from; + private final EnumFacing from; public TankContainer(EnumFacing from) { this.from = from; diff --git a/core/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/core/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 225d1136..cb263d93 100644 --- a/core/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/core/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -70,7 +70,7 @@ public class InventorySlot extends BaseSlot { @Override public SlotValidator getValidator() { - return (SlotValidator) this.validator; + return (SlotValidator) super.getValidator(); } public void setType(final Type type) { diff --git a/core/src/main/java/binnie/core/machines/inventory/MachineSide.java b/core/src/main/java/binnie/core/machines/inventory/MachineSide.java index c14a9ca6..1442dffc 100644 --- a/core/src/main/java/binnie/core/machines/inventory/MachineSide.java +++ b/core/src/main/java/binnie/core/machines/inventory/MachineSide.java @@ -6,15 +6,15 @@ import java.util.EnumSet; import net.minecraft.util.EnumFacing; public class MachineSide { - public static EnumSet TopAndBottom = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN); - public static EnumSet None = EnumSet.noneOf(EnumFacing.class); - public static EnumSet Top = EnumSet.of(EnumFacing.UP); - public static EnumSet Bottom = EnumSet.of(EnumFacing.DOWN); - public static EnumSet Sides = EnumSet.of(EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST); - private static EnumSet All = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST); + public static final EnumSet TOP_AND_BOTTOM = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN); + public static final EnumSet NONE = EnumSet.noneOf(EnumFacing.class); + public static final EnumSet TOP = EnumSet.of(EnumFacing.UP); + public static final EnumSet BOTTOM = EnumSet.of(EnumFacing.DOWN); + public static final EnumSet SIDES = EnumSet.of(EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST); + private static final EnumSet ALL = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST); public static String asString(final Collection sides) { - if (sides.containsAll(MachineSide.All)) { + if (sides.containsAll(MachineSide.ALL)) { return "Any"; } if (sides.isEmpty()) { @@ -33,7 +33,7 @@ public class MachineSide { } text += "Down"; } - if (sides.containsAll(MachineSide.Sides)) { + if (sides.containsAll(MachineSide.SIDES)) { if (sides.size() > 0) { text += ", "; } diff --git a/core/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/core/src/main/java/binnie/core/machines/inventory/SidedAccess.java index 29195b8c..eb591ce8 100644 --- a/core/src/main/java/binnie/core/machines/inventory/SidedAccess.java +++ b/core/src/main/java/binnie/core/machines/inventory/SidedAccess.java @@ -9,7 +9,7 @@ import java.util.Map; import net.minecraft.util.EnumFacing; class SidedAccess { - private Map accesses; + private final Map accesses; private AccessDirection base; private boolean insertLocked; private boolean extractLocked; diff --git a/core/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/core/src/main/java/binnie/core/machines/inventory/SlotValidator.java index 696f9064..21409c48 100644 --- a/core/src/main/java/binnie/core/machines/inventory/SlotValidator.java +++ b/core/src/main/java/binnie/core/machines/inventory/SlotValidator.java @@ -11,13 +11,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.AlleleManager; public abstract class SlotValidator extends Validator { - public static ValidatorSprite spriteBee; - public static ValidatorSprite spriteFrame; - public static ValidatorSprite spriteCircuit; - public static ValidatorSprite spriteBlock; @Nullable - private ValidatorSprite sprite; + private final ValidatorSprite sprite; public SlotValidator(@Nullable final ValidatorSprite icon) { this.sprite = icon; @@ -30,7 +26,7 @@ public abstract class SlotValidator extends Validator { } public static class Item extends SlotValidator { - private ItemStack target; + private final ItemStack target; public Item(final ItemStack target, final ValidatorSprite icon) { super(icon); diff --git a/core/src/main/java/binnie/core/machines/inventory/TankSlot.java b/core/src/main/java/binnie/core/machines/inventory/TankSlot.java index c9cc187a..dba8932d 100644 --- a/core/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/core/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -11,7 +11,7 @@ import net.minecraftforge.fluids.IFluidTank; import binnie.core.util.I18N; public class TankSlot extends BaseSlot { - private FluidTank tank; + private final FluidTank tank; @Deprecated public TankSlot(final int index, final String name, final int capacity) { diff --git a/core/src/main/java/binnie/core/machines/inventory/TankValidator.java b/core/src/main/java/binnie/core/machines/inventory/TankValidator.java index 12f5573d..acefd914 100644 --- a/core/src/main/java/binnie/core/machines/inventory/TankValidator.java +++ b/core/src/main/java/binnie/core/machines/inventory/TankValidator.java @@ -10,7 +10,7 @@ public abstract class TankValidator extends Validator { public abstract boolean isValid(final FluidStack p0); public static class Basic extends TankValidator { - private Fluid fluid; + private final Fluid fluid; public Basic(final String name) { this.fluid = Binnie.LIQUID.getFluidStack(name, 1).getFluid(); diff --git a/core/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java b/core/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java index 686d7282..d9534e79 100644 --- a/core/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java +++ b/core/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java @@ -9,8 +9,8 @@ import binnie.core.resource.BinnieSprite; public class ValidatorSprite { - private List spritesInput; - private List spritesOutput; + private final List spritesInput; + private final List spritesOutput; public ValidatorSprite(final AbstractMod mod, final String pathInput, final String pathOutput) { this(mod.getModId(), pathInput, pathOutput); diff --git a/core/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java b/core/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java index 16e487ad..20cb6b63 100644 --- a/core/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java +++ b/core/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java @@ -20,11 +20,11 @@ import ic2.api.energy.tile.IEnergyTile; @Optional.Interface(iface = "binnie.core.machines.component.IBuildcraft.TriggerProvider", modid = "BuildCraft|Silicon") public class ComponentPowerReceptor extends MachineComponent implements IPoweredMachine/*, IBuildcraft.TriggerProvider*/, IInteraction.ChunkUnload, IInteraction.Invalidation { - static final int inputAverageTicks = 20; - float previousPower; - LinkedList inputs; + private static final int inputAverageTicks = 20; + private final float previousPower; + private final LinkedList inputs; private boolean registeredToIC2EnergyNet; - private PowerInterface container; + private final PowerInterface container; public ComponentPowerReceptor(final IMachine machine) { this(machine, 1000); @@ -41,6 +41,10 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered } } + public static int getInputAverageTicks() { + return inputAverageTicks; + } + @Override public void readFromNBT(final NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); @@ -182,4 +186,12 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) this.getMachine().getTileEntity())); this.registeredToIC2EnergyNet = false; } + + public float getPreviousPower() { + return previousPower; + } + + public LinkedList getInputs() { + return inputs; + } } diff --git a/core/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/core/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index 777971a0..afafa720 100644 --- a/core/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/core/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -12,8 +12,8 @@ import binnie.core.machines.network.INetwork; import binnie.core.util.I18N; public abstract class ComponentProcessIndefinate extends MachineComponent implements IProcess, INetwork.TilePacketSync { - int clientEnergyPerSecond; - int clientInProgress; + private final int clientEnergyPerSecond; + private int clientInProgress; private float energyPerTick; private boolean inProgress; private float actionPauseProcess; diff --git a/core/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java b/core/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java index e1010f5c..7609bd32 100644 --- a/core/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java +++ b/core/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java @@ -3,8 +3,8 @@ package binnie.core.machines.power; 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(final IMachine machine, final int processEnergy, final int processLength) { super(machine); diff --git a/core/src/main/java/binnie/core/machines/power/PowerInterface.java b/core/src/main/java/binnie/core/machines/power/PowerInterface.java index b92e3b26..dd618f89 100644 --- a/core/src/main/java/binnie/core/machines/power/PowerInterface.java +++ b/core/src/main/java/binnie/core/machines/power/PowerInterface.java @@ -6,7 +6,7 @@ import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; public class PowerInterface implements INbtReadable, INbtWritable { - private int capacity; + private final int capacity; private int energy; public PowerInterface(final int capacity) { diff --git a/core/src/main/java/binnie/core/machines/power/PowerSystem.java b/core/src/main/java/binnie/core/machines/power/PowerSystem.java index 321b8be5..7e0233c6 100644 --- a/core/src/main/java/binnie/core/machines/power/PowerSystem.java +++ b/core/src/main/java/binnie/core/machines/power/PowerSystem.java @@ -8,7 +8,7 @@ public enum PowerSystem { RF(10.0), EU(40.0); - double conversion; + private final double conversion; PowerSystem(final double conversion) { this.conversion = conversion; diff --git a/core/src/main/java/binnie/core/machines/power/TankInfo.java b/core/src/main/java/binnie/core/machines/power/TankInfo.java index 80c523b5..6e56edf6 100644 --- a/core/src/main/java/binnie/core/machines/power/TankInfo.java +++ b/core/src/main/java/binnie/core/machines/power/TankInfo.java @@ -12,7 +12,7 @@ import forestry.api.core.INbtWritable; public class TankInfo implements INbtReadable, INbtWritable { @Nullable - public FluidStack liquid; + private FluidStack liquid; private float capacity; public TankInfo(final IFluidTank tank) { @@ -68,4 +68,9 @@ public class TankInfo implements INbtReadable, INbtWritable { nbt.setTag("liquid", tag); return nbt; } + + @Nullable + public FluidStack getLiquid() { + return liquid; + } } diff --git a/core/src/main/java/binnie/core/machines/storage/Compartment.java b/core/src/main/java/binnie/core/machines/storage/Compartment.java index 029d7cf2..301580ca 100644 --- a/core/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/core/src/main/java/binnie/core/machines/storage/Compartment.java @@ -35,7 +35,7 @@ enum Compartment implements IMachineType { public abstract static class PackageCompartment extends MachinePackage { protected PackageCompartment(final String uid) { - super(uid, false); + super(uid); } @Override @@ -43,8 +43,5 @@ enum Compartment implements IMachineType { return new TileEntityMachine(this); } - @Override - public void register() { - } } } diff --git a/core/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java b/core/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java index 7ac10a3e..7f92c441 100644 --- a/core/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java +++ b/core/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java @@ -11,7 +11,7 @@ import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; class ComponentBinnieCoreGUI extends MachineComponent implements IInteraction.RightClick { - private BinnieCoreGUI id; + private final BinnieCoreGUI id; public ComponentBinnieCoreGUI(final Machine machine, final BinnieCoreGUI id) { super(machine); diff --git a/core/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/core/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java index 117cefed..4e4d7879 100644 --- a/core/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java +++ b/core/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java @@ -12,9 +12,9 @@ import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.network.INetwork; class ComponentCompartmentInventory extends ComponentInventorySlots implements INetwork.GuiNBT { - private int tabCount; - private int slotsPerPage; - private Map tabs; + private final int tabCount; + private final int slotsPerPage; + private final Map tabs; public ComponentCompartmentInventory(final IMachine machine, final int tabCount, final int pageSize) { super(machine); diff --git a/core/src/main/java/binnie/core/machines/storage/SearchDialog.java b/core/src/main/java/binnie/core/machines/storage/SearchDialog.java new file mode 100644 index 00000000..1240ac4d --- /dev/null +++ b/core/src/main/java/binnie/core/machines/storage/SearchDialog.java @@ -0,0 +1,169 @@ +package binnie.core.machines.storage; + +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import binnie.core.api.gui.IWidget; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.controls.ControlCheckbox; +import binnie.core.gui.controls.ControlTextEdit; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.scroll.ControlScrollableContent; +import binnie.core.gui.events.EventTextEdit; +import binnie.core.gui.geometry.Border; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Dialog; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.textures.CraftGUITexture; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class SearchDialog extends Dialog { + private final Control slotGrid; + private final WindowCompartment windowCompartment; + private String textSearch = ""; + private boolean sortByName; + private boolean includeItems = true; + private boolean includeBlocks = true; + + public SearchDialog(WindowCompartment windowCompartment) { + super(windowCompartment, 252, 192); + this.windowCompartment = windowCompartment; + + final ControlScrollableContent scroll = new SearchScrollContent(this); + this.slotGrid = new Control(scroll, 1, 1, 108, 18); + scroll.setScrollableContent(this.slotGrid); + new ControlPlayerInventory(this, true); + new ControlTextEdit(this, 16, 16, 100, 14).addEventHandler(EventTextEdit.class, event -> { + textSearch = event.getValue(); + updateSearch(); + }); + this.includeItems = true; + this.includeBlocks = true; + new SortAlphabeticalCheckbox(this); + new IncludeItemsCheckbox(this); + new IncludeBlocksCheckbox(this); + this.updateSearch(); + } + + private void updateSearch() { + Map slotIds = new HashMap<>(); + final IInventory inv = windowCompartment.getInventory(); + for (int i = 0; i < inv.getSizeInventory(); ++i) { + final ItemStack stack = inv.getStackInSlot(i); + if (!stack.isEmpty()) { + final String name = stack.getDisplayName().toLowerCase(); + if (this.textSearch == null || name.contains(this.textSearch)) { + if (this.includeBlocks || Block.getBlockFromItem(stack.getItem()) == Blocks.AIR) { + if (this.includeItems || Block.getBlockFromItem(stack.getItem()) != Blocks.AIR) { + slotIds.put(i, name); + } + } + } + } + } + if (this.sortByName) { + final List> list = new LinkedList<>(slotIds.entrySet()); + list.sort((o1, o2) -> -o2.getValue().compareTo(o1.getValue())); + final Map result = new LinkedHashMap<>(); + for (final Map.Entry entry : list) { + result.put(entry.getKey(), entry.getValue()); + } + slotIds = result; + } + int y = 0; + int x = 0; + final int width = 108; + final int height = 2 + 18 * (1 + (slotIds.size() - 1) / 6); + this.slotGrid.deleteAllChildren(); + this.slotGrid.setSize(new Point(width, height)); + for (final int k : slotIds.keySet()) { + new ControlSlot.Builder(this.slotGrid, x, y).assign(k); + x += 18; + if (x >= 108) { + x = 0; + y += 18; + } + } + while (y < 108 || x != 0) { + // TODO: what was this supposed to do? + new ControlSlot.Builder(this.slotGrid, x, y); + x += 18; + if (x >= 108) { + x = 0; + y += 18; + } + } + } + + private static class SearchScrollContent extends ControlScrollableContent { + private final SearchDialog searchDialog; + + public SearchScrollContent(SearchDialog searchDialog) { + super(searchDialog, 124, 16, 116, 92, 6); + this.searchDialog = searchDialog; + } + + @Override + @SideOnly(Side.CLIENT) + public void onRenderBackground(int guiWidth, int guiHeight) { + RenderUtil.setColour(11184810); + CraftGUI.RENDER.texture(CraftGUITexture.OUTLINE, searchDialog.windowCompartment.getArea().inset(new Border(0, 6, 0, 0))); + } + } + + private static class SortAlphabeticalCheckbox extends ControlCheckbox { + private final SearchDialog searchDialog; + + public SortAlphabeticalCheckbox(SearchDialog searchDialog) { + super(searchDialog, 16, 40, 100, "Sort A-Z", searchDialog.sortByName); + this.searchDialog = searchDialog; + } + + @Override + protected void onValueChanged(final boolean value) { + searchDialog.sortByName = value; + searchDialog.updateSearch(); + } + } + + private static class IncludeItemsCheckbox extends ControlCheckbox { + private final SearchDialog searchDialog; + + public IncludeItemsCheckbox(SearchDialog searchDialog) { + super(searchDialog, 16, 64, 100, "Include Items", searchDialog.includeItems); + this.searchDialog = searchDialog; + } + + @Override + protected void onValueChanged(final boolean value) { + searchDialog.includeItems = value; + searchDialog.updateSearch(); + } + } + + private static class IncludeBlocksCheckbox extends ControlCheckbox { + private final SearchDialog searchDialog; + + public IncludeBlocksCheckbox(SearchDialog searchDialog) { + super(searchDialog, 16, 88, 100, "Include Blocks", searchDialog.includeBlocks); + this.searchDialog = searchDialog; + } + + @Override + protected void onValueChanged(final boolean value) { + searchDialog.includeBlocks = value; + searchDialog.updateSearch(); + } + } +} diff --git a/core/src/main/java/binnie/core/machines/storage/StandardCompartment.java b/core/src/main/java/binnie/core/machines/storage/StandardCompartment.java index 74c39b0c..36d4603d 100644 --- a/core/src/main/java/binnie/core/machines/storage/StandardCompartment.java +++ b/core/src/main/java/binnie/core/machines/storage/StandardCompartment.java @@ -1,10 +1,7 @@ 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; class StandardCompartment { public static class PackageCompartment extends Compartment.PackageCompartment { diff --git a/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java index b8ff4012..abeeb28a 100644 --- a/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -3,11 +3,7 @@ package binnie.core.machines.storage; import javax.annotation.Nullable; import java.util.Arrays; import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Map; -import java.util.Map.Entry; import binnie.core.api.gui.ITexture; import binnie.core.api.gui.events.EventHandlerOrigin; @@ -15,9 +11,7 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.window.WindowMachine; import binnie.core.machines.IMachine; import binnie.core.machines.MachinePackage; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -29,23 +23,18 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.BinnieCore; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.api.gui.IWidget; -import binnie.core.gui.controls.ControlCheckbox; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextEdit; import binnie.core.gui.controls.button.ControlButton; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.page.ControlPage; import binnie.core.gui.controls.page.ControlPages; -import binnie.core.gui.controls.scroll.ControlScrollableContent; import binnie.core.gui.controls.tab.ControlTabBar; import binnie.core.gui.events.EventMouse; import binnie.core.gui.events.EventTextEdit; import binnie.core.gui.events.EventValueChanged; -import binnie.core.gui.geometry.Border; import binnie.core.gui.geometry.CraftGUIUtil; import binnie.core.api.gui.Alignment; -import binnie.core.gui.minecraft.Dialog; import binnie.core.gui.minecraft.EnumColor; import binnie.core.gui.minecraft.IWindowAffectsShiftClick; import binnie.core.gui.minecraft.MinecraftGUI; @@ -53,7 +42,6 @@ import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.gui.minecraft.control.ControlPlayerInventory; import binnie.core.gui.minecraft.control.ControlSlide; -import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.gui.minecraft.control.ControlSlotArray; import binnie.core.gui.minecraft.control.ControlTabIcon; import binnie.core.gui.renderer.RenderUtil; @@ -106,7 +94,9 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh final int compartmentWidth = compartmentPageWidth + (doubleTabbed ? 48 : 24); final int compartmentHeight = compartmentPageHeight; final Control controlCompartment = new Control(this, x, y, compartmentWidth, compartmentHeight); - final ControlTabBar tab = new CompartmentTabBar1(this, controlCompartment, compartmentPageHeight, tabs1); + final ControlTabBar tab = new ControlTabBar<>(controlCompartment, 0, 0, 24, compartmentPageHeight, Alignment.LEFT, Arrays.asList(tabs1), (x1, y1, w, h, value) -> { + return new CompartmentTabIcon(this, x1, y1, w, h, value); + }); final String[] tabHelp = {"Compartment Tab", "Tabs that divide the inventory into sections. Each one can be labelled seperately."}; tab.addHelp(tabHelp); tab.addEventHandler(EventValueChanged.class, EventHandlerOrigin.DIRECT_CHILD, tab, event -> { @@ -139,7 +129,9 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } x += compartmentPageWidth; if (tabs2.length > 0) { - final ControlTabBar tab2 = new CompartmentTabBar2(this, controlCompartment, compartmentPageWidth, compartmentPageHeight, tabs2); + final ControlTabBar tab2 = new ControlTabBar<>(controlCompartment, 24 + compartmentPageWidth, 0, 24, compartmentPageHeight, Alignment.RIGHT, Arrays.asList(tabs2), (x1, y1, w, h, value) -> { + return new CompartmentTabIcon(this, x1, y1, w, h, value); + }); tab2.setValue(tabs1[0]); tab2.addHelp(tabHelp); tab2.addEventHandler(EventValueChanged.class, EventHandlerOrigin.DIRECT_CHILD, tab2, event -> { @@ -269,173 +261,18 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } } - public binnie.core.machines.storage.CompartmentTab getTab(final int i) { + public CompartmentTab getTab(final int i) { return Machine.getInterface(ComponentCompartmentInventory.class, this.getInventory()).getTab(i); } - public binnie.core.machines.storage.CompartmentTab getCurrentTab() { + public CompartmentTab getCurrentTab() { return this.getTab(this.currentTab); } - private static class SearchDialog extends Dialog { - Control slotGrid; - String textSearch = ""; - boolean sortByName = false; - boolean includeItems = true; - boolean includeBlocks = true; - private WindowCompartment windowCompartment; + private static class CompartmentTabIcon extends ControlTabIcon { + private final WindowCompartment windowCompartment; - public SearchDialog(WindowCompartment windowCompartment) { - super(windowCompartment, 252, 192); - this.windowCompartment = windowCompartment; - - final ControlScrollableContent scroll = new SearchScrollContent(this); - scroll.setScrollableContent(this.slotGrid = new Control(scroll, 1, 1, 108, 18)); - new ControlPlayerInventory(this, true); - new ControlTextEdit(this, 16, 16, 100, 14).addEventHandler(EventTextEdit.class, event -> { - textSearch = event.getValue(); - updateSearch(); - }); - this.includeItems = true; - this.includeBlocks = true; - new SortAlphabeticalCheckbox(this); - new IncludeItemsCheckbox(this); - new IncludeBlocksCheckbox(this); - this.updateSearch(); - } - - @Override - public void onClose() { - } - - private void updateSearch() { - Map slotIds = new HashMap<>(); - final IInventory inv = windowCompartment.getInventory(); - for (int i = 0; i < inv.getSizeInventory(); ++i) { - final ItemStack stack = inv.getStackInSlot(i); - if (!stack.isEmpty()) { - final String name = stack.getDisplayName().toLowerCase(); - if (this.textSearch == null || name.contains(this.textSearch)) { - if (this.includeBlocks || Block.getBlockFromItem(stack.getItem()) == Blocks.AIR) { - if (this.includeItems || Block.getBlockFromItem(stack.getItem()) != Blocks.AIR) { - slotIds.put(i, name); - } - } - } - } - } - if (this.sortByName) { - final List> list = new LinkedList<>(slotIds.entrySet()); - list.sort((o1, o2) -> -o2.getValue().compareTo(o1.getValue())); - final Map result = new LinkedHashMap<>(); - for (final Entry entry : list) { - result.put(entry.getKey(), entry.getValue()); - } - slotIds = result; - } - int y = 0; - int x = 0; - final int width = 108; - final int height = 2 + 18 * (1 + (slotIds.size() - 1) / 6); - this.slotGrid.deleteAllChildren(); - this.slotGrid.setSize(new Point(width, height)); - for (final int k : slotIds.keySet()) { - new ControlSlot.Builder(this.slotGrid, x, y).assign(k); - x += 18; - if (x >= 108) { - x = 0; - y += 18; - } - } - while (y < 108 || x != 0) { - // TODO: what was this supposed to do? - new ControlSlot.Builder(this.slotGrid, x, y); - x += 18; - if (x >= 108) { - x = 0; - y += 18; - } - } - } - - private static class SearchScrollContent extends ControlScrollableContent { - private SearchDialog searchDialog; - - public SearchScrollContent(SearchDialog searchDialog) { - super(searchDialog, 124, 16, 116, 92, 6); - this.searchDialog = searchDialog; - } - - @Override - @SideOnly(Side.CLIENT) - public void onRenderBackground(int guiWidth, int guiHeight) { - RenderUtil.setColour(11184810); - CraftGUI.RENDER.texture(CraftGUITexture.OUTLINE, searchDialog.windowCompartment.getArea().inset(new Border(0, 6, 0, 0))); - } - } - - private static class SortAlphabeticalCheckbox extends ControlCheckbox { - private SearchDialog searchDialog; - - public SortAlphabeticalCheckbox(SearchDialog searchDialog) { - super(searchDialog, 16, 40, 100, "Sort A-Z", searchDialog.sortByName); - this.searchDialog = searchDialog; - } - - @Override - protected void onValueChanged(final boolean value) { - searchDialog.sortByName = value; - searchDialog.updateSearch(); - } - } - - private static class IncludeItemsCheckbox extends ControlCheckbox { - private SearchDialog searchDialog; - - public IncludeItemsCheckbox(SearchDialog searchDialog) { - super(searchDialog, 16, 64, 100, "Include Items", searchDialog.includeItems); - this.searchDialog = searchDialog; - } - - @Override - protected void onValueChanged(final boolean value) { - searchDialog.includeItems = value; - searchDialog.updateSearch(); - } - } - - private static class IncludeBlocksCheckbox extends ControlCheckbox { - private SearchDialog searchDialog; - - public IncludeBlocksCheckbox(SearchDialog searchDialog) { - super(searchDialog, 16, 88, 100, "Include Blocks", searchDialog.includeBlocks); - this.searchDialog = searchDialog; - } - - @Override - protected void onValueChanged(final boolean value) { - searchDialog.includeBlocks = value; - searchDialog.updateSearch(); - } - } - } - - private static class CompartmentTabBar1 extends ControlTabBar { - public CompartmentTabBar1(final WindowCompartment windowCompartment, Control controlCompartment, int compartmentPageHeight, Integer[] tabs1) { - super(controlCompartment, 0, 0, 24, compartmentPageHeight, Alignment.LEFT, Arrays.asList(tabs1), (x, y, w, h, value) -> new CompartmentTab(windowCompartment, x, y, w, h, value)); - } - } - - private static class CompartmentTabBar2 extends ControlTabBar { - public CompartmentTabBar2(WindowCompartment windowCompartment, Control controlCompartment, int compartmentPageWidth, int compartmentPageHeight, Integer[] tabs2) { - super(controlCompartment, 24 + compartmentPageWidth, 0, 24, compartmentPageHeight, Alignment.RIGHT, Arrays.asList(tabs2), (x, y, w, h, value) -> new CompartmentTab(windowCompartment, x, y, w, h, value)); - } - } - - private static class CompartmentTab extends ControlTabIcon { - private WindowCompartment windowCompartment; - - public CompartmentTab(WindowCompartment windowCompartment, int x, int y, int w, int h, Integer value) { + public CompartmentTabIcon(WindowCompartment windowCompartment, int x, int y, int w, int h, Integer value) { super(x, y, w, h, value); this.windowCompartment = windowCompartment; } @@ -463,7 +300,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } private static class CompartmentCenterPanel extends Panel { - private WindowCompartment windowCompartment; + private final WindowCompartment windowCompartment; public CompartmentCenterPanel(WindowCompartment windowCompartment, ControlPage thisPage) { super(thisPage, 0, 0, thisPage.getWidth(), thisPage.getHeight(), MinecraftGUI.PanelType.BLACK); @@ -481,7 +318,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } private static class SearchButton extends ControlButton { - private WindowCompartment windowCompartment; + private final WindowCompartment windowCompartment; public SearchButton(WindowCompartment windowCompartment, Control controlCompartment, int compartmentWidth, int compartmentPageHeight) { super(controlCompartment, compartmentWidth - 24 - 64 - 8, compartmentPageHeight, 64, 16, "Search"); diff --git a/core/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/core/src/main/java/binnie/core/machines/transfer/TransferRequest.java index 345b75f0..ecf3b2ca 100644 --- a/core/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/core/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -32,8 +32,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(final ItemStack toTransfer, final IInventory destination) { this.itemToTransfer = ItemStack.EMPTY; @@ -342,12 +342,20 @@ public class TransferRequest { } public static class TransferSlot { - public int id; - public IInventory inventory; + private final int id; + private final IInventory inventory; public TransferSlot(final int id, final IInventory inventory) { this.id = id; this.inventory = inventory; } + + public int getId() { + return id; + } + + public IInventory getInventory() { + return inventory; + } } } diff --git a/core/src/main/java/binnie/core/models/AABBModelBaker.java b/core/src/main/java/binnie/core/models/AABBModelBaker.java index 999f7492..4266b64c 100644 --- a/core/src/main/java/binnie/core/models/AABBModelBaker.java +++ b/core/src/main/java/binnie/core/models/AABBModelBaker.java @@ -41,7 +41,7 @@ public class AABBModelBaker implements IModelBaker { private final List faces = new ArrayList<>(); private final List> bakedModels = new ArrayList<>(); protected AxisAlignedBB modelBounds; - protected ModelBakerModel currentModel = new ModelBakerModel(ModelManager.getInstance().getDefaultBlockState()); + protected final ModelBakerModel currentModel = new ModelBakerModel(ModelManager.getInstance().getDefaultBlockState()); protected int colorIndex = -1; public AABBModelBaker() { diff --git a/core/src/main/java/binnie/core/models/DefaultStateMapper.java b/core/src/main/java/binnie/core/models/DefaultStateMapper.java index 50378710..3ff3d0c9 100644 --- a/core/src/main/java/binnie/core/models/DefaultStateMapper.java +++ b/core/src/main/java/binnie/core/models/DefaultStateMapper.java @@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation; public class DefaultStateMapper extends StateMapperBase { - private ResourceLocation resourceLocation; + private final ResourceLocation resourceLocation; public DefaultStateMapper(ResourceLocation resourceLocation) { this.resourceLocation = resourceLocation; diff --git a/core/src/main/java/binnie/core/models/DoublePassBakedModel.java b/core/src/main/java/binnie/core/models/DoublePassBakedModel.java index c44967a6..5c7a662d 100644 --- a/core/src/main/java/binnie/core/models/DoublePassBakedModel.java +++ b/core/src/main/java/binnie/core/models/DoublePassBakedModel.java @@ -20,7 +20,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class DoublePassBakedModel implements IBakedModel { private static final int c = DefaultVertexFormats.ITEM.getColorOffset() / 4; private static final int v = DefaultVertexFormats.ITEM.getNextOffset() / 4; - private IBakedModel mainModel; + private final IBakedModel mainModel; private int primaryColor = 0xFF000000; private int secondaryColor = 0xFF000000; diff --git a/core/src/main/java/binnie/core/models/ModelManager.java b/core/src/main/java/binnie/core/models/ModelManager.java index 7656a661..be9b7f87 100644 --- a/core/src/main/java/binnie/core/models/ModelManager.java +++ b/core/src/main/java/binnie/core/models/ModelManager.java @@ -50,9 +50,9 @@ import forestry.core.utils.ModelUtil; @SideOnly(Side.CLIENT) public class ModelManager implements IModelManager { - private final static List customBlockModels = new ArrayList<>(); - private final static List spriteRegister = new ArrayList<>(); - public static IModelState defaultFenceState; + private static final List customBlockModels = new ArrayList<>(); + private static final List spriteRegister = new ArrayList<>(); + private static IModelState defaultFenceState; private final String modID; private final List itemModelRegisters = new ArrayList<>(); private final List stateMapperRegisters = new ArrayList<>(); diff --git a/core/src/main/java/binnie/core/modules/ModuleContainer.java b/core/src/main/java/binnie/core/modules/ModuleContainer.java index 72a0e8da..04310903 100644 --- a/core/src/main/java/binnie/core/modules/ModuleContainer.java +++ b/core/src/main/java/binnie/core/modules/ModuleContainer.java @@ -113,7 +113,7 @@ public class ModuleContainer implements IModuleContainer { return state.isAvailable(); } - public static interface ContainerState{ + public interface ContainerState{ boolean isAvailable(); } } diff --git a/core/src/main/java/binnie/core/modules/ModuleManager.java b/core/src/main/java/binnie/core/modules/ModuleManager.java index 89031396..8ccd6d11 100644 --- a/core/src/main/java/binnie/core/modules/ModuleManager.java +++ b/core/src/main/java/binnie/core/modules/ModuleManager.java @@ -23,16 +23,13 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import binnie.core.util.Log; public class ModuleManager { - private static Map containers = new LinkedHashMap<>(); + private static final Map containers = new LinkedHashMap<>(); private static final String CONFIG_CATEGORY = "modules"; - private static boolean initialized = false; + private static boolean initialized; - public static boolean isModuleEnabled(String containerID, String moduleID){ + public static boolean isModuleEnabled(String containerID, String moduleID) { IModuleContainer container = containers.get(containerID); - if(container == null){ - return false; - } - return container.isModuleEnabled(moduleID); + return container != null && container.isModuleEnabled(moduleID); } public static void register(IModuleContainer container){ diff --git a/core/src/main/java/binnie/core/network/BinnieCorePacketID.java b/core/src/main/java/binnie/core/network/BinnieCorePacketID.java index 9b519edf..16249284 100644 --- a/core/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/core/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -31,14 +31,14 @@ public enum BinnieCorePacketID implements IPacketID { final MessageUpdate packet = new MessageUpdate(message); final TileEntity tile = packet.getTileEntity(BinnieCore.getBinnieProxy().getWorld()); if (tile instanceof INetworkedEntity) { - ((INetworkedEntity) tile).readFromPacket(packet.payload); + ((INetworkedEntity) tile).readFromPacket(packet.getPayload()); } } else if (this == BinnieCorePacketID.TILE_METADATA) { // TODO: why doesn't this store any metadata to the packet ? final MessageMetadata packet2 = new MessageMetadata(message); final TileEntity tile = packet2.getTileEntity(BinnieCore.getBinnieProxy().getWorld()); if (tile instanceof TileEntityMetadata) { - ((TileEntityMetadata) tile).setTileMetadata(packet2.meta, true); + ((TileEntityMetadata) tile).setTileMetadata(packet2.getMeta(), true); } } else if (this == BinnieCorePacketID.CRAFT_GUI_ACTION && context.side == Side.CLIENT) { final MessageCraftGUI packet3 = new MessageCraftGUI(message); diff --git a/core/src/main/java/binnie/core/network/BinniePacketHandler.java b/core/src/main/java/binnie/core/network/BinniePacketHandler.java index 75b82903..5c64e8ef 100644 --- a/core/src/main/java/binnie/core/network/BinniePacketHandler.java +++ b/core/src/main/java/binnie/core/network/BinniePacketHandler.java @@ -43,7 +43,7 @@ public abstract class BinniePacketHandler implements IMessageHandler intPayload; - private List floatPayload; - private List stringPayload; + private final List intPayload; + private final List floatPayload; + private final List stringPayload; public PacketPayload() { this.intPayload = new ArrayList<>(); diff --git a/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java index c3dca2fa..dad34255 100644 --- a/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -32,7 +32,7 @@ import binnie.core.models.ModelManager; @SideOnly(Side.CLIENT) public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { - public static ModelManager modelManager = new ModelManager(Constants.CORE_MOD_ID); + public static final ModelManager modelManager = new ModelManager(Constants.CORE_MOD_ID); public static ModelManager getModelManager() { return modelManager; diff --git a/core/src/main/java/binnie/core/resource/BinnieResource.java b/core/src/main/java/binnie/core/resource/BinnieResource.java index 288d790d..7396ac1f 100644 --- a/core/src/main/java/binnie/core/resource/BinnieResource.java +++ b/core/src/main/java/binnie/core/resource/BinnieResource.java @@ -5,9 +5,9 @@ import net.minecraft.util.ResourceLocation; import binnie.core.AbstractMod; public class BinnieResource { - String mod; - String path; - private ResourceType type; + private final String mod; + private final String path; + private final ResourceType type; public BinnieResource(final AbstractMod mod, final ResourceType type, final String path) { this(mod.getModId(), type, path); diff --git a/core/src/main/java/binnie/core/resource/ManagerResource.java b/core/src/main/java/binnie/core/resource/ManagerResource.java index 381f6fef..9e352ab8 100644 --- a/core/src/main/java/binnie/core/resource/ManagerResource.java +++ b/core/src/main/java/binnie/core/resource/ManagerResource.java @@ -10,7 +10,7 @@ import binnie.core.AbstractMod; import binnie.core.BinnieCore; public class ManagerResource { - private List sprites; + private final List sprites; public ManagerResource() { this.sprites = new ArrayList<>(); diff --git a/core/src/main/java/binnie/core/resource/ResourceType.java b/core/src/main/java/binnie/core/resource/ResourceType.java index 7bbc3a11..59880424 100644 --- a/core/src/main/java/binnie/core/resource/ResourceType.java +++ b/core/src/main/java/binnie/core/resource/ResourceType.java @@ -7,7 +7,7 @@ public enum ResourceType { FX("fx"), ENTITY("entities"); - String name; + private final String name; ResourceType(final String name) { this.name = name; diff --git a/core/src/main/java/binnie/core/texture/BinnieCoreTexture.java b/core/src/main/java/binnie/core/texture/BinnieCoreTexture.java index b7d07dde..7ba0950e 100644 --- a/core/src/main/java/binnie/core/texture/BinnieCoreTexture.java +++ b/core/src/main/java/binnie/core/texture/BinnieCoreTexture.java @@ -16,8 +16,8 @@ public enum BinnieCoreTexture implements IBinnieTexture { GUI_ANALYST(ResourceType.GUI, "guianalyst"), GUI_PUNNETT(ResourceType.GUI, "punnett"); - String texture; - ResourceType type; + private final String texture; + private final ResourceType type; @SideOnly(Side.CLIENT) @Nullable diff --git a/core/src/main/java/binnie/core/util/ItemStackSet.java b/core/src/main/java/binnie/core/util/ItemStackSet.java index e7635e76..33684dfc 100644 --- a/core/src/main/java/binnie/core/util/ItemStackSet.java +++ b/core/src/main/java/binnie/core/util/ItemStackSet.java @@ -9,7 +9,7 @@ import java.util.Set; import net.minecraft.item.ItemStack; public class ItemStackSet implements Set { - List itemStacks; + protected final List itemStacks; public ItemStackSet() { this.itemStacks = new ArrayList<>(); diff --git a/design/src/main/java/binnie/design/DesignerManager.java b/design/src/main/java/binnie/design/DesignerManager.java index 2b7abaf6..4e2746bd 100644 --- a/design/src/main/java/binnie/design/DesignerManager.java +++ b/design/src/main/java/binnie/design/DesignerManager.java @@ -13,8 +13,8 @@ import binnie.design.api.IDesignManager; import binnie.design.api.IDesignSystem; public final class DesignerManager implements IDesignManager { - private static Map designMap = new LinkedHashMap<>(); - private static Map designCategories = new HashMap<>(); + private static final Map designMap = new LinkedHashMap<>(); + private static final Map designCategories = new HashMap<>(); private final List systems = new ArrayList<>(); diff --git a/design/src/main/java/binnie/design/EnumDesign.java b/design/src/main/java/binnie/design/EnumDesign.java index 2266278a..254564da 100644 --- a/design/src/main/java/binnie/design/EnumDesign.java +++ b/design/src/main/java/binnie/design/EnumDesign.java @@ -487,8 +487,8 @@ public enum EnumDesign implements IDesign { LETTERS("Letters"), DIAGONAL("Diagonals"); - String name; - List designs; + private final String name; + private final List designs; Category(final String name) { this.designs = new ArrayList<>(); diff --git a/design/src/main/java/binnie/design/EnumPattern.java b/design/src/main/java/binnie/design/EnumPattern.java index 8626ff93..53ebaf60 100644 --- a/design/src/main/java/binnie/design/EnumPattern.java +++ b/design/src/main/java/binnie/design/EnumPattern.java @@ -288,8 +288,8 @@ public enum EnumPattern implements IPattern { EnumPattern.OverlappedSplitBarred2.setLeftRotation(EnumPattern.OverlappedSplitBarred, false); } - ILayout leftRotation; - ILayout horizontalFlip; + private ILayout leftRotation; + private ILayout horizontalFlip; EnumPattern() { this.leftRotation = Layout.get(this, false); diff --git a/design/src/main/java/binnie/design/Layout.java b/design/src/main/java/binnie/design/Layout.java index c8293e02..14aea63a 100644 --- a/design/src/main/java/binnie/design/Layout.java +++ b/design/src/main/java/binnie/design/Layout.java @@ -9,8 +9,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class Layout implements ILayout { - IPattern pattern; - boolean inverted; + private final IPattern pattern; + private final boolean inverted; private Layout(final IPattern pattern, final boolean inverted) { this.pattern = pattern; diff --git a/design/src/main/java/binnie/design/blocks/BlockDesign.java b/design/src/main/java/binnie/design/blocks/BlockDesign.java index fcaf2a45..c475d278 100644 --- a/design/src/main/java/binnie/design/blocks/BlockDesign.java +++ b/design/src/main/java/binnie/design/blocks/BlockDesign.java @@ -61,7 +61,7 @@ import binnie.core.util.TileUtil; public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock, IColoredBlock, ISpriteRegister, IItemModelRegister, IStateMapperRegister { public static final EnumFacing[] RENDER_DIRECTIONS = new EnumFacing[]{EnumFacing.DOWN, EnumFacing.UP, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH}; public static final EnumFacing[] RENDER_DIRECTIONS_ITEM = new EnumFacing[]{EnumFacing.DOWN, EnumFacing.UP, EnumFacing.WEST, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.NORTH}; - IDesignSystem designSystem; + private final IDesignSystem designSystem; public BlockDesign(final IDesignSystem system, final Material material) { super(material); @@ -250,8 +250,8 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } public static class Key { - int metadata; - boolean item; + private final int metadata; + private final boolean item; public Key(int metadata, boolean item) { this.metadata = metadata; diff --git a/design/src/main/java/binnie/design/blocks/DesignBlock.java b/design/src/main/java/binnie/design/blocks/DesignBlock.java index cd656e88..dc461098 100644 --- a/design/src/main/java/binnie/design/blocks/DesignBlock.java +++ b/design/src/main/java/binnie/design/blocks/DesignBlock.java @@ -31,9 +31,9 @@ public class DesignBlock { {3, 2, 0, 1, 4, 5, 6}, {0, 1, 2, 3, 4, 5, 6}, }; - private IDesign design; - private IDesignMaterial primaryMaterial; - private IDesignMaterial secondaryMaterial; + private final IDesign design; + private final IDesignMaterial primaryMaterial; + private final IDesignMaterial secondaryMaterial; private int rotation; private EnumFacing facing; private boolean panel; diff --git a/design/src/main/java/binnie/design/gui/ComponentDesignerRecipe.java b/design/src/main/java/binnie/design/gui/ComponentDesignerRecipe.java index 25ee6586..e1b8a819 100644 --- a/design/src/main/java/binnie/design/gui/ComponentDesignerRecipe.java +++ b/design/src/main/java/binnie/design/gui/ComponentDesignerRecipe.java @@ -22,7 +22,7 @@ import binnie.design.api.IDesignMaterial; import binnie.design.EnumDesign; public class ComponentDesignerRecipe extends ComponentRecipe implements IComponentRecipe, INetwork.GuiNBT, IErrorStateSource { - public IDesignerType type; + private final IDesignerType type; private IDesign design; public ComponentDesignerRecipe(final Machine machine, final IDesignerType type) { diff --git a/design/src/main/java/binnie/design/gui/ControlTileSelect.java b/design/src/main/java/binnie/design/gui/ControlTileSelect.java index e3e20a2f..b5615923 100644 --- a/design/src/main/java/binnie/design/gui/ControlTileSelect.java +++ b/design/src/main/java/binnie/design/gui/ControlTileSelect.java @@ -38,8 +38,8 @@ import binnie.design.api.IDesignCategory; import binnie.design.EnumDesign; public class ControlTileSelect extends Control implements IControlValue, IControlScrollable { - IDesign value; - float shownHeight; + private IDesign value; + private final float shownHeight; protected ControlTileSelect(final IWidget parent, final int x, final int y) { super(parent, x, y, 102, 20 * (DesignAPI.manager.getSortedDesigns().size() / 4) + 22); diff --git a/design/src/main/java/binnie/design/gui/DesignErrorCode.java b/design/src/main/java/binnie/design/gui/DesignErrorCode.java index 151835f6..a6e39133 100644 --- a/design/src/main/java/binnie/design/gui/DesignErrorCode.java +++ b/design/src/main/java/binnie/design/gui/DesignErrorCode.java @@ -12,11 +12,11 @@ import net.minecraft.util.ResourceLocation; public enum DesignErrorCode implements IErrorStateDefinition { DESIGNER_NO_ADHESIVE("designer.no.adhesive", CoreErrorCode.NO_ITEM); - String name; + private final String name; @Nullable - IErrorStateDefinition parent; + private final IErrorStateDefinition parent; @Nullable - EnumErrorType type; + private final EnumErrorType type; DesignErrorCode(String name, IErrorStateDefinition parent) { this(name, parent, EnumErrorType.NONE); diff --git a/design/src/main/java/binnie/design/gui/DesignerSlots.java b/design/src/main/java/binnie/design/gui/DesignerSlots.java index 80cf43c6..c74f8483 100644 --- a/design/src/main/java/binnie/design/gui/DesignerSlots.java +++ b/design/src/main/java/binnie/design/gui/DesignerSlots.java @@ -1,7 +1,7 @@ package binnie.design.gui; public abstract class DesignerSlots { - public static int ADHESIVE_SLOT = 0; - public static int DESIGN_SLOT_1 = 1; - public static int DESIGN_SLOT_2 = 2; + public static final int ADHESIVE_SLOT = 0; + public static final int DESIGN_SLOT_1 = 1; + public static final int DESIGN_SLOT_2 = 2; } diff --git a/design/src/main/java/binnie/design/gui/SlotValidatorDesignMaterial.java b/design/src/main/java/binnie/design/gui/SlotValidatorDesignMaterial.java index 00cfb744..694f3128 100644 --- a/design/src/main/java/binnie/design/gui/SlotValidatorDesignMaterial.java +++ b/design/src/main/java/binnie/design/gui/SlotValidatorDesignMaterial.java @@ -1,5 +1,6 @@ package binnie.design.gui; +import binnie.core.machines.ManagerMachine; import binnie.design.api.IDesignerType; import net.minecraft.item.ItemStack; @@ -10,7 +11,7 @@ public class SlotValidatorDesignMaterial extends SlotValidator { private final IDesignerType type; public SlotValidatorDesignMaterial(final IDesignerType type) { - super(SlotValidator.spriteBlock); + super(ManagerMachine.getSpriteBlock()); this.type = type; } diff --git a/extrabees/src/main/java/binnie/extrabees/ExtraBees.java b/extrabees/src/main/java/binnie/extrabees/ExtraBees.java index de28ac43..00de6a9b 100644 --- a/extrabees/src/main/java/binnie/extrabees/ExtraBees.java +++ b/extrabees/src/main/java/binnie/extrabees/ExtraBees.java @@ -149,7 +149,7 @@ public class ExtraBees { try { Method m = GuiIdRegistry.class.getDeclaredMethod("registerGuiHandlers", GuiType.class, List.class); m.setAccessible(true); - m.invoke(null, new Object[]{GuiType.Tile, Lists.newArrayList(TileEntityExtraBeesAlvearyPart.class)}); + m.invoke(null, GuiType.Tile, Lists.newArrayList(TileEntityExtraBeesAlvearyPart.class)); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java index e5918f98..64a29895 100644 --- a/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java +++ b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java @@ -28,7 +28,7 @@ import binnie.extrabees.utils.Utils; public class AlvearyLogicFrameHousing extends AbstractAlvearyLogic { private final IItemHandlerModifiable inv; - private TileEntityExtraBeesAlvearyPart tile; + private final TileEntityExtraBeesAlvearyPart tile; public AlvearyLogicFrameHousing(TileEntityExtraBeesAlvearyPart tile) { this.tile = tile; diff --git a/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java index 545c47ba..55165fde 100644 --- a/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java +++ b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java @@ -13,6 +13,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.energy.IEnergyStorage; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; @@ -227,11 +229,12 @@ public class AlvearyLogicStimulator extends AbstractAlvearyLogic { @Nullable @Override + @SideOnly(Side.CLIENT) public GuiContainer getGui(@Nonnull EntityPlayer player, int data) { return new GuiContainerStimulator(getContainer(player, data)); } - @Nullable + @Nonnull @Override public ContainerStimulator getContainer(@Nonnull EntityPlayer player, int data) { return new ContainerStimulator(player, this); diff --git a/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java index bca89463..9310c427 100644 --- a/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java +++ b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java @@ -19,7 +19,7 @@ import forestry.api.multiblock.IMultiblockComponent; public class AlvearyLogicTransmitter extends AbstractAlvearyLogic implements IEnergyStorage { - private IEnergyStorage internalStorage; + private final IEnergyStorage internalStorage; public AlvearyLogicTransmitter() { internalStorage = new EnergyStorage(2000); diff --git a/extrabees/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java b/extrabees/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java index 266a7802..0465ecbd 100644 --- a/extrabees/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java +++ b/extrabees/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java @@ -49,7 +49,7 @@ public enum EnumAlvearyLogicType implements IStringSerializable { } }; - public static EnumAlvearyLogicType[] VALUES = values(); + public static final EnumAlvearyLogicType[] VALUES = values(); public abstract AbstractAlvearyLogic createLogic(TileEntityExtraBeesAlvearyPart tile); diff --git a/extrabees/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java b/extrabees/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java index 46456c15..279e3b55 100644 --- a/extrabees/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java +++ b/extrabees/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java @@ -14,7 +14,7 @@ public enum EnumHiveType implements IStringSerializable { NETHER, MARBLE; - List drops; + private final List drops; EnumHiveType() { this.drops = new ArrayList<>(); diff --git a/extrabees/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java b/extrabees/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java index 28a75e7a..f4e11308 100644 --- a/extrabees/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java +++ b/extrabees/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java @@ -39,9 +39,9 @@ public enum AlvearySimulatorCircuitType implements IBeeModifier { } } - public int recipe; - public int power; - BeeModifierLogic logic; + private final int recipe; + private final int power; + private final BeeModifierLogic logic; AlvearySimulatorCircuitType(final int recipe, final int power) { this.logic = new BeeModifierLogic(); @@ -114,4 +114,12 @@ public enum AlvearySimulatorCircuitType implements IBeeModifier { public boolean isHellish() { return this.logic.getModifier(EnumBeeBooleanModifier.Hellish); } + + public int getRecipe() { + return recipe; + } + + public int getPower() { + return power; + } } diff --git a/extrabees/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java b/extrabees/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java index 5779b3d1..a026d9a0 100644 --- a/extrabees/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java +++ b/extrabees/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java @@ -24,14 +24,14 @@ public class StimulatorCircuit implements ICircuit, IBeeModifier { public StimulatorCircuit(final AlvearySimulatorCircuitType type, final ICircuitLayout layout) { uid = "binnie.circuit.stimulator." + type.toString().toLowerCase(); this.type = type; - ItemStack stack = new ItemStack(PluginCore.getItems().tubes, 1, type.recipe); + ItemStack stack = new ItemStack(PluginCore.getItems().tubes, 1, type.getRecipe()); ChipsetManager.circuitRegistry.registerCircuit(this); ChipsetManager.solderManager.addRecipe(layout, stack, this); tooltip = Lists.newArrayList(); } public int getPowerUsage() { - return this.type.power; + return this.type.getPower(); } public void addTooltip(String tt) { diff --git a/extrabees/src/main/java/binnie/extrabees/client/BeeModelProvider.java b/extrabees/src/main/java/binnie/extrabees/client/BeeModelProvider.java index ad7317e1..38a4fb25 100644 --- a/extrabees/src/main/java/binnie/extrabees/client/BeeModelProvider.java +++ b/extrabees/src/main/java/binnie/extrabees/client/BeeModelProvider.java @@ -20,7 +20,7 @@ public class BeeModelProvider implements IBeeModelProvider { public static final BeeModelProvider instance = new BeeModelProvider(); @SideOnly(Side.CLIENT) - private static ModelResourceLocation[] models = new ModelResourceLocation[EnumBeeType.values().length]; + private static final ModelResourceLocation[] models = new ModelResourceLocation[EnumBeeType.values().length]; @Override @SideOnly(Side.CLIENT) diff --git a/extrabees/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java b/extrabees/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java index 246f73b3..d2efb2e2 100644 --- a/extrabees/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java +++ b/extrabees/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java @@ -18,12 +18,13 @@ import binnie.extrabees.utils.ExtraBeesResourceLocation; public abstract class AbstractAlvearyContainer extends Container { protected static final Dimension DEFAULT_DIMENSION = new Dimension(176, 144); - public final Dimension dimension; + private final Dimension dimension; protected final EntityPlayer player; protected final IItemHandlerModifiable inv; - protected ResourceLocation background; - protected int offset = 0; - protected String tooltip, title; + protected final ResourceLocation background; + protected final String tooltip; + protected int offset; + protected String title; public AbstractAlvearyContainer(EntityPlayer player, IItemHandlerModifiable inv, EnumAlvearyLogicType type, Dimension dimension) { this.player = player; @@ -59,4 +60,8 @@ public abstract class AbstractAlvearyContainer extends Container { public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) { return SlotUtil.transferStackInSlot(this.inventorySlots, playerIn, index); } + + public Dimension getDimension() { + return dimension; + } } diff --git a/extrabees/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java b/extrabees/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java index cb5b6cfd..5154f5f4 100644 --- a/extrabees/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java +++ b/extrabees/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java @@ -13,7 +13,8 @@ public class ContainerStimulator extends AbstractAlvearyContainer { private final AlvearyLogicStimulator logic; private final IEnergyStorage storage; - protected int power, maxPower; + protected final int maxPower; + protected int power; public ContainerStimulator(EntityPlayer player, AlvearyLogicStimulator logic) { super(player, logic.getInventory(), EnumAlvearyLogicType.STIMULATOR, DEFAULT_DIMENSION); diff --git a/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java b/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java index d6688132..8ab9e0d0 100644 --- a/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java +++ b/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java @@ -15,9 +15,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiContainerAlvearyPart extends GuiContainer { - @SuppressWarnings("all") protected FontRenderer font; - protected AbstractAlvearyContainer container; + protected final AbstractAlvearyContainer container; private int titleS = -1; public GuiContainerAlvearyPart(AbstractAlvearyContainer container) { @@ -35,7 +34,7 @@ public class GuiContainerAlvearyPart extends GuiContainer { titleS = (i + (xSize / 2)) - (font.getStringWidth(container.title) / 2); } - drawTexturedModalRect(i, j, 0, 0, container.dimension.width, container.dimension.height); + drawTexturedModalRect(i, j, 0, 0, container.getDimension().width, container.getDimension().height); font.drawString(container.title, titleS, j + 8, Color.DARK_GRAY.getRGB()); if (mouseX > i + 6 && mouseX < i + 23 && mouseY > j + 5 && mouseY < j + 22) { GuiUtils.drawHoveringText(Lists.newArrayList(container.tooltip), mouseX, mouseY, width, height, 150, font); diff --git a/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java b/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java index 581317ac..3254dbf7 100644 --- a/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java +++ b/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java @@ -11,7 +11,7 @@ import binnie.extrabees.utils.AlvearyMutationHandler; public class GuiContainerMutator extends GuiContainerAlvearyPart { - private String mutagens; + private final String mutagens; private int titleS = -1; public GuiContainerMutator(AbstractAlvearyContainer container) { diff --git a/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java b/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java index 67b0190c..fd2cdcbf 100644 --- a/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java +++ b/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.GlStateManager; public class GuiContainerStimulator extends GuiContainerAlvearyPart { - private ContainerStimulator container; + private final ContainerStimulator container; public GuiContainerStimulator(ContainerStimulator container) { super(container); diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/ConditionPerson.java b/extrabees/src/main/java/binnie/extrabees/genetics/ConditionPerson.java index 7ea54878..36668dbc 100644 --- a/extrabees/src/main/java/binnie/extrabees/genetics/ConditionPerson.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/ConditionPerson.java @@ -12,7 +12,7 @@ import forestry.api.genetics.IMutationCondition; public class ConditionPerson implements IMutationCondition { - String name; + private final String name; public ConditionPerson(final String name) { this.name = name; diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 9d6b612b..2cfd151a 100644 --- a/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -39,7 +39,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers { FRUIT, MYSTICAL; - boolean dominant; + private final boolean dominant; ExtraBeesFlowers() { this.dominant = true; diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/extrabees/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index d2c68ffd..591faa2a 100644 --- a/extrabees/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -402,9 +402,9 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } private String fx; - private boolean combinable; - private boolean dominant; - private String uid; + private final boolean combinable; + private final boolean dominant; + private final String uid; ExtraBeesEffect() { this.fx = ""; diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java b/extrabees/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java index 65de16c3..fcbfb7ea 100644 --- a/extrabees/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java @@ -1,6 +1,7 @@ package binnie.extrabees.genetics.effect; import java.util.ArrayList; +import java.util.List; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -19,10 +20,10 @@ public class FireworkCreator { public static class Firework { - boolean flicker; - boolean trail; - ArrayList colors; - byte shape; + private boolean flicker; + private boolean trail; + private final List colors; + private byte shape; public Firework() { this.flicker = false; diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/gui/database/WindowApiaristDatabase.java b/extrabees/src/main/java/binnie/extrabees/genetics/gui/database/WindowApiaristDatabase.java index afd51078..8d1a6bda 100644 --- a/extrabees/src/main/java/binnie/extrabees/genetics/gui/database/WindowApiaristDatabase.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/gui/database/WindowApiaristDatabase.java @@ -63,21 +63,29 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase { ResultantMutations(0xff00ff), FurtherMutations(0xff00); - public int color; + private final int color; SpeciesTab(int color) { this.color = color; } + + public int getColor() { + return color; + } } enum BranchesTab { Overview(0x0000ff), Species(0xff0000); - public int color; + private final int color; BranchesTab(int color) { this.color = color; } + + public int getColor() { + return color; + } } } diff --git a/extrabees/src/main/java/binnie/extrabees/gui/ControlBiomes.java b/extrabees/src/main/java/binnie/extrabees/gui/ControlBiomes.java index ce494b5c..abc1de33 100644 --- a/extrabees/src/main/java/binnie/extrabees/gui/ControlBiomes.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/ControlBiomes.java @@ -24,7 +24,7 @@ import binnie.core.gui.geometry.Area; import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlBiomes extends Control implements ITooltip { - List tolerated; + private final List tolerated; public ControlBiomes(IWidget parent, int x, int y, int width, int height) { super(parent, x, y, width * 16, height * 16); diff --git a/extrabees/src/main/java/binnie/extrabees/gui/ControlClimateBar.java b/extrabees/src/main/java/binnie/extrabees/gui/ControlClimateBar.java index 7416170e..1ab9e909 100644 --- a/extrabees/src/main/java/binnie/extrabees/gui/ControlClimateBar.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/ControlClimateBar.java @@ -41,8 +41,8 @@ public class ControlClimateBar extends Control implements ITooltip { 0x307cff }; - boolean isHumidity; - List tolerated; + private final boolean isHumidity; + private final List tolerated; public ControlClimateBar(IWidget parent, int x, int y, int width, int height) { this(parent, x, y, width, height, false); @@ -50,7 +50,6 @@ public class ControlClimateBar extends Control implements ITooltip { public ControlClimateBar(IWidget parent, int x, int y, int width, int height, boolean humidity) { super(parent, x, y, width, height); - isHumidity = false; tolerated = new ArrayList<>(); addAttribute(Attribute.MOUSE_OVER); isHumidity = humidity; diff --git a/extrabees/src/main/java/binnie/extrabees/gui/ControlProductsBox.java b/extrabees/src/main/java/binnie/extrabees/gui/ControlProductsBox.java index 2c721b37..457808b7 100644 --- a/extrabees/src/main/java/binnie/extrabees/gui/ControlProductsBox.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/ControlProductsBox.java @@ -1,5 +1,6 @@ package binnie.extrabees.gui; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -16,13 +17,12 @@ import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; public class ControlProductsBox extends ControlListBox { - IAlleleBeeSpecies species; - private int index; - private Type type; + @Nullable + private IAlleleBeeSpecies species; + private final Type type; public ControlProductsBox(IWidget parent, int x, int y, int width, int height, Type type) { super(parent, x, y, width, height, 12); - species = null; this.type = type; } @@ -64,12 +64,20 @@ public class ControlProductsBox extends ControlListBox { - private ControlItemDisplay item; + private final ControlItemDisplay item; public ControlProductsItem(ControlList controlList, ControlProductsBox.Product value, int y) { super(controlList, value, y); (item = new ControlItemDisplay(this, 4, 4)).setTooltip(); ControlText textWidget = new ControlTextCentered(this, 2, ""); CraftGUIUtil.moveWidget(textWidget, new Point(12, 0)); - item.setItemStack(value.item); - int time = (int) (55000.0 / value.chance); + item.setItemStack(value.getItem()); + int time = (int) (55000.0 / value.getChance()); int seconds = time / 20; int minutes = seconds / 60; int hours = minutes / 60; diff --git a/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesClimate.java b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesClimate.java index 3323a172..587b0982 100644 --- a/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesClimate.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesClimate.java @@ -9,9 +9,9 @@ import binnie.core.gui.database.DatabaseTab; import binnie.core.gui.database.PageSpecies; public class PageSpeciesClimate extends PageSpecies { - ControlClimateBar tempBar; - ControlClimateBar humidBar; - ControlBiomes biomes; + private final ControlClimateBar tempBar; + private final ControlClimateBar humidBar; + private final ControlBiomes biomes; public PageSpeciesClimate(IWidget parent, DatabaseTab tab) { super(parent, tab); diff --git a/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesGenome.java b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesGenome.java index ed0342c6..e82b5afb 100644 --- a/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesGenome.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesGenome.java @@ -22,17 +22,17 @@ import binnie.core.util.I18N; import binnie.core.genetics.AlleleHelper; public class PageSpeciesGenome extends PageSpecies { - ControlText title; - ControlText speedText; - ControlText lifespanText; - ControlText fertilityText; - ControlText floweringText; - ControlText territoryText; - ControlText nocturnalText; - ControlText caveDwellingText; - ControlText tolerantFlyerText; - ControlText flowerText; - ControlText effectText; + private final ControlText title; + private final ControlText speedText; + private final ControlText lifespanText; + private final ControlText fertilityText; + private final ControlText floweringText; + private final ControlText territoryText; + private final ControlText nocturnalText; + private final ControlText caveDwellingText; + private final ControlText tolerantFlyerText; + private final ControlText flowerText; + private final ControlText effectText; public PageSpeciesGenome(IWidget parent, DatabaseTab tab) { super(parent, tab); diff --git a/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesProducts.java b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesProducts.java index 874fa977..ce02a706 100644 --- a/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesProducts.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesProducts.java @@ -12,10 +12,10 @@ import binnie.core.gui.database.PageSpecies; import binnie.core.util.I18N; public class PageSpeciesProducts extends PageSpecies { - ControlText title; - ControlProductsBox productsBox; - ControlText title2; - ControlProductsBox specialitiesBox; + private final ControlText title; + private final ControlProductsBox productsBox; + private final ControlText title2; + private final ControlProductsBox specialitiesBox; public PageSpeciesProducts(IWidget parent, DatabaseTab tab) { super(parent, tab); diff --git a/extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java b/extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java index 6ce407d3..1982903c 100644 --- a/extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java +++ b/extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -58,7 +58,7 @@ public final class BlockRegister { new HiveDrop(valiantSpecies, 0.03) ); - if (!ConfigurationMain.canQuarryMineHives) { + if (!ConfigurationMain.isCanQuarryMineHives()) { //BuildCraftAPI.softBlocks.add(ExtraBees.hive); } } diff --git a/extrabees/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java b/extrabees/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java index 3b983f76..df6d3deb 100644 --- a/extrabees/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java +++ b/extrabees/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java @@ -91,9 +91,9 @@ public class ItemHoneyCrystal extends Item implements IElectricItem, IItemHudInf for(int i = 0; i < 9; ++i) { ItemStack target = player.inventory.mainInventory.get(i); if(target != null && target != stack && ElectricItem.manager.discharge(target, 1.0D / 0.0, 2147483647, true, true, true) <= 0.0D) { - double transfer = ElectricItem.manager.discharge(stack, 2.0D * this.TRANSFER_LIMIT, 2147483647, true, true, true); + double transfer = ElectricItem.manager.discharge(stack, 2.0D * TRANSFER_LIMIT, 2147483647, true, true, true); if(transfer > 0.0D) { - transfer = ElectricItem.manager.charge(target, transfer, this.TIER, true, false); + transfer = ElectricItem.manager.charge(target, transfer, TIER, true, false); if(transfer > 0.0D) { ElectricItem.manager.discharge(stack, transfer, 2147483647, true, true, false); transferred = true; @@ -122,19 +122,19 @@ public class ItemHoneyCrystal extends Item implements IElectricItem, IItemHudInf @Override @Optional.Method(modid = "ic2") public double getMaxCharge(ItemStack stack) { - return this.MAX_CHARGE; + return MAX_CHARGE; } @Override @Optional.Method(modid = "ic2") public int getTier(ItemStack stack) { - return this.TIER; + return TIER; } @Override @Optional.Method(modid = "ic2") public double getTransferLimit(ItemStack stack) { - return this.TRANSFER_LIMIT; + return TRANSFER_LIMIT; } @Override diff --git a/extrabees/src/main/java/binnie/extrabees/items/ItemProduct.java b/extrabees/src/main/java/binnie/extrabees/items/ItemProduct.java index 0ccd3b6c..67eb035a 100644 --- a/extrabees/src/main/java/binnie/extrabees/items/ItemProduct.java +++ b/extrabees/src/main/java/binnie/extrabees/items/ItemProduct.java @@ -18,7 +18,7 @@ import binnie.extrabees.items.types.IEBEnumItem; public class ItemProduct extends Item implements IItemModelRegister { - protected E[] types; + protected final E[] types; public ItemProduct(E[] types) { this.setMaxStackSize(64); diff --git a/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java b/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java index 321416e1..b4bb4232 100644 --- a/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java +++ b/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java @@ -564,7 +564,7 @@ public enum EnumHoneyComb implements IEBEnumItem { private final int primaryColor; private final int secondaryColor; - private Map products; + private final Map products; private boolean active; EnumHoneyComb() { diff --git a/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java b/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java index 0c70aced..5f655c92 100644 --- a/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java +++ b/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java @@ -45,7 +45,7 @@ public enum EnumHoneyDrop implements IEBEnumItem { private final int primaryColor; private final int secondaryColor; - private String liquidName; + private final String liquidName; private ItemStack remnant; EnumHoneyDrop() { diff --git a/extrabees/src/main/java/binnie/extrabees/items/types/EnumIndustrialFrame.java b/extrabees/src/main/java/binnie/extrabees/items/types/EnumIndustrialFrame.java index b18ab8f6..7d044fcc 100644 --- a/extrabees/src/main/java/binnie/extrabees/items/types/EnumIndustrialFrame.java +++ b/extrabees/src/main/java/binnie/extrabees/items/types/EnumIndustrialFrame.java @@ -104,17 +104,17 @@ public enum EnumIndustrialFrame implements IBeeModifier { } }; - String name; - float territoryMod; - float mutationMod; - float lifespanMod; - float productionMod; - float floweringMod; - boolean lighted; - boolean sunlight; - boolean rain; - int wearMod; - int power; + private final String name; + protected float territoryMod; + protected float mutationMod; + protected float lifespanMod; + protected float productionMod; + protected float floweringMod; + protected boolean lighted; + protected boolean sunlight; + protected boolean rain; + private final int wearMod; + private final int power; EnumIndustrialFrame(final String name, final int wear, final int power) { this.territoryMod = 1.0f; diff --git a/extrabees/src/main/java/binnie/extrabees/items/types/EnumPropolis.java b/extrabees/src/main/java/binnie/extrabees/items/types/EnumPropolis.java index 91857ba6..178c0a35 100644 --- a/extrabees/src/main/java/binnie/extrabees/items/types/EnumPropolis.java +++ b/extrabees/src/main/java/binnie/extrabees/items/types/EnumPropolis.java @@ -24,7 +24,7 @@ public enum EnumPropolis implements IEBEnumItem { private final int primaryColor; private final int secondaryColor; - private String liquidName; + private final String liquidName; private boolean active; EnumPropolis() { diff --git a/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java b/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java index 75005094..4af8a8bb 100644 --- a/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java +++ b/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java @@ -104,7 +104,7 @@ public class ExtraBeesClientProxy extends ExtraBeesCommonProxy { } private static class BlockItemOverrideList extends ItemOverrideList { - private Block block; + private final Block block; public BlockItemOverrideList(Block block) { super(ImmutableList.of()); diff --git a/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java b/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java index a7cabe84..c53932ad 100644 --- a/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java +++ b/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java @@ -8,10 +8,6 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import binnie.extrabees.genetics.ExtraBeeDefinition; public class ExtraBeesCommonProxy { - - public void registerBeeModel(ExtraBeeDefinition type) { - } - public Block registerBlock(Block block) { ForgeRegistries.BLOCKS.register(block); return block; diff --git a/extrabees/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java b/extrabees/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java index d22ee476..a04332ac 100644 --- a/extrabees/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java +++ b/extrabees/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java @@ -15,8 +15,8 @@ import forestry.core.utils.Translator; public class BeeModifierLogic { - private Map modifiers; - private List booleanModifiers; + private final Map modifiers; + private final List booleanModifiers; public BeeModifierLogic() { this.modifiers = new HashMap<>(); diff --git a/extrabees/src/main/java/binnie/extrabees/utils/HiveDrop.java b/extrabees/src/main/java/binnie/extrabees/utils/HiveDrop.java index e1cce737..b6749c85 100644 --- a/extrabees/src/main/java/binnie/extrabees/utils/HiveDrop.java +++ b/extrabees/src/main/java/binnie/extrabees/utils/HiveDrop.java @@ -13,9 +13,9 @@ import forestry.apiculture.genetics.IBeeDefinition; public class HiveDrop implements IHiveDrop { - private IAllele[] template; - private NonNullList extra; - private double chance; + private final IAllele[] template; + private final NonNullList extra; + private final double chance; public HiveDrop(IBeeDefinition species, double chance) { this(species.getTemplate(), NonNullList.create(), chance); diff --git a/extrabees/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java b/extrabees/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java index 951e9331..3a909b1f 100644 --- a/extrabees/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java +++ b/extrabees/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java @@ -5,11 +5,31 @@ import net.minecraftforge.common.config.Configuration; public class ConfigurationMain implements IConfigurable { private static final String WORLDGEN = "World-Gen"; - public static boolean canQuarryMineHives = true; - public static int waterHiveRate = 2; - public static int rockHiveRate = 2; - public static int netherHiveRate = 2; - public static int marbleHiveRate = 2; + private static boolean canQuarryMineHives = true; + private static int waterHiveRate = 2; + private static int rockHiveRate = 2; + private static int netherHiveRate = 2; + private static int marbleHiveRate = 2; + + public static boolean isCanQuarryMineHives() { + return canQuarryMineHives; + } + + public static int getWaterHiveRate() { + return waterHiveRate; + } + + public static int getRockHiveRate() { + return rockHiveRate; + } + + public static int getNetherHiveRate() { + return netherHiveRate; + } + + public static int getMarbleHiveRate() { + return marbleHiveRate; + } @Override public void configure(Configuration config) { diff --git a/extrabees/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java b/extrabees/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java index 7fcdc286..58ab4860 100644 --- a/extrabees/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java +++ b/extrabees/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java @@ -11,17 +11,17 @@ import java.util.LinkedList; import java.util.Random; public class ExtraBeesWorldGenerator implements IWorldGenerator { - private LinkedList worldGenHives = new LinkedList<>(); + private final LinkedList worldGenHives = new LinkedList<>(); public void registerHiveWorldGen(WorldGenHive hive) { worldGenHives.add(hive); } public void doInit() { - registerHiveWorldGen(new WorldGenHiveWater(ConfigurationMain.waterHiveRate)); - registerHiveWorldGen(new WorldGenHiveRock(ConfigurationMain.rockHiveRate)); - registerHiveWorldGen(new WorldGenHiveNether(ConfigurationMain.netherHiveRate)); - registerHiveWorldGen(new WorldGenHiveMarble(ConfigurationMain.marbleHiveRate)); + registerHiveWorldGen(new WorldGenHiveWater(ConfigurationMain.getWaterHiveRate())); + registerHiveWorldGen(new WorldGenHiveRock(ConfigurationMain.getRockHiveRate())); + registerHiveWorldGen(new WorldGenHiveNether(ConfigurationMain.getNetherHiveRate())); + registerHiveWorldGen(new WorldGenHiveMarble(ConfigurationMain.getMarbleHiveRate())); } @Override diff --git a/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHive.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHive.java index f3c1a381..6d061fcf 100644 --- a/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHive.java +++ b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHive.java @@ -4,7 +4,7 @@ package binnie.extrabees.worldgen; import net.minecraft.world.gen.feature.WorldGenerator; public abstract class WorldGenHive extends WorldGenerator { - private int rate; + private final int rate; public WorldGenHive(int rate) { this.rate = rate; diff --git a/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java index 33446530..1e53f0ad 100644 --- a/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java +++ b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java @@ -2,6 +2,7 @@ package binnie.extrabees.worldgen; import java.util.HashSet; import java.util.Random; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; @@ -16,7 +17,7 @@ import binnie.extrabees.blocks.BlockExtraBeeHives; import binnie.extrabees.blocks.type.EnumHiveType; public class WorldGenHiveMarble extends WorldGenHive { - HashSet validBlocks = new HashSet<>(); + private final Set validBlocks = new HashSet<>(); public WorldGenHiveMarble(int rate) { super(rate); diff --git a/extratrees/src/main/java/binnie/extratrees/CreativeTabCarpentry.java b/extratrees/src/main/java/binnie/extratrees/CreativeTabCarpentry.java index 478ded96..11b689a8 100644 --- a/extratrees/src/main/java/binnie/extratrees/CreativeTabCarpentry.java +++ b/extratrees/src/main/java/binnie/extratrees/CreativeTabCarpentry.java @@ -10,7 +10,7 @@ import binnie.core.Mods; import binnie.core.util.I18N; public class CreativeTabCarpentry extends CreativeTabs { - public static CreativeTabs instance = new CreativeTabCarpentry(); + public static final CreativeTabs INSTANCE = new CreativeTabCarpentry(); public CreativeTabCarpentry() { super("Carpentry"); diff --git a/extratrees/src/main/java/binnie/extratrees/alcohol/CocktailLiquid.java b/extratrees/src/main/java/binnie/extratrees/alcohol/CocktailLiquid.java index dcd1de8b..289d30a7 100644 --- a/extratrees/src/main/java/binnie/extratrees/alcohol/CocktailLiquid.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/CocktailLiquid.java @@ -6,8 +6,8 @@ import binnie.core.liquid.FluidType; import binnie.core.util.I18N; public class CocktailLiquid implements ICocktailLiquid { - private FluidType definition; - private float abv; + private final FluidType definition; + private final float abv; public CocktailLiquid(FluidType definition, float abv) { this.definition = definition; diff --git a/extratrees/src/main/java/binnie/extratrees/alcohol/GlasswareType.java b/extratrees/src/main/java/binnie/extratrees/alcohol/GlasswareType.java index ac2cc834..988795c6 100644 --- a/extratrees/src/main/java/binnie/extratrees/alcohol/GlasswareType.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/GlasswareType.java @@ -32,13 +32,13 @@ public enum GlasswareType { //TODO: Add to config public static final int MB_PER_GLASS = 100; - String name; - float contentBottom; - float contentHeight; - private int capacity; - private ModelResourceLocation modelLocation; - private String[] recipe; - private int recipeGlassCost; + private final String name; + private final float contentBottom; + private final float contentHeight; + private final int capacity; + private final ModelResourceLocation modelLocation; + private final String[] recipe; + private final int recipeGlassCost; GlasswareType(final int capacity, final int contentBottom, final int contentHeight, String... recipe) { this.capacity = capacity; diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/BlockCarpentry.java b/extratrees/src/main/java/binnie/extratrees/blocks/BlockCarpentry.java index e62cbfae..9d19b26d 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/BlockCarpentry.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/BlockCarpentry.java @@ -17,7 +17,7 @@ import binnie.extratrees.wood.planks.VanillaPlanks; public class BlockCarpentry extends BlockDesign { public BlockCarpentry(String name) { super(DesignSystem.Wood, Material.WOOD); - this.setCreativeTab(CreativeTabCarpentry.instance); + this.setCreativeTab(CreativeTabCarpentry.INSTANCE); this.setRegistryName(name); this.setResistance(5.0f); this.setHardness(2.0f); diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/decor/BlockMultiFence.java b/extratrees/src/main/java/binnie/extratrees/blocks/decor/BlockMultiFence.java index 326e76e4..4a537fc9 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/decor/BlockMultiFence.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/decor/BlockMultiFence.java @@ -150,7 +150,7 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat @Override public void getSubBlocks(CreativeTabs tab, NonNullList itemList) { - for (FenceType type : FenceType.values()) { + for (FenceType type : FenceType.getValues()) { itemList.add(WoodManager.getFence(VanillaPlanks.SPRUCE, VanillaPlanks.BIRCH, type, 1)); } } diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/decor/FenceDescription.java b/extratrees/src/main/java/binnie/extratrees/blocks/decor/FenceDescription.java index 7ed1088e..e5a8ad7c 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/decor/FenceDescription.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/decor/FenceDescription.java @@ -4,9 +4,9 @@ import binnie.extratrees.wood.planks.IPlankType; import binnie.extratrees.wood.WoodManager; public class FenceDescription { - FenceType fenceType; - IPlankType plankType; - IPlankType secondaryPlankType; + private final FenceType fenceType; + private final IPlankType plankType; + private final IPlankType secondaryPlankType; public FenceDescription(final FenceType fenceType, final IPlankType plankType, final IPlankType secondaryPlankType) { this.fenceType = fenceType; diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/decor/FenceType.java b/extratrees/src/main/java/binnie/extratrees/blocks/decor/FenceType.java index ceb82999..d639b2e6 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/decor/FenceType.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/decor/FenceType.java @@ -1,5 +1,6 @@ package binnie.extratrees.blocks.decor; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -7,11 +8,12 @@ import java.util.List; import binnie.core.util.I18N; public class FenceType { - public static List VALUES; + @Nullable + private static List VALUES; - public int size; - public boolean solid; - public boolean embossed; + private final int size; + private final boolean solid; + private final boolean embossed; public FenceType(final int size, final boolean solid, final boolean embedded) { this.size = size; @@ -25,7 +27,7 @@ public class FenceType { this.embossed = ((meta >> 3 & 0x1) > 0); } - public static Collection values() { + public static Collection getValues() { if (VALUES == null) { VALUES = new ArrayList<>(); for (int size = 0; size < 3; ++size) { @@ -85,4 +87,16 @@ public class FenceType { } return super.equals(obj); } + + public int getSize() { + return size; + } + + public boolean isSolid() { + return solid; + } + + public boolean isEmbossed() { + return embossed; + } } 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 0a33a044..3e305455 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeEmbedded.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeEmbedded.java @@ -37,7 +37,7 @@ public class MultiFenceRecipeEmbedded extends IForgeRegistryEntry.Impl IPlankType descPlankType = fenceDescription.getPlankType(); IPlankType plankType = WoodManager.getPlankType(b); if (descPlankType == plankType) { - this.cached = WoodManager.getFence(descPlankType, fenceDescription.getSecondaryPlankType(), new FenceType(type.size, type.solid, true), 2); + this.cached = WoodManager.getFence(descPlankType, fenceDescription.getSecondaryPlankType(), new FenceType(type.getSize(), type.isSolid(), true), 2); return true; } } diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipePattern.java b/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipePattern.java index f54e6838..593ec6a4 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipePattern.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipePattern.java @@ -6,18 +6,14 @@ import binnie.extratrees.wood.planks.IPlankType; import binnie.extratrees.wood.WoodManager; public class MultiFenceRecipePattern { - public static MultiFenceRecipePattern[] VALUES; - - static { - VALUES = new MultiFenceRecipePattern[]{ - new MultiFenceRecipePattern(0, 2, "010" + "0 0" + " "), - new MultiFenceRecipePattern(0, 1, "000" + "0 0" + " "), - new MultiFenceRecipePattern(1, 2, "010" + "0 0" + " 1 "), - new MultiFenceRecipePattern(1, 1, "000" + "0 0" + " 0 "), - new MultiFenceRecipePattern(2, 2, " 0 " + "1 1" + "101"), - new MultiFenceRecipePattern(2, 1, " 0 " + "0 0" + "000") - }; - } + public static final MultiFenceRecipePattern[] VALUES = new MultiFenceRecipePattern[]{ + new MultiFenceRecipePattern(0, 2, "010" + "0 0" + " "), + new MultiFenceRecipePattern(0, 1, "000" + "0 0" + " "), + new MultiFenceRecipePattern(1, 2, "010" + "0 0" + " 1 "), + new MultiFenceRecipePattern(1, 1, "000" + "0 0" + " 0 "), + new MultiFenceRecipePattern(2, 2, " 0 " + "1 1" + "101"), + new MultiFenceRecipePattern(2, 1, " 0 " + "0 0" + "000") + }; private final String pattern; private final int size; 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 ebf639e6..a215d638 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeSolid.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/decor/MultiFenceRecipeSolid.java @@ -34,7 +34,7 @@ public class MultiFenceRecipeSolid extends IForgeRegistryEntry.Impl imp if (type != null && type2 != null && type3 != null && type.equals(type2) && type.equals(type3)) { FenceDescription fenceDescription = WoodManager.getFenceDescription(a); if (fenceDescription != null) { - FenceType fenceType = new FenceType(type.size, true, type.solid); + FenceType fenceType = new FenceType(type.getSize(), true, type.isSolid()); this.cached = WoodManager.getFence(fenceDescription.getPlankType(), fenceDescription.getSecondaryPlankType(), fenceType, 2); return true; } diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/wood/ItemBlockETWoodDoor.java b/extratrees/src/main/java/binnie/extratrees/blocks/wood/ItemBlockETWoodDoor.java index ecb0a62a..6a0bfd2c 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/wood/ItemBlockETWoodDoor.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/wood/ItemBlockETWoodDoor.java @@ -25,8 +25,6 @@ public class ItemBlockETWoodDoor extends ItemBlockETWood implements /** * Copy of {@link ItemDoor#onItemUse} - */ - /** * Called when a Block is right-clicked with this Item */ @Override diff --git a/extratrees/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/extratrees/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index ea222825..efbe75db 100644 --- a/extratrees/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -10,7 +10,7 @@ import binnie.extratrees.api.ICarpentryInterface; import binnie.design.api.IDesignMaterial; public class CarpentryInterface implements ICarpentryInterface { - private static Map woodMap = new LinkedHashMap<>(); + private static final Map woodMap = new LinkedHashMap<>(); @Override public boolean registerCarpentryWood(final int index, final IDesignMaterial wood) { diff --git a/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index f0738781..664e8335 100644 --- a/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -27,8 +27,8 @@ public enum DesignSystem implements IDesignSystem { Wood, Glass; - Map primary; - Map secondary; + private final Map primary; + private final Map secondary; DesignSystem() { this.primary = new HashMap<>(); diff --git a/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java b/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java index e2a973f2..6b3bd7b5 100644 --- a/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -35,9 +35,9 @@ public class GlassType implements IDesignMaterial { } } - String name; - int colour; - int id; + private final String name; + private final int colour; + private final int id; private GlassType(final int id, final String name, final int colour) { this.id = id; @@ -113,8 +113,8 @@ public class GlassType implements IDesignMaterial { Red("Red", 10040115), Black("Black", 1644825); - String name; - int colour; + private final String name; + private final int colour; StandardColor(final String name, final int colour) { this.name = name; diff --git a/extratrees/src/main/java/binnie/extratrees/gen/TreeGenBase.java b/extratrees/src/main/java/binnie/extratrees/gen/TreeGenBase.java index 0c6e632f..8754cbd1 100644 --- a/extratrees/src/main/java/binnie/extratrees/gen/TreeGenBase.java +++ b/extratrees/src/main/java/binnie/extratrees/gen/TreeGenBase.java @@ -19,10 +19,10 @@ public class TreeGenBase extends WorldGenerator { protected int startZ; protected int girth; protected int height; - protected int minHeight; - protected int maxHeight; - protected boolean spawnPods; - protected int minPodHeight; + protected final int minHeight; + protected final int maxHeight; + protected final boolean spawnPods; + protected final int minPodHeight; public TreeGenBase() { this.minHeight = 4; @@ -60,16 +60,4 @@ public class TreeGenBase extends WorldGenerator { protected int[] getHeight() { return new int[]{5, 2}; } - - private static class Vector { - int x; - int y; - int z; - - public Vector(final int x, final int y, final int z) { - this.x = x; - this.y = y; - this.z = z; - } - } } diff --git a/extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree.java index 74106244..3e6baa0d 100644 --- a/extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree.java +++ b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree.java @@ -21,7 +21,7 @@ import binnie.extratrees.worldgen.BlockTypeVoid; import binnie.extratrees.worldgen.WorldGenBlockType; public class WorldGenTree extends WorldGenerator { - protected ITreeGenData treeGen; + protected final ITreeGenData treeGen; protected World world; protected Random rand; protected int startX; @@ -29,15 +29,15 @@ public class WorldGenTree extends WorldGenerator { protected int startZ; protected int girth; protected int height; - protected int minHeight; - protected int maxHeight; + protected final int minHeight; + protected final int maxHeight; protected boolean spawnPods; - protected int minPodHeight; - WorldGenBlockType leaf; - WorldGenBlockType wood; - WorldGenBlockType vine; - WorldGenBlockType air; - float bushiness; + protected final int minPodHeight; + protected WorldGenBlockType leaf; + protected WorldGenBlockType wood; + protected final WorldGenBlockType vine; + protected final WorldGenBlockType air; + protected float bushiness; public WorldGenTree(ITreeGenData tree) { this.minHeight = 3; @@ -293,9 +293,9 @@ public class WorldGenTree extends WorldGenerator { } static class Vector { - float x; - float y; - float z; + final float x; + final float y; + final float z; public Vector(final float f, final float h, final float g) { this.x = f; diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruitDefinition.java b/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruitDefinition.java index c373ab08..212b4cd1 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruitDefinition.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruitDefinition.java @@ -390,8 +390,8 @@ public enum AlleleETFruitDefinition { // , Papayimar("papayimar", FruitPod.PAPAYIMAR) ; - IAlleleFruit alleleFruit; - ETFruitProviderNone fruitProvider; + private final IAlleleFruit alleleFruit; + private final ETFruitProviderNone fruitProvider; AlleleETFruitDefinition(String name, int time, int unripe, int color, FruitSprite sprite, IFruitFamily family) { alleleFruit = new AlleleETFruit(name, fruitProvider = new ETFruitProviderRipening(name, family, sprite).setColours(new Color(color), new Color(unripe)).setRipeningPeriod(time)); diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 3bfd216d..16d1d3a8 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -2024,17 +2024,17 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT private static final String unlocalizedName = "extratrees.species.%s.name"; private static final String unlocalizedDesc = "extratrees.species.%s.desc"; - public static ETTreeDefinition[] VALUES = values(); - private String branchName; - private String binomial; - private Color leafColor; - private Color leafPollinatedColor; - private Color woodColor; - private EnumLeafType leafType; - private ILeafSpriteProvider leafSpriteProvider; - private EnumSaplingType saplingType; - private IWoodType woodType; - private IWoodProvider woodProvider; + public static final ETTreeDefinition[] VALUES = values(); + private final String branchName; + private final String binomial; + private final Color leafColor; + private final Color leafPollinatedColor; + private final Color woodColor; + private final EnumLeafType leafType; + private final ILeafSpriteProvider leafSpriteProvider; + private final EnumSaplingType saplingType; + private final IWoodType woodType; + private final IWoodProvider woodProvider; private IClassification branch; private IAlleleTreeSpecies species; private ITreeGenome genome; @@ -2213,7 +2213,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT } private static class AlleleTemplate { - IAllele[] alleles; + private final IAllele[] alleles; protected AlleleTemplate() { alleles = TreeManager.treeRoot.getDefaultTemplate(); diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java b/extratrees/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java index d3d302d4..2c782fce 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java @@ -30,10 +30,10 @@ public enum EnumSaplingType { private static class DefaultGermlingModelProvider implements IGermlingModelProvider { private ModelResourceLocation germlingModel; private ModelResourceLocation pollenModel; - private EnumSaplingType saplingType; - private Color leaf; - private Color wood; - private EnumSaplingType enumSaplingType; + private final EnumSaplingType saplingType; + private final Color leaf; + private final Color wood; + private final EnumSaplingType enumSaplingType; public DefaultGermlingModelProvider(EnumSaplingType enumSaplingType, EnumSaplingType saplingType, Color leaf, Color wood) { this.saplingType = saplingType; diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index 0b371445..d98ca44d 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -20,11 +20,11 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; public class ExtraTreeMutation implements ITreeMutation { - int chance; - boolean isSecret; - IAlleleTreeSpecies allele0; - IAlleleTreeSpecies allele1; - IAllele[] template; + private final int chance; + private boolean isSecret; + private final IAlleleTreeSpecies allele0; + private final IAlleleTreeSpecies allele1; + private final IAllele[] template; private float minTemperature; private float maxTemperature; private float minRainfall; diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/WoodProvider.java b/extratrees/src/main/java/binnie/extratrees/genetics/WoodProvider.java index a07de300..bd8bc016 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/WoodProvider.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/WoodProvider.java @@ -21,7 +21,7 @@ import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.ITextureManager; public class WoodProvider implements IWoodProvider { - private IWoodType type; + private final IWoodType type; @SideOnly(Side.CLIENT) @Nullable diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitFamily.java b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitFamily.java index 588ca3fe..37c07e70 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitFamily.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitFamily.java @@ -6,9 +6,9 @@ public enum ETFruitFamily implements IFruitFamily { BERRY("Berries", "berry", "berri"), CITRUS("Citrus", "citrus", "citrus"); - String name; - String uid; - String scientific; + private final String name; + private final String uid; + private final String scientific; ETFruitFamily(final String name, final String uid, final String scientific) { this.name = name; 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 2c3696b7..07f0e0bf 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderNone.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderNone.java @@ -27,7 +27,7 @@ public class ETFruitProviderNone implements IFruitProvider { protected final Map drops; protected final IFruitFamily family; protected final String name; - protected int ripeningPeriod = 2; + protected final int ripeningPeriod = 2; public ETFruitProviderNone(String name, IFruitFamily family) { this.name = name; diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderPod.java b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderPod.java index 54f0caeb..8a07e9f8 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderPod.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderPod.java @@ -17,7 +17,7 @@ import forestry.api.genetics.IFruitFamily; public class ETFruitProviderPod extends ETFruitProviderNone { @Nullable - private FruitPod pod; + private final FruitPod pod; public ETFruitProviderPod(String name, IFruitFamily family, FruitPod pod) { super(name, family); diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderRipening.java b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderRipening.java index 6cfc3218..631b6f70 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderRipening.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/ETFruitProviderRipening.java @@ -20,7 +20,7 @@ public class ETFruitProviderRipening extends ETFruitProviderNone { private int ripeningPeriod; private int colourCallow = 0xffffff; @Nullable - private FruitSprite sprite; + private final FruitSprite sprite; public ETFruitProviderRipening(String name, IFruitFamily family, FruitSprite sprite) { super(name, family); diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/FruitSprite.java b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/FruitSprite.java index 7dffa299..115b03c5 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/fruits/FruitSprite.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/fruits/FruitSprite.java @@ -20,7 +20,7 @@ public enum FruitSprite { PEAR; public static final FruitSprite[] VALUES = values(); - protected boolean isRegistered = false; + protected boolean isRegistered; private final ResourceLocation location; FruitSprite() { diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java b/extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java index 062000f6..22c44b0f 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java @@ -11,7 +11,7 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; public class ControlBlockIconDisplay extends Control { - TextureAtlasSprite icon; + private final TextureAtlasSprite icon; public ControlBlockIconDisplay(final IWidget parent, final int x, final int y, final TextureAtlasSprite icon) { super(parent, x, y, 18, 18); diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java index c00cd08e..4e204e61 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java @@ -23,7 +23,7 @@ import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class PageFruit extends PageAbstract { - boolean treesThatBearFruit; + private final boolean treesThatBearFruit; public PageFruit(final IWidget parent, final DatabaseTab tab, final boolean treesThatBearFruit) { super(parent, tab); diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java index 292a49f6..b5c81248 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java @@ -45,13 +45,13 @@ public class PagePlanksTrees extends PageAbstract { new ControlSpeciesBox(this, 4, 24, this.getSize().xPos() - 8, this.getSize().yPos() - 4 - 24).setOptions(trees); } - private static Collection getTreesThatMakePlanks(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { + private static Collection getTreesThatMakePlanks(ItemStack fruit, boolean master, World world, GameProfile player) { if (fruit == null) { return new ArrayList<>(); } ITreeRoot treeRoot = TreeManager.treeRoot; IBreedingSystem system = Binnie.GENETICS.getSystem(treeRoot); - final Collection set = nei ? system.getAllSpecies() : system.getDiscoveredSpecies(world, player); + final Collection set = master ? system.getAllSpecies() : system.getDiscoveredSpecies(world, player); final List found = new ArrayList<>(); for (final IAlleleSpecies species : set) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java index e2dd04ba..96802738 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java @@ -12,13 +12,13 @@ import binnie.core.gui.minecraft.MinecraftGUI; import binnie.core.gui.window.Panel; public class PageSpeciesImage extends PageSpecies { - ControlIndividualDisplay display; + private final ControlIndividualDisplay display; public PageSpeciesImage(final IWidget parent, final DatabaseTab tab) { super(parent, tab); new Panel(this, 7, 25, 130, 120, MinecraftGUI.PanelType.GRAY); this.display = new ControlIndividualDisplay(this, 12, 25, 120); - this.display.hastooltip = false; + this.display.setHasTooltip(false); new ControlTextCentered(this, 8, this.getValue().toString()); } diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java index dd2a7407..28c2955e 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import binnie.core.Binnie; import binnie.core.api.gui.IArea; import binnie.core.gui.controls.page.ControlPage; +import binnie.core.gui.database.ModeWidgets; import binnie.genetics.api.ITreeBreedingSystem; import forestry.api.arboriculture.TreeManager; import net.minecraft.entity.player.EntityPlayer; @@ -34,12 +35,12 @@ import binnie.design.api.IDesignMaterial; import binnie.extratrees.wood.WoodManager; public class WindowArboristDatabase extends WindowAbstractDatabase { - public WindowArboristDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, Binnie.GENETICS.getSystem(TreeManager.treeRoot), 120); + public static Window create(EntityPlayer player, Side side, boolean master) { + return new WindowArboristDatabase(player, side, master); } - public static Window create(final EntityPlayer player, final Side side, final boolean nei) { - return new WindowArboristDatabase(player, side, nei); + private WindowArboristDatabase(EntityPlayer player, Side side, boolean master) { + super(player, side, master, Binnie.GENETICS.getSystem(TreeManager.treeRoot), 120); } @Override @@ -111,7 +112,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { @Override @SideOnly(Side.CLIENT) - public IWidget createOption(final ItemStack value, final int y) { + public IWidget createOption(ItemStack value, int y) { return new ControlItemStackOption(this.getContent(), value, y); } } diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java index dc149be3..d0127026 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java @@ -18,12 +18,12 @@ import binnie.core.gui.minecraft.Window; import binnie.extratrees.ExtraTrees; public class WindowLepidopteristDatabase extends WindowAbstractDatabase { - public WindowLepidopteristDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, ExtraTrees.mothBreedingSystem, 160); + public WindowLepidopteristDatabase(EntityPlayer player, Side side, boolean master) { + super(player, side, master, ExtraTrees.mothBreedingSystem, 160); } - public static Window create(final EntityPlayer player, final Side side, final boolean nei) { - return new WindowLepidopteristDatabase(player, side, nei); + public static Window create(EntityPlayer player, Side side, boolean master) { + return new WindowLepidopteristDatabase(player, side, master); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java index dbe19d91..291ed1d6 100644 --- a/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java @@ -16,7 +16,7 @@ import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; public class MultiFenceRecipeEmbeddedWrapper implements IShapedCraftingRecipeWrapper { - private FenceType fenceType; + private final FenceType fenceType; @Nullable private IPlankType plankType; @Nullable @@ -48,22 +48,22 @@ public class MultiFenceRecipeEmbeddedWrapper implements IShapedCraftingRecipeWra IPlankType plankTypeSecondary = secondary.getKey(); if (plankType != plankTypeSecondary) { planks.add(plankType.getStack(false)); - fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, false), 1)); - outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, true), 2)); + fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), fenceType.isSolid(), false), 1)); + outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), fenceType.isSolid(), true), 2)); } } } else { planks.add(plankType.getStack(false)); - fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, false), 1)); - outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, true), 2)); + fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), fenceType.isSolid(), false), 1)); + outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), fenceType.isSolid(), true), 2)); } } else { for (IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()) { for (IPlankType plankType : WoodManager.getAllPlankTypes()) { if (plankType != plankTypeSecondary) { planks.add(plankType.getStack(false)); - fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, false), 1)); - outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, true), 2)); + fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), fenceType.isSolid(), false), 1)); + outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), fenceType.isSolid(), true), 2)); } } } diff --git a/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java index 827a821a..ace5035c 100644 --- a/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java @@ -20,7 +20,7 @@ import mezz.jei.api.recipe.VanillaRecipeCategoryUid; public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { - public List recipes = new ArrayList<>(); + private final List recipes = new ArrayList<>(); @Override public List getRecipeCategoryUids(IFocus focus) { @@ -35,7 +35,7 @@ public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { case INPUT: desc = WoodManager.getFenceDescription(itemStack); IPlankType plankType = WoodManager.getPlankType(itemStack); - if (plankType != null || desc != null && (!desc.getFenceType().embossed || !desc.getFenceType().embossed)) { + if (plankType != null || desc != null && (!desc.getFenceType().isEmbossed() || !desc.getFenceType().isEmbossed())) { return Collections.singletonList(VanillaRecipeCategoryUid.CRAFTING); } return Collections.emptyList(); @@ -68,7 +68,7 @@ public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { for (MultiFenceRecipePattern pattern : MultiFenceRecipePattern.VALUES) { recipes.add(new MultiFenceRecipeSizeWrapper(pattern)); } - for (FenceType fenceType : FenceType.VALUES) { + for (FenceType fenceType : FenceType.getValues()) { recipes.add(new MultiFenceRecipeEmbeddedWrapper(fenceType)); recipes.add(new MultiFenceRecipeSolidWrapper(fenceType)); } @@ -93,10 +93,10 @@ public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { } else { FenceDescription desc = WoodManager.getFenceDescription(ingredient); if (desc != null) { - if (!desc.getFenceType().embossed) { + if (!desc.getFenceType().isEmbossed()) { recipes.add(new MultiFenceRecipeEmbeddedWrapper(desc)); } - if (!desc.getFenceType().solid) { + if (!desc.getFenceType().isSolid()) { recipes.add(new MultiFenceRecipeSolidWrapper(desc)); } } @@ -104,13 +104,13 @@ public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { } else { FenceDescription desc = WoodManager.getFenceDescription(ingredient); if (desc != null) { - int size = desc.getFenceType().size; + int size = desc.getFenceType().getSize(); recipes.add(new MultiFenceRecipeSizeWrapper(MultiFenceRecipePattern.VALUES[size * 2], desc.getPlankType(), desc.getSecondaryPlankType())); recipes.add(new MultiFenceRecipeSizeWrapper(MultiFenceRecipePattern.VALUES[size * 2 + 1], desc.getPlankType(), desc.getSecondaryPlankType())); - if (desc.getFenceType().embossed) { + if (desc.getFenceType().isEmbossed()) { recipes.add(new MultiFenceRecipeEmbeddedWrapper(desc)); } - if (desc.getFenceType().solid) { + if (desc.getFenceType().isSolid()) { recipes.add(new MultiFenceRecipeSolidWrapper(desc)); } } diff --git a/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java index 0700c91c..ed24978d 100644 --- a/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java @@ -17,11 +17,11 @@ import mezz.jei.api.recipe.IRecipeWrapper; public class MultiFenceRecipeSizeWrapper implements IRecipeWrapper { @Nullable - private IPlankType plankType; + private final IPlankType plankType; @Nullable - private IPlankType plankTypeSecond; - private MultiFenceRecipePattern pattern; - private String[] recipePattern; + private final IPlankType plankTypeSecond; + private final MultiFenceRecipePattern pattern; + private final String[] recipePattern; public MultiFenceRecipeSizeWrapper(MultiFenceRecipePattern pattern) { this(pattern, null, null); diff --git a/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java index 843af032..a1d8fb79 100644 --- a/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java @@ -15,11 +15,11 @@ import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; public class MultiFenceRecipeSolidWrapper implements IShapedCraftingRecipeWrapper { - private FenceType fenceType; + private final FenceType fenceType; @Nullable - private IPlankType plankType; + private final IPlankType plankType; @Nullable - private IPlankType plankTypeSecondary; + private final IPlankType plankTypeSecondary; public MultiFenceRecipeSolidWrapper(FenceType fenceType) { this.fenceType = fenceType; @@ -41,20 +41,20 @@ public class MultiFenceRecipeSolidWrapper implements IShapedCraftingRecipeWrappe if (plankTypeSecondary == null) { for (IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()) { if (plankType != plankTypeSecondary) { - fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, false, fenceType.embossed), 1)); - outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, true, fenceType.embossed), 2)); + fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), false, fenceType.isEmbossed()), 1)); + outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), true, fenceType.isEmbossed()), 2)); } } } else { - fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, false, fenceType.embossed), 1)); - outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, true, fenceType.embossed), 2)); + fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), false, fenceType.isEmbossed()), 1)); + outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), true, fenceType.isEmbossed()), 2)); } } else { for (IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()) { for (IPlankType plankType : WoodManager.getAllPlankTypes()) { if (plankType != plankTypeSecondary) { - fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, false, fenceType.embossed), 1)); - outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, true, fenceType.embossed), 2)); + fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), false, fenceType.isEmbossed()), 1)); + outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.getSize(), true, fenceType.isEmbossed()), 2)); } } } diff --git a/extratrees/src/main/java/binnie/extratrees/items/ExtraTreeItems.java b/extratrees/src/main/java/binnie/extratrees/items/ExtraTreeItems.java index cfe537a3..5cf9e504 100644 --- a/extratrees/src/main/java/binnie/extratrees/items/ExtraTreeItems.java +++ b/extratrees/src/main/java/binnie/extratrees/items/ExtraTreeItems.java @@ -26,7 +26,7 @@ public enum ExtraTreeItems implements IItemMiscProvider { GRAIN_ROASTED("grain_roasted"), GLASS_FITTING("glass_fitting"); - String name; + private final String name; ExtraTreeItems(String name) { this.name = name; diff --git a/extratrees/src/main/java/binnie/extratrees/items/ExtraTreeLiquid.java b/extratrees/src/main/java/binnie/extratrees/items/ExtraTreeLiquid.java index 9e84609e..390b4b79 100644 --- a/extratrees/src/main/java/binnie/extratrees/items/ExtraTreeLiquid.java +++ b/extratrees/src/main/java/binnie/extratrees/items/ExtraTreeLiquid.java @@ -15,7 +15,7 @@ public enum ExtraTreeLiquid implements ILiquidDefinition { Latex("Latex", "latex", 14212041), Turpentine("Turpentine", "turpentine", 7951162); - FluidType type; + private final FluidType type; ExtraTreeLiquid(final String name, final String ident, final int color) { type = new FluidType(ident, name, color) diff --git a/extratrees/src/main/java/binnie/extratrees/items/Food.java b/extratrees/src/main/java/binnie/extratrees/items/Food.java index dac5f2d3..3bf230d6 100644 --- a/extratrees/src/main/java/binnie/extratrees/items/Food.java +++ b/extratrees/src/main/java/binnie/extratrees/items/Food.java @@ -283,10 +283,10 @@ public enum Food implements IItemMiscProvider { STARFRUIT(2), CANDLENUT(0); - public static Food[] VALUES = values(); + public static final Food[] VALUES = values(); - int hunger; - private List ores; + private final int hunger; + private final List ores; Food(final int hunger) { this.ores = new ArrayList<>(); diff --git a/extratrees/src/main/java/binnie/extratrees/items/ItemDrink.java b/extratrees/src/main/java/binnie/extratrees/items/ItemDrink.java index 141222bf..41c2e511 100644 --- a/extratrees/src/main/java/binnie/extratrees/items/ItemDrink.java +++ b/extratrees/src/main/java/binnie/extratrees/items/ItemDrink.java @@ -144,11 +144,6 @@ public class ItemDrink extends ItemFood implements IItemModelRegister { AlcoholEffect.makeDrunk(player, 2.1f); } - @Override - public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) { - return super.onItemUseFinish(stack, worldIn, entityLiving); - } - @Override public EnumAction getItemUseAction(final ItemStack itemStack) { if (FluidUtil.getFluidContained(itemStack) != null) { diff --git a/extratrees/src/main/java/binnie/extratrees/items/ItemHammer.java b/extratrees/src/main/java/binnie/extratrees/items/ItemHammer.java index f7c9d879..014baf7d 100644 --- a/extratrees/src/main/java/binnie/extratrees/items/ItemHammer.java +++ b/extratrees/src/main/java/binnie/extratrees/items/ItemHammer.java @@ -15,7 +15,7 @@ import binnie.core.util.I18N; import binnie.design.api.IToolHammer; public class ItemHammer extends Item implements IToolHammer, IItemModelRegister { - private boolean isDurableHammer; + private final boolean isDurableHammer; public ItemHammer(boolean durable) { this.isDurableHammer = durable; diff --git a/extratrees/src/main/java/binnie/extratrees/items/ItemSetSquare.java b/extratrees/src/main/java/binnie/extratrees/items/ItemSetSquare.java index f5791041..96742e75 100644 --- a/extratrees/src/main/java/binnie/extratrees/items/ItemSetSquare.java +++ b/extratrees/src/main/java/binnie/extratrees/items/ItemSetSquare.java @@ -14,7 +14,7 @@ import forestry.api.core.IModelManager; import binnie.design.api.IToolHammer; public class ItemSetSquare extends Item implements IToolHammer, IItemModelRegister { - private EnumSetSquareMode mode; + private final EnumSetSquareMode mode; public ItemSetSquare(final EnumSetSquareMode mode) { this.mode = mode; diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/extratrees/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index c349dbcd..324a4aec 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -34,7 +34,7 @@ public enum KitchenMachine implements IMachineType { public abstract static class PackageKitchenMachine extends MachinePackage { protected PackageKitchenMachine(final String uid) { - super(uid, false); + super(uid); } @Override @@ -42,8 +42,5 @@ public enum KitchenMachine implements IMachineType { return new TileEntityMachine(this); } - @Override - public void register() { - } } } diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index 5e545f6f..721106b3 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -22,9 +22,9 @@ import binnie.core.gui.renderer.RenderUtil; import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlSlotFluid extends Control implements ITooltip { - ControlFluidDisplay itemDisplay; + protected final ControlFluidDisplay itemDisplay; @Nullable - FluidStack fluidStack; + protected FluidStack fluidStack; public ControlSlotFluid(final IWidget parent, final int x, final int y, @Nullable final FluidStack fluid) { this(parent, x, y, 18, fluid); @@ -36,7 +36,7 @@ public class ControlSlotFluid extends Control implements ITooltip { this.itemDisplay = new ControlFluidDisplay(this, 1, 1, size - 2); this.fluidStack = fluid; this.addSelfEventHandler(EventWidget.ChangeSize.class, event -> { - ControlSlotFluid.this.itemDisplay.setSize(ControlSlotFluid.this.getSize().sub(new Point(2, 2))); + this.itemDisplay.setSize(this.getSize().sub(new Point(2, 2))); }); } diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java index 3f1ea419..26214c9b 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java @@ -8,7 +8,7 @@ import binnie.core.gui.minecraft.control.ControlSlotBase; import binnie.extratrees.alcohol.GlasswareType; public class ControlSlotGlassware extends ControlSlotBase implements IControlValue { - GlasswareType glasswareType; + private GlasswareType glasswareType; public ControlSlotGlassware(final IWidget parent, final int x, final int y, final GlasswareType glasswareType) { super(parent, x, y); diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java index 140c3ef0..0c369948 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java @@ -11,11 +11,10 @@ import binnie.core.gui.geometry.Area; import binnie.core.gui.minecraft.Window; public class ControlTankSlot extends ControlSlotFluid { - int tankID; + private final int tankID; public ControlTankSlot(final IWidget parent, final int x, final int y, final int i) { super(parent, x, y, null); - this.tankID = 0; this.tankID = i; this.addSelfEventHandler(EventMouse.Down.class, event -> { if (event.getButton() == 0) { @@ -29,7 +28,7 @@ public class ControlTankSlot extends ControlSlotFluid { @Override @SideOnly(Side.CLIENT) public void onUpdateClient() { - this.fluidStack = Window.get(this).getContainer().getTankInfo(this.tankID).liquid; + this.fluidStack = Window.get(this).getContainer().getTankInfo(this.tankID).getLiquid(); final int height = 16 * (((this.fluidStack == null) ? 0 : this.fluidStack.amount) / 1000); this.itemDisplay.setCroppedZone(this.itemDisplay, new Area(0, 16 - height, 16, 16)); super.onUpdateClient(); diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java index 73865828..d6bcdea0 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java @@ -11,6 +11,7 @@ import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.control.ControlPlayerInventory; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; +import net.minecraftforge.fml.relauncher.SideOnly; public class WindowBottleRack extends Window { public WindowBottleRack(final EntityPlayer player, final IInventory inventory, final Side side) { @@ -36,6 +37,7 @@ public class WindowBottleRack extends Window { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); for (int i = 0; i < 36; ++i) { diff --git a/extratrees/src/main/java/binnie/extratrees/liquid/Alcohol.java b/extratrees/src/main/java/binnie/extratrees/liquid/Alcohol.java index 2f349fae..6df11915 100644 --- a/extratrees/src/main/java/binnie/extratrees/liquid/Alcohol.java +++ b/extratrees/src/main/java/binnie/extratrees/liquid/Alcohol.java @@ -130,10 +130,10 @@ public enum Alcohol implements IFluidDefinition, ICocktailIngredientProvider { Rye("mash.rye", 10836007, 0.9, 0.05F), Corn("mash.corn", 13411364, 0.9, 0.05F); - final List fermentationLiquid; - final FluidType type; - String fermentationSolid; - CocktailLiquid cocktailLiquid; + private final List fermentationLiquid; + private final FluidType type; + private String fermentationSolid; + private final CocktailLiquid cocktailLiquid; Alcohol(final String ident, final int color, final double transparency, float abv) { this.fermentationLiquid = new ArrayList<>(); @@ -165,7 +165,7 @@ public enum Alcohol implements IFluidDefinition, ICocktailIngredientProvider { } protected void addFementation(final Juice juice) { - this.fermentationLiquid.add(juice.type.getDisplayName()); + this.fermentationLiquid.add(juice.getType().getDisplayName()); } protected void addFementation(final String oreDict) { diff --git a/extratrees/src/main/java/binnie/extratrees/liquid/Cocktail.java b/extratrees/src/main/java/binnie/extratrees/liquid/Cocktail.java index 3e3546f1..f18261c0 100644 --- a/extratrees/src/main/java/binnie/extratrees/liquid/Cocktail.java +++ b/extratrees/src/main/java/binnie/extratrees/liquid/Cocktail.java @@ -130,10 +130,10 @@ public enum Cocktail { Cocktail.SexOnTheBeach.add(Juice.Cranberry, 2); } - public String name; - public GlasswareType glasswareType; - public int colour; - public Map ingredients; + private final String name; + private final GlasswareType glasswareType; + private final int colour; + private final Map ingredients; Cocktail(final String name, final GlasswareType glasswareType, final int colour) { this.ingredients = new HashMap<>(); diff --git a/extratrees/src/main/java/binnie/extratrees/liquid/Juice.java b/extratrees/src/main/java/binnie/extratrees/liquid/Juice.java index 23376ecd..185003ba 100644 --- a/extratrees/src/main/java/binnie/extratrees/liquid/Juice.java +++ b/extratrees/src/main/java/binnie/extratrees/liquid/Juice.java @@ -34,9 +34,9 @@ public enum Juice implements IFluidDefinition, ICocktailIngredientProvider { WhiteGrape("White Grape Juice", "juice.white.grape", 16507769, 0.6, "WhiteGrape"), RedGrape("Red Grape Juice", "juice.red.grape", 9775412, 0.6, "RedGrape"); - public String squeezing; - FluidType type; - CocktailLiquid cocktailLiquid; + private String squeezing; + private final FluidType type; + private final CocktailLiquid cocktailLiquid; Juice(final String name, final String ident, final int colour, final double transparency, final String squeezing) { this.addSqueezing("crop" + squeezing); @@ -71,4 +71,8 @@ public enum Juice implements IFluidDefinition, ICocktailIngredientProvider { public FluidType getType() { return type; } + + public String getSqueezing() { + return squeezing; + } } diff --git a/extratrees/src/main/java/binnie/extratrees/liquid/Liqueur.java b/extratrees/src/main/java/binnie/extratrees/liquid/Liqueur.java index 5ea62723..eb0cd3a0 100644 --- a/extratrees/src/main/java/binnie/extratrees/liquid/Liqueur.java +++ b/extratrees/src/main/java/binnie/extratrees/liquid/Liqueur.java @@ -52,16 +52,16 @@ public enum Liqueur implements IFluidDefinition, ICocktailIngredientProvider { Liqueur.Raspberry.addFlavour("cropRaspberry"); } - float abv; - final FluidType type; - final CocktailLiquid cocktailLiquid; + private final float abv; + private final FluidType type; + private final CocktailLiquid cocktailLiquid; Liqueur(final String name, final int colour, final double transparency,float abv) { this(name + " Liqueur", "liqueur." + name.toLowerCase(), colour, transparency, abv); } Liqueur(final String name, final String ident, final int color, final double transparency, float abv) { - this.abv = (float) abv; + this.abv = abv; type = new FluidType(ident, name, color) .setTransparency(transparency) .setTextures(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid")) diff --git a/extratrees/src/main/java/binnie/extratrees/liquid/MiscFluid.java b/extratrees/src/main/java/binnie/extratrees/liquid/MiscFluid.java index 5210b4f3..ef0dbfa8 100644 --- a/extratrees/src/main/java/binnie/extratrees/liquid/MiscFluid.java +++ b/extratrees/src/main/java/binnie/extratrees/liquid/MiscFluid.java @@ -21,7 +21,7 @@ public enum MiscFluid implements IFluidDefinition, ICocktailLiquid { AgaveNectar("Agave Nectar", "syrup.agave", 13598245, 0.699999988079071), GrenadineSyrup("Grenadine Syrup", "syrup.grenadine", 16009573, 0.800000011920929); - FluidType type; + private final FluidType type; MiscFluid(final String name, final String ident, final int color, final double transparency) { type = new FluidType(ident, name, color) diff --git a/extratrees/src/main/java/binnie/extratrees/liquid/Spirit.java b/extratrees/src/main/java/binnie/extratrees/liquid/Spirit.java index 44405710..30c57991 100644 --- a/extratrees/src/main/java/binnie/extratrees/liquid/Spirit.java +++ b/extratrees/src/main/java/binnie/extratrees/liquid/Spirit.java @@ -42,12 +42,12 @@ public enum Spirit implements IFluidDefinition, ICocktailIngredientProvider { ApricotLiquor("Apricot Liquor", "liquor.apricot", 13421772, 0.05, 0.4F), FruitLiquor("Fruit Liquor", "liquor.fruit", 13421772, 0.05, 0.4F); - float abv; - FluidType type; - CocktailLiquid cocktailLiquid; + private final float abv; + private final FluidType type; + private final CocktailLiquid cocktailLiquid; Spirit(final String name, final String ident, final int color, final double transparency, final float abv) { - this.abv = (float) abv; + this.abv = abv; type = new FluidType(ident, name, color) .setTextures(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid")) .setShowHandler(type -> type == FluidContainerType.GLASS) diff --git a/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index f4be3a8b..66f434a3 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -56,7 +56,7 @@ public enum ExtraTreeMachine implements IMachineType { return null; }); - Supplier supplier; + private final Supplier supplier; ExtraTreeMachine(final Supplier supplier) { this.supplier = supplier; @@ -72,7 +72,7 @@ public enum ExtraTreeMachine implements IMachineType { } public static class ComponentExtraTreeGUI extends MachineComponent implements IInteraction.RightClick { - ExtraTreesGUID id; + private final ExtraTreesGUID id; public ComponentExtraTreeGUI(final Machine machine, final ExtraTreesGUID id) { super(machine); @@ -87,8 +87,8 @@ public enum ExtraTreeMachine implements IMachineType { public abstract static class PackageExtraTreeMachine extends MachinePackage { - protected PackageExtraTreeMachine(final String uid, final boolean powered) { - super(uid, powered); + protected PackageExtraTreeMachine(final String uid) { + super(uid); } @Override @@ -96,8 +96,5 @@ public enum ExtraTreeMachine implements IMachineType { return new TileEntityMachine(this); } - @Override - public void register() { - } } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java b/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java index d8c66ac6..3b5a91fb 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java @@ -19,11 +19,11 @@ public enum ExtraTreesErrorCode implements IErrorStateDefinition { LUMBERMILL_NO_SPACE_PLANKS("lumbermill.space.planks", CoreErrorCode.NO_SPACE), LUMBERMILL_NO_SPACE_SAW_DUST("lumbermill.space.saw_dust", CoreErrorCode.NO_SPACE); - String name; + private final String name; @Nullable - IErrorStateDefinition parent; + private final IErrorStateDefinition parent; @Nullable - EnumErrorType type; + private final EnumErrorType type; ExtraTreesErrorCode(String name) { this(name, null, EnumErrorType.NONE); diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java index 8226c073..2a7b6a6f 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java @@ -25,7 +25,7 @@ import binnie.extratrees.machines.brewery.recipes.BreweryRecipeManager; public class BreweryLogic extends ComponentProcessSetCost implements IProcess, INetwork.GuiNBT { @Nullable - public BreweryCrafting currentCrafting; + private BreweryCrafting currentCrafting; public BreweryLogic(final Machine machine) { super(machine, 16000, 800); @@ -88,7 +88,7 @@ public class BreweryLogic extends ComponentProcessSetCost implements IProcess, I if (this.canWork() == null && this.currentCrafting == null && this.getUtil().getTank(BreweryMachine.TANK_INPUT).getFluidAmount() >= Fluid.BUCKET_VOLUME) { final FluidStack stack = this.getUtil().drainTank(BreweryMachine.TANK_INPUT, Fluid.BUCKET_VOLUME); this.currentCrafting = this.getInputCrafting(); - this.currentCrafting.inputFluid = stack; + this.currentCrafting.setInputFluid(stack); this.getUtil().drainTank(BreweryMachine.TANK_INPUT, stack.amount); this.getUtil().removeIngredients(new int[]{0, 1, 2, 3, 4}, BreweryMachine.SLOTS_INVENTORY); } @@ -132,4 +132,9 @@ public class BreweryLogic extends ComponentProcessSetCost implements IProcess, I } return I18N.localise("extratrees.machine.machine.brewery.tooltips.creating", output.getFluid().getLocalizedName(output)); } + + @Nullable + public BreweryCrafting getCurrentCrafting() { + return currentCrafting; + } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java index 7f6f8f50..c5c5483a 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java @@ -29,7 +29,7 @@ public class BreweryMachine extends ExtraTreeMachine.PackageExtraTreeMachine imp public static final int[] SLOTS_INVENTORY = new int[]{5, 6, 7, 8, 9, 10, 11, 12, 13}; public BreweryMachine() { - super("brewery", true); + super("brewery"); } @Override @@ -59,12 +59,12 @@ public class BreweryMachine extends ExtraTreeMachine.PackageExtraTreeMachine imp final ComponentTankContainer tanks = new ComponentTankContainer(machine); TankSlot input = tanks.addTank(TANK_INPUT, "input", 5000); input.setValidator(new TankValidatorFermentInput()); - input.setOutputSides(MachineSide.TopAndBottom); + input.setOutputSides(MachineSide.TOP_AND_BOTTOM); final TankSlot output = tanks.addTank(TANK_OUTPUT, "output", 5000); output.setValidator(new TankValidatorFermentOutput()); output.forbidInsertion(); - output.setOutputSides(MachineSide.Sides); + output.setOutputSides(MachineSide.SIDES); new ComponentPowerReceptor(machine); new BreweryLogic(machine); @@ -75,7 +75,4 @@ public class BreweryMachine extends ExtraTreeMachine.PackageExtraTreeMachine imp return new TileEntityMachine(this); } - @Override - public void register() { - } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java index 933d9dfc..cf47d283 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java @@ -99,10 +99,7 @@ public class BrewedGrainRecipe implements IBreweryRecipe { @Override public boolean isGrain(ItemStack itemStack) { - if(itemStack.isEmpty()){ - return false; - } - return OreDictionaryUtil.hasOreName(itemStack, grainOreName); + return !itemStack.isEmpty() && OreDictionaryUtil.hasOreName(itemStack, grainOreName); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryCrafting.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryCrafting.java index 1ca5a1cf..09b882b8 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryCrafting.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryCrafting.java @@ -13,13 +13,13 @@ import binnie.extratrees.api.recipes.IBreweryCrafting; public class BreweryCrafting implements INbtWritable, IBreweryCrafting { @Nullable - public FluidStack inputFluid; + private FluidStack inputFluid; @Nullable - public ItemStack[] inputGrains; - public ItemStack ingredient; - public ItemStack yeast; + private final ItemStack[] inputGrains; + private final ItemStack ingredient; + private final ItemStack yeast; - public BreweryCrafting( @Nullable final FluidStack inputFluid, final ItemStack ingredient, @Nullable final ItemStack[] inputGrains, final ItemStack yeast) { + public BreweryCrafting(@Nullable FluidStack inputFluid, ItemStack ingredient, @Nullable ItemStack[] inputGrains, ItemStack yeast) { this.inputFluid = inputFluid; this.inputGrains = ((inputGrains == null) ? new ItemStack[3] : inputGrains); this.ingredient = ingredient; @@ -87,4 +87,8 @@ public class BreweryCrafting implements INbtWritable, IBreweryCrafting { public ItemStack getYeast() { return yeast; } + + public void setInputFluid(@Nullable FluidStack inputFluid) { + this.inputFluid = inputFluid; + } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java index 6b87f1ed..3e0b7c65 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java @@ -19,7 +19,7 @@ import binnie.extratrees.items.ExtraTreeItems; public class BreweryRecipeManager implements IBreweryManager { - private static Set recipes = new HashSet<>(); + private static final Set recipes = new HashSet<>(); public static boolean isValidGrain(final ItemStack itemstack) { for (final IBreweryRecipe recipe : recipes) { @@ -52,7 +52,7 @@ public class BreweryRecipeManager implements IBreweryManager { @Nullable public static FluidStack getOutput(final BreweryCrafting crafting) { - if (crafting.inputFluid != null && !crafting.yeast.isEmpty()) { + if (crafting.getInputFluid() != null && !crafting.getYeast().isEmpty()) { for (final IBreweryRecipe recipe : recipes) { FluidStack output = recipe.getOutput(crafting); if (output != null) { @@ -65,7 +65,7 @@ public class BreweryRecipeManager implements IBreweryManager { @Nullable public static IBreweryRecipe getRecipe(final BreweryCrafting crafting) { - if (crafting.inputFluid != null && !crafting.yeast.isEmpty()) { + if (crafting.getInputFluid() != null && !crafting.getYeast().isEmpty()) { for (final IBreweryRecipe recipe : recipes) { FluidStack output = recipe.getOutput(crafting); if (output != null) { diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java index a2e42ed4..de6a7252 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java @@ -28,8 +28,9 @@ import binnie.extratrees.machines.brewery.BreweryLogic; import binnie.extratrees.machines.brewery.recipes.BreweryRecipeManager; public class ControlBreweryProgress extends ControlProgressBase { - static Texture Brewery = new StandardTexture(0, 69, 34, 39, ExtraTreeTexture.GUI); - static Texture BreweryOverlay = new StandardTexture(34, 69, 34, 39, ExtraTreeTexture.GUI); + private static final Texture BREWERY = new StandardTexture(0, 69, 34, 39, ExtraTreeTexture.GUI); + // TODO: why is this unused? + private static final Texture BREWERY_OVERLAY = new StandardTexture(34, 69, 34, 39, ExtraTreeTexture.GUI); protected ControlBreweryProgress(final IWidget parent, final int x, final int y) { super(parent, x, y, 34, 39); @@ -39,13 +40,13 @@ public class ControlBreweryProgress extends ControlProgressBase { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - CraftGUI.RENDER.texture(ControlBreweryProgress.Brewery, Point.ZERO); + CraftGUI.RENDER.texture(BREWERY, Point.ZERO); final BreweryLogic logic = Machine.getInterface(BreweryLogic.class, Window.get(this).getInventory()); - if (logic == null || logic.currentCrafting == null || logic.currentCrafting.inputFluid == null) { + if (logic == null || logic.getCurrentCrafting() == null || logic.getCurrentCrafting().getInputFluid() == null) { return; } - FluidStack output = BreweryRecipeManager.getOutput(logic.currentCrafting); - FluidStack input = logic.currentCrafting.inputFluid; + FluidStack output = BreweryRecipeManager.getOutput(logic.getCurrentCrafting()); + FluidStack input = logic.getCurrentCrafting().getInputFluid(); final int fermentedHeight = (int) (32.0f * logic.getProgress() / 100.0f); CraftGUI.RENDER.limitArea(new Area(new Point(1, 6).add(this.getAbsolutePosition()), new Point(32, 32 - fermentedHeight)), guiWidth, guiHeight); GL11.glEnable(GL11.GL_SCISSOR_TEST); @@ -62,8 +63,8 @@ public class ControlBreweryProgress extends ControlProgressBase { RenderUtil.drawFluid(new Point(17, 22), output); GL11.glDisable(GL11.GL_SCISSOR_TEST); final ItemStackSet stacks = new ItemStackSet(); - Collections.addAll(stacks, logic.currentCrafting.inputGrains); - stacks.add(logic.currentCrafting.ingredient); + Collections.addAll(stacks, logic.getCurrentCrafting().getInputGrains()); + stacks.add(logic.getCurrentCrafting().getIngredient()); int x = 1; int y = 6; for (final ItemStack stack : stacks) { @@ -75,8 +76,4 @@ public class ControlBreweryProgress extends ControlProgressBase { } } } - - @Override - public void onRenderForeground(int guiWidth, int guiHeight) { - } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryGrain.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryGrain.java index ccd1531a..72e00132 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryGrain.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryGrain.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.brewery.window; +import binnie.core.machines.ManagerMachine; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; @@ -8,7 +9,7 @@ import binnie.extratrees.machines.brewery.recipes.BreweryRecipeManager; public class SlotValidatorBreweryGrain extends SlotValidator { public SlotValidatorBreweryGrain() { - super(SlotValidator.spriteBlock); + super(ManagerMachine.getSpriteBlock()); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryIngredient.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryIngredient.java index c0a74c88..0bcecc26 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryIngredient.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryIngredient.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.brewery.window; +import binnie.core.machines.ManagerMachine; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; @@ -8,7 +9,7 @@ import binnie.extratrees.machines.brewery.recipes.BreweryRecipeManager; public class SlotValidatorBreweryIngredient extends SlotValidator { public SlotValidatorBreweryIngredient() { - super(SlotValidator.spriteBlock); + super(ManagerMachine.getSpriteBlock()); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryYeast.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryYeast.java index 7a3e2694..cfad64bc 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryYeast.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryYeast.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.brewery.window; +import binnie.core.machines.ManagerMachine; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; @@ -8,7 +9,7 @@ import binnie.extratrees.machines.brewery.recipes.BreweryRecipeManager; public class SlotValidatorBreweryYeast extends SlotValidator { public SlotValidatorBreweryYeast() { - super(SlotValidator.spriteBlock); + super(ManagerMachine.getSpriteBlock()); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/WindowBrewery.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/WindowBrewery.java index f7d42f5f..15f0ecfd 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/WindowBrewery.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/WindowBrewery.java @@ -18,6 +18,7 @@ import binnie.core.gui.minecraft.control.ControlSlotArray; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.brewery.BreweryMachine; +import net.minecraftforge.fml.relauncher.SideOnly; public class WindowBrewery extends Window { public static final String LANG_KEY = "extratrees.machine.machine.brewery"; @@ -45,6 +46,7 @@ public class WindowBrewery extends Window { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); new ControlSlotArray.Builder(this, 42, 32, 1, 3).create(BreweryMachine.SLOT_RECIPE_GRAINS); diff --git a/extratrees/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java index 3adc30d8..a0cea27c 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java @@ -18,7 +18,7 @@ public final class PackageDesigner extends MachinePackage implements IMachineInf private final IDesignerType type; public PackageDesigner(final IDesignerType type) { - super(type.getName(), false); + super(type.getName()); this.type = type; } @@ -37,7 +37,4 @@ public final class PackageDesigner extends MachinePackage implements IMachineInf new ComponentDesignerRecipe(machine, this.type); } - @Override - public void register() { - } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java index 0f0d9781..9e54e97c 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java @@ -23,8 +23,8 @@ public class DistilleryLogic extends ComponentProcessSetCost implements IProcess public static final int INPUT_FLUID_AMOUNT = Fluid.BUCKET_VOLUME; @Nullable - public FluidStack currentFluid; - public int level; + private FluidStack currentFluid; + private int level; public DistilleryLogic(final Machine machine) { super(machine, 16000, 800); @@ -101,10 +101,6 @@ public class DistilleryLogic extends ComponentProcessSetCost implements IProcess this.currentFluid = null; } - @Override - protected void onTickTask() { - } - @Override public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { @@ -157,4 +153,17 @@ public class DistilleryLogic extends ComponentProcessSetCost implements IProcess } return I18N.localise("extratrees.machine.machine.distillery.tooltips.creating", output.getLocalizedName()); } + + @Nullable + public FluidStack getCurrentFluid() { + return currentFluid; + } + + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java index 7ac09c23..5e408738 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java @@ -20,7 +20,7 @@ public class DistilleryMachine extends ExtraTreeMachine.PackageExtraTreeMachine public static final int TANK_OUTPUT = 1; public DistilleryMachine() { - super("distillery", true); + super("distillery"); } @Override @@ -31,12 +31,12 @@ public class DistilleryMachine extends ExtraTreeMachine.PackageExtraTreeMachine final TankSlot input = tanks.addTank(TANK_INPUT, "input", 5000); input.setValidator(new TankValidatorDistilleryInput()); - input.setOutputSides(MachineSide.TopAndBottom); + input.setOutputSides(MachineSide.TOP_AND_BOTTOM); final TankSlot output = tanks.addTank(TANK_OUTPUT, "output", 5000); output.setValidator(new TankValidatorDistilleryOutput()); output.setReadOnly(); - output.setOutputSides(MachineSide.Sides); + output.setOutputSides(MachineSide.SIDES); new ComponentPowerReceptor(machine); new DistilleryLogic(machine); @@ -47,7 +47,4 @@ public class DistilleryMachine extends ExtraTreeMachine.PackageExtraTreeMachine return new TileEntityMachine(this); } - @Override - public void register() { - } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java index 4dea3e85..0414dc68 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java @@ -56,7 +56,7 @@ public class ControlDistilleryProgress extends ControlProgressBase { final DistilleryLogic component = Machine.getInterface(DistilleryLogic.class, Window.get(this).getInventory()); FluidStack stack = null; if (component != null) { - stack = component.currentFluid; + stack = component.getCurrentFluid(); } if (stack != null) { for (int y = 0; y < 4; ++y) { @@ -70,7 +70,7 @@ public class ControlDistilleryProgress extends ControlProgressBase { public void onRenderForeground(int guiWidth, int guiHeight) { DistilleryLogic distilleryLogic = Machine.getInterface(DistilleryLogic.class, Window.get(this).getInventory()); if (distilleryLogic != null) { - final int level = distilleryLogic.level; + final int level = distilleryLogic.getLevel(); GlStateManager.enableAlpha(); CraftGUI.RENDER.texture(OUTPUT, new Point(47, 14 + level * 15)); CraftGUI.RENDER.texture(DISTILLERY_OVERLAY, Point.ZERO); diff --git a/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java index 3fad2c99..d60ee1a3 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java @@ -18,6 +18,7 @@ import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.distillery.DistilleryLogic; import binnie.extratrees.machines.distillery.DistilleryMachine; +import net.minecraftforge.fml.relauncher.SideOnly; public class WindowDistillery extends Window { public WindowDistillery(final EntityPlayer player, final IInventory inventory, final Side side) { @@ -43,6 +44,7 @@ public class WindowDistillery extends Window { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); int x = 16; @@ -62,7 +64,7 @@ public class WindowDistillery extends Window { if("still-level".equals(name)){ DistilleryLogic distilleryLogic = Machine.getInterface(DistilleryLogic.class, Window.get(this).getInventory()); if (distilleryLogic != null) { - distilleryLogic.level = nbt.getByte("i"); + distilleryLogic.setLevel(nbt.getByte("i")); } } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java index d4208751..3f256ca7 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java @@ -47,10 +47,6 @@ public class FruitPressLogic extends ComponentProcessSetCost implements IProcess this.getUtil().decreaseStack(FruitPressMachine.SLOT_CURRENT, 1); } - @Override - protected void onTickTask() { - } - @Override public void onUpdate() { super.onUpdate(); diff --git a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java index 0629c695..51fad530 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java @@ -21,7 +21,7 @@ public class FruitPressMachine extends ExtraTreeMachine.PackageExtraTreeMachine public static final int TANK_OUTPUT_CAPACITY = 5000; public FruitPressMachine() { - super("press", true); + super("press"); } @Override @@ -48,7 +48,4 @@ public class FruitPressMachine extends ExtraTreeMachine.PackageExtraTreeMachine return new TileEntityMachine(this); } - @Override - public void register() { - } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java index b5625669..94860820 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java @@ -16,7 +16,7 @@ import binnie.extratrees.api.recipes.IFruitPressRecipe; public class FruitPressRecipeManager implements IFruitPressManager { //Map> - private static Multimap recipes = ArrayListMultimap.create(); + private static final Multimap recipes = ArrayListMultimap.create(); public static boolean isInput(final ItemStack itemstack) { return getOutput(itemstack) != null; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java index effb7b21..ae1ca92e 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.fruitpress.window; +import binnie.core.machines.ManagerMachine; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; @@ -8,7 +9,7 @@ import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager; public class SlotValidatorSqueezable extends SlotValidator { public SlotValidatorSqueezable() { - super(SlotValidator.spriteBlock); + super(ManagerMachine.getSpriteBlock()); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java index 7eca9381..52e4acbb 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java @@ -21,6 +21,7 @@ import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.fruitpress.FruitPressLogic; import binnie.extratrees.machines.fruitpress.FruitPressMachine; +import net.minecraftforge.fml.relauncher.SideOnly; public class WindowPress extends Window { public WindowPress(final EntityPlayer player, final IInventory inventory, final Side side) { @@ -46,6 +47,7 @@ public class WindowPress extends Window { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); new ControlSlot.Builder(this, 24, 52).assign(FruitPressMachine.SLOT_FRUIT); diff --git a/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java b/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java index 0a392d4d..0023dfe8 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java @@ -13,7 +13,7 @@ import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.IProcess; public class InfuserLogic extends ComponentProcessSetCost implements IProcess { - ItemStack infusing; + private ItemStack infusing; public InfuserLogic(final Machine machine) { super(machine, 16000, 800); @@ -66,10 +66,6 @@ public class InfuserLogic extends ComponentProcessSetCost implements IProcess { } } - @Override - protected void onTickTask() { - } - @Override public String getTooltip() { return "Infusing"; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserMachine.java index 75673fba..729bfad2 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserMachine.java @@ -15,7 +15,7 @@ import binnie.extratrees.machines.ExtraTreeMachine; public class InfuserMachine extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public InfuserMachine() { - super("infuser", true); + super("infuser"); } @Override @@ -26,12 +26,12 @@ public class InfuserMachine extends ExtraTreeMachine.PackageExtraTreeMachine imp final TankSlot input = tanks.addTank(Infuser.TANK_INPUT, "input", 5000); input.setValidator(new TankValidatorInfuserInput()); - input.setOutputSides(MachineSide.TopAndBottom); + input.setOutputSides(MachineSide.TOP_AND_BOTTOM); final TankSlot output = tanks.addTank(Infuser.TANK_OUTPUT, "output", 5000); output.setValidator(new TankValidatorInfuserOutput()); output.setReadOnly(); - output.setOutputSides(MachineSide.Sides); + output.setOutputSides(MachineSide.SIDES); new ComponentPowerReceptor(machine); new InfuserLogic(machine); @@ -42,7 +42,4 @@ public class InfuserMachine extends ExtraTreeMachine.PackageExtraTreeMachine imp return new TileEntityMachine(this); } - @Override - public void register() { - } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserRecipes.java b/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserRecipes.java index 92db8d23..7bc77190 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserRecipes.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserRecipes.java @@ -11,19 +11,19 @@ import net.minecraftforge.fluids.FluidStack; public class InfuserRecipes { - static Map recipes = new HashMap<>(); + private static final Map RECIPES = new HashMap<>(); @Nullable public static FluidStack getOutput(final FluidStack fluid, final ItemStack stack) { - return recipes.get(fluid.getFluid()); + return RECIPES.get(fluid.getFluid()); } public static boolean isValidInputLiquid(final FluidStack fluid) { - return recipes.containsKey(fluid.getFluid()); + return RECIPES.containsKey(fluid.getFluid()); } public static boolean isValidOutputLiquid(final FluidStack fluid) { - for (final Map.Entry entry : recipes.entrySet()) { + for (final Map.Entry entry : RECIPES.entrySet()) { if (entry.getValue().isFluidEqual(fluid)) { return true; } @@ -32,6 +32,6 @@ public class InfuserRecipes { } public static void addRecipe(final FluidStack input, final FluidStack output) { - recipes.put(input.getFluid(), output); + RECIPES.put(input.getFluid(), output); } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java index 287bb6ef..301f4960 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java @@ -25,7 +25,7 @@ public class LumbermillMachine extends ExtraTreeMachine.PackageExtraTreeMachine public static final int TANK_WATER_CAPACITY = 10000; public LumbermillMachine() { - super("lumbermill", true); + super("lumbermill"); } @Override @@ -54,7 +54,4 @@ public class LumbermillMachine extends ExtraTreeMachine.PackageExtraTreeMachine return new TileEntityMachine(this); } - @Override - public void register() { - } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java index 6cb076a9..a96616b8 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java @@ -33,10 +33,10 @@ import binnie.extratrees.machines.lumbermill.LumbermillMachine; import binnie.extratrees.machines.lumbermill.recipes.LumbermillRecipeManager; public class ControlLumbermillProgress extends ControlProgressBase { - static final Texture SAW = new StandardTexture(0, 0, 6, 32, ExtraTreeTexture.GUI); - static final Texture SAW_2 = new StandardTexture(2, 0, 4, 32, ExtraTreeTexture.GUI); - float oldProgress; - float animation; + private static final Texture SAW = new StandardTexture(0, 0, 6, 32, ExtraTreeTexture.GUI); + private static final Texture SAW_2 = new StandardTexture(2, 0, 4, 32, ExtraTreeTexture.GUI); + private float oldProgress; + private float animation; protected ControlLumbermillProgress(final IWidget parent, final int x, final int y) { super(parent, x, y, 66, 18); diff --git a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java index 8e176d41..5ddf5203 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.lumbermill.window; +import binnie.core.machines.ManagerMachine; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; @@ -11,7 +12,7 @@ public class SlotValidatorLog extends SlotValidator { private final World world; public SlotValidatorLog(World world) { - super(SlotValidator.spriteBlock); + super(ManagerMachine.getSpriteBlock()); this.world = world; } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/WindowLumbermill.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/WindowLumbermill.java index c02993d9..6af6e9b9 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/WindowLumbermill.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/WindowLumbermill.java @@ -17,6 +17,7 @@ import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.LumbermillMachine; +import net.minecraftforge.fml.relauncher.SideOnly; public class WindowLumbermill extends Window { public WindowLumbermill(final EntityPlayer player, final IInventory inventory, final Side side) { @@ -42,6 +43,7 @@ public class WindowLumbermill extends Window { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); new ControlSlot.Builder(this, 42, 43).assign(LumbermillMachine.SLOT_LOG); diff --git a/extratrees/src/main/java/binnie/extratrees/machines/nursery/ModelNursery.java b/extratrees/src/main/java/binnie/extratrees/machines/nursery/ModelNursery.java index 2b84a170..4e795b61 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/nursery/ModelNursery.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/nursery/ModelNursery.java @@ -8,19 +8,19 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ModelNursery extends ModelBase { - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; + private final ModelRenderer Shape1; + private final ModelRenderer Shape2; + private final ModelRenderer Shape3; + private final ModelRenderer Shape4; + private final ModelRenderer Shape5; + private final ModelRenderer Shape6; + private final ModelRenderer Shape7; + private final ModelRenderer Shape8; + private final ModelRenderer Shape9; + private final ModelRenderer Shape10; + private final ModelRenderer Shape11; + private final ModelRenderer Shape12; + private final ModelRenderer Shape13; public ModelNursery() { this.textureWidth = 64; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/nursery/Nursery.java b/extratrees/src/main/java/binnie/extratrees/machines/nursery/Nursery.java index e3085968..9571f3d5 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/nursery/Nursery.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/nursery/Nursery.java @@ -7,17 +7,17 @@ import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.extratrees.machines.ExtraTreeMachine; public class Nursery { - public static int slotCaterpillar = 0; + public static final int SLOT_CATERPILLAR = 0; public static class PackageNursery extends ExtraTreeMachine.PackageExtraTreeMachine { public PackageNursery() { - super("nursery", false); + super("nursery"); } @Override public void createMachine(final Machine machine) { final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(Nursery.slotCaterpillar, "caterpillar"); + inventory.addSlot(Nursery.SLOT_CATERPILLAR, "caterpillar"); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/machines/nursery/TileEntityNursery.java b/extratrees/src/main/java/binnie/extratrees/machines/nursery/TileEntityNursery.java index 93059419..ce63a646 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/nursery/TileEntityNursery.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/nursery/TileEntityNursery.java @@ -28,10 +28,6 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu return this.getMachine().getInterface(IButterflyNursery.class); } - boolean hasNursery() { - return this.getNursery() != null; - } - @Override public World getWorld() { return this.world; @@ -47,10 +43,6 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu return EnumHumidity.NORMAL; } - public boolean addProduct(final ItemStack product, final boolean all) { - return false; - } - @Override @Nullable public IButterfly getCaterpillar() { @@ -82,33 +74,6 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu return this.getWorld().getBiome(getPos()); } - public void setErrorState(final IErrorState state) { - } - - @Nullable - public IErrorState getErrorState() { - return null; - } - - public void setErrorState(final int state) { - } - - public boolean setErrorCondition(final boolean condition, final IErrorState errorState) { - return false; - } - - public Set getErrorStates() { - return new HashSet<>(); - } - - public int getBiomeId() { - return 0; - } - - public int getErrorOrdinal() { - return 0; - } - @Override public BlockPos getCoordinates() { return getPos(); diff --git a/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java b/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java index 83a7983f..166ea3db 100644 --- a/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java +++ b/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java @@ -99,22 +99,22 @@ public class ModelMultiFence extends ModelBlockCached ores = new ArrayList<>(); ores.addAll(OreDictionary.getOres(oreDict)); for (final Food food : Food.values()) { diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java index 6d0877c1..9f32acd2 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java @@ -320,7 +320,7 @@ public class ModuleWood implements Module { } shrubLog = new BlockShrubLog(); - ExtraTrees.proxy.registerBlock(shrubLog, new ItemBlockETWood(shrubLog)); + ExtraTrees.proxy.registerBlock(shrubLog, new ItemBlockETWood<>(shrubLog)); woodAccess.register(EnumShrubLog.INSTANCE, WoodBlockKind.LOG, false, shrubLog.getStateFromMeta(0), new ItemStack(shrubLog, 1, 0)); woodAccess.register(EnumShrubLog.INSTANCE, WoodBlockKind.LOG, true, shrubLog.getStateFromMeta(1), new ItemStack(shrubLog, 1, 1)); } diff --git a/extratrees/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/extratrees/src/main/java/binnie/extratrees/proxy/ProxyClient.java index 9a4f3d65..7ecd5c9b 100644 --- a/extratrees/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/extratrees/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -26,7 +26,7 @@ import binnie.extratrees.models.ModelETDecorativeLeaves; @SideOnly(Side.CLIENT) public class ProxyClient extends Proxy implements IExtraTreeProxy { - public static ModelManager modelManager = new ModelManager(Constants.EXTRA_TREES_MOD_ID); + public static final ModelManager modelManager = new ModelManager(Constants.EXTRA_TREES_MOD_ID); public static ModelManager getModelManager() { return modelManager; @@ -95,7 +95,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { } static class CustomMapper extends StateMapperBase { - ResourceLocation rl; + private final ResourceLocation rl; public CustomMapper(String name) { rl = new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name); diff --git a/extratrees/src/main/java/binnie/extratrees/wood/planks/VanillaPlanks.java b/extratrees/src/main/java/binnie/extratrees/wood/planks/VanillaPlanks.java index 5f29177b..197539d9 100644 --- a/extratrees/src/main/java/binnie/extratrees/wood/planks/VanillaPlanks.java +++ b/extratrees/src/main/java/binnie/extratrees/wood/planks/VanillaPlanks.java @@ -24,7 +24,7 @@ public enum VanillaPlanks implements IPlankType { BIG_OAK(4599061, EnumVanillaWoodType.DARK_OAK); private final IWoodType woodType; - private int color; + private final int color; @SideOnly(Side.CLIENT) private TextureAtlasSprite sprite; diff --git a/extratrees/src/main/java/binnie/extratrees/worldgen/BlockType.java b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockType.java index 9fb5dc17..442fed42 100644 --- a/extratrees/src/main/java/binnie/extratrees/worldgen/BlockType.java +++ b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockType.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import forestry.api.world.ITreeGenData; public class BlockType implements WorldGenBlockType { - IBlockState blockState; + private final IBlockState blockState; public BlockType(IBlockState blockState) { this.blockState = blockState; diff --git a/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java index 3f059eb1..105b9873 100644 --- a/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java +++ b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java @@ -10,7 +10,8 @@ import com.mojang.authlib.GameProfile; import forestry.api.world.ITreeGenData; public class BlockTypeLeaf implements WorldGenBlockType { - GameProfile owner; + @Nullable + private final GameProfile owner; public BlockTypeLeaf(@Nullable GameProfile owner) { this.owner = owner; diff --git a/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java index 78f5c796..423bd2dd 100644 --- a/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java +++ b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import forestry.api.world.ITreeGenData; public class BlockTypeLog implements WorldGenBlockType { - ITreeGenData treeGenData; + private final ITreeGenData treeGenData; public BlockTypeLog(ITreeGenData treeGenData) { this.treeGenData = treeGenData; diff --git a/genetics-api/src/main/java/binnie/genetics/api/ITreeBreedingSystem.java b/genetics-api/src/main/java/binnie/genetics/api/ITreeBreedingSystem.java index 7eb4bab1..fa1c6876 100644 --- a/genetics-api/src/main/java/binnie/genetics/api/ITreeBreedingSystem.java +++ b/genetics-api/src/main/java/binnie/genetics/api/ITreeBreedingSystem.java @@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; public interface ITreeBreedingSystem extends IBreedingSystem { - Collection getTreesThatBearFruit(ItemStack fruit, boolean nei, World world, GameProfile player); + Collection getTreesThatBearFruit(ItemStack fruit, boolean master, World world, GameProfile player); - Collection getTreesThatCanBearFruit(ItemStack fruit, boolean nei, World world, GameProfile player); + Collection getTreesThatCanBearFruit(ItemStack fruit, boolean master, World world, GameProfile player); - Collection getTreesThatHaveWood(ItemStack wood, boolean nei, World world, GameProfile player); + Collection getTreesThatHaveWood(ItemStack wood, boolean master, World world, GameProfile player); Set getAllFruits(); diff --git a/genetics/src/main/java/binnie/genetics/CreativeTabGenetics.java b/genetics/src/main/java/binnie/genetics/CreativeTabGenetics.java index 2bfa65a0..861d4701 100644 --- a/genetics/src/main/java/binnie/genetics/CreativeTabGenetics.java +++ b/genetics/src/main/java/binnie/genetics/CreativeTabGenetics.java @@ -10,7 +10,7 @@ import binnie.core.util.I18N; import binnie.genetics.item.GeneticsItems; public class CreativeTabGenetics extends CreativeTabs { - public static CreativeTabs instance = new CreativeTabGenetics(); + public static final CreativeTabs INSTANCE = new CreativeTabGenetics(); public CreativeTabGenetics() { super("Genetics"); diff --git a/genetics/src/main/java/binnie/genetics/Genetics.java b/genetics/src/main/java/binnie/genetics/Genetics.java index cacf19d4..34917524 100644 --- a/genetics/src/main/java/binnie/genetics/Genetics.java +++ b/genetics/src/main/java/binnie/genetics/Genetics.java @@ -1,6 +1,5 @@ package binnie.genetics; -import binnie.core.api.genetics.IBreedingSystem; import binnie.core.machines.errors.ErrorStateRegistry; import binnie.genetics.api.GeneticsApi; import binnie.genetics.api.acclimatiser.IAcclimatiserManager; @@ -51,8 +50,6 @@ public class Genetics extends AbstractMod { @SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer") public static Proxy proxy; @Nullable - public static IBreedingSystem treeBreedingSystem; - @Nullable private static ModuleItems items; @Nullable private static ModuleMachine machine; @@ -91,7 +88,6 @@ public class Genetics extends AbstractMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { TreeBreedingSystem treeBreedingSystem = new TreeBreedingSystem(); - Genetics.treeBreedingSystem = treeBreedingSystem; Binnie.GENETICS.registerBreedingSystem(treeBreedingSystem); proxy.registerItem(new ItemPunnettSquare()); diff --git a/genetics/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/genetics/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index d1c17c5e..7ed9c5ac 100644 --- a/genetics/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/genetics/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -26,7 +26,7 @@ import binnie.core.util.I18N; public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { private static final String GENES_NBT = "genes"; - private List genes; + private final List genes; public GeneArrayItem(ItemStack stack) { genes = new ArrayList<>(); diff --git a/genetics/src/main/java/binnie/genetics/genetics/GeneTracker.java b/genetics/src/main/java/binnie/genetics/genetics/GeneTracker.java index 7a927065..55eb4998 100644 --- a/genetics/src/main/java/binnie/genetics/genetics/GeneTracker.java +++ b/genetics/src/main/java/binnie/genetics/genetics/GeneTracker.java @@ -24,7 +24,7 @@ import binnie.core.api.genetics.IGene; import binnie.genetics.core.GeneticsPacket; public class GeneTracker extends WorldSavedData { - private ArrayList discoveredGenes; + private final ArrayList discoveredGenes; @Nullable private GameProfile username; diff --git a/genetics/src/main/java/binnie/genetics/genetics/SequencerItem.java b/genetics/src/main/java/binnie/genetics/genetics/SequencerItem.java index 1d204010..95f8b839 100644 --- a/genetics/src/main/java/binnie/genetics/genetics/SequencerItem.java +++ b/genetics/src/main/java/binnie/genetics/genetics/SequencerItem.java @@ -11,8 +11,8 @@ import binnie.core.genetics.Gene; import binnie.core.api.genetics.IGene; public class SequencerItem extends GeneItem { - public int sequenced; - public boolean analysed; + private int sequenced; + private boolean analysed; public SequencerItem(IGene gene) { super(gene); @@ -45,4 +45,20 @@ public class SequencerItem extends GeneItem { nbt.setBoolean("ana", analysed); return nbt; } + + public int getSequenced() { + return sequenced; + } + + public void setSequenced(int sequenced) { + this.sequenced = sequenced; + } + + public boolean isAnalysed() { + return analysed; + } + + public void setAnalysed(boolean analysed) { + this.analysed = analysed; + } } diff --git a/genetics/src/main/java/binnie/genetics/genetics/TreeBreedingSystem.java b/genetics/src/main/java/binnie/genetics/genetics/TreeBreedingSystem.java index ef622b48..54f8ee5f 100644 --- a/genetics/src/main/java/binnie/genetics/genetics/TreeBreedingSystem.java +++ b/genetics/src/main/java/binnie/genetics/genetics/TreeBreedingSystem.java @@ -50,11 +50,11 @@ import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; public class TreeBreedingSystem extends BreedingSystem implements binnie.genetics.api.ITreeBreedingSystem { - private UniqueItemStackSet allFruits; - private UniqueItemStackSet allWoods; - public UniqueItemStackSet discoveredPlanks; - private UniqueItemStackSet discoveredFruits; - private UniqueItemStackSet discoveredWoods; + private final UniqueItemStackSet allFruits; + private final UniqueItemStackSet allWoods; + private final UniqueItemStackSet discoveredPlanks; + private final UniqueItemStackSet discoveredFruits; + private final UniqueItemStackSet discoveredWoods; public TreeBreedingSystem() { this.allFruits = new UniqueItemStackSet(); @@ -145,8 +145,8 @@ public class TreeBreedingSystem extends BreedingSystem implements binnie.genetic } @Override - public Collection getTreesThatBearFruit(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { - final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); + public Collection getTreesThatBearFruit(final ItemStack fruit, final boolean master, final World world, final GameProfile player) { + final Collection set = master ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); final List found = new ArrayList<>(); for (final IAlleleSpecies species : set) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; @@ -161,8 +161,8 @@ public class TreeBreedingSystem extends BreedingSystem implements binnie.genetic } @Override - public Collection getTreesThatCanBearFruit(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { - final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); + public Collection getTreesThatCanBearFruit(final ItemStack fruit, final boolean master, final World world, final GameProfile player) { + final Collection set = master ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); final List found = new ArrayList<>(); final Set providers = new HashSet<>(); for (final IAlleleSpecies species : set) { @@ -187,8 +187,8 @@ public class TreeBreedingSystem extends BreedingSystem implements binnie.genetic } @Override - public Collection getTreesThatHaveWood(final ItemStack wood, final boolean nei, final World world, final GameProfile player) { - final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); + public Collection getTreesThatHaveWood(final ItemStack wood, final boolean master, final World world, final GameProfile player) { + final Collection set = master ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); final List found = new ArrayList<>(); for (final IAlleleSpecies species : set) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystManager.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystManager.java index 80d828a6..dd1f6c47 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystManager.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystManager.java @@ -31,8 +31,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class AnalystManager implements IAnalystManager { - private Collection analystPagePlugins = new ArrayList<>(); - private Collection producePlugins = new ArrayList<>(); + private final Collection analystPagePlugins = new ArrayList<>(); + private final Collection producePlugins = new ArrayList<>(); @Override public void registerAnalystPagePlugin(IAnalystPagePlugin analystPageFactory) { diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java index 7c737af3..45b92702 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java @@ -37,11 +37,11 @@ import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class AnalystPageDatabase extends Control implements ITitledWidget { private final ControlScrollableContent scroll; - boolean isMaster; + private final boolean master; - public AnalystPageDatabase(IWidget parent, IArea area, IBreedingSystem system, boolean isMaster) { + public AnalystPageDatabase(IWidget parent, IArea area, IBreedingSystem system, boolean master) { super(parent, area); - this.isMaster = isMaster; + this.master = master; setColor(getColor(system)); int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); @@ -91,7 +91,7 @@ public class AnalystPageDatabase extends Control implements ITitledWidget { private Collection getSpecies(IBreedingSystem system) { Collection species = new ArrayList<>(); - species.addAll(isMaster ? system.getAllSpecies() : system.getDiscoveredSpecies(getWindow().getWorld(), getWindow().getPlayer().getGameProfile())); + species.addAll(master ? system.getAllSpecies() : system.getDiscoveredSpecies(getWindow().getWorld(), getWindow().getPlayer().getGameProfile())); return species; } @@ -108,7 +108,7 @@ public class AnalystPageDatabase extends Control implements ITitledWidget { private static class ScrollOption extends Control { private final IAlleleSpecies v; - IAlleleSpecies value; + private final IAlleleSpecies value; public ScrollOption(Scroll scroll, int y, IAlleleSpecies v) { super(scroll.getContent(), 0, y, scroll.getWidth(), 12); @@ -126,7 +126,7 @@ public class AnalystPageDatabase extends Control implements ITitledWidget { private static class SpeciesSearch extends ControlTextEdit { private final IBreedingSystem system; - private AnalystPageDatabase analystPageDatabase; + private final AnalystPageDatabase analystPageDatabase; public SpeciesSearch(AnalystPageDatabase analystPageDatabase, int y, IBreedingSystem system) { super(analystPageDatabase, 20, y, analystPageDatabase.getWidth() - 40, 16); @@ -159,7 +159,7 @@ public class AnalystPageDatabase extends Control implements ITitledWidget { } private static class DatabaseScrollBar extends ControlScrollBar { - private AnalystPageDatabase analystPageDatabase; + private final AnalystPageDatabase analystPageDatabase; public DatabaseScrollBar(AnalystPageDatabase analystPageDatabase) { super(analystPageDatabase, analystPageDatabase.scroll.getXPos() + analystPageDatabase.scroll.getWidth() - 6, analystPageDatabase.scroll.getYPos() + 3, 3, analystPageDatabase.scroll.getHeight() - 6, analystPageDatabase.scroll); @@ -180,7 +180,7 @@ public class AnalystPageDatabase extends Control implements ITitledWidget { private static class ItemScrollList extends Control { private final Collection options; private final IBreedingSystem system; - private AnalystPageDatabase analystPageDatabase; + private final AnalystPageDatabase analystPageDatabase; public ItemScrollList(final AnalystPageDatabase analystPageDatabase, Collection options, IBreedingSystem system) { super(analystPageDatabase.scroll, 0, 0, analystPageDatabase.scroll.getWidth(), analystPageDatabase.scroll.getHeight()); @@ -207,7 +207,7 @@ public class AnalystPageDatabase extends Control implements ITitledWidget { private static class SpeciesIndividualDisplay extends ControlIndividualDisplay { private final IIndividual ind; private final IAlleleSpecies species; - private ItemScrollList itemScrollList; + private final ItemScrollList itemScrollList; public SpeciesIndividualDisplay(ItemScrollList itemScrollList, int biomeListX, int dx, int dy, IIndividual ind, IAlleleSpecies species) { super(itemScrollList, biomeListX + dx, 2 + dy, ind); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java index bfb62861..8329a4e3 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java @@ -29,7 +29,7 @@ import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class AnalystPageGenome extends Control implements ITitledWidget { - boolean active; + private final boolean active; public AnalystPageGenome(IWidget parent, IArea area, boolean active, IIndividual ind) { super(parent, area); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java index e5aca27d..999abfa3 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java @@ -14,18 +14,15 @@ import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.gui.window.Panel; public class AnalystPanel extends Panel { - WindowAnalyst window; - public AnalystPanel(WindowAnalyst window) { super(window, 16, 54, 280, 164, MinecraftGUI.PanelType.OUTLINE); - this.window = window; setColor(4473924); int sectionWidth = (getWidth() - 8 - 4) / 2; - window.leftPage = new LeftPage(this, sectionWidth); + window.setLeftPage(new LeftPage(this, sectionWidth)); new LeftPageScrollBar(this, sectionWidth, window); - window.rightPage = new RightPage(this, sectionWidth); + window.setRightPage(new RightPage(this, sectionWidth)); new RightPageScrollBar(this, sectionWidth, window); - window.analystPageSize = new Area(1, 1, sectionWidth, getHeight() - 8); + window.setAnalystPageSize(new Area(1, 1, sectionWidth, getHeight() - 8)); } @Override @@ -55,7 +52,7 @@ public class AnalystPanel extends Panel { private final WindowAnalyst window; public LeftPageScrollBar(AnalystPanel analystPanel, int sectionWidth, WindowAnalyst window) { - super(analystPanel, sectionWidth + 2 - 3, 6, 3, analystPanel.getHeight() - 8 + 2 - 6, window.leftPage); + super(analystPanel, sectionWidth + 2 - 3, 6, 3, analystPanel.getHeight() - 8 + 2 - 6, window.getLeftPage()); this.window = window; } @@ -65,11 +62,11 @@ public class AnalystPanel extends Panel { if (!isEnabled()) { return; } - if (window.leftPage.getContent() == null) { + if (window.getLeftPage().getContent() == null) { return; } - RenderUtil.drawGradientRect(getArea(), 1140850688 + window.leftPage.getContent().getColor(), 1140850688 + window.leftPage.getContent().getColor()); - RenderUtil.drawSolidRect(getRenderArea(), window.leftPage.getContent().getColor()); + RenderUtil.drawGradientRect(getArea(), 1140850688 + window.getLeftPage().getContent().getColor(), 1140850688 + window.getLeftPage().getContent().getColor()); + RenderUtil.drawSolidRect(getRenderArea(), window.getLeftPage().getContent().getColor()); } } @@ -93,7 +90,7 @@ public class AnalystPanel extends Panel { private final WindowAnalyst window; public RightPageScrollBar(AnalystPanel analystPanel, int sectionWidth, WindowAnalyst window) { - super(analystPanel, sectionWidth + 2 - 3 + sectionWidth + 4, 6, 3, analystPanel.getHeight() - 8 + 2 - 6, window.rightPage); + super(analystPanel, sectionWidth + 2 - 3 + sectionWidth + 4, 6, 3, analystPanel.getHeight() - 8 + 2 - 6, window.getRightPage()); this.window = window; } @@ -103,11 +100,11 @@ public class AnalystPanel extends Panel { if (!isEnabled()) { return; } - if (window.rightPage.getContent() == null) { + if (window.getRightPage().getContent() == null) { return; } - RenderUtil.drawGradientRect(getArea(), 1140850688 + window.rightPage.getContent().getColor(), 1140850688 + window.rightPage.getContent().getColor()); - RenderUtil.drawSolidRect(getRenderArea(), window.rightPage.getContent().getColor()); + RenderUtil.drawGradientRect(getArea(), 1140850688 + window.getRightPage().getContent().getColor(), 1140850688 + window.getRightPage().getContent().getColor()); + RenderUtil.drawSolidRect(getRenderArea(), window.getRightPage().getContent().getColor()); } } } diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java index 0843a76c..1947beff 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java @@ -19,8 +19,8 @@ import binnie.core.gui.renderer.RenderUtil; import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlAnalystButton extends Control { - ITitledWidget value; - WindowAnalyst window; + private final ITitledWidget value; + private final WindowAnalyst window; public ControlAnalystButton(IWidget parent, int x, int y, int width, int height, WindowAnalyst window, ITitledWidget page) { super(parent, x, y, width, height); @@ -28,12 +28,12 @@ public class ControlAnalystButton extends Control { addAttribute(Attribute.MOUSE_OVER); this.value = page; addSelfEventHandler(EventMouse.Down.class, event -> { - List pages = window.analystPages; - int currentIndex = pages.indexOf(window.rightPage.getContent()); + List pages = window.getAnalystPages(); + int currentIndex = pages.indexOf(window.getRightPage().getContent()); int clickedIndex = pages.indexOf(value); - if (window.isDatabase) { + if (window.isDatabase()) { if (clickedIndex != 0 && clickedIndex != currentIndex) { - window.setPage(window.rightPage, value); + window.setPage(window.getRightPage(), value); } } else { if (clickedIndex < 0) { @@ -42,10 +42,10 @@ public class ControlAnalystButton extends Control { if (clickedIndex < currentIndex) { ++clickedIndex; } - window.setPage(window.rightPage, null); - window.setPage(window.leftPage, null); - window.setPage(window.rightPage, pages.get(clickedIndex)); - window.setPage(window.leftPage, pages.get(clickedIndex - 1)); + window.setPage(window.getRightPage(), null); + window.setPage(window.getLeftPage(), null); + window.setPage(window.getRightPage(), pages.get(clickedIndex)); + window.setPage(window.getLeftPage(), pages.get(clickedIndex - 1)); } }); } @@ -58,7 +58,7 @@ public class ControlAnalystButton extends Control { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - boolean active = value == window.leftPage.getContent() || value == window.rightPage.getContent(); + boolean active = value == window.getLeftPage().getContent() || value == window.getRightPage().getContent(); RenderUtil.setColour((active ? -16777216 : 1140850688) + value.getColor()); GlStateManager.pushMatrix(); GlStateManager.enableBlend(); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java index cdbed2dd..ad7b1a37 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java @@ -22,20 +22,19 @@ import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.texture.BinnieCoreTexture; public class ControlAnalystChromosome extends Control implements ITooltip { - IAllele allele0; - IAllele allele1; - IChromosomeType chromosomeType; - ISpeciesRoot root; - Texture Homozygous; - Texture Heterozygous; + private static final Texture HOMOZYGOUS = new StandardTexture(0, 0, 16, 22, BinnieCoreTexture.GUI_ANALYST); + private static final Texture HETEROZYGOUS = new StandardTexture(16, 0, 16, 22, BinnieCoreTexture.GUI_ANALYST); + + private final IAllele allele0; + private final IAllele allele1; + private final IChromosomeType chromosomeType; + private final ISpeciesRoot root; public ControlAnalystChromosome(IWidget parent, int x, int y, ISpeciesRoot root, IChromosomeType type, IAllele allele0, IAllele allele1) { super(parent, x, y, 16, 22); - Homozygous = new StandardTexture(0, 0, 16, 22, BinnieCoreTexture.GUI_ANALYST); - Heterozygous = new StandardTexture(16, 0, 16, 22, BinnieCoreTexture.GUI_ANALYST); addAttribute(Attribute.MOUSE_OVER); this.root = root; - chromosomeType = type; + this.chromosomeType = type; this.allele0 = allele0; this.allele1 = allele1; } @@ -48,7 +47,7 @@ public class ControlAnalystChromosome extends Control implements ITooltip { @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); - CraftGUI.RENDER.texture(isHomozygous() ? Homozygous : Heterozygous, Point.ZERO); + CraftGUI.RENDER.texture(isHomozygous() ? HOMOZYGOUS : HETEROZYGOUS, Point.ZERO); } @Override diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java index c0217a71..51aab8be 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java @@ -69,6 +69,7 @@ public class ControlBiome extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(biome.getBiomeName().replaceAll("(\\p{Ll})(\\p{Lu})", "$1 $2")); } diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java index 2b8bd649..1696fcef 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java @@ -16,8 +16,8 @@ import binnie.core.gui.resource.textures.CraftGUITexture; @SideOnly(Side.CLIENT) public class ControlSystemButton extends Control { - IBreedingSystem system; - WindowAnalyst window; + private final IBreedingSystem system; + private final WindowAnalyst window; public ControlSystemButton(int xPos, int yPos, WindowAnalyst window, IBreedingSystem system) { super(window, xPos, yPos, 20, 20); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java b/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java index 63de09b8..d0d68578 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java @@ -44,22 +44,22 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class WindowAnalyst extends Window { @Nullable - IWidget baseWidget; - ControlScrollableContent leftPage; - ControlScrollableContent rightPage; + private IWidget baseWidget; + private ControlScrollableContent leftPage; + private ControlScrollableContent rightPage; @Nullable - Control tabBar; - Panel analystPanel; - List analystPages; + private Control tabBar; + private Panel analystPanel; + private final List analystPages; @Nullable - IArea analystPageSize; - boolean isDatabase; - boolean isMaster; - boolean lockedSearch; + private IArea analystPageSize; + private final boolean isDatabase; + private final boolean isMaster; + private final boolean lockedSearch; @Nullable - IIndividual current; + private IIndividual current; @Nullable - IBreedingSystem currentSystem; + private IBreedingSystem currentSystem; private Control analystNone; private ControlSlide slideUpInv; @@ -88,7 +88,7 @@ public class WindowAnalyst extends Window { private void setupValidators() { if (!isDatabase) { getWindowInventory().setValidator(0, new AnalystSlotValidator(this)); - getWindowInventory().setValidator(1, new SlotValidator.Item(GeneticsItems.DNADye.get(1), ModuleMachine.spriteDye)); + getWindowInventory().setValidator(1, new SlotValidator.Item(GeneticsItems.DNADye.get(1), ModuleMachine.getSpriteDye())); } } @@ -330,8 +330,36 @@ public class WindowAnalyst extends Window { updatePages(true); } + public ControlScrollableContent getLeftPage() { + return leftPage; + } + + public void setLeftPage(ControlScrollableContent leftPage) { + this.leftPage = leftPage; + } + + public ControlScrollableContent getRightPage() { + return rightPage; + } + + public void setRightPage(ControlScrollableContent rightPage) { + this.rightPage = rightPage; + } + + public void setAnalystPageSize(IArea analystPageSize) { + this.analystPageSize = analystPageSize; + } + + public List getAnalystPages() { + return analystPages; + } + + public boolean isDatabase() { + return isDatabase; + } + private static class AnalystSlotValidator extends SlotValidator.Individual { - private WindowAnalyst windowAnalyst; + private final WindowAnalyst windowAnalyst; public AnalystSlotValidator(WindowAnalyst windowAnalyst) { this.windowAnalyst = windowAnalyst; @@ -352,6 +380,7 @@ public class WindowAnalyst extends Window { } } + @SideOnly(Side.CLIENT) private static class AnalystNoneControl extends Control { public AnalystNoneControl(WindowAnalyst windowAnalyst) { super(windowAnalyst.analystPanel, 0, 0, windowAnalyst.analystPanel.getWidth(), windowAnalyst.analystPanel.getHeight()); diff --git a/genetics/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java index 448988e0..4b5dc418 100644 --- a/genetics/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java +++ b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java @@ -19,20 +19,20 @@ import binnie.core.gui.geometry.TextJustification; import binnie.core.gui.renderer.RenderUtil; public class ControlPunnett extends Control { - static int boxWidth = 80; - static int boxHeight = 28; + private static final int BOX_WIDTH = 80; + private static final int BOX_HEIGHT = 28; protected ControlPunnett(IWidget parent, int x, int y) { - super(parent, x, y, ControlPunnett.boxWidth * 3, ControlPunnett.boxWidth * 3); + super(parent, x, y, ControlPunnett.BOX_WIDTH * 3, ControlPunnett.BOX_WIDTH * 3); } @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - RenderUtil.drawSolidRect(new Area(0, ControlPunnett.boxHeight, ControlPunnett.boxWidth * 3, 1), 11184810); - RenderUtil.drawSolidRect(new Area(ControlPunnett.boxWidth / 2, ControlPunnett.boxHeight * 2, Math.round(ControlPunnett.boxWidth * 2.5f), 1), 11184810); - RenderUtil.drawSolidRect(new Area(ControlPunnett.boxWidth, 0, 1, ControlPunnett.boxHeight * 3), 11184810); - RenderUtil.drawSolidRect(new Area(ControlPunnett.boxWidth * 2, ControlPunnett.boxHeight / 2, 1, Math.round(ControlPunnett.boxHeight * 2.5f)), 11184810); + RenderUtil.drawSolidRect(new Area(0, ControlPunnett.BOX_HEIGHT, ControlPunnett.BOX_WIDTH * 3, 1), 11184810); + RenderUtil.drawSolidRect(new Area(ControlPunnett.BOX_WIDTH / 2, ControlPunnett.BOX_HEIGHT * 2, Math.round(ControlPunnett.BOX_WIDTH * 2.5f), 1), 11184810); + RenderUtil.drawSolidRect(new Area(ControlPunnett.BOX_WIDTH, 0, 1, ControlPunnett.BOX_HEIGHT * 3), 11184810); + RenderUtil.drawSolidRect(new Area(ControlPunnett.BOX_WIDTH * 2, ControlPunnett.BOX_HEIGHT / 2, 1, Math.round(ControlPunnett.BOX_HEIGHT * 2.5f)), 11184810); } public void setup(IChromosomeType chromosome, IIndividual ind1, IIndividual ind2, ISpeciesRoot root) { @@ -64,14 +64,14 @@ public class ControlPunnett extends Control { for (IAllele allele3 : alleles) { text.append(allele3.getAlleleName()).append(": ").append(25.0f / alleles.size()).append("%\n"); } - new ControlText(this, new Area(x * ControlPunnett.boxWidth, ControlPunnett.boxHeight * y, ControlPunnett.boxWidth, ControlPunnett.boxHeight), text.toString(), TextJustification.TOP_CENTER).setColor(11184810); + new ControlText(this, new Area(x * ControlPunnett.BOX_WIDTH, ControlPunnett.BOX_HEIGHT * y, ControlPunnett.BOX_WIDTH, ControlPunnett.BOX_HEIGHT), text.toString(), TextJustification.TOP_CENTER).setColor(11184810); ++y; } ++x; } - new ControlText(this, new Area(ControlPunnett.boxWidth, 0, ControlPunnett.boxWidth, ControlPunnett.boxHeight), "\n" + primary1.getAlleleName(), TextJustification.TOP_CENTER).setColor(11184810); - new ControlText(this, new Area(ControlPunnett.boxWidth * 2, 0, ControlPunnett.boxWidth, ControlPunnett.boxHeight), "\n" + secondary1.getAlleleName(), TextJustification.TOP_CENTER).setColor(11184810); - new ControlText(this, new Area(0, ControlPunnett.boxHeight, ControlPunnett.boxWidth, ControlPunnett.boxHeight), primary2.getAlleleName(), TextJustification.TOP_CENTER).setColor(11184810); - new ControlText(this, new Area(0, ControlPunnett.boxHeight * 2, ControlPunnett.boxWidth, ControlPunnett.boxHeight), primary2.getAlleleName(), TextJustification.TOP_CENTER).setColor(11184810); + new ControlText(this, new Area(ControlPunnett.BOX_WIDTH, 0, ControlPunnett.BOX_WIDTH, ControlPunnett.BOX_HEIGHT), "\n" + primary1.getAlleleName(), TextJustification.TOP_CENTER).setColor(11184810); + new ControlText(this, new Area(ControlPunnett.BOX_WIDTH * 2, 0, ControlPunnett.BOX_WIDTH, ControlPunnett.BOX_HEIGHT), "\n" + secondary1.getAlleleName(), TextJustification.TOP_CENTER).setColor(11184810); + new ControlText(this, new Area(0, ControlPunnett.BOX_HEIGHT, ControlPunnett.BOX_WIDTH, ControlPunnett.BOX_HEIGHT), primary2.getAlleleName(), TextJustification.TOP_CENTER).setColor(11184810); + new ControlText(this, new Area(0, ControlPunnett.BOX_HEIGHT * 2, ControlPunnett.BOX_WIDTH, ControlPunnett.BOX_HEIGHT), primary2.getAlleleName(), TextJustification.TOP_CENTER).setColor(11184810); } } diff --git a/genetics/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java b/genetics/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java index 22fb17c1..4596cca1 100644 --- a/genetics/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java +++ b/genetics/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java @@ -8,13 +8,10 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.genetics.ISpeciesRoot; - import binnie.core.Binnie; import binnie.core.Constants; import binnie.core.gui.CraftGUI; import binnie.core.gui.minecraft.Window; -import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.gui.resource.stylesheet.StyleSheetManager; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; @@ -22,17 +19,8 @@ import binnie.core.resource.ResourceType; import binnie.genetics.Genetics; public class WindowPunnettSquare extends Window { - - private static final IBinnieTexture texture = new GuiTexture(); - ControlSlot bee1; - ControlSlot bee2; - ControlPunnett punnett; - @Nullable - ISpeciesRoot root; - public WindowPunnettSquare(EntityPlayer player, IInventory inventory, Side side) { super(245, 205, player, inventory, side); - root = null; } public static Window create(EntityPlayer player, IInventory inventory, Side side) { diff --git a/genetics/src/main/java/binnie/genetics/item/GeneticLiquid.java b/genetics/src/main/java/binnie/genetics/item/GeneticLiquid.java index 83191f6f..bccbf698 100644 --- a/genetics/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/genetics/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -16,7 +16,7 @@ public enum GeneticLiquid implements IFluidDefinition { RawDNA("Raw DNA", "dna.raw", 15089129), BacteriaVector("Bacteria Vector", "bacteria.vector", 15960958); - FluidType type; + private final FluidType type; GeneticLiquid(final String name, final String ident, final int color) { type = new FluidType(ident, name, color) diff --git a/genetics/src/main/java/binnie/genetics/item/GeneticsItems.java b/genetics/src/main/java/binnie/genetics/item/GeneticsItems.java index c4e230c5..926bfe80 100644 --- a/genetics/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/genetics/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -24,8 +24,8 @@ public enum GeneticsItems implements IItemMiscProvider { IntegratedCPU("Integrated CPU", "integrated_cpu"), IntegratedCasing("Integrated Casing", "casing_circuit"); - String name; - String modelPath; + private final String name; + private final String modelPath; GeneticsItems(final String name, final String modelPath) { this.name = name; diff --git a/genetics/src/main/java/binnie/genetics/item/ItemAnalyst.java b/genetics/src/main/java/binnie/genetics/item/ItemAnalyst.java index 5cec0e76..81d74836 100644 --- a/genetics/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -14,7 +14,7 @@ import binnie.genetics.core.GeneticsGUI; public class ItemAnalyst extends ItemCore { public ItemAnalyst() { super("analyst"); - this.setCreativeTab(CreativeTabGenetics.instance); + this.setCreativeTab(CreativeTabGenetics.INSTANCE); this.setUnlocalizedName("analyst"); this.setMaxStackSize(1); } diff --git a/genetics/src/main/java/binnie/genetics/item/ItemDatabase.java b/genetics/src/main/java/binnie/genetics/item/ItemDatabase.java index 3763b3fe..52283292 100644 --- a/genetics/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -25,7 +25,7 @@ public class ItemDatabase extends ItemCore { public ItemDatabase() { super("geneticdatabase"); - this.setCreativeTab(CreativeTabGenetics.instance); + this.setCreativeTab(CreativeTabGenetics.INSTANCE); this.setMaxStackSize(1); setHasSubtypes(true); } diff --git a/genetics/src/main/java/binnie/genetics/item/ItemGene.java b/genetics/src/main/java/binnie/genetics/item/ItemGene.java index e6a00d9f..e5bf1ffd 100644 --- a/genetics/src/main/java/binnie/genetics/item/ItemGene.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemGene.java @@ -26,7 +26,7 @@ public abstract class ItemGene extends ItemCore implements IColoredItem { this.setMaxStackSize(1); this.setMaxDamage(16); this.setUnlocalizedName(unlocName); - this.setCreativeTab(CreativeTabGenetics.instance); + this.setCreativeTab(CreativeTabGenetics.INSTANCE); } @Override diff --git a/genetics/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/genetics/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index b670071e..552bfd77 100644 --- a/genetics/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -21,7 +21,7 @@ public class ItemMasterRegistry extends ItemCore { public ItemMasterRegistry() { super("master_registry"); - this.setCreativeTab(CreativeTabGenetics.instance); + this.setCreativeTab(CreativeTabGenetics.INSTANCE); this.setUnlocalizedName("master_registry"); this.setMaxStackSize(1); } diff --git a/genetics/src/main/java/binnie/genetics/item/ItemRegistry.java b/genetics/src/main/java/binnie/genetics/item/ItemRegistry.java index 195b998b..f52bf6ff 100644 --- a/genetics/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -14,7 +14,7 @@ import binnie.genetics.core.GeneticsGUI; public class ItemRegistry extends ItemCore { public ItemRegistry() { super("registry"); - this.setCreativeTab(CreativeTabGenetics.instance); + this.setCreativeTab(CreativeTabGenetics.INSTANCE); this.setUnlocalizedName("registry"); this.setMaxStackSize(1); } diff --git a/genetics/src/main/java/binnie/genetics/item/ItemSequence.java b/genetics/src/main/java/binnie/genetics/item/ItemSequence.java index a0660c64..59116a92 100644 --- a/genetics/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemSequence.java @@ -37,7 +37,7 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar super("sequence"); this.setMaxStackSize(1); this.setMaxDamage(5); - this.setCreativeTab(CreativeTabGenetics.instance); + this.setCreativeTab(CreativeTabGenetics.INSTANCE); } public static ItemStack create(final IGene gene) { @@ -68,12 +68,12 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar tooltip.add(I18N.localise("genetics.item.sequence." + (5 - itemStack.getItemDamage() % 6))); SequencerItem gene = SequencerItem.create(itemStack); if (gene != null) { - if (gene.analysed) { + if (gene.isAnalysed()) { gene.getInfo(tooltip); } else { tooltip.add("<" + I18N.localise("genetics.item.sequence.unknown") + ">"); } - int seq = gene.sequenced; + int seq = gene.getSequenced(); if (seq == 0) { tooltip.add(I18N.localise("genetics.item.sequence.unsequenced")); } else if (seq < 100) { @@ -96,14 +96,14 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar @Override public boolean isAnalysed(final ItemStack stack) { final SequencerItem seq = SequencerItem.create(stack); - return seq != null && seq.analysed; + return seq != null && seq.isAnalysed(); } @Override public ItemStack analyse(final ItemStack stack) { final SequencerItem seq = SequencerItem.create(stack); Preconditions.checkNotNull(seq, "Cannot analyze itemstack that is not a valid item sequence"); - seq.analysed = true; + seq.setAnalysed(true); seq.writeToItem(stack); return stack; } diff --git a/genetics/src/main/java/binnie/genetics/item/ModuleItems.java b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java index f80313d5..a6ef7ce5 100644 --- a/genetics/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java @@ -32,7 +32,7 @@ public class ModuleItems implements IInitializable { public ItemAnalyst analyst; public Item registry; public Item masterRegistry; - public ItemSerumArray itemSerumArray = null; + public ItemSerumArray itemSerumArray; @Nullable private Item itemGenetics; @@ -51,7 +51,7 @@ public class ModuleItems implements IInitializable { Genetics.proxy.registerItem(registry); masterRegistry = new ItemMasterRegistry(); Genetics.proxy.registerItem(masterRegistry); - itemGenetics = new ItemMisc(CreativeTabGenetics.instance, GeneticsItems.values()); + itemGenetics = new ItemMisc(CreativeTabGenetics.INSTANCE, GeneticsItems.values()); Genetics.proxy.registerItem(itemGenetics); itemSequencer = new ItemSequence(); Genetics.proxy.registerItem(itemSequencer); diff --git a/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java b/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java index 0a9eec99..79cabed4 100644 --- a/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java @@ -25,12 +25,12 @@ public enum AdvGeneticMachine implements IMachineType { public ItemStack get(final int i) { Genetics.machine(); - return new ItemStack(ModuleMachine.packageAdvGenetic.getBlock(), i, this.ordinal()); + return new ItemStack(ModuleMachine.getPackageAdvGenetic().getBlock(), i, this.ordinal()); } public abstract static class PackageAdvGeneticBase extends GeneticMachine.PackageGeneticBase { protected PackageAdvGeneticBase(final String uid, final int flashColour, final boolean powered) { - super(uid, flashColour, powered); + super(uid, flashColour); } } } diff --git a/genetics/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java b/genetics/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java index 1b73f25f..e31d3d66 100644 --- a/genetics/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java +++ b/genetics/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java @@ -11,7 +11,7 @@ import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; public class ComponentGeneticGUI extends MachineComponent implements IInteraction.RightClick { - GeneticsGUI id; + private final GeneticsGUI id; public ComponentGeneticGUI(final Machine machine, final GeneticsGUI id) { super(machine); diff --git a/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java b/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java index db0e06bd..8a9be357 100644 --- a/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java @@ -33,14 +33,14 @@ public enum GeneticMachine implements IMachineType { public ItemStack get(final int i) { Genetics.machine(); - return new ItemStack(ModuleMachine.packageGenetic.getBlock(), i, this.ordinal()); + return new ItemStack(ModuleMachine.getPackageGenetic().getBlock(), i, this.ordinal()); } public abstract static class PackageGeneticBase extends MachinePackage { private final int colour; - protected PackageGeneticBase(final String uid, final int flashColour, final boolean powered) { - super(uid, powered); + protected PackageGeneticBase(final String uid, final int flashColour) { + super(uid); this.colour = flashColour; } @@ -49,8 +49,5 @@ public enum GeneticMachine implements IMachineType { return new TileEntityMachine(this); } - @Override - public void register() { - } } } diff --git a/genetics/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java b/genetics/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java index f4f350b7..33c6fd66 100644 --- a/genetics/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java +++ b/genetics/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java @@ -47,11 +47,11 @@ public enum GeneticsErrorCode implements IErrorStateDefinition { SEQUENCER_NO_DNA("sequencer.no.dna", CoreErrorCode.NO_ITEM) ; - String name; + private final String name; @Nullable - IErrorStateDefinition parent; + private final IErrorStateDefinition parent; @Nullable - EnumErrorType type; + private final EnumErrorType type; GeneticsErrorCode(String name) { this(name, null, EnumErrorType.NONE); diff --git a/genetics/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/genetics/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index a48108b6..b1cd671c 100644 --- a/genetics/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -44,12 +44,12 @@ public enum LaboratoryMachine implements IMachineType { public ItemStack get(final int amount) { Genetics.machine(); - return new ItemStack(ModuleMachine.packageLabMachine.getBlock(), amount, this.ordinal()); + return new ItemStack(ModuleMachine.getPackageLabMachine().getBlock(), amount, this.ordinal()); } public static class PackageLabMachine extends GeneticMachine.PackageGeneticBase { public PackageLabMachine() { - super("lab_machine", 16777215, false); + super("lab_machine", 16777215); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java b/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java index 8ed6228e..e5b53b9f 100644 --- a/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -19,29 +19,65 @@ import binnie.genetics.machine.acclimatiser.Acclimatiser; import binnie.genetics.machine.incubator.Incubator; public class ModuleMachine implements IInitializable { - public static ValidatorSprite spriteSequencer; - public static ValidatorSprite spriteSerum; - public static ValidatorSprite spriteEnzyme; - public static ValidatorSprite spriteDye; - public static ValidatorSprite spriteBacteria; - public static ValidatorSprite spriteNugget; + private static ValidatorSprite spriteSequencer; + private static ValidatorSprite spriteSerum; + private static ValidatorSprite spriteEnzyme; + private static ValidatorSprite spriteDye; + private static ValidatorSprite spriteBacteria; + private static ValidatorSprite spriteNugget; - public static MachineGroup packageGenetic; - public static MachineGroup packageAdvGenetic; - public static MachineGroup packageLabMachine; + private static MachineGroup packageGenetic; + private static MachineGroup packageAdvGenetic; + private static MachineGroup packageLabMachine; + + public static ValidatorSprite getSpriteSequencer() { + return spriteSequencer; + } + + public static ValidatorSprite getSpriteSerum() { + return spriteSerum; + } + + public static ValidatorSprite getSpriteEnzyme() { + return spriteEnzyme; + } + + public static ValidatorSprite getSpriteDye() { + return spriteDye; + } + + public static ValidatorSprite getSpriteBacteria() { + return spriteBacteria; + } + + public static ValidatorSprite getSpriteNugget() { + return spriteNugget; + } + + public static MachineGroup getPackageGenetic() { + return packageGenetic; + } + + public static MachineGroup getPackageAdvGenetic() { + return packageAdvGenetic; + } + + public static MachineGroup getPackageLabMachine() { + return packageLabMachine; + } @Override public void preInit() { - (packageGenetic = new MachineGroup(Genetics.instance, "machine", "machine", GeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance); - (packageLabMachine = new MachineGroup(Genetics.instance, "lab_machine", "lab_machine", LaboratoryMachine.values())).setCreativeTab(CreativeTabGenetics.instance); - (packageAdvGenetic = new MachineGroup(Genetics.instance, "adv_machine", "adv_machine", AdvGeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance); + (packageGenetic = new MachineGroup(Genetics.instance, "machine", "machine", GeneticMachine.values())).setCreativeTab(CreativeTabGenetics.INSTANCE); + (packageLabMachine = new MachineGroup(Genetics.instance, "lab_machine", "lab_machine", LaboratoryMachine.values())).setCreativeTab(CreativeTabGenetics.INSTANCE); + (packageAdvGenetic = new MachineGroup(Genetics.instance, "adv_machine", "adv_machine", AdvGeneticMachine.values())).setCreativeTab(CreativeTabGenetics.INSTANCE); - ModuleMachine.spriteSequencer = new ValidatorSprite(Genetics.instance, "validator/sequencer.0", "validator/sequencer.1"); - ModuleMachine.spriteSerum = new ValidatorSprite(Genetics.instance, "validator/serum.0", "validator/serum.1"); - ModuleMachine.spriteEnzyme = new ValidatorSprite(Genetics.instance, "validator/enzyme.0", "validator/enzyme.1"); - ModuleMachine.spriteDye = new ValidatorSprite(Genetics.instance, "validator/dye.0", "validator/dye.1"); - ModuleMachine.spriteNugget = new ValidatorSprite(Genetics.instance, "validator/nugget.0", "validator/nugget.1"); - ModuleMachine.spriteBacteria = new ValidatorSprite(Genetics.instance, "validator/bacteria.0", "validator/bacteria.1"); + spriteSequencer = new ValidatorSprite(Genetics.instance, "validator/sequencer.0", "validator/sequencer.1"); + spriteSerum = new ValidatorSprite(Genetics.instance, "validator/serum.0", "validator/serum.1"); + spriteEnzyme = new ValidatorSprite(Genetics.instance, "validator/enzyme.0", "validator/enzyme.1"); + spriteDye = new ValidatorSprite(Genetics.instance, "validator/dye.0", "validator/dye.1"); + spriteNugget = new ValidatorSprite(Genetics.instance, "validator/nugget.0", "validator/nugget.1"); + spriteBacteria = new ValidatorSprite(Genetics.instance, "validator/bacteria.0", "validator/bacteria.1"); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index 0ce83b03..794881bd 100644 --- a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -30,10 +30,10 @@ public class Acclimatiser { public static final int SLOT_TARGET = 4; public static final int[] SLOT_ACCLIMATISER = new int[]{5, 6, 7}; public static final int[] SLOT_DRONE = new int[]{8, 9, 10, 11}; - private static List toleranceSystems = new ArrayList<>(); - private static List toleranceTypes = new ArrayList<>(); - private static Map temperatureItems = new HashMap<>(); - private static Map humidityItems = new HashMap<>(); + private static final List toleranceSystems = new ArrayList<>(); + private static final List toleranceTypes = new ArrayList<>(); + private static final Map temperatureItems = new HashMap<>(); + private static final Map humidityItems = new HashMap<>(); @Nullable private static ToleranceSystem getToleranceSystem(final ItemStack stack, final ItemStack acclim) { diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java index f065c229..613b69af 100644 --- a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java @@ -18,7 +18,7 @@ import net.minecraft.util.NonNullList; public class PackageAcclimatiser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageAcclimatiser() { - super("acclimatiser", 9857609, true); + super("acclimatiser", 9857609); } @Override @@ -55,7 +55,4 @@ public class PackageAcclimatiser extends GeneticMachine.PackageGeneticBase imple return new TileEntityMachine(this); } - @Override - public void register() { - } } diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index 7c06e7de..7341cf31 100644 --- a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -21,8 +21,8 @@ import binnie.genetics.core.GeneticsTexture; import binnie.core.gui.window.WindowMachine; public class WindowAcclimatiser extends WindowMachine { - static Texture ProgressBase = new StandardTexture(0, 64, 64, 64, GeneticsTexture.GUI_PROCESS_3); - static Texture Progress = new StandardTexture(0, 64, 64, 64, GeneticsTexture.GUI_PROCESS_3); + private static final Texture PROGRESS_BASE = new StandardTexture(0, 64, 64, 64, GeneticsTexture.GUI_PROCESS_3); + private static final Texture PROGRESS = new StandardTexture(0, 64, 64, 64, GeneticsTexture.GUI_PROCESS_3); public WindowAcclimatiser(final EntityPlayer player, final IInventory inventory, final Side side) { super(280, 198, player, inventory, side); @@ -32,7 +32,7 @@ public class WindowAcclimatiser extends WindowMachine { @SideOnly(Side.CLIENT) public void initialiseClient() { super.initialiseClient(); - new ControlProgress(this, 65, 28 , WindowAcclimatiser.ProgressBase, WindowAcclimatiser.Progress, Alignment.RIGHT); + new ControlProgress(this, 65, 28 , PROGRESS_BASE, PROGRESS, Alignment.RIGHT); int x = 16; final int y = 32; new ControlSlotArray.Builder(this, x, y, 2, 2).create(Acclimatiser.SLOT_RESERVE); diff --git a/genetics/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java b/genetics/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java index 17a8e264..4488e9a5 100644 --- a/genetics/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java +++ b/genetics/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java @@ -21,7 +21,7 @@ import binnie.genetics.machine.ModuleMachine; public class PackageAnalyser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageAnalyser() { - super("analyser", 9961727, true); + super("analyser", 9961727); } @Override @@ -44,7 +44,7 @@ public class PackageAnalyser extends GeneticMachine.PackageGeneticBase implement } ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); transfer.addRestock(Analyser.SLOT_RESERVE, 6, 1); - transfer.addStorage(6, Analyser.SLOT_FINISHED, (stack) -> ManagerGenetics.isAnalysed(stack)); + transfer.addStorage(6, Analyser.SLOT_FINISHED, ManagerGenetics::isAnalysed); new ComponentChargedSlots(machine).addCharge(13); new ComponentPowerReceptor(machine, 500); new AnalyserLogic(machine); @@ -56,13 +56,9 @@ public class PackageAnalyser extends GeneticMachine.PackageGeneticBase implement return new TileEntityMachine(this); } - @Override - public void register() { - } - private static class DyeSlotValidator extends SlotValidator { public DyeSlotValidator() { - super(ModuleMachine.spriteDye); + super(ModuleMachine.getSpriteDye()); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index 07080efa..ed0e589a 100644 --- a/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -26,8 +26,8 @@ import binnie.genetics.core.GeneticsTexture; import binnie.core.gui.window.WindowMachine; public class WindowAnalyser extends WindowMachine { - static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, GeneticsTexture.GUI_PROCESS_3); - static Texture Progress = new StandardTexture(0, 201, 142, 17, GeneticsTexture.GUI_PROCESS_3); + private static final Texture PROGRESS_BASE = new StandardTexture(0, 51, 66, 40, GeneticsTexture.GUI_PROCESS); + private static final Texture PROGRESS = new StandardTexture(66, 51, 66, 40, GeneticsTexture.GUI_PROCESS); public WindowAnalyser(final EntityPlayer player, final IInventory inventory, final Side side) { super(220, 210, player, inventory, side); @@ -37,8 +37,6 @@ public class WindowAnalyser extends WindowMachine { @SideOnly(Side.CLIENT) public void initialiseClient() { super.initialiseClient(); - WindowAnalyser.ProgressBase = new StandardTexture(0, 51, 66, 40, GeneticsTexture.GUI_PROCESS); - WindowAnalyser.Progress = new StandardTexture(66, 51, 66, 40, GeneticsTexture.GUI_PROCESS); int x = 16; final int y = 32; new ControlSlotArray.Builder(this, x, y, 2, 3).create(Analyser.SLOT_RESERVE); @@ -51,7 +49,7 @@ public class WindowAnalyser extends WindowMachine { new ControlIconDisplay(this, x + 36 + 2, y + 18, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()); x += 56; new Panel(this, x, y, 76, 50, MinecraftGUI.PanelType.TINTED); - new ControlProgress(this, x + 5, y + 5, WindowAnalyser.ProgressBase, WindowAnalyser.Progress, Alignment.LEFT); + new ControlProgress(this, x + 5, y + 5, PROGRESS_BASE, PROGRESS, Alignment.LEFT); new ControlSlot.Builder(this, x + 38 - 9, y + 25 - 9).assign(6); new ControlIconDisplay(this, x + 76 + 2, y + 18, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()); x += 96; diff --git a/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index 6653536a..8b4e4505 100644 --- a/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -71,10 +71,6 @@ public class ControlGene extends Control implements IControlValue, IToolt this.gene = value; } - @Override - public void onRenderForeground(int guiWidth, int guiHeight) { - } - @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { diff --git a/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java index 90531a17..f25ac0bf 100644 --- a/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java +++ b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -49,12 +49,12 @@ public class ControlGeneScroll extends Control implements IControlValue> genes = Binnie.GENETICS.getChromosomeMap(this.system.getSpeciesRoot()); int x = 0; int y = 0; - final boolean isNEI = ((WindowGeneBank) Window.get(this)).isNei; + final boolean master = ((WindowGeneBank) Window.get(this)).isMaster(); for (final Map.Entry> entry : genes.entrySet()) { final List discovered = new ArrayList<>(); for (final IAllele allele : entry.getValue()) { final Gene gene = new Gene(allele, entry.getKey(), this.system.getSpeciesRoot()); - if ((isNEI || tracker.isSequenced(new Gene(allele, entry.getKey(), this.system.getSpeciesRoot()))) && gene.getName().toLowerCase().contains(this.filter)) { + if ((master || tracker.isSequenced(new Gene(allele, entry.getKey(), this.system.getSpeciesRoot()))) && gene.getName().toLowerCase().contains(this.filter)) { discovered.add(allele); } } diff --git a/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java index 4aadd0d8..b1de6f51 100644 --- a/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java +++ b/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java @@ -42,38 +42,36 @@ import binnie.genetics.genetics.GeneTracker; public class WindowGeneBank extends WindowMachine { //public static IIcon[] iconsDNA; - public boolean isNei; - ControlGeneScroll genes; + private final boolean master; + private ControlGeneScroll genes; - public WindowGeneBank(final EntityPlayer player, final IInventory inventory, final Side side) { + public WindowGeneBank(EntityPlayer player, IInventory inventory, Side side) { this(player, inventory, side, false); } - public WindowGeneBank(final EntityPlayer player, final IInventory inventory, final Side side, final boolean isNEI) { + public WindowGeneBank(EntityPlayer player, IInventory inventory, Side side, boolean master) { super(320, 224, player, inventory, side); - this.isNei = isNEI; + this.master = master; } @Override - public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + public void receiveGuiNBTOnServer(EntityPlayer player, String name, NBTTagCompound nbt) { super.receiveGuiNBTOnServer(player, name, nbt); if (name.equals("gene-select")) { - final Gene gene = new Gene(nbt.getCompoundTag("gene")); - if (gene != null && !false) { - final ItemStack held = this.getHeldItemStack(); - final ItemStack converted = Engineering.addGene(held, gene); - this.getPlayer().inventory.setItemStack(converted); - this.getPlayer().inventory.markDirty(); - if (this.getPlayer() instanceof EntityPlayerMP) { - ((EntityPlayerMP) this.getPlayer()).sendContainerToPlayer(player.inventoryContainer); - } + Gene gene = new Gene(nbt.getCompoundTag("gene")); + ItemStack held = this.getHeldItemStack(); + ItemStack converted = Engineering.addGene(held, gene); + this.getPlayer().inventory.setItemStack(converted); + this.getPlayer().inventory.markDirty(); + if (this.getPlayer() instanceof EntityPlayerMP) { + ((EntityPlayerMP) this.getPlayer()).sendContainerToPlayer(player.inventoryContainer); } } } @Override public void initialiseServer() { - final GeneTracker tracker = GeneTracker.getTracker(this.getWorld(), this.getUsername()); + GeneTracker tracker = GeneTracker.getTracker(this.getWorld(), this.getUsername()); if (tracker != null) { tracker.synchToPlayer(this.getPlayer()); } @@ -148,6 +146,11 @@ public class WindowGeneBank extends WindowMachine { return "GeneBank"; } + public boolean isMaster() { + return master; + } + + // TODO: why is this unused? public static class ChromosomeType { IChromosomeType chromosome; IBreedingSystem system; @@ -170,7 +173,7 @@ public class WindowGeneBank extends WindowMachine { } private static class GeneBankTab extends ControlTabIcon { - private WindowGeneBank windowGeneBank; + private final WindowGeneBank windowGeneBank; public GeneBankTab(WindowGeneBank windowGeneBank, int x, int y, int w, int h, IBreedingSystem value) { super(x, y, w, h, value); diff --git a/genetics/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java b/genetics/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java index 232f86a4..9fc7cf3e 100644 --- a/genetics/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java +++ b/genetics/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java @@ -30,9 +30,9 @@ public class GenepoolFX extends MachineComponent implements IRender.DisplayTick @SideOnly(Side.CLIENT) private static class GenepoolParticle extends Particle { - double axisX; - double axisZ; - double angle; + private double axisX; + private double axisZ; + private double angle; public GenepoolParticle(World world, BlockPos pos, Random rand) { super(world, pos.getX() + 0.3 + rand.nextDouble() * 0.4, pos.getY() + 1, pos.getZ() + 0.3 + rand.nextDouble() * 0.4, 0.0, 0.0, 0.0); diff --git a/genetics/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java b/genetics/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java index a4acf2dc..b8a59e23 100644 --- a/genetics/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java +++ b/genetics/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java @@ -22,7 +22,7 @@ import binnie.genetics.machine.ModuleMachine; public class PackageGenepool extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageGenepool() { - super("genepool", 12661942, true); + super("genepool", 12661942); } @Override @@ -30,7 +30,7 @@ public class PackageGenepool extends GeneticMachine.PackageGeneticBase implement new ComponentGeneticGUI(machine, GeneticsGUI.GENEPOOL); ComponentInventorySlots inventory = new ComponentInventorySlots(machine); InventorySlot slotEnzyme = inventory.addSlot(Genepool.SLOT_ENZYME, "enzyme"); - slotEnzyme.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.spriteEnzyme)); + slotEnzyme.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.getSpriteEnzyme())); slotEnzyme.forbidExtraction(); InventorySlot slotProcess = inventory.addSlot(Genepool.SLOT_BEE, "process"); slotProcess.setValidator(new SlotValidator.Individual()); @@ -60,8 +60,4 @@ public class PackageGenepool extends GeneticMachine.PackageGeneticBase implement return new TileEntityMachine(this); } - @Override - public void register() { - } - } diff --git a/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java b/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java index bd4249c8..cffe7df3 100644 --- a/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java +++ b/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java @@ -25,8 +25,8 @@ import binnie.genetics.core.GeneticsTexture; import binnie.core.gui.window.WindowMachine; public class WindowGenepool extends WindowMachine { - static Texture ProgressBase = new StandardTexture(64, 0, 130, 21, GeneticsTexture.GUI_PROCESS_3); - static Texture Progress = new StandardTexture(64, 21, 130, 21, GeneticsTexture.GUI_PROCESS_3); + private static final Texture PROGRESS_BASE = new StandardTexture(64, 0, 130, 21, GeneticsTexture.GUI_PROCESS_3); + private static final Texture PROGRESS = new StandardTexture(64, 21, 130, 21, GeneticsTexture.GUI_PROCESS_3); public WindowGenepool(final EntityPlayer player, final IInventory inventory, final Side side) { super(280, 198, player, inventory, side); @@ -46,7 +46,7 @@ public class WindowGenepool extends WindowMachine { x += 18; new ControlSlot.Builder(this, x, y + 3 + 18).assign(0); x += 18; - new ControlMachineProgress(this, x, y + 19, WindowGenepool.ProgressBase, WindowGenepool.Progress, Alignment.LEFT); + new ControlMachineProgress(this, x, y + 19, PROGRESS_BASE, PROGRESS, Alignment.LEFT); x += 130; new ControlLiquidTank(this, x, y).setTankID(0); new ControlEnergyBar(this, 21, 115, 16, 60, Alignment.BOTTOM); diff --git a/genetics/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/genetics/src/main/java/binnie/genetics/machine/incubator/Incubator.java index 0e58b9fa..7e4f0fce 100644 --- a/genetics/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -23,7 +23,7 @@ public class Incubator { public static final int[] SLOT_OUTPUT = new int[]{4, 5, 6}; public static final int TANK_INPUT = 0; public static final int TANK_OUTPUT = 1; - private static List RECIPES = new ArrayList<>(); + private static final List RECIPES = new ArrayList<>(); @Nullable private static IncubatorRecipeLarvae LARVAE_RECIPE; 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 cf2fd378..e045d2d9 100644 --- a/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java @@ -19,7 +19,7 @@ import binnie.genetics.machine.GeneticsErrorCode; public class IncubatorLogic extends ComponentProcessIndefinate implements IProcess { @Nullable private IIncubatorRecipe recipe; - private Random rand; + private final Random rand; private boolean roomForOutput; public IncubatorLogic(final Machine machine) { diff --git a/genetics/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java b/genetics/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java index 7d5c13c4..692f30da 100644 --- a/genetics/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java @@ -15,7 +15,7 @@ import binnie.genetics.machine.GeneticMachine; public class PackageIncubator extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageIncubator() { - super("incubator", 16767313, true); + super("incubator", 16767313); } @Override @@ -44,7 +44,4 @@ public class PackageIncubator extends GeneticMachine.PackageGeneticBase implemen return new TileEntityMachine(this); } - @Override - public void register() { - } } diff --git a/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java b/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java index 99681501..b7039532 100644 --- a/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java @@ -24,8 +24,8 @@ import binnie.genetics.core.GeneticsTexture; import binnie.core.gui.window.WindowMachine; public class WindowIncubator extends WindowMachine { - static Texture ProgressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUI_PROCESS); - static Texture Progress = new StandardTexture(38, 91, 38, 32, GeneticsTexture.GUI_PROCESS); + private static final Texture PROGRESS_BASE = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUI_PROCESS); + private static final Texture PROGRESS = new StandardTexture(38, 91, 38, 32, GeneticsTexture.GUI_PROCESS); public WindowIncubator(final EntityPlayer player, final IInventory inventory, final Side side) { super(228, 196, player, inventory, side); @@ -43,7 +43,7 @@ public class WindowIncubator extends WindowMachine { x += 20; new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()); x += 18; - new ControlMachineProgress(this, x, y + 6, WindowIncubator.ProgressBase, WindowIncubator.Progress, Alignment.LEFT); + new ControlMachineProgress(this, x, y + 6, PROGRESS_BASE, PROGRESS, Alignment.LEFT); new ControlSlot.Builder(this, x + 11, y + 3 + 10).assign(3); x += 40; new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()); diff --git a/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java b/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java index dbfd7abb..6cf6df01 100644 --- a/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java +++ b/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java @@ -1,8 +1,6 @@ package binnie.genetics.machine.indexer; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import forestry.api.apiculture.BeeManager; @@ -23,24 +21,24 @@ public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory @Override public void Sort() { int i = 0; - while (i < this.indexerInventory.size()) { - if (this.indexerInventory.get(i) == null) { - this.indexerInventory.remove(i); + while (i < this.getIndexerInventory().size()) { + if (this.getIndexerInventory().get(i) == null) { + this.getIndexerInventory().remove(i); } else { ++i; } } - if (!this.needsSorting || this.sortingMode == null) { + if (!this.isNeedsSorting() || this.getSortingMode() == null) { return; } - this.needsSorting = false; - ++this.guiRefreshCounter; - switch (this.sortingMode) { + this.setNeedsSorting(false); + this.guiRefreshCounter = this.getGuiRefreshCounter() + 1; + switch (this.getSortingMode()) { case Species: case Type: { final Map speciesList = new HashMap<>(); - for (final ItemStack itemStack : this.indexerInventory) { + for (final ItemStack itemStack : this.getIndexerInventory()) { final int species = itemStack.getItemDamage(); if (!speciesList.containsKey(species)) { speciesList.put(species, new SpeciesList()); @@ -48,24 +46,24 @@ public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory speciesList.get(species).add(itemStack); } for (final SpeciesList sortableList : speciesList.values()) { - for (final ItemStack beeStack : sortableList.bees) { + for (final ItemStack beeStack : sortableList.getBees()) { if (BeeManager.beeRoot.isDrone(beeStack)) { - sortableList.drones.add(this.indexerInventory.indexOf(beeStack)); + sortableList.getDrones().add(this.getIndexerInventory().indexOf(beeStack)); } else if (BeeManager.beeRoot.isMated(beeStack)) { - sortableList.queens.add(this.indexerInventory.indexOf(beeStack)); + sortableList.getQueens().add(this.getIndexerInventory().indexOf(beeStack)); } else { - sortableList.princesses.add(this.indexerInventory.indexOf(beeStack)); + sortableList.getPrincesses().add(this.getIndexerInventory().indexOf(beeStack)); } } } this.sortedInventory = new SetList<>(); - switch (this.sortingMode) { + switch (this.getSortingMode()) { case Species: { for (int j = 0; j < 1024; ++j) { if (speciesList.containsKey(j)) { - this.sortedInventory.addAll(speciesList.get(j).queens); - this.sortedInventory.addAll(speciesList.get(j).princesses); - this.sortedInventory.addAll(speciesList.get(j).drones); + this.getSortedInventory().addAll(speciesList.get(j).getQueens()); + this.getSortedInventory().addAll(speciesList.get(j).getPrincesses()); + this.getSortedInventory().addAll(speciesList.get(j).getDrones()); } } break; @@ -73,17 +71,17 @@ public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory case Type: { for (int j = 0; j < 1024; ++j) { if (speciesList.containsKey(j)) { - this.sortedInventory.addAll(speciesList.get(j).queens); + this.getSortedInventory().addAll(speciesList.get(j).getQueens()); } } for (int j = 0; j < 1024; ++j) { if (speciesList.containsKey(j)) { - this.sortedInventory.addAll(speciesList.get(j).princesses); + this.getSortedInventory().addAll(speciesList.get(j).getPrincesses()); } } for (int j = 0; j < 1024; ++j) { if (speciesList.containsKey(j)) { - this.sortedInventory.addAll(speciesList.get(j).drones); + this.getSortedInventory().addAll(speciesList.get(j).getDrones()); } } break; @@ -92,9 +90,9 @@ public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory break; } default: { - this.sortedInventory.clear(); - for (i = 0; i < this.indexerInventory.size(); ++i) { - this.sortedInventory.add(i); + this.getSortedInventory().clear(); + for (i = 0; i < this.getIndexerInventory().size(); ++i) { + this.getSortedInventory().add(i); } break; } @@ -123,7 +121,7 @@ public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory @Override public boolean isEmpty() { - return this.sortedInventory.isEmpty(); + return this.getSortedInventory().isEmpty(); } @Override @@ -167,21 +165,4 @@ public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory Type } - private static class SpeciesList { - public List drones; - public List queens; - public List princesses; - public List bees; - - SpeciesList() { - this.drones = new ArrayList<>(); - this.queens = new ArrayList<>(); - this.princesses = new ArrayList<>(); - this.bees = new ArrayList<>(); - } - - public void add(final ItemStack stack) { - this.bees.add(stack); - } - } } diff --git a/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java b/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java index e277f712..59943556 100644 --- a/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java +++ b/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java @@ -14,13 +14,13 @@ import binnie.core.machines.inventory.ComponentInventory; import binnie.core.machines.inventory.SetList; public abstract class ComponentIndexerInventory extends ComponentInventory implements IInventory { - public int guiRefreshCounter; - public List sortedInventory; - int indexerSize; - List indexerInventory; + protected int guiRefreshCounter; + protected List sortedInventory; + private final int indexerSize; + private final List indexerInventory; @Nullable - T sortingMode; - boolean needsSorting; + private T sortingMode; + private boolean needsSorting; public ComponentIndexerInventory(final Machine machine) { super(machine); @@ -122,4 +122,29 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } public abstract void Sort(); + + public List getIndexerInventory() { + return indexerInventory; + } + + @Nullable + public T getSortingMode() { + return sortingMode; + } + + public boolean isNeedsSorting() { + return needsSorting; + } + + public void setNeedsSorting(boolean needsSorting) { + this.needsSorting = needsSorting; + } + + public int getGuiRefreshCounter() { + return guiRefreshCounter; + } + + public List getSortedInventory() { + return sortedInventory; + } } diff --git a/genetics/src/main/java/binnie/genetics/machine/indexer/SpeciesList.java b/genetics/src/main/java/binnie/genetics/machine/indexer/SpeciesList.java new file mode 100644 index 00000000..7f60fc9a --- /dev/null +++ b/genetics/src/main/java/binnie/genetics/machine/indexer/SpeciesList.java @@ -0,0 +1,40 @@ +package binnie.genetics.machine.indexer; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + +public class SpeciesList { + private final List drones; + private final List queens; + private final List princesses; + private final List bees; + + SpeciesList() { + this.drones = new ArrayList<>(); + this.queens = new ArrayList<>(); + this.princesses = new ArrayList<>(); + this.bees = new ArrayList<>(); + } + + public void add(final ItemStack stack) { + this.bees.add(stack); + } + + public List getDrones() { + return drones; + } + + public List getQueens() { + return queens; + } + + public List getPrincesses() { + return princesses; + } + + public List getBees() { + return bees; + } +} diff --git a/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java index 8b62c296..f9304c52 100644 --- a/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java +++ b/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java @@ -94,9 +94,9 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic @SideOnly(Side.CLIENT) private static class InoculatorParticle extends Particle { - double axisX; - double axisZ; - double angle; + private double axisX; + private double axisZ; + private double angle; public InoculatorParticle(World world, BlockPos pos) { super(world, pos.getX() + 0.5, pos.getY() + 0.92, pos.getZ() + 0.5, 0.0, 0.0, 0.0); diff --git a/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java index f27b0d53..c6e08741 100644 --- a/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java +++ b/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java @@ -139,11 +139,6 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { return new ErrorState(GeneticsErrorCode.DEFUNCT_SERUM); } - @Override - public ErrorState canProgress() { - return super.canProgress(); - } - @Override protected void onFinishTask() { super.onFinishTask(); diff --git a/genetics/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java index cbc044fb..294b4d79 100644 --- a/genetics/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java +++ b/genetics/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java @@ -27,7 +27,7 @@ import binnie.genetics.machine.ModuleMachine; public class PackageInoculator extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageInoculator() { - super("inoculator", 14819893, true); + super("inoculator", 14819893); } @Override @@ -85,13 +85,9 @@ public class PackageInoculator extends GeneticMachine.PackageGeneticBase impleme return new TileEntityMachine(this); } - @Override - public void register() { - } - private static class SerumSlotValidator extends SlotValidator { public SerumSlotValidator() { - super(ModuleMachine.spriteSerum); + super(ModuleMachine.getSpriteSerum()); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java index 9a3df9fd..999bebff 100644 --- a/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java +++ b/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java @@ -26,8 +26,8 @@ import binnie.genetics.core.GeneticsTexture; import binnie.core.gui.window.WindowMachine; public class WindowInoculator extends WindowMachine { - static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUI_PROCESS_2); - static Texture Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUI_PROCESS_2); + private static final Texture PROGRESS_BASE = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUI_PROCESS_2); + private static final Texture PROGRESS = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUI_PROCESS_2); public WindowInoculator(final EntityPlayer player, final IInventory inventory, final Side side) { super(266, 240, player, inventory, side); @@ -48,7 +48,7 @@ public class WindowInoculator extends WindowMachine { new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_EXPENDED) ); x += 18; - new ControlMachineProgress(this, x, y + 24, WindowInoculator.ProgressBase, WindowInoculator.Progress, Alignment.LEFT); + new ControlMachineProgress(this, x, y + 24, PROGRESS_BASE, PROGRESS, Alignment.LEFT); new ControlEnergyBar(this, 91, 118, 60, 16, Alignment.LEFT); new ControlErrorState(this, 161, 118); x += 142; diff --git a/genetics/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java b/genetics/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java index 54e0f154..d3a5dcd5 100644 --- a/genetics/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java +++ b/genetics/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java @@ -41,9 +41,9 @@ public class IsolaterFX extends MachineComponent implements IRender.RandomDispla @SideOnly(Side.CLIENT) private static class IsolaterParticleRandomTick extends Particle { - double axisX; - double axisZ; - double angle; + private final double axisX; + private final double axisZ; + private double angle; public IsolaterParticleRandomTick(World world, BlockPos pos, Random rand) { super(world, pos.getX() + 0.4 + 0.2 * rand.nextDouble(), pos.getY() + 1.6, pos.getZ() + 0.4 + rand.nextDouble() * 0.2, 0.0, 0.0, 0.0); @@ -74,9 +74,9 @@ public class IsolaterFX extends MachineComponent implements IRender.RandomDispla @SideOnly(Side.CLIENT) private static class IsolaterParticle extends Particle { - double axisX; - double axisZ; - double angle; + private double axisX; + private double axisZ; + private double angle; public IsolaterParticle(World world, BlockPos pos) { super(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0); diff --git a/genetics/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java b/genetics/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java index df60391c..289101c4 100644 --- a/genetics/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java +++ b/genetics/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java @@ -21,7 +21,7 @@ import binnie.genetics.machine.ModuleMachine; public class PackageIsolator extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageIsolator() { - super("isolator", 16740111, true); + super("isolator", 16740111); } @Override @@ -29,10 +29,10 @@ public class PackageIsolator extends GeneticMachine.PackageGeneticBase implement new ComponentGeneticGUI(machine, GeneticsGUI.ISOLATOR); final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); InventorySlot slotEnzyme = inventory.addSlot(Isolator.SLOT_ENZYME, "enzyme"); - slotEnzyme.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.spriteEnzyme)); + slotEnzyme.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.getSpriteEnzyme())); slotEnzyme.forbidExtraction(); InventorySlot slotSequencer = inventory.addSlot(Isolator.SLOT_SEQUENCER_VIAL, "sequencervial"); - slotSequencer.setValidator(new SlotValidator.Item(GeneticsItems.EmptySequencer.get(1), ModuleMachine.spriteSequencer)); + slotSequencer.setValidator(new SlotValidator.Item(GeneticsItems.EmptySequencer.get(1), ModuleMachine.getSpriteSequencer())); slotSequencer.forbidExtraction(); for (InventorySlot slot : inventory.addSlotArray(Isolator.SLOT_RESERVE, "input")) { slot.setValidator(new SlotValidator.Individual()); @@ -66,7 +66,4 @@ public class PackageIsolator extends GeneticMachine.PackageGeneticBase implement return new TileEntityMachine(this); } - @Override - public void register() { - } } diff --git a/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index 47c68718..e65bdaeb 100644 --- a/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -25,8 +25,8 @@ import binnie.genetics.core.GeneticsTexture; import binnie.core.gui.window.WindowMachine; public class WindowIsolator extends WindowMachine { - static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, GeneticsTexture.GUI_PROCESS_3); - static Texture Progress = new StandardTexture(0, 201, 142, 17, GeneticsTexture.GUI_PROCESS_3); + private static final Texture PROGRESS_BASE = new StandardTexture(0, 218, 142, 17, GeneticsTexture.GUI_PROCESS_3); + private static final Texture PROGRESS = new StandardTexture(0, 201, 142, 17, GeneticsTexture.GUI_PROCESS_3); public WindowIsolator(final EntityPlayer player, final IInventory inventory, final Side side) { super(330, 208, player, inventory, side); @@ -48,7 +48,7 @@ public class WindowIsolator extends WindowMachine { new ControlSlot.Builder(this, x, y + 36 + 3).assign(0); new ControlSlotCharge(this, x + 18 + 2, y + 36 + 3, 0).setColor(15722671); x += 18; - new ControlProgress(this, x, y + 3, WindowIsolator.ProgressBase, WindowIsolator.Progress, Alignment.LEFT); + new ControlProgress(this, x, y + 3, PROGRESS_BASE, PROGRESS, Alignment.LEFT); x += 142; new ControlSlot.Builder(this, x, y + 3).assign(6); new ControlSlot.Builder(this, x, y + 3 + 36).assign(1); diff --git a/genetics/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java index 7927c437..855afc35 100644 --- a/genetics/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java +++ b/genetics/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -26,7 +26,7 @@ import binnie.genetics.machine.ModuleMachine; public class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackagePolymeriser() { - super("polymeriser", 58819, true); + super("polymeriser", 58819); } @Override @@ -35,7 +35,7 @@ public class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implem ComponentInventorySlots inventory = new ComponentInventorySlots(machine); //Slot Gold InventorySlot slotGold = inventory.addSlot(Polymeriser.SLOT_GOLD, "catalyst"); - slotGold.setValidator(new SlotValidator.Item(new ItemStack(Items.GOLD_NUGGET, 1), ModuleMachine.spriteNugget)); + slotGold.setValidator(new SlotValidator.Item(new ItemStack(Items.GOLD_NUGGET, 1), ModuleMachine.getSpriteNugget())); slotGold.forbidExtraction(); //Slot Serum InventorySlot slotSerum = inventory.addSlot(Polymeriser.SLOT_SERUM, "process"); @@ -66,10 +66,6 @@ public class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implem return new TileEntityMachine(this); } - @Override - public void register() { - } - private static class BacteriaTankValidator extends TankValidator { @Override public boolean isValid(final FluidStack itemStack) { diff --git a/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java index 21633be0..aaa62c3d 100644 --- a/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java +++ b/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java @@ -31,9 +31,9 @@ public class PolymeriserFX extends MachineComponent implements IRender.DisplayTi @SideOnly(Side.CLIENT) private static class PolymeriserParticle extends Particle { - double axisX; - double axisZ; - double angle; + private double axisX; + private double axisZ; + private double angle; public PolymeriserParticle(World world, BlockPos pos) { super(world, pos.getX() + 0.5, pos.getY() + 1.8, pos.getZ() + 0.5, 0.0, 0.0, 0.0); diff --git a/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java index 73ccd48e..ad1d0c03 100644 --- a/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java +++ b/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java @@ -13,7 +13,7 @@ import binnie.genetics.genetics.Engineering; import binnie.genetics.machine.GeneticsErrorCode; public class PolymeriserLogic extends ComponentProcessSetCost implements IProcess { - private static float chargePerProcess = 0.4f; + private static final float chargePerProcess = 0.4f; private float dnaDrain; private float bacteriaDrain; diff --git a/genetics/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java index 7cd99202..476b491f 100644 --- a/genetics/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java +++ b/genetics/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java @@ -9,7 +9,7 @@ import binnie.genetics.machine.ModuleMachine; public class SlotValidatorUnfilledSerum extends SlotValidator { public SlotValidatorUnfilledSerum() { - super(ModuleMachine.spriteSerum); + super(ModuleMachine.getSpriteSerum()); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java index 1f1d01af..f34e8c70 100644 --- a/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java +++ b/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java @@ -25,8 +25,8 @@ import binnie.genetics.core.GeneticsTexture; import binnie.core.gui.window.WindowMachine; public class WindowPolymeriser extends WindowMachine { - static Texture ProgressBase = new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUI_PROCESS); - static Texture Progress = new StandardTexture(76, 91, 160, 79, GeneticsTexture.GUI_PROCESS); + private static final Texture PROGRESS_BASE = new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUI_PROCESS); + private static final Texture PROGRESS = new StandardTexture(76, 91, 160, 79, GeneticsTexture.GUI_PROCESS); public WindowPolymeriser(final EntityPlayer player, final IInventory inventory, final Side side) { super(278, 212, player, inventory, side); @@ -41,7 +41,7 @@ public class WindowPolymeriser extends WindowMachine { new ControlSlotArray.Builder(this, x, y, 1, 4).create(Polymeriser.SLOT_SERUM_RESERVE); new ControlIconDisplay(this, x + 18, y + 1, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()); x += 34; - new ControlMachineProgress(this, x + 18, y - 6, WindowPolymeriser.ProgressBase, WindowPolymeriser.Progress, Alignment.LEFT); + new ControlMachineProgress(this, x + 18, y - 6, WindowPolymeriser.PROGRESS_BASE, WindowPolymeriser.PROGRESS, Alignment.LEFT); new ControlSlot.Builder(this, x, y).assign(0); new ControlLiquidTank(this, x, y + 18 + 16, true).setTankID(0); new ControlLiquidTank(this, x, y + 18 + 16 + 18 + 8, true).setTankID(1); diff --git a/genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java index 06358d49..04b7c7eb 100644 --- a/genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java @@ -18,9 +18,9 @@ import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; public class ControlSequencerProgress extends ControlProgressBase { - static final String[] CODES = {"A", "T", "G", "C"}; - static final TextFormatting[] COLORS = {TextFormatting.GREEN, TextFormatting.LIGHT_PURPLE, TextFormatting.AQUA, TextFormatting.RED}; - ControlText textControl; + private static final String[] CODES = {"A", "T", "G", "C"}; + private static final TextFormatting[] COLORS = {TextFormatting.GREEN, TextFormatting.LIGHT_PURPLE, TextFormatting.AQUA, TextFormatting.RED}; + private final ControlText textControl; public ControlSequencerProgress(final IWidget parent, final int x, final int y) { super(parent, x, y, 100, 52); diff --git a/genetics/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index 9a2b8ba7..d843cf5f 100644 --- a/genetics/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -19,7 +19,7 @@ import binnie.genetics.machine.ModuleMachine; public class PackageSequencer extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageSequencer() { - super("sequencer", 12058418, true); + super("sequencer", 12058418); } @Override @@ -27,7 +27,7 @@ public class PackageSequencer extends GeneticMachine.PackageGeneticBase implemen new ComponentGeneticGUI(machine, GeneticsGUI.SEQUENCER); ComponentInventorySlots inventory = new ComponentInventorySlots(machine); InventorySlot slotDye = inventory.addSlot(Sequencer.SLOT_DYE, "dye"); - slotDye.setValidator(new SlotValidator.Item(GeneticsItems.FluorescentDye.get(1), ModuleMachine.spriteDye)); + slotDye.setValidator(new SlotValidator.Item(GeneticsItems.FluorescentDye.get(1), ModuleMachine.getSpriteDye())); slotDye.forbidExtraction(); for (InventorySlot slot : inventory.addSlotArray(Sequencer.SLOT_RESERVE, "input")) { slot.setValidator(new SlotValidatorUnsequenced()); @@ -52,7 +52,4 @@ public class PackageSequencer extends GeneticMachine.PackageGeneticBase implemen return new TileEntityMachine(this); } - @Override - public void register() { - } } diff --git a/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java index 1a92c934..8f44103a 100644 --- a/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java @@ -42,9 +42,9 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl @SideOnly(Side.CLIENT) private static class SequencerParticleRandomTick extends Particle { - double axisX; - double axisZ; - double angle; + private double axisX; + private double axisZ; + private double angle; public SequencerParticleRandomTick(World world, BlockPos pos, Random rand) { super(world, pos.getX() + 0.5, pos.getY() + 1.2 + rand.nextDouble() * 0.2, pos.getZ() + 0.5, 0.0, 0.0, 0.0); @@ -86,9 +86,9 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl SPRITES = new BinnieSprite[]{Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, Sequencer.fxSeqT}; } - double axisX; - double axisZ; - double angle; + private final double axisX; + private final double axisZ; + private final double angle; public SequencerParticle(World world, BlockPos pos) { super(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0); diff --git a/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java index 65231bed..2558dd93 100644 --- a/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java @@ -67,7 +67,7 @@ public class SequencerLogic extends ComponentProcess implements IProcess { if (!item.isEmpty()) { final SequencerItem seqItem = SequencerItem.create(item); if (seqItem != null) { - final int seq = seqItem.sequenced; + final int seq = seqItem.getSequenced(); if (seq != 0) { this.setProgress(seq); } @@ -104,9 +104,9 @@ public class SequencerLogic extends ComponentProcess implements IProcess { Preconditions.checkState(!item.isEmpty()); final SequencerItem seqItem = SequencerItem.create(item); Preconditions.checkState(seqItem != null); - final int seq = seqItem.sequenced; + final int seq = seqItem.getSequenced(); if (prog != seq) { - seqItem.sequenced = prog; + seqItem.setSequenced(prog); seqItem.writeToItem(item); } } diff --git a/genetics/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java index 0748060a..0511f6a9 100644 --- a/genetics/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java @@ -10,14 +10,14 @@ import binnie.genetics.machine.ModuleMachine; public class SlotValidatorUnsequenced extends SlotValidator { public SlotValidatorUnsequenced() { - super(ModuleMachine.spriteSequencer); + super(ModuleMachine.getSpriteSequencer()); } @Override public boolean isValid(final ItemStack itemStack) { if (itemStack.getItem() == Genetics.items().itemSequencer) { final SequencerItem seq = SequencerItem.create(itemStack); - return seq != null && seq.sequenced < 100; + return seq != null && seq.getSequenced() < 100; } return false; } diff --git a/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index 246e6676..6aebaba8 100644 --- a/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -29,9 +29,11 @@ import binnie.genetics.core.GeneticsTexture; import binnie.core.gui.window.WindowMachine; public class WindowSequencer extends WindowMachine { - static Texture ProgressBase = new StandardTexture(64, 114, 98, 9, GeneticsTexture.GUI_PROCESS_3); - static Texture Progress = new StandardTexture(64, 123, 98, 9, GeneticsTexture.GUI_PROCESS_3); - ControlText slotText; + // TODO: why are these unused? + private static final Texture PROGRESS_BASE = new StandardTexture(64, 114, 98, 9, GeneticsTexture.GUI_PROCESS_3); + private static final Texture PROGRESS = new StandardTexture(64, 123, 98, 9, GeneticsTexture.GUI_PROCESS_3); + + private ControlText slotText; public WindowSequencer(final EntityPlayer player, final IInventory inventory, final Side side) { super(226, 224, player, inventory, side); diff --git a/genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java b/genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java index 39c62632..48b26709 100644 --- a/genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java +++ b/genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java @@ -9,12 +9,8 @@ import binnie.core.gui.minecraft.control.ControlProgressBase; import binnie.core.gui.renderer.RenderUtil; public class ControlSplicerProgress extends ControlProgressBase { - float strength; - public ControlSplicerProgress(final IWidget parent, final int x, final int y, final int w, final int h) { super(parent, x, y, w, h); - this.strength = 0.0f; - this.strength = 0.0f; } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java b/genetics/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java index 25ecd43f..7081a26e 100644 --- a/genetics/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java +++ b/genetics/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java @@ -80,13 +80,9 @@ public class PackageSplicer extends AdvGeneticMachine.PackageAdvGeneticBase impl return new TileEntityMachine(this); } - @Override - public void register() { - } - private static class SerumSlotValidator extends SlotValidator { public SerumSlotValidator() { - super(ModuleMachine.spriteSerum); + super(ModuleMachine.getSpriteSerum()); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java b/genetics/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java index 42e3322f..7dfcae27 100644 --- a/genetics/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java +++ b/genetics/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java @@ -21,8 +21,8 @@ import binnie.genetics.genetics.Engineering; import binnie.genetics.machine.GeneticsErrorCode; public class SplicerLogic extends ComponentProcess implements IProcess { - public static int PROCESS_ENERGY = 12000000; - public static int PROCESS_LENGTH = 1200; + public static final int PROCESS_ENERGY = 12000000; + public static final int PROCESS_LENGTH = 1200; private int nOfGenes; public SplicerLogic(final Machine machine) { @@ -156,11 +156,6 @@ public class SplicerLogic extends ComponentProcess implements IProcess { return null; } - @Override - public ErrorState canProgress() { - return super.canProgress(); - } - @Override protected void onFinishTask() { super.onFinishTask(); @@ -182,8 +177,4 @@ public class SplicerLogic extends ComponentProcess implements IProcess { } this.getUtil().damageItem(serum, Splicer.SLOT_SERUM_VIAL, 1); } - - @Override - protected void onTickTask() { - } } diff --git a/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java b/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java index ab977eba..3dfa0b8b 100644 --- a/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java +++ b/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java @@ -25,8 +25,9 @@ import binnie.core.gui.window.WindowMachine; import binnie.genetics.machine.inoculator.Inoculator; public class WindowSplicer extends WindowMachine { - static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUI_PROCESS_2); - static Texture Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUI_PROCESS_2); + // TODO: why are these unused? + private static final Texture PROGRESS_BASE = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUI_PROCESS_2); + private static final Texture PROGRESS = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUI_PROCESS_2); public WindowSplicer(final EntityPlayer player, final IInventory inventory, final Side side) { super(280, 240, player, inventory, side); diff --git a/genetics/src/main/java/binnie/genetics/proxy/ProxyClient.java b/genetics/src/main/java/binnie/genetics/proxy/ProxyClient.java index 3e328299..ed5ef436 100644 --- a/genetics/src/main/java/binnie/genetics/proxy/ProxyClient.java +++ b/genetics/src/main/java/binnie/genetics/proxy/ProxyClient.java @@ -11,7 +11,7 @@ import binnie.core.models.ModelManager; @SideOnly(Side.CLIENT) public class ProxyClient extends Proxy implements IGeneticsProxy { - public static ModelManager modelManager = new ModelManager(Constants.GENETICS_MOD_ID); + public static final ModelManager modelManager = new ModelManager(Constants.GENETICS_MOD_ID); public static ModelManager getModelManager() { return modelManager; diff --git a/genetics/src/main/java/binnie/genetics/recipes/RotatedOreIngredient.java b/genetics/src/main/java/binnie/genetics/recipes/RotatedOreIngredient.java index 3be50f75..c01190ef 100644 --- a/genetics/src/main/java/binnie/genetics/recipes/RotatedOreIngredient.java +++ b/genetics/src/main/java/binnie/genetics/recipes/RotatedOreIngredient.java @@ -26,9 +26,9 @@ class RotatedOreIngredient extends Ingredient { private final NonNullList ores; private final int offset; @Nullable - private IntList itemIds = null; + private IntList itemIds; @Nullable - private ItemStack[] array = null; + private ItemStack[] array; public RotatedOreIngredient(String ore, int offset) { super(0);