diff --git a/gradle.properties b/gradle.properties index aa51f451..73d53cb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ mcversion=1.11.2 forgeversion=13.20.0.2227 mcp_mappings=snapshot_20161220 -forestry_version=5.3.0.32 +forestry_version=5.3.1.34 version_major=2 version_minor=0 diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 8bb27c29..d6f9ffb5 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -164,7 +164,7 @@ public class Botany extends AbstractMod { EntityPlayer player = event.getEntityPlayer(); if (player != null) { ItemStack heldItem = player.getHeldItemMainhand(); - if (heldItem != null) { + if (!heldItem.isEmpty()) { TileEntity tile = event.getWorld().getTileEntity(event.getPos()); if (tile instanceof TileEntityFlower) { TileEntityFlower flower = (TileEntityFlower) tile; @@ -195,7 +195,7 @@ public class Botany extends AbstractMod { EntityPlayer player = event.getEntityPlayer(); if (player != null) { ItemStack heldItem = player.getHeldItemMainhand(); - if (heldItem != null) { + if (!heldItem.isEmpty()) { Block block = world.getBlockState(event.getPos()).getBlock(); if (!Gardening.isSoil(block)) { pos = pos.down(); @@ -245,9 +245,11 @@ public class Botany extends AbstractMod { if (!Gardening.isSoil(block)) { return; } - IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.getItemInHand()); + EntityPlayer player = event.getPlayer(); + ItemStack heldItem = player.getHeldItem(event.getHand()); + IFlower flower = BotanyCore.getFlowerRoot().getConversion(heldItem); if (flower != null) { - Gardening.plant(world, pos, flower, event.getPlayer().getGameProfile()); + Gardening.plant(world, pos, flower, player.getGameProfile()); } } @@ -261,7 +263,7 @@ public class Botany extends AbstractMod { return; } - if (heldItem != null) { + if (!heldItem.isEmpty()) { Block block = world.getBlockState(pos).getBlock(); int py = -1; if (block instanceof IBlockSoil && (world.isAirBlock(pos.up()) || block.isReplaceable(world, pos))) { diff --git a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java index 7ff6c7f6..41e89ae0 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java +++ b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java @@ -9,6 +9,8 @@ import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; +import java.util.Locale; + public enum EnumFlowerChromosome implements IChromosomeType { SPECIES(IAlleleFlowerSpecies.class), PRIMARY(IAlleleInteger.class), @@ -36,7 +38,7 @@ public enum EnumFlowerChromosome implements IChromosomeType { @Override public String getName() { - return this.toString().toLowerCase(); + return this.toString().toLowerCase(Locale.ENGLISH); } @Override diff --git a/src/main/java/binnie/botany/api/IFlower.java b/src/main/java/binnie/botany/api/IFlower.java index 25b22f4b..4a42e103 100644 --- a/src/main/java/binnie/botany/api/IFlower.java +++ b/src/main/java/binnie/botany/api/IFlower.java @@ -4,10 +4,13 @@ import forestry.api.genetics.IIndividual; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nullable; + public interface IFlower extends IIndividual { @Override IFlowerGenome getGenome(); + @Nullable IFlowerGenome getMate(); void mate(final IFlower flower); diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 424f244d..86cf0e88 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -168,7 +168,6 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored } @Override - @Nullable public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return BlockMetadata.getPickBlock(world, pos); } diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index 982b154b..9ef4ff72 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -14,6 +14,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.HashMap; @@ -56,6 +58,7 @@ public class CeramicDesignSystem implements IDesignSystem { @Override @Nullable + @SideOnly(Side.CLIENT) public TextureAtlasSprite getPrimarySprite(IPattern pattern) { if (pattern instanceof EnumPattern) { return this.primary.get(((EnumPattern) pattern).ordinal()); @@ -65,6 +68,7 @@ public class CeramicDesignSystem implements IDesignSystem { @Override @Nullable + @SideOnly(Side.CLIENT) public TextureAtlasSprite getSecondarySprite(IPattern pattern) { if (pattern instanceof EnumPattern) { return this.secondary.get(((EnumPattern) pattern).ordinal()); @@ -73,6 +77,7 @@ public class CeramicDesignSystem implements IDesignSystem { } @Override + @SideOnly(Side.CLIENT) public void registerSprites() { for (EnumPattern pattern : EnumPattern.values()) { this.primary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"))); diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index afd2101b..c022f144 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -51,7 +51,7 @@ public class CeramicTileRecipe implements IRecipe { } for (CeramicBrickType type : CeramicBrickType.VALUES) { ItemStack result = type.getRecipe(stacks); - if (result != null) { + if (!result.isEmpty()) { return result; } } diff --git a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java b/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java index b224bc84..b642c232 100644 --- a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java +++ b/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java @@ -28,8 +28,7 @@ public class CeramicBrickPair { } public ItemStack getStack(int i) { - ItemStack s = new ItemStack(Botany.ceramicBrick, i, this.ordinal()); - return s; + return new ItemStack(Botany.ceramicBrick, i, this.ordinal()); } public CeramicBrickPair(int id) { diff --git a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java b/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java index e718bb03..4e277ecc 100644 --- a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java +++ b/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java @@ -16,11 +16,10 @@ import javax.annotation.Nullable; public enum CeramicBrickType implements IStringSerializable { Tile("tile", "Ceramic Tile"){ - @Nullable @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { - return null; + return ItemStack.EMPTY; } int mortars = 0; int blocks = 0; @@ -30,7 +29,7 @@ public enum CeramicBrickType implements IStringSerializable { ++mortars; } else { if (stack.getItem() != Item.getItemFromBlock(Botany.ceramic)) { - return null; + return ItemStack.EMPTY; } ++blocks; final int color = TileEntityMetadata.getItemDamage(stack); @@ -38,35 +37,31 @@ public enum CeramicBrickType implements IStringSerializable { blockColor = color; } else { if (blockColor != color) { - return null; + return ItemStack.EMPTY; } - continue; } } } if (mortars != 1) { - return null; + return ItemStack.EMPTY; } final EnumFlowerColor c = EnumFlowerColor.get(blockColor); return new CeramicBrickPair(c, c, CeramicBrickType.Tile).getStack(3); } }, 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) { @@ -76,21 +71,21 @@ public enum CeramicBrickType implements IStringSerializable { type3.type = this; return type3.getStack(1); } - return null; + return ItemStack.EMPTY; } else { if (stacks.size() != 3) { - return null; + return ItemStack.EMPTY; } final int[] colors = {-1, -1}; int a = 0; int b = 0; for (final ItemStack stack4 : stacks) { if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { - return null; + return ItemStack.EMPTY; } final CeramicBrickPair type4 = new CeramicBrickPair(stack4); if (type4.type != CeramicBrickType.Tile) { - return null; + return ItemStack.EMPTY; } final int color5 = type4.colorFirst.ordinal(); if (colors[0] == -1) { @@ -103,7 +98,7 @@ public enum CeramicBrickType implements IStringSerializable { ++b; } else { if (colors[1] != color5) { - return null; + return ItemStack.EMPTY; } ++b; } @@ -116,28 +111,27 @@ public enum CeramicBrickType implements IStringSerializable { } }, Split("split", "Split Ceramic Tile"){ - @Nullable @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { - return null; + return ItemStack.EMPTY; } final int[] colors = {-1, -1}; int altCounter = 0; for (final ItemStack stack2 : stacks) { final int alt = (altCounter != 0 && altCounter != 3) ? 1 : 0; if (stack2.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { - return null; + return ItemStack.EMPTY; } final CeramicBrickPair type = new CeramicBrickPair(stack2); if (type.type != CeramicBrickType.Tile) { - return null; + return ItemStack.EMPTY; } final int color2 = type.colorFirst.ordinal(); if (colors[alt] == -1) { colors[alt] = color2; } else if (colors[alt] != color2) { - return null; + return ItemStack.EMPTY; } ++altCounter; } @@ -145,20 +139,19 @@ public enum CeramicBrickType implements IStringSerializable { } }, Chequered("cheque", "Chequered Ceramic Tile"){ - @Nullable @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { - return null; + return ItemStack.EMPTY; } final int[] colors = {-1, -1}; for (final ItemStack stack2 : stacks) { if (stack2.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { - return null; + return ItemStack.EMPTY; } final CeramicBrickPair type2 = new CeramicBrickPair(stack2); if (type2.type != CeramicBrickType.Split) { - return null; + return ItemStack.EMPTY; } final int color3 = type2.colorFirst.ordinal(); final int color4 = type2.colorSecond.ordinal(); @@ -167,70 +160,65 @@ public enum CeramicBrickType implements IStringSerializable { colors[1] = color4; } else { if (colors[0] != color3 || colors[1] != color4) { - return null; + return ItemStack.EMPTY; } - continue; } } return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.Chequered).getStack(4); } }, Mixed("mixed", "Mixed Ceramic Tile"){ - @Nullable @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { - return null; + return ItemStack.EMPTY; } final int[] colors = {-1, -1}; for (final ItemStack stack2 : stacks) { if (stack2.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { - return null; + return ItemStack.EMPTY; } final CeramicBrickPair type2 = new CeramicBrickPair(stack2); if (type2.isTwoColors()) { - return null; + return ItemStack.EMPTY; } final int color3 = type2.colorFirst.ordinal(); if (type2.type == CeramicBrickType.Split) { if (colors[1] != -1) { - return null; + return ItemStack.EMPTY; } colors[1] = color3; } else { if (type2.type != CeramicBrickType.Chequered) { - return null; + return ItemStack.EMPTY; } if (colors[0] == -1) { colors[0] = color3; } else if (colors[0] != color3) { - return null; + return ItemStack.EMPTY; } } final int color4 = type2.colorSecond.ordinal(); } if (colors[0] == -1 || colors[1] == -1) { - return null; + return ItemStack.EMPTY; } return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.Mixed).getStack(4); } }, 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); @@ -257,13 +245,11 @@ public enum CeramicBrickType implements IStringSerializable { return this != CeramicBrickType.Tile; } - @Nullable public abstract ItemStack getRecipe(List stacks); - @Nullable protected ItemStack getVerticalBrickRecipe(List stacks){ if (stacks.size() != 1) { - return null; + return ItemStack.EMPTY; } final ItemStack stack5 = stacks.get(0); final CeramicBrickPair type = new CeramicBrickPair(stack5); @@ -279,10 +265,9 @@ public enum CeramicBrickType implements IStringSerializable { type.type = CeramicBrickType.VerticalStripeBrick; return type.getStack(1); } - return null; + return ItemStack.EMPTY; } - @Nullable protected ItemStack getBrickRecipe(CeramicBrickType ceramicType, List stacks){ if (stacks.size() == 1) { final ItemStack stack5 = stacks.get(0); @@ -295,20 +280,17 @@ public enum CeramicBrickType implements IStringSerializable { type.type = ceramicType; return type.getStack(1); } - return null; - } else { - if (stacks.size() != 4) { - return null; - } + return ItemStack.EMPTY; + } else if (stacks.size() == 4) { final int[] colors = {-1, -1}; for (int index2 = 0; index2 < stacks.size(); ++index2) { final ItemStack stack4 = stacks.get(index2); if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { - return null; + return ItemStack.EMPTY; } final CeramicBrickPair type4 = new CeramicBrickPair(stack4); if (type4.type != CeramicBrickType.LargeBrick) { - return null; + return ItemStack.EMPTY; } final int color5 = type4.colorFirst.ordinal(); final int color6 = type4.colorSecond.ordinal(); @@ -320,10 +302,12 @@ public enum CeramicBrickType implements IStringSerializable { colors[alt2] = color5; colors[1 - alt2] = color6; } else if (colors[alt2] != color5 || colors[1 - alt2] != color6) { - return null; + return ItemStack.EMPTY; } } return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), ceramicType).getStack(4); + } else { + return ItemStack.EMPTY; } } diff --git a/src/main/java/binnie/botany/core/BotanyTexture.java b/src/main/java/binnie/botany/core/BotanyTexture.java index f9cd752b..c00594fb 100644 --- a/src/main/java/binnie/botany/core/BotanyTexture.java +++ b/src/main/java/binnie/botany/core/BotanyTexture.java @@ -5,6 +5,8 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; import binnie.extrabees.ExtraBees; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum BotanyTexture implements IBinnieTexture { ; @@ -17,6 +19,7 @@ public enum BotanyTexture implements IBinnieTexture { } @Override + @SideOnly(Side.CLIENT) public BinnieResource getTexture() { return Binnie.RESOURCE.getPNG(ExtraBees.instance, this.type, this.texture); } diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index 8c52ff8e..a52dbb2c 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -4,7 +4,9 @@ import binnie.Binnie; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.core.circuits.BinnieCircuit; +import com.google.common.base.Preconditions; import forestry.api.circuits.ChipsetManager; +import forestry.api.circuits.ICircuitLayout; import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; import net.minecraft.item.ItemStack; @@ -17,7 +19,7 @@ public class CircuitGarden extends BinnieCircuit { private GardenLogic logic; public CircuitGarden(EnumMoisture moisture, @Nullable EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) { - super(getName(moisture, ph, manual, fertilised), 4, manual ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual") : ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"), recipe); + super(getName(moisture, ph, manual, fertilised), 4, getLayout(manual), recipe); this.isManual = manual; this.logic = new GardenLogic(moisture, ph, this.isManual, fertilised, icon, Binnie.LANGUAGE.localise(this.getUnlocalizedName())); StringBuilder info = new StringBuilder("Flowers (") @@ -41,6 +43,13 @@ public class CircuitGarden extends BinnieCircuit { this.addTooltipString(info.toString()); } + private static ICircuitLayout getLayout(boolean manual) { + String layoutUid = manual ? "forestry.farms.manual" : "forestry.farms.managed"; + ICircuitLayout layout = ChipsetManager.circuitRegistry.getLayout(layoutUid); + Preconditions.checkState(layout != null, "Couldn't find Forestry circuit layout %s.", layoutUid); + return layout; + } + private static String getName(EnumMoisture moisture, @Nullable EnumAcidity ph, boolean manual, boolean fertilised) { String name = "garden." + moisture.getName(); if (ph != null) { diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index 36881046..431625bd 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -109,7 +109,7 @@ public class GardenLogic extends FarmLogic { EnumAcidity pH = soil.getPH(world, position); if (pH.ordinal() < this.acidity.ordinal()) { ItemStack stack = this.getAvailableAlkaline(housing); - if (stack != null && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() + 1])) { + if (!stack.isEmpty() && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() + 1])) { NonNullList resources = NonNullList.create(); resources.add(stack); housing.getFarmInventory().removeResources(resources); @@ -118,7 +118,7 @@ public class GardenLogic extends FarmLogic { } if (pH.ordinal() > this.acidity.ordinal()) { final ItemStack stack = this.getAvailableAcid(housing); - if (stack != null && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() - 1])) { + if (!stack.isEmpty() && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() - 1])) { NonNullList resources = NonNullList.create(); resources.add(stack); housing.getFarmInventory().removeResources(resources); @@ -129,7 +129,7 @@ public class GardenLogic extends FarmLogic { if (!this.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(getBlockState(world, position), world, position)) { ItemStack block = this.getAsItemStack(world, position); ItemStack loam = this.getAvailableLoam(housing); - if (this.isWaste(block) && loam != null) { + if (this.isWaste(block) && !loam.isEmpty()) { this.produce.addAll(Blocks.DIRT.getDrops(world, position, Block.getBlockFromItem(block.getItem()).getStateFromMeta(block.getItemDamage()), 0)); this.setBlock(world, position, Blocks.AIR, 0); return trySetSoil(world, position, loam, housing); @@ -184,7 +184,6 @@ public class GardenLogic extends FarmLogic { return false; } - @Nullable private ItemStack getAvailableLoam(IFarmHousing housing) { EnumMoisture[] moistures; if (this.moisture == EnumMoisture.Damp) { @@ -214,16 +213,16 @@ public class GardenLogic extends FarmLogic { if (housing.getFarmInventory().hasResources(resources)) { return new ItemStack(Blocks.DIRT); } - return null; + return ItemStack.EMPTY; } private boolean trySetSoil(World world, BlockPos position, IFarmHousing housing) { return this.trySetSoil(world, position, this.getAvailableLoam(housing), housing); } - private boolean trySetSoil(World world, BlockPos position, @Nullable ItemStack loam, IFarmHousing housing) { + private boolean trySetSoil(World world, BlockPos position, ItemStack loam, IFarmHousing housing) { ItemStack copy = loam; - if (loam != null) { + if (!loam.isEmpty()) { if (loam.getItem() == Item.getItemFromBlock(Blocks.DIRT)) { loam = new ItemStack(Botany.soil, 0, 4); } @@ -326,7 +325,6 @@ public class GardenLogic extends FarmLogic { return false; } - @Nullable public ItemStack getAvailableAcid(IFarmHousing housing) { for (final ItemStack stack : Gardening.getAcidFertilisers()) { if (!stack.isEmpty()) { @@ -337,10 +335,9 @@ public class GardenLogic extends FarmLogic { } } } - return null; + return ItemStack.EMPTY; } - @Nullable public ItemStack getAvailableAlkaline(IFarmHousing housing) { for (final ItemStack stack : Gardening.getAlkalineFertilisers()) { if (!stack.isEmpty()) { @@ -351,7 +348,7 @@ public class GardenLogic extends FarmLogic { } } } - return null; + return ItemStack.EMPTY; } } diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index fdd64b7d..13ae664e 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -35,6 +36,7 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -246,12 +248,12 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState } @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList drops = new ArrayList<>(); + public NonNullList getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + NonNullList drops = NonNullList.create(); TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() == 0) { ItemStack flower = ((TileEntityFlower) tile).getItemStack(); - if (flower != null) { + if (!flower.isEmpty()) { drops.add(flower); } } diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index e129f496..6e0c15c9 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -325,12 +325,12 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } } - @Nullable public ItemStack getItemStack() { - if (this.flower == null) { - return null; + IFlower flower = this.getFlower(); + if (flower == null) { + return ItemStack.EMPTY; } - return Binnie.GENETICS.getFlowerRoot().getMemberStack(this.getFlower(), EnumFlowerStage.getStage(getFlower())); + return Binnie.GENETICS.getFlowerRoot().getMemberStack(flower, EnumFlowerStage.getStage(flower)); } @Nullable diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 135c551a..e7042a5d 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -153,7 +153,7 @@ public class Gardening { public static boolean isAcidFertiliser(final ItemStack itemstack) { for (final ItemStack stack : getAcidFertilisers()) { - if (stack != null && stack.isItemEqual(itemstack)) { + if (!stack.isEmpty() && stack.isItemEqual(itemstack)) { return true; } } @@ -162,7 +162,7 @@ public class Gardening { public static boolean isAlkalineFertiliser(final ItemStack itemstack) { for (final ItemStack stack : getAlkalineFertilisers()) { - if (stack != null && stack.isItemEqual(itemstack)) { + if (!stack.isEmpty() && stack.isItemEqual(itemstack)) { return true; } } @@ -171,7 +171,7 @@ public class Gardening { public static boolean isNutrientFertiliser(final ItemStack itemstack) { for (final ItemStack stack : getNutrientFertilisers()) { - if (stack != null && stack.isItemEqual(itemstack)) { + if (!stack.isEmpty() && stack.isItemEqual(itemstack)) { return true; } } diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 1de64123..ea488e51 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -138,7 +138,7 @@ public class ModuleGardening implements IInitializable { for (int insulate = 0; insulate < 6; ++insulate) { final ItemStack tubes = new ItemStack(Botany.insulatedTube, 2, mat + 128 * insulate); final ItemStack insulateStack = ItemInsulatedTube.getInsulateStack(tubes); - final ItemStack forestryTube = new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, mat); + final ItemStack forestryTube = new ItemStack(Mods.Forestry.item("thermionic_tubes"), 1, mat); GameRegistry.addShapelessRecipe(tubes, forestryTube, forestryTube, insulateStack); } } @@ -151,9 +151,9 @@ public class ModuleGardening implements IInitializable { GameRegistry.addShapelessRecipe(BotanyItems.Weedkiller.get(4), new ItemStack(Items.SPIDER_EYE), new ItemStack(Items.WHEAT_SEEDS), new ItemStack(Items.WHEAT_SEEDS), new ItemStack(Items.WHEAT_SEEDS)); GameRegistry.addShapelessRecipe(BotanyItems.AshPowder.get(4), Mods.Forestry.stack("ash")); GameRegistry.addShapelessRecipe(BotanyItems.MulchPowder.get(4), Mods.Forestry.stack("mulch")); - GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.Forestry.stack("fertilizerBio")); - GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.Forestry.stack("fertilizerCompound")); - GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.Forestry.stack("woodPulp")); + GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.Forestry.stack("fertilizer_bio")); + GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.Forestry.stack("fertilizer_compound")); + GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.Forestry.stack("wood_pulp")); GameRegistry.addRecipe(new ShapelessOreRecipe(BotanyItems.SulphurPowder.get(4), "dustSulphur")); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Botany.pigment, 2, EnumFlowerColor.Black.ordinal()), "pigment", "pigment", "dyeBlack")); ModuleGardening.queuedAcidFertilisers.put(BotanyItems.SulphurPowder.get(1), 1); @@ -165,11 +165,11 @@ public class ModuleGardening implements IInitializable { ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.AshPowder.get(1), 1); ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.PulpPowder.get(1), 1); ModuleGardening.queuedAlkalineFertilisers.put(Mods.Forestry.stack("ash"), 2); - ModuleGardening.queuedAlkalineFertilisers.put(Mods.Forestry.stack( "woodPulp"), 2); + ModuleGardening.queuedAlkalineFertilisers.put(Mods.Forestry.stack( "wood_pulp"), 2); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1); - ModuleGardening.queuedNutrientFertilisers.put(Mods.Forestry.stack( "fertilizerBio"), 2); - ModuleGardening.queuedNutrientFertilisers.put(Mods.Forestry.stack("fertilizerCompound"), 2); + ModuleGardening.queuedNutrientFertilisers.put(Mods.Forestry.stack( "fertilizer_bio"), 2); + ModuleGardening.queuedNutrientFertilisers.put(Mods.Forestry.stack("fertilizer_compound"), 2); for (final Map.Entry entry : ModuleGardening.queuedAcidFertilisers.entrySet()) { this.addAcidFertiliser(entry.getKey(), entry.getValue()); } @@ -192,12 +192,11 @@ public class ModuleGardening implements IInitializable { GameRegistry.addRecipe(new PigmentRecipe()); } - @Nullable private ItemStack getStack(final int type, final int pH, final int moisture) { if (type >= 0 && type <= 2 && pH >= 0 && pH <= 2 && moisture >= 0 && moisture <= 2) { return new ItemStack(Gardening.getSoilBlock(EnumSoilType.values()[type]), 1, BlockSoil.getMeta(EnumAcidity.values()[pH], EnumMoisture.values()[moisture])); } - return null; + return ItemStack.EMPTY; } private void addAcidFertiliser(final ItemStack stack, final int strengthMax) { @@ -209,7 +208,7 @@ public class ModuleGardening implements IInitializable { for (int strength = 1; strength < strengthMax; ++strength) { final ItemStack start = this.getStack(type, pH, moisture); final ItemStack end = this.getStack(type, pH - strength, moisture); - if (start != null && end != null) { + if (!start.isEmpty() && !end.isEmpty()) { end.setCount(numOfBlocks); final Object[] stacks = new Object[numOfBlocks + 1]; for (int i = 0; i < numOfBlocks; ++i) { @@ -234,7 +233,7 @@ public class ModuleGardening implements IInitializable { for (int strength = 1; strength < strengthMax; ++strength) { final ItemStack start = this.getStack(type, pH, moisture); final ItemStack end = this.getStack(type, pH + strength, moisture); - if (end != null) { + if (!end.isEmpty()) { end.setCount(numOfBlocks); final Object[] stacks = new Object[numOfBlocks + 1]; for (int i = 0; i < numOfBlocks; ++i) { @@ -259,7 +258,7 @@ public class ModuleGardening implements IInitializable { for (int strength = 1; strength < strengthMax; ++strength) { final ItemStack start = this.getStack(type, pH, moisture); final ItemStack end = this.getStack(type + strength, pH, moisture); - if (end != null) { + if (!end.isEmpty()) { end.setCount(numOfBlocks); final Object[] stacks = new Object[numOfBlocks + 1]; for (int i = 0; i < numOfBlocks; ++i) { diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index 3128e625..e00fe28a 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -11,6 +11,7 @@ import binnie.core.genetics.ForestryAllele; import binnie.core.genetics.Tolerance; import binnie.extrabees.ExtraBees; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; @@ -29,7 +30,7 @@ public class FlowerBreedingSystem extends BreedingSystem { } @Override - public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) { + public float getChance(final IMutation mutation, final EntityPlayer player, final IAlleleSpecies species1, final IAlleleSpecies species2) { return mutation.getBaseChance(); } diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index 6173533e..579a546b 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -15,10 +15,14 @@ import binnie.botany.api.IFlowerMutationBuilder; import binnie.botany.api.IFlowerRoot; import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.AlleleSpeciesRegisterEvent; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleRegistry; +import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IClassification; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; @@ -29,6 +33,7 @@ import net.minecraftforge.common.MinecraftForge; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; public enum FlowerDefinition implements IFlowerDefinition { @@ -1089,6 +1094,14 @@ public enum FlowerDefinition implements IFlowerDefinition { } private void init() { + markAllelesAsValid(EnumBeeChromosome.FERTILITY, EnumFlowerChromosome.FERTILITY); + markAllelesAsValid(EnumBeeChromosome.TERRITORY, EnumFlowerChromosome.TERRITORY); + markAllelesAsValid(EnumBeeChromosome.LIFESPAN, EnumFlowerChromosome.LIFESPAN); + markAllelesAsValid(EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumFlowerChromosome.TEMPERATURE_TOLERANCE); + markAllelesAsValid(EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumFlowerChromosome.HUMIDITY_TOLERANCE); + markAllelesAsValid(EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumFlowerChromosome.PH_TOLERANCE); + markAllelesAsValid(EnumTreeChromosome.SAPPINESS, EnumFlowerChromosome.SAPPINESS); + template = Arrays.copyOf(FlowerTemplates.getDefaultTemplate(), EnumFlowerChromosome.values().length); AlleleHelper.getInstance().set(template, EnumFlowerChromosome.SPECIES, species); AlleleHelper.getInstance().set(template, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); @@ -1104,6 +1117,14 @@ public enum FlowerDefinition implements IFlowerDefinition { } } + private static void markAllelesAsValid(IChromosomeType existingType, IChromosomeType newType) { + IAlleleRegistry alleleRegistry = AlleleManager.alleleRegistry; + Collection alleles = alleleRegistry.getRegisteredAlleles(existingType); + for (IAllele allele : alleles) { + alleleRegistry.addValidAlleleTypes(allele, newType); + } + } + protected final IFlowerMutationBuilder registerMutation(final FlowerDefinition parent1, final FlowerDefinition parent2, final int chance) { return FlowerManager.flowerFactory.createMutation(parent1.species, parent2.species, getTemplate(), chance); } diff --git a/src/main/java/binnie/botany/genetics/FlowerRoot.java b/src/main/java/binnie/botany/genetics/FlowerRoot.java index 2d22cb2c..35965f73 100644 --- a/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -64,7 +64,7 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { @Override public boolean isMember(final ItemStack stack) { - return stack != null && this.getType(stack) != null; + return !stack.isEmpty() && this.getType(stack) != null; } @Override @@ -105,10 +105,9 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { } @Override - @Nullable public ItemStack getMemberStack(IIndividual flower, ISpeciesType type) { if (!this.isMember(flower)) { - return null; + return ItemStack.EMPTY; } Item flowerItem = Botany.flowerItem; if (type == EnumFlowerStage.SEED) { diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index f3a7bdad..028468b8 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -51,7 +51,7 @@ public class ModuleGenetics implements IInitializable { @Override public void postInit() { FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla"); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(Botany.database), + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(Botany.database), "X#X", "YEY", "RDR", diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index 0be9b069..333804c1 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -24,7 +24,7 @@ public enum PacketID implements IPacketID { NBTTagCompound data = packet.getTagCompound(); EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); String info = ""; - if (data.hasNoTags()) { + if (data == null || data.hasNoTags()) { info += Binnie.LANGUAGE.localise("botany.flowers.species.not.discover"); } else { IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species")); diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 78cb1695..0a2d6fb0 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -52,7 +52,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -@Mod(modid = Constants.CORE_MOD_ID, name = "Binnie Core", useMetadata = true, dependencies = "required-after:forestry") +@Mod(modid = Constants.CORE_MOD_ID, name = "Binnie Core", useMetadata = true, dependencies = "required-after:forestry@[5.3.1.34,)") public final class BinnieCore extends AbstractMod { public BinnieCore() { diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index bc024688..af7e1e81 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -40,29 +40,26 @@ public class Mods { return ForgeRegistries.BLOCKS.getValue(key); } - @Nullable public ItemStack stack(final String name) { Item item = this.item(name); if (item == null) { - return null; + return ItemStack.EMPTY; } return new ItemStack(item); } - @Nullable public ItemStack stack(final String name, final int amount) { Item item = this.item(name); if (item == null) { - return null; + return ItemStack.EMPTY; } return new ItemStack(item, amount); } - @Nullable public ItemStack stack(final String name, final int amount, final int meta) { Item item = this.item(name); if (item == null) { - return null; + return ItemStack.EMPTY; } 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 e62a10f8..bc8f1339 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -1,5 +1,6 @@ package binnie.core.block; +import binnie.core.BinnieCore; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -8,18 +9,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import binnie.core.BinnieCore; - import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; public class BlockMetadata extends BlockContainer implements IBlockMetadata { static int temporyMeta = -1; @@ -49,7 +47,6 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { } @Override - @Nullable public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return getPickBlock(world, pos); } @@ -70,22 +67,22 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { return getMetaFromState(state); } - @Nullable public static ItemStack getBlockDropped(IBlockMetadata block, IBlockAccess world, BlockPos pos) { TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); if (tile != null && !tile.hasDroppedBlock()) { int meta = block.getDroppedMeta(world.getBlockState(pos), tile.getTileMetadata()); return TileEntityMetadata.getItemStack((Block) block, meta); } - return null; + return ItemStack.EMPTY; } - public static List getBlockDroppedAsList(IBlockMetadata block, IBlockAccess world, BlockPos pos) { + public static NonNullList getBlockDroppedAsList(IBlockMetadata block, IBlockAccess world, BlockPos pos) { ItemStack drop = getBlockDropped(block, world, pos); - if(drop != null){ - return Collections.singletonList(getBlockDropped(block, world, pos)); + NonNullList list = NonNullList.create(); + if (!drop.isEmpty()) { + list.add(drop); } - return Collections.emptyList(); + return list; } public static boolean breakBlock(IBlockMetadata blockMetadata, @Nullable EntityPlayer player, World world, BlockPos pos) { @@ -107,7 +104,6 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { return hasBeenBroken; } - @Nullable public static ItemStack getPickBlock(World world, BlockPos pos) { Block block = world.getBlockState(pos).getBlock(); return getBlockDropped((IBlockMetadata) block, world, pos); diff --git a/src/main/java/binnie/core/circuits/BinnieCircuit.java b/src/main/java/binnie/core/circuits/BinnieCircuit.java index a73ea5b1..46c447ec 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuit.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuit.java @@ -19,7 +19,7 @@ public class BinnieCircuit implements ICircuit { this.uid = "binnie.circuit." + uid; this.limit = limit; ChipsetManager.circuitRegistry.registerCircuit(this); - if (itemStack != null) { + if (!itemStack.isEmpty()) { ChipsetManager.solderManager.addRecipe(layout, itemStack, this); } } diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index 34c5f6ab..aa4e0ad5 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -10,6 +10,7 @@ import forestry.api.apiculture.IApiaristTracker; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeMutation; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IMutation; @@ -28,14 +29,14 @@ class BeeBreedingSystem extends BreedingSystem { } @Override - public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) { + public float getChance(final IMutation mutation, final EntityPlayer player, final IAlleleSpecies species1, final IAlleleSpecies species2) { return ((IBeeMutation) mutation). getChance(new VirtualBeeHousing(player), (IAlleleBeeSpecies) species1, (IAlleleBeeSpecies) species2, (IBeeGenome) this.getSpeciesRoot(). - templateAsGenome(this.getSpeciesRoot().getTemplate(species1.getUID())), - (IBeeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2.getUID()))); + templateAsGenome(this.getSpeciesRoot().getTemplate(species1)), + (IBeeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2))); } @Override diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index a3a07eee..9130b2e7 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -151,21 +151,18 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { this.allBranches.add(branch); } } - if (this.getSpeciesRoot().getMutations(false) != null) { + List speciesMutations = this.getSpeciesRoot().getMutations(false); + if (!speciesMutations.isEmpty()) { final Set mutations = new LinkedHashSet<>(); - mutations.addAll(this.getSpeciesRoot().getMutations(false)); + mutations.addAll(speciesMutations); if (this == Binnie.GENETICS.beeBreedingSystem) { mutations.addAll(ExtraBeeMutation.mutations); } for (final IMutation mutation : mutations) { this.allMutations.add(mutation); final Set participatingSpecies = new LinkedHashSet<>(); - if (mutation.getAllele0() != null) { - participatingSpecies.add(mutation.getAllele0()); - } - if (mutation.getAllele1() != null) { - participatingSpecies.add(mutation.getAllele1()); - } + participatingSpecies.add(mutation.getAllele0()); + participatingSpecies.add(mutation.getAllele1()); for (final IAlleleSpecies species3 : participatingSpecies) { this.allFurtherMutations.get(species3).add(mutation); if (this.allActiveSpecies.contains(species3)) { @@ -333,7 +330,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { // return this.iconDiscovered.getIcon(); // } - public abstract float getChance(final IMutation p0, final EntityPlayer p1, final IAllele p2, final IAllele p3); + public abstract float getChance(final IMutation p0, final EntityPlayer p1, final IAlleleSpecies p2, final IAlleleSpecies p3); public abstract Class getTrackerClass(); @@ -472,7 +469,11 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { public abstract void addExtraAlleles(final IChromosomeType p0, final TreeSet p1); public ItemStack getConversionStack(final ItemStack stack) { - return this.getSpeciesRoot().getMemberStack(this.getConversion(stack), this.getDefaultType()); + IIndividual conversion = this.getConversion(stack); + if (conversion == null) { + return ItemStack.EMPTY; + } + return this.getSpeciesRoot().getMemberStack(conversion, this.getDefaultType()); } public final Collection getActiveKaryotype() { @@ -480,14 +481,28 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public ItemStack getDefaultMember(final String uid) { - return this.getSpeciesRoot().getMemberStack(this.getIndividual(uid), this.getDefaultType()); + IIndividual individual = this.getIndividual(uid); + if (individual == null) { + return ItemStack.EMPTY; + } + return this.getSpeciesRoot().getMemberStack(individual, this.getDefaultType()); } + @Nullable public IIndividual getIndividual(final String uid) { - return this.getSpeciesRoot().templateAsIndividual(this.getSpeciesRoot().getTemplate(uid)); + IAllele[] template = this.getSpeciesRoot().getTemplate(uid); + if (template == null) { + return null; + } + return this.getSpeciesRoot().templateAsIndividual(template); } + @Nullable public IGenome getGenome(final String uid) { - return this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(uid)); + IAllele[] template = this.getSpeciesRoot().getTemplate(uid); + if (template == null) { + return null; + } + return this.getSpeciesRoot().templateAsGenome(template); } } diff --git a/src/main/java/binnie/core/genetics/IBreedingMessage.java b/src/main/java/binnie/core/genetics/IBreedingMessage.java index 74e377ff..83cb9b8f 100644 --- a/src/main/java/binnie/core/genetics/IBreedingMessage.java +++ b/src/main/java/binnie/core/genetics/IBreedingMessage.java @@ -29,7 +29,7 @@ interface IBreedingMessage { } } if (root != null) { - this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), EnumBeeType.DRONE); + this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species)), EnumBeeType.DRONE); } } @@ -64,7 +64,7 @@ interface IBreedingMessage { } } if (root != null) { - this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), EnumBeeType.DRONE); + this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species)), EnumBeeType.DRONE); } } diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 80f8a782..f049a148 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -21,6 +21,7 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; +import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterflyRoot; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -85,7 +86,7 @@ public class ManagerGenetics extends ManagerBase { } public IButterflyRoot getButterflyRoot() { - return (IButterflyRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootButterflies"); + return ButterflyManager.butterflyRoot; } public IFlowerRoot getFlowerRoot() { @@ -130,8 +131,8 @@ public class ManagerGenetics extends ManagerBase { } @Nullable - public BreedingSystem getConversionSystem(@Nullable final ItemStack stack) { - if (stack != null) { + public BreedingSystem getConversionSystem(final ItemStack stack) { + if (!stack.isEmpty()) { for (final BreedingSystem system : this.getActiveSystems()) { if (system.getConversion(stack) != null) { return system; @@ -141,15 +142,14 @@ public class ManagerGenetics extends ManagerBase { return null; } - @Nullable - public ItemStack getConversionStack(@Nullable final ItemStack stack) { - if (stack != null) { + public ItemStack getConversionStack(final ItemStack stack) { + if (!stack.isEmpty()) { final BreedingSystem system = this.getConversionSystem(stack); if (system != null) { return system.getConversionStack(stack); } } - return null; + return ItemStack.EMPTY; } @Nullable diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 816be60e..9fa14f9f 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -5,6 +5,7 @@ import binnie.core.BinnieCore; import binnie.extratrees.ExtraTrees; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IMutation; @@ -25,7 +26,7 @@ class MothBreedingSystem extends BreedingSystem { } @Override - public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) { + public float getChance(final IMutation mutation, final EntityPlayer player, final IAlleleSpecies species1, final IAlleleSpecies species2) { return 0.0f; } diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 8df130a8..97aedb1c 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -56,9 +56,10 @@ public class TreeBreedingSystem extends BreedingSystem { } @Override - public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) { - final ITreeGenome genome0 = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species1.getUID())); - final ITreeGenome genome2 = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2.getUID())); + public float getChance(final IMutation mutation, final EntityPlayer player, final IAlleleSpecies species1, final IAlleleSpecies species2) { + ISpeciesRoot speciesRoot = this.getSpeciesRoot(); + final ITreeGenome genome0 = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(species1)); + final ITreeGenome genome2 = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(species2)); return ((ITreeMutation) mutation).getChance(player.world, player.getPosition(), (IAlleleTreeSpecies) species1, (IAlleleTreeSpecies) species2, genome0, genome2); } @@ -95,11 +96,11 @@ public class TreeBreedingSystem extends BreedingSystem { this.discoveredWoods.clear(); for (final IAlleleSpecies species : this.getDiscoveredSpecies(tracker)) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); + final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies)); IAlleleTreeSpecies treeSpecies = genome.getPrimary(); final ItemStack wood = treeSpecies.getWoodProvider().getWoodStack(); - if (wood != null) { + if (!wood.isEmpty()) { this.discoveredWoods.add(wood); } @@ -121,11 +122,11 @@ public class TreeBreedingSystem extends BreedingSystem { super.calculateArrays(); for (final IAlleleSpecies species : this.allActiveSpecies) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); + final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies)); IAlleleTreeSpecies treeSpecies = genome.getPrimary(); final ItemStack wood = treeSpecies.getWoodProvider().getWoodStack(); - if (wood != null) { + if (!wood.isEmpty()) { this.allWoods.add(wood); } @@ -145,7 +146,7 @@ public class TreeBreedingSystem extends BreedingSystem { final List found = new ArrayList<>(); for (final IAlleleSpecies species : set) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); + final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies)); for (final ItemStack fruit2 : genome.getFruitProvider().getProducts().keySet()) { if (fruit2.isItemEqual(fruit)) { found.add(species); @@ -161,7 +162,7 @@ public class TreeBreedingSystem extends BreedingSystem { final Set providers = new HashSet<>(); for (final IAlleleSpecies species : set) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); + final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies)); for (final ItemStack fruit2 : genome.getFruitProvider().getProducts().keySet()) { if (fruit2.isItemEqual(fruit)) { providers.add(genome.getFruitProvider().getFamily()); @@ -185,7 +186,7 @@ public class TreeBreedingSystem extends BreedingSystem { final List found = new ArrayList<>(); for (final IAlleleSpecies species : set) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); + ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies)); IAlleleTreeSpecies treeSpecies = genome.getPrimary(); final ItemStack woodStack = treeSpecies.getWoodProvider().getWoodStack(); @@ -204,10 +205,11 @@ public class TreeBreedingSystem extends BreedingSystem { final List found = new ArrayList<>(); for (final IAlleleSpecies species : set) { final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); + ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies)); IAlleleTreeSpecies treeSpecies = genome.getPrimary(); final ItemStack woodStack = treeSpecies.getWoodProvider().getWoodStack(); - if (LumbermillRecipes.getPlankProduct(woodStack) != null && fruit.isItemEqual(LumbermillRecipes.getPlankProduct(woodStack))) { + ItemStack plankProduct = LumbermillRecipes.getPlankProduct(woodStack); + if (!plankProduct.isEmpty() && fruit.isItemEqual(plankProduct)) { found.add(species); } } @@ -221,7 +223,7 @@ public class TreeBreedingSystem extends BreedingSystem { } @Override - public boolean isDNAManipulable(ISpeciesType type) { + public boolean isDNAManipulable(@Nullable ISpeciesType type) { return type == EnumGermlingType.POLLEN; } diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index f26d5441..c0f701f3 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -55,14 +55,12 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB return 1.0f; } - @Nullable public ItemStack getQueen() { - return null; + return ItemStack.EMPTY; } - @Nullable public ItemStack getDrone() { - return null; + return ItemStack.EMPTY; } public void setQueen(final ItemStack itemstack) { diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 3873d9ed..c4e4a4fa 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -50,12 +50,12 @@ public class ModuleItems implements IInitializable { if (player != null) { ItemStack heldItem = player.getHeldItemMainhand(); - if (heldItem != null && heldItem.getItem() == BinnieCore.getFieldKit() && player.isSneaking()) { + if (!heldItem.isEmpty() && heldItem.getItem() == BinnieCore.getFieldKit() && player.isSneaking()) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityFlower) { TileEntityFlower tileFlower = (TileEntityFlower) tile; IFlower flower = tileFlower.getFlower(); - if (flower != null && flower.getGenome() != null) { + if (flower != null) { IFlowerGenome flowerGenome = flower.getGenome(); NBTTagCompound info = new NBTTagCompound(); info.setString("Species", flowerGenome.getPrimary().getUID()); diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 0659c0bd..ff0ee963 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -109,9 +109,11 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { protected void onFoodEaten(final ItemStack itemStack, final World world, final EntityPlayer player) { if (!world.isRemote) { FluidStack fluid = getContained(itemStack); - final IDrinkLiquid liquid = DrinkManager.getLiquid(fluid); - if (liquid != null) { - AlcoholEffect.makeDrunk(player, liquid.getABV() * fluid.amount); + if (fluid != null) { + final IDrinkLiquid liquid = DrinkManager.getLiquid(fluid); + if (liquid != null) { + AlcoholEffect.makeDrunk(player, liquid.getABV() * fluid.amount); + } } } } diff --git a/src/main/java/binnie/core/machines/IMachineType.java b/src/main/java/binnie/core/machines/IMachineType.java index 3d89fa8f..6e9144d3 100644 --- a/src/main/java/binnie/core/machines/IMachineType.java +++ b/src/main/java/binnie/core/machines/IMachineType.java @@ -2,7 +2,10 @@ package binnie.core.machines; import binnie.core.network.IOrdinaled; +import javax.annotation.Nullable; + public interface IMachineType extends IOrdinaled { + @Nullable Class getPackageClass(); boolean isActive(); diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index a67e0f7b..c721164f 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -23,6 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; 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; @@ -163,9 +164,7 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN component.onUpdate(); } } else { - for (IRender.DisplayTick renders : this.getInterfaces(IRender.DisplayTick.class)) { - renders.onDisplayTick(this.getWorld(), this.getTileEntity().getPos(), this.getWorld().rand); - } + updateClient(); } if (this.queuedInventoryUpdate) { for (final MachineComponent component : this.getComponents()) { @@ -175,6 +174,13 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN } } + @SideOnly(Side.CLIENT) + private void updateClient() { + for (IRender.DisplayTick renders : this.getInterfaces(IRender.DisplayTick.class)) { + renders.onDisplayTick(this.getWorld(), this.getTileEntity().getPos(), this.getWorld().rand); + } + } + public IInventory getInventory() { return this.getInterface(IInventory.class); } diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index 1e3af204..fef0ccc5 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -2,6 +2,8 @@ package binnie.core.machines; import binnie.Binnie; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class MachinePackage { private String uid; @@ -27,7 +29,8 @@ public abstract class MachinePackage { public abstract TileEntity createTileEntity(); public abstract void register(); - + + @SideOnly(Side.CLIENT) public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage);//, final RenderBlocks p5); public final String getDisplayName() { diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index 89812b75..2aba88dd 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -9,11 +9,11 @@ import binnie.core.machines.power.PowerSystem; import binnie.core.util.ItemStackSet; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Random; @@ -38,7 +38,7 @@ public class MachineUtil { } public boolean isSlotEmpty(final int slot) { - return this.getInventory().getStackInSlot(slot) == null; + return this.getInventory().getStackInSlot(slot).isEmpty(); } public IFluidTank getTank(final int id) { @@ -51,21 +51,19 @@ public class MachineUtil { return amount <= space; } - @Nullable public ItemStack getStack(final int slot) { return this.getInventory().getStackInSlot(slot); } public void deleteStack(final int slot) { - this.setStack(slot, null); + this.setStack(slot, ItemStack.EMPTY); } - @Nullable public ItemStack decreaseStack(final int slot, final int amount) { return this.getInventory().decrStackSize(slot, amount); } - public void setStack(final int slot, @Nullable final ItemStack stack) { + public void setStack(final int slot, final ItemStack stack) { this.getInventory().setInventorySlotContents(slot, stack); } @@ -76,7 +74,7 @@ public class MachineUtil { public void addStack(final int slot, final ItemStack addition) { final ItemStack merge = this.getStack(slot); - if (merge == null) { + if (merge.isEmpty()) { this.setStack(slot, addition); } else { if (merge.isItemEqual(addition) && merge.getCount() + addition.getCount() <= merge.getMaxStackSize()) { @@ -101,7 +99,7 @@ public class MachineUtil { if (damage < 0) { item.setItemDamage(Math.max(0, item.getItemDamage() + damage)); } else if (item.attemptDamageItem(damage, new Random())) { - this.setStack(slot, null); + this.setStack(slot, ItemStack.EMPTY); } this.setStack(slot, item); } @@ -123,7 +121,7 @@ public class MachineUtil { final ItemStack[] stacks = new ItemStack[slots.length]; for (int i = 0; i < slots.length; ++i) { ItemStack stack = this.getStack(slots[i]); - if (copy && stack != null) { + if (copy && !stack.isEmpty()) { stack = stack.copy(); } stacks[i] = stack; @@ -145,12 +143,12 @@ public class MachineUtil { return false; } - List requiredStacks = this.getNonNullStacks(recipe, true); + List requiredStacks = this.getNonEmptyStacks(recipe, true); for (ItemStack requiredStack : requiredStacks) { IInventory inventory = this.getInventory(); for (int slot : inventorySlots) { ItemStack stackInSlot = this.getStack(slot); - if (stackInSlot != null && ItemStack.areItemsEqual(requiredStack, stackInSlot) && ItemStack.areItemStackTagsEqual(requiredStack, stackInSlot)) { + if (!stackInSlot.isEmpty() && ItemStack.areItemsEqual(requiredStack, stackInSlot) && ItemStack.areItemStackTagsEqual(requiredStack, stackInSlot)) { if (requiredStack.getCount() >= stackInSlot.getCount()) { requiredStack.shrink(stackInSlot.getCount()); inventory.removeStackFromSlot(slot); @@ -195,14 +193,14 @@ public class MachineUtil { return this.machine.getInterface(IProcess.class); } - public List getNonNullStacks(final int[] slots) { - return getNonNullStacks(slots, false); + public NonNullList getNonEmptyStacks(final int[] slots) { + return getNonEmptyStacks(slots, false); } - public List getNonNullStacks(final int[] slots, boolean copy) { - final List stacks = new ArrayList<>(); + public NonNullList getNonEmptyStacks(final int[] slots, boolean copy) { + final NonNullList stacks = NonNullList.create(); for (final ItemStack stack : this.getStacks(slots, copy)) { - if (stack != null) { + if (!stack.isEmpty()) { stacks.add(stack); } } diff --git a/src/main/java/binnie/core/machines/base/DefaultInventory.java b/src/main/java/binnie/core/machines/base/DefaultInventory.java index e50afe43..b1809d2a 100644 --- a/src/main/java/binnie/core/machines/base/DefaultInventory.java +++ b/src/main/java/binnie/core/machines/base/DefaultInventory.java @@ -35,7 +35,7 @@ class DefaultInventory implements IInventory { } @Override - public void setInventorySlotContents(final int i, @Nullable final ItemStack itemstack) { + public void setInventorySlotContents(final int i, final ItemStack itemstack) { } @Override diff --git a/src/main/java/binnie/core/machines/component/IComponentRecipe.java b/src/main/java/binnie/core/machines/component/IComponentRecipe.java index ad1b2c91..efae1402 100644 --- a/src/main/java/binnie/core/machines/component/IComponentRecipe.java +++ b/src/main/java/binnie/core/machines/component/IComponentRecipe.java @@ -7,9 +7,7 @@ import javax.annotation.Nullable; public interface IComponentRecipe { boolean isRecipe(); - @Nullable ItemStack doRecipe(final boolean takeItem); - @Nullable ItemStack getProduct(); } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java index 2ef185ed..d337bf1a 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java @@ -87,7 +87,7 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork. @Override public void onUpdate() { for (final int slot : this.charges.keySet()) { - if (this.getCharge(slot) <= 0.0f && this.getUtil().decreaseStack(slot, 1) != null) { + if (this.getCharge(slot) <= 0.0f && !this.getUtil().decreaseStack(slot, 1).isEmpty()) { this.setCharge(slot, 1.0f); } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index 6774ce83..16446b9c 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -27,7 +27,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve @Override public void clear() { for (InventorySlot slot : this.inventory.values()) { - slot.setContent(null); + slot.setContent(ItemStack.EMPTY); } } @@ -46,12 +46,11 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve return 0; } - @Nullable @Override public ItemStack removeStackFromSlot(int index) { InventorySlot inventorySlot = this.inventory.get(index); - ItemStack content = inventorySlot.getContent(); - inventorySlot.setContent(null); + ItemStack content = inventorySlot.getItemStack(); + inventorySlot.setContent(ItemStack.EMPTY); return content; } @@ -70,28 +69,26 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - @Nullable public ItemStack getStackInSlot(final int index) { if (this.inventory.containsKey(index)) { - return this.inventory.get(index).getContent(); + return this.inventory.get(index).getItemStack(); } - return null; + return ItemStack.EMPTY; } @Override - @Nullable public ItemStack decrStackSize(final int index, final int amount) { if (this.inventory.containsKey(index)) { final ItemStack stack = this.inventory.get(index).decrStackSize(amount); this.markDirty(); return stack; } - return null; + return ItemStack.EMPTY; } @Override - public void setInventorySlotContents(final int index, @Nullable final ItemStack itemStack) { - if (this.inventory.containsKey(index) && (itemStack == null || this.inventory.get(index).isValid(itemStack))) { + public void setInventorySlotContents(final int index, final ItemStack itemStack) { + if (this.inventory.containsKey(index) && (itemStack.isEmpty() || this.inventory.get(index).isValid(itemStack))) { this.inventory.get(index).setContent(itemStack); } this.markDirty(); @@ -100,9 +97,9 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve protected void transferItem(final int indexFrom, final int indexTo) { if (this.inventory.containsKey(indexFrom) && this.inventory.containsKey(indexTo)) { final InventorySlot slotFrom = this.inventory.get(indexFrom); - final ItemStack oldStack = slotFrom.getContent(); - final ItemStack newStack = oldStack == null ? null : oldStack.copy(); - slotFrom.setContent(null); + final ItemStack oldStack = slotFrom.getItemStack(); + final ItemStack newStack = oldStack.isEmpty() ? ItemStack.EMPTY : oldStack.copy(); + slotFrom.setContent(ItemStack.EMPTY); this.inventory.get(indexTo).setContent(newStack); } this.markDirty(); @@ -226,8 +223,8 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve @Override public void onDestruction() { for (final InventorySlot slot : this.inventory.values()) { - final ItemStack stack = slot.getContent(); - if (!slot.isRecipe() && stack != null) { + final ItemStack stack = slot.getItemStack(); + if (!slot.isRecipe() && !stack.isEmpty()) { final float f = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; final float f2 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; final float f3 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java index dd1a1596..c3f062cd 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java @@ -101,11 +101,11 @@ public class ComponentInventoryTransfer extends MachineComponent { @Override protected void doTransfer(final IInventory inv) { - if (inv.getStackInSlot(this.destination) == null) { + if (inv.getStackInSlot(this.destination).isEmpty()) { for (final int i : this.buffer) { - if (inv.getStackInSlot(i) != null) { + if (!inv.getStackInSlot(i).isEmpty()) { final ItemStack newStack = inv.decrStackSize(i, this.limit); - if (newStack != null) { + if (!newStack.isEmpty()) { inv.setInventorySlotContents(this.destination, newStack); return; } @@ -128,7 +128,7 @@ public class ComponentInventoryTransfer extends MachineComponent { @Override protected void doTransfer(final IInventory inv) { ItemStack stackInSlot = inv.getStackInSlot(this.source); - if (stackInSlot != null) { + if (!stackInSlot.isEmpty()) { TransferRequest transferRequest = new TransferRequest(stackInSlot, inv).setTargetSlots(this.destination).ignoreValidation(); ItemStack transfer = transferRequest.transfer(true); inv.setInventorySlotContents(this.source, transfer); @@ -138,7 +138,7 @@ public class ComponentInventoryTransfer extends MachineComponent { @Override protected boolean fulfilled(final IInventory inv) { final ItemStack stack = inv.getStackInSlot(this.source); - return stack != null && (this.condition == null || this.condition.fulfilled(stack)); + return !stack.isEmpty() && (this.condition == null || this.condition.fulfilled(stack)); } } diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 94a0a126..3287be76 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -8,40 +8,42 @@ import net.minecraft.nbt.NBTTagCompound; import javax.annotation.Nullable; public class InventorySlot extends BaseSlot { - @Nullable private ItemStack itemStack; private Type type; public InventorySlot(final int index, final String unlocName) { super(index, unlocName); - this.itemStack = null; + this.itemStack = ItemStack.EMPTY; this.type = Type.Standard; } @Override @Nullable public ItemStack getContent() { + return this.itemStack.isEmpty() ? null : this.itemStack; + } + + public ItemStack getItemStack() { return this.itemStack; } - @Nullable - public ItemStack getItemStack() { - return this.getContent(); + @Override + public boolean isEmpty() { + return this.itemStack.isEmpty(); } @Override - public void setContent(@Nullable final ItemStack itemStack) { + public void setContent(final ItemStack itemStack) { this.itemStack = itemStack; } - @Nullable public ItemStack decrStackSize(final int amount) { - if (this.itemStack == null) { - return null; + if (this.itemStack.isEmpty()) { + return ItemStack.EMPTY; } if (this.itemStack.getCount() <= amount) { final ItemStack returnStack = this.itemStack.copy(); - this.itemStack = null; + this.itemStack = ItemStack.EMPTY; return returnStack; } final ItemStack returnStack = this.itemStack.copy(); @@ -57,14 +59,14 @@ public class InventorySlot extends BaseSlot { final NBTTagCompound itemNBT = slotNBT.getCompoundTag("item"); this.itemStack = new ItemStack(itemNBT); } else { - this.itemStack = null; + this.itemStack = ItemStack.EMPTY; } } @Override public NBTTagCompound writeToNBT(final NBTTagCompound slotNBT) { final NBTTagCompound itemNBT = new NBTTagCompound(); - if (this.itemStack != null) { + if (!this.itemStack.isEmpty()) { this.itemStack.writeToNBT(itemNBT); } slotNBT.setTag("item", itemNBT); diff --git a/src/main/java/binnie/core/machines/power/PowerSystem.java b/src/main/java/binnie/core/machines/power/PowerSystem.java index f5d73144..bdc3c779 100644 --- a/src/main/java/binnie/core/machines/power/PowerSystem.java +++ b/src/main/java/binnie/core/machines/power/PowerSystem.java @@ -31,7 +31,10 @@ public enum PowerSystem { } public ItemStack saveTo(final ItemStack stack) { - final NBTTagCompound tag = stack.hasTagCompound() ? stack.getTagCompound() : new NBTTagCompound(); + NBTTagCompound tag = stack.getTagCompound(); + if (tag == null) { + tag = new NBTTagCompound(); + } tag.setByte("power-system", (byte) this.ordinal()); stack.setTagCompound(tag); return stack; diff --git a/src/main/java/binnie/core/machines/storage/Compartment.java b/src/main/java/binnie/core/machines/storage/Compartment.java index 9cc709a9..fc7bf802 100644 --- a/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/src/main/java/binnie/core/machines/storage/Compartment.java @@ -9,6 +9,8 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; enum Compartment implements IMachineType { Compartment(StandardCompartment.PackageCompartment.class), @@ -56,6 +58,7 @@ enum Compartment implements IMachineType { } @Override + @SideOnly(Side.CLIENT) public void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage) { MachineRendererCompartment.instance.renderMachine(machine, 16777215, renderTexture, x, y, z, partialTicks); } diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index e5d688a4..bb8e886f 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -49,6 +49,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.Arrays; @@ -153,6 +154,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh final ControlPage thisPage = page[p2]; final Panel panel = new Panel(thisPage, 0, 0, thisPage.w(), thisPage.h(), MinecraftGUI.PanelType.Black) { @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { final Texture iTexture = CraftGUI.render.getTexture(CraftGUITexture.TabOutline); RenderUtil.setColour(WindowCompartment.this.getTab(WindowCompartment.this.panels.get(this)).getColor().getColour()); @@ -307,6 +309,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh public void initialise() { final ControlScrollableContent scroll = new ControlScrollableContent(this, 124, 16, 116, 92, 6) { @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.setColour(11184810); CraftGUI.render.texture(CraftGUITexture.Outline, this.getArea().inset(new IBorder(0, 6, 0, 0))); @@ -352,7 +355,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh final IInventory inv = WindowCompartment.this.getInventory(); for (int i = 0; i < inv.getSizeInventory(); ++i) { final ItemStack stack = inv.getStackInSlot(i); - if (stack != null) { + if (!stack.isEmpty()) { final String name = stack.getDisplayName().toLowerCase(); if (this.textSearch == null || name.contains(this.textSearch)) { if (this.includeBlocks || Block.getBlockFromItem(stack.getItem()) == Blocks.AIR) { @@ -400,11 +403,13 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { super.onUpdateClient(); this.updateTabs(); } + @SideOnly(Side.CLIENT) public void updateTabs() { this.tabName.setValue(this.getCurrentTab().getName()); this.tabIcon.setItemStack(this.getCurrentTab().getIcon()); diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index e0627f7c..0a5d8290 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -8,20 +8,18 @@ import binnie.core.machines.power.ITankMachine; import com.google.common.base.Preconditions; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.IFluidTank; -import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; public class TransferRequest { - @Nullable private ItemStack itemToTransfer; - @Nullable private ItemStack returnItem; @Nullable private IInventory origin; @@ -34,9 +32,9 @@ public class TransferRequest { private List insertedSlots; private List insertedTanks; - public TransferRequest(@Nullable final ItemStack toTransfer, final IInventory destination) { - this.itemToTransfer = null; - this.returnItem = null; + public TransferRequest(final ItemStack toTransfer, final IInventory destination) { + this.itemToTransfer = ItemStack.EMPTY; + this.returnItem = ItemStack.EMPTY; this.targetSlots = new int[0]; this.targetTanks = new int[0]; this.transferLiquids = true; @@ -54,7 +52,7 @@ public class TransferRequest { targetTanks[j] = j; } } - if (toTransfer != null) { + if (!toTransfer.isEmpty()) { this.setItemToTransfer(toTransfer.copy()); this.setReturnItem(toTransfer.copy()); } @@ -65,39 +63,34 @@ public class TransferRequest { this.transferLiquids = true; } - @Nullable public static ItemStack transferItemToInventory(final ItemStack item, final IInventory destination, final boolean doAdd) { ItemStack addition = item.copy(); for (int i = 0; i < destination.getSizeInventory(); ++i) { addition = transferToInventory(addition, destination, new int[]{i}, doAdd, false); - if (addition == null) { - return null; + if (addition.isEmpty()) { + return ItemStack.EMPTY; } } return addition; } - @Nullable public static ItemStack transferToInventory(ItemStack item, final IInventory destination, final int[] targetSlots, final boolean doAdd, final boolean ignoreValidation) { ItemStack returnItem = item; for (final int i : targetSlots) { if (destination.isItemValidForSlot(i, returnItem) || ignoreValidation) { ItemStack stackInSlot = destination.getStackInSlot(i); - if (stackInSlot == null) { + if (stackInSlot.isEmpty()) { if (doAdd) { destination.setInventorySlotContents(i, returnItem.copy()); } - return null; + return ItemStack.EMPTY; } if (returnItem.isStackable()) { final ItemStack merged = stackInSlot.copy(); - final ItemStack[] newStacks = mergeStacks(returnItem.copy(), merged.copy()); - returnItem = newStacks[0]; + final NonNullList newStacks = mergeStacks(returnItem.copy(), merged.copy()); + returnItem = newStacks.get(0); if (doAdd) { - destination.setInventorySlotContents(i, newStacks[1]); - } - if (returnItem == null) { - return null; + destination.setInventorySlotContents(i, newStacks.get(1)); } } } @@ -109,7 +102,7 @@ public class TransferRequest { this.itemToTransfer = itemToTransfer; } - private void setReturnItem(@Nullable final ItemStack returnItem) { + private void setReturnItem(final ItemStack returnItem) { this.returnItem = returnItem; } @@ -137,32 +130,30 @@ public class TransferRequest { return this; } - @Nullable public ItemStack getReturnItem() { return this.returnItem; } - @Nullable public ItemStack transfer(final boolean doAdd) { ItemStack item = this.returnItem; - if (item == null || this.destination == null || this.origin == null) { - return null; + if (item.isEmpty() || this.destination == null || this.origin == null) { + return ItemStack.EMPTY; } if (this.transferLiquids && this.destination instanceof ITankMachine) { ItemStack itemIn = item.copy(); for (final int tankID : this.targetTanks) { item = transferToTank(item, this.origin, (ITankMachine) this.destination, tankID, doAdd); - if (item == null || !ItemStack.areItemStacksEqual(item, itemIn)) { + if (item.isEmpty() || !ItemStack.areItemStacksEqual(item, itemIn)) { break; } item = transferFromTank(item, this.origin, (ITankMachine) this.destination, tankID, doAdd); - if (item == null || !ItemStack.areItemStacksEqual(item, itemIn)) { + if (item.isEmpty() || !ItemStack.areItemStacksEqual(item, itemIn)) { break; } } } - if (item != null) { + if (!item.isEmpty()) { for (final int slot : this.targetSlots) { if (this.destination.isItemValidForSlot(slot, item) || this.ignoreReadOnly) { if (this.destination instanceof IInventorySlots) { @@ -172,26 +163,26 @@ public class TransferRequest { } } ItemStack stackInSlot = this.destination.getStackInSlot(slot); - if (stackInSlot != null) { + if (!stackInSlot.isEmpty()) { if (item.isStackable()) { final ItemStack merged = stackInSlot.copy(); - final ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy()); - item = newStacks[0]; - if (!areItemsEqual(merged, newStacks[1])) { + final NonNullList newStacks = mergeStacks(item.copy(), merged.copy()); + item = newStacks.get(0); + if (!areItemsEqual(merged, newStacks.get(1))) { this.insertedSlots.add(new TransferSlot(slot, this.destination)); } if (doAdd) { - this.destination.setInventorySlotContents(slot, newStacks[1]); + this.destination.setInventorySlotContents(slot, newStacks.get(1)); } - if (item == null) { - return null; + if (item.isEmpty()) { + return ItemStack.EMPTY; } } } } } } - if (item != null) { + if (!item.isEmpty()) { for (final int slot : this.targetSlots) { if (this.destination.isItemValidForSlot(slot, item) || this.ignoreReadOnly) { if (this.destination instanceof IInventorySlots) { @@ -200,12 +191,12 @@ public class TransferRequest { continue; } } - if (this.destination.getStackInSlot(slot) == null) { + if (this.destination.getStackInSlot(slot).isEmpty()) { this.insertedSlots.add(new TransferSlot(slot, this.destination)); if (doAdd) { this.destination.setInventorySlotContents(slot, item.copy()); } - return null; + return ItemStack.EMPTY; } } } @@ -218,7 +209,7 @@ public class TransferRequest { return ItemStack.areItemStackTagsEqual(itemstack, merged) && itemstack.isItemEqual(merged); } - public static ItemStack[] mergeStacks(ItemStack itemstack, final ItemStack merged) { + public static NonNullList mergeStacks(ItemStack itemstack, final ItemStack merged) { if (areItemsEqual(itemstack, merged)) { final int space = merged.getMaxStackSize() - merged.getCount(); if (space > 0) { @@ -231,10 +222,12 @@ public class TransferRequest { } } } - return new ItemStack[]{itemstack, merged}; + NonNullList result = NonNullList.create(); + result.add(itemstack); + result.add(merged); + return result; } - @Nullable 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.getCount() >= 1); @@ -242,8 +235,7 @@ public class TransferRequest { final ItemStack singleCopy = itemStack.copy(); singleCopy.setCount(1); - // TODO 1.11: use IFluidHandlerItem - final IFluidHandler fluidHandler = FluidUtil.getFluidHandler(singleCopy); + final IFluidHandlerItem fluidHandler = FluidUtil.getFluidHandler(singleCopy); if (fluidHandler != null) { final FluidStack containerLiquid = fluidHandler.drain(Integer.MAX_VALUE, false); @@ -255,24 +247,20 @@ public class TransferRequest { final int amountAdded = tank.fill(containerLiquid, false); - // TODO 1.11: use IFluidHandlerItem fluidHandler.drain(amountAdded, true); + ItemStack drainedContainer = fluidHandler.getContainer(); - if (singleCopy.getCount() == 0 || transferItemToInventory(singleCopy, origin, false) == null) { + if (drainedContainer.isEmpty() || transferItemToInventory(singleCopy, origin, false).isEmpty()) { if (doAdd) { tank.fill(containerLiquid, true); - if (singleCopy.getCount() > 0) { - transferItemToInventory(singleCopy, origin, true); + if (!drainedContainer.isEmpty()) { + transferItemToInventory(drainedContainer, origin, true); } } - if (itemStack.getCount() == 1) { - return null; - } else { - final ItemStack leftover = itemStack.copy(); - leftover.shrink(1); - return leftover; - } + final ItemStack leftover = itemStack.copy(); + leftover.shrink(1); + return leftover; } } } @@ -280,7 +268,6 @@ public class TransferRequest { return itemStack; } - @Nullable private static ItemStack transferFromTank(ItemStack itemStack, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { Preconditions.checkNotNull(itemStack); Preconditions.checkArgument(itemStack.getCount() >= 1); @@ -290,30 +277,25 @@ public class TransferRequest { if (fluid != null) { final ItemStack singleCopy = itemStack.copy(); singleCopy.setCount(1); - // TODO 1.11: use IFluidHandlerItem - IFluidHandler fluidHandler = FluidUtil.getFluidHandler(singleCopy); + IFluidHandlerItem fluidHandler = FluidUtil.getFluidHandler(singleCopy); if (fluidHandler != null) { final int fillAmount = fluidHandler.fill(fluid, true); if (fillAmount > 0) { final FluidStack fillFluid = tank.drain(fillAmount, false); if (fillFluid != null) { - // TODO 1.11: use IFluidHandlerItem fluidHandler.fill(fillFluid, true); - if (singleCopy.getCount() == 0 || transferItemToInventory(singleCopy, origin, false) == null) { + ItemStack filledContainer = fluidHandler.getContainer(); + if (filledContainer.isEmpty() || transferItemToInventory(singleCopy, origin, false).isEmpty()) { if (doAdd) { tank.drain(fillFluid.amount, true); - if (singleCopy.getCount() > 0) { - transferItemToInventory(singleCopy, origin, true); + if (!filledContainer.isEmpty()) { + transferItemToInventory(filledContainer, origin, true); } } - if (itemStack.getCount() == 1) { - return null; - } else { - ItemStack leftover = itemStack.copy(); - leftover.shrink(1); - return leftover; - } + ItemStack leftover = itemStack.copy(); + leftover.shrink(1); + return leftover; } } } @@ -341,7 +323,6 @@ public class TransferRequest { return this.destination; } - @Nullable public ItemStack getItemToTransfer() { return this.itemToTransfer; } diff --git a/src/main/java/binnie/core/resource/IBinnieTexture.java b/src/main/java/binnie/core/resource/IBinnieTexture.java index 93520a50..5c3d4d22 100644 --- a/src/main/java/binnie/core/resource/IBinnieTexture.java +++ b/src/main/java/binnie/core/resource/IBinnieTexture.java @@ -1,5 +1,9 @@ package binnie.core.resource; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + public interface IBinnieTexture { + @SideOnly(Side.CLIENT) BinnieResource getTexture(); } diff --git a/src/main/java/binnie/core/texture/BinnieCoreTexture.java b/src/main/java/binnie/core/texture/BinnieCoreTexture.java index 28cd5c86..66d2e34e 100644 --- a/src/main/java/binnie/core/texture/BinnieCoreTexture.java +++ b/src/main/java/binnie/core/texture/BinnieCoreTexture.java @@ -5,6 +5,8 @@ import binnie.core.BinnieCore; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum BinnieCoreTexture implements IBinnieTexture { Compartment(ResourceType.Tile, "Compartment"), @@ -25,6 +27,7 @@ public enum BinnieCoreTexture implements IBinnieTexture { } @Override + @SideOnly(Side.CLIENT) public BinnieResource getTexture() { return Binnie.RESOURCE.getPNG(BinnieCore.getInstance(), this.type, this.texture); } diff --git a/src/main/java/binnie/core/triggers/TriggerInventory.java b/src/main/java/binnie/core/triggers/TriggerInventory.java index f3e80962..d8f2e2ed 100644 --- a/src/main/java/binnie/core/triggers/TriggerInventory.java +++ b/src/main/java/binnie/core/triggers/TriggerInventory.java @@ -4,6 +4,6 @@ import net.minecraft.inventory.IInventory; public class TriggerInventory { private static Boolean isSlotEmpty(final IInventory inventory, final int slot) { - return inventory.getStackInSlot(slot) != null; + return !inventory.getStackInSlot(slot).isEmpty(); } } diff --git a/src/main/java/binnie/core/util/FakeCraftingWorld.java b/src/main/java/binnie/core/util/FakeCraftingWorld.java index b6064aaf..f293f389 100644 --- a/src/main/java/binnie/core/util/FakeCraftingWorld.java +++ b/src/main/java/binnie/core/util/FakeCraftingWorld.java @@ -39,7 +39,7 @@ public class FakeCraftingWorld extends World { private FakeCraftingWorld() { super(saveHandler, worldInfo, worldProvider, new Profiler(), true); this.provider.setWorld(this); - this.mapStorage = new FakeMapStorage(); + this.mapStorage = new FakeMapStorage(saveHandler); } @Override diff --git a/src/main/java/binnie/core/util/FakeMapStorage.java b/src/main/java/binnie/core/util/FakeMapStorage.java index 382c21e8..1b82352b 100644 --- a/src/main/java/binnie/core/util/FakeMapStorage.java +++ b/src/main/java/binnie/core/util/FakeMapStorage.java @@ -1,13 +1,14 @@ package binnie.core.util; import net.minecraft.world.WorldSavedData; +import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.MapStorage; import javax.annotation.Nullable; public class FakeMapStorage extends MapStorage { - public FakeMapStorage() { - super(null); + public FakeMapStorage(ISaveHandler fakeSaveHandler) { + super(fakeSaveHandler); } @Override diff --git a/src/main/java/binnie/core/util/FakeSaveHandler.java b/src/main/java/binnie/core/util/FakeSaveHandler.java index f858b2b0..da5a6a75 100644 --- a/src/main/java/binnie/core/util/FakeSaveHandler.java +++ b/src/main/java/binnie/core/util/FakeSaveHandler.java @@ -26,7 +26,7 @@ public class FakeSaveHandler implements ISaveHandler { @Override public IChunkLoader getChunkLoader(WorldProvider provider) { - return null; + throw new UnsupportedOperationException(); } @Override @@ -42,7 +42,7 @@ public class FakeSaveHandler implements ISaveHandler { @Override public IPlayerFileData getPlayerNBTManager() { - return null; + throw new UnsupportedOperationException(); } @Override @@ -53,18 +53,18 @@ public class FakeSaveHandler implements ISaveHandler { @Override public File getMapFileFromName(String mapName) { - return null; + throw new UnsupportedOperationException(); } @Override public File getWorldDirectory() { - return null; + throw new UnsupportedOperationException(); } @Override public TemplateManager getStructureTemplateManager() { - return null; + throw new UnsupportedOperationException(); } } diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index da144e76..643dee45 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -21,21 +21,20 @@ public class ItemStackSet implements Set { return this.itemStacks.toString(); } - @Nullable protected ItemStack getExisting(final ItemStack stack) { for (final ItemStack stack2 : this.itemStacks) { if (ItemStack.areItemsEqual(stack2, stack) && ItemStack.areItemStackTagsEqual(stack2, stack)) { return stack2; } } - return null; + return ItemStack.EMPTY; } @Override public boolean add(final ItemStack e) { if (e != null) { ItemStack existing = this.getExisting(e); - if (existing == null) { + if (existing.isEmpty()) { return this.itemStacks.add(e.copy()); } existing.grow(e.getCount()); @@ -59,7 +58,7 @@ public class ItemStackSet implements Set { @Override public boolean contains(final Object o) { - return o instanceof ItemStack && this.getExisting((ItemStack) o) != null; + return o instanceof ItemStack && !this.getExisting((ItemStack) o).isEmpty(); } @Override @@ -86,7 +85,7 @@ public class ItemStackSet implements Set { if (this.contains(o)) { final ItemStack r = (ItemStack) o; final ItemStack existing = this.getExisting(r); - if (existing != null && existing.getCount() > r.getCount()) { + if (!existing.isEmpty() && existing.getCount() > r.getCount()) { existing.shrink(r.getCount()); } else { this.itemStacks.remove(existing); diff --git a/src/main/java/binnie/core/util/UniqueItemStackSet.java b/src/main/java/binnie/core/util/UniqueItemStackSet.java index ba30cbdb..ea59e424 100644 --- a/src/main/java/binnie/core/util/UniqueItemStackSet.java +++ b/src/main/java/binnie/core/util/UniqueItemStackSet.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; public class UniqueItemStackSet extends ItemStackSet { @Override public boolean add(final ItemStack e) { - return e != null && this.getExisting(e) == null && this.itemStacks.add(e.copy()); + return !e.isEmpty() && this.getExisting(e).isEmpty() && this.itemStacks.add(e.copy()); } @Override diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java index f0528d98..d561be52 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java @@ -34,6 +34,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.ArrayList; @@ -54,8 +55,6 @@ public class WindowFieldKit extends Window { private float analyseProgress; private boolean isAnalysing; private Map info; - @Nullable - private ItemStack prev; public WindowFieldKit(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { super(280, 230, player, inventory, side); @@ -67,7 +66,6 @@ public class WindowFieldKit extends Window { this.analyseProgress = 1; this.isAnalysing = false; this.info = new HashMap<>(); - this.prev = null; } @Override @@ -146,6 +144,7 @@ public class WindowFieldKit extends Window { } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { super.onUpdateClient(); if (this.isAnalysing) { @@ -154,7 +153,7 @@ public class WindowFieldKit extends Window { this.isAnalysing = false; this.analyseProgress = 1; final ItemStack stack = this.getWindowInventory().getStackInSlot(0); - if (stack != null) { + if (!stack.isEmpty()) { this.sendClientAction("analyse", new NBTTagCompound()); } this.refreshSpecies(); @@ -171,7 +170,7 @@ public class WindowFieldKit extends Window { private void refreshSpecies() { final ItemStack item = this.getWindowInventory().getStackInSlot(0); - if (item == null || !AlleleManager.alleleRegistry.isIndividual(item)) { + if (item.isEmpty() || !AlleleManager.alleleRegistry.isIndividual(item)) { return; } final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(item); @@ -214,10 +213,9 @@ public class WindowFieldKit extends Window { } if (this.isClient()) { final ItemStack item = this.getWindowInventory().getStackInSlot(0); - this.prev = item; this.text.setValue(""); - if (item != null && !Analyser.isAnalysed(item)) { - if (this.getWindowInventory().getStackInSlot(1) == null) { + if (!item.isEmpty() && !Analyser.isAnalysed(item)) { + if (this.getWindowInventory().getStackInSlot(1).isEmpty()) { this.text.setValue("No Paper!"); this.isAnalysing = false; this.analyseProgress = 1; @@ -228,7 +226,7 @@ public class WindowFieldKit extends Window { return; } } - } else if (item != null) { + } else if (!item.isEmpty()) { this.isAnalysing = false; this.analyseProgress = 1; this.refreshSpecies(); diff --git a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java index 9ef7ee2f..86e09b81 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java @@ -139,9 +139,11 @@ public class WindowGenesis extends Window { return; } final IChromosomeType chromo = ((Gene) event.value).getChromosome(); - WindowGenesis.this.template[chromo.ordinal()] = ((Gene) event.value).getAllele(); - if (chromo == ((Gene) event.value).getSpeciesRoot().getSpeciesChromosomeType()) { - WindowGenesis.this.template = ((Gene) event.value).getSpeciesRoot().getTemplate(((Gene) event.value).getAllele().getUID()); + IAllele allele = ((Gene) event.value).getAllele(); + WindowGenesis.this.template[chromo.ordinal()] = allele; + ISpeciesRoot speciesRoot = ((Gene) event.value).getSpeciesRoot(); + if (chromo == speciesRoot.getSpeciesChromosomeType()) { + WindowGenesis.this.template = speciesRoot.getTemplate(allele.getUID()); } WindowGenesis.this.refreshTemplate(chromo); } @@ -199,10 +201,10 @@ public class WindowGenesis extends Window { if (side == Side.SERVER && name.equals("genesis")) { final ItemStack stack = new ItemStack(action); final InventoryPlayer playerInv = player.inventory; - if (stack == null) { + if (stack.isEmpty()) { return; } - if (playerInv.getItemStack() == null) { + if (playerInv.getItemStack().isEmpty()) { playerInv.setItemStack(stack); } else if (playerInv.getItemStack().isItemEqual(stack) && ItemStack.areItemStackTagsEqual(playerInv.getItemStack(), stack)) { final int fit = stack.getMaxStackSize() - (stack.getCount() + playerInv.getItemStack().getCount()); diff --git a/src/main/java/binnie/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/craftgui/controls/ControlTextEdit.java index 031637ee..de867123 100644 --- a/src/main/java/binnie/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/craftgui/controls/ControlTextEdit.java @@ -12,7 +12,10 @@ import binnie.craftgui.events.EventTextEdit; import binnie.craftgui.events.EventWidget; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.gui.GuiTextField; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ControlTextEdit extends Control implements IControlValue { GuiTextField field; private String cachedValue; diff --git a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java index a6f33fc7..917f19a0 100644 --- a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java +++ b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java @@ -18,11 +18,14 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.client.config.GuiUtils; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; +@SideOnly(Side.CLIENT) public class RenderUtil { private RenderUtil() { diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index c300d6ae..e15c4e49 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -87,10 +87,10 @@ public class ContainerCraftGUI extends Container { for (int i = 0; i < inventory.getSizeInventory(); ++i) { if (inventory.dispenseOnClose(i)) { ItemStack stack = inventory.getStackInSlot(i); - if (stack != null) { + if (!stack.isEmpty()) { TransferRequest transferRequest = new TransferRequest(stack, par1EntityPlayer.inventory); stack = transferRequest.transfer(true); - if (stack != null) { + if (!stack.isEmpty()) { par1EntityPlayer.dropItem(stack, false); } } @@ -123,27 +123,25 @@ public class ContainerCraftGUI extends Container { } @Override - @Nullable public final ItemStack transferStackInSlot(final EntityPlayer player, final int slotID) { return this.shiftClick(player, slotID); } - @Nullable private ItemStack shiftClick(final EntityPlayer player, final int slotnumber) { final TransferRequest request = this.getShiftClickRequest(player, slotnumber); final ItemStack itemstack = request.transfer(true); final Slot shiftClickedSlot = this.inventorySlots.get(slotnumber); shiftClickedSlot.putStack(itemstack); shiftClickedSlot.onSlotChanged(); - return null; + return ItemStack.EMPTY; } private TransferRequest getShiftClickRequest(final EntityPlayer player, final int slotnumber) { final Slot shiftClickedSlot = this.inventorySlots.get(slotnumber); - ItemStack itemstack = null; + ItemStack itemstack = ItemStack.EMPTY; if (shiftClickedSlot.getHasStack()) { ItemStack shiftClickedStack = shiftClickedSlot.getStack(); - if (shiftClickedStack != null) { + if (!shiftClickedStack.isEmpty()) { itemstack = shiftClickedStack.copy(); } } @@ -174,7 +172,7 @@ public class ContainerCraftGUI extends Container { return null; } ItemStack heldItem = player.inventory.getItemStack(); - if (heldItem == null) { + if (heldItem.isEmpty()) { return null; } heldItem = heldItem.copy(); @@ -461,7 +459,7 @@ public class ContainerCraftGUI extends Container { final Slot slot = new CustomSlot(inventory, index); slot.slotNumber = slotNumber; this.inventorySlots.add(slotNumber, slot); - this.inventoryItemStacks.add(slotNumber, null); + this.inventoryItemStacks.add(slotNumber, ItemStack.EMPTY); return slot; } } diff --git a/src/main/java/binnie/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/craftgui/minecraft/CustomSlot.java index 190474e0..9530374d 100644 --- a/src/main/java/binnie/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/CustomSlot.java @@ -13,8 +13,8 @@ import javax.annotation.Nullable; public class CustomSlot extends Slot { @Override - public boolean isItemValid(@Nullable final ItemStack stack) { - return stack != null && this.inventory.isItemValidForSlot(this.getSlotIndex(), stack); + public boolean isItemValid(final ItemStack stack) { + return !stack.isEmpty() && this.inventory.isItemValidForSlot(this.getSlotIndex(), stack); } public CustomSlot(final IInventory inventory, final int index) { @@ -38,8 +38,8 @@ public class CustomSlot extends Slot { public void onSlotClick(final ContainerCraftGUI container, final int dragType, final ClickType modifier, final EntityPlayer player) { ItemStack stack = player.inventory.getItemStack(); //TODO modifier==mouseButton2? - if (stack == null || modifier == ClickType.PICKUP_ALL) { - this.putStack(null); + if (stack.isEmpty() || modifier == ClickType.PICKUP_ALL) { + this.putStack(ItemStack.EMPTY); } else { stack = stack.copy(); stack.setCount(1); diff --git a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java index 68766162..26309cd6 100644 --- a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java @@ -31,7 +31,6 @@ import java.util.List; public class GuiCraftGUI extends GuiContainer { IPoint mousePos; private Window window; - @Nullable private ItemStack draggedItem; @Override @@ -47,6 +46,7 @@ public class GuiCraftGUI extends GuiContainer { super(window.getContainer()); this.mousePos = IPoint.ZERO; this.window = window; + this.draggedItem = ItemStack.EMPTY; this.resize(window.getSize()); } @@ -65,7 +65,6 @@ public class GuiCraftGUI extends GuiContainer { this.window.initGui(); } - @Nullable public ItemStack getDraggedItem() { return this.draggedItem; } diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index 59c95e5d..a22370ea 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -213,6 +213,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.setColour(16777215); if (this.getBackground1() != null) { @@ -226,7 +227,9 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { + super.onUpdateClient(); ControlSlot.highlighting.get(EnumHighlighting.Help).clear(); ControlSlot.shiftClickActive = false; } @@ -239,7 +242,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG return this.getPlayer().getGameProfile(); } - @Nullable public ItemStack getHeldItemStack() { return this.player.inventory.getItemStack(); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java index 040f17bf..fad294c4 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java @@ -13,6 +13,8 @@ import binnie.craftgui.minecraft.MinecraftTooltip; import binnie.craftgui.minecraft.Window; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -22,6 +24,7 @@ public class ControlErrorState extends Control implements ITooltip { private int type; @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { Object texture = CraftGUITexture.StateWarning; if (this.errorState == null) { @@ -33,6 +36,7 @@ public class ControlErrorState extends Control implements ITooltip { super.onRenderBackground(guiWidth, guiHeight); } + @Nullable public ErrorState getError() { return Window.get(this).getContainer().getErrorState(); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java index 840b5902..00e8cd60 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java @@ -10,11 +10,13 @@ import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.minecraft.Window; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opencl.CL; import javax.annotation.Nullable; public class ControlItemDisplay extends Control implements ITooltip { - @Nullable private ItemStack itemStack; public boolean hastooltip; private boolean rotating; @@ -38,14 +40,15 @@ public class ControlItemDisplay extends Control implements ITooltip { public ControlItemDisplay(final IWidget parent, final int x, final int y, final int size) { super(parent, x, y, size, size); - this.itemStack = null; + this.itemStack = ItemStack.EMPTY; this.hastooltip = false; this.rotating = false; } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - if (this.itemStack == null) { + if (this.itemStack.isEmpty()) { return; } @@ -67,18 +70,18 @@ public class ControlItemDisplay extends Control implements ITooltip { GlStateManager.enableAlpha(); } - public void setItemStack(@Nullable final ItemStack itemStack) { + public void setItemStack(final ItemStack itemStack) { this.itemStack = itemStack; } - @Nullable public ItemStack getItemStack() { return this.itemStack; } @Override + @SideOnly(Side.CLIENT) public void getTooltip(final Tooltip tooltip) { - if (this.hastooltip && this.itemStack != null) { + if (this.hastooltip && !this.itemStack.isEmpty()) { tooltip.add(this.itemStack.getTooltip(((Window) this.getTopParent()).getPlayer(), false)); } super.getTooltip(tooltip); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java index b81d515c..228a0d1c 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java @@ -25,6 +25,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import javax.annotation.Nullable; @@ -75,6 +77,7 @@ public class ControlLiquidTank extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(this.horizontal ? CraftGUITexture.HorizontalLiquidTank : CraftGUITexture.LiquidTank, IPoint.ZERO); GuiCraftGUI gui = Window.get(this).getGui(); @@ -85,7 +88,7 @@ public class ControlLiquidTank extends Control implements ITooltip { final int c = -1442840576 + MinecraftTooltip.getOutline(MinecraftTooltip.Type.Error); RenderUtil.drawGradientRect(this.getArea().inset(1), c, c); } else if (this.getTopParent().getMousedOverWidget() == this) { - if (gui.getDraggedItem() != null) { + if (!gui.getDraggedItem().isEmpty()) { RenderUtil.drawGradientRect(this.getArea().inset(1), -1426089575, -1426089575); } else { RenderUtil.drawGradientRect(this.getArea().inset(1), -2130706433, -2130706433); @@ -130,6 +133,7 @@ public class ControlLiquidTank extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { CraftGUI.render.texture(this.horizontal ? CraftGUITexture.HorizontalLiquidTankOverlay : CraftGUITexture.LiquidTankOverlay, IPoint.ZERO); GuiCraftGUI gui = Window.get(this).getGui(); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java index e4d72134..ef62c948 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java @@ -50,7 +50,7 @@ public class ControlPlayerInventory extends Control { } } - public void addItem(@Nullable final ItemStack item) { + public void addItem(final ItemStack item) { for (final ControlSlot slot : this.slots) { if (!slot.slot.getHasStack()) { slot.slot.putStack(item); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java index af5303da..c5fcd899 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java @@ -13,6 +13,8 @@ import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.renderer.GlStateManager; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlSlide extends Control { private IArea expanded; @@ -35,6 +37,7 @@ public class ControlSlide extends Control { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); if (this.label != null) { diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java index ac7368d0..0f970256 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java @@ -119,7 +119,7 @@ public class ControlSlot extends ControlSlotBase { } if (!highlighted && this.getTopParent().getMousedOverWidget() == this) { GuiCraftGUI gui = Window.get(this).getGui(); - if (gui.getDraggedItem() != null && !this.slot.isItemValid(gui.getDraggedItem())) { + if (!gui.getDraggedItem().isEmpty() && !this.slot.isItemValid(gui.getDraggedItem())) { RenderUtil.drawGradientRect(new IArea(1, 1, 16, 16), -1426089575, -1426089575); } else { RenderUtil.drawGradientRect(new IArea(1, 1, 16, 16), -2130706433, -2130706433); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java index 2b71e7aa..44c393c3 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java @@ -32,9 +32,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip { this.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { @Override public void onEvent(final EventWidget.ChangeSize event) { - if (ControlSlotBase.this.itemDisplay != null) { - ControlSlotBase.this.itemDisplay.setSize(ControlSlotBase.this.getSize().sub(new IPoint(2, 2))); - } + ControlSlotBase.this.itemDisplay.setSize(ControlSlotBase.this.getSize().sub(new IPoint(2, 2))); } }); } @@ -61,14 +59,14 @@ public abstract class ControlSlotBase extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void getTooltip(final Tooltip tooltip) { final ItemStack item = this.getItemStack(); - if (item == null) { + if (item.isEmpty()) { return; } tooltip.add(item.getTooltip(((Window) this.getTopParent()).getPlayer(), false)); } - @Nullable public abstract ItemStack getItemStack(); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java b/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java index 92b13fee..bb997cbc 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java @@ -5,6 +5,8 @@ import binnie.craftgui.controls.tab.ControlTab; import binnie.craftgui.controls.tab.ControlTabBar; import binnie.craftgui.core.geometry.IPoint; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -17,15 +19,15 @@ public class ControlTabIcon extends ControlTab { this.item.hastooltip = false; } - @Nullable public ItemStack getItemStack() { if (this.value instanceof IItemStackRepresentitive) { return ((IItemStackRepresentitive) this.value).getItemStackRepresentitive(); } - return null; + return ItemStack.EMPTY; } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { super.onUpdateClient(); this.item.setItemStack(this.getItemStack()); diff --git a/src/main/java/binnie/craftgui/mod/database/ControlBranchBoxOption.java b/src/main/java/binnie/craftgui/mod/database/ControlBranchBoxOption.java index 9525bd99..dc04264e 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlBranchBoxOption.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlBranchBoxOption.java @@ -6,6 +6,6 @@ import forestry.api.genetics.IClassification; class ControlBranchBoxOption extends ControlTextOption { public ControlBranchBoxOption(final ControlList controlList, final IClassification option, final int y) { - super(controlList, option, (option.getName() == null) ? option.getScientific() : (option.getName().contains(".") ? option.getScientific() : option.getName()), y); + super(controlList, option, option.getName().contains(".") ? option.getScientific() : option.getName(), y); } } diff --git a/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java index a3eae6ba..6ffae883 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java @@ -10,6 +10,7 @@ import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlItemDisplay; import com.mojang.authlib.GameProfile; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; @@ -28,7 +29,8 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme public void setSpecies(final IAlleleSpecies species, EnumDiscoveryState state) { final ISpeciesRoot speciesRoot = Binnie.GENETICS.getSpeciesRoot(species); final BreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot); - final IIndividual ind = system.getSpeciesRoot().templateAsIndividual(system.getSpeciesRoot().getTemplate(species.getUID())); + final IAllele[] template = system.getSpeciesRoot().getTemplate(species); + final IIndividual ind = system.getSpeciesRoot().templateAsIndividual(template); super.setItemStack(system.getSpeciesRoot().getMemberStack(ind, system.getDefaultType())); this.species = species; final GameProfile username = Window.get(this).getUsername(); diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java b/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java index 4d27d11b..d8834829 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java @@ -13,7 +13,10 @@ import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITextureSheet; import binnie.craftgui.resource.minecraft.StandardTexture; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; class ControlMutationSymbol extends Control implements ITooltip { private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); @@ -23,6 +26,7 @@ class ControlMutationSymbol extends Control implements ITooltip { private int type; @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); if (this.type == 0) { @@ -54,15 +58,13 @@ class ControlMutationSymbol extends Control implements ITooltip { @Override public void getTooltip(final Tooltip tooltip) { if (this.type == 1 && this.discovered) { - final IAllele species1 = this.value.getAllele0(); - final IAllele species2 = this.value.getAllele1(); + final IAlleleSpecies species1 = this.value.getAllele0(); + final IAlleleSpecies species2 = this.value.getAllele1(); final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); final float chance = system.getChance(this.value, Window.get(this).getPlayer(), species1, species2); tooltip.add("Current Chance - " + chance + "%"); - if (this.value.getSpecialConditions() != null) { - for (final String string : this.value.getSpecialConditions()) { - tooltip.add(string); - } + for (final String string : this.value.getSpecialConditions()) { + tooltip.add(string); } } } diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java b/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java index 20fde80f..5a645e1d 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java @@ -39,8 +39,8 @@ public class PageSpeciesOverview extends PageSpecies { public void onValueChanged(final IAlleleSpecies species) { this.controlInd1.setSpecies(species, EnumDiscoveryState.Show); this.controlInd2.setSpecies(species, EnumDiscoveryState.Show); - final String branchBinomial = (species.getBranch() != null) ? species.getBranch().getScientific() : ""; - final String branchName = (species.getBranch() != null) ? species.getBranch().getName() : "Unknown"; + final String branchBinomial = species.getBranch().getScientific(); + final String branchName = species.getBranch().getName(); this.controlName.setValue(TextFormatting.UNDERLINE + species.getName()); this.controlScientific.setValue(TextFormatting.ITALIC + branchBinomial + " " + species.getBinomial()); this.controlAuthority.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.discovered") + ": " + TextFormatting.BOLD + species.getAuthority()); diff --git a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java index f6521f29..fb4bb822 100644 --- a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java @@ -29,6 +29,7 @@ import forestry.api.genetics.IClassification; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -44,9 +45,13 @@ public abstract class WindowAbstractDatabase extends Window { private Map modes; boolean isNEI; private BreedingSystem system; + @Nullable private Panel panelInformation; + @Nullable private Panel panelSearch; + @Nullable private ControlPages modePages; + @Nullable private IAlleleSpecies gotoSpecies; public void changeMode(final IDatabaseMode mode) { diff --git a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java b/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java index f66302e0..8f92370f 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java +++ b/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java @@ -1,9 +1,10 @@ package binnie.craftgui.resource.minecraft; -import binnie.core.BinnieCore; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.craftgui.core.CraftGUI; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum CraftGUITextureSheet implements IBinnieTexture { Controls2("controls"), @@ -22,10 +23,8 @@ public enum CraftGUITextureSheet implements IBinnieTexture { } @Override + @SideOnly(Side.CLIENT) public BinnieResource getTexture() { - if (BinnieCore.getBinnieProxy().isServer()) { - return null; - } return CraftGUI.resourceManager.getTextureSheet(this.name).getTexture(); } } diff --git a/src/main/java/binnie/craftgui/resource/minecraft/ParsedTextureSheet.java b/src/main/java/binnie/craftgui/resource/minecraft/ParsedTextureSheet.java index 38878148..8e4e927f 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/ParsedTextureSheet.java +++ b/src/main/java/binnie/craftgui/resource/minecraft/ParsedTextureSheet.java @@ -3,6 +3,8 @@ package binnie.craftgui.resource.minecraft; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; class ParsedTextureSheet implements IBinnieTexture { private String name; @@ -16,6 +18,7 @@ class ParsedTextureSheet implements IBinnieTexture { } @Override + @SideOnly(Side.CLIENT) public BinnieResource getTexture() { return new BinnieResource(this.modid, ResourceType.GUI, this.path); } diff --git a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java index 964e8bad..26392593 100644 --- a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java @@ -38,10 +38,10 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.Mutation, 0.5f, 0.2f); EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.Production, 0.75f, 0.2f); EnumHiveFrame.Debug.logic.setModifier(EnumBeeModifier.Lifespan, 1.0E-4f, 1.0E-4f); - GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Cocoa.item), " c ", "cFc", " c ", 'F', Mods.Forestry.stack("frameImpregnated"), 'c', new ItemStack(Items.DYE, 1, 3)); - GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Cage.item), Mods.Forestry.stack("frameImpregnated"), Blocks.IRON_BARS); - GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Soul.item), Mods.Forestry.stack("frameImpregnated"), Blocks.SOUL_SAND); - GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Clay.item), " c ", "cFc", " c ", 'F', Mods.Forestry.stack("frameImpregnated"), 'c', Items.CLAY_BALL); + GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Cocoa.item), " c ", "cFc", " c ", 'F', Mods.Forestry.stack("frame_impregnated"), 'c', new ItemStack(Items.DYE, 1, 3)); + GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Cage.item), Mods.Forestry.stack("frame_impregnated"), Blocks.IRON_BARS); + GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Soul.item), Mods.Forestry.stack("frame_impregnated"), Blocks.SOUL_SAND); + GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Clay.item), " c ", "cFc", " c ", 'F', Mods.Forestry.stack("frame_impregnated"), 'c', Items.CLAY_BALL); } private final Item item; @@ -67,11 +67,10 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { } @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()) { - return null; + return ItemStack.EMPTY; } return frame; } @@ -87,7 +86,7 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { } @Override - public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + public float getLifespanModifier(final IBeeGenome genome, @Nullable final IBeeGenome mate, final float currentModifier) { return this.logic.getModifier(EnumBeeModifier.Lifespan, currentModifier); } diff --git a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java index 48b13cd8..67b95332 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java @@ -10,6 +10,8 @@ import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -30,6 +32,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt } @Override + @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, 0, "frames/" + getRegistryName().getResourcePath()); } @@ -45,7 +48,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt } @Override - public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + public float getLifespanModifier(final IBeeGenome genome, @Nullable final IBeeGenome mate, final float currentModifier) { return this.frame.getLifespanModifier(genome, mate, currentModifier); } @@ -55,11 +58,10 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt } @Override - @Nullable public ItemStack frameUsed(final IBeeHousing housing, final ItemStack frame, final IBee queen, final int wear) { frame.setItemDamage(frame.getItemDamage() + wear); if (frame.getItemDamage() >= frame.getMaxDamage()) { - return null; + return ItemStack.EMPTY; } return frame; } diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index 36d6051c..5d84a8cf 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -50,7 +50,7 @@ public class ModuleApiary implements IInitializable { public void postInit() { EnumHiveFrame.init(); Block alveary = Mods.Forestry.block("alveary.plain"); - Item thermionicTubes = Mods.Forestry.item("thermionicTubes"); + Item thermionicTubes = Mods.Forestry.item("thermionic_tubes"); Item chipsets = Mods.Forestry.item("chipsets"); GameRegistry.addRecipe(AlvearyMachine.Mutator.get(1), "g g", " a ", "t t", 'g', Items.GOLD_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java index 446727c8..f7d35a47 100644 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java @@ -129,7 +129,7 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo } @Override - public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + public float getLifespanModifier(final IBeeGenome genome, @Nullable final IBeeGenome mate, final float currentModifier) { return (this.getBeeModifier() == null) ? 1.0f : this.getBeeModifier().getLifespanModifier(genome, mate, currentModifier); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java index cb5bcf51..5ae9aa36 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java @@ -10,10 +10,14 @@ import binnie.extrabees.apiary.ComponentExtraBeeGUI; import binnie.extrabees.apiary.TileExtraBeeAlveary; import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ExtraBeeTexture; +import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IBeeRoot; import forestry.api.apiculture.IHiveFrame; +import forestry.api.multiblock.IAlvearyController; +import forestry.api.multiblock.IMultiblockLogicAlveary; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -43,7 +47,7 @@ public class AlvearyFrame { @Override public boolean isValid(final ItemStack itemStack) { - return itemStack != null && itemStack.getItem() instanceof IHiveFrame; + return !itemStack.isEmpty() && itemStack.getItem() instanceof IHiveFrame; } @Override @@ -59,18 +63,27 @@ public class AlvearyFrame { @Override public void wearOutEquipment(final int amount) { - if (this.getHiveFrame() == null) { - return; + IHiveFrame hiveFrame = this.getHiveFrame(); + if (hiveFrame != null) { + final World world = this.getMachine().getTileEntity().getWorld(); + IBeeRoot beeRoot = Binnie.GENETICS.getBeeRoot(); + IMultiblockLogicAlveary multiblockLogic = ((TileExtraBeeAlveary) this.getMachine().getTileEntity()).getMultiblockLogic(); + IAlvearyController alvearyController = multiblockLogic.getController(); + ItemStack queenStack = alvearyController.getBeeInventory().getQueen(); + IBee queen = beeRoot.getMember(queenStack); + if (queen != null) { + final int wear = Math.round(amount * 5 * beeRoot.getBeekeepingMode(world).getWearModifier()); + ItemStack frame = this.getInventory().getStackInSlot(AlvearyFrame.slotFrame); + ItemStack frameUsed = hiveFrame.frameUsed(alvearyController, frame, queen, wear); + this.getInventory().setInventorySlotContents(AlvearyFrame.slotFrame, frameUsed); + } } - final World world = this.getMachine().getTileEntity().getWorld(); - final int wear = Math.round(amount * 5 * Binnie.GENETICS.getBeeRoot().getBeekeepingMode(world).getWearModifier()); - this.getInventory().setInventorySlotContents(AlvearyFrame.slotFrame, this.getHiveFrame().frameUsed(((TileExtraBeeAlveary) this.getMachine().getTileEntity()).getMultiblockLogic().getController(), this.getInventory().getStackInSlot(AlvearyFrame.slotFrame), null, wear)); } @Nullable public IHiveFrame getHiveFrame() { ItemStack stackInSlot = this.getInventory().getStackInSlot(AlvearyFrame.slotFrame); - if (stackInSlot != null) { + if (!stackInSlot.isEmpty()) { return (IHiveFrame) stackInSlot.getItem(); } return null; @@ -87,7 +100,7 @@ public class AlvearyFrame { } @Override - public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + public float getLifespanModifier(final IBeeGenome genome, @Nullable final IBeeGenome mate, final float currentModifier) { return (this.getHiveFrame() == null) ? 1.0f : this.getHiveFrame().getBeeModifier().getLifespanModifier(genome, mate, currentModifier); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java index 5b6d0b63..7b9af5e9 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java @@ -70,7 +70,7 @@ public class AlvearyHatchery { final IBeeHousing house = ((TileExtraBeeAlveary) tile).getMultiblockLogic().getController(); if (house != null && !house.getErrorLogic().hasErrors()) { final ItemStack queenStack = house.getBeeInventory().getQueen(); - final IBee queen = (queenStack == null) ? null : Binnie.GENETICS.getBeeRoot().getMember(queenStack); + final IBee queen = (queenStack.isEmpty()) ? null : Binnie.GENETICS.getBeeRoot().getMember(queenStack); if (queen != null) { final ItemStack larvae = Binnie.GENETICS.getBeeRoot().getMemberStack(Binnie.GENETICS.getBeeRoot().getBee(queen.getGenome()), EnumBeeType.LARVAE); new TransferRequest(larvae, this.getInventory()).transfer(true); diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java index 79a4eb33..71fcb62d 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java @@ -28,8 +28,8 @@ public class AlvearyMutator { return getMutationMult(item) > 0.0f; } - public static float getMutationMult(@Nullable final ItemStack item) { - if (item == null) { + public static float getMutationMult(final ItemStack item) { + if (item.isEmpty()) { return 1.0f; } for (final ItemStack comp : AlvearyMutator.mutations.keySet()) { @@ -40,8 +40,8 @@ public class AlvearyMutator { return 1.0f; } - public static void addMutationItem(@Nullable final ItemStack item, final float chance) { - if (item == null) { + public static void addMutationItem(final ItemStack item, final float chance) { + if (item.isEmpty()) { return; } AlvearyMutator.mutations.put(item, chance); diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java index 1e6dd802..bcd3f3ca 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java @@ -52,7 +52,7 @@ public class AlvearyStimulator { @Override public boolean isValid(final ItemStack itemStack) { - return itemStack != null && ChipsetManager.circuitRegistry.isChipset(itemStack); + return !itemStack.isEmpty() && ChipsetManager.circuitRegistry.isChipset(itemStack); } @Override @@ -241,7 +241,7 @@ public class AlvearyStimulator { CircuitType type; public StimulatorCircuit(final CircuitType type, final ICircuitLayout layout) { - super("stimulator." + type.toString().toLowerCase(), 4, layout, Mods.Forestry.item("thermionicTubes"), type.recipe); + super("stimulator." + type.toString().toLowerCase(), 4, layout, Mods.Forestry.item("thermionic_tubes"), type.recipe); this.type = type; } diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java index 8bcbcc40..9118ebaa 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java @@ -107,7 +107,7 @@ public enum ExtraBeeItems implements IItemMiscProvider { if (woodGear != null) { gear = new ItemStack(woodGear, 1); } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("for.honey", 500), null, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', Mods.Forestry.item("royalJelly"), 'b', Mods.Forestry.item("beeswax"), 'p', Mods.Forestry.item("pollen"), 'g', gear); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("for.honey", 500), ItemStack.EMPTY, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', Mods.Forestry.item("royal_jelly"), 'b', Mods.Forestry.item("beeswax"), 'p', Mods.Forestry.item("pollen"), 'g', gear); } ExtraBeeItems(String name, String modelPath) { diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java b/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java index 989f4afe..028c6d4f 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java @@ -5,6 +5,8 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; import binnie.extrabees.ExtraBees; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum ExtraBeeTexture implements IBinnieTexture { AlvearyMutator(ResourceType.Tile, "alveary/AlvearyMutator"), @@ -29,6 +31,7 @@ public enum ExtraBeeTexture implements IBinnieTexture { } @Override + @SideOnly(Side.CLIENT) public BinnieResource getTexture() { return Binnie.RESOURCE.getPNG(ExtraBees.instance, this.type, this.texture); } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index fa8d110a..761ec12e 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -2,6 +2,7 @@ package binnie.extrabees.genetics; import binnie.Binnie; import binnie.core.genetics.ForestryAllele; +import com.google.common.base.Preconditions; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; @@ -25,9 +26,7 @@ public class ExtraBeeMutation implements IBeeMutation { public static List mutations = new ArrayList<>(); @Nullable MutationRequirement req; - @Nullable IAlleleBeeSpecies species0; - @Nullable IAlleleBeeSpecies species1; IAllele[] template; int chance; @@ -204,18 +203,16 @@ public class ExtraBeeMutation implements IBeeMutation { } public ExtraBeeMutation(final IAlleleBeeSpecies allele0, final IAlleleBeeSpecies allele1, final IAllele[] mutation, final int chance, @Nullable final MutationRequirement req) { - this.species0 = null; - this.species1 = null; - this.template = new IAllele[0]; + Preconditions.checkNotNull(allele0); + Preconditions.checkNotNull(allele1); + Preconditions.checkNotNull(mutation); this.chance = 80; this.chance = chance; this.req = req; this.species0 = allele0; this.species1 = allele1; this.template = mutation; - if (this.species0 != null && this.species1 != null && this.template != null) { - ExtraBeeMutation.mutations.add(this); - } + ExtraBeeMutation.mutations.add(this); } @Override @@ -255,10 +252,6 @@ public class ExtraBeeMutation implements IBeeMutation { @Override public float getChance(final IBeeHousing housing, final IAlleleBeeSpecies allele0, final IAlleleBeeSpecies allele1, final IBeeGenome genome0, final IBeeGenome genome1) { - if (this.species0 == null || this.species1 == null || allele0 == null || allele1 == null) { - return 0.0f; - } - final World world = housing.getWorldObj(); final Biome biome = housing.getBiome(); if (this.req != null && !this.req.fufilled(housing, allele0, allele1, genome0, genome1)) { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java index 7189ce02..07a2ad35 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java @@ -85,7 +85,7 @@ public enum ExtraBeesBranch implements IClassification { } } - public static void doInit() { + public static void setSpeciesBranches() { final IClassification frozenBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.frozen"); if (frozenBranch != null) { frozenBranch.addMemberSpecies(ExtraBeesSpecies.ARTIC); diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index 59b2e84b..6465aa5c 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -301,8 +301,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } } - public void addProduct(@Nullable final ItemStack product, final Float chance) { - if (product == null) { + public void addProduct(final ItemStack product, final Float chance) { + if (product.isEmpty()) { this.setState(State.Inactive); } else { this.products.put(product, chance); @@ -319,8 +319,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } } - public void addSpecialty(@Nullable final ItemStack product, final Float chance) { - if (product == null) { + public void addSpecialty(final ItemStack product, final Float chance) { + if (product.isEmpty()) { this.setState(State.Inactive); } else { this.specialties.put(product, chance); @@ -1064,7 +1064,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { @Override public float getResearchSuitability(final ItemStack itemstack) { - if (itemstack == null) { + if (itemstack.isEmpty()) { return 0.0f; } for (final ItemStack stack : this.products.keySet()) { @@ -1080,13 +1080,13 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { if (itemstack.getItem() == Items.GLASS_BOTTLE) { return 0.9f; } - if (itemstack.getItem() == Mods.Forestry.item("honeyDrop")) { + if (itemstack.getItem() == Mods.Forestry.item("honey_drop")) { return 0.5f; } if (itemstack.getItem() == Mods.Forestry.item("honeydew")) { return 0.7f; } - if (itemstack.getItem() == Mods.Forestry.item("beeComb")) { + if (itemstack.getItem() == Mods.Forestry.item("bee_comb")) { return 0.4f; } if (AlleleManager.alleleRegistry.isIndividual(itemstack)) { diff --git a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java index 373f73b1..56fe6068 100644 --- a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java @@ -19,6 +19,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ModuleGenetics implements IInitializable { @Override public void preInit() { + ExtraBeesBranch.setSpeciesBranches(); for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) { AlleleManager.alleleRegistry.registerAllele(species); } @@ -34,7 +35,6 @@ public class ModuleGenetics implements IInitializable { ExtraBeesFlowers.doInit(); ExtraBeesSpecies.doInit(); ExtraBeeMutation.doInit(); - ExtraBeesBranch.doInit(); } @Override @@ -47,11 +47,11 @@ public class ModuleGenetics implements IInitializable { ++ebSpeciesCount; } } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); } public static IGenome getGenome(final IAlleleBeeSpecies allele0) { - return Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(allele0.getUID())); + return Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(allele0)); } // public static ItemStack getBeeIcon(final IAlleleBeeSpecies species) { diff --git a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java index 250dbf31..9dd7f2bb 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java @@ -60,7 +60,7 @@ public class ControlBiomes extends Control implements ITooltip { if (species == null) { return; } - final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID())); + final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species)); final IBee bee = Binnie.GENETICS.getBeeRoot().getBee(genome); } } diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index a1d1a5b5..3955fd72 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -15,6 +15,7 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAllele; import java.util.ArrayList; import java.util.List; @@ -90,13 +91,14 @@ public class ControlClimateBar extends Control implements ITooltip { } int main; EnumTolerance tolerance; + final IAllele[] template = Binnie.GENETICS.getBeeRoot().getTemplate(species); + final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(template); + if (!this.isHumidity) { main = species.getTemperature().ordinal() - 1; - final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID())); tolerance = genome.getToleranceTemp(); } else { main = species.getHumidity().ordinal(); - final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID())); tolerance = genome.getToleranceHumid(); } this.tolerated.add(main); diff --git a/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java b/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java index f04837ca..3c8a6710 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java +++ b/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java @@ -15,10 +15,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public class WindowPunnettSquare extends Window { ControlSlot bee1; ControlSlot bee2; ControlPunnett punnett; + @Nullable ISpeciesRoot root; public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java index 97ad8662..3a548cfa 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java @@ -144,15 +144,15 @@ public enum EnumHoneyComb implements IItemEnum { return ExtraBees.proxy.localise("item.comb." + this.name().toLowerCase()); } - public boolean addProduct(@Nullable final ItemStack item, final Float chance) { - if (item == null) { + public boolean addProduct(final ItemStack item, final Float chance) { + if (item.isEmpty()) { return false; } this.products.put(item.copy(), chance); return true; } - public void tryAddProduct(@Nullable final ItemStack item, final Float chance) { + public void tryAddProduct(final ItemStack item, final Float chance) { this.active = this.addProduct(item, chance); } diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index 75416210..4c6d1d39 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -25,7 +25,7 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { public static void addSubtypes() { final ItemStack beeswax = Mods.Forestry.stack("beeswax"); - final ItemStack honeyDrop = Mods.Forestry.stack("honeyDrop"); + final ItemStack honeyDrop = Mods.Forestry.stack("honey_drop"); OreDictionary.registerOre("ingotIron", Items.IRON_INGOT); OreDictionary.registerOre("ingotGold", Items.GOLD_INGOT); OreDictionary.registerOre("gemDiamond", Items.DIAMOND); @@ -150,7 +150,7 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { EnumHoneyComb.SALTPETER.addProduct(honeyDrop, 0.25f); EnumHoneyComb.SALTPETER.tryAddProduct(getOreDictionary("dustSaltpeter"), 1.00f); EnumHoneyComb.COMPOST.addProduct(honeyDrop, 0.25f); - EnumHoneyComb.COMPOST.tryAddProduct(Mods.Forestry.stack("fertilizerBio"), 1.00f); + EnumHoneyComb.COMPOST.tryAddProduct(Mods.Forestry.stack("fertilizer_bio"), 1.00f); EnumHoneyComb.SAWDUST.addProduct(honeyDrop, 0.25f); if (!OreDictionary.getOres("dustSawdust").isEmpty()) { EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("dustSawdust").get(0), 1.00f); @@ -220,12 +220,11 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { } } - @Nullable private static ItemStack getOreDictionary(final String string) { if (OreDictionary.getOres(string).size() > 0) { return OreDictionary.getOres(string).get(0); } - return null; + return ItemStack.EMPTY; } @SideOnly(Side.CLIENT) @@ -258,7 +257,7 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { QUARTZ; public ItemStack get() { - return Mods.Forestry.stack("beeCombs", 1, this.ordinal()); + return Mods.Forestry.stack("bee_combs", 1, this.ordinal()); } } } diff --git a/src/main/java/binnie/extrabees/products/ModuleProducts.java b/src/main/java/binnie/extrabees/products/ModuleProducts.java index 4b89976c..6e667037 100644 --- a/src/main/java/binnie/extrabees/products/ModuleProducts.java +++ b/src/main/java/binnie/extrabees/products/ModuleProducts.java @@ -42,7 +42,7 @@ public class ModuleProducts implements IInitializable { @Override public void postInit() { - GameRegistry.addRecipe(new ItemStack(ExtraBees.honeyCrystalEmpty), "#@#", "@#@", "#@#", '@', Mods.Forestry.stack("honeyDrop"), '#', EnumHoneyDrop.ENERGY.get(1)); + GameRegistry.addRecipe(new ItemStack(ExtraBees.honeyCrystalEmpty), "#@#", "@#@", "#@#", '@', Mods.Forestry.stack("honey_drop"), '#', EnumHoneyDrop.ENERGY.get(1)); for (final EnumHoneyComb info : EnumHoneyComb.values()) { info.addRecipe(); } diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java index 81b889dd..50242f7f 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java @@ -9,7 +9,10 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ExtraBeesProxyClient extends ExtraBeesProxy { public static ModelManager modelManager = new ModelManager(Constants.EXTRA_BEES_MOD_ID); diff --git a/src/main/java/binnie/extratrees/api/IDesignSystem.java b/src/main/java/binnie/extratrees/api/IDesignSystem.java index 49b29965..ccc36cd2 100644 --- a/src/main/java/binnie/extratrees/api/IDesignSystem.java +++ b/src/main/java/binnie/extratrees/api/IDesignSystem.java @@ -2,16 +2,21 @@ package binnie.extratrees.api; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; public interface IDesignSystem { @Nullable + @SideOnly(Side.CLIENT) TextureAtlasSprite getPrimarySprite(final IPattern pattern); @Nullable + @SideOnly(Side.CLIENT) TextureAtlasSprite getSecondarySprite(final IPattern pattern); + @SideOnly(Side.CLIENT) void registerSprites(); IDesignMaterial getDefaultMaterial(); diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 7ef83a64..001e105d 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -287,7 +287,6 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { // } @Override - @Nullable public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return BlockMetadata.getPickBlock(world, pos); } diff --git a/src/main/java/binnie/extratrees/block/ItemETDoor.java b/src/main/java/binnie/extratrees/block/ItemETDoor.java index 6a1bbac0..869a06b3 100644 --- a/src/main/java/binnie/extratrees/block/ItemETDoor.java +++ b/src/main/java/binnie/extratrees/block/ItemETDoor.java @@ -102,6 +102,6 @@ public class ItemETDoor extends ItemMetadata { // @Override // @SideOnly(Side.CLIENT) // public int getColorFromItemStack(final ItemStack par1ItemStack, final int par2) { -// return WoodManager.getPlankType((par1ItemStack == null) ? 0 : (par1ItemStack.getItemDamage() & 0xFF)).getColour(); +// return WoodManager.getPlankType((par1ItemStack.isEmpty()) ? 0 : (par1ItemStack.getItemDamage() & 0xFF)).getColour(); // } } diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 41b7de2f..98b5dfdf 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -282,7 +282,7 @@ public class ModuleBlocks implements IInitializable { final ItemStack doorSolid = WoodManager.getDoor(plank2, DoorType.Solid); final ItemStack doorSplit = WoodManager.getDoor(plank2, DoorType.Double); final ItemStack doorFull = WoodManager.getDoor(plank2, DoorType.Full); - if (planks2 != null && gate != null) { + if (!planks2.isEmpty() && !gate.isEmpty()) { gate.setCount(1); GameRegistry.addRecipe(gate.copy(), "fpf", 'f', fenceNormal.copy(), 'p', planks2.copy()); fenceNormal.setCount(4); @@ -299,7 +299,7 @@ public class ModuleBlocks implements IInitializable { public void addSqueezer(final IWoodType log, final ILiquidType liquid, final int amount, final float pulpChance) { final FluidStack liquidStack = liquid.get(amount); ItemStack logStack = TreeManager.woodAccess.getStack(log, WoodBlockKind.LOG, false); - RecipeManagers.squeezerManager.addRecipe(10, logStack, liquidStack, Mods.Forestry.stack("woodPulp"), (int) (100.0f * pulpChance)); + RecipeManagers.squeezerManager.addRecipe(10, logStack, liquidStack, Mods.Forestry.stack("wood_pulp"), (int) (100.0f * pulpChance)); } public void addSqueezer(final IWoodType log, final ILiquidType liquid, final int amount) { diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 2af0062e..951a4b1d 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -107,7 +107,7 @@ public class WoodManager { public static ItemStack getFence(final IPlankType plank, final IPlankType plank2, final FenceType type, final int amount) { if (plank instanceof IFenceProvider && plank == plank2 && type.isPlain()) { final ItemStack original = ((IFenceProvider) plank).getFence(); - if (original != null) { + if (!original.isEmpty()) { original.setCount(amount); return original; } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java index 6b0919e4..d0b3638c 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java @@ -129,7 +129,6 @@ public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { } @Override - @Nullable public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return BlockMetadata.getPickBlock(world, pos); } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index 9043e28c..dc4762d1 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -172,7 +172,6 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock // } @Override - @Nullable public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return BlockMetadata.getPickBlock(world, pos); } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 5fba51d3..285518bf 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -14,8 +14,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; public class MultiFenceRecipeEmbedded implements IRecipe { - @Nullable - private ItemStack cached; + private ItemStack cached = ItemStack.EMPTY; @Override public boolean matches(final InventoryCrafting inv, final World world) { @@ -25,18 +24,16 @@ public class MultiFenceRecipeEmbedded implements IRecipe { final ItemStack a = inv.getStackInSlot(row * 3); final ItemStack b = inv.getStackInSlot(row * 3 + 1); final ItemStack c = inv.getStackInSlot(row * 3 + 2); - if (a != null && b != null) { - if (c != null) { - type = WoodManager.getFenceType(a); - final FenceType type2 = WoodManager.getFenceType(c); - if (type != null && type2 != null) { - if (type.equals(type2)) { - final IPlankType pType = WoodManager.get(b); - FenceDescription fenceDescription = WoodManager.getFenceDescription(a); - if (fenceDescription != null && fenceDescription.getPlankType() == pType) { - this.cached = WoodManager.getFence(fenceDescription.getPlankType(), fenceDescription.getSecondaryPlankType(), new FenceType(type.size, type.solid, true), 2); - return true; - } + if (!a.isEmpty() && !b.isEmpty() && !c.isEmpty()) { + type = WoodManager.getFenceType(a); + final FenceType type2 = WoodManager.getFenceType(c); + if (type != null && type2 != null) { + if (type.equals(type2)) { + final IPlankType pType = WoodManager.get(b); + FenceDescription fenceDescription = WoodManager.getFenceDescription(a); + if (fenceDescription != null && fenceDescription.getPlankType() == pType) { + this.cached = WoodManager.getFence(fenceDescription.getPlankType(), fenceDescription.getSecondaryPlankType(), new FenceType(type.size, type.solid, true), 2); + return true; } } } @@ -57,7 +54,7 @@ public class MultiFenceRecipeEmbedded implements IRecipe { @Override public ItemStack getRecipeOutput() { - return (this.cached == null) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; + return (this.cached.isEmpty()) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 7d127d6a..67422be8 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -16,8 +16,7 @@ import java.util.ArrayList; import java.util.List; public class MultiFenceRecipeSize implements IRecipe { - @Nullable - private ItemStack cached; + private ItemStack cached = ItemStack.EMPTY; @Override public boolean matches(final InventoryCrafting inv, final World world) { @@ -44,7 +43,7 @@ public class MultiFenceRecipeSize implements IRecipe { if (types.isEmpty()) { return false; } - ItemStack fence = null; + ItemStack fence = ItemStack.EMPTY; if (pattern.contains("0100 0 ")) { fence = WoodManager.getFence(types.get(0), types.get(1), new FenceType(0, false, false), 4); } else if (pattern.contains("0000 0 ")) { @@ -59,7 +58,7 @@ public class MultiFenceRecipeSize implements IRecipe { fence = WoodManager.getFence(types.get(0), types.get(0), new FenceType(2, false, false), 4); } this.cached = fence; - return fence != null; + return !fence.isEmpty(); } @Override @@ -74,7 +73,7 @@ public class MultiFenceRecipeSize implements IRecipe { @Override public ItemStack getRecipeOutput() { - return (this.cached == null) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; + return (this.cached.isEmpty()) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; } // TODO: what is this? diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 97100284..771a9cea 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -13,8 +13,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; public class MultiFenceRecipeSolid implements IRecipe { - @Nullable - private ItemStack cached; + private ItemStack cached = ItemStack.EMPTY; @Override public boolean matches(final InventoryCrafting inv, final World world) { @@ -32,8 +31,11 @@ public class MultiFenceRecipeSolid implements IRecipe { if (type != null && type2 != null && type3 != null && type.equals(type2)) { if (type.equals(type3)) { FenceDescription fenceDescription = WoodManager.getFenceDescription(a); - this.cached = WoodManager.getFence(fenceDescription.getPlankType(), fenceDescription.getSecondaryPlankType(), new FenceType(type.size, true, type.solid), 2); - return true; + if (fenceDescription != null) { + FenceType fenceType = new FenceType(type.size, true, type.solid); + this.cached = WoodManager.getFence(fenceDescription.getPlankType(), fenceDescription.getSecondaryPlankType(), fenceType, 2); + return true; + } } } } @@ -54,7 +56,7 @@ public class MultiFenceRecipeSolid implements IRecipe { @Override public ItemStack getRecipeOutput() { - return (this.cached == null) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; + return (this.cached.isEmpty()) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; } @Override diff --git a/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java b/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java index c0bd4dad..57ac1391 100644 --- a/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java @@ -17,6 +17,6 @@ public class TreeTypePredicate implements Predicate { @Override public boolean apply(@Nullable ETTreeDefinition treeDefinition) { - return treeDefinition.getMetadata() >= minMeta && treeDefinition.getMetadata() <= maxMeta; + return treeDefinition != null && treeDefinition.getMetadata() >= minMeta && treeDefinition.getMetadata() <= maxMeta; } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 02199bb9..cf05496e 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -65,7 +65,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } final BlockDesign blockC = (BlockDesign) world.getBlockState(pos).getBlock(); final ItemStack item = player.getHeldItemMainhand(); - if (item == null) { + if (item.isEmpty()) { return; } if (!(item.getItem() instanceof IToolHammer)) { diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index fbef5664..cbab3a64 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -12,6 +12,8 @@ import forestry.core.render.TextureManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.HashMap; @@ -138,6 +140,7 @@ public enum DesignSystem implements IDesignSystem { @Override @Nullable + @SideOnly(Side.CLIENT) public TextureAtlasSprite getPrimarySprite(final IPattern pattern) { if (pattern instanceof EnumPattern) { return this.primary.get(((EnumPattern) pattern).ordinal()); @@ -147,6 +150,7 @@ public enum DesignSystem implements IDesignSystem { @Override @Nullable + @SideOnly(Side.CLIENT) public TextureAtlasSprite getSecondarySprite(final IPattern pattern) { if (pattern instanceof EnumPattern) { return this.secondary.get(((EnumPattern) pattern).ordinal()); @@ -155,6 +159,7 @@ public enum DesignSystem implements IDesignSystem { } @Override + @SideOnly(Side.CLIENT) public void registerSprites() { for (final EnumPattern pattern : EnumPattern.values()) { this.primary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), "blocks/" + getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"))); diff --git a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java index f0674140..95610ed9 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java @@ -5,6 +5,8 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; import binnie.extratrees.ExtraTrees; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum ExtraTreeTexture implements IBinnieTexture { Gui(ResourceType.GUI, "gui"), @@ -28,6 +30,7 @@ public enum ExtraTreeTexture implements IBinnieTexture { } @Override + @SideOnly(Side.CLIENT) public BinnieResource getTexture() { return Binnie.RESOURCE.getPNG(ExtraTrees.instance, this.type, this.texture); } diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 2696fc8e..9c612c68 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -222,7 +222,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { @Override public float getResearchSuitability(final ItemStack itemstack) { - if (itemstack == null) { + if (itemstack.isEmpty()) { return 0.0f; } if (itemstack.getItem() == Items.GLASS_BOTTLE) { @@ -238,13 +238,13 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { return 1.0f; } } - if (itemstack.getItem() == Mods.Forestry.item("honeyDrop")) { + if (itemstack.getItem() == Mods.Forestry.item("honey_drop")) { return 0.5f; } if (itemstack.getItem() == Mods.Forestry.item("honeydew")) { return 0.7f; } - if (itemstack.getItem() == Mods.Forestry.item("beeComb")) { + if (itemstack.getItem() == Mods.Forestry.item("bee_comb")) { return 0.4f; } if (AlleleManager.alleleRegistry.isIndividual(itemstack)) { diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index ce6f7729..c8a37965 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -1,12 +1,14 @@ package binnie.extratrees.genetics; import binnie.Binnie; +import com.google.common.base.Preconditions; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreeMutation; import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; @@ -128,16 +130,16 @@ public class ExtraTreeMutation implements ITreeMutation { new ExtraTreeMutation(ETTreeDefinition.Hazel.getSpecies(), ETTreeDefinition.Alder.getSpecies(), ETTreeDefinition.DwarfHazel.getSpecies(), 10); } - public static IAllele getVanilla(final String uid) { - final IAllele allele = AlleleManager.alleleRegistry.getAllele("forestry.tree" + uid); - if (allele == null) { - throw new RuntimeException("No forestry species with id " + uid); - } - return allele; + public static IAlleleSpecies getVanilla(final String uid) { + String forestryUid = "forestry.tree" + uid; + final IAllele allele = AlleleManager.alleleRegistry.getAllele(forestryUid); + Preconditions.checkArgument(allele != null); + Preconditions.checkArgument(allele instanceof IAlleleSpecies, "No Forestry species with uid: %s", forestryUid); + return (IAlleleSpecies) allele; } - public ExtraTreeMutation(final IAllele allele0, final IAllele allele1, final IAllele result, final int chance) { - this(allele0, allele1, Binnie.GENETICS.getTreeRoot().getTemplate(result.getUID()), chance); + public ExtraTreeMutation(final IAlleleSpecies allele0, final IAlleleSpecies allele1, final IAlleleSpecies result, final int chance) { + this(allele0, allele1, Binnie.GENETICS.getTreeRoot().getTemplate(result), chance); } public ExtraTreeMutation(final IAllele allele0, final IAllele allele1, final IAllele[] template, final int chance) { diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 8c62f971..0d629cb2 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -133,7 +133,7 @@ public class ModuleItems implements IInitializable { GameRegistry.addRecipe(ExtraTreeItems.GrainCorn.get(3), " s ", " s", " s ", 's', ExtraTreeItems.GrainWheat.get(1)); GameRegistry.addRecipe(ExtraTreeItems.GrainRye.get(3), " ", "s s", " s ", 's', ExtraTreeItems.GrainWheat.get(1)); GameRegistry.addRecipe(ExtraTreeItems.Hops.get(3), " s ", "sps", " s ", 's', Items.WHEAT_SEEDS, 'p', Items.APPLE); - GameRegistry.addRecipe(ExtraTreeItems.ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.Forestry.stack("oakStick")); + GameRegistry.addRecipe(ExtraTreeItems.ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.Forestry.stack("oak_stick")); GameRegistry.addRecipe(ExtraTreeItems.GlassFitting.get(6), "s s", " i ", "s s", 'i', Items.IRON_INGOT, 's', Items.STICK); GameRegistry.addSmelting(ExtraTreeItems.GrainWheat.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); GameRegistry.addSmelting(ExtraTreeItems.GrainRye.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); @@ -144,12 +144,12 @@ public class ModuleItems implements IInitializable { CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(Food.PAPAYIMAR.get(1), minium, "cropPapaya")); } catch (Exception ex) { } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(items.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(items.itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(items.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(items.itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); RecipeManagers.stillManager.addRecipe(25, ExtraTreeLiquid.Resin.get(5), ExtraTreeLiquid.Turpentine.get(3)); - RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), null, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); + RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), ItemStack.EMPTY, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); if (Binnie.LIQUID.getFluidStack("Creosote Oil", 100) != null) { - RecipeManagers.carpenterManager.addRecipe(25, Binnie.LIQUID.getFluidStack("Creosote Oil", 50), null, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); + RecipeManagers.carpenterManager.addRecipe(25, Binnie.LIQUID.getFluidStack("Creosote Oil", 50), ItemStack.EMPTY, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); } FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Sap.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Sap.get(1).getFluid(), 20, 10000, 1)); diff --git a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index d4b3f02a..abaa0859 100644 --- a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -10,6 +10,10 @@ import binnie.core.resource.ResourceType; import binnie.extratrees.ExtraTrees; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; public enum KitchenMachine implements IMachineType { // TODO implement @@ -17,9 +21,10 @@ public enum KitchenMachine implements IMachineType { Cupboard(null), BottleRack(BottleRack.PackageBottleRack.class); + @Nullable Class clss; - KitchenMachine(final Class clss) { + KitchenMachine(@Nullable final Class clss) { this.clss = clss; } @@ -60,6 +65,7 @@ public enum KitchenMachine implements IMachineType { } @Override + @SideOnly(Side.CLIENT) public void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage) { MachineRendererKitchen.instance.renderMachine(machine, textureName, x, y, z, partialTicks); } diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java index 49a9cf3c..12ced18f 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java @@ -14,6 +14,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -46,6 +48,7 @@ public class ControlFluidDisplay extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { if (this.fluidStack == null) { return; @@ -78,7 +81,7 @@ public class ControlFluidDisplay extends Control implements ITooltip { } } - public void setFluidStack(final FluidStack fluidStack) { + public void setFluidStack(@Nullable final FluidStack fluidStack) { this.fluidStack = fluidStack; } diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index 739272f0..7be9ef96 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -12,16 +12,21 @@ import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventWidget; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; public class ControlSlotFluid extends Control implements ITooltip { ControlFluidDisplay itemDisplay; + @Nullable FluidStack fluidStack; - public ControlSlotFluid(final IWidget parent, final int x, final int y, final FluidStack fluid) { + public ControlSlotFluid(final IWidget parent, final int x, final int y, @Nullable final FluidStack fluid) { this(parent, x, y, 18, fluid); } - public ControlSlotFluid(final IWidget parent, final int x, final int y, final int size, final FluidStack fluid) { + public ControlSlotFluid(final IWidget parent, final int x, final int y, final int size, @Nullable final FluidStack fluid) { super(parent, x, y, size, size); this.addAttribute(Attribute.MouseOver); this.itemDisplay = new ControlFluidDisplay(this, 1, 1, size - 2); @@ -29,9 +34,7 @@ public class ControlSlotFluid extends Control implements ITooltip { this.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { @Override public void onEvent(final EventWidget.ChangeSize event) { - if (ControlSlotFluid.this.itemDisplay != null) { - ControlSlotFluid.this.itemDisplay.setSize(ControlSlotFluid.this.getSize().sub(new IPoint(2, 2))); - } + ControlSlotFluid.this.itemDisplay.setSize(ControlSlotFluid.this.getSize().sub(new IPoint(2, 2))); } }); } @@ -46,6 +49,7 @@ public class ControlSlotFluid extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { super.onUpdateClient(); this.itemDisplay.setFluidStack(this.getFluidStack()); @@ -60,6 +64,7 @@ public class ControlSlotFluid extends Control implements ITooltip { tooltip.add(item.getFluid().getLocalizedName(item)); } + @Nullable public FluidStack getFluidStack() { return this.fluidStack; } diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java index d63abb97..36308fc1 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java @@ -5,6 +5,8 @@ import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.Window; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlTankSlot extends ControlSlotFluid { int tankID; @@ -26,6 +28,7 @@ public class ControlTankSlot extends ControlSlotFluid { } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { this.fluidStack = Window.get(this).getContainer().getTankInfo(this.tankID).liquid; final int height = 16 * (((this.fluidStack == null) ? 0 : this.fluidStack.amount) / 1000); diff --git a/src/main/java/binnie/extratrees/machines/Designer.java b/src/main/java/binnie/extratrees/machines/Designer.java index c8faf734..ea8a3a7d 100644 --- a/src/main/java/binnie/extratrees/machines/Designer.java +++ b/src/main/java/binnie/extratrees/machines/Designer.java @@ -96,16 +96,15 @@ public abstract class Designer { @Override public boolean isRecipe() { - return this.getProduct() != null; + return !this.getProduct().isEmpty(); } @Override - @Nullable public ItemStack getProduct() { final ItemStack plank1 = this.getUtil().getStack(Designer.design1Slot); final ItemStack plank2 = this.getUtil().getStack(Designer.design2Slot); - if (plank1 == null || plank2 == null) { - return null; + if (plank1.isEmpty() || plank2.isEmpty()) { + return ItemStack.EMPTY; } final IDesignMaterial type1 = this.type.getSystem().getMaterial(plank1); final IDesignMaterial type2 = this.type.getSystem().getMaterial(plank2); @@ -114,18 +113,17 @@ public abstract class Designer { } @Override - @Nullable public ItemStack doRecipe(final boolean takeItem) { if (!this.isRecipe()) { - return null; + return ItemStack.EMPTY; } if (this.canWork() != null) { - return null; + return ItemStack.EMPTY; } final ItemStack product = this.getProduct(); if (takeItem) { final ItemStack a = this.getUtil().decreaseStack(Designer.design1Slot, 1); - if (a == null) { + if (a.isEmpty()) { this.getUtil().decreaseStack(Designer.design2Slot, 1); } else if (this.design != EnumDesign.Blank) { this.getUtil().decreaseStack(Designer.design2Slot, 1); @@ -144,8 +142,8 @@ public abstract class Designer { if (name.equals("recipe")) { final InventoryPlayer playerInv = player.inventory; final ItemStack recipe = this.doRecipe(false); - if (recipe != null) { - if (playerInv.getItemStack() == null) { + if (!recipe.isEmpty()) { + if (playerInv.getItemStack().isEmpty()) { playerInv.setItemStack(this.doRecipe(true)); } else if (playerInv.getItemStack().isItemEqual(recipe) && ItemStack.areItemStackTagsEqual(playerInv.getItemStack(), recipe)) { final int fit = recipe.getMaxStackSize() - (recipe.getCount() + playerInv.getItemStack().getCount()); diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 520056d5..5f9cbcb9 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -37,13 +37,13 @@ public class ModuleMachine implements IInitializable { @Override public void postInit() { - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Lumbermill.get(1), "gAg", "GsG", "gPg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'A', Items.IRON_AXE, 's', Mods.Forestry.stack("sturdyMachine"), 'P', "gearBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Press.get(1), "iGi", "tSt", "tPt", 'i', "ingotIron", 'G', Blocks.GLASS, 't', "ingotTin", 'S', Mods.Forestry.stack("sturdyMachine"), 'P', "gearBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Brewery.get(1), "bGb", "iSi", "bPb", 'i', "ingotIron", 'G', Blocks.GLASS, 'b', "gearBronze", 'S', Mods.Forestry.stack("sturdyMachine"), 'P', "gearBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Distillery.get(1), "rGr", "iSi", "rPr", 'i', "ingotIron", 'G', Blocks.GLASS, 'r', "dustRedstone", 'S', Mods.Forestry.stack("sturdyMachine"), 'P', "gearBronze")); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Woodworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.PLANKS, 's', Mods.Forestry.stack("impregnatedCasing"))); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Panelworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.WOODEN_SLAB, 's', Mods.Forestry.stack("impregnatedCasing"))); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Glassworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.GLASS, 's', Mods.Forestry.stack("impregnatedCasing"))); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnatedCasing"))); + GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Lumbermill.get(1), "gAg", "GsG", "gPg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'A', Items.IRON_AXE, 's', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze")); + GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Press.get(1), "iGi", "tSt", "tPt", 'i', "ingotIron", 'G', Blocks.GLASS, 't', "ingotTin", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze")); + GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Brewery.get(1), "bGb", "iSi", "bPb", 'i', "ingotIron", 'G', Blocks.GLASS, 'b', "gearBronze", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze")); + GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Distillery.get(1), "rGr", "iSi", "rPr", 'i', "ingotIron", 'G', Blocks.GLASS, 'r', "dustRedstone", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze")); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Woodworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.PLANKS, 's', Mods.Forestry.stack("impregnated_casing"))); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Panelworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.WOODEN_SLAB, 's', Mods.Forestry.stack("impregnated_casing"))); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Glassworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.GLASS, 's', Mods.Forestry.stack("impregnated_casing"))); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnated_casing"))); } } diff --git a/src/main/java/binnie/extratrees/machines/Validators.java b/src/main/java/binnie/extratrees/machines/Validators.java index f78ce677..0886c6c6 100644 --- a/src/main/java/binnie/extratrees/machines/Validators.java +++ b/src/main/java/binnie/extratrees/machines/Validators.java @@ -35,7 +35,7 @@ public class Validators { @Override public boolean isValid(final ItemStack itemStack) { final IDesignMaterial mat = this.type.getSystem().getMaterial(itemStack); - return itemStack != null && mat != null; + return !itemStack.isEmpty() && mat != null; } @Override diff --git a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java index 118c25fa..20860259 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java @@ -22,22 +22,18 @@ public class BrewedGrainRecipe implements IBreweryRecipe { private final ItemStack yeast; public BrewedGrainRecipe(Alcohol output, int grainOreId) { - this(output, grainOreId, null, null); + this(output, grainOreId, null, ExtraTreeItems.Yeast.get(1)); } public BrewedGrainRecipe(Alcohol output, int grainOreId, Integer ingredientOreId) { - this(output, grainOreId, ingredientOreId, null); + this(output, grainOreId, ingredientOreId, ExtraTreeItems.Yeast.get(1)); } - public BrewedGrainRecipe(Alcohol output, int grainOreId, @Nullable Integer ingredientOreId, @Nullable ItemStack specificYeast) { + public BrewedGrainRecipe(Alcohol output, int grainOreId, @Nullable Integer ingredientOreId, ItemStack specificYeast) { this.output = output.get(Fluid.BUCKET_VOLUME); this.grainOreId = grainOreId; this.ingredientOreId = ingredientOreId; - if (specificYeast != null) { - this.yeast = specificYeast; - } else { - this.yeast = ExtraTreeItems.Yeast.get(1); - } + this.yeast = specificYeast; } @Override @@ -72,8 +68,8 @@ public class BrewedGrainRecipe implements IBreweryRecipe { } @Override - public boolean isIngredient(@Nullable ItemStack itemstack) { - if (itemstack == null) { + public boolean isIngredient(ItemStack itemstack) { + if (itemstack.isEmpty()) { return ingredientOreId == null; } return ingredientOreId != null && OreDictionaryUtil.hasOreId(itemstack, ingredientOreId); diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java index 180ad67b..5fe146d7 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java @@ -1,6 +1,5 @@ package binnie.extratrees.machines.brewery; -import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -12,12 +11,10 @@ public class BreweryCrafting implements INbtWritable { @Nullable public FluidStack inputFluid; public ItemStack[] inputGrains; - @Nullable public ItemStack ingredient; - @Nullable public ItemStack yeast; - public BreweryCrafting(@Nullable final FluidStack inputFluid, @Nullable final ItemStack ingredient, @Nullable final ItemStack[] inputGrains, final @Nullable ItemStack yeast) { + public BreweryCrafting(@Nullable final FluidStack inputFluid, final ItemStack ingredient, @Nullable final ItemStack[] inputGrains, final ItemStack yeast) { this.inputFluid = inputFluid; this.inputGrains = ((inputGrains == null) ? new ItemStack[3] : inputGrains); this.ingredient = ingredient; @@ -51,8 +48,8 @@ public class BreweryCrafting implements INbtWritable { return nbt; } - private NBTTagCompound getNBT(@Nullable final ItemStack ingr) { - if (ingr == null) { + private NBTTagCompound getNBT(final ItemStack ingr) { + if (ingr.isEmpty()) { return new NBTTagCompound(); } final NBTTagCompound nbt = new NBTTagCompound(); diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java index c5ae1e74..afbffc89 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java @@ -5,6 +5,7 @@ import binnie.core.machines.network.INetwork; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; +import com.google.common.base.Preconditions; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -66,6 +67,7 @@ public class BreweryLogic extends ComponentProcessSetCost implements IProcess, I @Override protected void onFinishTask() { + Preconditions.checkState(this.currentCrafting != null); FluidStack output = BreweryRecipes.getOutput(this.currentCrafting); if (output != null) { this.getUtil().fillTank(BreweryMachine.TANK_OUTPUT, output); diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java index 81822b3a..390bfbd8 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java @@ -15,17 +15,13 @@ public class BreweryRecipe implements IBreweryRecipe { private final ItemStack yeast; public BreweryRecipe(final FluidStack input, final FluidStack output) { - this(input, output, null); + this(input, output, ExtraTreeItems.Yeast.get(1)); } - public BreweryRecipe(final FluidStack input, final FluidStack output, @Nullable final ItemStack specificYeast) { + public BreweryRecipe(final FluidStack input, final FluidStack output, final ItemStack specificYeast) { this.input = input; this.output = output; - if (specificYeast != null) { - this.yeast = specificYeast; - } else { - this.yeast = ExtraTreeItems.Yeast.get(1); - } + this.yeast = specificYeast; } @Override diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java index 5136a93d..1419a5ca 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java @@ -40,7 +40,7 @@ public class BreweryRecipes { @Nullable public static FluidStack getOutput(final FluidStack stack) { - final BreweryCrafting crafting = new BreweryCrafting(stack, null, null, null); + final BreweryCrafting crafting = new BreweryCrafting(stack, ItemStack.EMPTY, null, ItemStack.EMPTY); for (final IBreweryRecipe recipe : recipes) { FluidStack output = recipe.getOutput(crafting); if (output != null) { @@ -52,7 +52,7 @@ public class BreweryRecipes { @Nullable public static FluidStack getOutput(final BreweryCrafting crafting) { - if (crafting.inputFluid != null && crafting.yeast != null) { + if (crafting.inputFluid != null && !crafting.yeast.isEmpty()) { for (final IBreweryRecipe recipe : recipes) { FluidStack output = recipe.getOutput(crafting); if (output != null) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java index f11735e2..5aa453f5 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java @@ -17,6 +17,8 @@ import binnie.extratrees.machines.distillery.DistilleryLogic; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlDistilleryProgress extends ControlProgressBase { public static final Texture DISTILLERY_BASE = new StandardTexture(43, 0, 58, 66, ExtraTreeTexture.Gui); @@ -41,6 +43,7 @@ public class ControlDistilleryProgress extends ControlProgressBase { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { DistilleryLogic distilleryLogic = Machine.getInterface(DistilleryLogic.class, Window.get(this).getInventory()); if (distilleryLogic != null) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java index df2588dc..6d6a0f8b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java @@ -20,6 +20,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlFruitPressProgress extends ControlProgressBase { private static final Texture PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.Gui); @@ -35,7 +37,7 @@ public class ControlFruitPressProgress extends ControlProgressBase { return; } final ItemStack input = slotFromInventory.getStack(); - if (input == null || FruitPressRecipes.getOutput(input) == null) { + if (input.isEmpty() || FruitPressRecipes.getOutput(input) == null) { return; } FluidStack fluid = FruitPressRecipes.getOutput(input); @@ -44,6 +46,7 @@ public class ControlFruitPressProgress extends ControlProgressBase { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { GlStateManager.enableBlend(); CraftGUI.render.texture(ControlFruitPressProgress.PressTexture, new IPoint(0, Math.round(16 * this.progress))); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java index fd67f336..b5f7c99b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java @@ -17,6 +17,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; public class ControlLumbermillProgress extends ControlProgressBase { @@ -35,12 +37,13 @@ public class ControlLumbermillProgress extends ControlProgressBase { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { GlStateManager.disableLighting(); final int sawX = (int) (63 * this.progress); CraftGUI.render.texture(ControlLumbermillProgress.Saw, new IPoint(sawX, -8 + Math.round(6 * (float) Math.sin(this.animation)))); final ItemStack item = Window.get(this).getInventory().getStackInSlot(LumbermillMachine.SLOT_LOG); - if (item == null) { + if (item.isEmpty()) { return; } GlStateManager.disableLighting(); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java index 3011e30b..ae5f8852 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java @@ -31,12 +31,11 @@ public class ControlRecipeSlot extends ControlSlotBase { } @Override - @Nullable public ItemStack getItemStack() { final IComponentRecipe recipe = Machine.getInterface(IComponentRecipe.class, Window.get(this).getInventory()); if (recipe != null && recipe.isRecipe()) { return recipe.getProduct(); } - return null; + return ItemStack.EMPTY; } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index 81ad90f4..d1cbd53b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -24,6 +24,8 @@ import binnie.extratrees.carpentry.EnumDesign; import binnie.extratrees.machines.Designer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.HashMap; @@ -62,6 +64,7 @@ public class ControlTileSelect extends Control implements IControlValue } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { super.onUpdateClient(); final TileEntityMachine tile = (TileEntityMachine) Window.get(this).getInventory(); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java index eec58b39..5662b3e1 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java @@ -36,15 +36,15 @@ public class PagePlanksOverview extends PageAbstract { final ItemStack fence = WoodManager.getFence(type, new FenceType(0), 1); final ItemStack gate = WoodManager.getGate(type); final ItemStack door = WoodManager.getDoor(type, DoorType.Standard); - if (fence != null) { + if (!fence.isEmpty()) { new ControlItemDisplay(this, x, 48).setItemStack(fence); x += 22; } - if (gate != null) { + if (!gate.isEmpty()) { new ControlItemDisplay(this, x, 48).setItemStack(gate); x += 22; } - if (door != null) { + if (!door.isEmpty()) { new ControlItemDisplay(this, x, 48).setItemStack(door); x += 22; } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index 0838aa78..8d66d1d4 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -39,9 +39,6 @@ public class PageSpeciesTreeGenome extends PageSpecies { return; } final ITree tree = Binnie.GENETICS.getTreeRoot().templateAsIndividual(template); - if (tree == null) { - return; - } final ITreeGenome genome = tree.getGenome(); final IAlleleTreeSpecies treeSpecies = genome.getPrimary(); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java index e2aab86f..b377bfb6 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java @@ -16,6 +16,7 @@ import binnie.extratrees.machines.fruitpress.FruitPressLogic; import binnie.extratrees.machines.fruitpress.FruitPressMachine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; @@ -65,7 +66,7 @@ public class WindowPress extends Window { logic.alterProgress(2.0f); } else if (name.equals("clear-fruit")) { logic.setProgress(0.0f); - this.getInventory().setInventorySlotContents(FruitPressMachine.SLOT_CURRENT, null); + this.getInventory().setInventorySlotContents(FruitPressMachine.SLOT_CURRENT, ItemStack.EMPTY); } } } diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java index c5884156..b118018d 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.tuple.Pair; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collection; import java.util.Map; @@ -16,13 +15,13 @@ public class FruitPressRecipes { // Map> private static Multimap> pressRecipes = ArrayListMultimap.create(); - public static boolean isInput(@Nullable final ItemStack itemstack) { + public static boolean isInput(final ItemStack itemstack) { return getOutput(itemstack) != null; } @Nullable - public static FluidStack getOutput(@Nullable final ItemStack itemstack) { - if (itemstack == null) { + public static FluidStack getOutput(final ItemStack itemstack) { + if (itemstack.isEmpty()) { return null; } diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java index 306caff7..78a83aa6 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java @@ -19,7 +19,7 @@ public class LumbermillLogic extends ComponentProcessSetCost implements IProcess @Override public ErrorState canWork() { ItemStack logStack = this.getUtil().getStack(LumbermillMachine.SLOT_LOG); - if (logStack == null) { + if (logStack.isEmpty()) { return new ErrorState.NoItem("No Wood", LumbermillMachine.SLOT_LOG); } final ItemStack plankResult = LumbermillRecipes.getPlankProduct(logStack); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java index aacdcda0..8e7a6806 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java @@ -26,7 +26,6 @@ public class LumbermillRecipes { // Map> private static Multimap> recipes = ArrayListMultimap.create(); - @Nullable public static ItemStack getPlankProduct(final ItemStack logStack) { if (recipes.isEmpty()) { calculateLumbermillProducts(); @@ -38,7 +37,7 @@ public class LumbermillRecipes { return entry.getValue().copy(); } } - return null; + return ItemStack.EMPTY; } public static Collection> getRecipes() { @@ -66,7 +65,7 @@ public class LumbermillRecipes { try { ItemStack recipeOutput = craftingManager.findMatchingRecipe(fakeCraftingInventory, FakeCraftingWorld.getInstance()); - if (recipeOutput != null) { + if (!recipeOutput.isEmpty()) { if (OreDictionaryUtil.hasOreId(recipeOutput, plankOreId)) { Item logItem = logCopy.getItem(); ItemStack outputCopy = recipeOutput.copy(); diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index ce0e8d7c..c565a06b 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -18,7 +18,10 @@ import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ProxyClient extends Proxy implements IExtraTreeProxy { public static ModelManager modelManager = new ModelManager(Constants.EXTRA_TREES_MOD_ID); diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index e23f60f1..06fcb803 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -27,6 +27,7 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import javax.annotation.Nonnull; +import javax.annotation.Nullable; @Mod(modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class Genetics extends AbstractMod { @@ -38,6 +39,7 @@ public class Genetics extends AbstractMod { public static Proxy proxy; public static String channel = "GEN"; + @Nullable private static Item itemGenetics; public static ItemSerum itemSerum; public static ItemSequence itemSequencer; diff --git a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java index 085f0d14..da0bd9fb 100644 --- a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java +++ b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java @@ -26,6 +26,5 @@ public interface IIncubatorRecipe { ItemStack getInputStack(); - @Nullable ItemStack getExpectedOutput(); } diff --git a/src/main/java/binnie/genetics/core/GeneticsTexture.java b/src/main/java/binnie/genetics/core/GeneticsTexture.java index c1d1b686..5ab3eb96 100644 --- a/src/main/java/binnie/genetics/core/GeneticsTexture.java +++ b/src/main/java/binnie/genetics/core/GeneticsTexture.java @@ -6,6 +6,8 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; import binnie.genetics.Genetics; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum GeneticsTexture implements IBinnieTexture { GeneticMachine(ResourceType.Tile, "GeneticMachine"), @@ -34,6 +36,7 @@ public enum GeneticsTexture implements IBinnieTexture { } @Override + @SideOnly(Side.CLIENT) public BinnieResource getTexture() { return Binnie.RESOURCE.getPNG(Genetics.instance, this.type, this.texture); } diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index b8ef91ef..36a11bcc 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -12,8 +12,8 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nullable; public class Engineering { - public static boolean isGeneAcceptor(@Nullable final ItemStack stack) { - if (stack == null) { + public static boolean isGeneAcceptor(final ItemStack stack) { + if (stack.isEmpty()) { return false; } if (stack.getItem() instanceof IItemSerum) { @@ -53,8 +53,8 @@ public class Engineering { return stack; } - public static IGene[] getGenes(@Nullable final ItemStack serum) { - if (serum != null) { + public static IGene[] getGenes(final ItemStack serum) { + if (!serum.isEmpty()) { if (serum.getItem() instanceof IItemSerum) { return ((IItemSerum) serum.getItem()).getGenes(serum); } diff --git a/src/main/java/binnie/genetics/genetics/GeneTracker.java b/src/main/java/binnie/genetics/genetics/GeneTracker.java index 2359cbb3..9f599b68 100644 --- a/src/main/java/binnie/genetics/genetics/GeneTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneTracker.java @@ -71,9 +71,11 @@ public class GeneTracker extends WorldSavedData { for (int i = 0; i < nbtChromo.tagCount(); ++i) { final String uid = nbtChromo.getStringTagAt(i); final IAllele allele = AlleleManager.alleleRegistry.getAllele(uid); - final Gene gene = new Gene(allele, chromo, root); - if (allele != null && !this.discoveredGenes.contains(gene)) { - this.discoveredGenes.add(gene); + if (allele != null) { + final Gene gene = new Gene(allele, chromo, root); + if (!this.discoveredGenes.contains(gene)) { + this.discoveredGenes.add(gene); + } } } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index 44cd4270..c8345c77 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -131,7 +131,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { int dx = 0; int dy = 0; for (final IAlleleSpecies species : options) { - final IIndividual ind = system.getSpeciesRoot().templateAsIndividual(system.getSpeciesRoot().getTemplate(species.getUID())); + final IIndividual ind = system.getSpeciesRoot().templateAsIndividual(system.getSpeciesRoot().getTemplate(species)); new ControlIndividualDisplay(this, biomeListX + dx, 2 + dy, ind) { @Override public void initialise() { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index a2d0c770..2002f5c3 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -18,12 +18,12 @@ public class AnalystPageDescription extends ControlAnalystPage { this.setColour(3355443); int y = 4; final IAlleleSpecies species = ind.getGenome().getPrimary(); - final String branchBinomial = (species.getBranch() != null) ? species.getBranch().getScientific() : ""; - final String branchName = (species.getBranch() != null) ? species.getBranch().getName() : "Unknown"; + final String branchBinomial = species.getBranch().getScientific(); + final String branchName = species.getBranch().getName(); final String desc = species.getDescription(); String descBody = "§o"; String descSig = ""; - if (desc == null || Objects.equals(desc, "") || desc.contains("for.description")) { + if (Objects.equals(desc, "") || desc.contains("for.description")) { descBody += ""; } else { final String[] descStrings = desc.split("\\|"); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index 6d329b13..a53ceeab 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -16,6 +16,8 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.client.renderer.GlStateManager; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class AnalystPageGenome extends ControlAnalystPage { boolean active; @@ -27,10 +29,11 @@ public class AnalystPageGenome extends ControlAnalystPage { int y = 4; new ControlTextCentered(this, y, "§n" + this.getTitle()).setColour(this.getColour()); y += 16; - final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind.getClass()); + final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind); final BreedingSystem system = Binnie.GENETICS.getSystem(root); final Control scaled = new Control(this, 0, y, 0, 0) { @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { GlStateManager.pushMatrix(); GlStateManager.translate(10.0f, -15.0f, 0.0f); @@ -38,6 +41,7 @@ public class AnalystPageGenome extends ControlAnalystPage { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { GlStateManager.popMatrix(); } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java index 46a13469..fb9dab81 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java @@ -18,7 +18,7 @@ public class AnalystPageKaryogram extends ControlAnalystPage { new ControlTextCentered(this, y, "§nKaryogram").setColour(this.getColour()); y += 16; y += 8; - final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind.getClass()); + final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind); final BreedingSystem system = Binnie.GENETICS.getSystem(root); final int maxBiomePerLine = (int) ((this.w() + 4.0f - 16.0f) / 22.0f); int karygramX = (this.w() - (Math.min(maxBiomePerLine, system.getActiveKaryotype().size()) * 18 - 4)) / 2; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java index f3e2d84f..7f8b68f9 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java @@ -17,6 +17,7 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -43,7 +44,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { final List products = new ArrayList<>(); for (final ICentrifugeRecipe recipe : RecipeManagers.centrifugeManager.recipes()) { boolean isRecipe = false; - if (recipe.getInput() != null && stack.isItemEqual(recipe.getInput())) { + if (stack.isItemEqual(recipe.getInput())) { isRecipe = true; } if (isRecipe) { @@ -57,8 +58,8 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { return products; } - public Collection getSqueezer(final ItemStack stack) { - final List products = new ArrayList<>(); + public NonNullList getSqueezer(final ItemStack stack) { + final NonNullList products = NonNullList.create(); for (ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { boolean isRecipe = false; for (final Object obj : recipe.getResources()) { @@ -67,7 +68,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { } } if (isRecipe) { - if (recipe.getRemnants() != null) { + if (!recipe.getRemnants().isEmpty()) { products.add(recipe.getRemnants()); } } @@ -138,9 +139,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { } } if (isRecipe) { - if (recipe.getFluidOutput() != null) { - products.add(recipe.getFluidOutput()); - } + products.add(recipe.getFluidOutput()); } } return products; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/AnalystPageWood.java index 4eb96c35..8a115ee6 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageWood.java @@ -33,7 +33,7 @@ public class AnalystPageWood extends AnalystPageProduce { final IAlleleTreeSpecies treeSpecies = genome.getPrimary(); final ItemStack stackWood = treeSpecies.getWoodProvider().getWoodStack(); - if (stackWood != null) { + if (!stackWood.isEmpty()) { products.add(stackWood); } // for (final ItemStack stack : diff --git a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java b/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java index 56c93454..8c572df1 100644 --- a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java +++ b/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java @@ -25,7 +25,7 @@ public class ControlIndividualDisplay extends ControlItemDisplay implements IToo @Override public void getTooltip(final Tooltip tooltip) { final ItemStack stack = this.getItemStack(); - if (stack == null) { + if (stack.isEmpty()) { return; } final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index f22d1d98..38d45b16 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -44,32 +44,38 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; public class WindowAnalyst extends Window { + @Nullable IWidget baseWidget; ControlScrollableContent leftPage; ControlScrollableContent rightPage; + @Nullable Control tabBar; Panel analystPanel; List analystPages; + @Nullable IArea analystPageSize; boolean isDatabase; boolean isMaster; boolean lockedSearch; private Control analystNone; private ControlSlide slideUpInv; + @Nullable IIndividual current; + @Nullable BreedingSystem currentSystem; public static GeneticsGUI.WindowFactory create(final boolean database, final boolean master) { return (player, inventory, side) -> new WindowAnalyst(player, inventory, side, database, master); } - public WindowAnalyst(final EntityPlayer player, final IInventory inventory, final Side side, final boolean database, final boolean master) { + public WindowAnalyst(final EntityPlayer player, @Nullable final IInventory inventory, final Side side, final boolean database, final boolean master) { super(312, 230, player, inventory, side); this.baseWidget = null; this.tabBar = null; @@ -151,6 +157,7 @@ public class WindowAnalyst extends Window { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.setColour(syst.getColour()); final int outset = (WindowAnalyst.this.getSystem() == syst) ? 1 : 0; @@ -174,6 +181,7 @@ public class WindowAnalyst extends Window { this.tabBar = new Control(this, x, 28, this.w() - 16 - x, 20); this.analystPanel = new Panel(this, 16, 54, 280, 164, MinecraftGUI.PanelType.Outline) { @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawGradientRect(this.getArea(), 1157627903, 1728053247); super.onRenderBackground(guiWidth, guiHeight); @@ -185,6 +193,7 @@ public class WindowAnalyst extends Window { final int sectionWidth = (this.w() - 8 - 4) / 2; WindowAnalyst.this.leftPage = new ControlScrollableContent(this, 3, 3, sectionWidth + 2, this.h() - 8 + 2, 0) { @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { if (this.getContent() == null) { return; @@ -195,6 +204,7 @@ public class WindowAnalyst extends Window { }; new ControlScrollBar(this, sectionWidth + 2 - 3, 6, 3, this.h() - 8 + 2 - 6, WindowAnalyst.this.leftPage) { @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { if (!this.isEnabled()) { return; @@ -208,6 +218,7 @@ public class WindowAnalyst extends Window { }; WindowAnalyst.this.rightPage = new ControlScrollableContent(this, 3 + sectionWidth + 4, 3, sectionWidth + 2, this.h() - 8 + 2, 0) { @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { if (this.getContent() == null) { return; @@ -218,6 +229,7 @@ public class WindowAnalyst extends Window { }; new ControlScrollBar(this, sectionWidth + 2 - 3 + sectionWidth + 4, 6, 3, this.h() - 8 + 2 - 6, WindowAnalyst.this.rightPage) { @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { if (!this.isEnabled()) { return; @@ -380,6 +392,7 @@ public class WindowAnalyst extends Window { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { final boolean active = this.value == WindowAnalyst.this.leftPage.getContent() || this.value == WindowAnalyst.this.rightPage.getContent(); RenderUtil.setColour((active ? -16777216 : 1140850688) + this.value.getColour()); @@ -437,7 +450,7 @@ public class WindowAnalyst extends Window { } } - public void setPage(final ControlScrollableContent side, final ControlAnalystPage page) { + public void setPage(final ControlScrollableContent side, @Nullable final ControlAnalystPage page) { final ControlAnalystPage existingPage = (ControlAnalystPage) side.getContent(); if (existingPage != null) { existingPage.hide(); @@ -469,7 +482,7 @@ public class WindowAnalyst extends Window { } } - public void setStack(@Nullable final ItemStack stack) { + public void setStack(final ItemStack stack) { final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); this.setIndividual(ind); } diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index 502e66fb..650fffa6 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -122,7 +122,9 @@ public class GeneticsJeiPlugin extends BlankModPlugin { boolean fullyCharged = (itemChargeable.getCharges(itemStack) == itemChargeable.getMaxCharges(itemStack)); String info = fullyCharged ? "charged" : "uncharged"; ISpeciesRoot root = itemChargeable.getSpeciesRoot(itemStack); - return info + ":" + root.getUID(); + if (root != null) { + return info + ":" + root.getUID(); + } } return null; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java index 2be448f1..a7f5a974 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java @@ -6,6 +6,8 @@ import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.awt.*; @@ -19,16 +21,20 @@ public class IncubatorRecipeWrapper extends BlankRecipeWrapper { @Override public void getIngredients(IIngredients ingredients) { ingredients.setInput(FluidStack.class, recipe.getInput()); - ingredients.setOutput(FluidStack.class, recipe.getOutput()); + FluidStack fluidOutput = recipe.getOutput(); + if (fluidOutput != null) { + ingredients.setOutput(FluidStack.class, fluidOutput); + } ingredients.setInput(ItemStack.class, recipe.getInputStack()); ItemStack output = recipe.getExpectedOutput(); - if (output != null) { + if (!output.isEmpty()) { ingredients.setOutput(ItemStack.class, output); } } @Override + @SideOnly(Side.CLIENT) public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { float loss = recipe.getLossChance(); if (loss > 0) { diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java index 2a0335ae..372c7a40 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java @@ -26,9 +26,11 @@ public class LarvaeIncubatorRecipeMaker { for (ItemStack larvae : subtypes) { IncubatorRecipe recipe = new IncubatorRecipe(larvae, recipeLarvae.getInput(), recipeLarvae.getOutput(), recipeLarvae.getLossChance(), recipeLarvae.getChance()); final IBee bee = Binnie.GENETICS.getBeeRoot().getMember(larvae); - ItemStack drone = Binnie.GENETICS.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); - recipe.setOutputStack(drone); - recipes.add(new LarvaeIncubatorRecipeWrapper(recipe)); + if (bee != null) { + ItemStack drone = Binnie.GENETICS.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); + recipe.setOutputStack(drone); + recipes.add(new LarvaeIncubatorRecipeWrapper(recipe)); + } } return recipes; diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java index 6f47849d..2c71f4f8 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java @@ -84,36 +84,40 @@ public class InoculatorRecipeCategory extends BlankRecipeCategory focus = recipeLayout.getFocus(); - Object focusValue = focus.getValue(); - if (focusValue instanceof ItemStack) { - ItemStack focusStack = (ItemStack) focusValue; - if (AlleleManager.alleleRegistry.isIndividual(focusStack)) { - if (focus.getMode() == IFocus.Mode.INPUT) { - ItemStack serum = recipeWrapper.getInputSerum(); - ItemStack output = InoculatorLogic.applySerum(focusStack, serum); - itemStacks.set(0, serum); - itemStacks.set(1, focusStack); + if (focus != null) { + Object focusValue = focus.getValue(); + if (focusValue instanceof ItemStack) { + ItemStack focusStack = (ItemStack) focusValue; + if (AlleleManager.alleleRegistry.isIndividual(focusStack)) { + if (focus.getMode() == IFocus.Mode.INPUT) { + ItemStack serum = recipeWrapper.getInputSerum(); + ItemStack output = InoculatorLogic.applySerum(focusStack, serum); + itemStacks.set(0, serum); + itemStacks.set(1, focusStack); + itemStacks.set(2, output); + return; + } else if (focus.getMode() == IFocus.Mode.OUTPUT) { + IIndividual individual = AlleleManager.alleleRegistry.getIndividual(focusStack); + if (individual != null) { + ISpeciesRoot speciesRoot = individual.getGenome().getSpeciesRoot(); + IAlleleSpecies species = individual.getGenome().getPrimary(); + ItemStack serum = ItemSerum.create(new Gene(species, speciesRoot.getSpeciesChromosomeType(), speciesRoot)); + serum.setItemDamage(0); // set fully charged + + itemStacks.set(0, serum); + itemStacks.set(1, recipeWrapper.getWildcardTarget()); + itemStacks.set(2, focusStack); + return; + } + } + } else if (focusStack.getItem() instanceof ItemSerum) { + ItemStack input = recipeWrapper.getWildcardTarget(); + ItemStack output = InoculatorLogic.applySerum(input, focusStack); + itemStacks.set(0, focusStack); + itemStacks.set(1, input); itemStacks.set(2, output); return; - } else if (focus.getMode() == IFocus.Mode.OUTPUT) { - IIndividual individual = AlleleManager.alleleRegistry.getIndividual(focusStack); - ISpeciesRoot speciesRoot = individual.getGenome().getSpeciesRoot(); - IAlleleSpecies species = individual.getGenome().getPrimary(); - ItemStack serum = ItemSerum.create(new Gene(species, speciesRoot.getSpeciesChromosomeType(), speciesRoot)); - serum.setItemDamage(0); // set fully charged - - itemStacks.set(0, serum); - itemStacks.set(1, recipeWrapper.getWildcardTarget()); - itemStacks.set(2, focusStack); - return; } - } else if (focusStack.getItem() instanceof ItemSerum) { - ItemStack input = recipeWrapper.getWildcardTarget(); - ItemStack output = InoculatorLogic.applySerum(input, focusStack); - itemStacks.set(0, focusStack); - itemStacks.set(1, input); - itemStacks.set(2, output); - return; } } diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java index 708d9706..0d9d2939 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java @@ -8,7 +8,10 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.time.DurationFormatUtils; import javax.annotation.Nullable; @@ -55,6 +58,7 @@ public class InoculatorRecipeWrapper extends BlankRecipeWrapper { } @Override + @SideOnly(Side.CLIENT) public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { if (currentIngredients == null) { return; @@ -84,8 +88,7 @@ public class InoculatorRecipeWrapper extends BlankRecipeWrapper { processTicks = InoculatorLogic.getProcessLength(inputSerum); } - // todo: 1.11 use MinecraftForgeClient#getLocale() for integer formatting - NumberFormat decimalFormat = NumberFormat.getIntegerInstance(); + NumberFormat decimalFormat = NumberFormat.getIntegerInstance(MinecraftForgeClient.getLocale()); String powerString = decimalFormat.format(power) + " RF"; int xPower = 15 + (recipeWidth - minecraft.fontRendererObj.getStringWidth(powerString)) / 2; minecraft.fontRendererObj.drawString(powerString, xPower, 5, Color.gray.getRGB()); diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 4a96668a..f786a815 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -76,6 +76,7 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar @Override public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { final IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows"); + Preconditions.checkNotNull(species); itemList.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.GENETICS.getBeeRoot()), false)); } diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index ed49cdb5..3a135f88 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -94,7 +94,7 @@ public class ItemSerum extends ItemGene implements IItemSerum { @Override public String getItemStackDisplayName(final ItemStack itemstack) { final GeneItem gene = this.getGeneItem(itemstack); - if (gene != null) { + if (gene != null && gene.getSpeciesRoot() != null) { BreedingSystem system = Binnie.GENETICS.getSystem(gene.getSpeciesRoot()); return system.getDescriptor() + " " + Binnie.LANGUAGE.localise("genetic.item.gene.serum"); } else { diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 67841cdd..5ada60e1 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -95,9 +95,7 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { final IChromosome c = template.getGenome().getChromosomes()[type.ordinal()]; if (c != null) { final IAllele active = c.getActiveAllele(); - if (active != null) { - item.addGene(new Gene(active, type, root)); - } + item.addGene(new Gene(active, type, root)); } } final ItemStack array = new ItemStack(this); diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 7f686762..2537589c 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -83,67 +83,65 @@ public class ModuleItem implements IInitializable { @Override public void postInit() { Item itemGenetics = Genetics.getItemGenetics(); - if (itemGenetics != null) { - GameRegistry.addShapelessRecipe(GeneticsItems.DNADye.get(8), - Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5)); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.LaboratoryCasing.get(itemGenetics, 1), - "iii", "iYi", "iii", - 'i', "ingotIron", 'Y', Mods.Forestry.item("sturdyMachine"))); - GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.DNADye.get(itemGenetics, 2), - "dyePurple", "dyeMagenta", "dyePink")); - GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.FluorescentDye.get(itemGenetics, 2), - "dyeOrange", "dyeYellow", "dustGlowstone")); - GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.GrowthMedium.get(itemGenetics, 2), - new ItemStack(Items.DYE, 1, 15), Items.SUGAR)); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySequencer.get(itemGenetics, 1), - " p ", "iGi", " p ", - 'i', "ingotGold", 'G', Blocks.GLASS_PANE, 'p', Items.PAPER)); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySerum.get(itemGenetics, 1), - " g ", " G ", "GGG", - 'g', "ingotGold", 'G', Blocks.GLASS_PANE)); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptyGenome.get(itemGenetics, 1), - "sss", "sss", "sss", - 's', GeneticsItems.EmptySerum.get(itemGenetics, 1))); - GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.CYLINDER.get(8), - " g ", "g g", " ", - 'g', Blocks.GLASS_PANE)); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), - "l g", " c ", "g l", - 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone")); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), - "g l", " c ", "l g", - 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone")); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCasing.get(itemGenetics, 1), - "ccc", "cdc", "ccc", - 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', GeneticsItems.LaboratoryCasing.get(itemGenetics, 1))); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCPU.get(itemGenetics, 1), - "ccc", "cdc", "ccc", - 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', Items.DIAMOND)); + GameRegistry.addShapelessRecipe(GeneticsItems.DNADye.get(8), + Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5)); + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.LaboratoryCasing.get(itemGenetics, 1), + "iii", "iYi", "iii", + 'i', "ingotIron", 'Y', Mods.Forestry.item("sturdy_machine"))); + GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.DNADye.get(itemGenetics, 2), + "dyePurple", "dyeMagenta", "dyePink")); + GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.FluorescentDye.get(itemGenetics, 2), + "dyeOrange", "dyeYellow", "dustGlowstone")); + GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.GrowthMedium.get(itemGenetics, 2), + new ItemStack(Items.DYE, 1, 15), Items.SUGAR)); + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySequencer.get(itemGenetics, 1), + " p ", "iGi", " p ", + 'i', "ingotGold", 'G', Blocks.GLASS_PANE, 'p', Items.PAPER)); + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySerum.get(itemGenetics, 1), + " g ", " G ", "GGG", + 'g', "ingotGold", 'G', Blocks.GLASS_PANE)); + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptyGenome.get(itemGenetics, 1), + "sss", "sss", "sss", + 's', GeneticsItems.EmptySerum.get(itemGenetics, 1))); + GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.CYLINDER.get(8), + " g ", "g g", " ", + 'g', Blocks.GLASS_PANE)); + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), + "l g", " c ", "g l", + 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone")); + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), + "g l", " c ", "l g", + 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone")); + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCasing.get(itemGenetics, 1), + "ccc", "cdc", "ccc", + 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', GeneticsItems.LaboratoryCasing.get(itemGenetics, 1))); + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCPU.get(itemGenetics, 1), + "ccc", "cdc", "ccc", + 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', Items.DIAMOND)); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, - new ItemStack(Genetics.database), - "X#X", "YEY", "RDR", - '#', Blocks.GLASS_PANE, 'X', Items.DIAMOND, 'Y', Items.DIAMOND, 'R', Items.REDSTONE, 'D', Items.ENDER_EYE, 'E', Blocks.OBSIDIAN); - GameRegistry.addSmelting(Genetics.itemSequencer, GeneticsItems.EmptySequencer.get(itemGenetics, 1), 0.0f); - GameRegistry.addSmelting(Genetics.itemSerum, GeneticsItems.EmptySerum.get(itemGenetics, 1), 0.0f); - GameRegistry.addSmelting(Genetics.itemSerumArray, GeneticsItems.EmptyGenome.get(itemGenetics, 1), 0.0f); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, + new ItemStack(Genetics.database), + "X#X", "YEY", "RDR", + '#', Blocks.GLASS_PANE, 'X', Items.DIAMOND, 'Y', Items.DIAMOND, 'R', Items.REDSTONE, 'D', Items.ENDER_EYE, 'E', Blocks.OBSIDIAN); + GameRegistry.addSmelting(Genetics.itemSequencer, GeneticsItems.EmptySequencer.get(itemGenetics, 1), 0.0f); + GameRegistry.addSmelting(Genetics.itemSerum, GeneticsItems.EmptySerum.get(itemGenetics, 1), 0.0f); + GameRegistry.addSmelting(Genetics.itemSerumArray, GeneticsItems.EmptyGenome.get(itemGenetics, 1), 0.0f); - GameRegistry.addShapedRecipe(new ItemStack(Genetics.analyst), - " c ", "cac", " d ", - 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), - 'a', Mods.Forestry.item("portableAlyzer"), - 'd', new ItemStack(Items.DIAMOND)); + GameRegistry.addShapedRecipe(new ItemStack(Genetics.analyst), + " c ", "cac", " d ", + 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), + 'a', Mods.Forestry.item("portable_alyzer"), + 'd', new ItemStack(Items.DIAMOND)); - final Item[] dbs = {ExtraBees.dictionary, ExtraTrees.items().itemDictionary, ExtraTrees.items().itemDictionaryLepi, Botany.database}; - if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { - for (final Item a2 : dbs) { - for (final Item b2 : dbs) { - for (final Item c2 : dbs) { - for (final Item d : dbs) { - if (a2 != b2 && a2 != c2 && a2 != d && b2 != c2 && b2 != d && c2 != d) { - GameRegistry.addShapedRecipe(new ItemStack(Genetics.registry), new Object[]{" b ", "fct", " l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', a2, 't', b2, 'f', c2, 'l', d}); - } + final Item[] dbs = {ExtraBees.dictionary, ExtraTrees.items().itemDictionary, ExtraTrees.items().itemDictionaryLepi, Botany.database}; + if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { + for (final Item a2 : dbs) { + for (final Item b2 : dbs) { + for (final Item c2 : dbs) { + for (final Item d : dbs) { + if (a2 != b2 && a2 != c2 && a2 != d && b2 != c2 && b2 != d && c2 != d) { + GameRegistry.addShapedRecipe(new ItemStack(Genetics.registry), " b ", "fct", " l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', a2, 't', b2, 'f', c2, 'l', d); } } } diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index f9f463be..d825ad64 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -84,7 +84,7 @@ public enum LaboratoryMachine implements IMachineType { public NBTTagCompound writeToNBT(final NBTTagCompound nbttagcompound1) { NBTTagCompound nbttagcompound = super.writeToNBT(nbttagcompound1); final NBTTagCompound nbt = new NBTTagCompound(); - if (this.stack != null) { + if (!this.stack.isEmpty()) { this.stack.writeToNBT(nbt); } nbttagcompound.setTag("Item", nbt); @@ -104,7 +104,7 @@ public enum LaboratoryMachine implements IMachineType { @Override public void onDestruction() { super.onDestruction(); - if (this.stack != null) { + if (!this.stack.isEmpty()) { final float f = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; final float f2 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; final float f3 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; @@ -127,7 +127,7 @@ public enum LaboratoryMachine implements IMachineType { // @Override // public void onRightClick(final World world, final EntityPlayer player, final int x, final int y, final int z) { // if (BinnieCore.proxy.isSimulating(world) && player.getHeldItem() != null) { -// if (this.stack != null && player.getHeldItem().getItem() instanceof IToolWrench) { +// if (!this.stack.isEmpty() && player.getHeldItem().getItem() instanceof IToolWrench) { // final float f = 0.7f; // final double d0 = world.rand.nextFloat() * f + (1.0f - f) * 0.5; // final double d2 = world.rand.nextFloat() * f + (1.0f - f) * 0.5; @@ -158,18 +158,18 @@ public enum LaboratoryMachine implements IMachineType { // validSelections.add(Genetics.registry); // validSelections.add(Genetics.masterRegistry); // validSelections.add(BinnieCore.genesis); -// if (this.stack == null && validSelections.contains(player.getHeldItem().getItem())) { +// if (this.stack.isEmpty() && validSelections.contains(player.getHeldItem().getItem())) { // this.stack = player.getHeldItem().copy(); // final ItemStack heldItem = player.getHeldItem(); // heldItem.shrink(1); // world.markBlockForUpdate(x, y, z); // return; // } -// if (this.stack != null && player.getHeldItem().getItem() instanceof IToolWrench) { +// if (!this.stack.isEmpty() && player.getHeldItem().getItem() instanceof IToolWrench) { // this.stack.getItem().onItemRightClick(this.stack, world, player); // } // } -// if (this.stack != null) { +// if (!this.stack.isEmpty()) { // this.stack.getItem().onItemRightClick(this.stack, world, player); // } // } diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index ea1a59d4..94c8fec8 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -42,7 +42,7 @@ public class MachineRendererLab { World world = machine.getWorld(); LaboratoryMachine.ComponentGUIHolder holder = Machine.getInterface(LaboratoryMachine.ComponentGUIHolder.class, machine); Label_0591: { - if (world != null && holder != null && holder.getStack() != null) { + if (world != null && holder != null && !holder.getStack().isEmpty()) { BinnieCore.getBinnieProxy().getMinecraftInstance(); if (Minecraft.isFancyGraphicsEnabled()) { final ItemStack stack = holder.getStack(); @@ -83,9 +83,9 @@ public class MachineRendererLab { break Label_0591; } } - this.dummyEntityItem.setEntityItemStack((ItemStack) null); + this.dummyEntityItem.setEntityItemStack(ItemStack.EMPTY); for (final EntityItem item2 : this.itemSides) { - item2.setEntityItemStack((ItemStack) null); + item2.setEntityItemStack(ItemStack.EMPTY); } } GlStateManager.popMatrix(); diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 543ad306..9de92e71 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -52,7 +52,7 @@ public class ModuleMachine implements IInitializable { final String diamondGear = !OreDictionary.getOres("gearDiamond").isEmpty() ? "gearIron" : "ingotIron"; for (final Object circuit : standardCircuit) { GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Incubator.get(1), "gFg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'F', Blocks.FURNACE, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', ironGear)); - Item alyzer = Mods.Forestry.item("portableAlyzer"); + Item alyzer = Mods.Forestry.item("portable_alyzer"); GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Analyser.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', alyzer, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', GeneticsItems.DNADye.get(1))); GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Genepool.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', "gearBronze", 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', Blocks.GLASS)); GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Acclimatiser.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', Items.LAVA_BUCKET, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', Items.WATER_BUCKET)); diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index b949f85d..236ae324 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -33,7 +33,7 @@ public class Acclimatiser { private static Map humidityItems = new HashMap<>(); @Nullable - private static ToleranceSystem getToleranceSystem(@Nullable final ItemStack stack, final ItemStack acclim) { + private static ToleranceSystem getToleranceSystem(final ItemStack stack, final ItemStack acclim) { final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); if (root != null) { for (final ToleranceSystem system : Acclimatiser.toleranceSystems) { @@ -67,15 +67,15 @@ public class Acclimatiser { return 0.0f; } - public static void addTemperatureItem(@Nullable final ItemStack itemstack, final float amount) { - if (itemstack == null) { + public static void addTemperatureItem(final ItemStack itemstack, final float amount) { + if (itemstack.isEmpty()) { return; } Acclimatiser.temperatureItems.put(itemstack, amount); } - public static void addHumidityItem(@Nullable final ItemStack itemstack, final float amount) { - if (itemstack == null) { + public static void addHumidityItem(final ItemStack itemstack, final float amount) { + if (itemstack.isEmpty()) { return; } Acclimatiser.humidityItems.put(itemstack, amount); @@ -109,8 +109,8 @@ public class Acclimatiser { addHumidityItem(FluidContainerType.CAPSULE.getFilled(FluidRegistry.WATER), 0.75f); } - public static boolean canAcclimatise(@Nullable final ItemStack stack, final List acclimatisers) { - if (stack == null || acclimatisers.isEmpty()) { + public static boolean canAcclimatise(final ItemStack stack, final List acclimatisers) { + if (stack.isEmpty() || acclimatisers.isEmpty()) { return true; } for (final ItemStack acclim : acclimatisers) { diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java index c551f520..08daad63 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java @@ -16,10 +16,10 @@ public class AcclimatiserLogic extends ComponentProcessIndefinate { @Override public ErrorState canWork() { - if (this.getUtil().getStack(Acclimatiser.SLOT_TARGET) == null) { + if (this.getUtil().getStack(Acclimatiser.SLOT_TARGET).isEmpty()) { return new ErrorState.NoItem(Genetics.proxy.localise("machine.labMachine.acclimatiser.errors.no.individual.desc"), Acclimatiser.SLOT_TARGET); } - if (this.getUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER).isEmpty()) { + if (this.getUtil().getNonEmptyStacks(Acclimatiser.SLOT_ACCLIMATISER).isEmpty()) { return new ErrorState.NoItem(Genetics.proxy.localise("machine.labMachine.acclimatiser.errors.no.item.desc"), Acclimatiser.SLOT_ACCLIMATISER); } return super.canWork(); @@ -27,7 +27,7 @@ public class AcclimatiserLogic extends ComponentProcessIndefinate { @Override public ErrorState canProgress() { - if (!Acclimatiser.canAcclimatise(this.getUtil().getStack(Acclimatiser.SLOT_TARGET), this.getUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER))) { + if (!Acclimatiser.canAcclimatise(this.getUtil().getStack(Acclimatiser.SLOT_TARGET), this.getUtil().getNonEmptyStacks(Acclimatiser.SLOT_ACCLIMATISER))) { return new ErrorState.InvalidItem(Genetics.proxy.localise("machine.labMachine.acclimatiser.errors.can.not.acclimatise.desc"), Acclimatiser.SLOT_TARGET); } return super.canProgress(); @@ -49,11 +49,11 @@ public class AcclimatiserLogic extends ComponentProcessIndefinate { protected void attemptAcclimatisation() { final List acclms = new ArrayList<>(); ItemStack target = this.getUtil().getStack(Acclimatiser.SLOT_TARGET); - if (target == null) { + if (target.isEmpty()) { return; } - for (final ItemStack s : this.getUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER)) { + for (final ItemStack s : this.getUtil().getNonEmptyStacks(Acclimatiser.SLOT_ACCLIMATISER)) { if (Acclimatiser.canAcclimatise(target, s)) { acclms.add(s); } @@ -63,7 +63,7 @@ public class AcclimatiserLogic extends ComponentProcessIndefinate { this.getUtil().setStack(Acclimatiser.SLOT_TARGET, acclimed); for (final int i : Acclimatiser.SLOT_ACCLIMATISER) { ItemStack stack = this.getUtil().getStack(i); - if (stack != null && stack.isItemEqual(acc)) { + if (!stack.isEmpty() && stack.isItemEqual(acc)) { this.getUtil().decreaseStack(i, 1); break; } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java index a128fbff..38f62b20 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java @@ -44,7 +44,7 @@ public class PackageAcclimatiser extends GeneticMachine.PackageGeneticBase imple transfer.addStorage(Acclimatiser.SLOT_TARGET, Acclimatiser.SLOT_DRONE, new ComponentInventoryTransfer.Condition() { @Override public boolean fulfilled(final ItemStack stack) { - return !Acclimatiser.canAcclimatise(stack, machine.getMachineUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER)); + return !Acclimatiser.canAcclimatise(stack, machine.getMachineUtil().getNonEmptyStacks(Acclimatiser.SLOT_ACCLIMATISER)); } }); new ComponentPowerReceptor(machine, 5000); diff --git a/src/main/java/binnie/genetics/machine/analyser/Analyser.java b/src/main/java/binnie/genetics/machine/analyser/Analyser.java index 887c7423..1a68de0d 100644 --- a/src/main/java/binnie/genetics/machine/analyser/Analyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/Analyser.java @@ -21,8 +21,8 @@ public class Analyser { return ind != null || stack.getItem() instanceof IItemAnalysable || Binnie.GENETICS.getConversion(stack) != null; } - public static boolean isAnalysed(@Nullable final ItemStack stack) { - if (stack == null) { + public static boolean isAnalysed(final ItemStack stack) { + if (stack.isEmpty()) { return false; } final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); @@ -32,26 +32,24 @@ public class Analyser { return stack.getItem() instanceof IItemAnalysable && ((IItemAnalysable) stack.getItem()).isAnalysed(stack); } - @Nullable - public static ItemStack analyse(@Nullable ItemStack stack) { - if (stack == null) { - return null; - } - final ItemStack conv = Binnie.GENETICS.getConversionStack(stack); - if (conv != null) { - stack = conv; - } - final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); - if (root != null) { - final IIndividual ind = root.getMember(stack); - ind.analyze(); - final NBTTagCompound nbttagcompound = new NBTTagCompound(); - ind.writeToNBT(nbttagcompound); - stack.setTagCompound(nbttagcompound); - return stack; - } - if (stack.getItem() instanceof IItemAnalysable) { - return ((IItemAnalysable) stack.getItem()).analyse(stack); + public static ItemStack analyse(ItemStack stack) { + if (!stack.isEmpty()) { + final ItemStack conv = Binnie.GENETICS.getConversionStack(stack); + if (!conv.isEmpty()) { + stack = conv; + } + final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); + if (root != null) { + final IIndividual ind = root.getMember(stack); + ind.analyze(); + final NBTTagCompound nbttagcompound = new NBTTagCompound(); + ind.writeToNBT(nbttagcompound); + stack.setTagCompound(nbttagcompound); + return stack; + } + if (stack.getItem() instanceof IItemAnalysable) { + return ((IItemAnalysable) stack.getItem()).analyse(stack); + } } return stack; } diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java index 1375e42a..5b8694bc 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java @@ -50,6 +50,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, } @Override + @SideOnly(Side.CLIENT) public void onUpdate() { super.onUpdate(); this.setAlphaF((float) Math.cos(1.57 * this.particleAge / this.particleMaxAge)); @@ -75,7 +76,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, final EntityItem dummyEntityItem = this.dummyEntityItem; dummyEntityItem.setAgeToCreativeDespawnTime(); //++dummyEntityItem.age; this.dummyEntityItem.hoverStart = 0.0f; - if (stack == null) { + if (stack.isEmpty()) { return; } final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); @@ -93,7 +94,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, public void syncToNBT(final NBTTagCompound nbt) { final NBTTagCompound item = new NBTTagCompound(); final ItemStack stack = this.getUtil().getStack(6); - if (stack != null) { + if (!stack.isEmpty()) { stack.writeToNBT(item); nbt.setTag("item", item); } @@ -104,7 +105,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, if (nbt.hasKey("item")) { this.getUtil().setStack(6, new ItemStack(nbt.getCompoundTag("item"))); } else { - this.getUtil().setStack(6, null); + this.getUtil().setStack(6, ItemStack.EMPTY); } } diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index 3055fab6..8e348d14 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -56,7 +56,7 @@ public class ControlGene extends Control implements IControlValue, IToolt } private boolean canFill(final ItemStack stack) { - return stack != null && stack.getCount() == 1 && Engineering.isGeneAcceptor(stack) && Engineering.canAcceptGene(stack, this.getValue()); + return !stack.isEmpty() && stack.getCount() == 1 && Engineering.isGeneAcceptor(stack) && Engineering.canAcceptGene(stack, this.getValue()); } @Override diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlSequencerProgress.java b/src/main/java/binnie/genetics/machine/craftgui/ControlSequencerProgress.java index 9d7755f2..9733c161 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlSequencerProgress.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlSequencerProgress.java @@ -26,7 +26,7 @@ public class ControlSequencerProgress extends ControlProgressBase { public void onUpdateClient() { super.onUpdateClient(); final ItemStack stack = Machine.getMachine(Window.get(this).getInventory()).getMachineUtil().getStack(5); - if (stack == null) { + if (stack.isEmpty()) { this.textControl.setValue(""); } else { final Random rand = new Random(stack.getDisplayName().length()); diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/src/main/java/binnie/genetics/machine/incubator/Incubator.java index 61de337c..b7ba94d5 100644 --- a/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -40,17 +40,21 @@ public class Incubator { Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.DYE, 1, 15), GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaPoly.get(10), 0.1f)); Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.BLAZE_POWDER), GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaVector.get(10), 0.05f)); if (BinnieCore.isApicultureActive()) { - Incubator.RECIPES.add(LARVAE_RECIPE = new IncubatorRecipeLarvae(Mods.Forestry.stack("beeLarvaeGE", 1, OreDictionary.WILDCARD_VALUE), GeneticLiquid.GrowthMedium.get(50), null, 1.0f, 0.05f) { + final ItemStack beeLarvaeWildcard = Mods.Forestry.stack("bee_larvae_ge", 1, OreDictionary.WILDCARD_VALUE); + Incubator.RECIPES.add(LARVAE_RECIPE = new IncubatorRecipeLarvae(beeLarvaeWildcard, GeneticLiquid.GrowthMedium.get(50), null, 1.0f, 0.05f) { @Override public ItemStack getOutputStack(final MachineUtil machine) { final ItemStack larvae = machine.getStack(3); final IBee bee = Binnie.GENETICS.getBeeRoot().getMember(larvae); + if (bee == null) { + return ItemStack.EMPTY; + } return Binnie.GENETICS.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); } @Override public ItemStack getExpectedOutput() { - return Mods.Forestry.stack("beeDroneGE", 1, OreDictionary.WILDCARD_VALUE); + return Mods.Forestry.stack("bee_drone_ge", 1, OreDictionary.WILDCARD_VALUE); } }); } diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java index 53ed07ae..c576aeb8 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java @@ -83,7 +83,7 @@ public class IncubatorLogic extends ComponentProcessIndefinate implements IProce } final FluidStack liquid = this.getUtil().getFluid(Incubator.TANK_INPUT); final ItemStack incubator = this.getUtil().getStack(Incubator.SLOT_INCUBATOR); - if (this.recipe != null && (incubator == null || liquid == null || !this.recipe.isInputLiquid(liquid) || !isStackValid(incubator, recipe))) { + if (this.recipe != null && (incubator.isEmpty() || liquid == null || !this.recipe.isInputLiquid(liquid) || !isStackValid(incubator, recipe))) { this.recipe = null; final ItemStack leftover = new TransferRequest(incubator, this.getInventory()).setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation().transfer(true); this.getUtil().setStack(Incubator.SLOT_INCUBATOR, leftover); @@ -92,7 +92,7 @@ public class IncubatorLogic extends ComponentProcessIndefinate implements IProce if (liquid == null) { return; } - if (incubator != null) { + if (!incubator.isEmpty()) { final IIncubatorRecipe recipe = this.getRecipe(incubator, liquid); if (recipe != null) { this.recipe = recipe; @@ -103,7 +103,7 @@ public class IncubatorLogic extends ComponentProcessIndefinate implements IProce int potentialSlot = 0; for (final int slot : Incubator.SLOT_QUEUE) { final ItemStack stack = this.getUtil().getStack(slot); - if (stack != null) { + if (!stack.isEmpty()) { if (potential == null) { for (final IIncubatorRecipe recipe2 : Incubator.getRecipes()) { final boolean rightLiquid = recipe2.isInputLiquid(liquid); @@ -119,12 +119,12 @@ public class IncubatorLogic extends ComponentProcessIndefinate implements IProce } if (potential != null) { final TransferRequest removal = new TransferRequest(incubator, this.getInventory()).setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation(); - if (removal.transfer(false) == null) { + if (removal.transfer(false).isEmpty()) { this.recipe = potential; } removal.transfer(true); final ItemStack stack2 = this.getUtil().getStack(potentialSlot); - this.getUtil().setStack(potentialSlot, null); + this.getUtil().setStack(potentialSlot, ItemStack.EMPTY); this.getUtil().setStack(Incubator.SLOT_INCUBATOR, stack2); } } diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java index 4d49032c..4c6f10aa 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java @@ -16,7 +16,6 @@ public class IncubatorRecipe implements IIncubatorRecipe { private final ItemStack itemStack; private final float lossChance; private final float tickChance; - @Nullable private ItemStack outputStack; public IncubatorRecipe(ItemStack itemStack, final FluidStack input, @Nullable final FluidStack output, final float lossChance) { @@ -25,6 +24,7 @@ public class IncubatorRecipe implements IIncubatorRecipe { public IncubatorRecipe(ItemStack itemStack, final FluidStack input, @Nullable final FluidStack output, final float lossChance, final float chance) { this.itemStack = itemStack; + this.outputStack = ItemStack.EMPTY; this.input = input; this.output = output; this.lossChance = lossChance; @@ -79,7 +79,7 @@ public class IncubatorRecipe implements IIncubatorRecipe { machine.fillTank(Incubator.TANK_OUTPUT, this.output); } this.outputStack = this.getOutputStack(machine); - if (this.outputStack != null) { + if (!this.outputStack.isEmpty()) { final ItemStack output = this.outputStack.copy(); final TransferRequest product = new TransferRequest(output, machine.getInventory()).setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation(); product.transfer(true); @@ -95,7 +95,6 @@ public class IncubatorRecipe implements IIncubatorRecipe { return this; } - @Nullable protected ItemStack getOutputStack(final MachineUtil util) { return getExpectedOutput(); } @@ -111,11 +110,11 @@ public class IncubatorRecipe implements IIncubatorRecipe { } } final ItemStack outputStack = this.getOutputStack(machine); - if (outputStack != null) { + if (!outputStack.isEmpty()) { final ItemStack output = outputStack.copy(); final TransferRequest product = new TransferRequest(output, machine.getInventory()).setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation(); final ItemStack leftover = product.transfer(false); - return leftover == null; + return leftover.isEmpty(); } return true; } diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java index 68fb6bef..170cd11b 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java @@ -3,8 +3,10 @@ package binnie.genetics.machine.incubator; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nullable; + public class IncubatorRecipeLarvae extends IncubatorRecipe { - public IncubatorRecipeLarvae(ItemStack itemStack, FluidStack input, FluidStack output, float lossChance, float chance) { + public IncubatorRecipeLarvae(ItemStack itemStack, FluidStack input, @Nullable FluidStack output, float lossChance, float chance) { super(itemStack, input, output, lossChance, chance); } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java index 1cb18e36..c2a21c8f 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java @@ -24,7 +24,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic public InoculatorFX(final IMachine machine) { super(machine); - this.dummyEntityItem = new EntityItem(null); + this.dummyEntityItem = new EntityItem(machine.getWorld()); } @SideOnly(Side.CLIENT) @@ -86,7 +86,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic final EntityItem dummyEntityItem = this.dummyEntityItem; dummyEntityItem.setAgeToCreativeDespawnTime(); // ++dummyEntityItem.age; this.dummyEntityItem.hoverStart = 0.0f; - if (stack == null) { + if (stack.isEmpty()) { return; } final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); @@ -104,7 +104,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic public void syncToNBT(final NBTTagCompound nbt) { final NBTTagCompound item = new NBTTagCompound(); final ItemStack stack = this.getUtil().getStack(9); - if (stack != null) { + if (!stack.isEmpty()) { stack.writeToNBT(item); nbt.setTag("item", item); } @@ -115,7 +115,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic if (nbt.hasKey("item")) { this.getUtil().setStack(9, new ItemStack(nbt.getCompoundTag("item"))); } else { - this.getUtil().setStack(9, null); + this.getUtil().setStack(9, ItemStack.EMPTY); } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java index ea6f01cf..be75afa0 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java @@ -11,6 +11,7 @@ import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.Engineering; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -23,16 +24,16 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { public static final int PROCESS_BASE_ENERGY = 600000; public static final int BACTERIA_PER_PROCESS = 15; - public static int getProcessLength(@Nullable ItemStack itemStack) { + public static int getProcessLength(ItemStack itemStack) { return PROCESS_BASE_LENGTH * getNumberOfGenes(itemStack); } - public static int getProcessBaseEnergy(@Nullable ItemStack itemStack) { + public static int getProcessBaseEnergy(ItemStack itemStack) { return PROCESS_BASE_ENERGY * getNumberOfGenes(itemStack); } - private static int getNumberOfGenes(@Nullable ItemStack serum) { - if (serum == null) { + private static int getNumberOfGenes(ItemStack serum) { + if (serum.isEmpty()) { return 1; } return Engineering.getGenes(serum).length; @@ -81,7 +82,7 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { return state; } ItemStack serum = this.getUtil().getStack(Inoculator.SLOT_SERUM_VIAL); - if (serum != null && Engineering.getCharges(serum) == 0) { + if (!serum.isEmpty() && 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(); @@ -99,11 +100,14 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { return new ErrorState(Genetics.proxy.localise("machine.errors.invalid.serum.desc"), Genetics.proxy.localise("machine.errors.invalid.serum.mismatch.info")); } final IIndividual individual = genes[0].getSpeciesRoot().getMember(target); - for (final IGene gene : genes) { - final IAllele a = individual.getGenome().getActiveAllele(gene.getChromosome()); - final IAllele b = individual.getGenome().getInactiveAllele(gene.getChromosome()); - if (!a.getUID().equals(gene.getAllele().getUID()) || !b.getUID().equals(gene.getAllele().getUID())) { - return null; + if (individual != null) { + final IGenome genome = individual.getGenome(); + for (final IGene gene : genes) { + final IAllele a = genome.getActiveAllele(gene.getChromosome()); + final IAllele b = genome.getInactiveAllele(gene.getChromosome()); + if (!a.getUID().equals(gene.getAllele().getUID()) || !b.getUID().equals(gene.getAllele().getUID())) { + return null; + } } } return new ErrorState(Genetics.proxy.localise("genetics.machine.errors.defunct.serum.desc"), Genetics.proxy.localise("genetics.machine.errors.defunct.serum.info")); diff --git a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java index f4707e52..5484e296 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java @@ -1,6 +1,8 @@ package binnie.genetics.machine.inoculator; +import binnie.core.machines.IMachine; import binnie.core.machines.Machine; +import binnie.core.machines.MachineUtil; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; @@ -79,7 +81,14 @@ public class PackageInoculator extends GeneticMachine.PackageGeneticBase impleme transfer.addStorage(Inoculator.SLOT_TARGET, Inoculator.SLOT_FINISHED, new ComponentInventoryTransfer.Condition() { @Override 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; + if (!stack.isEmpty()) { + IMachine machine = this.transfer.getMachine(); + MachineUtil machineUtil = machine.getMachineUtil(); + if (!machineUtil.getStack(Inoculator.SLOT_SERUM_VIAL).isEmpty() && machine.getInterface(InoculatorLogic.class).isValidSerum() != null) { + return true; + } + } + return false; } }); new ComponentPowerReceptor(machine, 15000); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java index 71a9f1c6..a917f3db 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java @@ -9,8 +9,6 @@ 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; @@ -38,11 +36,11 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces return (int) (super.getProcessEnergy() * getNumberOfGenes(serum) * this.getCatalyst()); } - public static float getDNAPerProcess(@Nullable ItemStack serum) { + public static float getDNAPerProcess(ItemStack serum) { return getNumberOfGenes(serum) * 50; } - public static float getBacteriaPerProcess(@Nullable ItemStack serum) { + public static float getBacteriaPerProcess(ItemStack serum) { return 0.2f * getDNAPerProcess(serum); } @@ -64,8 +62,8 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces } } - private static int getNumberOfGenes(@Nullable ItemStack serum) { - if (serum == null) { + private static int getNumberOfGenes(ItemStack serum) { + if (serum.isEmpty()) { return 1; } return Engineering.getGenes(serum).length; @@ -85,7 +83,7 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces @Override public ErrorState canWork() { ItemStack serumStack = this.getUtil().getStack(Polymeriser.SLOT_SERUM); - if (serumStack == null) { + if (serumStack.isEmpty()) { return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.polymeriser.errors.item.no"), Polymeriser.SLOT_SERUM); } if (!serumStack.isItemDamaged()) { @@ -109,7 +107,7 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces protected void onFinishTask() { super.onFinishTask(); ItemStack serumStack = this.getUtil().getStack(Polymeriser.SLOT_SERUM); - Preconditions.checkState(serumStack != null); + Preconditions.checkState(!serumStack.isEmpty()); this.getUtil().damageItem(serumStack, Polymeriser.SLOT_SERUM, -1); } } \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java index f04de1e9..9ab2aadc 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java @@ -18,8 +18,8 @@ public class SequencerLogic extends ComponentProcess implements IProcess { super(machine); } - public static float getSequenceStrength(@Nullable ItemStack stack) { - if (stack == null) { + public static float getSequenceStrength(ItemStack stack) { + if (stack.isEmpty()) { return 1.0f; } final float mult = 1.0f - stack.getItemDamage() % 6 / 5.0f; @@ -54,7 +54,7 @@ public class SequencerLogic extends ComponentProcess implements IProcess { return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.sequencer.errors.insufficient.dye"), Sequencer.SLOT_DYE); } ItemStack stackDone = this.getUtil().getStack(Sequencer.SLOT_DONE); - if (stackDone != null && stackDone.getCount() >= 64) { + if (!stackDone.isEmpty() && stackDone.getCount() >= 64) { return new ErrorState.NoSpace(Genetics.proxy.localise("machine.machine.sequencer.errors.no.space"), new int[]{Sequencer.SLOT_DONE}); } return super.canProgress(); @@ -64,7 +64,7 @@ public class SequencerLogic extends ComponentProcess implements IProcess { protected void onStartTask() { super.onStartTask(); final ItemStack item = this.getUtil().getStack(Sequencer.SLOT_TARGET); - if (item != null) { + if (!item.isEmpty()) { final SequencerItem seqItem = SequencerItem.create(item); if (seqItem != null) { final int seq = seqItem.sequenced; @@ -80,12 +80,12 @@ public class SequencerLogic extends ComponentProcess implements IProcess { super.onFinishTask(); this.updateSequence(); ItemStack stack = this.getUtil().getStack(Sequencer.SLOT_TARGET); - Preconditions.checkState(stack != null); + Preconditions.checkState(!stack.isEmpty()); 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) { + if (this.getUtil().getStack(Sequencer.SLOT_DONE).isEmpty()) { this.getUtil().setStack(Sequencer.SLOT_DONE, GeneticsItems.EmptySequencer.get(1)); } else { this.getUtil().decreaseStack(Sequencer.SLOT_DONE, -1); @@ -101,7 +101,7 @@ 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); - Preconditions.checkState(item != null); + Preconditions.checkState(!item.isEmpty()); final SequencerItem seqItem = SequencerItem.create(item); Preconditions.checkState(seqItem != null); final int seq = seqItem.sequenced; diff --git a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java index 421e3f6a..44d48109 100644 --- a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java @@ -1,6 +1,8 @@ package binnie.genetics.machine.splicer; +import binnie.core.machines.IMachine; import binnie.core.machines.Machine; +import binnie.core.machines.MachineUtil; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; @@ -76,7 +78,14 @@ public class PackageSplicer extends AdvGeneticMachine.PackageAdvGeneticBase impl transfer.addStorage(Splicer.SLOT_TARGET, Splicer.SLOT_FINISHED, new ComponentInventoryTransfer.Condition() { @Override 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; + if (!stack.isEmpty()) { + IMachine machine = this.transfer.getMachine(); + MachineUtil machineUtil = machine.getMachineUtil(); + if (!machineUtil.getStack(Splicer.SLOT_SERUM_VIAL).isEmpty() && machine.getInterface(SplicerLogic.class).isValidSerum() != null) { + return true; + } + } + return false; } }); new ComponentPowerReceptor(machine, 20000); diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java index 0435cee5..1393ce59 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java @@ -81,7 +81,7 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, final EntityItem dummyEntityItem = this.dummyEntityItem; dummyEntityItem.setAgeToCreativeDespawnTime(); //++dummyEntityItem.age; this.dummyEntityItem.hoverStart = 0.0f; - if (stack == null) { + if (stack.isEmpty()) { return; } final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); @@ -99,7 +99,7 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, public void syncToNBT(final NBTTagCompound nbt) { final NBTTagCompound item = new NBTTagCompound(); final ItemStack stack = this.getUtil().getStack(9); - if (stack != null) { + if (!stack.isEmpty()) { stack.writeToNBT(item); nbt.setTag("item", item); } @@ -110,7 +110,7 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, if (nbt.hasKey("item")) { this.getUtil().setStack(9, new ItemStack(nbt.getCompoundTag("item"))); } else { - this.getUtil().setStack(9, null); + this.getUtil().setStack(9, ItemStack.EMPTY); } } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java index 47450b9c..bef68b82 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java @@ -66,8 +66,8 @@ public class SplicerLogic extends ComponentProcess implements IProcess { this.nOfGenes = getGenesToUse(serum, target); } - public static int getGenesToUse(@Nullable ItemStack serum, @Nullable ItemStack target) { - if (serum == null || target == null) { + public static int getGenesToUse(ItemStack serum, ItemStack target) { + if (serum.isEmpty() || target.isEmpty()) { return 1; } final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(target); @@ -86,7 +86,7 @@ public class SplicerLogic extends ComponentProcess implements IProcess { private int getFullNumberOfGenes() { final ItemStack serum = this.getUtil().getStack(0); - if (serum == null) { + if (serum.isEmpty()) { return 1; } return Engineering.getGenes(serum).length; @@ -110,7 +110,7 @@ public class SplicerLogic extends ComponentProcess implements IProcess { } ItemStack serum = this.getUtil().getStack(Splicer.SLOT_SERUM_VIAL); - if (serum == null) { + if (serum.isEmpty()) { return new ErrorState.NoItem(Genetics.proxy.localise("machine.errors.no.serum.desc"), Splicer.SLOT_SERUM_VIAL); } @@ -128,7 +128,7 @@ public class SplicerLogic extends ComponentProcess implements IProcess { @Nullable public ErrorState isValidSerum() { final ItemStack serum = this.getUtil().getStack(Splicer.SLOT_SERUM_VIAL); - if (serum == null) { + if (serum.isEmpty()) { return null; } final ItemStack target = this.getUtil().getStack(Splicer.SLOT_TARGET); @@ -163,9 +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); + Preconditions.checkState(!serum.isEmpty()); final ItemStack target = this.getUtil().getStack(Splicer.SLOT_TARGET); - Preconditions.checkState(target != null); + Preconditions.checkState(!target.isEmpty()); final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(target); if (!ind.isAnalyzed()) { ind.analyze();