diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index e7c11fab..f4d2ef56 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -4,7 +4,7 @@ import binnie.Constants; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumSoilType; import binnie.botany.api.IFlower; -import binnie.botany.api.gardening.IBlockSoil; +import binnie.botany.api.IBlockSoil; import binnie.botany.ceramic.BlockCeramic; import binnie.botany.ceramic.BlockCeramicPatterned; import binnie.botany.ceramic.BlockStainedGlass; @@ -57,9 +57,11 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = Constants.BOTANY_MOD_ID, name = "Binnie's Botany", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class Botany extends AbstractMod { + @SuppressWarnings("NullableProblems") @Mod.Instance(Constants.BOTANY_MOD_ID) public static Botany instance; + @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer") public static Proxy proxy; @@ -255,7 +257,7 @@ public class Botany extends AbstractMod { World world = event.getWorld(); EntityPlayer player = event.getEntityPlayer(); ItemStack heldItem = player.getHeldItemMainhand(); - if (!BinnieCore.proxy.isSimulating(event.getWorld())) { + if (!BinnieCore.getBinnieProxy().isSimulating(event.getWorld())) { return; } diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java index 13d822c9..9c07dc19 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java @@ -21,7 +21,6 @@ public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty getColourMixes(boolean p0); diff --git a/src/main/java/binnie/botany/api/IFlowerType.java b/src/main/java/binnie/botany/api/IFlowerType.java index 6e8fa66c..fbcad545 100644 --- a/src/main/java/binnie/botany/api/IFlowerType.java +++ b/src/main/java/binnie/botany/api/IFlowerType.java @@ -13,7 +13,6 @@ public interface IFlowerType> extends Comparable { @SideOnly(Side.CLIENT) void registerModels(Item item, IModelManager manager, EnumFlowerStage type); - @Nonnull @SideOnly(Side.CLIENT) ModelResourceLocation getModel(EnumFlowerStage type, boolean flowered); diff --git a/src/main/java/binnie/botany/api/package-info.java b/src/main/java/binnie/botany/api/package-info.java new file mode 100644 index 00000000..d93958b7 --- /dev/null +++ b/src/main/java/binnie/botany/api/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package binnie.botany.api; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 0504f2a3..ff2f630c 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -57,7 +57,7 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi drops = Collections.singletonList(ceramic.getStack()); } boolean hasBeenBroken = world.setBlockToAir(pos); - if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { + if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { spawnAsEntity(world, pos, drop); } diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 0da98bfd..c61ba700 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -98,7 +98,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored drops = Collections.singletonList(ceramic.getStack()); } boolean hasBeenBroken = world.setBlockToAir(pos); - if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { + if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { spawnAsEntity(world, pos, drop); } diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index 0b03c847..4e3f7d3a 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -10,11 +10,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; public class CeramicTileRecipe implements IRecipe { - ItemStack cached; + @Nullable + private ItemStack cached; @Override public boolean matches(final InventoryCrafting inv, final World world) { @@ -68,9 +70,8 @@ public class CeramicTileRecipe implements IRecipe { return this.cached; } - @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public ItemStack[] getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index 4224e7c0..743044a7 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -13,7 +13,7 @@ import javax.annotation.Nonnull; public class PigmentRecipe implements IRecipe { @Override - public boolean matches(@Nonnull final InventoryCrafting crafting, @Nonnull final World world) { + public boolean matches(final InventoryCrafting crafting, final World world) { return this.getCraftingResult(crafting) != null; } @@ -23,7 +23,7 @@ public class PigmentRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(@Nonnull final InventoryCrafting crafting) { + public ItemStack getCraftingResult(final InventoryCrafting crafting) { int n = 0; ItemStack stack = null; for (int i = 0; i < crafting.getSizeInventory(); ++i) { @@ -47,9 +47,8 @@ public class PigmentRecipe implements IRecipe { return 1; } - @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public ItemStack[] getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index b39c363d..8a176791 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -49,6 +49,7 @@ import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -78,7 +79,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock 0 && (player == null || !player.capabilities.isCreativeMode)) { + if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { spawnAsEntity(world, pos, drop); } @@ -228,7 +229,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock stacks) { if (stacks.size() != 4) { @@ -49,18 +52,21 @@ public enum CeramicBrickType implements IStringSerializable { } }, Brick("brick", "Ceramic Bricks"){ + @Nullable @Override public ItemStack getRecipe(List stacks) { return getBrickRecipe(this, stacks); } }, StripeBrick("brickstripe", "Striped Ceramic Bricks"){ + @Nullable @Override public ItemStack getRecipe(List stacks) { return getBrickRecipe(this, stacks); } }, LargeBrick("bricklarge", "Large Ceramic Bricks"){ + @Nullable @Override public ItemStack getRecipe(List stacks) { if (stacks.size() == 1) { @@ -110,6 +116,7 @@ public enum CeramicBrickType implements IStringSerializable { } }, Split("split", "Split Ceramic Tile"){ + @Nullable @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { @@ -138,6 +145,7 @@ public enum CeramicBrickType implements IStringSerializable { } }, Chequered("cheque", "Chequered Ceramic Tile"){ + @Nullable @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { @@ -168,6 +176,7 @@ public enum CeramicBrickType implements IStringSerializable { } }, Mixed("mixed", "Mixed Ceramic Tile"){ + @Nullable @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { @@ -207,18 +216,21 @@ public enum CeramicBrickType implements IStringSerializable { } }, VerticalBrick("verticalbrick", "Vertical Ceramic Bricks"){ + @Nullable @Override public ItemStack getRecipe(List stacks) { return getVerticalBrickRecipe(stacks); } }, VerticalStripeBrick("verticalbrickstripe", "Vertical Striped Ceramic Bricks"){ + @Nullable @Override public ItemStack getRecipe(List stacks) { return getVerticalBrickRecipe(stacks); } }, VerticalLargeBrick("verticalbricklarge", "Large Vertical Ceramic Bricks"){ + @Nullable @Override public ItemStack getRecipe(List stacks) { return getVerticalBrickRecipe(stacks); @@ -244,9 +256,11 @@ public enum CeramicBrickType implements IStringSerializable { public boolean canDouble() { return this != CeramicBrickType.Tile; } - + + @Nullable public abstract ItemStack getRecipe(List stacks); + @Nullable protected ItemStack getVerticalBrickRecipe(List stacks){ if (stacks.size() != 1) { return null; @@ -267,7 +281,8 @@ public enum CeramicBrickType implements IStringSerializable { } return null; } - + + @Nullable protected ItemStack getBrickRecipe(CeramicBrickType ceramicType, List stacks){ if (stacks.size() == 1) { final ItemStack stack5 = stacks.get(0); diff --git a/src/main/java/binnie/botany/ceramic/brick/package-info.java b/src/main/java/binnie/botany/ceramic/brick/package-info.java new file mode 100644 index 00000000..e1007c1a --- /dev/null +++ b/src/main/java/binnie/botany/ceramic/brick/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.ceramic.brick; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/ceramic/package-info.java b/src/main/java/binnie/botany/ceramic/package-info.java new file mode 100644 index 00000000..e33c02d5 --- /dev/null +++ b/src/main/java/binnie/botany/ceramic/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.ceramic; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/core/package-info.java b/src/main/java/binnie/botany/core/package-info.java new file mode 100644 index 00000000..b80d61cc --- /dev/null +++ b/src/main/java/binnie/botany/core/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.core; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java index 553ff1be..9e438dbf 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java @@ -10,10 +10,11 @@ import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.renderer.RenderUtil; public class ControlColourDisplay extends Control implements IControlValue, ITooltip { - IFlowerColour value; + private IFlowerColour value; - public ControlColourDisplay(final IWidget parent, final int x, final int y) { + public ControlColourDisplay(final IWidget parent, final int x, final int y, final IFlowerColour value) { super(parent, x, y, 16, 16); + this.value = value; this.addAttribute(Attribute.MouseOver); } diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java b/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java index 31ee95ba..9bc93def 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java @@ -1,32 +1,23 @@ package binnie.botany.craftgui; import binnie.botany.api.IColourMix; -import binnie.core.genetics.BreedingSystem; import binnie.craftgui.controls.listbox.ControlList; import binnie.craftgui.controls.listbox.ControlOption; -import binnie.craftgui.mod.database.WindowAbstractDatabase; public class ControlColourMixItem extends ControlOption { - ControlColourDisplay itemWidget1; - ControlColourDisplay itemWidget2; - ControlColourDisplay itemWidget3; - ControlColourMixSymbol addSymbol; - ControlColourMixSymbol arrowSymbol; + private final ControlColourDisplay itemWidget1; + private final ControlColourDisplay itemWidget2; + private final ControlColourDisplay itemWidget3; + private final ControlColourMixSymbol addSymbol; + private final ControlColourMixSymbol arrowSymbol; public ControlColourMixItem(final ControlList controlList, final IColourMix option, final int y) { super(controlList, option, y); - this.itemWidget1 = new ControlColourDisplay(this, 4, 4); - this.itemWidget2 = new ControlColourDisplay(this, 44, 4); - this.itemWidget3 = new ControlColourDisplay(this, 104, 4); - this.addSymbol = new ControlColourMixSymbol(this, 24, 4, 0); - this.arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1); - final BreedingSystem system = ((WindowAbstractDatabase) this.getSuperParent()).getBreedingSystem(); - if (this.getValue() != null) { - this.itemWidget1.setValue(this.getValue().getColourFirst()); - this.itemWidget2.setValue(this.getValue().getColourSecond()); - this.itemWidget3.setValue(this.getValue().getResult()); - this.addSymbol.setValue(this.getValue()); - this.arrowSymbol.setValue(this.getValue()); - } + IColourMix value = this.getValue(); + this.itemWidget1 = new ControlColourDisplay(this, 4, 4, value.getColourFirst()); + this.itemWidget2 = new ControlColourDisplay(this, 44, 4, value.getColourSecond()); + this.itemWidget3 = new ControlColourDisplay(this, 104, 4, value.getResult()); + this.addSymbol = new ControlColourMixSymbol(this, 24, 4, 0, value); + this.arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1, value); } } diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index 25ba3b13..b4f8aae5 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -28,9 +28,9 @@ public class ControlColourMixSymbol extends Control implements ITooltip { } } - protected ControlColourMixSymbol(final IWidget parent, final int x, final int y, final int type) { + protected ControlColourMixSymbol(final IWidget parent, final int x, final int y, final int type, final IColourMix value) { super(parent, x, y, 16 + type * 16, 16); - this.value = null; + this.value = value; this.type = type; this.addAttribute(Attribute.MouseOver); } diff --git a/src/main/java/binnie/botany/craftgui/ControlColourOption.java b/src/main/java/binnie/botany/craftgui/ControlColourOption.java index 1ddb51a2..72eedc15 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourOption.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourOption.java @@ -15,7 +15,7 @@ public class ControlColourOption extends ControlTextOption { public ControlColourOption(final ControlList controlList, final IFlowerColour option, final int y) { super(controlList, option, option.getColourName(), y); this.setSize(new IPoint(this.getSize().x(), 20)); - (this.controlBee = new ControlColourDisplay(this, 2, 2)).setValue(option); + this.controlBee = new ControlColourDisplay(this, 2, 2, option); this.addAttribute(Attribute.MouseOver); CraftGUIUtil.moveWidget(this.textWidget, new IPoint(22, 0)); this.textWidget.setSize(this.textWidget.getSize().sub(new IPoint(24, 0))); diff --git a/src/main/java/binnie/botany/craftgui/package-info.java b/src/main/java/binnie/botany/craftgui/package-info.java new file mode 100644 index 00000000..8494b341 --- /dev/null +++ b/src/main/java/binnie/botany/craftgui/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.craftgui; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index 4ce2916a..e4c5d34e 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -5,7 +5,7 @@ import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; -import binnie.botany.api.gardening.IBlockSoil; +import binnie.botany.api.IBlockSoil; import binnie.botany.flower.TileEntityFlower; import binnie.botany.gardening.Gardening; import forestry.api.farming.FarmDirection; diff --git a/src/main/java/binnie/botany/farm/package-info.java b/src/main/java/binnie/botany/farm/package-info.java new file mode 100644 index 00000000..67737cee --- /dev/null +++ b/src/main/java/binnie/botany/farm/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.farm; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 24fc30cd..e067f5de 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -110,7 +110,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { super.onBlockPlacedBy(world, pos, state, placer, stack); final TileEntity flower = world.getTileEntity(pos); - if (!BinnieCore.proxy.isSimulating(world)) { + if (!BinnieCore.getBinnieProxy().isSimulating(world)) { if (flower != null && flower instanceof TileEntityFlower) { final IFlower f = BotanyCore.getFlowerRoot().getMember(stack); ((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower)); @@ -258,7 +258,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { final List drops = this.getDrops(world, pos, world.getBlockState(pos), 0); final boolean hasBeenBroken = world.setBlockToAir(pos); - if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { + if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (final ItemStack drop : drops) { spawnAsEntity(world, pos, drop); } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 4d4376fc..214ba2d9 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -21,6 +21,7 @@ import forestry.core.items.IColoredItem; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; @@ -103,7 +104,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister list.add(TextFormatting.YELLOW + colorInfo.replaceAll("%PRIMARY", primaryColor).replaceAll("%SECONDARY", secondaryColor).replaceAll("%STEM", stemColor)); if (individual.isAnalyzed()) { - if (BinnieCore.proxy.isShiftDown()) { + if (GuiScreen.isShiftKeyDown()) { individual.addTooltip(list); } else { list.add(TextFormatting.ITALIC + "<" + Binnie.LANGUAGE.localise("for.gui.tooltip.tmi") + ">"); diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index e1239ffa..1aaca873 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -312,7 +312,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public void setSection(final int i) { this.section = i; - if (BinnieCore.proxy.isSimulating(this.worldObj)) { + if (BinnieCore.getBinnieProxy().isSimulating(this.worldObj)) { this.updateRender(true); } } diff --git a/src/main/java/binnie/botany/flower/package-info.java b/src/main/java/binnie/botany/flower/package-info.java new file mode 100644 index 00000000..bf13bbc3 --- /dev/null +++ b/src/main/java/binnie/botany/flower/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.flower; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index f3a384d1..e97dbd81 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -3,7 +3,7 @@ package binnie.botany.gardening; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumSoilType; -import binnie.botany.api.gardening.IBlockSoil; +import binnie.botany.api.IBlockSoil; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import net.minecraft.block.Block; diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index fc6d25b7..10958238 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -6,7 +6,7 @@ import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; -import binnie.botany.api.gardening.IBlockSoil; +import binnie.botany.api.IBlockSoil; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import net.minecraft.block.Block; diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index a81965a2..ed867619 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -5,7 +5,7 @@ import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; import binnie.botany.api.IFlower; -import binnie.botany.api.gardening.IBlockSoil; +import binnie.botany.api.IBlockSoil; import binnie.botany.flower.TileEntityFlower; import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; @@ -114,7 +114,7 @@ public class Gardening { } public static void tryGrowSection(final World world, final BlockPos pos) { - if (!BinnieCore.proxy.isSimulating(world)) { + if (!BinnieCore.getBinnieProxy().isSimulating(world)) { return; } final TileEntity flower = world.getTileEntity(pos); diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 64434045..994485e0 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -4,7 +4,7 @@ import binnie.Binnie; import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; -import binnie.botany.api.gardening.IBlockSoil; +import binnie.botany.api.IBlockSoil; import binnie.core.BinnieCore; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; @@ -49,7 +49,7 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { pos = pos.down(); block = world.getBlockState(pos).getBlock(); } - if (Gardening.isSoil(block) && !BinnieCore.proxy.isSimulating(world)) { + if (Gardening.isSoil(block) && !BinnieCore.getBinnieProxy().isSimulating(world)) { IBlockSoil soil = (IBlockSoil) block; String info = Binnie.LANGUAGE.localise("botany.soil.type") + ": "; info = info + soil.getType(world, pos).getTranslated(true); diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 76257934..3e5ac416 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -84,7 +84,7 @@ public class ModuleGardening implements IInitializable { Botany.proxy.registerItem(Botany.clay); Botany.ceramic = new BlockCeramic(); Botany.proxy.registerBlock(Botany.ceramic, new ItemCeramic(Botany.ceramic)); - BinnieCore.proxy.registerTileEntity(TileCeramic.class, "botany.tile.ceramic"); + BinnieCore.getBinnieProxy().registerTileEntity(TileCeramic.class, "botany.tile.ceramic"); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramic), new ItemMetadataRenderer()); Botany.stained = new BlockStainedGlass(); Botany.proxy.registerBlock(Botany.stained, new ItemStainedGlass(Botany.stained)); @@ -94,7 +94,7 @@ public class ModuleGardening implements IInitializable { Botany.ceramicBrick = new BlockCeramicBrick(); Botany.proxy.registerBlock(Botany.ceramicBrick, new ItemCeramicBrick(Botany.ceramicBrick)); GameRegistry.registerTileEntity(TileCeramicBrick.class, ""); - BinnieCore.proxy.registerTileEntity(TileCeramicBrick.class, "botany.tile.ceramicBrick"); + BinnieCore.getBinnieProxy().registerTileEntity(TileCeramicBrick.class, "botany.tile.ceramicBrick"); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer()); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer()); } diff --git a/src/main/java/binnie/botany/gardening/package-info.java b/src/main/java/binnie/botany/gardening/package-info.java new file mode 100644 index 00000000..4168ff23 --- /dev/null +++ b/src/main/java/binnie/botany/gardening/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.gardening; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java index 03dad047..70b137b9 100644 --- a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java @@ -20,22 +20,19 @@ import javax.annotation.Nonnull; public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerSpecies, IAlleleFlowerSpeciesBuilder { - @Nonnull private final IFlowerType flowerType; - @Nonnull private EnumAcidity acidity = EnumAcidity.Neutral; - @Nonnull private EnumMoisture moisture = EnumMoisture.Normal; public AlleleFlowerSpecies( - @Nonnull String uid, - @Nonnull String unlocalizedName, - @Nonnull String authority, - @Nonnull String unlocalizedDescription, + String uid, + String unlocalizedName, + String authority, + String unlocalizedDescription, boolean isDominant, - @Nonnull IClassification branch, - @Nonnull String binomial, - @Nonnull IFlowerType flowerType) { + IClassification branch, + String binomial, + IFlowerType flowerType) { super(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial); this.flowerType = flowerType; } @@ -58,7 +55,6 @@ public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerS return this; } - @Nonnull @Override public ISpeciesRoot getRoot() { return BotanyCore.getFlowerRoot(); diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index 32ab7980..1a6c5fbe 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -16,6 +16,7 @@ import forestry.core.genetics.Individual; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.common.util.Constants; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -23,7 +24,6 @@ import java.util.List; import java.util.Random; public class Flower extends Individual implements IFlower { - @Nonnull public IFlowerGenome genome; @Nullable public IFlowerGenome mate; @@ -31,34 +31,29 @@ public class Flower extends Individual implements IFlower { private boolean wilting; private boolean flowered; - public Flower(@Nonnull final NBTTagCompound nbt) { + public Flower(final NBTTagCompound nbt) { super(nbt); - if (nbt == null) { - this.genome = BotanyCore.getFlowerRoot().templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate()); - return; - } + if (nbt.hasKey("Age")) { this.age = nbt.getInteger("Age"); } else { this.age = 0; } - if (nbt.hasKey("Wilt")) { - this.wilting = nbt.getBoolean("Wilt"); - } else { - this.wilting = false; - } + + this.wilting = nbt.hasKey("Wilt") && nbt.getBoolean("Wilt"); + if (nbt.hasKey("Flowered")) { this.flowered = nbt.getBoolean("Flowered"); } else { - if (age > 0) { - this.flowered = true; - } else { - this.flowered = false; - } + this.flowered = age > 0; } + if (nbt.hasKey("Genome")) { this.genome = new FlowerGenome(nbt.getCompoundTag("Genome")); + } else { + this.genome = BotanyCore.getFlowerRoot().templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate()); } + if (nbt.hasKey("Mate")) { this.mate = new FlowerGenome(nbt.getCompoundTag("Mate")); } @@ -69,20 +64,13 @@ public class Flower extends Individual implements IFlower { this.wilting = false; this.genome = genome; this.age = age; - if (age > 0) { - this.flowered = true; - } else { - this.flowered = false; - } + this.flowered = age > 0; } @Override public String getDisplayName() { final IAlleleFlowerSpecies species = this.getGenome().getPrimary(); - String name = ""; - if (species != null) { - name += species.getName(); - } + String name = species.getName(); if (this.age == 0) { name += ""; } @@ -114,15 +102,13 @@ public class Flower extends Individual implements IFlower { nbttagcompound.setInteger("Age", this.age); nbttagcompound.setBoolean("Wilt", this.wilting); nbttagcompound.setBoolean("Flowered", this.flowered); - if (this.genome != null) { - final NBTTagCompound NBTmachine = new NBTTagCompound(); - this.genome.writeToNBT(NBTmachine); - nbttagcompound.setTag("Genome", NBTmachine); - } + final NBTTagCompound nbtGenome = new NBTTagCompound(); + this.genome.writeToNBT(nbtGenome); + nbttagcompound.setTag("Genome", nbtGenome); if (this.mate != null) { - final NBTTagCompound NBTmachine = new NBTTagCompound(); - this.mate.writeToNBT(NBTmachine); - nbttagcompound.setTag("Mate", NBTmachine); + final NBTTagCompound nbtMate = new NBTTagCompound(); + this.mate.writeToNBT(nbtMate); + nbttagcompound.setTag("Mate", nbtMate); } return nbttagcompound; } @@ -157,6 +143,7 @@ public class Flower extends Individual implements IFlower { } @Override + @Nullable public IFlowerGenome getMate() { return this.mate; } @@ -217,17 +204,21 @@ public class Flower extends Individual implements IFlower { @Override public IFlower getOffspring(final World world, final BlockPos pos) { - final IChromosome[] chromosomes = new IChromosome[this.genome.getChromosomes().length]; - IChromosome[] parentFirst = this.genome.getChromosomes(); - IChromosome[] parentSecond = this.mate.getChromosomes(); - parentFirst = this.mutateSpecies(world, pos, this.genome, this.mate); - parentSecond = this.mutateSpecies(world, pos, this.mate, this.genome); - for (int i = 0; i < parentFirst.length; ++i) { - if (parentFirst[i] != null && parentSecond[i] != null) { - chromosomes[i] = Chromosome.inheritChromosome(world.rand, parentFirst[i], parentSecond[i]); + if (this.mate != null) { + final IChromosome[] chromosomes = new IChromosome[this.genome.getChromosomes().length]; + IChromosome[] parentFirst = this.mutateSpecies(world, pos, this.genome, this.mate); + IChromosome[] parentSecond = this.mutateSpecies(world, pos, this.mate, this.genome); + for (int i = 0; i < parentFirst.length; ++i) { + if (parentFirst[i] != null && parentSecond[i] != null) { + chromosomes[i] = Chromosome.inheritChromosome(world.rand, parentFirst[i], parentSecond[i]); + } } + return new Flower(new FlowerGenome(chromosomes), 0); + } else { + NBTTagCompound nbt = new NBTTagCompound(); + writeToNBT(nbt); + return new Flower(nbt); } - return new Flower(new FlowerGenome(chromosomes), 0); } private IChromosome[] mutateSpecies(World world, BlockPos pos, IFlowerGenome genomeFirst, IFlowerGenome genomeSecond) { diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index a9b7dd5c..d3040369 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -52,16 +52,16 @@ public class FlowerBreedingSystem extends BreedingSystem { public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (chromosome == EnumFlowerChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.low"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.normal"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.high"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.maximum"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.maximum"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/botany/genetics/FlowerRoot.java b/src/main/java/binnie/botany/genetics/FlowerRoot.java index 3cce6c9f..71d14ed0 100644 --- a/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -254,6 +255,7 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { } @Override + @Nullable public IFlower getConversion(final ItemStack itemstack) { for (final Map.Entry entry : this.conversions.entrySet()) { if (entry.getKey().isItemEqual(itemstack)) { diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index d250af1c..f3a7bdad 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -30,7 +30,7 @@ public class ModuleGenetics implements IInitializable { Botany.flower = new BlockFlower(); Botany.proxy.registerBlock(Botany.flower); - BinnieCore.proxy.registerTileEntity(TileEntityFlower.class, "botany.tile.flower", null); + BinnieCore.getBinnieProxy().registerTileEntity(TileEntityFlower.class, "botany.tile.flower", null); Botany.flowerItem = new ItemBotany("itemFlower", EnumFlowerStage.FLOWER, ""); Botany.pollen = new ItemBotany("pollen", EnumFlowerStage.POLLEN, "pollen"); diff --git a/src/main/java/binnie/botany/genetics/package-info.java b/src/main/java/binnie/botany/genetics/package-info.java new file mode 100644 index 00000000..079e14ec --- /dev/null +++ b/src/main/java/binnie/botany/genetics/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.genetics; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/items/package-info.java b/src/main/java/binnie/botany/items/package-info.java new file mode 100644 index 00000000..e65b0b82 --- /dev/null +++ b/src/main/java/binnie/botany/items/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.items; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index 1a42a20a..2372b961 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -22,7 +22,7 @@ public enum PacketID implements IPacketID { if (this == PacketID.FIELDKIT && context.side == Side.CLIENT) { MessageNBT packet = new MessageNBT(message); NBTTagCompound data = packet.getTagCompound(); - EntityPlayer player = BinnieCore.proxy.getPlayer(); + EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); String info = ""; if (data.hasNoTags()) { info += Binnie.LANGUAGE.localise("botany.flowers.species.not.discover"); diff --git a/src/main/java/binnie/botany/network/package-info.java b/src/main/java/binnie/botany/network/package-info.java new file mode 100644 index 00000000..7fb44fd5 --- /dev/null +++ b/src/main/java/binnie/botany/network/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.network; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/package-info.java b/src/main/java/binnie/botany/package-info.java new file mode 100644 index 00000000..319ffc61 --- /dev/null +++ b/src/main/java/binnie/botany/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/proxy/package-info.java b/src/main/java/binnie/botany/proxy/package-info.java new file mode 100644 index 00000000..4e28bc7d --- /dev/null +++ b/src/main/java/binnie/botany/proxy/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.proxy; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 916f8ca4..95d7791f 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -7,15 +7,18 @@ import binnie.core.network.IPacketID; import binnie.core.network.IPacketProvider; import binnie.core.network.packet.MessageBinnie; import binnie.core.proxy.IProxyCore; +import com.google.common.base.Preconditions; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; public abstract class AbstractMod implements IPacketProvider, IInitializable { + @Nullable private SimpleNetworkWrapper wrapper; protected List modules; @@ -50,6 +53,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { public abstract String getModID(); public SimpleNetworkWrapper getNetworkWrapper() { + Preconditions.checkState(wrapper != null, "Tried to get network wrapper before it has been init."); return this.wrapper; } @@ -80,7 +84,8 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { return; } this.getProxy().init(); - (this.wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(this.getChannel())).registerMessage(this.getPacketHandler(), MessageBinnie.class, 1, Side.CLIENT); + this.wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(this.getChannel()); + this.wrapper.registerMessage(this.getPacketHandler(), MessageBinnie.class, 1, Side.CLIENT); this.wrapper.registerMessage(this.getPacketHandler(), MessageBinnie.class, 1, Side.SERVER); for (final IInitializable module : this.modules) { module.init(); diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index ffcc6af8..78cb1695 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -19,10 +19,13 @@ import binnie.core.models.ModelManager; import binnie.core.network.BinnieCorePacketID; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; +import binnie.core.proxy.BinnieModProxy; import binnie.core.proxy.BinnieProxy; +import binnie.core.proxy.IBinnieModProxy; import binnie.core.proxy.IBinnieProxy; import binnie.core.triggers.ModuleTrigger; import binnie.craftgui.minecraft.ModuleCraftGUI; +import com.google.common.base.Preconditions; import forestry.api.core.ForestryEvent; import forestry.plugins.PluginManager; import net.minecraft.entity.player.EntityPlayerMP; @@ -45,6 +48,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -55,15 +59,54 @@ public final class BinnieCore extends AbstractMod { FluidRegistry.enableUniversalBucket(); } + @SuppressWarnings("NullableProblems") @Mod.Instance(Constants.CORE_MOD_ID) - public static BinnieCore instance; + private static BinnieCore instance; + + @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer") - public static BinnieProxy proxy; + private static BinnieProxy proxy; + public static int multipassRenderID; - private static List modList = new ArrayList<>(); - public static MachineGroup packageCompartment; - public static ItemGenesis genesis; - public static ItemFieldKit fieldKit; + private static final List modList = new ArrayList<>(); + + @Nullable + private static MachineGroup packageCompartment; + @Nullable + private static ItemGenesis genesis; + @Nullable + private static ItemFieldKit fieldKit; + + public static MachineGroup getPackageCompartment() { + Preconditions.checkState(packageCompartment != null, "packageCompartment has not been init"); + return packageCompartment; + } + + public static void setPackageCompartment(MachineGroup packageCompartment) { + BinnieCore.packageCompartment = packageCompartment; + } + + public static ItemGenesis getGenesis() { + Preconditions.checkState(genesis != null, "genesis has not been init"); + return genesis; + } + + public static void setGenesis(ItemGenesis genesis) { + BinnieCore.genesis = genesis; + } + + public static ItemFieldKit getFieldKit() { + Preconditions.checkState(fieldKit != null, "fieldKit has not been init"); + return fieldKit; + } + + public static void setFieldKit(ItemFieldKit fieldKit) { + BinnieCore.fieldKit = fieldKit; + } + + public static BinnieCore getInstance() { + return instance; + } @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { @@ -71,7 +114,7 @@ public final class BinnieCore extends AbstractMod { Binnie.CONFIGURATION.registerConfiguration(ConfigurationMods.class, this); for (FluidContainerType container : FluidContainerType.getBinnieContainers()) { Item item = new ItemFluidContainer(container); - BinnieCore.proxy.registerItem(item); + getProxy().registerItem(item); } this.preInit(); } @@ -115,7 +158,11 @@ public final class BinnieCore extends AbstractMod { @Override public IBinnieProxy getProxy() { - return BinnieCore.proxy; + return proxy; + } + + public static BinnieProxy getBinnieProxy() { + return proxy; } @Override @@ -176,7 +223,7 @@ public final class BinnieCore extends AbstractMod { public static class PacketHandler extends BinniePacketHandler { public PacketHandler() { - super(BinnieCore.instance); + super(BinnieCore.getInstance()); } } diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index ace429e8..b8a7a415 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -77,8 +77,7 @@ public class Mods { super(id); } - @Nonnull - @Override + @Override public Item item(final String name) { Item item = super.item(name); if (item == null) { @@ -87,8 +86,7 @@ public class Mods { return item; } - @Nonnull - @Override + @Override public Block block(final String name) { Block block = super.block(name); if (block == null) { @@ -97,22 +95,19 @@ public class Mods { return block; } - @Nonnull - @Override + @Override public ItemStack stack(final String name) { Item item = this.item(name); return new ItemStack(item); } - @Nonnull - @Override + @Override public ItemStack stack(final String name, final int amount) { Item item = this.item(name); return new ItemStack(item, amount); } - @Nonnull - @Override + @Override public ItemStack stack(final String name, final int amount, final int meta) { Item item = this.item(name); return new ItemStack(item, amount, meta); diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index c8d57774..31ed13a5 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -93,7 +93,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { drops = block.getDrops(world, pos, world.getBlockState(pos), 0); } boolean hasBeenBroken = world.setBlockToAir(pos); - if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { + if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for(ItemStack drop : drops) { spawnAsEntity(world, pos, drop); } diff --git a/src/main/java/binnie/core/block/package-info.java b/src/main/java/binnie/core/block/package-info.java new file mode 100644 index 00000000..ca45c4a6 --- /dev/null +++ b/src/main/java/binnie/core/block/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.block; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java index 18882907..14b36273 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java @@ -9,39 +9,32 @@ import forestry.api.circuits.ICircuitSocketType; import javax.annotation.Nonnull; public class BinnieCircuitLayout implements ICircuitLayout { - @Nonnull private final String uid; - @Nonnull private final AbstractMod mod; - @Nonnull private final ICircuitSocketType socketType; - public BinnieCircuitLayout(@Nonnull final AbstractMod mod, @Nonnull final String uid, @Nonnull final ICircuitSocketType socketType) { + public BinnieCircuitLayout(final AbstractMod mod, final String uid, final ICircuitSocketType socketType) { this.uid = uid; this.mod = mod; this.socketType = socketType; ChipsetManager.circuitRegistry.registerLayout(this); } - @Nonnull @Override public String getUID() { return "binnie.circuitLayout" + this.uid; } - @Nonnull @Override public String getName() { return Binnie.LANGUAGE.localise(this.mod, "circuit.layout." + this.uid.toLowerCase()); } - @Nonnull @Override public String getUsage() { return Binnie.LANGUAGE.localise(this.mod, "circuit.layout." + this.uid.toLowerCase() + ".usage"); } - @Nonnull @Override public ICircuitSocketType getSocketType() { return this.socketType; diff --git a/src/main/java/binnie/core/circuits/package-info.java b/src/main/java/binnie/core/circuits/package-info.java new file mode 100644 index 00000000..a95770ed --- /dev/null +++ b/src/main/java/binnie/core/circuits/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.circuits; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index 36824d9d..8c36d594 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -56,16 +56,16 @@ class BeeBreedingSystem extends BreedingSystem { public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (chromosome == EnumBeeChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.low"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.normal"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.high"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.maximum"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.maximum"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 5da0f639..0dd213db 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -24,6 +24,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -71,11 +72,11 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public String getChromosomeName(final IChromosomeType chromo) { - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); + return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); } public String getChromosomeShortName(final IChromosomeType chromo) { - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); + return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); } public final String getEpitome(final float discoveredPercentage) { @@ -95,7 +96,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } else if (discoveredPercentage < 1.0f) { i = 5; } - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".epitome." + i); + return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".epitome." + i); } public abstract ISpeciesRoot getSpeciesRoot(); @@ -405,7 +406,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public final String getDescriptor() { - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".descriptor"); + return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".descriptor"); } public final String getIdent() { @@ -425,16 +426,16 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (allele instanceof IAlleleBoolean) { - return ((IAlleleBoolean) allele).getValue() ? Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.true") : Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.false"); + return ((IAlleleBoolean) allele).getValue() ? Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.true") : Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.false"); } if (Objects.equals(allele.getName(), "for.gui.maximum")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.maximum"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.maximum"); } return allele.getName(); } public String getName() { - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".shortName"); + return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".shortName"); } @Override @@ -452,6 +453,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { public abstract boolean isDNAManipulable(final ISpeciesType type); + @Nullable public IIndividual getConversion(final ItemStack stack) { return null; } diff --git a/src/main/java/binnie/core/genetics/EnumBeeModifier.java b/src/main/java/binnie/core/genetics/EnumBeeModifier.java index ef23cece..2fb45d68 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeModifier.java @@ -12,6 +12,6 @@ public enum EnumBeeModifier { GeneticDecay; public String getName() { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "beemodifier." + this.name().toLowerCase()); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "beemodifier." + this.name().toLowerCase()); } } diff --git a/src/main/java/binnie/core/genetics/Gene.java b/src/main/java/binnie/core/genetics/Gene.java index 3863dd04..003f22d9 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/src/main/java/binnie/core/genetics/Gene.java @@ -2,15 +2,14 @@ package binnie.core.genetics; import binnie.Binnie; import binnie.genetics.api.IGene; -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; +import com.google.common.base.Preconditions; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.nbt.NBTTagCompound; -public class Gene implements IGene, INbtReadable, INbtWritable { +public class Gene implements IGene { private IAllele allele; private IChromosomeType chromosome; private ISpeciesRoot root; @@ -32,17 +31,26 @@ public class Gene implements IGene, INbtReadable, INbtWritable { } public Gene(final NBTTagCompound nbt) { - this.readFromNBT(nbt); + this.allele = AlleleManager.alleleRegistry.getAllele(nbt.getString("allele")); + String rootKey = nbt.getString("root"); + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(rootKey); + Preconditions.checkArgument(root != null, "Could not find root: %s", rootKey); + this.root = root; + final int chromoID = nbt.getByte("chromo"); + Preconditions.checkArgument(chromoID >= 0 && chromoID < this.root.getKaryotype().length, "Invalid chromosomeId: %s", chromoID); + this.chromosome = this.root.getKaryotype()[chromoID]; } @Override public void readFromNBT(final NBTTagCompound nbt) { this.allele = AlleleManager.alleleRegistry.getAllele(nbt.getString("allele")); - this.root = AlleleManager.alleleRegistry.getSpeciesRoot(nbt.getString("root")); + String rootKey = nbt.getString("root"); + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(rootKey); + Preconditions.checkArgument(root != null, "Could not find root: %s", rootKey); + this.root = root; final int chromoID = nbt.getByte("chromo"); - if (this.root != null && chromoID >= 0 && chromoID < this.root.getKaryotype().length) { - this.chromosome = this.root.getKaryotype()[chromoID]; - } + Preconditions.checkArgument(chromoID >= 0 && chromoID < this.root.getKaryotype().length, "Invalid chromosomeId: %s", chromoID); + this.chromosome = this.root.getKaryotype()[chromoID]; } @Override @@ -53,18 +61,12 @@ public class Gene implements IGene, INbtReadable, INbtWritable { return nbt; } - public boolean isCorrupted() { - return this.allele == null || this.chromosome == null || this.root == null; - } - public static Gene create(final NBTTagCompound nbt) { - final Gene gene = new Gene(nbt); - return gene.isCorrupted() ? null : gene; + return new Gene(nbt); } public static Gene create(final IAllele allele, final IChromosomeType chromosome, final ISpeciesRoot root) { - final Gene gene = new Gene(allele, chromosome, root); - return gene.isCorrupted() ? null : gene; + return new Gene(allele, chromosome, root); } @Override diff --git a/src/main/java/binnie/core/genetics/IBreedingMessage.java b/src/main/java/binnie/core/genetics/IBreedingMessage.java index 6f90d200..74e377ff 100644 --- a/src/main/java/binnie/core/genetics/IBreedingMessage.java +++ b/src/main/java/binnie/core/genetics/IBreedingMessage.java @@ -35,7 +35,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.breedingmessage.species"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.breedingmessage.species"); } @Override @@ -70,7 +70,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.breedingmessage.branch"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.breedingmessage.branch"); } @Override @@ -95,7 +95,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.breedingmessage.epithet"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.breedingmessage.epithet"); } @Override diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 82576b96..d30e932b 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -6,6 +6,7 @@ import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.genetics.FlowerBreedingSystem; import binnie.core.BinnieCore; import binnie.core.ManagerBase; +import com.google.common.base.Preconditions; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeRoot; import forestry.api.arboriculture.ITreeRoot; @@ -101,18 +102,15 @@ public class ManagerGenetics extends ManagerBase { return null; } - @Nullable public BreedingSystem getSystem(final ISpeciesRoot root) { - return this.getSystem(root.getUID()); + String rootUID = root.getUID(); + BreedingSystem system = this.getSystem(rootUID); + Preconditions.checkState(system != null, "Could not find system for species root %s", rootUID); + return system; } public ISpeciesRoot getSpeciesRoot(final IAlleleSpecies species) { - for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - if (root.getKaryotype()[0].getAlleleClass().isInstance(species)) { - return root; - } - } - return null; + return species.getRoot(); } public IAllele getToleranceAllele(final EnumTolerance tol) { @@ -131,6 +129,7 @@ public class ManagerGenetics extends ManagerBase { this.BREEDING_SYSTEMS.put(system.getSpeciesRoot(), system); } + @Nullable public BreedingSystem getConversionSystem(final ItemStack stack) { for (final BreedingSystem system : this.getActiveSystems()) { if (system.getConversion(stack) != null) { @@ -140,11 +139,13 @@ public class ManagerGenetics extends ManagerBase { return null; } + @Nullable public ItemStack getConversionStack(final ItemStack stack) { final BreedingSystem system = this.getConversionSystem(stack); return (system == null) ? null : system.getConversionStack(stack); } + @Nullable public IIndividual getConversion(final ItemStack stack) { final BreedingSystem system = this.getConversionSystem(stack); return (system == null) ? null : system.getConversion(stack); diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 12d1cde8..729db8d1 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -49,24 +49,24 @@ class MothBreedingSystem extends BreedingSystem { if (chromosome == EnumButterflyChromosome.METABOLISM) { final int metabolism = ((IAlleleInteger) allele).getValue(); if (metabolism >= 19) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.highest"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.highest"); } if (metabolism >= 16) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.higher"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.higher"); } if (metabolism >= 13) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.high"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.high"); } if (metabolism >= 10) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.normal"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.normal"); } if (metabolism >= 7) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.slow"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.slow"); } if (metabolism >= 4) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.slower"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.slower"); } - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.slowest"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.slowest"); } else { if (chromosome == EnumButterflyChromosome.FERTILITY) { final int metabolism = ((IAlleleInteger) allele).getValue(); diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 42044abe..e492ba96 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -32,6 +32,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; @@ -86,18 +87,18 @@ public class TreeBreedingSystem extends BreedingSystem { } if (chromosome == EnumTreeChromosome.PLANT) { final EnumSet types = ((IAllelePlantType) allele).getPlantTypes(); - return types.isEmpty() ? Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.none") : types.iterator().next().toString(); + return types.isEmpty() ? Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.none") : types.iterator().next().toString(); } if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) { final IFruitProvider provider = ((IAlleleFruit) allele).getProvider(); - return (provider.getProducts().size() == 0) ? Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.none") : provider.getProducts().keySet().iterator().next().getDisplayName(); + return (provider.getProducts().size() == 0) ? Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.none") : provider.getProducts().keySet().iterator().next().getDisplayName(); } if (chromosome == EnumTreeChromosome.GROWTH) { if (allele.getUID().contains("Tropical")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.growth.tropical"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.growth.tropical"); } if (allele.getUID().contains("Lightlevel")) { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.growth.lightlevel"); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.growth.lightlevel"); } } return super.getAlleleName(chromosome, allele); @@ -240,10 +241,8 @@ public class TreeBreedingSystem extends BreedingSystem { } @Override + @Nullable public IIndividual getConversion(final ItemStack stack) { - if (stack == null) { - return null; - } // for (final Map.Entry entry : TreeManager.treeRoot.getIndividualTemplates()) { // if (ItemStack.areItemStacksEqual(stack, entry.getKey())) { // return entry.getValue(); diff --git a/src/main/java/binnie/core/genetics/package-info.java b/src/main/java/binnie/core/genetics/package-info.java new file mode 100644 index 00000000..d3d29577 --- /dev/null +++ b/src/main/java/binnie/core/genetics/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.genetics; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/src/main/java/binnie/core/gui/BinnieGUIHandler.java index d0812311..4565ab1b 100644 --- a/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -27,7 +27,7 @@ public final class BinnieGUIHandler implements IGuiHandler { @Override public final Object getClientGuiElement(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z) { - if (BinnieCore.proxy.isSimulating(world)) { + if (BinnieCore.getBinnieProxy().isSimulating(world)) { return this.getServerGuiElement(id, player, world, x, y, z); } final Window window = this.getWindow(id, player, world, x, y, z, Side.CLIENT); diff --git a/src/main/java/binnie/core/gui/package-info.java b/src/main/java/binnie/core/gui/package-info.java new file mode 100644 index 00000000..9fda53c8 --- /dev/null +++ b/src/main/java/binnie/core/gui/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/integration/jei/Drawables.java b/src/main/java/binnie/core/integration/jei/Drawables.java index 7d5e6551..2aaf959c 100644 --- a/src/main/java/binnie/core/integration/jei/Drawables.java +++ b/src/main/java/binnie/core/integration/jei/Drawables.java @@ -6,7 +6,10 @@ import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableStatic; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nullable; + public class Drawables { + @Nullable private static Drawables INSTANCE; public static Drawables getDrawables(IGuiHelper guiHelper) { diff --git a/src/main/java/binnie/core/integration/jei/package-info.java b/src/main/java/binnie/core/integration/jei/package-info.java index 983a63d0..ea2e1a1c 100644 --- a/src/main/java/binnie/core/integration/jei/package-info.java +++ b/src/main/java/binnie/core/integration/jei/package-info.java @@ -1,7 +1,9 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault package binnie.core.integration.jei; +import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index 63600fda..79bae04c 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -66,7 +66,7 @@ public class ItemFieldKit extends ItemCore { @Override public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { if (!player.isSneaking() && hand == EnumHand.MAIN_HAND) { - BinnieCore.proxy.openGui(BinnieCoreGUI.FieldKit, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + BinnieCore.getBinnieProxy().openGui(BinnieCoreGUI.FieldKit, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); } return super.onItemRightClick(itemStack, world, player, hand); } diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index e98fb5c0..7ce98fe1 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -22,7 +22,7 @@ public class ItemGenesis extends ItemCore { @Override public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { - BinnieCore.proxy.openGui(BinnieCoreGUI.Genesis, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + BinnieCore.getBinnieProxy().openGui(BinnieCoreGUI.Genesis, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); return new ActionResult<>(EnumActionResult.SUCCESS, itemStack); } diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index b52b5886..694d7e0f 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -24,7 +24,7 @@ public class ItemMisc extends ItemCore { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull final Item itemIn, final CreativeTabs creativeTabs, List subItems) { + public void getSubItems(final Item itemIn, final CreativeTabs creativeTabs, List subItems) { for (IItemMiscProvider item : this.items) { if (item.isActive()) { subItems.add(this.getStack(item, 1)); @@ -32,7 +32,6 @@ public class ItemMisc extends ItemCore { } } - @Nonnull private IItemMiscProvider getItem(int damage) { return (damage >= this.items.length) ? this.items[0] : this.items[damage]; } @@ -57,9 +56,8 @@ public class ItemMisc extends ItemCore { } } - @Nonnull @Override - public String getItemStackDisplayName(@Nonnull final ItemStack stack) { + public String getItemStackDisplayName(final ItemStack stack) { IItemMiscProvider item = this.getItem(stack.getItemDamage()); return item.getName(stack); } diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 878ca388..3873d9ed 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -23,10 +23,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ModuleItems implements IInitializable { @Override public void preInit() { - BinnieCore.fieldKit = new ItemFieldKit(); - BinnieCore.proxy.registerItem(BinnieCore.fieldKit); - BinnieCore.genesis = new ItemGenesis(); - BinnieCore.proxy.registerItem(BinnieCore.genesis); + BinnieCore.setFieldKit(new ItemFieldKit()); + BinnieCore.getBinnieProxy().registerItem(BinnieCore.getFieldKit()); + BinnieCore.setGenesis(new ItemGenesis()); + BinnieCore.getBinnieProxy().registerItem(BinnieCore.getGenesis()); } @Override @@ -35,7 +35,7 @@ public class ModuleItems implements IInitializable { @Override public void postInit() { - GameRegistry.addRecipe(new ItemStack(BinnieCore.fieldKit, 1, 63), "g ", " is", " pi", 'g', Blocks.GLASS_PANE, 'i', Items.IRON_INGOT, 'p', Items.PAPER, 's', new ItemStack(Items.DYE, 1)); + GameRegistry.addRecipe(new ItemStack(BinnieCore.getFieldKit(), 1, 63), "g ", " is", " pi", 'g', Blocks.GLASS_PANE, 'i', Items.IRON_INGOT, 'p', Items.PAPER, 's', new ItemStack(Items.DYE, 1)); } @SubscribeEvent @@ -50,7 +50,7 @@ public class ModuleItems implements IInitializable { if (player != null) { ItemStack heldItem = player.getHeldItemMainhand(); - if (heldItem != null && heldItem.getItem() == BinnieCore.fieldKit && player.isSneaking()) { + if (heldItem != null && heldItem.getItem() == BinnieCore.getFieldKit() && player.isSneaking()) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityFlower) { TileEntityFlower tileFlower = (TileEntityFlower) tile; diff --git a/src/main/java/binnie/core/item/package-info.java b/src/main/java/binnie/core/item/package-info.java new file mode 100644 index 00000000..50a2ccf6 --- /dev/null +++ b/src/main/java/binnie/core/item/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.item; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/language/package-info.java b/src/main/java/binnie/core/language/package-info.java new file mode 100644 index 00000000..1a387e7e --- /dev/null +++ b/src/main/java/binnie/core/language/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.language; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/liquid/FluidContainerType.java b/src/main/java/binnie/core/liquid/FluidContainerType.java index 2082a86e..ff72b732 100644 --- a/src/main/java/binnie/core/liquid/FluidContainerType.java +++ b/src/main/java/binnie/core/liquid/FluidContainerType.java @@ -35,7 +35,7 @@ public enum FluidContainerType { } public String getDisplayName() { - return BinnieCore.proxy.localise("item.container." + this.name().toLowerCase()); + return BinnieCore.getBinnieProxy().localise("item.container." + this.name().toLowerCase()); } public boolean isActive() { diff --git a/src/main/java/binnie/core/liquid/package-info.java b/src/main/java/binnie/core/liquid/package-info.java new file mode 100644 index 00000000..a8e21ded --- /dev/null +++ b/src/main/java/binnie/core/liquid/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.liquid; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index cc44a564..e9e49f86 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -112,7 +112,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, @Nullable ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { - if (!BinnieCore.proxy.isSimulating(world)) { + if (!BinnieCore.getBinnieProxy().isSimulating(world)) { return true; } if (player.isSneaking()) { @@ -134,7 +134,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entityliving, ItemStack stack) { super.onBlockPlacedBy(world, pos, state, entityliving, stack); - if (!BinnieCore.proxy.isSimulating(world)) { + if (!BinnieCore.getBinnieProxy().isSimulating(world)) { return; } final IMachine machine = Machine.getMachine(world.getTileEntity(pos)); @@ -173,7 +173,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { @Override public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { - if (BinnieCore.proxy.isSimulating(world) && this.canHarvestBlock(world, pos, player) && !player.capabilities.isCreativeMode) { + if (BinnieCore.getBinnieProxy().isSimulating(world) && this.canHarvestBlock(world, pos, player) && !player.capabilities.isCreativeMode) { //final int metadata = this.getMetaFromState(state); //final ItemStack stack = new ItemStack(Item.getItemFromBlock(this), 1, this.damageDropped(state)); this.dropBlockAsItem(world, pos, state, 0); diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index 50255a17..0e9db9bf 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -113,14 +113,14 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN } public void sendPacket() { - if (!BinnieCore.proxy.isSimulating(this.getTileEntity().getWorld())) { + if (!BinnieCore.getBinnieProxy().isSimulating(this.getTileEntity().getWorld())) { return; } - BinnieCore.proxy.sendNetworkEntityPacket((INetworkedEntity) this.getTileEntity()); + BinnieCore.getBinnieProxy().sendNetworkEntityPacket((INetworkedEntity) this.getTileEntity()); } public Side getSide() { - return BinnieCore.proxy.isSimulating(this.getTileEntity().getWorld()) ? Side.SERVER : Side.CLIENT; + return BinnieCore.getBinnieProxy().isSimulating(this.getTileEntity().getWorld()) ? Side.SERVER : Side.CLIENT; } @Override @@ -153,7 +153,7 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN } public void onUpdate() { - if (BinnieCore.proxy.isSimulating(this.getWorld())) { + if (BinnieCore.getBinnieProxy().isSimulating(this.getWorld())) { for (final MachineComponent component : this.getComponents()) { component.onUpdate(); } @@ -262,7 +262,7 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN if (nbt.hasNoTags()) { return null; } - return BinnieCore.instance.getNetworkWrapper().getPacketFrom(new MessageTileNBT(BinnieCorePacketID.TileDescriptionSync.ordinal(), this.getTileEntity(), nbt).GetMessage()); + return BinnieCore.getInstance().getNetworkWrapper().getPacketFrom(new MessageTileNBT(BinnieCorePacketID.TileDescriptionSync.ordinal(), this.getTileEntity(), nbt).GetMessage()); } @Override diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index 3f7bb22a..bb649701 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -48,7 +48,7 @@ public class MachineGroup { mod.getProxy().registerBlock(this.block); Item i = mod.getProxy().registerItem(new ItemMachine(this.block)); for (int j = 0; j < types.length; j++) { - BinnieCore.proxy.registermodel(i, j, new ModelResourceLocation(i.getRegistryName(), "machine_type=" + j)); + BinnieCore.getBinnieProxy().registermodel(i, j, new ModelResourceLocation(i.getRegistryName(), "machine_type=" + j)); } for (final MachinePackage pack2 : this.getPackages()) { diff --git a/src/main/java/binnie/core/machines/MachineRendererBlock.java b/src/main/java/binnie/core/machines/MachineRendererBlock.java index fa40ec64..9417d05f 100644 --- a/src/main/java/binnie/core/machines/MachineRendererBlock.java +++ b/src/main/java/binnie/core/machines/MachineRendererBlock.java @@ -22,7 +22,7 @@ public class MachineRendererBlock { GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5); GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); - BinnieCore.proxy.bindTexture(texture); + BinnieCore.getBinnieProxy().bindTexture(texture); this.model.render((float) x, (float) y, (float) z, 0.0625f, 0.0625f, 0.0625f); GlStateManager.popMatrix(); diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index 5131de4e..f09c923b 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -51,6 +51,7 @@ public class MachineUtil { return amount <= space; } + @Nullable public ItemStack getStack(final int slot) { return this.getInventory().getStackInSlot(slot); } @@ -59,11 +60,12 @@ public class MachineUtil { this.setStack(slot, null); } + @Nullable public ItemStack decreaseStack(final int slot, final int amount) { return this.getInventory().decrStackSize(slot, amount); } - public void setStack(final int slot, final ItemStack stack) { + public void setStack(final int slot, @Nullable final ItemStack stack) { this.getInventory().setInventorySlotContents(slot, stack); } @@ -73,10 +75,10 @@ public class MachineUtil { } public void addStack(final int slot, final ItemStack addition) { - if (this.isSlotEmpty(slot)) { + final ItemStack merge = this.getStack(slot); + if (merge == null) { this.setStack(slot, addition); } else { - final ItemStack merge = this.getStack(slot); if (merge.isItemEqual(addition) && merge.stackSize + addition.stackSize <= merge.getMaxStackSize()) { merge.stackSize += addition.stackSize; this.setStack(slot, merge); @@ -84,6 +86,7 @@ public class MachineUtil { } } + @Nullable public FluidStack drainTank(final int tank, final int amount) { return this.getTank(tank).drain(amount, true); } @@ -94,8 +97,7 @@ public class MachineUtil { return drain != null && drain.amount == amount; } - public void damageItem(final int slot, final int damage) { - final ItemStack item = this.getStack(slot); + public void damageItem(final ItemStack item, final int slot, final int damage) { if (damage < 0) { item.setItemDamage(Math.max(0, item.getItemDamage() + damage)); } else if (item.attemptDamageItem(damage, new Random())) { @@ -208,6 +210,6 @@ public class MachineUtil { } public boolean isServer() { - return BinnieCore.proxy.isSimulating(this.machine.getWorld()); + return BinnieCore.getBinnieProxy().isSimulating(this.machine.getWorld()); } } diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index ad84ac7d..9e6dc583 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -71,17 +71,17 @@ public class ManagerMachine extends ManagerBase { @Override public void init() { - SlotValidator.spriteBee = new ValidatorSprite(BinnieCore.instance, "validator/bee.0", "validator/bee.1"); - SlotValidator.spriteFrame = new ValidatorSprite(BinnieCore.instance, "validator/frame.0", "validator/frame.1"); - SlotValidator.spriteCircuit = new ValidatorSprite(BinnieCore.instance, "validator/circuit.0", "validator/circuit.1"); - SlotValidator.spriteBlock = new ValidatorSprite(BinnieCore.instance, "validator/block.0", "validator/block.1"); + 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"); } @Override public void postInit() { // TODO fix rendering Object rendererMachine = null; // BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"); - BinnieCore.proxy.registerTileEntity(TileEntityMachine.class, "binnie.tile.machine", rendererMachine); + BinnieCore.getBinnieProxy().registerTileEntity(TileEntityMachine.class, "binnie.tile.machine", rendererMachine); } public Class[] getComponentInterfaces(final Class clss) { diff --git a/src/main/java/binnie/core/machines/base/DefaultInventory.java b/src/main/java/binnie/core/machines/base/DefaultInventory.java index 5548c501..a4d50187 100644 --- a/src/main/java/binnie/core/machines/base/DefaultInventory.java +++ b/src/main/java/binnie/core/machines/base/DefaultInventory.java @@ -32,7 +32,7 @@ class DefaultInventory implements IInventoryMachine { } @Override - public void setInventorySlotContents(final int i, final ItemStack itemstack) { + public void setInventorySlotContents(final int i, @Nullable final ItemStack itemstack) { } @Override diff --git a/src/main/java/binnie/core/machines/base/package-info.java b/src/main/java/binnie/core/machines/base/package-info.java new file mode 100644 index 00000000..e5d58519 --- /dev/null +++ b/src/main/java/binnie/core/machines/base/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.machines.base; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/component/package-info.java b/src/main/java/binnie/core/machines/component/package-info.java new file mode 100644 index 00000000..8e31b23d --- /dev/null +++ b/src/main/java/binnie/core/machines/component/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.machines.component; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/src/main/java/binnie/core/machines/inventory/BaseSlot.java index 8b36c8cd..90a0bbff 100644 --- a/src/main/java/binnie/core/machines/inventory/BaseSlot.java +++ b/src/main/java/binnie/core/machines/inventory/BaseSlot.java @@ -5,6 +5,7 @@ import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import net.minecraft.util.EnumFacing; +import javax.annotation.Nullable; import java.util.Collection; import java.util.EnumSet; @@ -34,6 +35,7 @@ public abstract class BaseSlot implements INbtWritable, INbtReadable, IValida return item == null || this.validator == null || this.validator.isValid(item); } + @Nullable public abstract T getContent(); public abstract void setContent(final T p0); diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index 403c6cb9..e38ca92c 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -56,7 +56,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve return content; } - @Nonnull @Override public ITextComponent getDisplayName() { return new TextComponentString(""); @@ -92,7 +91,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - public void setInventorySlotContents(final int index, final ItemStack itemStack) { + public void setInventorySlotContents(final int index, @Nullable final ItemStack itemStack) { if (this.inventory.containsKey(index) && (itemStack == null || this.inventory.get(index).isValid(itemStack))) { this.inventory.get(index).setContent(itemStack); } @@ -108,7 +107,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve this.markDirty(); } - @Nonnull @Override public String getName() { return ""; @@ -120,17 +118,17 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - public boolean isUseableByPlayer(@Nonnull final EntityPlayer var1) { + public boolean isUseableByPlayer(final EntityPlayer var1) { return true; } @Override - public void closeInventory(@Nonnull EntityPlayer player) { + public void closeInventory(EntityPlayer player) { } @Override - public void openInventory(@Nonnull EntityPlayer player) { + public void openInventory(EntityPlayer player) { } @@ -218,7 +216,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - public boolean isItemValidForSlot(final int slot, @Nonnull final ItemStack itemStack) { + public boolean isItemValidForSlot(final int slot, final ItemStack itemStack) { final InventorySlot iSlot = this.getSlot(slot); return iSlot != null && (iSlot.isValid(itemStack) && !this.isReadOnly(slot)); } @@ -244,9 +242,8 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } } - @Nonnull @Override - public int[] getSlotsForFace(@Nonnull final EnumFacing var1) { + public int[] getSlotsForFace(final EnumFacing var1) { final List slots = new ArrayList<>(); for (final InventorySlot slot : this.inventory.values()) { if (slot.canInsert() || slot.canExtract()) { @@ -261,12 +258,12 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - public boolean canInsertItem(final int i, @Nonnull final ItemStack itemstack, @Nonnull final EnumFacing direction) { + public boolean canInsertItem(final int i, final ItemStack itemstack, final EnumFacing direction) { return this.isItemValidForSlot(i, itemstack) && this.getSlot(i).canInsert(direction); } @Override - public boolean canExtractItem(final int i, @Nonnull final ItemStack itemstack, @Nonnull final EnumFacing direction) { + public boolean canExtractItem(final int i, final ItemStack itemstack, final EnumFacing direction) { return this.getSlot(i).canExtract(direction); } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java index 0ca7af67..dd1a1596 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java @@ -6,6 +6,7 @@ import binnie.core.machines.transfer.TransferRequest; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -18,19 +19,23 @@ public class ComponentInventoryTransfer extends MachineComponent { } public void addRestock(final int[] buffer, final int destination, final int limit) { - this.transfers.add(new Restock(this.getMachine(), buffer, destination, limit)); + Restock restock = new Restock(this.getMachine(), buffer, destination, limit); + this.transfers.add(restock); } public void addRestock(final int[] buffer, final int destination) { - this.transfers.add(new Restock(this.getMachine(), buffer, destination)); + Restock restock = new Restock(this.getMachine(), buffer, destination); + this.transfers.add(restock); } public void addStorage(final int source, final int[] destination) { - this.transfers.add(new Storage(this.getMachine(), source, destination)); + Storage storage = new Storage(this.getMachine(), source, destination); + this.transfers.add(storage); } public void performTransfer(final int source, final int[] destination) { - new Storage(this.getMachine(), source, destination).transfer(this.getMachine().getInterface(IInventoryMachine.class)); + IInventoryMachine inventoryMachine = this.getMachine().getInterface(IInventoryMachine.class); + new Storage(this.getMachine(), source, destination).transfer(inventoryMachine); } @Override @@ -41,24 +46,27 @@ public class ComponentInventoryTransfer extends MachineComponent { } public void addStorage(final int source, final int[] destination, final Condition condition) { - this.transfers.add(new Storage(this.getMachine(), source, destination).setCondition(condition)); + Storage storage = new Storage(this.getMachine(), source, destination); + Transfer transfer = storage.setCondition(condition); + this.transfers.add(transfer); } public abstract class Transfer { + @Nullable protected Condition condition; - protected IMachine machine; + protected final IMachine machine; private Transfer(final IMachine machine) { this.machine = machine; } public final void transfer(final IInventory inv) { - if (this.condition == null || this.fufilled(inv)) { + if (this.condition == null || this.fulfilled(inv)) { this.doTransfer(inv); } } - protected boolean fufilled(final IInventory inv) { + protected boolean fulfilled(final IInventory inv) { return true; } @@ -119,21 +127,25 @@ public class ComponentInventoryTransfer extends MachineComponent { @Override protected void doTransfer(final IInventory inv) { - if (inv.getStackInSlot(this.source) != null) { - inv.setInventorySlotContents(this.source, new TransferRequest(inv.getStackInSlot(this.source), inv).setTargetSlots(this.destination).ignoreValidation().transfer(true)); + ItemStack stackInSlot = inv.getStackInSlot(this.source); + if (stackInSlot != null) { + TransferRequest transferRequest = new TransferRequest(stackInSlot, inv).setTargetSlots(this.destination).ignoreValidation(); + ItemStack transfer = transferRequest.transfer(true); + inv.setInventorySlotContents(this.source, transfer); } } @Override - protected boolean fufilled(final IInventory inv) { + protected boolean fulfilled(final IInventory inv) { final ItemStack stack = inv.getStackInSlot(this.source); - return stack != null && this.condition.fufilled(stack); + return stack != null && (this.condition == null || this.condition.fulfilled(stack)); } } public abstract static class Condition { + @Nullable public Transfer transfer; - public abstract boolean fufilled(final ItemStack p0); + public abstract boolean fulfilled(final ItemStack p0); } } diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 91853249..4224d8cd 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -5,7 +5,10 @@ import binnie.core.BinnieCore; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import javax.annotation.Nullable; + public class InventorySlot extends BaseSlot { + @Nullable private ItemStack itemStack; private Type type; @@ -16,19 +19,22 @@ public class InventorySlot extends BaseSlot { } @Override + @Nullable public ItemStack getContent() { return this.itemStack; } + @Nullable public ItemStack getItemStack() { return this.getContent(); } @Override - public void setContent(final ItemStack itemStack) { + public void setContent(@Nullable final ItemStack itemStack) { this.itemStack = itemStack; } + @Nullable public ItemStack decrStackSize(final int amount) { if (this.itemStack == null) { return null; @@ -92,7 +98,7 @@ public class InventorySlot extends BaseSlot { @Override public String getName() { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.slot." + this.unlocName); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.slot." + this.unlocName); } public enum Type { diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index aaf38f3b..9d37f9d9 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -48,7 +48,7 @@ public class TankSlot extends BaseSlot { @Override public String getName() { - return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.slot." + this.unlocName); + return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.slot." + this.unlocName); } } diff --git a/src/main/java/binnie/core/machines/inventory/package-info.java b/src/main/java/binnie/core/machines/inventory/package-info.java new file mode 100644 index 00000000..54e57f6c --- /dev/null +++ b/src/main/java/binnie/core/machines/inventory/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.machines.inventory; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/network/package-info.java b/src/main/java/binnie/core/machines/network/package-info.java new file mode 100644 index 00000000..d01cefe2 --- /dev/null +++ b/src/main/java/binnie/core/machines/network/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.machines.network; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/package-info.java b/src/main/java/binnie/core/machines/package-info.java new file mode 100644 index 00000000..1856471d --- /dev/null +++ b/src/main/java/binnie/core/machines/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.machines; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index c1e4436f..356f3888 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -74,13 +74,13 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem @Override public ErrorState canWork() { - return (this.actionCancelTask == 0.0f) ? null : new ErrorState(BinnieCore.proxy.localise("machine.errors.task.cancelled.desc"), BinnieCore.proxy.localise("machine.errors.task.cancelled.info")); + return (this.actionCancelTask == 0.0f) ? null : new ErrorState(BinnieCore.getBinnieProxy().localise("machine.errors.task.cancelled.desc"), BinnieCore.getBinnieProxy().localise("machine.errors.task.cancelled.info")); } @Override public ErrorState canProgress() { if (this.actionPauseProcess != 0.0f) { - return new ErrorState(BinnieCore.proxy.localise("machine.errors.task.process.paused.desc"), BinnieCore.proxy.localise("machine.errors.task.process.paused.info")); + return new ErrorState(BinnieCore.getBinnieProxy().localise("machine.errors.task.process.paused.desc"), BinnieCore.getBinnieProxy().localise("machine.errors.task.process.paused.info")); } return (this.getPower().getInterface().getEnergy(PowerSystem.RF) < this.getEnergyPerTick()) ? new ErrorState.InsufficientPower() : null; } @@ -103,7 +103,7 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem @Override public String getTooltip() { - return BinnieCore.proxy.localise("machine.tooltips.processing"); + return BinnieCore.getBinnieProxy().localise("machine.tooltips.processing"); } @Override diff --git a/src/main/java/binnie/core/machines/power/package-info.java b/src/main/java/binnie/core/machines/power/package-info.java new file mode 100644 index 00000000..4a56b5cd --- /dev/null +++ b/src/main/java/binnie/core/machines/power/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.machines.power; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/storage/Compartment.java b/src/main/java/binnie/core/machines/storage/Compartment.java index 4517c902..9cc709a9 100644 --- a/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/src/main/java/binnie/core/machines/storage/Compartment.java @@ -35,7 +35,7 @@ enum Compartment implements IMachineType { } public ItemStack get(final int i) { - return new ItemStack(BinnieCore.packageCompartment.getBlock(), i, this.ordinal()); + return new ItemStack(BinnieCore.getPackageCompartment().getBlock(), i, this.ordinal()); } public abstract static class PackageCompartment extends MachinePackage { diff --git a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java index 14d6f165..c77d4572 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java +++ b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java @@ -20,6 +20,6 @@ class ComponentBinnieCoreGUI extends MachineComponent implements IInteraction.Ri @Override public void onRightClick(final World world, final EntityPlayer player, final BlockPos pos) { - BinnieCore.proxy.openGui(this.id, player, pos); + BinnieCore.getBinnieProxy().openGui(this.id, player, pos); } } diff --git a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java index f86fd698..36a0b93b 100644 --- a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java +++ b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java @@ -29,7 +29,7 @@ class MachineRendererCompartment { GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5); GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); - BinnieCore.proxy.bindTexture(texture); + BinnieCore.getBinnieProxy().bindTexture(texture); this.model.render(null, (float) x, (float) y, (float) z, 0.0625f, 0.0625f, 0.0625f); GlStateManager.popMatrix(); diff --git a/src/main/java/binnie/core/machines/storage/ModuleStorage.java b/src/main/java/binnie/core/machines/storage/ModuleStorage.java index 9fed6f4b..95974bad 100644 --- a/src/main/java/binnie/core/machines/storage/ModuleStorage.java +++ b/src/main/java/binnie/core/machines/storage/ModuleStorage.java @@ -13,7 +13,9 @@ import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleStorage implements IInitializable { @Override public void preInit() { - (BinnieCore.packageCompartment = new MachineGroup(BinnieCore.instance, "storage", "storage", Compartment.values())).setCreativeTab(CreativeTabs.BUILDING_BLOCKS); + MachineGroup machineGroup = new MachineGroup(BinnieCore.getInstance(), "storage", "storage", Compartment.values()); + BinnieCore.setPackageCompartment(machineGroup); + machineGroup.setCreativeTab(CreativeTabs.BUILDING_BLOCKS); } @Override diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index ce5186bf..a9a83f6e 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -102,7 +102,7 @@ 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 ControlTabBar(controlCompartment, 0, 0, 24, compartmentPageHeight, Position.Left) { + final ControlTabBar tab = new ControlTabBar(controlCompartment, 0, 0, 24, compartmentPageHeight, Position.Left, Arrays.asList(tabs1)) { @Override public ControlTab createTab(final int x, final int y, final int w, final int h, final Integer value) { return new ControlTabIcon(this, x, y, w, h, value) { @@ -130,8 +130,6 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh }; final String[] tabHelp = {"Compartment Tab", "Tabs that divide the inventory into sections. Each one can be labelled seperately."}; tab.addHelp(tabHelp); - tab.setValues(Arrays.asList(tabs1)); - tab.setValue(0); tab.addEventHandler(new EventValueChanged.Handler() { @Override public void onEvent(final EventValueChanged event) { @@ -169,7 +167,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } x += compartmentPageWidth; if (tabs2.length > 0) { - final ControlTabBar tab2 = new ControlTabBar(controlCompartment, 24 + compartmentPageWidth, 0, 24, compartmentPageHeight, Position.Right) { + final ControlTabBar tab2 = new ControlTabBar(controlCompartment, 24 + compartmentPageWidth, 0, 24, compartmentPageHeight, Position.Right, Arrays.asList(tabs2)) { @Override public ControlTab createTab(final int x, final int y, final int w, final int h, final Integer value) { return new ControlTabIcon(this, x, y, w, h, value) { @@ -195,8 +193,6 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh }; } }; - tab2.setValues(Arrays.asList(tabs2)); - tab2.setValue(0); tab2.addHelp(tabHelp); tab2.addEventHandler(new EventValueChanged.Handler() { @Override @@ -428,7 +424,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh @Override protected AbstractMod getMod() { - return BinnieCore.instance; + return BinnieCore.getInstance(); } @Override diff --git a/src/main/java/binnie/core/machines/storage/WindowTest.java b/src/main/java/binnie/core/machines/storage/WindowTest.java index 11a42395..c20aa1d5 100644 --- a/src/main/java/binnie/core/machines/storage/WindowTest.java +++ b/src/main/java/binnie/core/machines/storage/WindowTest.java @@ -28,7 +28,7 @@ public class WindowTest extends WindowMachine { @Override protected AbstractMod getMod() { - return BinnieCore.instance; + return BinnieCore.getInstance(); } @Override diff --git a/src/main/java/binnie/core/machines/storage/package-info.java b/src/main/java/binnie/core/machines/storage/package-info.java new file mode 100644 index 00000000..056f0aa0 --- /dev/null +++ b/src/main/java/binnie/core/machines/storage/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.machines.storage; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index cd52b04f..e270ef5c 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -222,7 +222,7 @@ public class TransferRequest { } @Nullable - public static ItemStack transferToTank(@Nonnull final ItemStack itemStack, @Nonnull final IInventory origin, @Nonnull final ITankMachine destination, final int tankID, final boolean doAdd) { + public static ItemStack transferToTank(final ItemStack itemStack, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { Preconditions.checkNotNull(itemStack); Preconditions.checkArgument(itemStack.stackSize >= 1); @@ -267,7 +267,7 @@ public class TransferRequest { return itemStack; } - private static ItemStack transferFromTank(@Nonnull ItemStack itemStack, @Nonnull final IInventory origin, @Nonnull final ITankMachine destination, final int tankID, final boolean doAdd) { + private static ItemStack transferFromTank(ItemStack itemStack, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { Preconditions.checkNotNull(itemStack); Preconditions.checkArgument(itemStack.stackSize >= 1); diff --git a/src/main/java/binnie/core/machines/transfer/package-info.java b/src/main/java/binnie/core/machines/transfer/package-info.java new file mode 100644 index 00000000..e77f773d --- /dev/null +++ b/src/main/java/binnie/core/machines/transfer/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.machines.transfer; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java index bfa2ddab..bf600a32 100644 --- a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java +++ b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java @@ -11,7 +11,7 @@ class BinnieConfiguration extends Configuration { private String filename; public BinnieConfiguration(final String filename, final AbstractMod mod) { - super(new File(BinnieCore.proxy.getDirectory(), filename)); + super(new File(BinnieCore.getBinnieProxy().getDirectory(), filename)); this.mod = mod; this.filename = filename; } diff --git a/src/main/java/binnie/core/mod/config/package-info.java b/src/main/java/binnie/core/mod/config/package-info.java new file mode 100644 index 00000000..de8f5aa6 --- /dev/null +++ b/src/main/java/binnie/core/mod/config/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.mod.config; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index 0859a7b8..b91c7bdf 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -269,11 +269,11 @@ public class ModelManager implements IModelManager { } } - public static void registerCustomBlockModel(@Nonnull BlockModelEntry index) { + public static void registerCustomBlockModel(BlockModelEntry index) { customBlockModels.add(index); } - public static void registerCustomModel(@Nonnull ModelEntry index) { + public static void registerCustomModel(ModelEntry index) { customModels.add(index); } diff --git a/src/main/java/binnie/core/models/ModelMutlipass.java b/src/main/java/binnie/core/models/ModelMutlipass.java index 163d65bc..2621de0d 100644 --- a/src/main/java/binnie/core/models/ModelMutlipass.java +++ b/src/main/java/binnie/core/models/ModelMutlipass.java @@ -41,7 +41,7 @@ public class ModelMutlipass, K> extends Mod } @Nullable - protected IBakedModel bakeModel(@Nonnull IBlockState state, @Nonnull K key) { + protected IBakedModel bakeModel(IBlockState state, K key) { if (key == null) { return null; } diff --git a/src/main/java/binnie/core/models/PanelModelBaker.java b/src/main/java/binnie/core/models/PanelModelBaker.java index c52593a6..0598e3cd 100644 --- a/src/main/java/binnie/core/models/PanelModelBaker.java +++ b/src/main/java/binnie/core/models/PanelModelBaker.java @@ -36,7 +36,6 @@ public class PanelModelBaker implements IModelBaker { private final float[] quadsUV; private final List faces = new ArrayList<>(); private final List> bakedModels = new ArrayList<>(); - @Nonnull protected AxisAlignedBB renderBounds = Block.FULL_BLOCK_AABB; protected ModelBakerModel currentModel = new ModelBakerModel(ModelManager.getInstance().DEFAULT_BLOCK); @@ -51,7 +50,7 @@ public class PanelModelBaker implements IModelBaker { } @Override - public void setRenderBounds(@Nonnull AxisAlignedBB renderBounds) { + public void setRenderBounds(AxisAlignedBB renderBounds) { if (renderBounds == null) { return; } @@ -72,7 +71,7 @@ public class PanelModelBaker implements IModelBaker { } @Override - public void addModel(@Nonnull AxisAlignedBB renderBounds, @Nonnull TextureAtlasSprite[] textures, int colorIndex) { + public void addModel(AxisAlignedBB renderBounds, TextureAtlasSprite[] textures, int colorIndex) { setColorIndex(colorIndex); @@ -82,12 +81,12 @@ public class PanelModelBaker implements IModelBaker { } @Override - public void addModel(@Nonnull AxisAlignedBB renderBounds, @Nonnull TextureAtlasSprite texture, int colorIndex) { + public void addModel(AxisAlignedBB renderBounds, TextureAtlasSprite texture, int colorIndex) { addModel(renderBounds, new TextureAtlasSprite[]{ texture, texture, texture, texture, texture, texture }, colorIndex); } @Override - public void addBlockModel(@Nonnull Block block, @Nonnull AxisAlignedBB renderBounds, @Nullable BlockPos pos, @Nonnull TextureAtlasSprite[] textures, int colorIndex) { + public void addBlockModel(Block block, AxisAlignedBB renderBounds, @Nullable BlockPos pos, TextureAtlasSprite[] textures, int colorIndex) { setColorIndex(colorIndex); if(pos != null){ @@ -107,12 +106,12 @@ public class PanelModelBaker implements IModelBaker { } @Override - public void addBlockModel(@Nonnull Block block, @Nonnull AxisAlignedBB renderBounds, @Nullable BlockPos pos, @Nonnull TextureAtlasSprite texture, int colorIndex) { + public void addBlockModel(Block block, AxisAlignedBB renderBounds, @Nullable BlockPos pos, TextureAtlasSprite texture, int colorIndex) { addBlockModel(block, renderBounds, pos, new TextureAtlasSprite[]{ texture, texture, texture, texture, texture, texture }, colorIndex); } @Override - public void addBakedModel(@Nullable IBlockState state, @Nonnull IBakedModel model) { + public void addBakedModel(@Nullable IBlockState state, IBakedModel model) { if(model != null){ this.bakedModels.add(Pair.of(state, model)); } @@ -185,7 +184,7 @@ public class PanelModelBaker implements IModelBaker { } @Override - public void addFace(@Nonnull EnumFacing facing, @Nonnull TextureAtlasSprite sprite) { + public void addFace(EnumFacing facing, TextureAtlasSprite sprite) { if (sprite == null) { return; } diff --git a/src/main/java/binnie/core/models/package-info.java b/src/main/java/binnie/core/models/package-info.java new file mode 100644 index 00000000..28cdb7ea --- /dev/null +++ b/src/main/java/binnie/core/models/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.models; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/multiblock/package-info.java b/src/main/java/binnie/core/multiblock/package-info.java new file mode 100644 index 00000000..8723cd31 --- /dev/null +++ b/src/main/java/binnie/core/multiblock/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.multiblock; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index 9e32f7a0..c9965324 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -27,19 +27,19 @@ public enum BinnieCorePacketID implements IPacketID { public void onMessage(final MessageBinnie message, final MessageContext context) { if (this == BinnieCorePacketID.NetworkEntityUpdate) { final MessageUpdate packet = new MessageUpdate(message); - final TileEntity tile = packet.getTileEntity(BinnieCore.proxy.getWorld()); + final TileEntity tile = packet.getTileEntity(BinnieCore.getBinnieProxy().getWorld()); if (tile instanceof INetworkedEntity) { ((INetworkedEntity) tile).readFromPacket(packet.payload); } } else if (this == BinnieCorePacketID.TileMetadata) { final MessageMetadata packet2 = new MessageMetadata(message); - final TileEntity tile = packet2.getTileEntity(BinnieCore.proxy.getWorld()); + final TileEntity tile = packet2.getTileEntity(BinnieCore.getBinnieProxy().getWorld()); if (tile instanceof TileEntityMetadata) { ((TileEntityMetadata) tile).setTileMetadata(packet2.meta, true); } } else if (this == BinnieCorePacketID.CraftGUIAction && context.side == Side.CLIENT) { final MessageCraftGUI packet3 = new MessageCraftGUI(message); - final EntityPlayer player = BinnieCore.proxy.getPlayer(); + final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); if (player.openContainer instanceof ContainerCraftGUI && packet3.getTagCompound() != null) { ((ContainerCraftGUI) player.openContainer).recieveNBT(Side.CLIENT, player, packet3.getTagCompound()); } @@ -51,7 +51,7 @@ public enum BinnieCorePacketID implements IPacketID { } } else if (this == BinnieCorePacketID.TileDescriptionSync && context.side == Side.CLIENT) { final MessageTileNBT packet4 = new MessageTileNBT(message); - final TileEntity tile = packet4.getTarget(BinnieCore.proxy.getWorld()); + final TileEntity tile = packet4.getTarget(BinnieCore.getBinnieProxy().getWorld()); if (tile != null && packet4.getTagCompound() != null) { final IMachine machine = Machine.getMachine(tile); if (machine != null && machine instanceof INetwork.TilePacketSync) { diff --git a/src/main/java/binnie/core/network/BinniePacketHandler.java b/src/main/java/binnie/core/network/BinniePacketHandler.java index 4e16e238..b24b52a3 100644 --- a/src/main/java/binnie/core/network/BinniePacketHandler.java +++ b/src/main/java/binnie/core/network/BinniePacketHandler.java @@ -2,6 +2,7 @@ package binnie.core.network; import binnie.core.AbstractMod; import binnie.core.network.packet.MessageBinnie; +import com.google.common.base.Preconditions; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.IThreadListener; @@ -11,7 +12,10 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; + public abstract class BinniePacketHandler implements IMessageHandler { + @Nullable private IPacketProvider provider; public BinniePacketHandler(final AbstractMod mod) { @@ -22,10 +26,16 @@ public abstract class BinniePacketHandler implements IMessageHandler { return this.itemStacks.isEmpty(); } - @Nonnull @Override public Iterator iterator() { return this.itemStacks.iterator(); @@ -96,7 +95,7 @@ class FluidStackSet implements Set { } @Override - public boolean removeAll(@Nonnull final Collection c) { + public boolean removeAll(final Collection c) { boolean addedAll = true; for (final Object o : c) { final boolean removed = this.remove(o); @@ -106,7 +105,7 @@ class FluidStackSet implements Set { } @Override - public boolean retainAll(@Nonnull final Collection c) { + public boolean retainAll(final Collection c) { return this.itemStacks.retainAll(c); } @@ -115,15 +114,13 @@ class FluidStackSet implements Set { return this.itemStacks.size(); } - @Nonnull @Override public Object[] toArray() { return this.itemStacks.toArray(); } - @Nonnull @Override - public T[] toArray(@Nonnull final T[] a) { + public T[] toArray(final T[] a) { return this.itemStacks.toArray(a); } } diff --git a/src/main/java/binnie/core/util/OreDictionaryUtil.java b/src/main/java/binnie/core/util/OreDictionaryUtil.java index 79456667..5914c368 100644 --- a/src/main/java/binnie/core/util/OreDictionaryUtil.java +++ b/src/main/java/binnie/core/util/OreDictionaryUtil.java @@ -22,7 +22,7 @@ public class OreDictionaryUtil { } } - public static boolean hasOreId(@Nonnull ItemStack itemStack, int oreId) { + public static boolean hasOreId(ItemStack itemStack, int oreId) { int[] oreIds = OreDictionary.getOreIDs(itemStack); return contains(oreIds, oreId); } diff --git a/src/main/java/binnie/core/util/TileUtil.java b/src/main/java/binnie/core/util/TileUtil.java index 768f6c12..cef0b659 100644 --- a/src/main/java/binnie/core/util/TileUtil.java +++ b/src/main/java/binnie/core/util/TileUtil.java @@ -12,7 +12,7 @@ import javax.annotation.Nullable; public class TileUtil { @Nullable - public static T getTile(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull Class tileClass) { + public static T getTile(IBlockAccess world, BlockPos pos, Class tileClass) { if (pos == null) { return null; } diff --git a/src/main/java/binnie/core/util/package-info.java b/src/main/java/binnie/core/util/package-info.java new file mode 100644 index 00000000..40546adf --- /dev/null +++ b/src/main/java/binnie/core/util/package-info.java @@ -0,0 +1,8 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.util; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java index 5a3a0266..bde08e68 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java @@ -70,7 +70,7 @@ public class WindowFieldKit extends Window { @Override protected AbstractMod getMod() { - return BinnieCore.instance; + return BinnieCore.getInstance(); } @Override diff --git a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java index b8b06ee1..c81db5b9 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java @@ -52,7 +52,7 @@ public class WindowGenesis extends Window { @Override protected AbstractMod getMod() { - return BinnieCore.instance; + return BinnieCore.getInstance(); } @Override @@ -64,7 +64,7 @@ public class WindowGenesis extends Window { public void initialiseClient() { new ControlPlayerInventory(this); this.setTitle("Genesis"); - final ControlTabBar tabSystems = new ControlTabBar(this, 8, 28, 23, 100, Position.Left) { + final ControlTabBar tabSystems = new ControlTabBar(this, 8, 28, 23, 100, Position.Left, Binnie.GENETICS.getActiveSystems()) { @Override public ControlTab createTab(final int x, final int y, final int w, final int h, final BreedingSystem value) { return new ControlTabIcon(this, x, y, w, h, value) { @@ -92,7 +92,6 @@ public class WindowGenesis extends Window { }; } }; - tabSystems.setValues(Binnie.GENETICS.getActiveSystems()); this.root = Binnie.GENETICS.getActiveSystems().iterator().next().getSpeciesRoot(); this.template = this.root.getDefaultTemplate(); final IArea one = new IArea(32, 28, 170, 100); diff --git a/src/main/java/binnie/craftgui/binniecore/package-info.java b/src/main/java/binnie/craftgui/binniecore/package-info.java new file mode 100644 index 00000000..65e7ee0e --- /dev/null +++ b/src/main/java/binnie/craftgui/binniecore/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.binniecore; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/craftgui/controls/ControlCheckbox.java index 51299fda..9f9fd7e0 100644 --- a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/craftgui/controls/ControlCheckbox.java @@ -14,8 +14,8 @@ import binnie.craftgui.events.EventValueChanged; import binnie.craftgui.resource.minecraft.CraftGUITexture; public class ControlCheckbox extends Control implements IControlValue { - boolean value; - String text; + private boolean value; + private String text; public ControlCheckbox(final IWidget parent, final int x, final int y, final boolean bool) { this(parent, x, y, 0, "", bool); diff --git a/src/main/java/binnie/craftgui/controls/ControlText.java b/src/main/java/binnie/craftgui/controls/ControlText.java index bd2026a4..26950127 100644 --- a/src/main/java/binnie/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/craftgui/controls/ControlText.java @@ -22,7 +22,7 @@ public class ControlText extends Control implements IControlValue { public ControlText(final IWidget parent, final IArea area, final String text, final TextJustification align) { super(parent, area.pos().x(), area.pos().y(), area.size().x(), area.size().y()); - this.setValue(text); + this.text = text; this.align = align; } diff --git a/src/main/java/binnie/craftgui/controls/button/ControlButton.java b/src/main/java/binnie/craftgui/controls/button/ControlButton.java index 0ffd2f4f..d7198a05 100644 --- a/src/main/java/binnie/craftgui/controls/button/ControlButton.java +++ b/src/main/java/binnie/craftgui/controls/button/ControlButton.java @@ -11,8 +11,12 @@ import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventMouse; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import javax.annotation.Nullable; + public class ControlButton extends Control { + @Nullable private ControlText textWidget; + @Nullable private String text; public ControlButton(final IWidget parent, final int x, final int y, final int width, final int height) { @@ -39,10 +43,14 @@ public class ControlButton extends Control { @Override public void onUpdateClient() { if (this.textWidget != null) { - this.textWidget.setValue(this.getText()); + String text = this.getText(); + if (text != null) { + this.textWidget.setValue(text); + } } } + @Nullable public String getText() { return this.text; } diff --git a/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java b/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java index d150cf12..44729785 100644 --- a/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java +++ b/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java @@ -4,6 +4,7 @@ import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.IWidget; import binnie.craftgui.events.EventMouse; import binnie.craftgui.events.EventValueChanged; +import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.Collections; @@ -14,6 +15,14 @@ public class ControlEnumButton extends ControlButton implements IControlValue private T currentSelection; private List enumConstants; + public ControlEnumButton(final IWidget parent, final int x, final int y, final int width, final int height, final T[] values) { + super(parent, x, y, width, height, ""); + Preconditions.checkArgument(values.length > 0, "Tried to create ControlEnumButton with no values."); + this.enumConstants = new ArrayList<>(); + Collections.addAll(this.enumConstants, values); + this.currentSelection = values[0]; + } + @Override public String getText() { return this.currentSelection.toString(); @@ -39,15 +48,6 @@ public class ControlEnumButton extends ControlButton implements IControlValue } } - public ControlEnumButton(final IWidget parent, final int x, final int y, final int width, final int height, final T[] values) { - super(parent, x, y, width, height, ""); - this.enumConstants = new ArrayList<>(); - Collections.addAll(this.enumConstants, values); - if (values.length > 0) { - this.currentSelection = values[0]; - } - } - @Override public T getValue() { return this.currentSelection; diff --git a/src/main/java/binnie/craftgui/controls/button/package-info.java b/src/main/java/binnie/craftgui/controls/button/package-info.java new file mode 100644 index 00000000..94544ed2 --- /dev/null +++ b/src/main/java/binnie/craftgui/controls/button/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.controls.button; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/core/IControlValue.java b/src/main/java/binnie/craftgui/controls/core/IControlValue.java index 59668fd7..9f9724cb 100644 --- a/src/main/java/binnie/craftgui/controls/core/IControlValue.java +++ b/src/main/java/binnie/craftgui/controls/core/IControlValue.java @@ -5,5 +5,5 @@ import binnie.craftgui.core.IWidget; public interface IControlValue extends IWidget { T getValue(); - void setValue(final T p0); + void setValue(final T value); } diff --git a/src/main/java/binnie/craftgui/controls/core/package-info.java b/src/main/java/binnie/craftgui/controls/core/package-info.java new file mode 100644 index 00000000..f620f9de --- /dev/null +++ b/src/main/java/binnie/craftgui/controls/core/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.controls.core; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/craftgui/controls/listbox/ControlList.java index ce6260a8..1f256aef 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlList.java @@ -7,21 +7,25 @@ import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.events.EventValueChanged; +import javax.annotation.Nullable; import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; public class ControlList extends Control implements IControlValue { ControlListBox parent; - T value; + private T defaultValue; + private T value; Map allOptions; Map optionWidgets; boolean creating; + @Nullable IValidator validator; - protected ControlList(final ControlListBox parent, final int x, final int y, final int w, final int h) { + protected ControlList(final ControlListBox parent, final int x, final int y, final int w, final int h, final T defaultValue) { super(parent, x, y, w, h); - this.value = null; + this.value = defaultValue; + this.defaultValue = defaultValue; this.allOptions = new LinkedHashMap<>(); this.optionWidgets = new LinkedHashMap<>(); this.creating = false; @@ -33,13 +37,17 @@ public class ControlList extends Control implements IControlValue { return this.value; } + public T getDefaultValue() { + return defaultValue; + } + @Override public void setValue(final T value) { if (value == this.value) { return; } this.value = value; - if (value != null && this.optionWidgets.containsKey(value)) { + if (this.optionWidgets.containsKey(value)) { final IWidget child = this.optionWidgets.get(value); this.parent.ensureVisible(child.y(), child.y() + child.h(), this.h()); } @@ -109,7 +117,7 @@ public class ControlList extends Control implements IControlValue { } ++index; } - this.setValue(null); + this.setValue(defaultValue); } private boolean isValidOption(final IWidget widget) { diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java b/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java index 8a236d34..02e97970 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java @@ -6,6 +6,7 @@ import binnie.craftgui.controls.scroll.ControlScrollableContent; import binnie.craftgui.core.IWidget; import binnie.craftgui.events.EventKey; +import javax.annotation.Nullable; import java.util.Collection; public class ControlListBox extends ControlScrollableContent> implements IControlValue { @@ -15,7 +16,7 @@ public class ControlListBox extends ControlScrollableContent> @Override public void initialise() { - this.setScrollableContent(new ControlList<>(this, 1, 1, this.w() - 2 - this.scrollBarSize, this.h() - 2)); + this.setScrollableContent(new ControlList<>(this, 1, 1, this.w() - 2 - this.scrollBarSize, this.h() - 2, this.getContent().getDefaultValue())); this.addEventHandler(new EventKey.Down.Handler() { @Override public void onEvent(final EventKey.Down event) { diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java index 1376766b..06ad99a5 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java @@ -4,23 +4,12 @@ import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; +import binnie.craftgui.core.IWidget; import binnie.craftgui.events.EventMouse; import binnie.craftgui.resource.minecraft.CraftGUITexture; public class ControlOption extends Control implements IControlValue { - T value; - - @Override - public void onUpdateClient() { - if (this.getValue() == null) { - return; - } - int colour = 10526880; - if (this.isCurrentSelection()) { - colour = 16777215; - } - this.setColour(colour); - } + private T value; public ControlOption(final ControlList controlList, final T option) { this(controlList, option, 16); @@ -29,17 +18,24 @@ public class ControlOption extends Control implements IControlValue { public ControlOption(final ControlList controlList, final T option, final int height) { super(controlList, 0, height, controlList.getSize().x(), 20); this.value = option; - if (this.value != null) { - this.addAttribute(Attribute.MouseOver); - } + this.addAttribute(Attribute.MouseOver); this.addSelfEventHandler(new EventMouse.Down.Handler() { @Override public void onEvent(final EventMouse.Down event) { - ((IControlValue) ControlOption.this.getParent()).setValue(ControlOption.this.getValue()); + controlList.setValue(ControlOption.this.getValue()); } }); } + @Override + public void onUpdateClient() { + int colour = 10526880; + if (this.isCurrentSelection()) { + colour = 16777215; + } + this.setColour(colour); + } + @Override public T getValue() { return this.value; @@ -51,7 +47,7 @@ public class ControlOption extends Control implements IControlValue { } public boolean isCurrentSelection() { - return this.getValue() != null && this.getValue().equals(((IControlValue) this.getParent()).getValue()); + return this.getValue().equals(((IControlValue) this.getParent()).getValue()); } @Override diff --git a/src/main/java/binnie/craftgui/controls/listbox/package-info.java b/src/main/java/binnie/craftgui/controls/listbox/package-info.java new file mode 100644 index 00000000..feeb2d1b --- /dev/null +++ b/src/main/java/binnie/craftgui/controls/listbox/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.controls.listbox; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/package-info.java b/src/main/java/binnie/craftgui/controls/package-info.java new file mode 100644 index 00000000..f6e9ac76 --- /dev/null +++ b/src/main/java/binnie/craftgui/controls/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.controls; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/page/ControlPage.java b/src/main/java/binnie/craftgui/controls/page/ControlPage.java index b0f430c8..ca6e09f5 100644 --- a/src/main/java/binnie/craftgui/controls/page/ControlPage.java +++ b/src/main/java/binnie/craftgui/controls/page/ControlPage.java @@ -5,7 +5,7 @@ import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.IWidget; public class ControlPage extends Control implements IControlValue { - T value; + private T value; public ControlPage(final IWidget parent, final T value) { this(parent, 0, 0, parent.w(), parent.h(), value); @@ -13,7 +13,7 @@ public class ControlPage extends Control implements IControlValue { public ControlPage(final IWidget parent, final int x, final int y, final int w, final int h, final T value) { super(parent, x, y, w, h); - this.setValue(value); + this.value = value; if (parent instanceof IControlValue && ((IControlValue) parent).getValue() == null) { ((IControlValue) parent).setValue(value); } diff --git a/src/main/java/binnie/craftgui/controls/page/package-info.java b/src/main/java/binnie/craftgui/controls/page/package-info.java new file mode 100644 index 00000000..6afcd725 --- /dev/null +++ b/src/main/java/binnie/craftgui/controls/page/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.controls.page; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java b/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java index 75ecf090..e7912736 100644 --- a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java +++ b/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java @@ -7,7 +7,10 @@ import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.events.EventMouse; import binnie.craftgui.events.EventWidget; +import javax.annotation.Nullable; + public class ControlScrollableContent extends Control implements IControlScrollable { + @Nullable protected T controlChild; protected int scrollBarSize; float percentageIndex; @@ -33,7 +36,7 @@ public class ControlScrollableContent extends Control impleme this.scrollBarSize = scrollBarSize; } - public void setScrollableContent(final T child) { + public void setScrollableContent(@Nullable final T child) { this.controlChild = child; if (child == null) { return; @@ -44,7 +47,7 @@ public class ControlScrollableContent extends Control impleme child.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { @Override public void onEvent(final EventWidget.ChangeSize event) { - ControlScrollableContent.this.controlChild.setOffset(new IPoint(0, Math.round(-ControlScrollableContent.this.percentageIndex * ControlScrollableContent.this.getMovementRange()))); + child.setOffset(new IPoint(0, Math.round(-ControlScrollableContent.this.percentageIndex * ControlScrollableContent.this.getMovementRange()))); if (ControlScrollableContent.this.getMovementRange() == 0) { ControlScrollableContent.this.percentageIndex = 0; } @@ -52,6 +55,7 @@ public class ControlScrollableContent extends Control impleme }); } + @Nullable public T getContent() { return this.controlChild; } diff --git a/src/main/java/binnie/craftgui/controls/scroll/package-info.java b/src/main/java/binnie/craftgui/controls/scroll/package-info.java new file mode 100644 index 00000000..5f47e4e0 --- /dev/null +++ b/src/main/java/binnie/craftgui/controls/scroll/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.controls.scroll; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/craftgui/controls/tab/ControlTab.java index 0033535d..5b722b50 100644 --- a/src/main/java/binnie/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/craftgui/controls/tab/ControlTab.java @@ -23,7 +23,7 @@ public class ControlTab extends Control implements ITooltip, IControlValue public ControlTab(final ControlTabBar parent, final int x, final int y, final int w, final int h, final T value) { super(parent, x, y, w, h); - this.setValue(value); + this.value = value; this.tabBar = parent; this.addAttribute(Attribute.MouseOver); this.addSelfEventHandler(new EventMouse.Down.Handler() { @@ -56,11 +56,11 @@ public class ControlTab extends Control implements ITooltip, IControlValue } public boolean isCurrentSelection() { - return this.getValue() != null && this.getValue().equals(this.tabBar.getValue()); + return this.getValue().equals(this.tabBar.getValue()); } public Position getTabPosition() { - return this.tabBar.position; + return this.tabBar.getDirection(); } public String getName() { diff --git a/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java b/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java index bf405bc1..7d000c53 100644 --- a/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java +++ b/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java @@ -6,15 +6,23 @@ import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventValueChanged; +import com.google.common.collect.Iterables; import java.util.Collection; +import java.util.List; public class ControlTabBar extends Control implements IControlValue { - T value; - Position position; + private T value; + private Position position; - public ControlTabBar(final IWidget parent, final int x, final int y, final int width, final int height, final Position position) { + public ControlTabBar(final IWidget parent, final int x, final int y, final int width, final int height, final Position position, final Collection values) { + this(parent, x, y, width, height, position, Iterables.get(values, 0)); + setValues(values); + } + + public ControlTabBar(final IWidget parent, final int x, final int y, final int width, final int height, final Position position, final T value) { super(parent, x, y, width, height); + this.value = value; this.position = position; this.addEventHandler(new EventValueChanged.Handler() { @Override @@ -24,7 +32,7 @@ public class ControlTabBar extends Control implements IControlValue { }.setOrigin(EventHandler.Origin.DirectChild, this)); } - public void setValues(final Collection values) { + private void setValues(final Collection values) { final int i = 0; while (i < this.getWidgets().size()) { this.deleteChild(this.getWidgets().get(0)); @@ -43,9 +51,6 @@ public class ControlTabBar extends Control implements IControlValue { } ++j; } - if (this.value == null && !values.isEmpty()) { - this.setValue(values.iterator().next()); - } } public ControlTab createTab(final int x, final int y, final int w, final int h, final T value) { diff --git a/src/main/java/binnie/craftgui/controls/tab/package-info.java b/src/main/java/binnie/craftgui/controls/tab/package-info.java new file mode 100644 index 00000000..0d1f838f --- /dev/null +++ b/src/main/java/binnie/craftgui/controls/tab/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.controls.tab; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/core/Widget.java b/src/main/java/binnie/craftgui/core/Widget.java index 785e0efe..07ad3474 100644 --- a/src/main/java/binnie/craftgui/core/Widget.java +++ b/src/main/java/binnie/craftgui/core/Widget.java @@ -12,7 +12,7 @@ import java.util.ConcurrentModificationException; import java.util.List; public class Widget implements IWidget { - private IWidget parent; + private final IWidget parent; private List subWidgets; private List attributes; private IPoint position; @@ -27,7 +27,6 @@ public class Widget implements IWidget { private boolean visible; public Widget(final IWidget parent) { - this.parent = null; this.subWidgets = new ArrayList<>(); this.attributes = new ArrayList<>(); this.position = IPoint.ZERO; @@ -39,9 +38,7 @@ public class Widget implements IWidget { this.enabled = true; this.visible = true; this.parent = parent; - if (parent != null) { - parent.addWidget(this); - } + parent.addWidget(this); } @Override diff --git a/src/main/java/binnie/craftgui/core/geometry/package-info.java b/src/main/java/binnie/craftgui/core/geometry/package-info.java new file mode 100644 index 00000000..c08d0395 --- /dev/null +++ b/src/main/java/binnie/craftgui/core/geometry/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.core.geometry; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/core/package-info.java b/src/main/java/binnie/craftgui/core/package-info.java new file mode 100644 index 00000000..d0bedb03 --- /dev/null +++ b/src/main/java/binnie/craftgui/core/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.core; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java index 65c23f2a..328f5a70 100644 --- a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java +++ b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java @@ -57,7 +57,6 @@ public class RenderUtil { net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } - @Nonnull private static FontRenderer getFontRenderer(Minecraft minecraft, ItemStack ingredient) { FontRenderer fontRenderer = ingredient.getItem().getFontRenderer(ingredient); if (fontRenderer == null) { @@ -154,7 +153,7 @@ public class RenderUtil { public static void drawSprite(final IPoint pos, final TextureAtlasSprite icon) { if (icon != null) { - BinnieCore.proxy.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + BinnieCore.getBinnieProxy().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexture(pos.x(), pos.y(), icon, 0, 0, 0); } } diff --git a/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java b/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java index 61086240..499bcf0c 100644 --- a/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java +++ b/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java @@ -119,7 +119,7 @@ public class TextureRenderer { public void setTexture(final Texture texture) { if (texture != null) { - BinnieCore.proxy.bindTexture(texture.getFilename()); + BinnieCore.getBinnieProxy().bindTexture(texture.getFilename()); } } diff --git a/src/main/java/binnie/craftgui/core/renderer/package-info.java b/src/main/java/binnie/craftgui/core/renderer/package-info.java new file mode 100644 index 00000000..fb60176f --- /dev/null +++ b/src/main/java/binnie/craftgui/core/renderer/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.core.renderer; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/events/EventValueChanged.java b/src/main/java/binnie/craftgui/events/EventValueChanged.java index 1724a758..10c48d02 100644 --- a/src/main/java/binnie/craftgui/events/EventValueChanged.java +++ b/src/main/java/binnie/craftgui/events/EventValueChanged.java @@ -2,14 +2,18 @@ package binnie.craftgui.events; import binnie.craftgui.core.IWidget; +import javax.annotation.Nullable; + public class EventValueChanged extends Event { + @Nullable public T value; - public EventValueChanged(final IWidget origin, final T value) { + public EventValueChanged(final IWidget origin, @Nullable final T value) { super(origin); this.value = value; } + @Nullable public T getValue() { return this.value; } diff --git a/src/main/java/binnie/craftgui/events/package-info.java b/src/main/java/binnie/craftgui/events/package-info.java new file mode 100644 index 00000000..3d40f0c5 --- /dev/null +++ b/src/main/java/binnie/craftgui/events/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.events; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index 33f91523..637ad188 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -281,7 +281,7 @@ public class ContainerCraftGUI extends Container { if (shouldSend) { //TODO INVENTORY this.crafters.stream().filter(Objects::nonNull).forEach(entityPlayer -> { - BinnieCore.proxy.sendToPlayer(new MessageContainerUpdate(nbt.getValue()), entityPlayer); + BinnieCore.getBinnieProxy().sendToPlayer(new MessageContainerUpdate(nbt.getValue()), entityPlayer); }); sentThisTime.put(nbt.getKey(), nbt.getValue()); } diff --git a/src/main/java/binnie/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/craftgui/minecraft/CustomSlot.java index 5c9eee80..ba804e35 100644 --- a/src/main/java/binnie/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/CustomSlot.java @@ -9,16 +9,19 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + public class CustomSlot extends Slot { @Override - public boolean isItemValid(final ItemStack par1ItemStack) { - return this.inventory.isItemValidForSlot(this.getSlotIndex(), par1ItemStack); + public boolean isItemValid(@Nullable final ItemStack stack) { + return stack != null && this.inventory.isItemValidForSlot(this.getSlotIndex(), stack); } public CustomSlot(final IInventory inventory, final int index) { super(inventory, index, 0, 0); } + @Nullable public InventorySlot getInventorySlot() { final IInventorySlots slots = Machine.getInterface(IInventorySlots.class, this.inventory); if (slots != null) { diff --git a/src/main/java/binnie/craftgui/minecraft/GUIIcon.java b/src/main/java/binnie/craftgui/minecraft/GUIIcon.java index 65272642..e725ac0c 100644 --- a/src/main/java/binnie/craftgui/minecraft/GUIIcon.java +++ b/src/main/java/binnie/craftgui/minecraft/GUIIcon.java @@ -26,7 +26,7 @@ public enum GUIIcon { } public void register() { - this.icon = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/" + this.path); + this.icon = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/" + this.path); } public BinnieSprite getIcon() { diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index eeeb3d93..09953eb6 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -41,6 +41,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Deque; @@ -51,10 +52,13 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG private ControlText title; protected int titleButtonLeft; protected int titleButtonRight; + @Nullable private StandardTexture bgText1; + @Nullable private StandardTexture bgText2; private boolean hasBeenInitialised; private EntityPlayer player; + @Nullable private IInventory entityInventory; private Side side; @@ -187,7 +191,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG if (this.getSize().x() > 256) { this.bgText2 = new StandardTexture(0, 0, 256, 256, this.getBackgroundTextureFile(2)); } - if (!BinnieCore.proxy.checkTexture(this.bgText1.getTexture())) { + if (!BinnieCore.getBinnieProxy().checkTexture(this.bgText1.getTexture())) { this.bgText1 = null; this.bgText2 = null; } @@ -234,6 +238,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG return null; } + @Nullable public IInventory getInventory() { return this.entityInventory; } @@ -264,7 +269,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG if (this.getPlayer() != null) { return this.getPlayer().worldObj; } - return BinnieCore.proxy.getWorld(); + return BinnieCore.getBinnieProxy().getWorld(); } public void onInventoryUpdate() { @@ -273,7 +278,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG public void sendClientAction(final String name, final NBTTagCompound action) { action.setString("type", name); final MessageCraftGUI packet = new MessageCraftGUI(action); - BinnieCore.proxy.sendToServer(packet); + BinnieCore.getBinnieProxy().sendToServer(packet); } @Override diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java index 8c6801b8..060edbcf 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java @@ -20,6 +20,8 @@ import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.inventory.IInventory; +import javax.annotation.Nullable; + public class ControlEnergyBar extends Control implements ITooltip { public static boolean isError; private Position direction; @@ -30,14 +32,14 @@ public class ControlEnergyBar extends Control implements ITooltip { this.addAttribute(Attribute.MouseOver); } + @Nullable public IPoweredMachine getClientPower() { final IInventory inventory = Window.get(this).getInventory(); final TileEntityMachine machine = (inventory instanceof TileEntityMachine) ? (TileEntityMachine) inventory : null; if (machine == null) { return null; } - final IPoweredMachine clientPower = machine.getMachine().getInterface(IPoweredMachine.class); - return clientPower; + return machine.getMachine().getInterface(IPoweredMachine.class); } public float getPercentage() { diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java index ffe9d3b8..040f17bf 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java @@ -14,7 +14,10 @@ import binnie.craftgui.minecraft.Window; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.entity.player.InventoryPlayer; +import javax.annotation.Nullable; + public class ControlErrorState extends Control implements ITooltip { + @Nullable private ErrorState errorState; private int type; @@ -92,6 +95,7 @@ public class ControlErrorState extends Control implements ITooltip { } } + @Nullable public ErrorState getErrorState() { return this.errorState; } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java index d4176bc8..1e306983 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java @@ -13,7 +13,7 @@ public class ControlIconDisplay extends Control { public ControlIconDisplay(final IWidget parent, final int x, final int y, final ResourceLocation icon) { super(parent, x, y, 16, 16); - this.sprite = BinnieCore.proxy.getTextureAtlasSprite(icon); + this.sprite = BinnieCore.getBinnieProxy().getTextureAtlasSprite(icon); } @Override diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java index 51f4e10d..07fe917c 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java @@ -110,10 +110,10 @@ public class ControlLiquidTank extends Control implements ITooltip { CraftGUI.render.limitArea(new IArea(limited.pos().add(pos).add(offset), limited.size().sub(offset)), guiWidth, guiHeight); GL11.glEnable(GL11.GL_SCISSOR_TEST); { - BinnieCore.proxy.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + BinnieCore.getBinnieProxy().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); for (int y = 0; y < height; y += 16) { for (int x = 0; x < (this.horizontal ? 58 : 16); x += 16) { - final TextureAtlasSprite icon = BinnieCore.proxy.getTextureAtlasSprite(fluid.getStill()); + final TextureAtlasSprite icon = BinnieCore.getBinnieProxy().getTextureAtlasSprite(fluid.getStill()); RenderUtil.drawSprite(new IPoint(1 + x, 1 + y), icon); } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/package-info.java b/src/main/java/binnie/craftgui/minecraft/control/package-info.java new file mode 100644 index 00000000..28684393 --- /dev/null +++ b/src/main/java/binnie/craftgui/minecraft/control/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.minecraft.control; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/minecraft/package-info.java b/src/main/java/binnie/craftgui/minecraft/package-info.java new file mode 100644 index 00000000..a0d3fef3 --- /dev/null +++ b/src/main/java/binnie/craftgui/minecraft/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.minecraft; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/minecraft/render/package-info.java b/src/main/java/binnie/craftgui/minecraft/render/package-info.java new file mode 100644 index 00000000..54793595 --- /dev/null +++ b/src/main/java/binnie/craftgui/minecraft/render/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.minecraft.render; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java index 557f9cc1..14326070 100644 --- a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java @@ -156,7 +156,7 @@ public abstract class WindowAbstractDatabase extends Window { } }); this.addTabs(); - final ControlTabBar tab = new ControlTabBar(this, 176 + this.selectionBoxWidth, 24, 22, 176, Position.Right) { + final ControlTabBar tab = new ControlTabBar(this, 176 + this.selectionBoxWidth, 24, 22, 176, Position.Right, this.modePages.getValues()) { @Override public ControlTab createTab(final int x, final int y, final int w, final int h, final IDatabaseMode value) { return new ControlTab(this, x, y, w, h, value) { @@ -167,12 +167,10 @@ public abstract class WindowAbstractDatabase extends Window { }; } }; - tab.setValues(this.modePages.getValues()); 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, Position.Left); - this.modes.get(mode).infoTabs.setValues(this.modes.get(mode).infoPages.getValues()); + this.modes.get(mode).infoTabs = new ControlTabBar<>(this.modes.get(mode).modePage, 8, 24, 16, 176, Position.Left, this.modes.get(mode).infoPages.getValues()); CraftGUIUtil.linkWidgets(this.modes.get(mode).infoTabs, this.modes.get(mode).infoPages); } } @@ -216,7 +214,7 @@ public abstract class WindowAbstractDatabase extends Window { @Override public String getName() { - return BinnieCore.proxy.localise("gui.database.mode." + this.name().toLowerCase()); + return BinnieCore.getBinnieProxy().localise("gui.database.mode." + this.name().toLowerCase()); } } diff --git a/src/main/java/binnie/craftgui/mod/database/package-info.java b/src/main/java/binnie/craftgui/mod/database/package-info.java new file mode 100644 index 00000000..b16276b6 --- /dev/null +++ b/src/main/java/binnie/craftgui/mod/database/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.mod.database; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java b/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java index 0f60e5ca..f66302e0 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java +++ b/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java @@ -23,7 +23,7 @@ public enum CraftGUITextureSheet implements IBinnieTexture { @Override public BinnieResource getTexture() { - if (BinnieCore.proxy.isServer()) { + if (BinnieCore.getBinnieProxy().isServer()) { return null; } return CraftGUI.resourceManager.getTextureSheet(this.name).getTexture(); diff --git a/src/main/java/binnie/craftgui/resource/minecraft/package-info.java b/src/main/java/binnie/craftgui/resource/minecraft/package-info.java new file mode 100644 index 00000000..ed4730b5 --- /dev/null +++ b/src/main/java/binnie/craftgui/resource/minecraft/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.resource.minecraft; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/resource/package-info.java b/src/main/java/binnie/craftgui/resource/package-info.java new file mode 100644 index 00000000..813ab962 --- /dev/null +++ b/src/main/java/binnie/craftgui/resource/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.resource; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/window/package-info.java b/src/main/java/binnie/craftgui/window/package-info.java new file mode 100644 index 00000000..7979ef14 --- /dev/null +++ b/src/main/java/binnie/craftgui/window/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.craftgui.window; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index f3b9b7d9..17c8bea9 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -27,10 +27,14 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @Mod(modid = Constants.EXTRA_BEES_MOD_ID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraBees extends AbstractMod { + @SuppressWarnings("NullableProblems") @Mod.Instance(Constants.EXTRA_BEES_MOD_ID) public static ExtraBees instance; + + @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesProxyClient", serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer") public static ExtraBeesProxy proxy; + public static Block hive; public static Material materialBeehive; public static Block ectoplasm; diff --git a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java index 80d2e467..964e8bad 100644 --- a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java @@ -16,17 +16,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; +import javax.annotation.Nullable; + public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { Cocoa, Cage, - Soul, + Soul(80), Clay, Debug; - Item item; - int maxDamage; - BeeModifierLogic logic; - public static void init() { EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.Lifespan, 0.75f, 0.25f); EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.Production, 1.5f, 5.0f); @@ -36,7 +34,6 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.Mutation, 1.5f, 5.0f); EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.Lifespan, 0.75f, 0.5f); EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.Production, 0.25f, 0.1f); - EnumHiveFrame.Soul.setMaxDamage(80); EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.Lifespan, 1.5f, 5.0f); EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.Mutation, 0.5f, 0.2f); EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.Production, 0.75f, 0.2f); @@ -47,20 +44,30 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Clay.item), " c ", "cFc", " c ", 'F', Mods.Forestry.stack("frameImpregnated"), 'c', Items.CLAY_BALL); } + private final Item item; + private final int maxDamage; + private final BeeModifierLogic logic; + + EnumHiveFrame() { + this(240); + } + + EnumHiveFrame(int maxDamage) { + this.maxDamage = maxDamage; + this.logic = new BeeModifierLogic(); + this.item = new ItemHiveFrame(this).setRegistryName("hiveFrame." + name().toLowerCase()); + } + public int getIconIndex() { return 55 + this.ordinal(); } - public void setMaxDamage(final int damage) { - this.maxDamage = damage; - } - - EnumHiveFrame() { - this.maxDamage = 240; - this.logic = new BeeModifierLogic(); + public int getMaxDamage() { + return maxDamage; } @Override + @Nullable public ItemStack frameUsed(final IBeeHousing house, final ItemStack frame, final IBee queen, final int wear) { frame.setItemDamage(frame.getItemDamage() + wear); if (frame.getItemDamage() >= frame.getMaxDamage()) { @@ -127,4 +134,8 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { public IBeeModifier getBeeModifier() { return this; } + + public Item getItem() { + return item; + } } diff --git a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java index 858d5caa..14e4d735 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java @@ -21,7 +21,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt public ItemHiveFrame(final EnumHiveFrame frame) { this.frame = frame; - this.setMaxDamage(frame.maxDamage); + this.setMaxDamage(frame.getMaxDamage()); this.setCreativeTab(Tabs.tabApiculture); this.setMaxStackSize(1); this.setUnlocalizedName("hiveFrame"); diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index f94125fb..36d6051c 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -29,7 +29,7 @@ public class ModuleApiary implements IInitializable { public void preInit() { final MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values()); machineGroup.setCreativeTab(Tabs.tabApiculture); - BinnieCore.proxy.registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary", null); + BinnieCore.getBinnieProxy().registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary", null); ModuleApiary.blockComponent = machineGroup.getBlock(); AlvearyMutator.addMutationItem(new ItemStack(Blocks.SOUL_SAND), 1.5f); AlvearyMutator.addMutationItem(Mods.IC2.stack("UranFuel"), 4.0f); @@ -42,8 +42,7 @@ public class ModuleApiary implements IInitializable { AlvearyMutator.addMutationItem(new ItemStack(Items.ENDER_PEARL), 2.0f); AlvearyMutator.addMutationItem(new ItemStack(Items.ENDER_EYE), 4.0f); for (final EnumHiveFrame frame : EnumHiveFrame.values()) { - frame.item = new ItemHiveFrame(frame).setRegistryName("hiveFrame." + frame.name().toLowerCase()); - ExtraBees.proxy.registerItem(frame.item); + ExtraBees.proxy.registerItem(frame.getItem()); } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/package-info.java b/src/main/java/binnie/extrabees/apiary/machine/package-info.java new file mode 100644 index 00000000..2efd3272 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.apiary.machine; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/apiary/package-info.java b/src/main/java/binnie/extrabees/apiary/package-info.java new file mode 100644 index 00000000..1033a5b3 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.apiary; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/config/package-info.java b/src/main/java/binnie/extrabees/config/package-info.java new file mode 100644 index 00000000..9a10b512 --- /dev/null +++ b/src/main/java/binnie/extrabees/config/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.config; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/core/package-info.java b/src/main/java/binnie/extrabees/core/package-info.java new file mode 100644 index 00000000..83119bdd --- /dev/null +++ b/src/main/java/binnie/extrabees/core/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.core; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 8c815a0e..a9a4420e 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -118,7 +118,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo } } - public boolean isAcceptedFlower(final World world, final IIndividual individual, final BlockPos pos) { + public boolean isAcceptedFlower(final World world, final BlockPos pos) { final Block block = world.getBlockState(pos).getBlock(); switch (this) { case WATER: { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index e2707473..d8202d3f 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -10,6 +10,7 @@ import binnie.extrabees.core.BeeModelProvider; import binnie.extrabees.genetics.effect.ExtraBeesEffect; import binnie.extrabees.products.EnumHoneyComb; import binnie.extrabees.products.ItemHoneyComb; +import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; @@ -37,9 +38,9 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; @@ -171,22 +172,25 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { BLUTONIUM("caruthus", 1769702), MYSTICAL("mystica", 4630306); - private int primaryColor; + private final int primaryColor; private int secondaryColor; private EnumTemperature temperature; private EnumHumidity humidity; private boolean hasEffect; private boolean isSecret; private boolean isCounted; - private String binomial; + private final String binomial; + @Nullable private IClassification branch; private String uid; + @Nullable private Achievement achievement; private boolean dominant; - private HashMap products; - private HashMap specialties; - public HashMap allProducts; - public HashMap allSpecialties; + private final Map products; + private final Map specialties; + public final Map allProducts; + public final Map allSpecialties; + @Nullable private IAllele[] template; public State state; boolean nocturnal; @@ -199,7 +203,6 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { this.hasEffect = false; this.isSecret = true; this.isCounted = true; - this.binomial = ""; this.branch = null; this.uid = ""; this.achievement = null; @@ -212,29 +215,10 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { this.nocturnal = false; this.uid = this.toString().toLowerCase(); this.binomial = binomial; - this.primaryColor = colour; } ExtraBeesSpecies() { - this.primaryColor = 16777215; - this.secondaryColor = 16768022; - this.temperature = EnumTemperature.NORMAL; - this.humidity = EnumHumidity.NORMAL; - this.hasEffect = false; - this.isSecret = true; - this.isCounted = true; - this.binomial = ""; - this.branch = null; - this.uid = ""; - this.achievement = null; - this.dominant = true; - this.products = new LinkedHashMap<>(); - this.specialties = new LinkedHashMap<>(); - this.allProducts = new LinkedHashMap<>(); - this.allSpecialties = new LinkedHashMap<>(); - this.state = State.Active; - this.nocturnal = false; - this.state = State.Deprecated; + this("", 16777215); } @Override @@ -297,11 +281,11 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { return this.dominant; } - public HashMap getProducts() { + public Map getProducts() { return this.products; } - public HashMap getSpecialty() { + public Map getSpecialty() { return this.specialties; } @@ -316,7 +300,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } } - public void addProduct(final ItemStack product, final Float chance) { + public void addProduct(@Nullable final ItemStack product, final Float chance) { if (product == null) { this.setState(State.Inactive); } else { @@ -334,7 +318,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } } - public void addSpecialty(final ItemStack product, final Float chance) { + public void addSpecialty(@Nullable final ItemStack product, final Float chance) { if (product == null) { this.setState(State.Inactive); } else { @@ -361,10 +345,12 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } public static IAllele[] getDefaultTemplate() { - return Binnie.GENETICS.getBeeRoot().getDefaultTemplate(); + IBeeRoot beeRoot = Binnie.GENETICS.getBeeRoot(); + return beeRoot.getDefaultTemplate(); } public IAllele[] getTemplate() { + Preconditions.checkState(this.template != null, "Species Template has not been set: %s", name()); this.template[EnumBeeChromosome.SPECIES.ordinal()] = this; return this.template; } @@ -378,14 +364,15 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } public void importTemplate(final IAllele[] template) { - this.template = template.clone(); + IAllele[] templateCopy = template.clone(); this.setHumidity(((IAlleleSpecies) template[0]).getHumidity()); this.setTemperature(((IAlleleSpecies) template[0]).getTemperature()); this.setSecondaryColor(((IAlleleSpecies) template[0]).getSpriteColour(1)); - this.template[EnumBeeChromosome.SPECIES.ordinal()] = this; + templateCopy[EnumBeeChromosome.SPECIES.ordinal()] = this; + this.template = templateCopy; } - public void recessive() { + public void setRecessive() { this.dominant = false; } @@ -393,8 +380,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { this.isSecret = secret; } - public void setHasEffect(final boolean effect) { - this.hasEffect = effect; + public void setHasEffect() { + this.hasEffect = true; } public void setSecondaryColor(final int colour) { @@ -402,31 +389,37 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } public static void doInit() { - for (final ExtraBeesSpecies species : values()) { - species.template = getDefaultTemplate(); - } final int aridBody = 13362036; final int rockBody = 10066329; final int endBody = 14278302; + + for (ExtraBeesSpecies species : values()) { + species.importTemplate(getDefaultTemplate()); + } + ExtraBeesSpecies.ARID.importTemplate(ForestryAllele.BeeSpecies.Modest); ExtraBeesSpecies.ARID.addProduct(EnumHoneyComb.BARREN, 0.30f); ExtraBeesSpecies.ARID.setHumidity(EnumHumidity.ARID); ExtraBeesSpecies.ARID.setFlowerProvider(ExtraBeesFlowers.DEAD.getUID()); ExtraBeesSpecies.ARID.setTemperatureTolerance(Tolerance.Up1); ExtraBeesSpecies.ARID.setSecondaryColor(aridBody); + ExtraBeesSpecies.BARREN.importTemplate(ExtraBeesSpecies.ARID); ExtraBeesSpecies.BARREN.setFertility(ForestryAllele.Fertility.Low); ExtraBeesSpecies.BARREN.addProduct(EnumHoneyComb.BARREN, 0.30f); - ExtraBeesSpecies.DESOLATE.addProduct(EnumHoneyComb.BARREN, 0.30f); + ExtraBeesSpecies.DESOLATE.importTemplate(ExtraBeesSpecies.BARREN); + ExtraBeesSpecies.DESOLATE.addProduct(EnumHoneyComb.BARREN, 0.30f); ExtraBeesSpecies.DESOLATE.setEffect(ExtraBeesEffect.HUNGER.getUID()); - ExtraBeesSpecies.DESOLATE.recessive(); + ExtraBeesSpecies.DESOLATE.setRecessive(); ExtraBeesSpecies.DESOLATE.setNocturnal(); - ExtraBeesSpecies.DESOLATE.setHasEffect(true); + ExtraBeesSpecies.DESOLATE.setHasEffect(); + ExtraBeesSpecies.GNAWING.importTemplate(ExtraBeesSpecies.BARREN); ExtraBeesSpecies.GNAWING.setFlowerProvider(ExtraBeesFlowers.WOOD.getUID()); ExtraBeesSpecies.GNAWING.addProduct(EnumHoneyComb.BARREN, 0.25f); ExtraBeesSpecies.GNAWING.addSpecialty(EnumHoneyComb.SAWDUST, 0.25f); + ExtraBeesSpecies.ROTTEN.importTemplate(ExtraBeesSpecies.DESOLATE); ExtraBeesSpecies.ROTTEN.setNocturnal(); ExtraBeesSpecies.ROTTEN.setCaveDwelling(); @@ -434,18 +427,22 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.ROTTEN.setEffect(ExtraBeesEffect.SPAWN_ZOMBIE.getUID()); ExtraBeesSpecies.ROTTEN.addProduct(EnumHoneyComb.BARREN, 0.30f); ExtraBeesSpecies.ROTTEN.addSpecialty(EnumHoneyComb.ROTTEN, 0.10f); + ExtraBeesSpecies.BONE.importTemplate(ExtraBeesSpecies.ROTTEN); ExtraBeesSpecies.BONE.addProduct(EnumHoneyComb.BARREN, 0.30f); ExtraBeesSpecies.BONE.addSpecialty(EnumHoneyComb.BONE, 0.10f); ExtraBeesSpecies.BONE.setEffect(ExtraBeesEffect.SPAWN_SKELETON.getUID()); + ExtraBeesSpecies.CREEPER.importTemplate(ExtraBeesSpecies.ROTTEN); ExtraBeesSpecies.CREEPER.setAllDay(); ExtraBeesSpecies.CREEPER.addProduct(EnumHoneyComb.BARREN, 0.30f); ExtraBeesSpecies.CREEPER.addSpecialty(ItemHoneyComb.VanillaComb.POWDERY.get(), 0.08f); ExtraBeesSpecies.CREEPER.setEffect(ExtraBeesEffect.SPAWN_CREEPER.getUID()); + ExtraBeesSpecies.DECOMPOSING.importTemplate(ExtraBeesSpecies.BARREN); ExtraBeesSpecies.DECOMPOSING.addProduct(EnumHoneyComb.BARREN, 0.30f); ExtraBeesSpecies.DECOMPOSING.addSpecialty(EnumHoneyComb.COMPOST, 0.08f); + ExtraBeesSpecies.ROCK.addProduct(EnumHoneyComb.STONE, 0.30f); ExtraBeesSpecies.ROCK.setIsSecret(false); ExtraBeesSpecies.ROCK.setAllDay(); @@ -457,141 +454,174 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.ROCK.setFertility(ForestryAllele.Fertility.Low); ExtraBeesSpecies.ROCK.setLifespan(ForestryAllele.Lifespan.Short); ExtraBeesSpecies.ROCK.setSecondaryColor(rockBody); - ExtraBeesSpecies.STONE.addProduct(EnumHoneyComb.STONE, 0.30f); + ExtraBeesSpecies.STONE.importTemplate(ExtraBeesSpecies.ROCK); - ExtraBeesSpecies.STONE.recessive(); + ExtraBeesSpecies.STONE.addProduct(EnumHoneyComb.STONE, 0.30f); + ExtraBeesSpecies.STONE.setRecessive(); ExtraBeesSpecies.STONE.setSecondaryColor(rockBody); - ExtraBeesSpecies.GRANITE.addProduct(EnumHoneyComb.STONE, 0.30f); + ExtraBeesSpecies.GRANITE.importTemplate(ExtraBeesSpecies.STONE); + ExtraBeesSpecies.GRANITE.addProduct(EnumHoneyComb.STONE, 0.30f); ExtraBeesSpecies.GRANITE.setTemperatureTolerance(Tolerance.Both2); ExtraBeesSpecies.GRANITE.setHumidityTolerance(Tolerance.Both2); ExtraBeesSpecies.GRANITE.setSecondaryColor(rockBody); - ExtraBeesSpecies.MINERAL.addProduct(EnumHoneyComb.STONE, 0.30f); + ExtraBeesSpecies.MINERAL.importTemplate(ExtraBeesSpecies.GRANITE); + ExtraBeesSpecies.MINERAL.addProduct(EnumHoneyComb.STONE, 0.30f); ExtraBeesSpecies.MINERAL.setSecondaryColor(rockBody); + + ExtraBeesSpecies.COPPER.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.COPPER.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.COPPER.addSpecialty(EnumHoneyComb.COPPER, 0.06f); - ExtraBeesSpecies.COPPER.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.COPPER.setSecondaryColor(rockBody); + + ExtraBeesSpecies.TIN.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.TIN.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.TIN.addSpecialty(EnumHoneyComb.TIN, 0.06f); - ExtraBeesSpecies.TIN.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.TIN.setSecondaryColor(rockBody); + + ExtraBeesSpecies.IRON.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.IRON.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.IRON.addSpecialty(EnumHoneyComb.IRON, 0.05f); - ExtraBeesSpecies.IRON.importTemplate(ExtraBeesSpecies.MINERAL); - ExtraBeesSpecies.IRON.recessive(); + ExtraBeesSpecies.IRON.setRecessive(); ExtraBeesSpecies.IRON.setSecondaryColor(rockBody); + + ExtraBeesSpecies.LEAD.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.LEAD.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.LEAD.addSpecialty(EnumHoneyComb.LEAD, 0.50f); - ExtraBeesSpecies.LEAD.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.LEAD.setSecondaryColor(rockBody); + + ExtraBeesSpecies.NICKEL.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.NICKEL.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.NICKEL.addSpecialty(EnumHoneyComb.NICKEL, 0.05f); - ExtraBeesSpecies.NICKEL.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.NICKEL.setSecondaryColor(rockBody); + + ExtraBeesSpecies.ZINC.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.ZINC.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.ZINC.addSpecialty(EnumHoneyComb.ZINC, 0.05f); - ExtraBeesSpecies.ZINC.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.ZINC.setSecondaryColor(rockBody); + + ExtraBeesSpecies.TITANIUM.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.TITANIUM.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.TITANIUM.addSpecialty(EnumHoneyComb.TITANIUM, 0.02f); - ExtraBeesSpecies.TITANIUM.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.TITANIUM.setSecondaryColor(rockBody); + + ExtraBeesSpecies.TUNGSTATE.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.TUNGSTATE.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.TUNGSTATE.addSpecialty(EnumHoneyComb.TUNGSTEN, 0.01f); - ExtraBeesSpecies.TUNGSTATE.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.TUNGSTATE.setSecondaryColor(rockBody); + + ExtraBeesSpecies.GOLD.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.GOLD.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.GOLD.addSpecialty(EnumHoneyComb.GOLD, 0.02f); - ExtraBeesSpecies.GOLD.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.GOLD.setSecondaryColor(rockBody); + + ExtraBeesSpecies.SILVER.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.SILVER.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.SILVER.addSpecialty(EnumHoneyComb.SILVER, 0.02f); - ExtraBeesSpecies.SILVER.importTemplate(ExtraBeesSpecies.MINERAL); - ExtraBeesSpecies.SILVER.recessive(); - ExtraBeesSpecies.SILVER.recessive(); + ExtraBeesSpecies.SILVER.setRecessive(); ExtraBeesSpecies.SILVER.setSecondaryColor(rockBody); + + ExtraBeesSpecies.PLATINUM.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.PLATINUM.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.PLATINUM.addSpecialty(EnumHoneyComb.PLATINUM, 0.01f); - ExtraBeesSpecies.PLATINUM.importTemplate(ExtraBeesSpecies.MINERAL); - ExtraBeesSpecies.PLATINUM.recessive(); + ExtraBeesSpecies.PLATINUM.setRecessive(); ExtraBeesSpecies.PLATINUM.setSecondaryColor(rockBody); + + ExtraBeesSpecies.LAPIS.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.LAPIS.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.LAPIS.addSpecialty(EnumHoneyComb.LAPIS, 0.05f); - ExtraBeesSpecies.LAPIS.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.LAPIS.setSecondaryColor(rockBody); + + ExtraBeesSpecies.EMERALD.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.EMERALD.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.EMERALD.addSpecialty(EnumHoneyComb.EMERALD, 0.04f); - ExtraBeesSpecies.EMERALD.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.EMERALD.setSecondaryColor(rockBody); + + ExtraBeesSpecies.RUBY.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.RUBY.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.RUBY.addSpecialty(EnumHoneyComb.RUBY, 0.03f); - ExtraBeesSpecies.RUBY.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.RUBY.setSecondaryColor(rockBody); + + ExtraBeesSpecies.SAPPHIRE.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.SAPPHIRE.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.SAPPHIRE.addSpecialty(EnumHoneyComb.SAPPHIRE, 0.03f); - ExtraBeesSpecies.SAPPHIRE.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.SAPPHIRE.setSecondaryColor(rockBody); + + ExtraBeesSpecies.DIAMOND.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.DIAMOND.addProduct(EnumHoneyComb.STONE, 0.20f); ExtraBeesSpecies.DIAMOND.addSpecialty(EnumHoneyComb.DIAMOND, 0.01f); - ExtraBeesSpecies.DIAMOND.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.DIAMOND.setSecondaryColor(rockBody); + ExtraBeesSpecies.UNSTABLE.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.UNSTABLE.addProduct(EnumHoneyComb.BARREN, 0.20f); ExtraBeesSpecies.UNSTABLE.setEffect(ExtraBeesEffect.RADIOACTIVE.getUID()); ExtraBeesSpecies.UNSTABLE.setFertility(ForestryAllele.Fertility.Low); ExtraBeesSpecies.UNSTABLE.setLifespan(ForestryAllele.Lifespan.Shortest); - ExtraBeesSpecies.UNSTABLE.recessive(); + ExtraBeesSpecies.UNSTABLE.setRecessive(); + ExtraBeesSpecies.NUCLEAR.importTemplate(ExtraBeesSpecies.UNSTABLE); ExtraBeesSpecies.NUCLEAR.addProduct(EnumHoneyComb.BARREN, 0.20f); - ExtraBeesSpecies.NUCLEAR.recessive(); + ExtraBeesSpecies.NUCLEAR.setRecessive(); + ExtraBeesSpecies.RADIOACTIVE.importTemplate(ExtraBeesSpecies.NUCLEAR); ExtraBeesSpecies.RADIOACTIVE.addProduct(EnumHoneyComb.BARREN, 0.20f); ExtraBeesSpecies.RADIOACTIVE.addSpecialty(EnumHoneyComb.URANIUM, 0.02f); - ExtraBeesSpecies.RADIOACTIVE.setHasEffect(true); - ExtraBeesSpecies.RADIOACTIVE.recessive(); + ExtraBeesSpecies.RADIOACTIVE.setHasEffect(); + ExtraBeesSpecies.RADIOACTIVE.setRecessive(); + ExtraBeesSpecies.ANCIENT.importTemplate(ForestryAllele.BeeSpecies.Noble); ExtraBeesSpecies.ANCIENT.addProduct(EnumHoneyComb.OLD, 0.30f); ExtraBeesSpecies.ANCIENT.setLifespan(ForestryAllele.Lifespan.Elongated); + ExtraBeesSpecies.PRIMEVAL.importTemplate(ExtraBeesSpecies.ANCIENT); ExtraBeesSpecies.PRIMEVAL.addProduct(EnumHoneyComb.OLD, 0.30f); ExtraBeesSpecies.PRIMEVAL.setLifespan(ForestryAllele.Lifespan.Long); + ExtraBeesSpecies.PREHISTORIC.importTemplate(ExtraBeesSpecies.ANCIENT); ExtraBeesSpecies.PREHISTORIC.addProduct(EnumHoneyComb.OLD, 0.30f); ExtraBeesSpecies.PREHISTORIC.setLifespan(ForestryAllele.Lifespan.Longer); ExtraBeesSpecies.PREHISTORIC.setFertility(ForestryAllele.Fertility.Low); - ExtraBeesSpecies.PREHISTORIC.recessive(); + ExtraBeesSpecies.PREHISTORIC.setRecessive(); + ExtraBeesSpecies.RELIC.importTemplate(ExtraBeesSpecies.ANCIENT); ExtraBeesSpecies.RELIC.addProduct(EnumHoneyComb.OLD, 0.30f); - ExtraBeesSpecies.RELIC.setHasEffect(true); + ExtraBeesSpecies.RELIC.setHasEffect(); ExtraBeesSpecies.RELIC.setLifespan(ForestryAllele.Lifespan.Longest); + ExtraBeesSpecies.COAL.importTemplate(ExtraBeesSpecies.ANCIENT); ExtraBeesSpecies.COAL.setLifespan(ForestryAllele.Lifespan.Normal); ExtraBeesSpecies.COAL.addProduct(EnumHoneyComb.OLD, 0.20f); ExtraBeesSpecies.COAL.addSpecialty(EnumHoneyComb.COAL, 0.08f); + ExtraBeesSpecies.RESIN.importTemplate(ExtraBeesSpecies.COAL); ExtraBeesSpecies.RESIN.addProduct(EnumHoneyComb.OLD, 0.20f); ExtraBeesSpecies.RESIN.addSpecialty(EnumHoneyComb.RESIN, 0.05f); - ExtraBeesSpecies.RESIN.recessive(); + ExtraBeesSpecies.RESIN.setRecessive(); + ExtraBeesSpecies.OIL.importTemplate(ExtraBeesSpecies.COAL); ExtraBeesSpecies.OIL.addProduct(EnumHoneyComb.OLD, 0.20f); ExtraBeesSpecies.OIL.addSpecialty(EnumHoneyComb.OIL, 0.05f); + ExtraBeesSpecies.DISTILLED.importTemplate(ExtraBeesSpecies.OIL); ExtraBeesSpecies.DISTILLED.addProduct(EnumHoneyComb.OIL, 0.10f); - ExtraBeesSpecies.DISTILLED.recessive(); + ExtraBeesSpecies.DISTILLED.setRecessive(); + ExtraBeesSpecies.FUEL.importTemplate(ExtraBeesSpecies.OIL); ExtraBeesSpecies.FUEL.addProduct(EnumHoneyComb.OIL, 0.10f); ExtraBeesSpecies.FUEL.addSpecialty(EnumHoneyComb.FUEL, 0.04f); - ExtraBeesSpecies.FUEL.setHasEffect(true); + ExtraBeesSpecies.FUEL.setHasEffect(); + ExtraBeesSpecies.CREOSOTE.importTemplate(ExtraBeesSpecies.COAL); ExtraBeesSpecies.CREOSOTE.addProduct(EnumHoneyComb.COAL, 0.10f); ExtraBeesSpecies.CREOSOTE.addSpecialty(EnumHoneyComb.CREOSOTE, 0.07f); - ExtraBeesSpecies.CREOSOTE.setHasEffect(true); + ExtraBeesSpecies.CREOSOTE.setHasEffect(); + ExtraBeesSpecies.LATEX.importTemplate(ExtraBeesSpecies.RESIN); ExtraBeesSpecies.LATEX.addProduct(EnumHoneyComb.RESIN, 0.10f); ExtraBeesSpecies.LATEX.addSpecialty(EnumHoneyComb.LATEX, 0.05f); - ExtraBeesSpecies.LATEX.setHasEffect(true); + ExtraBeesSpecies.LATEX.setHasEffect(); + ExtraBeesSpecies.WATER.addProduct(EnumHoneyComb.WATER, 0.30f); ExtraBeesSpecies.WATER.setIsSecret(false); ExtraBeesSpecies.WATER.setTolerantFlyer(); @@ -600,107 +630,130 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.WATER.setFlowering(ForestryAllele.Flowering.Slow); ExtraBeesSpecies.WATER.setEffect(ExtraBeesEffect.WATER.getUID()); ExtraBeesSpecies.WATER.setHumidity(EnumHumidity.DAMP); + ExtraBeesSpecies.RIVER.importTemplate(ExtraBeesSpecies.WATER); ExtraBeesSpecies.RIVER.addProduct(EnumHoneyComb.WATER, 0.30f); ExtraBeesSpecies.RIVER.addSpecialty(EnumHoneyComb.CLAY, 0.20f); - ExtraBeesSpecies.RIVER.importTemplate(ExtraBeesSpecies.WATER); + ExtraBeesSpecies.OCEAN.importTemplate(ExtraBeesSpecies.WATER); ExtraBeesSpecies.OCEAN.addProduct(EnumHoneyComb.WATER, 0.30f); ExtraBeesSpecies.OCEAN.importTemplate(ExtraBeesSpecies.WATER); - ExtraBeesSpecies.OCEAN.recessive(); + ExtraBeesSpecies.OCEAN.setRecessive(); + ExtraBeesSpecies.INK.importTemplate(ExtraBeesSpecies.OCEAN); ExtraBeesSpecies.INK.addProduct(EnumHoneyComb.WATER, 0.30f); ExtraBeesSpecies.INK.addSpecialty(new ItemStack(Items.DYE, 1, 0), 0.10f); + ExtraBeesSpecies.GROWING.importTemplate(ForestryAllele.BeeSpecies.Forest); ExtraBeesSpecies.GROWING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f); ExtraBeesSpecies.GROWING.setFlowering(ForestryAllele.Flowering.Average); ExtraBeesSpecies.GROWING.setFlowerProvider(ExtraBeesFlowers.LEAVES.getUID()); + ExtraBeesSpecies.THRIVING.importTemplate(ExtraBeesSpecies.GROWING); ExtraBeesSpecies.THRIVING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f); ExtraBeesSpecies.THRIVING.setFlowering(ForestryAllele.Flowering.Fast); + ExtraBeesSpecies.BLOOMING.importTemplate(ExtraBeesSpecies.THRIVING); ExtraBeesSpecies.BLOOMING.setFlowering(ForestryAllele.Flowering.Fastest); ExtraBeesSpecies.BLOOMING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f); ExtraBeesSpecies.BLOOMING.setFlowerProvider(ExtraBeesFlowers.Sapling.getUID()); ExtraBeesSpecies.BLOOMING.setEffect(ExtraBeesEffect.BonemealSapling.getUID()); + ExtraBeesSpecies.SWEET.importTemplate(ForestryAllele.BeeSpecies.Rural); ExtraBeesSpecies.SWEET.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.40f); ExtraBeesSpecies.SWEET.addProduct(new ItemStack(Items.SUGAR, 1, 0), 0.10f); ExtraBeesSpecies.SWEET.setFlowerProvider(ExtraBeesFlowers.SUGAR.getUID()); + + ExtraBeesSpecies.SUGAR.importTemplate(ExtraBeesSpecies.SWEET); ExtraBeesSpecies.SUGAR.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.40f); ExtraBeesSpecies.SUGAR.addProduct(new ItemStack(Items.SUGAR, 1, 0), 0.20f); - ExtraBeesSpecies.SUGAR.importTemplate(ExtraBeesSpecies.SWEET); + + ExtraBeesSpecies.RIPENING.importTemplate(ExtraBeesSpecies.SUGAR); ExtraBeesSpecies.RIPENING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f); ExtraBeesSpecies.RIPENING.addProduct(new ItemStack(Items.SUGAR, 1, 0), 0.10f); ExtraBeesSpecies.RIPENING.addSpecialty(EnumHoneyComb.FRUIT, 0.10f); ExtraBeesSpecies.RIPENING.setFlowerProvider(ExtraBeesFlowers.Fruit.getUID()); - ExtraBeesSpecies.RIPENING.importTemplate(ExtraBeesSpecies.SUGAR); + ExtraBeesSpecies.FRUIT.importTemplate(ExtraBeesSpecies.RIPENING); ExtraBeesSpecies.FRUIT.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f); ExtraBeesSpecies.FRUIT.addProduct(new ItemStack(Items.SUGAR, 1, 0), 0.15f); ExtraBeesSpecies.FRUIT.addSpecialty(EnumHoneyComb.FRUIT, 0.20f); ExtraBeesSpecies.FRUIT.setEffect(ExtraBeesEffect.BonemealFruit.getUID()); - ExtraBeesSpecies.FRUIT.setHasEffect(true); + ExtraBeesSpecies.FRUIT.setHasEffect(); + ExtraBeesSpecies.ALCOHOL.importTemplate(ExtraBeesSpecies.SWEET); ExtraBeesSpecies.ALCOHOL.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f); ExtraBeesSpecies.ALCOHOL.addSpecialty(EnumHoneyComb.ALCOHOL, 0.10f); ExtraBeesSpecies.ALCOHOL.setEffect("forestry.effectDrunkard"); - ExtraBeesSpecies.ALCOHOL.recessive(); + ExtraBeesSpecies.ALCOHOL.setRecessive(); + + ExtraBeesSpecies.FARM.importTemplate(ForestryAllele.BeeSpecies.Rural); ExtraBeesSpecies.FARM.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f); ExtraBeesSpecies.FARM.addSpecialty(EnumHoneyComb.SEED, 0.10f); - ExtraBeesSpecies.FARM.importTemplate(ForestryAllele.BeeSpecies.Rural); + + ExtraBeesSpecies.MILK.importTemplate(ForestryAllele.BeeSpecies.Rural); ExtraBeesSpecies.MILK.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f); ExtraBeesSpecies.MILK.addSpecialty(EnumHoneyComb.MILK, 0.10f); - ExtraBeesSpecies.MILK.importTemplate(ForestryAllele.BeeSpecies.Rural); + + ExtraBeesSpecies.COFFEE.importTemplate(ForestryAllele.BeeSpecies.Rural); ExtraBeesSpecies.COFFEE.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f); ExtraBeesSpecies.COFFEE.addSpecialty(EnumHoneyComb.COFFEE, 0.08f); - ExtraBeesSpecies.COFFEE.importTemplate(ForestryAllele.BeeSpecies.Rural); - ExtraBeesSpecies.SWAMP.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f); + ExtraBeesSpecies.SWAMP.importTemplate(ForestryAllele.BeeSpecies.Marshy); + ExtraBeesSpecies.SWAMP.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f); ExtraBeesSpecies.SWAMP.setHumidity(EnumHumidity.DAMP); ExtraBeesSpecies.SWAMP.setEffect(ExtraBeesEffect.SLOW.getUID()); + ExtraBeesSpecies.BOGGY.importTemplate(ExtraBeesSpecies.SWAMP); ExtraBeesSpecies.BOGGY.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f); ExtraBeesSpecies.BOGGY.importTemplate(ExtraBeesSpecies.SWAMP); - ExtraBeesSpecies.BOGGY.recessive(); + ExtraBeesSpecies.BOGGY.setRecessive(); + ExtraBeesSpecies.FUNGAL.importTemplate(ExtraBeesSpecies.BOGGY); ExtraBeesSpecies.FUNGAL.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f); ExtraBeesSpecies.FUNGAL.addSpecialty(EnumHoneyComb.FUNGAL, 0.15f); ExtraBeesSpecies.FUNGAL.importTemplate(ExtraBeesSpecies.BOGGY); ExtraBeesSpecies.FUNGAL.setEffect(ExtraBeesEffect.BonemealMushroom.getUID()); - ExtraBeesSpecies.FUNGAL.setHasEffect(true); - ExtraBeesSpecies.BASALT.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f); + ExtraBeesSpecies.FUNGAL.setHasEffect(); + ExtraBeesSpecies.BASALT.importTemplate(ForestryAllele.BeeSpecies.Sinister); + ExtraBeesSpecies.BASALT.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f); ExtraBeesSpecies.BASALT.setEffect("forestry.effectAggressive"); ExtraBeesSpecies.BASALT.setSecondaryColor(10101539); ExtraBeesSpecies.BASALT.setHumidity(EnumHumidity.ARID); ExtraBeesSpecies.BASALT.setTemperature(EnumTemperature.HELLISH); - ExtraBeesSpecies.TEMPERED.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f); + ExtraBeesSpecies.TEMPERED.importTemplate(ExtraBeesSpecies.BASALT); + ExtraBeesSpecies.TEMPERED.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f); ExtraBeesSpecies.TEMPERED.setEffect(ExtraBeesEffect.METEOR.getUID()); - ExtraBeesSpecies.TEMPERED.recessive(); + ExtraBeesSpecies.TEMPERED.setRecessive(); ExtraBeesSpecies.TEMPERED.setSecondaryColor(10101539); + ExtraBeesSpecies.VOLCANIC.importTemplate(ExtraBeesSpecies.TEMPERED); ExtraBeesSpecies.VOLCANIC.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f); ExtraBeesSpecies.VOLCANIC.addSpecialty(EnumHoneyComb.BLAZE, 0.10f); - ExtraBeesSpecies.VOLCANIC.setHasEffect(true); + ExtraBeesSpecies.VOLCANIC.setHasEffect(); ExtraBeesSpecies.VOLCANIC.setSecondaryColor(10101539); + ExtraBeesSpecies.MALICIOUS.importTemplate(ForestryAllele.BeeSpecies.Tropical); ExtraBeesSpecies.MALICIOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.MALICIOUS.setSecondaryColor(431972); ExtraBeesSpecies.MALICIOUS.setHumidity(EnumHumidity.DAMP); ExtraBeesSpecies.MALICIOUS.setTemperature(EnumTemperature.WARM); + ExtraBeesSpecies.INFECTIOUS.importTemplate(ExtraBeesSpecies.MALICIOUS); ExtraBeesSpecies.INFECTIOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.INFECTIOUS.setFlowering(ForestryAllele.Flowering.Slow); ExtraBeesSpecies.INFECTIOUS.setSecondaryColor(431972); + ExtraBeesSpecies.VIRULENT.importTemplate(ExtraBeesSpecies.INFECTIOUS); ExtraBeesSpecies.VIRULENT.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.VIRULENT.addSpecialty(EnumHoneyComb.VENOMOUS, 0.12f); ExtraBeesSpecies.VIRULENT.setFlowering(ForestryAllele.Flowering.Average); - ExtraBeesSpecies.VIRULENT.recessive(); - ExtraBeesSpecies.VIRULENT.setHasEffect(true); + ExtraBeesSpecies.VIRULENT.setRecessive(); + ExtraBeesSpecies.VIRULENT.setHasEffect(); ExtraBeesSpecies.VIRULENT.setSecondaryColor(431972); + ExtraBeesSpecies.VISCOUS.importTemplate(ForestryAllele.BeeSpecies.Tropical); ExtraBeesSpecies.VISCOUS.setEffect(ExtraBeesEffect.ECTOPLASM.getUID()); ExtraBeesSpecies.VISCOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); @@ -708,133 +761,158 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.VISCOUS.setHumidity(EnumHumidity.DAMP); ExtraBeesSpecies.VISCOUS.setSpeed(ForestryAllele.Speed.Slow); ExtraBeesSpecies.VISCOUS.setTemperature(EnumTemperature.WARM); + ExtraBeesSpecies.GLUTINOUS.importTemplate(ExtraBeesSpecies.VISCOUS); ExtraBeesSpecies.GLUTINOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.GLUTINOUS.setSpeed(ForestryAllele.Speed.Normal); ExtraBeesSpecies.GLUTINOUS.setSecondaryColor(431972); + ExtraBeesSpecies.STICKY.importTemplate(ExtraBeesSpecies.GLUTINOUS); ExtraBeesSpecies.STICKY.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.STICKY.addSpecialty(EnumHoneyComb.SLIME, 0.12f); ExtraBeesSpecies.STICKY.setSpeed(ForestryAllele.Speed.Fast); - ExtraBeesSpecies.STICKY.setHasEffect(true); + ExtraBeesSpecies.STICKY.setHasEffect(); ExtraBeesSpecies.STICKY.setSecondaryColor(431972); + ExtraBeesSpecies.CORROSIVE.importTemplate(ExtraBeesSpecies.STICKY); ExtraBeesSpecies.CORROSIVE.setHumidity(EnumHumidity.DAMP); ExtraBeesSpecies.CORROSIVE.setTemperature(EnumTemperature.WARM); ExtraBeesSpecies.CORROSIVE.setEffect(ExtraBeesEffect.ACID.getUID()); ExtraBeesSpecies.CORROSIVE.setFlowering(ForestryAllele.Flowering.Average); ExtraBeesSpecies.CORROSIVE.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 20f); - ExtraBeesSpecies.CORROSIVE.recessive(); + ExtraBeesSpecies.CORROSIVE.setRecessive(); ExtraBeesSpecies.CORROSIVE.setSecondaryColor(431972); + ExtraBeesSpecies.CAUSTIC.importTemplate(ExtraBeesSpecies.CORROSIVE); ExtraBeesSpecies.CAUSTIC.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.CAUSTIC.addSpecialty(EnumHoneyComb.ACIDIC, 0.03f); ExtraBeesSpecies.CAUSTIC.setSecondaryColor(431972); + ExtraBeesSpecies.ACIDIC.importTemplate(ExtraBeesSpecies.CAUSTIC); ExtraBeesSpecies.ACIDIC.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.20f); ExtraBeesSpecies.ACIDIC.addSpecialty(EnumHoneyComb.ACIDIC, 0.16f); - ExtraBeesSpecies.ACIDIC.setHasEffect(true); + ExtraBeesSpecies.ACIDIC.setHasEffect(); ExtraBeesSpecies.ACIDIC.setSecondaryColor(431972); + ExtraBeesSpecies.EXCITED.setEffect(ExtraBeesEffect.LIGHTNING.getUID()); ExtraBeesSpecies.EXCITED.addProduct(EnumHoneyComb.REDSTONE, 0.10f); ExtraBeesSpecies.EXCITED.setCaveDwelling(); ExtraBeesSpecies.EXCITED.setFlowerProvider(ExtraBeesFlowers.REDSTONE.getUID()); + ExtraBeesSpecies.ENERGETIC.importTemplate(ExtraBeesSpecies.EXCITED); ExtraBeesSpecies.ENERGETIC.setEffect(ExtraBeesEffect.LIGHTNING.getUID()); ExtraBeesSpecies.ENERGETIC.addProduct(EnumHoneyComb.REDSTONE, 0.12f); - ExtraBeesSpecies.ENERGETIC.recessive(); + ExtraBeesSpecies.ENERGETIC.setRecessive(); + ExtraBeesSpecies.ECSTATIC.importTemplate(ExtraBeesSpecies.ENERGETIC); ExtraBeesSpecies.ECSTATIC.setEffect(ExtraBeesEffect.Power.getUID()); ExtraBeesSpecies.ECSTATIC.addProduct(EnumHoneyComb.REDSTONE, 0.20f); ExtraBeesSpecies.ECSTATIC.addSpecialty(EnumHoneyComb.IC2ENERGY, 0.08f); - ExtraBeesSpecies.ECSTATIC.setHasEffect(true); + ExtraBeesSpecies.ECSTATIC.setHasEffect(); + ExtraBeesSpecies.ARTIC.importTemplate(ForestryAllele.BeeSpecies.Wintry); ExtraBeesSpecies.ARTIC.addProduct(ItemHoneyComb.VanillaComb.FROZEN.get(), 0.25f); ExtraBeesSpecies.ARTIC.setTemperature(EnumTemperature.ICY); ExtraBeesSpecies.ARTIC.setSecondaryColor(14349811); + ExtraBeesSpecies.FREEZING.importTemplate(ExtraBeesSpecies.ARTIC); ExtraBeesSpecies.FREEZING.addProduct(ItemHoneyComb.VanillaComb.FROZEN.get(), 0.20f); ExtraBeesSpecies.FREEZING.addSpecialty(EnumHoneyComb.GLACIAL, 0.10f); ExtraBeesSpecies.FREEZING.setSecondaryColor(14349811); + ExtraBeesSpecies.SHADOW.importTemplate(ExtraBeesSpecies.BASALT); ExtraBeesSpecies.SHADOW.setNocturnal(); ExtraBeesSpecies.SHADOW.addProduct(EnumHoneyComb.SHADOW, 0.05f); ExtraBeesSpecies.SHADOW.setEffect(ExtraBeesEffect.BLINDNESS.getUID()); ExtraBeesSpecies.SHADOW.setAllDay(false); - ExtraBeesSpecies.SHADOW.recessive(); + ExtraBeesSpecies.SHADOW.setRecessive(); ExtraBeesSpecies.SHADOW.setSecondaryColor(3355443); + + ExtraBeesSpecies.DARKENED.importTemplate(ExtraBeesSpecies.SHADOW); ExtraBeesSpecies.DARKENED.addProduct(EnumHoneyComb.SHADOW, 0.10f); ExtraBeesSpecies.DARKENED.setNocturnal(); - ExtraBeesSpecies.DARKENED.importTemplate(ExtraBeesSpecies.SHADOW); ExtraBeesSpecies.DARKENED.setSecondaryColor(3355443); + ExtraBeesSpecies.ABYSS.importTemplate(ExtraBeesSpecies.DARKENED); ExtraBeesSpecies.ABYSS.setNocturnal(); ExtraBeesSpecies.ABYSS.addProduct(EnumHoneyComb.SHADOW, 0.25f); ExtraBeesSpecies.ABYSS.setEffect(ExtraBeesEffect.WITHER.getUID()); - ExtraBeesSpecies.ABYSS.setHasEffect(true); + ExtraBeesSpecies.ABYSS.setHasEffect(); ExtraBeesSpecies.ABYSS.setSecondaryColor(3355443); + ExtraBeesSpecies.CELEBRATORY.importTemplate(ForestryAllele.BeeSpecies.Merry); ExtraBeesSpecies.CELEBRATORY.setEffect(ExtraBeesEffect.FIREWORKS.getUID()); + ExtraBeesSpecies.GLOWSTONE.importTemplate(ExtraBeesSpecies.BASALT); ExtraBeesSpecies.GLOWSTONE.addProduct(EnumHoneyComb.GLOWSTONE, 0.15f); ExtraBeesSpecies.GLOWSTONE.setSecondaryColor(10101539); + ExtraBeesSpecies.HAZARDOUS.importTemplate(ForestryAllele.BeeSpecies.Austere); ExtraBeesSpecies.HAZARDOUS.addProduct(EnumHoneyComb.SALTPETER, 0.12f); + ExtraBeesSpecies.JADED.importTemplate(ForestryAllele.BeeSpecies.Imperial); ExtraBeesSpecies.JADED.setFertility(ForestryAllele.Fertility.Maximum); ExtraBeesSpecies.JADED.setFlowering(ForestryAllele.Flowering.Maximum); ExtraBeesSpecies.JADED.setTerritory(ForestryAllele.Territory.Largest); ExtraBeesSpecies.JADED.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f); ExtraBeesSpecies.JADED.addSpecialty(Mods.Forestry.stack("pollen"), 0.20f); - ExtraBeesSpecies.JADED.setHasEffect(true); + ExtraBeesSpecies.JADED.setHasEffect(); ExtraBeesSpecies.JADED.setSecondaryColor(14453483); + ExtraBeesSpecies.JADED.addSpecialty(EnumHoneyComb.PURPLE, 0.15f); + ExtraBeesSpecies.JADED.isCounted = false; + ExtraBeesSpecies.UNUSUAL.importTemplate(ForestryAllele.BeeSpecies.Ended); ExtraBeesSpecies.UNUSUAL.setEffect(ExtraBeesEffect.GRAVITY.getUID()); ExtraBeesSpecies.UNUSUAL.setSecondaryColor(12231403); ExtraBeesSpecies.UNUSUAL.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f); + ExtraBeesSpecies.SPATIAL.importTemplate(ExtraBeesSpecies.UNUSUAL); ExtraBeesSpecies.SPATIAL.setEffect(ExtraBeesEffect.GRAVITY.getUID()); ExtraBeesSpecies.SPATIAL.setSecondaryColor(10768076); ExtraBeesSpecies.SPATIAL.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f); ExtraBeesSpecies.SPATIAL.addSpecialty(EnumHoneyComb.CERTUS, 0.05f); - ExtraBeesSpecies.QUANTUM.importTemplate(ExtraBeesSpecies.QUANTUM); + ExtraBeesSpecies.QUANTUM.setEffect(ExtraBeesEffect.TELEPORT.getUID()); ExtraBeesSpecies.QUANTUM.setSecondaryColor(13963227); ExtraBeesSpecies.QUANTUM.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f); ExtraBeesSpecies.QUANTUM.addSpecialty(EnumHoneyComb.CERTUS, 0.15f); ExtraBeesSpecies.QUANTUM.addSpecialty(EnumHoneyComb.ENDERPEARL, 0.15f); - ExtraBeesSpecies.JADED.addSpecialty(EnumHoneyComb.PURPLE, 0.15f); - ExtraBeesSpecies.JADED.isCounted = false; + ExtraBeesSpecies.YELLORIUM.importTemplate(ExtraBeesSpecies.NUCLEAR); ExtraBeesSpecies.YELLORIUM.addProduct(EnumHoneyComb.BARREN, 0.20f); ExtraBeesSpecies.YELLORIUM.addSpecialty(EnumHoneyComb.YELLORIUM, 0.02f); ExtraBeesSpecies.YELLORIUM.setEffect(ExtraBeesEffect.RADIOACTIVE.getUID()); ExtraBeesSpecies.YELLORIUM.setFertility(ForestryAllele.Fertility.Low); ExtraBeesSpecies.YELLORIUM.setLifespan(ForestryAllele.Lifespan.Shortest); + ExtraBeesSpecies.CYANITE.importTemplate(ExtraBeesSpecies.YELLORIUM); ExtraBeesSpecies.CYANITE.addProduct(EnumHoneyComb.BARREN, 0.20f); ExtraBeesSpecies.CYANITE.addSpecialty(EnumHoneyComb.CYANITE, 0.01f); + ExtraBeesSpecies.BLUTONIUM.importTemplate(ExtraBeesSpecies.CYANITE); ExtraBeesSpecies.BLUTONIUM.addProduct(EnumHoneyComb.BARREN, 0.20f); ExtraBeesSpecies.BLUTONIUM.addSpecialty(EnumHoneyComb.BLUTONIUM, 0.01f); + ExtraBeesSpecies.MYSTICAL.importTemplate(ForestryAllele.BeeSpecies.Noble); for (final Map.Entry entry : ForestryAllele.BeeSpecies.Noble.getAllele().getProductChances().entrySet()) { ExtraBeesSpecies.MYSTICAL.addProduct(entry.getKey(), entry.getValue()); } ExtraBeesSpecies.MYSTICAL.setFlowerProvider(ExtraBeesFlowers.Mystical.getUID()); - for (final ExtraBeesSpecies species2 : values()) { - if (species2.state != State.Active) { - AlleleManager.alleleRegistry.blacklistAllele(species2.getUID()); + + for (final ExtraBeesSpecies species : values()) { + if (species.state != State.Active) { + AlleleManager.alleleRegistry.blacklistAllele(species.getUID()); } for (final EnumBeeChromosome chromo : EnumBeeChromosome.values()) { if (chromo != EnumBeeChromosome.HUMIDITY_TOLERANCE) { - final IAllele allele = species2.template[chromo.ordinal()]; + final IAllele allele = species.getTemplate()[chromo.ordinal()]; if (allele == null || !chromo.getAlleleClass().isInstance(allele)) { - throw new RuntimeException(species2.getName() + " has an invalid " + chromo.toString() + " chromosome!"); + throw new RuntimeException(species.getName() + " has an invalid " + chromo.toString() + " chromosome!"); } } } } + for (int i = 0; i < 16; ++i) { final ExtraBeesSpecies species3 = values()[ExtraBeesSpecies.RED.ordinal() + i]; final EnumHoneyComb comb = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i]; @@ -842,6 +920,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { species3.addSpecialty(comb, 0.25f); species3.setSecondaryColor(9240320); } + for (final ExtraBeesSpecies species2 : values()) { species2.registerTemplate(); ExtraBees.proxy.registerBeeModel(species2); @@ -926,60 +1005,60 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { public void setAllDay(final boolean allDay) { if (allDay) { - this.template[EnumBeeChromosome.NEVER_SLEEPS.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue"); + this.getTemplate()[EnumBeeChromosome.NEVER_SLEEPS.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue"); } else { - this.template[EnumBeeChromosome.NEVER_SLEEPS.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolFalse"); + this.getTemplate()[EnumBeeChromosome.NEVER_SLEEPS.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolFalse"); } } public void setCaveDwelling() { - this.template[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue"); + this.getTemplate()[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue"); } public void setTolerantFlyer() { - this.template[EnumBeeChromosome.TOLERATES_RAIN.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue"); + this.getTemplate()[EnumBeeChromosome.TOLERATES_RAIN.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue"); } public void setFlowerProvider(final String uid) { final IAllele allele = AlleleManager.alleleRegistry.getAllele(uid); if (allele instanceof IAlleleFlowers) { - this.template[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = allele; + this.getTemplate()[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = allele; } } public void setEffect(final String uid) { final IAllele allele = AlleleManager.alleleRegistry.getAllele(uid); if (allele instanceof IAlleleBeeEffect) { - this.template[EnumBeeChromosome.EFFECT.ordinal()] = AlleleManager.alleleRegistry.getAllele(uid); + this.getTemplate()[EnumBeeChromosome.EFFECT.ordinal()] = AlleleManager.alleleRegistry.getAllele(uid); } } private void setFertility(final ForestryAllele.Fertility fert) { - this.template[EnumBeeChromosome.FERTILITY.ordinal()] = fert.getAllele(); + this.getTemplate()[EnumBeeChromosome.FERTILITY.ordinal()] = fert.getAllele(); } private void setLifespan(final ForestryAllele.Lifespan fert) { - this.template[EnumBeeChromosome.LIFESPAN.ordinal()] = fert.getAllele(); + this.getTemplate()[EnumBeeChromosome.LIFESPAN.ordinal()] = fert.getAllele(); } private void setSpeed(final ForestryAllele.Speed fert) { - this.template[EnumBeeChromosome.SPEED.ordinal()] = fert.getAllele(); + this.getTemplate()[EnumBeeChromosome.SPEED.ordinal()] = fert.getAllele(); } private void setTerritory(final ForestryAllele.Territory fert) { - this.template[EnumBeeChromosome.TERRITORY.ordinal()] = fert.getAllele(); + this.getTemplate()[EnumBeeChromosome.TERRITORY.ordinal()] = fert.getAllele(); } private void setFlowering(final ForestryAllele.Flowering fert) { - this.template[EnumBeeChromosome.FLOWERING.ordinal()] = fert.getAllele(); + this.getTemplate()[EnumBeeChromosome.FLOWERING.ordinal()] = fert.getAllele(); } private void setHumidityTolerance(final Tolerance fert) { - this.template[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = fert.getAllele(); + this.getTemplate()[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = fert.getAllele(); } private void setTemperatureTolerance(final Tolerance both1) { - this.template[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = both1.getAllele(); + this.getTemplate()[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = both1.getAllele(); } @Override diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index a2fd3932..589a6281 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -70,12 +70,16 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { BonemealMushroom, Power; - String fx; - public boolean combinable; - public boolean dominant; - public int id; + private String fx; + private boolean combinable; + private boolean dominant; + private int id; private String uid; - static List birthdays; + private static final List birthdays = new ArrayList<>(); + + static { + birthdays.add(new Birthday(3, 10, "Binnie")); + } ExtraBeesEffect() { this.fx = ""; @@ -192,7 +196,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { if (world.isAirBlock(pos) && (world.isBlockNormalCube(pos.down(), false) || world.getBlockState(pos.down()).getBlock() == ExtraBees.ectoplasm)) { world.setBlockState(pos, ExtraBees.ectoplasm.getDefaultState()); } - return null; + return storedData; } break; } @@ -366,7 +370,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { final double dy = y1 - entity2.posY; final double dz = z1 - entity2.posZ; if (dx * dx + dy * dy + dz * dz < 2.0) { - return null; + return storedData; } final double strength = 0.5 / (dx * dx + dy * dy + dz * dz) * entityStrength; entity2.addVelocity(dx * strength, dy * strength, dz * strength); @@ -380,7 +384,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { final double dy = y1 - entity3.posY; final double dz = z1 - entity3.posZ; if (dx * dx + dy * dy + dz * dz < 2.0) { - return null; + return storedData; } final double strength = 0.5 / (dx * dx + dy * dy + dz * dz); entity3.addVelocity(-dx * strength, -dy * strength, -dz * strength); @@ -389,22 +393,22 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } case TELEPORT: { if (world.rand.nextInt(80) > 1) { - return null; + return storedData; } final List entities4 = this.getEntities(Entity.class, genome, housing); if (entities4.size() == 0) { - return null; + return storedData; } final Entity entity4 = entities4.get(world.rand.nextInt(entities4.size())); if (!(entity4 instanceof EntityLiving)) { - return null; + return storedData; } final float jumpDist = 5.0f; if (y1 < 4) { y1 = 4; } if (!world.isAirBlock(pos) || !world.isAirBlock(pos.up())) { - return null; + return storedData; } entity4.setPositionAndUpdate(x1, y1, z1); ((EntityLiving) entity4).addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 160, 10)); @@ -412,7 +416,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } case WATER: { if (world.rand.nextInt(120) > 1) { - return null; + return storedData; } IFluidHandler fluidHandler = TileUtil.getCapability(world, pos, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP); if (fluidHandler != null) { @@ -423,9 +427,9 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } case BonemealSapling: { if (world.rand.nextInt(20) > 1) { - return null; + return storedData; } - if (ExtraBeesFlowers.Sapling.isAcceptedFlower(world, null, pos)) { + if (ExtraBeesFlowers.Sapling.isAcceptedFlower(world, pos)) { ItemDye.applyBonemeal(new ItemStack(Blocks.DIRT, 1), world, pos); break; } @@ -433,9 +437,9 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } case BonemealFruit: { if (world.rand.nextInt(20) > 1) { - return null; + return storedData; } - if (ExtraBeesFlowers.Fruit.isAcceptedFlower(world, null, pos)) { + if (ExtraBeesFlowers.Fruit.isAcceptedFlower(world, pos)) { ItemDye.applyBonemeal(new ItemStack(Blocks.DIRT, 1), world, pos); break; } @@ -443,7 +447,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } case BonemealMushroom: { if (world.rand.nextInt(20) > 1) { - return null; + return storedData; } if (world.getBlockState(pos).getBlock() == Blocks.BROWN_MUSHROOM || world.getBlockState(pos).getBlock() == Blocks.RED_MUSHROOM) { ItemDye.applyBonemeal(new ItemStack(Blocks.DIRT, 1), world, pos); @@ -461,7 +465,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { break; } } - return null; + return storedData; } protected Vec3i getModifiedArea(final IBeeGenome genome, final IBeeHousing housing) { @@ -547,10 +551,6 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return this.getUID(); } - static { - (ExtraBeesEffect.birthdays = new ArrayList<>()).add(new Birthday(3, 10, "Binnie")); - } - public static class Birthday { int day; int month; diff --git a/src/main/java/binnie/extrabees/genetics/effect/package-info.java b/src/main/java/binnie/extrabees/genetics/effect/package-info.java new file mode 100644 index 00000000..9d4d6cb2 --- /dev/null +++ b/src/main/java/binnie/extrabees/genetics/effect/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.genetics.effect; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/genetics/items/package-info.java b/src/main/java/binnie/extrabees/genetics/items/package-info.java new file mode 100644 index 00000000..e4ad22a3 --- /dev/null +++ b/src/main/java/binnie/extrabees/genetics/items/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.genetics.items; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/genetics/package-info.java b/src/main/java/binnie/extrabees/genetics/package-info.java new file mode 100644 index 00000000..51cfaa7d --- /dev/null +++ b/src/main/java/binnie/extrabees/genetics/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.genetics; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java b/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java index 7b42b914..2eaaf1fa 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java @@ -37,7 +37,7 @@ public class ControlProductsBox extends ControlListBox strings = new ArrayList<>(); if (this.type == Type.Products) { for (final Map.Entry entry : species.getProductChances().entrySet()) { diff --git a/src/main/java/binnie/extrabees/gui/database/package-info.java b/src/main/java/binnie/extrabees/gui/database/package-info.java new file mode 100644 index 00000000..fc98b4c5 --- /dev/null +++ b/src/main/java/binnie/extrabees/gui/database/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.gui.database; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/gui/package-info.java b/src/main/java/binnie/extrabees/gui/package-info.java new file mode 100644 index 00000000..538f5f6b --- /dev/null +++ b/src/main/java/binnie/extrabees/gui/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.gui; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java b/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java index 3ae2e0f3..d398ed95 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java @@ -10,12 +10,14 @@ import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.renderer.RenderUtil; import forestry.api.genetics.IChromosomeType; +import javax.annotation.Nullable; + public class ControlChromosome extends Control implements IControlValue, ITooltip { - IChromosomeType value; + private IChromosomeType value; protected ControlChromosome(final IWidget parent, final int x, final int y, final IChromosomeType type) { super(parent, x, y, 16, 16); - this.setValue(type); + this.value = type; this.addAttribute(Attribute.MouseOver); } @@ -38,8 +40,6 @@ public class ControlChromosome extends Control implements IControlValue ingredients) { for (final Cocktail cocktail : values()) { boolean is = true; @@ -71,8 +73,10 @@ public enum Cocktail { } public static void registerIngredient(final ICocktailIngredient ingredient) { - Cocktail.cocktailIngredients.put(ingredient.getIdentifier().toLowerCase(), ingredient); - DrinkManager.registerDrinkLiquid(ingredient.getIdentifier().toLowerCase(), new DrinkLiquid(ingredient.getDisplayName(), ingredient.getColour(), ingredient.getTransparency(), ingredient.getABV())); + String id = ingredient.getIdentifier().toLowerCase(); + Cocktail.cocktailIngredients.put(id, ingredient); + DrinkLiquid liquid = new DrinkLiquid(ingredient.getDisplayName(), ingredient.getColour(), ingredient.getTransparency(), ingredient.getABV(), id); + DrinkManager.registerDrinkLiquid(liquid); } public static ICocktailIngredient getIngredient(final String name2) { diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index 4affe4bc..354817b5 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -56,7 +56,7 @@ public class ModuleAlcohol implements IInitializable { for (final Liqueur juice4 : Liqueur.values()) { Cocktail.registerIngredient(juice4); } - DrinkManager.registerDrinkLiquid("water", new DrinkLiquid("Water", 13421823, 0.1f, 0.0f)); + DrinkManager.registerDrinkLiquid(new DrinkLiquid("Water", 13421823, 0.1f, 0.0f, "water")); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java index db20afff..b291316f 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java @@ -4,17 +4,18 @@ import binnie.Binnie; import net.minecraftforge.fluids.FluidStack; public class DrinkLiquid implements IDrinkLiquid { - String name; - int colour; - float transparency; - float abv; - public String ident; + private final String name; + private final int colour; + private final float transparency; + private final float abv; + private final String ident; - public DrinkLiquid(final String name, final int colour, final float transparency, final float abv) { + public DrinkLiquid(final String name, final int colour, final float transparency, final float abv, final String ident) { this.name = name; this.colour = colour; this.transparency = transparency; this.abv = abv; + this.ident = ident; } @Override @@ -42,11 +43,6 @@ public class DrinkLiquid implements IDrinkLiquid { return this.ident; } - @Override - public void setIdent(final String lowerCase) { - this.ident = lowerCase; - } - @Override public float getABV() { return this.abv; diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java index 7242153a..37300d05 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java @@ -13,9 +13,8 @@ public class DrinkManager { return DrinkManager.drinkLiquids.get(id.toLowerCase()); } - public static void registerDrinkLiquid(final String id, final IDrinkLiquid liquid) { - liquid.setIdent(id.toLowerCase()); - DrinkManager.drinkLiquids.put(id.toLowerCase(), liquid); + public static void registerDrinkLiquid(final IDrinkLiquid liquid) { + DrinkManager.drinkLiquids.put(liquid.getIdentifier(), liquid); } public static IDrinkLiquid getLiquid(final Fluid fluid) { diff --git a/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java b/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java index 541eba09..691233e9 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java @@ -13,8 +13,6 @@ public interface IDrinkLiquid { String getIdentifier(); - void setIdent(final String p0); - float getABV(); FluidStack get(final int p0); diff --git a/src/main/java/binnie/extratrees/alcohol/drink/package-info.java b/src/main/java/binnie/extratrees/alcohol/drink/package-info.java new file mode 100644 index 00000000..c0b35df7 --- /dev/null +++ b/src/main/java/binnie/extratrees/alcohol/drink/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.alcohol.drink; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/alcohol/package-info.java b/src/main/java/binnie/extratrees/alcohol/package-info.java new file mode 100644 index 00000000..78a66231 --- /dev/null +++ b/src/main/java/binnie/extratrees/alcohol/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.alcohol; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/api/package-info.java b/src/main/java/binnie/extratrees/api/package-info.java new file mode 100644 index 00000000..76a83130 --- /dev/null +++ b/src/main/java/binnie/extratrees/api/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package binnie.extratrees.api; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java index e2f21fac..dbfdaba3 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java @@ -53,8 +53,7 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode for (int blockNumber = 0; blockNumber < blockCount; blockNumber++) { final PropertyETType variant = PropertyETType.create("variant", blockNumber, VARIANTS_PER_BLOCK); BlockETDecorativeLeaves block = new BlockETDecorativeLeaves(blockNumber) { - @Nonnull - @Override + @Override public PropertyETType getVariant() { return variant; } @@ -82,7 +81,6 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode return blockNumber; } - @Nonnull public abstract PropertyETType getVariant(); @Override @@ -165,7 +163,6 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode return getDefaultState().withProperty(getVariant(), type); } - @Nonnull public ETTreeDefinition getTreeType(int meta) { int variantCount = getVariant().getAllowedValues().size(); int variantMeta = (meta % variantCount) + blockNumber * VARIANTS_PER_BLOCK; diff --git a/src/main/java/binnie/extratrees/block/EnumETLog.java b/src/main/java/binnie/extratrees/block/EnumETLog.java index 0ba2df9d..0b78812f 100644 --- a/src/main/java/binnie/extratrees/block/EnumETLog.java +++ b/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -148,7 +148,6 @@ public enum EnumETLog implements IWoodType { return ordinal(); } - @Nonnull public static EnumETLog byMetadata(int meta) { if (meta < 0 || meta >= VALUES.length) { meta = 0; diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index b6c77fbb..a4f3fe16 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -16,7 +16,7 @@ public enum FruitPod { // IIcon[] icons; FruitPod() { - this.textures = new short[]{BinnieCore.proxy.getUniqueTextureUID(), BinnieCore.proxy.getUniqueTextureUID(), BinnieCore.proxy.getUniqueTextureUID()}; + this.textures = new short[]{BinnieCore.getBinnieProxy().getUniqueTextureUID(), BinnieCore.getBinnieProxy().getUniqueTextureUID(), BinnieCore.getBinnieProxy().getUniqueTextureUID()}; // this.icons = new IIcon[3]; } diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index c3d19143..543c4c8e 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -22,7 +22,6 @@ import java.util.List; import javax.annotation.Nonnull; public class WoodManager { - @Nonnull public static String getDisplayName(IWoodTyped wood, IWoodType woodType) { WoodBlockKind blockKind = wood.getBlockKind(); diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java index 51402f6a..7fc6aef3 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public class BlockHedge extends Block implements IBlockFence, IColoredBlock { @@ -32,7 +33,7 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { } @Override - public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, Entity entityIn) { + public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn) { final boolean connectNegZ = this.canConnectFenceTo(world, pos.north()); final boolean connectPosZ = this.canConnectFenceTo(world, pos.south()); final boolean connectNegX = this.canConnectFenceTo(world, pos.west()); diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 3c79d5a3..e947a3ed 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -56,9 +56,8 @@ public class MultiFenceRecipeEmbedded implements IRecipe { return (this.cached == null) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; } - @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public ItemStack[] getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 5ace5942..0287689f 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -80,9 +80,8 @@ public class MultiFenceRecipeSize implements IRecipe { } } - @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public ItemStack[] getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index c28d4159..64f4cb54 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -53,9 +53,8 @@ public class MultiFenceRecipeSolid implements IRecipe { return (this.cached == null) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; } - @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public ItemStack[] getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/extratrees/block/decor/package-info.java b/src/main/java/binnie/extratrees/block/decor/package-info.java new file mode 100644 index 00000000..56d3f0aa --- /dev/null +++ b/src/main/java/binnie/extratrees/block/decor/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.block.decor; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/block/package-info.java b/src/main/java/binnie/extratrees/block/package-info.java new file mode 100644 index 00000000..c6a5320d --- /dev/null +++ b/src/main/java/binnie/extratrees/block/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.block; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java index 3ee571e9..6c2fe717 100644 --- a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java @@ -5,6 +5,8 @@ import com.google.common.base.Predicate; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.PlankType; +import javax.annotation.Nullable; + public class ETWoodTypePredicate implements Predicate { private final int minWoodTypeMeta; private final int maxWoodTypeMeta; @@ -17,10 +19,14 @@ public class ETWoodTypePredicate implements Predicate { } @Override - public boolean apply(EnumETLog woodType) { - if(!isLog && !(woodType.getPlank() instanceof PlankType.ExtraTreePlanks)){ - return false; + public boolean apply(@Nullable EnumETLog woodType) { + if (woodType != null) { + if (isLog || woodType.getPlank() instanceof PlankType.ExtraTreePlanks) { + if (woodType.getMetadata() >= minWoodTypeMeta && woodType.getMetadata() <= maxWoodTypeMeta) { + return true; + } + } } - return woodType.getMetadata() >= minWoodTypeMeta && woodType.getMetadata() <= maxWoodTypeMeta; + return false; } } diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETType.java b/src/main/java/binnie/extratrees/block/property/PropertyETType.java index 55310e37..8700a290 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETType.java @@ -14,7 +14,7 @@ public class PropertyETType extends PropertyEnum { return (int) Math.ceil((float) ETTreeDefinition.VALUES.length / variantsPerBlock); } - public static PropertyETType create(@Nonnull String name, int blockNumber, int variantsPerBlock) { + public static PropertyETType create(String name, int blockNumber, int variantsPerBlock) { TreeTypePredicate filter = new TreeTypePredicate(blockNumber, variantsPerBlock); Collection allowedValues = Collections2.filter(Lists.newArrayList(ETTreeDefinition.class.getEnumConstants()), filter); return new PropertyETType(name, ETTreeDefinition.class, allowedValues); diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java index 3b45d754..e857d27a 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java @@ -13,10 +13,10 @@ import forestry.arboriculture.blocks.property.PropertyWoodType; public class PropertyETWoodType extends PropertyWoodType { - public static PropertyETWoodType[] create(@Nonnull String name, int variantsPerBlock) { + public static PropertyETWoodType[] create(String name, int variantsPerBlock) { return create(name, variantsPerBlock, false); } - public static PropertyETWoodType[] create(@Nonnull String name, int variantsPerBlock, boolean isLog) { + public static PropertyETWoodType[] create(String name, int variantsPerBlock, boolean isLog) { int length; if(isLog){ length = EnumETLog.VALUES.length; diff --git a/src/main/java/binnie/extratrees/block/property/package-info.java b/src/main/java/binnie/extratrees/block/property/package-info.java new file mode 100644 index 00000000..4852f92f --- /dev/null +++ b/src/main/java/binnie/extratrees/block/property/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.block.property; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java index e77fd997..34404543 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java @@ -22,8 +22,7 @@ public abstract class BlockETFence extends BlockForestryFence impleme for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETFence block = new BlockETFence(fireproof, i) { - @Nonnull - @Override + @Override public PropertyETWoodType getVariant() { return variant; } @@ -44,7 +43,6 @@ public abstract class BlockETFence extends BlockForestryFence impleme setUnlocalizedName(name); } - @Nonnull @Override public EnumETLog getWoodType(int meta) { int variantCount = getVariant().getAllowedValues().size(); diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java index 9cccb5b4..78290255 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java @@ -17,8 +17,7 @@ public abstract class BlockETLog extends BlockForestryLog { for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETLog block = new BlockETLog(fireproof, i) { - @Nonnull - @Override + @Override public PropertyWoodType getVariant() { return variant; } @@ -39,7 +38,6 @@ public abstract class BlockETLog extends BlockForestryLog { setUnlocalizedName(name); } - @Nonnull @Override public EnumETLog getWoodType(int meta) { int variantCount = getVariant().getAllowedValues().size(); diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java index 3fc353f4..02e8abc0 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java @@ -18,8 +18,7 @@ public abstract class BlockETPlank extends BlockForestryPlanks { for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETPlank block = new BlockETPlank(fireproof, i) { - @Nonnull - @Override + @Override public PropertyETWoodType getVariant() { return variant; } @@ -40,7 +39,6 @@ public abstract class BlockETPlank extends BlockForestryPlanks { setUnlocalizedName(name); } - @Nonnull @Override public EnumETLog getWoodType(int meta) { int variantCount = getVariant().getAllowedValues().size(); diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java index 99a2f4c3..c8d13a07 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java @@ -17,8 +17,7 @@ public abstract class BlockETSlab extends BlockForestrySlab { for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETSlab block = new BlockETSlab(fireproof, i) { - @Nonnull - @Override + @Override public PropertyETWoodType getVariant() { return variant; } @@ -47,7 +46,6 @@ public abstract class BlockETSlab extends BlockForestrySlab { setUnlocalizedName(name); } - @Nonnull @Override public EnumETLog getWoodType(int meta) { meta &= ~8; // unset the top/bottom slab bit diff --git a/src/main/java/binnie/extratrees/block/wood/package-info.java b/src/main/java/binnie/extratrees/block/wood/package-info.java new file mode 100644 index 00000000..b197b222 --- /dev/null +++ b/src/main/java/binnie/extratrees/block/wood/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.block.wood; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 306691d4..ff8fa115 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -47,6 +47,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock, IColoredBlock, ISpriteRegister, IItemModelRegister, IStateMapperRegister { @@ -228,7 +229,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo @SideOnly(Side.CLIENT) @Override - public TextureAtlasSprite getSprite(Integer key, EnumFacing facing, int pass) { + public TextureAtlasSprite getSprite(Integer key, @Nullable EnumFacing facing, int pass) { DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), key); if(facing == null){ diff --git a/src/main/java/binnie/extratrees/carpentry/package-info.java b/src/main/java/binnie/extratrees/carpentry/package-info.java new file mode 100644 index 00000000..6c8ebf61 --- /dev/null +++ b/src/main/java/binnie/extratrees/carpentry/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.carpentry; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/config/package-info.java b/src/main/java/binnie/extratrees/config/package-info.java new file mode 100644 index 00000000..d39f0a0f --- /dev/null +++ b/src/main/java/binnie/extratrees/config/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.config; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index b377575f..2b93906f 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -30,7 +30,7 @@ public class ModuleCore implements IInitializable { @Override public void postInit() { - if (BinnieCore.proxy.isDebug()) { + if (BinnieCore.getBinnieProxy().isDebug()) { try { final PrintWriter outputSpecies = new PrintWriter(new FileWriter("data/species.html")); final PrintWriter outputLogs = new PrintWriter(new FileWriter("data/logs.html")); diff --git a/src/main/java/binnie/extratrees/core/package-info.java b/src/main/java/binnie/extratrees/core/package-info.java new file mode 100644 index 00000000..852bb844 --- /dev/null +++ b/src/main/java/binnie/extratrees/core/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.core; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/gen/package-info.java b/src/main/java/binnie/extratrees/gen/package-info.java new file mode 100644 index 00000000..30cea164 --- /dev/null +++ b/src/main/java/binnie/extratrees/gen/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.gen; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index f7d82bb1..1b7d3cef 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -6,6 +6,7 @@ import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.FruitPod; import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.item.Food; +import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleTreeSpecies; @@ -133,17 +134,18 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF public static final AlleleETFruit Gooseberry = new AlleleETFruit("Gooseberry", 8, 12164944, 12177232, FruitSprite.TINY); public static final AlleleETFruit GoldenRaspberry = new AlleleETFruit("GoldenRaspberry", 8, 12496955, 15970363, FruitSprite.TINY); - IFruitFamily family; - boolean isRipening; - int diffR, diffG, diffB; - FruitPod pod; - int ripeningPeriod; - int colourUnripe; - int colour; - FruitSprite sprite; - HashMap products; - + @Nullable + private IFruitFamily family; + private boolean isRipening; + private int diffR, diffG, diffB; + private FruitPod pod; + private int ripeningPeriod; + private int colourUnripe; + private int colour; + private FruitSprite sprite; + private Map products; + @Nullable private static LinkedList list; public static List values() { @@ -375,11 +377,10 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF } @Override - public int compareTo(@Nonnull IAlleleFruit o) { + public int compareTo(IAlleleFruit o) { return o == this ? 0 : -1; } - @Nonnull @Override public Map getSpecialty() { return new HashMap<>(); @@ -398,7 +399,6 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF return false; } - @Nonnull @Override public List getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { if (this.pod != null) { @@ -447,7 +447,6 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF return sprite != null; } - @Nonnull @Override public String getModID() { return Constants.EXTRA_TREES_MOD_ID; @@ -477,6 +476,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Override public IFruitFamily getFamily() { + Preconditions.checkState(this.family != null, "Family has not been set."); return this.family; } @@ -485,9 +485,8 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF return this.ripeningPeriod; } - @Nonnull @Override - public HashMap getProducts() { + public Map getProducts() { return products; } diff --git a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java index 4b319f16..1109cc39 100644 --- a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java +++ b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java @@ -8,13 +8,12 @@ import forestry.api.genetics.IAllele; import forestry.arboriculture.genetics.TreeDefinition; import net.minecraft.item.ItemStack; -public class ETLeafProvider implements ILeafProvider { +import javax.annotation.Nullable; +public class ETLeafProvider implements ILeafProvider { + @Nullable private IAlleleTreeSpecies treeSpecies; - - public ETLeafProvider() { - } - + @Override public void init(IAlleleTreeSpecies treeSpecies) { this.treeSpecies = treeSpecies; @@ -22,11 +21,13 @@ public class ETLeafProvider implements ILeafProvider { @Override public ItemStack getDecorativeLeaves() { - IAllele allele = treeSpecies; - if(allele == null){ - allele = TreeDefinition.Oak.getTemplate()[EnumTreeChromosome.SPECIES.ordinal()]; + IAllele species; + if (treeSpecies == null) { + species = TreeDefinition.Oak.getTemplate()[EnumTreeChromosome.SPECIES.ordinal()]; + } else { + species = treeSpecies; } - return ModuleBlocks.getDecorativeLeaves(allele.getUID()); + return ModuleBlocks.getDecorativeLeaves(species.getUID()); } } diff --git a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java index c22e2acd..c475921d 100644 --- a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java +++ b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java @@ -52,8 +52,7 @@ public enum EnumSaplingType { } } - @Nonnull - @Override + @Override public ModelResourceLocation getModel(EnumGermlingType type) { if (type == EnumGermlingType.SAPLING) { return germlingModel; diff --git a/src/main/java/binnie/extratrees/genetics/WoodProvider.java b/src/main/java/binnie/extratrees/genetics/WoodProvider.java index fcbc7f19..da8b26e8 100644 --- a/src/main/java/binnie/extratrees/genetics/WoodProvider.java +++ b/src/main/java/binnie/extratrees/genetics/WoodProvider.java @@ -42,7 +42,6 @@ public class WoodProvider implements IWoodProvider { } - @Nonnull @Override public TextureAtlasSprite getSprite(boolean isTop) { if (isTop) { diff --git a/src/main/java/binnie/extratrees/genetics/package-info.java b/src/main/java/binnie/extratrees/genetics/package-info.java new file mode 100644 index 00000000..819ab900 --- /dev/null +++ b/src/main/java/binnie/extratrees/genetics/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.genetics; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/item/package-info.java b/src/main/java/binnie/extratrees/item/package-info.java new file mode 100644 index 00000000..3ed33374 --- /dev/null +++ b/src/main/java/binnie/extratrees/item/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.item; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java b/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java new file mode 100644 index 00000000..abb1e6e4 --- /dev/null +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.kitchen.craftgui; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/kitchen/package-info.java b/src/main/java/binnie/extratrees/kitchen/package-info.java new file mode 100644 index 00000000..712931f6 --- /dev/null +++ b/src/main/java/binnie/extratrees/kitchen/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.kitchen; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java index 294209a1..b92a0f0f 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java @@ -22,7 +22,7 @@ public class MachineRendererNursery { GlStateManager.pushMatrix(); GlStateManager.translate(x + 0.5, y, z + 0.5); GlStateManager.scale(0.05, 0.05, 0.05); - BinnieCore.proxy.bindTexture(new BinnieResource(ExtraTrees.instance, ResourceType.Tile, "test.png")); + BinnieCore.getBinnieProxy().bindTexture(new BinnieResource(ExtraTrees.instance, ResourceType.Tile, "test.png")); //this.casinoMachine.renderAll(); GlStateManager.popMatrix(); } diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 4e18f51a..520056d5 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -27,7 +27,7 @@ public class ModuleMachine implements IInitializable { blockMachine = machineGroup.getBlock(); // TODO fix rendering Object rendererMachine = null;// BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"); - BinnieCore.proxy.registerTileEntity(TileEntityNursery.class, "binnie.tile.nursery", rendererMachine); + BinnieCore.getBinnieProxy().registerTileEntity(TileEntityNursery.class, "binnie.tile.nursery", rendererMachine); } @Override diff --git a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java index 1d22e92b..ac849bc8 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java @@ -99,7 +99,7 @@ public class BrewedGrainRecipe implements IBreweryRecipe { } @Override - public boolean isGrain(@Nonnull ItemStack itemStack) { + public boolean isGrain(ItemStack itemStack) { return OreDictionaryUtil.hasOreId(itemStack, grainOreId); } diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java index 3deb35ba..3d455e07 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java @@ -8,7 +8,7 @@ import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nullable; -public class BreweryCrafting implements INbtWritable, INbtReadable { +public class BreweryCrafting implements INbtWritable { @Nullable public FluidStack inputFluid; public ItemStack[] inputGrains; @@ -24,20 +24,16 @@ public class BreweryCrafting implements INbtWritable, INbtReadable { this.yeast = yeast; } - public BreweryCrafting(final NBTTagCompound nbt) { - this.readFromNBT(nbt); - } - - @Override - public void readFromNBT(final NBTTagCompound nbt) { - this.inputFluid = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("fluid")); - this.ingredient = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("ingr")); - this.inputGrains = new ItemStack[] { + public static BreweryCrafting create(final NBTTagCompound nbt) { + FluidStack inputFluid = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("fluid")); + ItemStack ingredient = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("ingr")); + ItemStack[] inputGrains = new ItemStack[] { ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in1")), ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in2")), ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in3")) }; - this.yeast = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("yeast")); + ItemStack yeast = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("yeast")); + return new BreweryCrafting(inputFluid, ingredient, inputGrains, yeast); } @Override diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java index 0e9c6d35..c5ae1e74 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java @@ -101,7 +101,7 @@ public class BreweryLogic extends ComponentProcessSetCost implements IProcess, I if (nbt.getBoolean("null")) { this.currentCrafting = null; } else { - this.currentCrafting = new BreweryCrafting(nbt); + this.currentCrafting = BreweryCrafting.create(nbt); } } } diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java index 7b35ec16..aa5ac0b4 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java @@ -50,7 +50,7 @@ public class BreweryRecipe implements IBreweryRecipe { } @Override - public boolean isGrain(@Nonnull ItemStack itemStack) { + public boolean isGrain(ItemStack itemStack) { return false; } @@ -60,7 +60,7 @@ public class BreweryRecipe implements IBreweryRecipe { } @Override - public boolean isIngredient(@Nonnull ItemStack itemstack) { + public boolean isIngredient(ItemStack itemstack) { return false; } diff --git a/src/main/java/binnie/extratrees/machines/brewery/IBreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/IBreweryRecipe.java index cff441c4..efef2b5c 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/IBreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/IBreweryRecipe.java @@ -13,11 +13,11 @@ public interface IBreweryRecipe { FluidStack getOutput(); - boolean isIngredient(@Nonnull ItemStack itemstack); + boolean isIngredient(ItemStack itemstack); List getIngredients(); - boolean isGrain(@Nonnull ItemStack itemStack); + boolean isGrain(ItemStack itemStack); List getGrains(); diff --git a/src/main/java/binnie/extratrees/machines/brewery/package-info.java b/src/main/java/binnie/extratrees/machines/brewery/package-info.java new file mode 100644 index 00000000..1759a822 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/brewery/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.machines.brewery; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index e6315496..1f6fab60 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -121,11 +121,11 @@ public class ControlTileSelect extends Control implements IControlValue } public static class ControlTile extends Control implements IControlValue, ITooltip { - IDesign value; + private IDesign value; protected ControlTile(final IWidget parent, final int x, final int y, final IDesign value) { super(parent, x, y, 18, 18); - this.setValue(value); + this.value = value; this.addAttribute(Attribute.MouseOver); this.addSelfEventHandler(new EventMouse.Down.Handler() { @Override @@ -144,7 +144,7 @@ public class ControlTileSelect extends Control implements IControlValue @Override public void getTooltip(final Tooltip tooltip) { - tooltip.add(Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.designer.pattern", this.getValue().getName())); + tooltip.add(Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.designer.pattern", this.getValue().getName())); } @Override diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java index 045781a9..eec58b39 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java @@ -58,7 +58,7 @@ public class PagePlanksOverview extends PageAbstract { String descBody = "§o"; String descSig = ""; if (desc == null || desc.length() == 0) { - descBody += BinnieCore.proxy.localise("gui.database.nodescription"); + descBody += BinnieCore.getBinnieProxy().localise("gui.database.nodescription"); } else { final String[] descStrings = desc.split("\\|"); descBody += descStrings[0]; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index 5133ba47..9d9fb198 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -61,7 +61,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.PLANT) + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MiddleLeft); y += th; - new ControlText(contents, new IArea(0, y, w2, th), BinnieCore.proxy.localise("gui.temperature.short") + " : ", TextJustification.MiddleRight); + new ControlText(contents, new IArea(0, y, w2, th), BinnieCore.getBinnieProxy().localise("gui.temperature.short") + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft); y += th; //TODO RENDERING @@ -134,8 +134,8 @@ public class PageSpeciesTreeGenome extends PageSpecies { public static String tolerated(final boolean t) { if (t) { - return BinnieCore.proxy.localise("gui.tolerated"); + return BinnieCore.getBinnieProxy().localise("gui.tolerated"); } - return BinnieCore.proxy.localise("gui.nottolerated"); + return BinnieCore.getBinnieProxy().localise("gui.nottolerated"); } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java index 3e9ab0a6..722533fc 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java @@ -31,7 +31,7 @@ public class WindowWoodworker extends Window { @Override public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); - new ControlText(this, new IArea(190, 36, 114, 10), BinnieCore.proxy.localise("gui.design"), TextJustification.TopCenter).setColour(4473924); + new ControlText(this, new IArea(190, 36, 114, 10), BinnieCore.getBinnieProxy().localise("gui.design"), TextJustification.TopCenter).setColour(4473924); new Panel(this, 188, 48, 118, 126, MinecraftGUI.PanelType.Gray); this.textEdit = new ControlTextEdit(this, 188, 178, 118, 12); final ControlScrollableContent scroll = new ControlScrollableContent(this, 190, 50, 114, 122, 12); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/package-info.java b/src/main/java/binnie/extratrees/machines/craftgui/package-info.java new file mode 100644 index 00000000..67da091c --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/craftgui/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.machines.craftgui; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/distillery/package-info.java b/src/main/java/binnie/extratrees/machines/distillery/package-info.java new file mode 100644 index 00000000..c93c481c --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/distillery/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.machines.distillery; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java index fca718cb..c5884156 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java @@ -35,7 +35,7 @@ public class FruitPressRecipes { return null; } - public static void addRecipe(@Nonnull final ItemStack stack, @Nonnull final FluidStack fluid) { + public static void addRecipe(final ItemStack stack, final FluidStack fluid) { if (getOutput(stack) != null) { return; } diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java b/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java new file mode 100644 index 00000000..f3a1c09e --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.machines.fruitpress; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java index c2681fa1..169ca82d 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java @@ -87,7 +87,7 @@ public class LumbermillRecipes { } @Override - public boolean canInteractWith(@Nonnull EntityPlayer playerIn) { + public boolean canInteractWith(EntityPlayer playerIn) { return true; } } diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java b/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java new file mode 100644 index 00000000..ed8c8d30 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.machines.lumbermill; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/package-info.java b/src/main/java/binnie/extratrees/machines/package-info.java new file mode 100644 index 00000000..192cff36 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.machines; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java index c7fe5233..c3712a94 100644 --- a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java @@ -26,7 +26,7 @@ public class ModelETDecorativeLeaves extends ModelBlockCached(); - if (stack == null) { - return; - } this.readFromNBT(stack.getTagCompound()); } @@ -39,7 +38,10 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { @Override public int getColour(final int renderPass) { if (renderPass == 2) { - return this.getBreedingSystem().getColour(); + BreedingSystem breedingSystem = this.getBreedingSystem(); + if (breedingSystem != null) { + return breedingSystem.getColour(); + } } return 16777215; } @@ -47,11 +49,15 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { @Override public void getInfo(final List list) { final List totalList = new ArrayList<>(); - for (IGene gene : this.genes) { - final String chromosomeName = this.getBreedingSystem().getChromosomeName(gene.getChromosome()); - totalList.add(TextFormatting.GOLD + chromosomeName + TextFormatting.GRAY + ": " + gene.getName()); + + BreedingSystem breedingSystem = this.getBreedingSystem(); + if (breedingSystem != null) { + for (IGene gene : this.genes) { + final String chromosomeName = breedingSystem.getChromosomeName(gene.getChromosome()); + totalList.add(TextFormatting.GOLD + chromosomeName + TextFormatting.GRAY + ": " + gene.getName()); + } } - if (totalList.size() < 4 || BinnieCore.proxy.isShiftDown()) { + if (totalList.size() < 4 || GuiScreen.isShiftKeyDown()) { list.addAll(totalList); } else { list.add(totalList.get(0)); @@ -60,6 +66,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { } } + @Nullable public BreedingSystem getBreedingSystem() { if (this.genes.size() == 0) { return null; @@ -99,6 +106,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { } @Override + @Nullable public ISpeciesRoot getSpeciesRoot() { if (this.genes.size() == 0) { return null; @@ -106,6 +114,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { return this.genes.get(0).getSpeciesRoot(); } + @Nullable public IGene getGene(final int chromosome) { for (final IGene gene : this.genes) { if (gene.getChromosome().ordinal() == chromosome) { @@ -117,10 +126,10 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { @Override public void writeToItem(final ItemStack stack) { - if (stack == null) { - return; + NBTTagCompound nbt = stack.getTagCompound(); + if (nbt == null) { + nbt = new NBTTagCompound(); } - final NBTTagCompound nbt = stack.hasTagCompound() ? stack.getTagCompound() : new NBTTagCompound(); this.writeToNBT(nbt); stack.setTagCompound(nbt); } diff --git a/src/main/java/binnie/genetics/genetics/GeneItem.java b/src/main/java/binnie/genetics/genetics/GeneItem.java index 8202cef5..cbd30590 100644 --- a/src/main/java/binnie/genetics/genetics/GeneItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneItem.java @@ -4,46 +4,49 @@ import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.api.IGene; -import forestry.api.core.INbtReadable; +import binnie.genetics.item.GeneticsItems; +import com.google.common.base.Preconditions; import forestry.api.core.INbtWritable; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.common.util.Constants; +import javax.annotation.Nullable; import java.util.List; -public class GeneItem implements INbtReadable, INbtWritable, IGeneItem { - IGene gene; +public class GeneItem implements INbtWritable, IGeneItem { + private IGene gene; - public GeneItem(final ItemStack stack) { - if (stack == null) { - return; + @Nullable + public static GeneItem create(final ItemStack stack) { + NBTTagCompound tagCompound = stack.getTagCompound(); + if (tagCompound != null && tagCompound.hasKey("gene", Constants.NBT.TAG_COMPOUND)) { + NBTTagCompound geneNbt = tagCompound.getCompoundTag("gene"); + Gene gene = Gene.create(geneNbt); + return new GeneItem(gene); } - this.readFromNBT(stack.getTagCompound()); + return null; } public GeneItem(final IGene gene) { this.gene = gene; } - public boolean isCorrupted() { - return this.gene == null; - } - @Override public void writeToItem(final ItemStack stack) { - if (this.gene == null || stack == null) { - return; + NBTTagCompound nbt = stack.getTagCompound(); + if (nbt == null) { + nbt = new NBTTagCompound(); } - final NBTTagCompound nbt = stack.hasTagCompound() ? stack.getTagCompound() : new NBTTagCompound(); this.writeToNBT(nbt); stack.setTagCompound(nbt); } @Override public int getColour(final int renderPass) { - if (renderPass == 2 && this.getBreedingSystem() != null) { + if (renderPass == 2) { return this.getBreedingSystem().getColour(); } return 16777215; @@ -56,28 +59,15 @@ public class GeneItem implements INbtReadable, INbtWritable, IGeneItem { } public BreedingSystem getBreedingSystem() { - if (this.gene == null) { - return null; - } - return Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot().getUID()); + return Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()); } public IGene getGene() { return this.gene; } - @Override - public void readFromNBT(final NBTTagCompound nbt) { - if (nbt != null) { - this.gene = Gene.create(nbt.getCompoundTag("gene")); - } - } - @Override public NBTTagCompound writeToNBT(final NBTTagCompound nbt) { - if (this.gene == null) { - return nbt; - } final NBTTagCompound geneNBT = this.gene.getNBTTagCompound(); nbt.setTag("gene", geneNBT); return nbt; diff --git a/src/main/java/binnie/genetics/genetics/GeneTracker.java b/src/main/java/binnie/genetics/genetics/GeneTracker.java index 90197907..85b2135d 100644 --- a/src/main/java/binnie/genetics/genetics/GeneTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneTracker.java @@ -17,13 +17,15 @@ import net.minecraft.nbt.NBTTagString; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; +import javax.annotation.Nullable; import java.util.ArrayList; public class GeneTracker extends WorldSavedData { private ArrayList discoveredGenes; - GameProfile username; + @Nullable + private GameProfile username; - public GeneTracker(final String s, final GameProfile username) { + public GeneTracker(final String s, @Nullable final GameProfile username) { super(s); this.discoveredGenes = new ArrayList<>(); this.username = username; @@ -38,7 +40,7 @@ public class GeneTracker extends WorldSavedData { return getTracker(player.worldObj, null); } - public static GeneTracker getTracker(final World world, final GameProfile player) { + public static GeneTracker getTracker(final World world, @Nullable final GameProfile player) { final String filename = "GeneTracker." + ((player == null) ? "common" : player.getId()); GeneTracker tracker = (GeneTracker) world.loadItemData(GeneTracker.class, filename); if (tracker == null) { diff --git a/src/main/java/binnie/genetics/genetics/IGeneItem.java b/src/main/java/binnie/genetics/genetics/IGeneItem.java index 25fcf00f..7603801a 100644 --- a/src/main/java/binnie/genetics/genetics/IGeneItem.java +++ b/src/main/java/binnie/genetics/genetics/IGeneItem.java @@ -4,9 +4,11 @@ import binnie.genetics.api.IGene; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; import java.util.List; public interface IGeneItem { + @Nullable ISpeciesRoot getSpeciesRoot(); void getInfo(final List p0); diff --git a/src/main/java/binnie/genetics/genetics/SequencerItem.java b/src/main/java/binnie/genetics/genetics/SequencerItem.java index 8723cd65..10d54fc8 100644 --- a/src/main/java/binnie/genetics/genetics/SequencerItem.java +++ b/src/main/java/binnie/genetics/genetics/SequencerItem.java @@ -1,15 +1,33 @@ package binnie.genetics.genetics; +import binnie.core.genetics.Gene; import binnie.genetics.api.IGene; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.Constants; + +import javax.annotation.Nullable; public class SequencerItem extends GeneItem { public int sequenced; public boolean analysed; - public SequencerItem(final ItemStack stack) { - super(stack); + @Nullable + public static SequencerItem create(final ItemStack itemStack) { + NBTTagCompound nbt = itemStack.getTagCompound(); + if (nbt != null && + nbt.hasKey("gene", Constants.NBT.TAG_COMPOUND) && + nbt.hasKey("seq", Constants.NBT.TAG_BYTE) && + nbt.hasKey("ana") + ) { + NBTTagCompound geneNbt = nbt.getCompoundTag("gene"); + Gene gene = Gene.create(geneNbt); + SequencerItem sequencerItem = new SequencerItem(gene); + sequencerItem.sequenced = nbt.getByte("seq"); + sequencerItem.analysed = nbt.getBoolean("ana"); + return sequencerItem; + } + return null; } public SequencerItem(final IGene gene) { @@ -18,13 +36,6 @@ public class SequencerItem extends GeneItem { this.analysed = false; } - @Override - public void readFromNBT(final NBTTagCompound nbt) { - super.readFromNBT(nbt); - this.sequenced = nbt.getByte("seq"); - this.analysed = nbt.getBoolean("ana"); - } - @Override public NBTTagCompound writeToNBT(final NBTTagCompound nbt2) { NBTTagCompound nbt = super.writeToNBT(nbt2); diff --git a/src/main/java/binnie/genetics/genetics/package-info.java b/src/main/java/binnie/genetics/genetics/package-info.java new file mode 100644 index 00000000..dcf877ef --- /dev/null +++ b/src/main/java/binnie/genetics/genetics/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.genetics; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java index a4d14969..9b790cf3 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java @@ -16,14 +16,11 @@ public class AnalystPageAppearance extends ControlAnalystPage { final IAlleleSpecies species = ind.getGenome().getPrimary(); new ControlTextCentered(this, y, "§nAppearance").setColour(this.getColour()); y += 12; - final ControlColourDisplay a = new ControlColourDisplay(this, this.w() / 2 - 28, y); - a.setValue(ind.getGenome().getPrimaryColor()); + final ControlColourDisplay a = new ControlColourDisplay(this, this.w() / 2 - 28, y, ind.getGenome().getPrimaryColor()); a.addTooltip("Primary Petal Colour"); - final ControlColourDisplay b = new ControlColourDisplay(this, this.w() / 2 - 8, y); - b.setValue(ind.getGenome().getSecondaryColor()); + final ControlColourDisplay b = new ControlColourDisplay(this, this.w() / 2 - 8, y, ind.getGenome().getSecondaryColor()); b.addTooltip("Secondary Petal Colour"); - final ControlColourDisplay c = new ControlColourDisplay(this, this.w() / 2 + 12, y); - c.setValue(ind.getGenome().getStemColor()); + final ControlColourDisplay c = new ControlColourDisplay(this, this.w() / 2 + 12, y, ind.getGenome().getStemColor()); c.addTooltip("Stem Colour"); y += 26; final int sections = ind.getGenome().getType().getSections(); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java index 20a47a16..b8adcfdc 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java @@ -35,7 +35,7 @@ public class AnalystPageBehaviour extends ControlAnalystPage { final IAlleleBeeEffect effect = bee.getGenome().getEffect(); final Vec3i t = bee.getGenome().getTerritory(); if (!effect.getUID().contains("None")) { - final String effectDesc = BinnieCore.proxy.localiseOrBlank("allele." + effect.getUID() + ".desc"); + final String effectDesc = BinnieCore.getBinnieProxy().localiseOrBlank("allele." + effect.getUID() + ".desc"); final String loc = effectDesc.equals("") ? ("Effect: " + effect.getName()) : effectDesc; new ControlText(this, new IArea(4, y, this.w() - 8, 0), loc, TextJustification.TopCenter).setColour(this.getColour()); y += CraftGUI.render.textHeight(loc, this.w() - 8) + 1; @@ -55,7 +55,7 @@ public class AnalystPageBehaviour extends ControlAnalystPage { y += 22; final IAlleleButterflyEffect effect2 = bee2.getGenome().getEffect(); if (!effect2.getUID().contains("None")) { - final String effectDesc2 = BinnieCore.proxy.localiseOrBlank("allele." + effect2.getUID() + ".desc"); + final String effectDesc2 = BinnieCore.getBinnieProxy().localiseOrBlank("allele." + effect2.getUID() + ".desc"); final String loc2 = effectDesc2.equals("") ? ("Effect: " + effect2.getName()) : effectDesc2; new ControlText(this, new IArea(4, y, this.w() - 8, 0), loc2, TextJustification.TopCenter).setColour(this.getColour()); y += CraftGUI.render.textHeight(loc2, this.w() - 8) + 1; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java index bf92d6d7..8a177345 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java @@ -37,7 +37,7 @@ public class AnalystPageProducts extends AnalystPageProduce { this.setColour(13382400); final IBeeGenome genome = ind.getGenome(); final float speed = genome.getSpeed(); - final float modeSpeed = Binnie.GENETICS.getBeeRoot().getBeekeepingMode(BinnieCore.proxy.getWorld()).getBeeModifier().getProductionModifier(genome, 1.0f); + final float modeSpeed = Binnie.GENETICS.getBeeRoot().getBeekeepingMode(BinnieCore.getBinnieProxy().getWorld()).getBeeModifier().getProductionModifier(genome, 1.0f); int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 12; diff --git a/src/main/java/binnie/genetics/gui/package-info.java b/src/main/java/binnie/genetics/gui/package-info.java new file mode 100644 index 00000000..aa7d8609 --- /dev/null +++ b/src/main/java/binnie/genetics/gui/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.gui; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 293ccf5f..fc6dd48e 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -48,7 +48,7 @@ public enum GeneticsItems implements IItemMiscProvider { return new ItemStack(Genetics.getItemGenetics(), size, this.ordinal()); } - public ItemStack get(@Nonnull Item itemGenetics, final int size) { + public ItemStack get(Item itemGenetics, final int size) { return new ItemStack(itemGenetics, size, this.ordinal()); } diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index ab0bf230..b82ff53f 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public abstract class ItemGene extends ItemCore { @@ -51,7 +52,9 @@ public abstract class ItemGene extends ItemCore { list.add(damage + " " + Binnie.LANGUAGE.localise("genetic.item.gene.charges")); } final IGeneItem gene = this.getGeneItem(itemstack); - gene.getInfo(list); + if (gene != null) { + gene.getInfo(list); + } } @Override @@ -61,5 +64,6 @@ public abstract class ItemGene extends ItemCore { public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { } - public abstract IGeneItem getGeneItem(final ItemStack p0); + @Nullable + public abstract IGeneItem getGeneItem(final ItemStack itemStack); } diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index e0e66b9f..b92748f2 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -10,6 +10,7 @@ import binnie.genetics.api.IItemAnalysable; import binnie.genetics.api.IItemChargeable; import binnie.genetics.genetics.GeneItem; import binnie.genetics.genetics.SequencerItem; +import com.google.common.base.Preconditions; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.AlleleManager; @@ -34,11 +35,12 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar @Override public String getItemStackDisplayName(final ItemStack itemstack) { - final GeneItem gene = new GeneItem(itemstack); - if (gene.isCorrupted()) { + final GeneItem gene = GeneItem.create(itemstack); + if (gene == null) { return "Corrupted Sequence"; + } else { + return gene.getBreedingSystem().getDescriptor() + " DNA Sequence"; } - return gene.getBreedingSystem().getDescriptor() + " DNA Sequence"; } @Override @@ -46,22 +48,21 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar public void addInformation(final ItemStack itemstack, final EntityPlayer entityPlayer, final List list, final boolean par4) { super.addInformation(itemstack, entityPlayer, list, par4); list.add(Genetics.proxy.localise("item.sequence." + (5 - itemstack.getItemDamage() % 6))); - final SequencerItem gene = new SequencerItem(itemstack); - if (gene.isCorrupted()) { - return; - } - if (gene.analysed) { - gene.getInfo(list); - } else { - list.add(""); - } - final int seq = gene.sequenced; - if (seq == 0) { - list.add("Unsequenced"); - } else if (seq < 100) { - list.add("Partially Sequenced (" + seq + "%)"); - } else { - list.add("Fully Sequenced"); + final SequencerItem gene = SequencerItem.create(itemstack); + if (gene != null) { + if (gene.analysed) { + gene.getInfo(list); + } else { + list.add(""); + } + final int seq = gene.sequenced; + if (seq == 0) { + list.add("Unsequenced"); + } else if (seq < 100) { + list.add("Partially Sequenced (" + seq + "%)"); + } else { + list.add("Fully Sequenced"); + } } } @@ -79,13 +80,14 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar @Override public boolean isAnalysed(final ItemStack stack) { - final SequencerItem seq = new SequencerItem(stack); - return seq.isCorrupted() || seq.analysed; + final SequencerItem seq = SequencerItem.create(stack); + return seq != null && seq.analysed; } @Override public ItemStack analyse(final ItemStack stack) { - final SequencerItem seq = new SequencerItem(stack); + final SequencerItem seq = SequencerItem.create(stack); + Preconditions.checkNotNull(seq, "Cannot analyze itemstack that is not a valid item sequence"); seq.analysed = true; seq.writeToItem(stack); return stack; @@ -120,7 +122,8 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar @Override public ISpeciesRoot getSpeciesRoot(ItemStack itemStack) { - final SequencerItem seq = new SequencerItem(itemStack); + final SequencerItem seq = SequencerItem.create(itemStack); + Preconditions.checkNotNull(seq, "Cannot getSpeciesRoot from itemstack that is not a valid item sequence"); return seq.getSpeciesRoot(); } } diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 1b49f2ab..aed525df 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -1,12 +1,14 @@ package binnie.genetics.item; import binnie.Binnie; +import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.GeneItem; import binnie.genetics.genetics.IGeneItem; +import com.google.common.base.Preconditions; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; @@ -18,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; import java.util.Map; @@ -51,9 +54,6 @@ public class ItemSerum extends ItemGene implements IItemSerum { final IChromosomeType chromosome = entry.getKey(); for (final IAllele allele : entry.getValue()) { final Gene gene = Gene.create(allele, chromosome, root); - if (gene == null) { - continue; - } final IGeneItem item = new GeneItem(gene); final ItemStack stack = new ItemStack(this); item.writeToItem(stack); @@ -65,35 +65,46 @@ public class ItemSerum extends ItemGene implements IItemSerum { @Override public IGene[] getGenes(final ItemStack stack) { - return new IGene[]{this.getGeneItem(stack).getGene()}; + GeneItem geneItem = this.getGeneItem(stack); + Preconditions.checkNotNull(geneItem, "Cannot get genes from itemStack that is not a valid serum."); + return new IGene[]{geneItem.getGene()}; } @Override public ISpeciesRoot getSpeciesRoot(final ItemStack stack) { - return this.getGeneItem(stack).getSpeciesRoot(); + GeneItem geneItem = this.getGeneItem(stack); + Preconditions.checkNotNull(geneItem, "Cannot get species root from itemStack that is not a valid serum."); + return geneItem.getSpeciesRoot(); } @Override public IGene getGene(final ItemStack stack, final int chromosome) { - return this.getGeneItem(stack).getGene(); + GeneItem geneItem = this.getGeneItem(stack); + Preconditions.checkNotNull(geneItem, "Cannot get gene from itemStack that is not a valid serum."); + return geneItem.getGene(); } @Override - public GeneItem getGeneItem(final ItemStack stack) { - return new GeneItem(stack); + @Nullable + public GeneItem getGeneItem(final ItemStack itemStack) { + return GeneItem.create(itemStack); } @Override public String getItemStackDisplayName(final ItemStack itemstack) { final GeneItem gene = this.getGeneItem(itemstack); - if (!gene.isCorrupted()) - return Binnie.GENETICS.getSystem(gene.getSpeciesRoot()).getDescriptor() + " " + Binnie.LANGUAGE.localise("genetic.item.gene.serum"); - return Binnie.LANGUAGE.localise("genetic.item.gene.corrupted.serum"); + if (gene != null) { + BreedingSystem system = Binnie.GENETICS.getSystem(gene.getSpeciesRoot()); + return system.getDescriptor() + " " + Binnie.LANGUAGE.localise("genetic.item.gene.serum"); + } else { + return Binnie.LANGUAGE.localise("genetic.item.gene.corrupted.serum"); + } } @Override public ItemStack addGene(final ItemStack stack, final IGene gene) { final IGeneItem geneI = this.getGeneItem(stack); + Preconditions.checkNotNull(geneI, "Cannot add gene to itemStack that is not a valid serum."); geneI.addGene(gene); geneI.writeToItem(stack); return stack; diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 5574d5d3..8f1ae755 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -1,12 +1,14 @@ package binnie.genetics.item; import binnie.Binnie; +import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.GeneArrayItem; import binnie.genetics.genetics.IGeneItem; +import com.google.common.base.Preconditions; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; @@ -20,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public class ItemSerumArray extends ItemGene implements IItemSerum { @@ -46,22 +49,37 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { @Override public IGene[] getGenes(final ItemStack stack) { - return this.getGeneItem(stack).getGenes().toArray(new IGene[0]); + GeneArrayItem geneItem = this.getGeneItem(stack); + if (geneItem != null) { + return geneItem.getGenes().toArray(new IGene[0]); + } + return new IGene[0]; } @Override + @Nullable public ISpeciesRoot getSpeciesRoot(final ItemStack stack) { - return this.getGeneItem(stack).getSpeciesRoot(); + GeneArrayItem geneItem = this.getGeneItem(stack); + if (geneItem != null) { + return geneItem.getSpeciesRoot(); + } + return null; } @Override + @Nullable public IGene getGene(final ItemStack stack, final int chromosome) { - return this.getGeneItem(stack).getGene(chromosome); + GeneArrayItem geneItem = this.getGeneItem(stack); + if (geneItem != null) { + return geneItem.getGene(chromosome); + } else { + return null; + } } @Override - public GeneArrayItem getGeneItem(final ItemStack stack) { - return new GeneArrayItem(stack); + public GeneArrayItem getGeneItem(final ItemStack itemStack) { + return new GeneArrayItem(itemStack); } @Override @@ -99,17 +117,23 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { @Override public String getItemStackDisplayName(final ItemStack itemstack) { - ISpeciesRoot speciesRoot = getGeneItem(itemstack).getSpeciesRoot(); - if (speciesRoot != null) - return Binnie.GENETICS.getSystem(getGeneItem(itemstack).getSpeciesRoot()).getDescriptor() + " Serum Array"; + GeneArrayItem geneItem = getGeneItem(itemstack); + if (geneItem != null) { + ISpeciesRoot speciesRoot = geneItem.getSpeciesRoot(); + if (speciesRoot != null) { + BreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot); + return system.getDescriptor() + " Serum Array"; + } + } return "Corrupted Serum Array"; } @Override public ItemStack addGene(final ItemStack stack, final IGene gene) { - final IGeneItem geneI = this.getGeneItem(stack); - geneI.addGene(gene); - geneI.writeToItem(stack); + final IGeneItem geneItem = this.getGeneItem(stack); + Preconditions.checkNotNull(geneItem, "Cannot add gene to itemStack that is not a valid serum array."); + geneItem.addGene(gene); + geneItem.writeToItem(stack); return stack; } diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index cf75a275..7f686762 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -63,21 +63,21 @@ public class ModuleItem implements IInitializable { @Override public void init() { - ModuleItem.iconNight = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.night"); - ModuleItem.iconDaytime = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.day"); - ModuleItem.iconAllDay = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.allday"); - ModuleItem.iconRain = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.rain"); - ModuleItem.iconNoRain = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.norain"); - ModuleItem.iconSky = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.sky"); - ModuleItem.iconNoSky = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.nosky"); - ModuleItem.iconFire = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.fire"); - ModuleItem.iconNoFire = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.nofire"); - ModuleItem.iconAdd = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.add"); - ModuleItem.iconArrow = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.arrow"); - ModuleItem.iconAdd0 = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.add.0"); - ModuleItem.iconArrow0 = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.arrow.0"); - ModuleItem.iconAdd1 = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.add.1"); - ModuleItem.iconArrow1 = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.arrow.1"); + ModuleItem.iconNight = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.night"); + ModuleItem.iconDaytime = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.day"); + ModuleItem.iconAllDay = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.allday"); + ModuleItem.iconRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.rain"); + ModuleItem.iconNoRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.norain"); + ModuleItem.iconSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.sky"); + ModuleItem.iconNoSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nosky"); + ModuleItem.iconFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.fire"); + ModuleItem.iconNoFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nofire"); + ModuleItem.iconAdd = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add"); + ModuleItem.iconArrow = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow"); + ModuleItem.iconAdd0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.0"); + ModuleItem.iconArrow0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.0"); + ModuleItem.iconAdd1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.1"); + ModuleItem.iconArrow1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.1"); } @Override diff --git a/src/main/java/binnie/genetics/item/package-info.java b/src/main/java/binnie/genetics/item/package-info.java new file mode 100644 index 00000000..20a9927d --- /dev/null +++ b/src/main/java/binnie/genetics/item/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.item; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java b/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java index 9847c98a..692237a7 100644 --- a/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java +++ b/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java @@ -23,6 +23,7 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im public int guiRefreshCounter; List indexerInventory; public List sortedInventory; + @Nullable T sortingMode; boolean needsSorting; @@ -69,7 +70,7 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } @Override - public void setInventorySlotContents(final int index, final ItemStack itemStack) { + public void setInventorySlotContents(final int index, @Nullable final ItemStack itemStack) { if (index >= 0 && index < this.indexerInventory.size()) { this.indexerInventory.set(index, itemStack); } else if (itemStack != null) { @@ -112,6 +113,7 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im this.needsSorting = true; } + @Nullable public T getMode() { return this.sortingMode; } @@ -159,7 +161,7 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im ++i; } } - if (!this.needsSorting) { + if (!this.needsSorting || this.sortingMode == null) { return; } this.needsSorting = false; diff --git a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java index d4d1be99..986a59bc 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java @@ -26,7 +26,7 @@ public class MachineRendererGenetics { final float phase = (float) Math.max(0.0, Math.sin((System.currentTimeMillis() + i1) * 0.003)); GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5); GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); - BinnieCore.proxy.getMinecraftInstance(); + BinnieCore.getBinnieProxy().getMinecraftInstance(); if (Minecraft.isFancyGraphicsEnabled()) { for (IRender.Render render : machine.getInterfaces(IRender.Render.class)) { render.renderInWorld(x, y, z); diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index 99953407..d20b397a 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -43,7 +43,7 @@ public class MachineRendererLab { LaboratoryMachine.ComponentGUIHolder holder = Machine.getInterface(LaboratoryMachine.ComponentGUIHolder.class, machine); Label_0591: { if (world != null && holder != null && holder.getStack() != null) { - BinnieCore.proxy.getMinecraftInstance(); + BinnieCore.getBinnieProxy().getMinecraftInstance(); if (Minecraft.isFancyGraphicsEnabled()) { final ItemStack stack = holder.getStack(); this.dummyEntityItem.worldObj = world; @@ -53,7 +53,7 @@ public class MachineRendererLab { this.dummyEntityItem.onUpdate(); } GlStateManager.pushMatrix(); - final EntityPlayer player = BinnieCore.proxy.getPlayer(); + final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); final double dx = ix + 0.5 - player.lastTickPosX; final double dz = iz + 0.5 - player.lastTickPosZ; final double t = Math.atan2(dz, dx) * 180.0 / 3.1415; @@ -64,7 +64,7 @@ public class MachineRendererLab { GlStateManager.scale(1.2f, 1.2f, 1.2f); GlStateManager.rotate(45.0f, 1.0f, 0.0f, 0.0f); GlStateManager.translate(0.0f, 0.1f, 0.1f); - RenderManager renderManager = BinnieCore.proxy.getMinecraftInstance().getRenderManager(); + RenderManager renderManager = BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderManager(); renderManager.doRenderEntity(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f, false); GlStateManager.popMatrix(); int rot = 0; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java index 95521a36..a128fbff 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java @@ -43,7 +43,7 @@ public class PackageAcclimatiser extends GeneticMachine.PackageGeneticBase imple transfer.addRestock(Acclimatiser.SLOT_RESERVE, Acclimatiser.SLOT_TARGET, 1); transfer.addStorage(Acclimatiser.SLOT_TARGET, Acclimatiser.SLOT_DRONE, new ComponentInventoryTransfer.Condition() { @Override - public boolean fufilled(final ItemStack stack) { + public boolean fulfilled(final ItemStack stack) { return !Acclimatiser.canAcclimatise(stack, machine.getMachineUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER)); } }); diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java b/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java new file mode 100644 index 00000000..98fd6e8c --- /dev/null +++ b/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.acclimatiser; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java index 13354db1..19e9dd53 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java @@ -31,7 +31,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, @Override public void onDisplayTick(World world, BlockPos pos, Random rand) { if (rand.nextFloat() < 1.0f && this.getUtil().getProcess().isInProgress()) { - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.3 + rand.nextDouble() * 0.2, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.3 + rand.nextDouble() * 0.2, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; double angle = this.rand.nextDouble() * 2.0 * 3.1415; @@ -78,14 +78,14 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, if (stack == null) { return; } - final EntityPlayer player = BinnieCore.proxy.getPlayer(); + final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); final double dx = x + 0.5 - player.lastTickPosX; final double dz = z + 0.5 - player.lastTickPosZ; final double t = Math.atan2(dz, dx) * 180.0 / 3.1415; GlStateManager.pushMatrix(); GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); GlStateManager.translate(0.0f, -0.2f, 0.0f); - BinnieCore.proxy.getMinecraftInstance().getRenderItem().renderItem(dummyEntityItem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED);//doRender(this.dummyEntityItem.getEntityItem(), 0.0, 0.0, 0.0, 0.0f, 0.0f); + BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderItem().renderItem(dummyEntityItem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED);//doRender(this.dummyEntityItem.getEntityItem(), 0.0, 0.0, 0.0, 0.0f, 0.0f); GlStateManager.popMatrix(); } diff --git a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java index 8f597cb9..1f479801 100644 --- a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java @@ -55,7 +55,7 @@ public class PackageAnalyser extends GeneticMachine.PackageGeneticBase implement transfer.addRestock(Analyser.SLOT_RESERVE, 6, 1); transfer.addStorage(6, Analyser.SLOT_FINISHED, new ComponentInventoryTransfer.Condition() { @Override - public boolean fufilled(final ItemStack stack) { + public boolean fulfilled(final ItemStack stack) { return Analyser.isAnalysed(stack); } }); diff --git a/src/main/java/binnie/genetics/machine/analyser/package-info.java b/src/main/java/binnie/genetics/machine/analyser/package-info.java new file mode 100644 index 00000000..6434b1bf --- /dev/null +++ b/src/main/java/binnie/genetics/machine/analyser/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.analyser; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index 012becf9..ad782b60 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -1,6 +1,7 @@ package binnie.genetics.machine.craftgui; import binnie.Binnie; +import binnie.core.genetics.BreedingSystem; import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.Attribute; @@ -18,29 +19,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class ControlGene extends Control implements IControlValue, ITooltip { - IGene gene; + private IGene gene; - @Override - public void getTooltip(final Tooltip tooltip) { - final String cName = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome()); - tooltip.add(cName + ": " + this.gene.getName()); - if (this.isMouseOver() && this.canFill(Window.get(this).getHeldItemStack())) { - tooltip.add("Left click to assign gene"); - final IGene existingGene = Engineering.getGene(Window.get(this).getHeldItemStack(), this.gene.getChromosome().ordinal()); - if (existingGene == null) { - return; - } - final String dName = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome()); - tooltip.add("Will replace " + dName + ": " + existingGene.getName()); - } - } - - private boolean canFill(final ItemStack stack) { - return stack != null && stack.stackSize == 1 && Engineering.isGeneAcceptor(stack) && Engineering.canAcceptGene(stack, this.getValue()); - } - - protected ControlGene(final IWidget parent, final int x, final int y) { + protected ControlGene(final IWidget parent, final int x, final int y, final IGene gene) { super(parent, x, y, 16, 16); + this.gene = gene; this.addAttribute(Attribute.MouseOver); this.addSelfEventHandler(new EventMouse.Down.Handler() { @Override @@ -56,6 +39,26 @@ public class ControlGene extends Control implements IControlValue, IToolt }); } + @Override + public void getTooltip(final Tooltip tooltip) { + BreedingSystem system = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()); + final String cName = system.getChromosomeName(this.gene.getChromosome()); + tooltip.add(cName + ": " + this.gene.getName()); + if (this.isMouseOver() && this.canFill(Window.get(this).getHeldItemStack())) { + tooltip.add("Left click to assign gene"); + final IGene existingGene = Engineering.getGene(Window.get(this).getHeldItemStack(), this.gene.getChromosome().ordinal()); + if (existingGene == null) { + return; + } + final String dName = system.getChromosomeName(this.gene.getChromosome()); + tooltip.add("Will replace " + dName + ": " + existingGene.getName()); + } + } + + private boolean canFill(final ItemStack stack) { + return stack != null && stack.stackSize == 1 && Engineering.isGeneAcceptor(stack) && Engineering.canAcceptGene(stack, this.getValue()); + } + @Override public IGene getValue() { return this.gene; diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java index 202191b3..4bade5d1 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -13,12 +13,14 @@ import binnie.genetics.genetics.GeneTracker; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; import java.util.Map; public class ControlGeneScroll extends Control implements IControlValue { private String filter; + @Nullable private BreedingSystem system; protected ControlGeneScroll(final IWidget parent, final int x, final int y, final int w, final int h) { @@ -38,6 +40,9 @@ public class ControlGeneScroll extends Control implements IControlValue> genes = Binnie.GENETICS.getChromosomeMap(this.system.getSpeciesRoot()); @@ -63,7 +68,7 @@ public class ControlGeneScroll extends Control implements IControlValue scroll = new ControlScrollableContent<>(this, boxX + 24 + 2, 34, geneBoxWidth + 10, 116, 12); final ControlTextEdit edit = new ControlTextEdit(this, boxX + 27 + geneBoxWidth - 70, 18, 80, 12); this.addEventHandler(new EventTextEdit.Handler() { @Override public void onEvent(final EventTextEdit event) { - WindowGeneBank.this.genes.setFilter(event.getValue()); + String value = event.getValue(); + if (value == null) { + value = ""; + } + WindowGeneBank.this.genes.setFilter(value); } }.setOrigin(EventHandler.Origin.Self, edit)); - scroll.setScrollableContent(this.genes = new ControlGeneScroll(scroll, 1, 1, geneBoxWidth, 116)); + this.genes = new ControlGeneScroll(scroll, 1, 1, geneBoxWidth, 116); + scroll.setScrollableContent(this.genes); this.genes.setGenes(Binnie.GENETICS.beeBreedingSystem); - final ControlTabBar tabBar = new ControlTabBar(this, boxX, 32, 24, 120, Position.Left) { + final ControlTabBar tabBar = new ControlTabBar(this, boxX, 32, 24, 120, Position.Left, Binnie.GENETICS.getActiveSystems()) { @Override public ControlTab createTab(final int x, final int y, final int w, final int h, final BreedingSystem value) { return new ControlTabIcon(this, x, y, w, h, value) { @@ -129,12 +134,9 @@ public class WindowGeneBank extends WindowMachine { }; } }; - tabBar.setValues(Binnie.GENETICS.getActiveSystems()); tabBar.setValue(Binnie.GENETICS.beeBreedingSystem); boxX -= 8; - final ControlTabBar infoTabs = new ControlTabBar<>(this, boxX + 8, 160, 16, 50, Position.Left); - infoTabs.setValues(Arrays.asList("Stats", "Ranking")); - infoTabs.setValue("Info"); + final ControlTabBar infoTabs = new ControlTabBar<>(this, boxX + 8, 160, 16, 50, Position.Left, Arrays.asList("Info", "Stats", "Ranking")); final Panel panelProject = new Panel(this, boxX + 24, 160, geneBoxWidth + 20, 50, MinecraftGUI.PanelType.Black); int totalGenes = 0; int seqGenes = 0; diff --git a/src/main/java/binnie/genetics/machine/craftgui/package-info.java b/src/main/java/binnie/genetics/machine/craftgui/package-info.java new file mode 100644 index 00000000..2db43520 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/craftgui/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.craftgui; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java index 67642563..7175dbed 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java @@ -21,7 +21,7 @@ public class GenepoolFX extends MachineComponent implements IRender.DisplayTick @Override public void onDisplayTick(World world, BlockPos pos, Random rand) { if (rand.nextFloat() < 1.0f && this.getUtil().getProcess().isInProgress()) { - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(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) { + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(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) { double axisX = this.posX; double axisZ = this.posZ; double angle = this.rand.nextDouble() * 2.0 * 3.1415; diff --git a/src/main/java/binnie/genetics/machine/genepool/package-info.java b/src/main/java/binnie/genetics/machine/genepool/package-info.java new file mode 100644 index 00000000..2078664b --- /dev/null +++ b/src/main/java/binnie/genetics/machine/genepool/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.genepool; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/incubator/package-info.java b/src/main/java/binnie/genetics/machine/incubator/package-info.java new file mode 100644 index 00000000..68adbc3b --- /dev/null +++ b/src/main/java/binnie/genetics/machine/incubator/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.incubator; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java index 232704b7..ff38a562 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java @@ -32,7 +32,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic public void onDisplayTick(World world, BlockPos pos, Random rand) { final int tick = (int) (world.getTotalWorldTime() % 3L); if (tick == 0 && this.getUtil().getProcess().isInProgress()) { - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 0.92, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 0.92, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; double angle = (int) (this.worldObj.getTotalWorldTime() % 4L) * 0.5 * 3.1415; @@ -89,14 +89,14 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic if (stack == null) { return; } - final EntityPlayer player = BinnieCore.proxy.getPlayer(); + final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); final double dx = x + 0.5 - player.lastTickPosX; final double dz = z + 0.5 - player.lastTickPosZ; final double t = Math.atan2(dz, dx) * 180.0 / 3.1415; GlStateManager.pushMatrix(); GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); GlStateManager.translate(0.0f, -0.25f, 0.0f); - BinnieCore.proxy.getMinecraftInstance().getRenderItem().renderItem(this.dummyEntityItem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED); //, 0.0, 0.0, 0.0, 0.0f, 0.0f); + BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderItem().renderItem(this.dummyEntityItem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED); //, 0.0, 0.0, 0.0, 0.0f, 0.0f); GlStateManager.popMatrix(); } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java index d81efdb6..758e017b 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java @@ -122,7 +122,7 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { ItemStack applied = applySerum(target, serum); util.setStack(Inoculator.SLOT_TARGET, applied); - util.damageItem(Inoculator.SLOT_SERUM_VIAL, 1); + util.damageItem(serum, Inoculator.SLOT_SERUM_VIAL, 1); } public static ItemStack applySerum(ItemStack target, ItemStack serum) { diff --git a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java index efc67805..f4707e52 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java @@ -72,13 +72,13 @@ public class PackageInoculator extends GeneticMachine.PackageGeneticBase impleme transfer.addRestock(Inoculator.SLOT_SERUM_RESERVE, 0); transfer.addStorage(Inoculator.SLOT_SERUM_VIAL, Inoculator.SLOT_SERUM_EXPENDED, new ComponentInventoryTransfer.Condition() { @Override - public boolean fufilled(final ItemStack stack) { + public boolean fulfilled(final ItemStack stack) { return Engineering.getCharges(stack) == 0; } }); transfer.addStorage(Inoculator.SLOT_TARGET, Inoculator.SLOT_FINISHED, new ComponentInventoryTransfer.Condition() { @Override - public boolean fufilled(final ItemStack stack) { + public boolean fulfilled(final ItemStack stack) { return stack != null && this.transfer.getMachine().getMachineUtil().getStack(Inoculator.SLOT_SERUM_VIAL) != null && this.transfer.getMachine().getInterface(InoculatorLogic.class).isValidSerum() != null; } }); diff --git a/src/main/java/binnie/genetics/machine/inoculator/package-info.java b/src/main/java/binnie/genetics/machine/inoculator/package-info.java new file mode 100644 index 00000000..dfa19cdd --- /dev/null +++ b/src/main/java/binnie/genetics/machine/inoculator/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.inoculator; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java b/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java index d50a11b9..9aee8e3e 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java @@ -23,7 +23,7 @@ public class IsolaterFX extends MachineComponent implements IRender.RandomDispla if (!this.getUtil().getProcess().isInProgress()) { return; } - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(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) { + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(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) { double axisX = 0.0; double axisZ = 0.0; double angle = 0.0; @@ -57,7 +57,7 @@ public class IsolaterFX extends MachineComponent implements IRender.RandomDispla public void onDisplayTick(World world, BlockPos pos, Random rand) { final int tick = (int) (world.getTotalWorldTime() % 6L); if ((tick == 0 || tick == 5) && this.getUtil().getProcess().isInProgress()) { - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; double angle = 0.7 + (int) (this.worldObj.getTotalWorldTime() % 2L) * 3.1415; diff --git a/src/main/java/binnie/genetics/machine/isolator/package-info.java b/src/main/java/binnie/genetics/machine/isolator/package-info.java new file mode 100644 index 00000000..8f0b5674 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/isolator/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.isolator; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/package-info.java b/src/main/java/binnie/genetics/machine/package-info.java new file mode 100644 index 00000000..9d702f43 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java index d49fc5c9..bf351f08 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -52,7 +52,7 @@ public class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implem transfer.addRestock(Polymeriser.SLOT_SERUM_RESERVE, Polymeriser.SLOT_SERUM, 1); transfer.addStorage(Polymeriser.SLOT_SERUM, Polymeriser.SLOT_SERUM_FINISHED, new ComponentInventoryTransfer.Condition() { @Override - public boolean fufilled(final ItemStack stack) { + public boolean fulfilled(final ItemStack stack) { return !stack.isItemDamaged(); } }); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java index 06a0c962..0d743680 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java @@ -22,7 +22,7 @@ public class PolymeriserFX extends MachineComponent implements IRender.DisplayTi public void onDisplayTick(World world, BlockPos pos, Random rand) { final int tick = (int) (world.getTotalWorldTime() % 8L); if ((tick == 0 || tick == 3) && this.getUtil().getProcess().isInProgress()) { - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.8, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.8, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; double angle = 0.7 + (int) (this.worldObj.getTotalWorldTime() % 2L) * 3.1415; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java index 54c9d75b..71a9f1c6 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java @@ -6,8 +6,11 @@ import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.Genetics; import binnie.genetics.genetics.Engineering; +import com.google.common.base.Preconditions; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + public class PolymeriserLogic extends ComponentProcessSetCost implements IProcess { private static float chargePerProcess = 0.4f; private float dnaDrain; @@ -35,11 +38,11 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces return (int) (super.getProcessEnergy() * getNumberOfGenes(serum) * this.getCatalyst()); } - public static float getDNAPerProcess(ItemStack serum) { + public static float getDNAPerProcess(@Nullable ItemStack serum) { return getNumberOfGenes(serum) * 50; } - public static float getBacteriaPerProcess(ItemStack serum) { + public static float getBacteriaPerProcess(@Nullable ItemStack serum) { return 0.2f * getDNAPerProcess(serum); } @@ -61,7 +64,7 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces } } - private static int getNumberOfGenes(ItemStack serum) { + private static int getNumberOfGenes(@Nullable ItemStack serum) { if (serum == null) { return 1; } @@ -81,10 +84,11 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces @Override public ErrorState canWork() { - if (this.getUtil().isSlotEmpty(Polymeriser.SLOT_SERUM)) { + ItemStack serumStack = this.getUtil().getStack(Polymeriser.SLOT_SERUM); + if (serumStack == null) { return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.polymeriser.errors.item.no"), Polymeriser.SLOT_SERUM); } - if (!this.getUtil().getStack(Polymeriser.SLOT_SERUM).isItemDamaged()) { + if (!serumStack.isItemDamaged()) { return new ErrorState.InvalidItem(Genetics.proxy.localise("machine.machine.polymeriser.errors.item.filled"), Polymeriser.SLOT_SERUM); } return super.canWork(); @@ -104,6 +108,8 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces @Override protected void onFinishTask() { super.onFinishTask(); - this.getUtil().damageItem(Polymeriser.SLOT_SERUM, -1); + ItemStack serumStack = this.getUtil().getStack(Polymeriser.SLOT_SERUM); + Preconditions.checkState(serumStack != null); + this.getUtil().damageItem(serumStack, Polymeriser.SLOT_SERUM, -1); } } \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/polymeriser/package-info.java b/src/main/java/binnie/genetics/machine/polymeriser/package-info.java new file mode 100644 index 00000000..b04cbb07 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/polymeriser/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.polymeriser; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java index 71b62cf1..49eaf7c7 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java @@ -23,7 +23,7 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl if (!this.getUtil().getProcess().isInProgress()) { return; } - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.2 + rand.nextDouble() * 0.2, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.2 + rand.nextDouble() * 0.2, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; double angle = this.rand.nextDouble() * 2.0 * 3.1415; @@ -62,7 +62,7 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl public void onDisplayTick(World world, BlockPos pos, Random rand) { final int ticks = (int) (world.getTotalWorldTime() % 16L); if (ticks == 0 && this.getUtil().getProcess().isInProgress()) { - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = 0.0; double axisZ = 0.0; double angle = 0.0; diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java index cfaa1c49..fa54786a 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java @@ -8,14 +8,17 @@ import binnie.genetics.Genetics; import binnie.genetics.genetics.GeneTracker; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.item.GeneticsItems; +import com.google.common.base.Preconditions; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + public class SequencerLogic extends ComponentProcess implements IProcess { public SequencerLogic(final Machine machine) { super(machine); } - public static float getSequenceStrength(ItemStack stack) { + public static float getSequenceStrength(@Nullable ItemStack stack) { if (stack == null) { return 1.0f; } @@ -61,10 +64,14 @@ public class SequencerLogic extends ComponentProcess implements IProcess { protected void onStartTask() { super.onStartTask(); final ItemStack item = this.getUtil().getStack(Sequencer.SLOT_TARGET); - final SequencerItem seqItem = new SequencerItem(item); - final int seq = seqItem.sequenced; - if (seq != 0) { - this.setProgress(seq); + if (item != null) { + final SequencerItem seqItem = SequencerItem.create(item); + if (seqItem != null) { + final int seq = seqItem.sequenced; + if (seq != 0) { + this.setProgress(seq); + } + } } } @@ -72,7 +79,10 @@ public class SequencerLogic extends ComponentProcess implements IProcess { protected void onFinishTask() { super.onFinishTask(); this.updateSequence(); - final SequencerItem seqItem = new SequencerItem(this.getUtil().getStack(Sequencer.SLOT_TARGET)); + ItemStack stack = this.getUtil().getStack(Sequencer.SLOT_TARGET); + Preconditions.checkState(stack != null); + final SequencerItem seqItem = SequencerItem.create(stack); + Preconditions.checkState(seqItem != null); GeneTracker.getTracker(this.getMachine().getWorld(), this.getMachine().getOwner()).registerGene(seqItem.getGene()); this.getUtil().decreaseStack(Sequencer.SLOT_TARGET, 1); if (this.getUtil().getStack(Sequencer.SLOT_DONE) == null) { @@ -91,7 +101,9 @@ public class SequencerLogic extends ComponentProcess implements IProcess { private void updateSequence() { final int prog = (int) this.getProgress(); final ItemStack item = this.getUtil().getStack(Sequencer.SLOT_TARGET); - final SequencerItem seqItem = new SequencerItem(item); + Preconditions.checkState(item != null); + final SequencerItem seqItem = SequencerItem.create(item); + Preconditions.checkState(seqItem != null); final int seq = seqItem.sequenced; if (prog != seq) { seqItem.sequenced = prog; diff --git a/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java b/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java index f65c67a7..32758649 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java @@ -14,8 +14,8 @@ public class SlotValidatorUnsequenced extends SlotValidator { @Override public boolean isValid(final ItemStack itemStack) { if (itemStack.getItem() == Genetics.itemSequencer) { - final SequencerItem seq = new SequencerItem(itemStack); - return seq.sequenced < 100; + final SequencerItem seq = SequencerItem.create(itemStack); + return seq != null && seq.sequenced < 100; } return false; } diff --git a/src/main/java/binnie/genetics/machine/sequencer/package-info.java b/src/main/java/binnie/genetics/machine/sequencer/package-info.java new file mode 100644 index 00000000..9c30feab --- /dev/null +++ b/src/main/java/binnie/genetics/machine/sequencer/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.sequencer; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java index 1fc37e4b..421e3f6a 100644 --- a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java @@ -69,13 +69,13 @@ public class PackageSplicer extends AdvGeneticMachine.PackageAdvGeneticBase impl transfer.addRestock(Splicer.SLOT_SERUM_RESERVE, Splicer.SLOT_SERUM_VIAL); transfer.addStorage(Splicer.SLOT_SERUM_VIAL, Splicer.SLOT_SERUM_EXPENDED, new ComponentInventoryTransfer.Condition() { @Override - public boolean fufilled(final ItemStack stack) { + public boolean fulfilled(final ItemStack stack) { return Engineering.getCharges(stack) == 0; } }); transfer.addStorage(Splicer.SLOT_TARGET, Splicer.SLOT_FINISHED, new ComponentInventoryTransfer.Condition() { @Override - public boolean fufilled(final ItemStack stack) { + public boolean fulfilled(final ItemStack stack) { return stack != null && this.transfer.getMachine().getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null && this.transfer.getMachine().getInterface(SplicerLogic.class).isValidSerum() != null; } }); diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java index 57caa07b..32c8c8ce 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java @@ -32,7 +32,7 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, public void onDisplayTick(World world, BlockPos pos, Random rand) { final int tick = (int) (world.getTotalWorldTime() % 3L); if (tick == 0 && this.getUtil().getProcess().isInProgress()) { - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; double angle = (int) (this.worldObj.getTotalWorldTime() % 4L) * 0.5 * 3.1415; @@ -83,14 +83,14 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, if (stack == null) { return; } - final EntityPlayer player = BinnieCore.proxy.getPlayer(); + final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); final double dx = x + 0.5 - player.lastTickPosX; final double dz = z + 0.5 - player.lastTickPosZ; final double t = Math.atan2(dz, dx) * 180.0 / 3.1415; GlStateManager.pushMatrix(); GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); GlStateManager.translate(0.0f, -0.25f, 0.0f); - BinnieCore.proxy.getMinecraftInstance().getRenderItem().renderItem(dummyEntityItem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED);//doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); + BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderItem().renderItem(dummyEntityItem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED);//doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); GlStateManager.popMatrix(); } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java index 9cd4b652..47450b9c 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java @@ -8,6 +8,7 @@ import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.Engineering; +import com.google.common.base.Preconditions; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IIndividual; @@ -107,21 +108,29 @@ public class SplicerLogic extends ComponentProcess implements IProcess { if (this.getUtil().isSlotEmpty(Splicer.SLOT_TARGET)) { return new ErrorState.NoItem(Genetics.proxy.localise("machine.advMachine.splicer.errors.no.individual.desc"), Splicer.SLOT_TARGET); } - if (this.getUtil().isSlotEmpty(Splicer.SLOT_SERUM_VIAL)) { + + ItemStack serum = this.getUtil().getStack(Splicer.SLOT_SERUM_VIAL); + if (serum == null) { return new ErrorState.NoItem(Genetics.proxy.localise("machine.errors.no.serum.desc"), Splicer.SLOT_SERUM_VIAL); } + final ErrorState state = this.isValidSerum(); if (state != null) { return state; } - if (this.getUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null && Engineering.getCharges(this.getUtil().getStack(Splicer.SLOT_SERUM_VIAL)) == 0) { + + if (Engineering.getCharges(serum) == 0) { return new ErrorState(Genetics.proxy.localise("machine.errors.empty.serum.desc"), Genetics.proxy.localise("machine.errors.empty.serum.info")); } return super.canWork(); } + @Nullable public ErrorState isValidSerum() { final ItemStack serum = this.getUtil().getStack(Splicer.SLOT_SERUM_VIAL); + if (serum == null) { + return null; + } final ItemStack target = this.getUtil().getStack(Splicer.SLOT_TARGET); final IGene[] genes = Engineering.getGenes(serum); if (genes.length == 0) { @@ -154,7 +163,9 @@ public class SplicerLogic extends ComponentProcess implements IProcess { protected void onFinishTask() { super.onFinishTask(); final ItemStack serum = this.getUtil().getStack(Splicer.SLOT_SERUM_VIAL); + Preconditions.checkState(serum != null); final ItemStack target = this.getUtil().getStack(Splicer.SLOT_TARGET); + Preconditions.checkState(target != null); final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(target); if (!ind.isAnalyzed()) { ind.analyze(); @@ -167,7 +178,7 @@ public class SplicerLogic extends ComponentProcess implements IProcess { Splicer.setGene(gene, target, 0); Splicer.setGene(gene, target, 1); } - this.getUtil().damageItem(Splicer.SLOT_SERUM_VIAL, 1); + this.getUtil().damageItem(serum, Splicer.SLOT_SERUM_VIAL, 1); } @Override diff --git a/src/main/java/binnie/genetics/machine/splicer/package-info.java b/src/main/java/binnie/genetics/machine/splicer/package-info.java new file mode 100644 index 00000000..9b4bc969 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/splicer/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.splicer; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/network/package-info.java b/src/main/java/binnie/genetics/network/package-info.java new file mode 100644 index 00000000..ec2315a2 --- /dev/null +++ b/src/main/java/binnie/genetics/network/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.network; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/package-info.java b/src/main/java/binnie/genetics/package-info.java new file mode 100644 index 00000000..dc0da5bd --- /dev/null +++ b/src/main/java/binnie/genetics/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/proxy/package-info.java b/src/main/java/binnie/genetics/proxy/package-info.java new file mode 100644 index 00000000..7db8987f --- /dev/null +++ b/src/main/java/binnie/genetics/proxy/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.proxy; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/package-info.java b/src/main/java/binnie/package-info.java new file mode 100644 index 00000000..7ea4a7d8 --- /dev/null +++ b/src/main/java/binnie/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file