diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index f4d2ef56..0b3c1913 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -261,14 +261,14 @@ public class Botany extends AbstractMod { return; } - if (player != null && heldItem != null) { + if (heldItem != null) { Block block = world.getBlockState(pos).getBlock(); int py = -1; if (block instanceof IBlockSoil && (world.isAirBlock(pos.up()) || block.isReplaceable(world, pos))) { py = 1; } if (py >= 0) { - IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.getEntityPlayer().getHeldItemMainhand()); + IFlower flower = BotanyCore.getFlowerRoot().getConversion(heldItem); if (flower != null && Gardening.plant(world, pos.add(0, py, 0), flower, player.getGameProfile()) && !player.capabilities.isCreativeMode) { --heldItem.stackSize; } diff --git a/src/main/java/binnie/botany/api/EnumAcidity.java b/src/main/java/binnie/botany/api/EnumAcidity.java index 744d7f41..f187c5e5 100644 --- a/src/main/java/binnie/botany/api/EnumAcidity.java +++ b/src/main/java/binnie/botany/api/EnumAcidity.java @@ -4,18 +4,17 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nullable; + public enum EnumAcidity implements IStringSerializable { Acid(TextFormatting.RED), - Neutral, + Neutral(null), Alkaline(TextFormatting.AQUA); + @Nullable final TextFormatting color; - EnumAcidity() { - this(null); - } - - EnumAcidity(TextFormatting color) { + EnumAcidity(@Nullable TextFormatting color) { this.color = color; } diff --git a/src/main/java/binnie/botany/api/EnumMoisture.java b/src/main/java/binnie/botany/api/EnumMoisture.java index 71f9482b..1f2483ce 100644 --- a/src/main/java/binnie/botany/api/EnumMoisture.java +++ b/src/main/java/binnie/botany/api/EnumMoisture.java @@ -4,18 +4,17 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nullable; + public enum EnumMoisture implements IStringSerializable { Dry(TextFormatting.YELLOW), - Normal, + Normal(null), Damp(TextFormatting.DARK_BLUE); + @Nullable final TextFormatting color; - EnumMoisture() { - this(null); - } - - EnumMoisture(TextFormatting color) { + EnumMoisture(@Nullable TextFormatting color) { this.color = color; } diff --git a/src/main/java/binnie/botany/api/EnumSoilType.java b/src/main/java/binnie/botany/api/EnumSoilType.java index 0e90dbc3..5c8dc239 100644 --- a/src/main/java/binnie/botany/api/EnumSoilType.java +++ b/src/main/java/binnie/botany/api/EnumSoilType.java @@ -4,6 +4,7 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nullable; import java.util.Locale; public enum EnumSoilType implements IStringSerializable { @@ -11,13 +12,10 @@ public enum EnumSoilType implements IStringSerializable { LOAM(TextFormatting.GOLD), FLOWERBED(TextFormatting.LIGHT_PURPLE); + @Nullable final TextFormatting color; - EnumSoilType() { - this(null); - } - - EnumSoilType(TextFormatting color) { + EnumSoilType(@Nullable TextFormatting color) { this.color = color; } diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index bb1ad79e..23c578aa 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -167,6 +167,7 @@ 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 b5629351..982b154b 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -90,6 +90,7 @@ public class CeramicDesignSystem implements IDesignSystem { } @Override + @Nullable public IDesignMaterial getMaterial(final ItemStack itemStack) { return (itemStack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? this.getMaterial(itemStack.getItemDamage()) : null; } diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index 4e3f7d3a..e5e40517 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -25,6 +25,7 @@ public class CeramicTileRecipe implements IRecipe { } @Override + @Nullable public ItemStack getCraftingResult(final InventoryCrafting inv) { final Item ceramicBlock = Item.getItemFromBlock(Botany.ceramic); final Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile); diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index 743044a7..2ce7f2d2 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class PigmentRecipe implements IRecipe { @Override @@ -18,11 +19,13 @@ public class PigmentRecipe implements IRecipe { } @Override + @Nullable public ItemStack getRecipeOutput() { return null; } @Override + @Nullable public ItemStack getCraftingResult(final InventoryCrafting crafting) { int n = 0; ItemStack stack = null; diff --git a/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java index ca52c996..551cd98b 100644 --- a/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java @@ -20,12 +20,10 @@ public class ItemCeramicBrick extends ItemBlock implements IColoredItem { @Override public int getColorFromItemstack(ItemStack stack, int tintIndex) { CeramicBrickPair ceramic = new CeramicBrickPair(stack.getItemDamage()); - if(ceramic != null){ - if (tintIndex == 1) { - return ceramic.colorFirst.getColor(false); - }else if (tintIndex == 2) { - return ceramic.colorSecond.getColor(false); - } + if (tintIndex == 1) { + return ceramic.colorFirst.getColor(false); + } else if (tintIndex == 2) { + return ceramic.colorSecond.getColor(false); } return 16777215; } diff --git a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java index 8358e9f8..c2289618 100644 --- a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java @@ -7,9 +7,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -public class TileCeramicBrick extends TileEntity{ +import javax.annotation.Nullable; +public class TileCeramicBrick extends TileEntity{ + @Nullable private EnumFlowerColor colorFirst; + @Nullable private EnumFlowerColor colorSecond; public void setColors(EnumFlowerColor colorFirst, EnumFlowerColor colorSecond) { diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index e067f5de..894edca6 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -35,6 +35,7 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -68,6 +69,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState } @Override + @Nullable public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos) { return null; } @@ -113,7 +115,9 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState if (!BinnieCore.getBinnieProxy().isSimulating(world)) { if (flower != null && flower instanceof TileEntityFlower) { final IFlower f = BotanyCore.getFlowerRoot().getMember(stack); - ((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower)); + if (f != null) { + ((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower)); + } } return; } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 214ba2d9..9234376c 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -12,6 +12,7 @@ import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; import binnie.botany.genetics.Flower; import binnie.core.BinnieCore; +import com.google.common.base.Preconditions; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.genetics.IIndividual; @@ -29,6 +30,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -40,6 +42,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public class ItemBotany extends Item implements IColoredItem, IItemModelRegister { @@ -77,7 +80,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister return false; } final IIndividual individual = this.getIndividual(itemstack); - return individual != null && individual.getGenome() != null && individual.hasEffect(); + return individual != null && individual.hasEffect(); } @Override @@ -86,7 +89,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister return; } IFlower individual = (IFlower) this.getIndividual(itemStack); - if (individual == null || individual.getGenome() == null) { + if (individual == null) { list.add(TextFormatting.DARK_RED + Binnie.LANGUAGE.localise("botany.flower.destroy")); return; } @@ -114,8 +117,13 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } } + @Nullable protected IIndividual getIndividual(final ItemStack itemstack) { - return new Flower(itemstack.getTagCompound()); + NBTTagCompound tagCompound = itemstack.getTagCompound(); + if (tagCompound == null) { + return null; + } + return new Flower(tagCompound); } private IAlleleFlowerSpecies getPrimarySpecies(final ItemStack itemstack) { @@ -132,7 +140,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister return Binnie.LANGUAGE.localise("item.botany.flower.corrupted.name"); } IIndividual individual = this.getIndividual(itemstack); - if (individual != null && individual.getGenome() != null) { + if (individual != null) { return individual.getDisplayName() + (!tag.isEmpty() ? " " + Binnie.LANGUAGE.localise("item.botany." + tag + ".name") : ""); } return Binnie.LANGUAGE.localise("item.botany.flower.corrupted.name"); @@ -155,7 +163,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister @Override public int getColorFromItemstack(ItemStack stack, int tintIndex) { IFlower flower = BotanyCore.getFlowerRoot().getMember(stack); - if (flower == null || flower.getGenome() == null) { + if (flower == null) { return 16777215; } return (tintIndex == 0) ? flower.getGenome().getStemColor().getColor(flower.isWilted()) : ((tintIndex == 1) ? flower.getGenome().getPrimaryColor().getColor(flower.isWilted()) : flower.getGenome().getSecondaryColor().getColor(flower.isWilted())); @@ -175,9 +183,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister @Override public ModelResourceLocation getModelLocation(ItemStack stack) { IFlower flower = BotanyCore.getFlowerRoot().getMember(stack); - if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) { - return null; - } + Preconditions.checkNotNull(flower); IAlleleFlowerSpecies flowerSpecies = flower.getGenome().getPrimary(); IFlowerType flowerType = flowerSpecies.getType(); return flowerSpecies.getFlowerModel(type, flower.hasFlowered()); diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 796595e9..a757388b 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public class ItemInsulatedTube extends ItemCore implements IColoredItem { @@ -147,7 +148,7 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { return new ItemStack(Blocks.STONE); } default: { - return null; + throw new IllegalStateException("Unknown insulated tube type: " + this); } } } diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index f15d8512..2063e2a0 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -111,11 +111,12 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return super.writeToNBT(nbtCompound); } - public void create(final ItemStack stack, final GameProfile owner) { - this.create(BotanyCore.getFlowerRoot().getMember(stack), owner); + public void create(final ItemStack stack, @Nullable final GameProfile owner) { + IFlower flower = BotanyCore.getFlowerRoot().getMember(stack); + this.create(flower, owner); } - public void create(final IFlower flower, final GameProfile owner) { + public void create(final IFlower flower, @Nullable final GameProfile owner) { this.flower = flower; if (this.flower.getAge() == 0) { this.flower.setFlowered(false); @@ -130,6 +131,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } @Override + @Nullable public IIndividual getPollen() { return this.getFlower(); } @@ -323,6 +325,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } } + @Nullable public ItemStack getItemStack() { if (this.flower == null) { return null; @@ -330,6 +333,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return Binnie.GENETICS.getFlowerRoot().getMemberStack(this.getFlower(), EnumFlowerStage.getStage(getFlower())); } + @Nullable private TileEntityFlower getRoot() { if (this.getSection() == 0) { return null; @@ -600,6 +604,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public void setErrorState(final IErrorState state) { } + @Nullable public IErrorState getErrorState() { return null; } diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 3e5ac416..3e84ca92 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -38,6 +38,7 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -158,18 +159,18 @@ public class ModuleGardening implements IInitializable { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Botany.pigment, 2, EnumFlowerColor.Black.ordinal()), "pigment", "pigment", "dyeBlack")); ModuleGardening.queuedAcidFertilisers.put(BotanyItems.SulphurPowder.get(1), 1); ModuleGardening.queuedAcidFertilisers.put(BotanyItems.MulchPowder.get(1), 1); - ModuleGardening.queuedAcidFertilisers.put(new ItemStack(GameRegistry.findItem("forestry", "mulch")), 2); + ModuleGardening.queuedAcidFertilisers.put(Mods.Forestry.stack("mulch"), 2); for (final ItemStack stack : OreDictionary.getOres("dustSulfur")) { ModuleGardening.queuedAcidFertilisers.put(stack, 2); } ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.AshPowder.get(1), 1); ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.PulpPowder.get(1), 1); - ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("forestry", "ash")), 2); - ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("forestry", "woodPulp")), 2); + ModuleGardening.queuedAlkalineFertilisers.put(Mods.Forestry.stack("ash"), 2); + ModuleGardening.queuedAlkalineFertilisers.put(Mods.Forestry.stack( "woodPulp"), 2); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1); - ModuleGardening.queuedNutrientFertilisers.put(new ItemStack(GameRegistry.findItem("forestry", "fertilizerBio")), 2); - ModuleGardening.queuedNutrientFertilisers.put(new ItemStack(GameRegistry.findItem("forestry", "fertilizerCompound")), 2); + ModuleGardening.queuedNutrientFertilisers.put(Mods.Forestry.stack( "fertilizerBio"), 2); + ModuleGardening.queuedNutrientFertilisers.put(Mods.Forestry.stack("fertilizerCompound"), 2); for (final Map.Entry entry : ModuleGardening.queuedAcidFertilisers.entrySet()) { this.addAcidFertiliser(entry.getKey(), entry.getValue()); } @@ -192,17 +193,15 @@ 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 null; + 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 new ItemStack(Gardening.getSoilBlock(EnumSoilType.values()[type]), 1, BlockSoil.getMeta(EnumAcidity.values()[pH], EnumMoisture.values()[moisture])); + return null; } private void addAcidFertiliser(final ItemStack stack, final int strengthMax) { - if (stack == null) { - return; - } Gardening.fertiliserAcid.put(stack, strengthMax); for (int moisture = 0; moisture < 3; ++moisture) { for (int pH = 0; pH < 3; ++pH) { @@ -211,7 +210,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 (start != null && end != null) { end.stackSize = numOfBlocks; final Object[] stacks = new Object[numOfBlocks + 1]; for (int i = 0; i < numOfBlocks; ++i) { @@ -228,9 +227,6 @@ public class ModuleGardening implements IInitializable { } private void addAlkalineFertiliser(final ItemStack stack, final int strengthMax) { - if (stack == null) { - return; - } Gardening.fertiliserAlkaline.put(stack, strengthMax); for (int moisture = 0; moisture < 3; ++moisture) { for (int pH = 0; pH < 3; ++pH) { @@ -256,9 +252,6 @@ public class ModuleGardening implements IInitializable { } private void addNutrientFertiliser(final ItemStack stack, final int strengthMax) { - if (stack == null) { - return; - } Gardening.fertiliserNutrient.put(stack, strengthMax); for (int moisture = 0; moisture < 3; ++moisture) { for (int pH = 0; pH < 3; ++pH) { diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index d3040369..3128e625 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -70,7 +70,7 @@ public class FlowerBreedingSystem extends BreedingSystem { @Override public boolean isDNAManipulable(final ItemStack member) { ISpeciesType type = this.getSpeciesRoot().getType(member); - return isDNAManipulable(type); + return type != null && isDNAManipulable(type); } @Override diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index e6a8d89d..c59db58a 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -26,6 +26,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -941,6 +942,7 @@ public enum FlowerDefinition implements IFlowerDefinition { String binomial; String branchName; List variantTemplates; + @Nullable IClassification branch; EnumFlowerColor primaryColor, secondaryColor; @@ -996,7 +998,7 @@ public enum FlowerDefinition implements IFlowerDefinition { IAlleleFlowerSpeciesBuilder speciesBuilder = FlowerManager.flowerFactory.createSpecies(uid, unlocalizedName, "Binnie's Mod Team", unlocalizedDescription, isDominant, getBranch(), binomial, flowerType); setSpeciesProperties(speciesBuilder); this.species = speciesBuilder.build(); - if (branch != null) { + if (this.branch != null) { this.branch.addMemberSpecies(species); } } diff --git a/src/main/java/binnie/botany/genetics/FlowerGenome.java b/src/main/java/binnie/botany/genetics/FlowerGenome.java index d36a9539..65041f7e 100644 --- a/src/main/java/binnie/botany/genetics/FlowerGenome.java +++ b/src/main/java/binnie/botany/genetics/FlowerGenome.java @@ -21,6 +21,8 @@ import forestry.core.genetics.Genome; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import javax.annotation.Nullable; + public class FlowerGenome extends Genome implements IFlowerGenome { public FlowerGenome(final NBTTagCompound nbttagcompound) { super(nbttagcompound); @@ -30,6 +32,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome { super(chromosomes); } + @Nullable public static IAlleleFlowerSpecies getSpecies(ItemStack itemStack) { if (!FlowerManager.flowerRoot.isMember(itemStack)) { return null; diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 729db8d1..816be60e 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -79,7 +79,7 @@ class MothBreedingSystem extends BreedingSystem { @Override public boolean isDNAManipulable(final ItemStack member) { ISpeciesType type = this.getSpeciesRoot().getType(member); - return isDNAManipulable(type); + return type != null && isDNAManipulable(type); } @Override diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index ac5fb5a4..f26d5441 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -1,6 +1,7 @@ package binnie.core.genetics; import com.mojang.authlib.GameProfile; +import forestry.api.apiculture.DefaultBeeListener; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -10,14 +11,18 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.core.IErrorLogic; import forestry.api.genetics.IIndividual; +import forestry.apiculture.FakeBeekeepingLogic; import forestry.apiculture.InventoryBeeHousing; +import forestry.core.errors.FakeErrorLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Biomes; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.ArrayList; +import java.util.Collections; public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier { ArrayList beeModifier = new ArrayList<>(); @@ -50,10 +55,12 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB return 1.0f; } + @Nullable public ItemStack getQueen() { return null; } + @Nullable public ItemStack getDrone() { return null; } @@ -125,7 +132,7 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB @Override public IErrorLogic getErrorLogic() { - return null; + return FakeErrorLogic.instance; } // TODO ?? @@ -157,7 +164,7 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB // TODO ?? @Override public Iterable getBeeListeners() { - return null; + return Collections.emptyList(); } @Override @@ -167,7 +174,7 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB @Override public IBeekeepingLogic getBeekeepingLogic() { - return null; + return FakeBeekeepingLogic.instance; } @Override diff --git a/src/main/java/binnie/core/genetics/VirtualHousing.java b/src/main/java/binnie/core/genetics/VirtualHousing.java index e4296fe5..78d94205 100644 --- a/src/main/java/binnie/core/genetics/VirtualHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualHousing.java @@ -11,6 +11,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; +import java.util.Collections; import java.util.Set; class VirtualHousing implements IHousing { @@ -75,7 +76,7 @@ class VirtualHousing implements IHousing { } public Set getErrorStates() { - return null; + return Collections.emptySet(); } @Override diff --git a/src/main/java/binnie/core/genetics/VirtualMothHousing.java b/src/main/java/binnie/core/genetics/VirtualMothHousing.java index 48d02c78..b09b52ab 100644 --- a/src/main/java/binnie/core/genetics/VirtualMothHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualMothHousing.java @@ -5,17 +5,21 @@ import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; import net.minecraft.entity.player.EntityPlayer; +import javax.annotation.Nullable; + public class VirtualMothHousing extends VirtualHousing implements IButterflyNursery { public VirtualMothHousing(final EntityPlayer player) { super(player); } @Override + @Nullable public IButterfly getCaterpillar() { return null; } @Override + @Nullable public IIndividual getNanny() { return null; } diff --git a/src/main/java/binnie/core/gui/BinnieCoreGUI.java b/src/main/java/binnie/core/gui/BinnieCoreGUI.java index 47af40a8..e63b6761 100644 --- a/src/main/java/binnie/core/gui/BinnieCoreGUI.java +++ b/src/main/java/binnie/core/gui/BinnieCoreGUI.java @@ -30,7 +30,7 @@ public enum BinnieCoreGUI implements IBinnieGUID { return new WindowGenesis(player, null, side); } default: { - return null; + throw new IllegalArgumentException("Unknown GUI type: " + this); } } } diff --git a/src/main/java/binnie/core/gui/IBinnieGUID.java b/src/main/java/binnie/core/gui/IBinnieGUID.java index fcea66d5..b00873d7 100644 --- a/src/main/java/binnie/core/gui/IBinnieGUID.java +++ b/src/main/java/binnie/core/gui/IBinnieGUID.java @@ -6,6 +6,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public interface IBinnieGUID extends IOrdinaled { - Window getWindow(final EntityPlayer p0, final World p1, final int p2, final int p3, final int p4, final Side p5); + @Nullable + Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side); } diff --git a/src/main/java/binnie/core/liquid/FluidContainerType.java b/src/main/java/binnie/core/liquid/FluidContainerType.java index ff72b732..9c96badb 100644 --- a/src/main/java/binnie/core/liquid/FluidContainerType.java +++ b/src/main/java/binnie/core/liquid/FluidContainerType.java @@ -4,8 +4,6 @@ import binnie.core.BinnieCore; import binnie.core.Mods; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; @@ -14,13 +12,13 @@ import javax.annotation.Nullable; public enum FluidContainerType { CAPSULE, - REFARACTORY, + REFRACTORY, CAN, GLASS, CYLINDER; @Nullable - ItemFluidContainer item; + private ItemFluidContainer item; public int getMaxStackSize() { return 16; @@ -38,22 +36,22 @@ public enum FluidContainerType { return BinnieCore.getBinnieProxy().localise("item.container." + this.name().toLowerCase()); } - public boolean isActive() { - return this.getEmpty() != null; - } - @Nullable public ItemFluidContainer getItem() { return item; } + + public void setItem(ItemFluidContainer item) { + this.item = item; + } public ItemStack get(int amount){ - if(item == null){ + if (item == null){ throw new IllegalArgumentException("Null container item: " + this); } return new ItemStack(item, amount); } - + public ItemStack getEmpty() { switch (this) { case CAN: { @@ -63,9 +61,14 @@ public enum FluidContainerType { return Mods.Forestry.stack("capsule"); } case CYLINDER: - case GLASS: - return new ItemStack(item); - case REFARACTORY: { + case GLASS: { + if (item != null) { + return new ItemStack(item); + } else { + throw new IllegalArgumentException("Null container item: " + this); + } + } + case REFRACTORY: { return Mods.Forestry.stack("refractory"); } default: { @@ -74,35 +77,16 @@ public enum FluidContainerType { } } - @Nullable public ItemStack getFilled(Fluid fluid) { ItemStack stack = getEmpty(); - if (stack != null) { - stack = stack.copy(); - IFluidHandler fluidHandler = FluidUtil.getFluidHandler(stack); - if (fluidHandler != null) { - int fill = fluidHandler.fill(new FluidStack(fluid, Integer.MAX_VALUE), true); - if (fill > 0) { - return stack; - } + stack = stack.copy(); + IFluidHandler fluidHandler = FluidUtil.getFluidHandler(stack); + if (fluidHandler != null) { + int fill = fluidHandler.fill(new FluidStack(fluid, Integer.MAX_VALUE), true); + if (fill > 0) { + return stack; } } - return null; - } - - public void registerContainerData(final IFluidType fluid) { - if (!this.isActive()) { - return; - } - ItemStack filled = getFilled(FluidRegistry.getFluid(fluid.getIdentifier().toLowerCase())); - if(filled == null){ - filled = item.getContainer(fluid); - } - ItemStack empty = this.getEmpty(); - if (filled == null || empty == null || fluid.get(1000) == null) { - return; - } - final FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(fluid.get(1000), filled, empty); - FluidContainerRegistry.registerFluidContainer(data); + throw new IllegalStateException("Could not fill fluid handler for container: " + this); } } diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 61750684..6adf70f4 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -32,6 +32,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public class ItemFluidContainer extends ItemFood implements IItemModelRegister { @@ -40,7 +41,7 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { public ItemFluidContainer(FluidContainerType container) { super(0, false); this.container = container; - container.item = this; + container.setItem(this); this.maxStackSize = container.getMaxStackSize(); this.setHasSubtypes(true); this.setUnlocalizedName("container" + container.getName()); @@ -50,9 +51,6 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { @Override public String getItemStackDisplayName(final ItemStack itemstack) { - if (itemstack == null) { - return "???"; - } FluidStack fluid = getContained(itemstack); if (fluid == null) { return "Empty " + container.getDisplayName(); @@ -73,7 +71,8 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { subItems.add(getContainer(liquid)); } } - + + @Nullable protected FluidStack getContained(ItemStack itemStack) { if (itemStack.stackSize != 1) { itemStack = itemStack.copy(); diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 28795b49..391821ec 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -15,6 +15,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.ShapedOreRecipe; +import javax.annotation.Nullable; import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; @@ -26,7 +27,7 @@ public class ManagerLiquid extends ManagerBase { this.fluids = new LinkedHashMap<>(); EnumContainerType.CAN.add(new BinnieContainerPermission(FluidContainerType.CAN)); EnumContainerType.CAPSULE.add(new BinnieContainerPermission(FluidContainerType.CAPSULE)); - EnumContainerType.REFRACTORY.add(new BinnieContainerPermission(FluidContainerType.REFARACTORY)); + EnumContainerType.REFRACTORY.add(new BinnieContainerPermission(FluidContainerType.REFRACTORY)); EnumContainerType.GLASS.add(new BinnieContainerPermission(FluidContainerType.GLASS)); } @@ -51,6 +52,7 @@ public class ManagerLiquid extends ManagerBase { return bFluid; } + @Nullable public FluidStack getFluidStack(final String name, final int amount) { return FluidRegistry.getFluidStack(name.toLowerCase(), amount); } @@ -61,13 +63,6 @@ public class ManagerLiquid extends ManagerBase { @Override public void postInit() { - for (final IFluidType fluid : this.fluids.values()) { - for (final FluidContainerType container : FluidContainerType.values()) { - if (container.isActive() && fluid.canPlaceIn(container)) { - container.registerContainerData(fluid); - } - } - } GameRegistry.addShapelessRecipe(FluidContainerType.GLASS.get(1), Items.GLASS_BOTTLE); GameRegistry.addShapelessRecipe(new ItemStack(Items.GLASS_BOTTLE), FluidContainerType.GLASS.get(1)); GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.GLASS.get(3), diff --git a/src/main/java/binnie/core/machines/IMachine.java b/src/main/java/binnie/core/machines/IMachine.java index 1d2bb2b7..37b6061b 100644 --- a/src/main/java/binnie/core/machines/IMachine.java +++ b/src/main/java/binnie/core/machines/IMachine.java @@ -11,6 +11,7 @@ public interface IMachine extends IOwnable { MachineUtil getMachineUtil(); + @Nullable T getInterface(Class Interface); void markDirty(); diff --git a/src/main/java/binnie/core/machines/IOwnable.java b/src/main/java/binnie/core/machines/IOwnable.java index b7623289..b3b44161 100644 --- a/src/main/java/binnie/core/machines/IOwnable.java +++ b/src/main/java/binnie/core/machines/IOwnable.java @@ -2,8 +2,11 @@ package binnie.core.machines; import com.mojang.authlib.GameProfile; +import javax.annotation.Nullable; + interface IOwnable { + @Nullable GameProfile getOwner(); - void setOwner(final GameProfile p0); + void setOwner(final GameProfile owner); } diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index aaa83066..a67e0f7b 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -33,8 +33,8 @@ import java.util.Map; public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT { private MachinePackage machinePackage; - private Map, List> componentInterfaceMap; - private Map, MachineComponent> componentMap; + private Map, List> componentInterfaceMap; + private Map, MachineComponent> componentMap; private TileEntity tile; private boolean queuedInventoryUpdate; @Nullable @@ -55,7 +55,7 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN Preconditions.checkNotNull(component, "Can't have a null machine component!"); component.setMachine(this); this.componentMap.put(component.getClass(), component); - for (final Class inter : component.getComponentInterfaces()) { + for (final Class inter : component.getComponentInterfaces()) { if (!this.componentInterfaceMap.containsKey(inter)) { this.componentInterfaceMap.put(inter, new ArrayList<>()); } @@ -67,15 +67,15 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN return this.componentMap.values(); } - @Nullable public T getComponent(final Class componentClass) { if (this.hasComponent(componentClass)) { return componentClass.cast(this.componentMap.get(componentClass)); } - return null; + throw new IllegalArgumentException("No component found for " + componentClass); } @Override + @Nullable public T getInterface(final Class interfaceClass) { if (this.hasInterface(interfaceClass)) { return this.getInterfaces(interfaceClass).get(0); @@ -88,12 +88,12 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN return interfaceClass.cast(component); } } - throw new IllegalArgumentException("No interface for : " + interfaceClass); + return null; } @Override public List getInterfaces(final Class interfaceClass) { - final ArrayList interfaces = new ArrayList<>(); + final List interfaces = new ArrayList<>(); if (!this.hasInterface(interfaceClass)) { return interfaces; } @@ -107,7 +107,7 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN return this.componentInterfaceMap.containsKey(interfaceClass); } - public boolean hasComponent(final Class componentClass) { + public boolean hasComponent(final Class componentClass) { return this.componentMap.containsKey(componentClass); } @@ -146,7 +146,8 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN } public void onRightClick(final World world, final EntityPlayer player, final BlockPos pos) { - for (final IInteraction.RightClick component : this.getInterfaces(IInteraction.RightClick.class)) { + List interfaces = this.getInterfaces(IInteraction.RightClick.class); + for (final IInteraction.RightClick component : interfaces) { component.onRightClick(world, player, pos); } } diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/src/main/java/binnie/core/machines/MachineComponent.java index d529b468..24e85988 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/src/main/java/binnie/core/machines/MachineComponent.java @@ -35,7 +35,7 @@ public class MachineComponent implements INbtReadable, INbtWritable { public void onUpdate() { } - public Class[] getComponentInterfaces() { + public Class[] getComponentInterfaces() { return Binnie.MACHINE.getComponentInterfaces(this.getClass()); } diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 9e6dc583..1db30741 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Set; public class ManagerMachine extends ManagerBase { - private Map, Class[]> componentInterfaceMap; + private Map, Class[]> componentInterfaceMap; private Map machineGroups; private Map> networkIDToComponent; private Map, Integer> componentToNetworkID; @@ -84,7 +84,7 @@ public class ManagerMachine extends ManagerBase { BinnieCore.getBinnieProxy().registerTileEntity(TileEntityMachine.class, "binnie.tile.machine", rendererMachine); } - public Class[] getComponentInterfaces(final Class clss) { + public Class[] getComponentInterfaces(final Class clss) { if (!this.componentInterfaceMap.containsKey(clss)) { this.registerComponentClass(clss); } diff --git a/src/main/java/binnie/core/machines/base/DefaultInventory.java b/src/main/java/binnie/core/machines/base/DefaultInventory.java index a4d50187..024331fa 100644 --- a/src/main/java/binnie/core/machines/base/DefaultInventory.java +++ b/src/main/java/binnie/core/machines/base/DefaultInventory.java @@ -16,17 +16,19 @@ class DefaultInventory implements IInventoryMachine { } @Override + @Nullable public ItemStack getStackInSlot(final int i) { return null; } @Override + @Nullable public ItemStack decrStackSize(final int i, final int j) { return null; } - @Nullable @Override + @Nullable public ItemStack removeStackFromSlot(int index) { return null; } diff --git a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java index 37961806..8037a862 100644 --- a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java +++ b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java @@ -68,7 +68,7 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi // } @Override - public void setInventorySlotContents(final int index, final ItemStack itemStack) { + public void setInventorySlotContents(final int index, @Nullable final ItemStack itemStack) { this.getInventory().setInventorySlotContents(index, itemStack); } @@ -113,29 +113,24 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi return this.getInventory().isItemValidForSlot(slot, itemStack); } - - //TODO Implement @Override public int getField(int id) { - return 0; + return this.getInventory().getField(id); } - //TODO Implement @Override public void setField(int id, int value) { - + this.getInventory().setField(id, value); } - //TODO Implement @Override public int getFieldCount() { - return 0; + return this.getInventory().getFieldCount(); } - //TODO Implement @Override public void clear() { - + this.getInventory().clear(); } @Override diff --git a/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/src/main/java/binnie/core/machines/inventory/BaseSlot.java index b19f6fee..e3bc0489 100644 --- a/src/main/java/binnie/core/machines/inventory/BaseSlot.java +++ b/src/main/java/binnie/core/machines/inventory/BaseSlot.java @@ -41,8 +41,9 @@ public abstract class BaseSlot implements INbtWritable, INbtReadable, IValida public abstract void setContent(final T content); - public void setValidator(final Validator val) { + public BaseSlot setValidator(final Validator val) { this.validator = val; + return this; } public boolean isEmpty() { diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 56b4161b..0380eeb1 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -179,6 +179,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac } @Override + @Nullable public FluidStack drain(final FluidStack resource, final boolean doDrain) { final int index = getTankIndexToDrain(from, null); if (tanks.containsKey(index)) { @@ -188,6 +189,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac } @Override + @Nullable public final FluidStack drain(final int maxDrain, final boolean doDrain) { final int index = getTankIndexToDrain(from, null); if (tanks.containsKey(index)) { diff --git a/src/main/java/binnie/core/machines/power/TankInfo.java b/src/main/java/binnie/core/machines/power/TankInfo.java index c07dc238..fe4067c2 100644 --- a/src/main/java/binnie/core/machines/power/TankInfo.java +++ b/src/main/java/binnie/core/machines/power/TankInfo.java @@ -6,7 +6,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; +import javax.annotation.Nullable; + public class TankInfo implements INbtReadable, INbtWritable { + @Nullable public FluidStack liquid; private float capacity; diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 0ae8915f..1fe31d58 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -164,7 +164,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh for (int k = 0; k < inv.getPageSize(); ++k) { slotsIDs[k] = i++; } - new ControlSlotArray(thisPage, 8, 8, inv.getPageSize() / 5, 5).create(slotsIDs); + new ControlSlotArray.Builder(thisPage, 8, 8, inv.getPageSize() / 5, 5).create(slotsIDs); } x += compartmentPageWidth; if (tabs2.length > 0) { @@ -379,7 +379,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh this.slotGrid.deleteAllChildren(); this.slotGrid.setSize(new IPoint(width, height)); for (final int k : slotIds.keySet()) { - new ControlSlot(this.slotGrid, x, y).assign(k); + new ControlSlot.Builder(this.slotGrid, x, y).assign(k); x += 18; if (x >= 108) { x = 0; @@ -387,7 +387,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } } while (y < 108 || x != 0) { - new ControlSlot(this.slotGrid, x, y); + // TODO: what was this supposed to do? + new ControlSlot.Builder(this.slotGrid, x, y); x += 18; if (x >= 108) { x = 0; diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index fe79eea3..d0b80abd 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -35,7 +35,7 @@ public class TransferRequest { private List insertedSlots; private List insertedTanks; - public TransferRequest(final ItemStack toTransfer, final IInventory destination) { + public TransferRequest(@Nullable final ItemStack toTransfer, final IInventory destination) { this.itemToTransfer = null; this.returnItem = null; this.targetSlots = new int[0]; @@ -68,9 +68,6 @@ public class TransferRequest { @Nullable public static ItemStack transferItemToInventory(final ItemStack item, final IInventory destination, final boolean doAdd) { - if (item == null || destination == null) { - return item; - } ItemStack addition = item.copy(); for (int i = 0; i < destination.getSizeInventory(); ++i) { addition = transferToInventory(addition, destination, new int[]{i}, doAdd, false); diff --git a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java b/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java index 5016e0e5..ea9d9f9d 100644 --- a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java +++ b/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java @@ -4,6 +4,8 @@ import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import net.minecraft.tileentity.TileEntity; +import javax.annotation.Nullable; + class TileEntityMultiblockMachine extends TileEntity { private boolean inStructure; private int tileX; @@ -14,10 +16,12 @@ class TileEntityMultiblockMachine extends TileEntity { return this.inStructure; } + @Nullable public Machine getMachine() { return this.getMasterMachine(); } + @Nullable private Machine getMasterMachine() { if (!this.inStructure) { return null; diff --git a/src/main/java/binnie/core/network/packet/MessageCoordinates.java b/src/main/java/binnie/core/network/packet/MessageCoordinates.java index ec2948ed..39639dcf 100644 --- a/src/main/java/binnie/core/network/packet/MessageCoordinates.java +++ b/src/main/java/binnie/core/network/packet/MessageCoordinates.java @@ -5,6 +5,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.io.IOException; public class MessageCoordinates extends MessageBase { @@ -45,6 +46,7 @@ public class MessageCoordinates extends MessageBase { return new BlockPos(this.posX, this.posY, this.posZ); } + @Nullable public TileEntity getTileEntity(final World world) { return world.getTileEntity(getCoordinates()); } diff --git a/src/main/java/binnie/core/network/packet/MessageUpdate.java b/src/main/java/binnie/core/network/packet/MessageUpdate.java index b1be38c3..3e3cc02f 100644 --- a/src/main/java/binnie/core/network/packet/MessageUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageUpdate.java @@ -5,9 +5,11 @@ import io.netty.buffer.ByteBuf; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.io.IOException; public class MessageUpdate extends MessageCoordinates { + @Nullable public PacketPayload payload; public MessageUpdate(final MessageBinnie message) { @@ -67,6 +69,7 @@ public class MessageUpdate extends MessageCoordinates { } } + @Nullable public TileEntity getTarget(final World world) { return world.getTileEntity(getCoordinates()); } diff --git a/src/main/java/binnie/core/util/FluidStackSet.java b/src/main/java/binnie/core/util/FluidStackSet.java index 56884901..1d899726 100644 --- a/src/main/java/binnie/core/util/FluidStackSet.java +++ b/src/main/java/binnie/core/util/FluidStackSet.java @@ -2,7 +2,7 @@ package binnie.core.util; import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -10,19 +10,20 @@ import java.util.List; import java.util.Set; class FluidStackSet implements Set { - List itemStacks; + protected final List fluidStacks; FluidStackSet() { - this.itemStacks = new ArrayList<>(); + this.fluidStacks = new ArrayList<>(); } @Override public String toString() { - return this.itemStacks.toString(); + return this.fluidStacks.toString(); } + @Nullable protected FluidStack getExisting(final FluidStack stack) { - for (final FluidStack stack2 : this.itemStacks) { + for (final FluidStack stack2 : this.fluidStacks) { if (stack2.isFluidEqual(stack)) { return stack2; } @@ -33,10 +34,10 @@ class FluidStackSet implements Set { @Override public boolean add(final FluidStack e) { if (e != null) { - if (this.getExisting(e) == null) { - return this.itemStacks.add(e.copy()); + FluidStack existing = this.getExisting(e); + if (existing == null) { + return this.fluidStacks.add(e.copy()); } - final FluidStack existing = this.getExisting(e); existing.amount += e.amount; } return false; @@ -53,7 +54,7 @@ class FluidStackSet implements Set { @Override public void clear() { - this.itemStacks.clear(); + this.fluidStacks.clear(); } @Override @@ -72,12 +73,12 @@ class FluidStackSet implements Set { @Override public boolean isEmpty() { - return this.itemStacks.isEmpty(); + return this.fluidStacks.isEmpty(); } @Override public Iterator iterator() { - return this.itemStacks.iterator(); + return this.fluidStacks.iterator(); } @Override @@ -85,10 +86,10 @@ class FluidStackSet implements Set { if (this.contains(o)) { final FluidStack r = (FluidStack) o; final FluidStack existing = this.getExisting(r); - if (existing.amount > r.amount) { + if (existing != null && existing.amount > r.amount) { existing.amount -= r.amount; } else { - this.itemStacks.remove(existing); + this.fluidStacks.remove(existing); } } return false; @@ -106,21 +107,21 @@ class FluidStackSet implements Set { @Override public boolean retainAll(final Collection c) { - return this.itemStacks.retainAll(c); + return this.fluidStacks.retainAll(c); } @Override public int size() { - return this.itemStacks.size(); + return this.fluidStacks.size(); } @Override public Object[] toArray() { - return this.itemStacks.toArray(); + return this.fluidStacks.toArray(); } @Override public T[] toArray(final T[] a) { - return this.itemStacks.toArray(a); + return this.fluidStacks.toArray(a); } } diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index ae93c476..98476041 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -2,6 +2,7 @@ package binnie.core.util; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -20,6 +21,7 @@ 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)) { @@ -32,10 +34,10 @@ public class ItemStackSet implements Set { @Override public boolean add(final ItemStack e) { if (e != null) { - if (this.getExisting(e) == null) { + ItemStack existing = this.getExisting(e); + if (existing == null) { return this.itemStacks.add(e.copy()); } - final ItemStack existing = this.getExisting(e); existing.stackSize += e.stackSize; } return false; @@ -84,9 +86,8 @@ public class ItemStackSet implements Set { if (this.contains(o)) { final ItemStack r = (ItemStack) o; final ItemStack existing = this.getExisting(r); - if (existing.stackSize > r.stackSize) { - final ItemStack itemStack = existing; - itemStack.stackSize -= r.stackSize; + if (existing != null && existing.stackSize > r.stackSize) { + existing.stackSize -= r.stackSize; } else { this.itemStacks.remove(existing); } diff --git a/src/main/java/binnie/core/util/TileUtil.java b/src/main/java/binnie/core/util/TileUtil.java index cef0b659..3a9434ff 100644 --- a/src/main/java/binnie/core/util/TileUtil.java +++ b/src/main/java/binnie/core/util/TileUtil.java @@ -13,9 +13,6 @@ import javax.annotation.Nullable; public class TileUtil { @Nullable public static T getTile(IBlockAccess world, BlockPos pos, Class tileClass) { - if (pos == null) { - return null; - } TileEntity tileEntity = world.getTileEntity(pos); if (tileClass.isInstance(tileEntity)) { return tileClass.cast(tileEntity); diff --git a/src/main/java/binnie/core/util/UniqueFluidStackSet.java b/src/main/java/binnie/core/util/UniqueFluidStackSet.java index 482c1584..b3ea3cc2 100644 --- a/src/main/java/binnie/core/util/UniqueFluidStackSet.java +++ b/src/main/java/binnie/core/util/UniqueFluidStackSet.java @@ -5,7 +5,7 @@ import net.minecraftforge.fluids.FluidStack; public class UniqueFluidStackSet extends FluidStackSet { @Override public boolean add(final FluidStack e) { - return e != null && this.getExisting(e) == null && this.itemStacks.add(e.copy()); + return e != null && this.getExisting(e) == null && this.fluidStacks.add(e.copy()); } @Override @@ -13,7 +13,7 @@ public class UniqueFluidStackSet extends FluidStackSet { if (this.contains(o)) { final FluidStack r = (FluidStack) o; final FluidStack existing = this.getExisting(r); - this.itemStacks.remove(existing); + this.fluidStacks.remove(existing); } return false; } diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java index 37e9f1ba..5cbf63ad 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java @@ -116,8 +116,8 @@ public class WindowFieldKit extends Window { new ControlPlayerInventory(this); final IPoint handGlass = new IPoint(16, 32); this.GlassControl = new ControlImage(this, handGlass.x(), handGlass.y(), new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett)); - new ControlSlot(this, handGlass.x() + 54, handGlass.y() + 26).assign(InventoryType.Window, 0); - new ControlSlot(this, 208, 8).assign(InventoryType.Window, 1); + new ControlSlot.Builder(this, handGlass.x() + 54, handGlass.y() + 26).assign(InventoryType.Window, 0); + new ControlSlot.Builder(this, 208, 8).assign(InventoryType.Window, 1); (this.text = new ControlText(this, new IPoint(232, 13), "Paper")).setColour(2236962); (this.text = new ControlText(this, new IArea(0, 120, this.w(), 24), "", TextJustification.MiddleCenter)).setColour(2236962); this.chromo = new ControlChromosome(this, 150, 24); diff --git a/src/main/java/binnie/craftgui/controls/core/Control.java b/src/main/java/binnie/craftgui/controls/core/Control.java index 870785e8..c6599789 100644 --- a/src/main/java/binnie/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/craftgui/controls/core/Control.java @@ -10,6 +10,8 @@ import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.minecraft.Window; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -39,6 +41,13 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { public void onUpdateClient() { } + @Nonnull + @Override + public IWidget getParent() { + //noinspection ConstantConditions + return super.getParent(); + } + public void addHelp(final String string) { this.helpStrings.add(string); } @@ -76,6 +85,6 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { } public Window getWindow() { - return (Window) this.getSuperParent(); + return (Window) this.getTopParent(); } } diff --git a/src/main/java/binnie/craftgui/core/IWidget.java b/src/main/java/binnie/craftgui/core/IWidget.java index 1f642500..10e98801 100644 --- a/src/main/java/binnie/craftgui/core/IWidget.java +++ b/src/main/java/binnie/craftgui/core/IWidget.java @@ -16,7 +16,7 @@ public interface IWidget { void deleteAllChildren(); - ITopLevelWidget getSuperParent(); + ITopLevelWidget getTopParent(); boolean isTopLevel(); diff --git a/src/main/java/binnie/craftgui/core/TopLevelWidget.java b/src/main/java/binnie/craftgui/core/TopLevelWidget.java index 2238a7e7..abc5f58a 100644 --- a/src/main/java/binnie/craftgui/core/TopLevelWidget.java +++ b/src/main/java/binnie/craftgui/core/TopLevelWidget.java @@ -150,14 +150,8 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { final Deque queue = this.calculateMousedOverWidgets(); while (!queue.isEmpty()) { final IWidget widget = queue.removeFirst(); - if (widget.isEnabled() && widget.isVisible()) { - if (!widget.canMouseOver()) { - continue; - } - if (widget.isEnabled() && widget.isVisible() && widget.canMouseOver() && widget.calculateIsMouseOver()) { - return widget; - } - continue; + if (widget.isEnabled() && widget.isVisible() && widget.canMouseOver() && widget.calculateIsMouseOver()) { + return widget; } } return null; diff --git a/src/main/java/binnie/craftgui/core/Widget.java b/src/main/java/binnie/craftgui/core/Widget.java index d7e67c17..cf62921f 100644 --- a/src/main/java/binnie/craftgui/core/Widget.java +++ b/src/main/java/binnie/craftgui/core/Widget.java @@ -9,7 +9,6 @@ import binnie.craftgui.events.EventWidget; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; -import java.util.ConcurrentModificationException; import java.util.List; public class Widget implements IWidget { @@ -80,13 +79,17 @@ public class Widget implements IWidget { @Override @Nullable - public final IWidget getParent() { + public IWidget getParent() { return this.parent; } @Override - public final ITopLevelWidget getSuperParent() { - return (ITopLevelWidget) (this.parent == null ? this : this.parent.getSuperParent()); + public final ITopLevelWidget getTopParent() { + if (this.parent == null) { + return (ITopLevelWidget) this; + } else { + return this.parent.getTopParent(); + } } @Override @@ -237,7 +240,7 @@ public class Widget implements IWidget { @Override public final void callEvent(final Event event) { - this.getSuperParent().recieveEvent(event); + this.getTopParent().recieveEvent(event); } @Override @@ -255,7 +258,7 @@ public class Widget implements IWidget { @Override public final IPoint getMousePosition() { - return this.getSuperParent().getAbsoluteMousePosition(); + return this.getTopParent().getAbsoluteMousePosition(); } @Override @@ -297,7 +300,7 @@ public class Widget implements IWidget { if (!this.isVisible()) { return; } - if (this.getSuperParent() == this) { + if (this.getTopParent() == this) { ((ITopLevelWidget) this).updateTopLevel(); } this.onUpdateClient(); @@ -386,17 +389,17 @@ public class Widget implements IWidget { @Override public final boolean isFocused() { - return this.getSuperParent().isFocused(this); + return this.getTopParent().isFocused(this); } @Override public final boolean isDragged() { - return this.getSuperParent().isDragged(this); + return this.getTopParent().isDragged(this); } @Override public final boolean isMouseOver() { - return this.getSuperParent().isMouseOver(this); + return this.getTopParent().isMouseOver(this); } @Override @@ -437,7 +440,7 @@ public class Widget implements IWidget { @Override public final void delete() { - this.getSuperParent().widgetDeleted(this); + this.getTopParent().widgetDeleted(this); this.onDelete(); } @@ -446,12 +449,11 @@ public class Widget implements IWidget { } @Override - @SuppressWarnings("unchecked") @Nullable public T getWidget(final Class widgetClass) { for (final IWidget child : this.getWidgets()) { if (widgetClass.isInstance(child)) { - return (T) child; + return widgetClass.cast(child); } final T found = child.getWidget(widgetClass); if (found != null) { diff --git a/src/main/java/binnie/craftgui/events/EventHandler.java b/src/main/java/binnie/craftgui/events/EventHandler.java index 34ce1290..262fb360 100644 --- a/src/main/java/binnie/craftgui/events/EventHandler.java +++ b/src/main/java/binnie/craftgui/events/EventHandler.java @@ -2,6 +2,8 @@ package binnie.craftgui.events; import binnie.craftgui.core.IWidget; +import javax.annotation.Nullable; + public abstract class EventHandler { Class eventClass; Origin origin; diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index b56da00a..909ec4c7 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -16,6 +16,7 @@ import binnie.core.machines.transfer.TransferRequest; import binnie.core.network.packet.MessageContainerUpdate; import binnie.craftgui.minecraft.control.ControlSlot; import binnie.craftgui.minecraft.control.EnumHighlighting; +import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.EntityPlayer; @@ -79,33 +80,6 @@ public class ContainerCraftGUI extends Container { return this.window.isServer() ? Side.SERVER : Side.CLIENT; } - @Override - @Nullable - public Slot getSlot(final int index) { - if (index < 0 || index >= this.inventorySlots.size()) { - return null; - } - return this.inventorySlots.get(index); - } - - @Override - public void putStackInSlot(final int index, final ItemStack par2ItemStack) { - Slot slot = this.getSlot(index); - if (slot != null) { - slot.putStack(par2ItemStack); - } - } - - @Override - public void putStacksInSlots(final ItemStack[] par1ArrayOfItemStack) { - for (int i = 0; i < par1ArrayOfItemStack.length; ++i) { - Slot slot = this.getSlot(i); - if (slot != null) { - slot.putStack(par1ArrayOfItemStack[i]); - } - } - } - @Override public void onContainerClosed(final EntityPlayer par1EntityPlayer) { this.crafters.remove(par1EntityPlayer); @@ -125,7 +99,6 @@ public class ContainerCraftGUI extends Container { } } - @Nullable @Override public ItemStack slotClick(int slotNum, int dragType, ClickType clickType, EntityPlayer player) { @@ -134,11 +107,9 @@ public class ContainerCraftGUI extends Container { ((CustomSlot) slot).onSlotClick(this, dragType, clickType, player); return player.inventory.getItemStack(); } - final ItemStack stack = super.slotClick(slotNum, dragType, clickType, player); - return stack; + return super.slotClick(slotNum, dragType, clickType, player); } - public void sendNBTToClient(final String key, final NBTTagCompound nbt) { this.syncedNBT.put(key, nbt); } @@ -153,15 +124,14 @@ 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); - if (request == null) { - return null; - } final ItemStack itemstack = request.transfer(true); final Slot shiftClickedSlot = this.inventorySlots.get(slotnumber); shiftClickedSlot.putStack(itemstack); @@ -170,9 +140,6 @@ public class ContainerCraftGUI extends Container { } private TransferRequest getShiftClickRequest(final EntityPlayer player, final int slotnumber) { - if (slotnumber < 0) { - return null; - } final Slot shiftClickedSlot = this.inventorySlots.get(slotnumber); ItemStack itemstack = null; if (shiftClickedSlot.getHasStack()) { @@ -201,12 +168,19 @@ public class ContainerCraftGUI extends Container { return request; } + @Nullable public final ItemStack tankClick(final EntityPlayer player, final int slotID) { - if (player.inventory.getItemStack() == null) { + IInventory inventory = this.window.getInventory(); + if (inventory == null) { return null; } - ItemStack heldItem = player.inventory.getItemStack().copy(); - heldItem = new TransferRequest(heldItem, this.window.getInventory()).setOrigin(player.inventory).setTargetSlots(new int[0]).setTargetTanks(new int[]{slotID}).transfer(true); + ItemStack heldItem = player.inventory.getItemStack(); + if (heldItem == null) { + return null; + } + heldItem = heldItem.copy(); + TransferRequest transferRequest = new TransferRequest(heldItem, inventory).setOrigin(player.inventory).setTargetSlots(new int[0]).setTargetTanks(new int[]{slotID}); + heldItem = transferRequest.transfer(true); player.inventory.setItemStack(heldItem); if (player instanceof EntityPlayerMP) { ((EntityPlayerMP) player).updateHeldItem(); @@ -295,18 +269,6 @@ public class ContainerCraftGUI extends Container { this.syncedNBT.clear(); } -//FIXME hack - - /** - * sets whether the player can craft in this inventory or not - */ - @Override - public void setCanCraft(EntityPlayer player, boolean canCraft) { - super.setCanCraft(player, canCraft); - } -//end - - private NBTTagCompound createErrorNBT(final IErrorStateSource error) { final NBTTagCompound nbt = new NBTTagCompound(); ErrorState state = null; @@ -378,6 +340,7 @@ public class ContainerCraftGUI extends Container { } } + @Nullable public ErrorState getErrorState() { return this.error; } @@ -409,9 +372,6 @@ public class ContainerCraftGUI extends Container { private void onMouseOverSlot(final EntityPlayer player, final NBTTagCompound data) { final int slotnumber = data.getShort("slot"); final TransferRequest request = this.getShiftClickRequest(player, slotnumber); - if (request == null) { - return; - } request.transfer(false); final NBTTagCompound nbt = new NBTTagCompound(); final List slots = new ArrayList<>(); @@ -437,11 +397,14 @@ public class ContainerCraftGUI extends Container { } } - private CustomSlot getSlot(final IInventory inventory, final int id) { - for (final Object o : this.inventorySlots) { - final CustomSlot slot = (CustomSlot) o; - if (slot.inventory == inventory && slot.getSlotIndex() == id) { - return slot; + @Nullable + private CustomSlot getSlot(@Nullable final IInventory inventory, final int id) { + if (inventory != null) { + for (final Object o : this.inventorySlots) { + final CustomSlot slot = (CustomSlot) o; + if (slot.inventory == inventory && slot.getSlotIndex() == id) { + return slot; + } } } return null; @@ -475,18 +438,22 @@ public class ContainerCraftGUI extends Container { } protected IInventory getInventory(final InventoryType type) { - if (type == InventoryType.Machine) { - return this.window.getInventory(); + switch (type) { + case Machine: { + IInventory inventory = this.window.getInventory(); + Preconditions.checkState(inventory != null, "Window has no machine inventory: %s", this.window); + return inventory; + } + case Player: + return this.window.getPlayer().inventory; + case Window: + return this.window.getWindowInventory(); + default: + throw new IllegalArgumentException("Unknown type: " + type); } - if (type == InventoryType.Player) { - return this.window.getPlayer().inventory; - } - if (type == InventoryType.Window) { - return this.window.getWindowInventory(); - } - return null; } + @Nullable private Slot createServerSlot(final InventoryType type, final int index, final int slotNumber) { final IInventory inventory = this.getInventory(type); if (this.inventorySlots.get(slotNumber) != null) { diff --git a/src/main/java/binnie/craftgui/minecraft/IWindowAffectsShiftClick.java b/src/main/java/binnie/craftgui/minecraft/IWindowAffectsShiftClick.java index 637f369b..29d71549 100644 --- a/src/main/java/binnie/craftgui/minecraft/IWindowAffectsShiftClick.java +++ b/src/main/java/binnie/craftgui/minecraft/IWindowAffectsShiftClick.java @@ -3,5 +3,5 @@ package binnie.craftgui.minecraft; import binnie.core.machines.transfer.TransferRequest; public interface IWindowAffectsShiftClick { - void alterRequest(final TransferRequest p0); + void alterRequest(final TransferRequest request); } diff --git a/src/main/java/binnie/craftgui/minecraft/InventoryType.java b/src/main/java/binnie/craftgui/minecraft/InventoryType.java index 77b5f517..ad34024e 100644 --- a/src/main/java/binnie/craftgui/minecraft/InventoryType.java +++ b/src/main/java/binnie/craftgui/minecraft/InventoryType.java @@ -3,6 +3,5 @@ package binnie.craftgui.minecraft; public enum InventoryType { Player, Machine, - Window, - Custom; + Window } diff --git a/src/main/java/binnie/craftgui/minecraft/ListMap.java b/src/main/java/binnie/craftgui/minecraft/ListMap.java index c906e1d6..9326d076 100644 --- a/src/main/java/binnie/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/craftgui/minecraft/ListMap.java @@ -1,5 +1,6 @@ package binnie.craftgui.minecraft; +import javax.annotation.Nullable; import java.util.Collection; import java.util.Iterator; import java.util.LinkedHashMap; @@ -96,6 +97,7 @@ class ListMap implements List { } @Override + @Nullable public T get(final int index) { return this.map.get(index); } @@ -112,6 +114,7 @@ class ListMap implements List { } @Override + @Nullable public T remove(final int index) { return null; } @@ -133,16 +136,16 @@ class ListMap implements List { @Override public ListIterator listIterator() { - return null; + throw new UnsupportedOperationException(); } @Override public ListIterator listIterator(final int index) { - return null; + throw new UnsupportedOperationException(); } @Override public List subList(final int fromIndex, final int toIndex) { - return null; + throw new UnsupportedOperationException(); } } diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index 1d8a05c1..93565368 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -32,6 +32,7 @@ import binnie.craftgui.resource.StyleSheetManager; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITexture; import binnie.craftgui.resource.minecraft.StandardTexture; +import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -46,7 +47,7 @@ import java.util.ArrayList; import java.util.Deque; public abstract class Window extends TopLevelWidget implements INetwork.RecieveGuiNBT { - @Nullable + @Nullable // client side only private GuiCraftGUI gui; private ContainerCraftGUI container; private WindowInventory windowInventory; @@ -59,12 +60,54 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG @Nullable private StandardTexture bgText2; private boolean hasBeenInitialised; - @Nullable private EntityPlayer player; @Nullable private IInventory entityInventory; private Side side; + public Window(final int width, final int height, final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + this.titleButtonLeft = 8; + this.titleButtonRight = 8; + this.bgText1 = null; + this.bgText2 = null; + this.hasBeenInitialised = false; + this.side = Side.CLIENT; + this.side = side; + this.player = player; + this.entityInventory = inventory; + this.container = new ContainerCraftGUI(this); + this.windowInventory = new WindowInventory(this); + if (side == Side.SERVER) { + return; + } + + this.setSize(new IPoint(width, height)); + this.gui = new GuiCraftGUI(this); + for (final EnumHighlighting h : EnumHighlighting.values()) { + ControlSlot.highlighting.put(h, new ArrayList<>()); + } + CraftGUI.render.setStyleSheet(StyleSheetManager.getDefault()); + this.titleButtonLeft = -14; + if (this.showHelpButton()) { + new ControlHelp(this, this.titleButtonLeft += 22, 8); + } + String showInfoButton = this.showInfoButton(); + if (showInfoButton != null) { + new ControlInfo(this, this.titleButtonLeft += 22, 8, showInfoButton); + } + this.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { + @Override + public void onEvent(final EventWidget.ChangeSize event) { + if (Window.this.isClient()) { + Window.this.getGui().resize(Window.this.getSize()); + if (Window.this.title != null) { + Window.this.title.setSize(new IPoint(Window.this.w(), Window.this.title.h())); + } + } + } + }); + } + public void getTooltip(final Tooltip tooltip) { final Deque queue = this.calculateMousedOverWidgets(); while (!queue.isEmpty()) { @@ -130,54 +173,13 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG return null; } - public Window(final int width, final int height, final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { - this.titleButtonLeft = 8; - this.titleButtonRight = 8; - this.bgText1 = null; - this.bgText2 = null; - this.hasBeenInitialised = false; - this.side = Side.CLIENT; - this.side = side; - this.setInventories(player, inventory); - this.container = new ContainerCraftGUI(this); - this.windowInventory = new WindowInventory(this); - if (side == Side.SERVER) { - return; - } - this.setSize(new IPoint(width, height)); - this.gui = new GuiCraftGUI(this); - for (final EnumHighlighting h : EnumHighlighting.values()) { - ControlSlot.highlighting.put(h, new ArrayList<>()); - } - CraftGUI.render.setStyleSheet(StyleSheetManager.getDefault()); - this.titleButtonLeft = -14; - if (this.showHelpButton()) { - new ControlHelp(this, this.titleButtonLeft += 22, 8); - } - String showInfoButton = this.showInfoButton(); - if (showInfoButton != null) { - new ControlInfo(this, this.titleButtonLeft += 22, 8, showInfoButton); - } - this.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { - @Override - public void onEvent(final EventWidget.ChangeSize event) { - if (Window.this.isClient() && Window.this.getGui() != null) { - Window.this.getGui().resize(Window.this.getSize()); - if (Window.this.title != null) { - Window.this.title.setSize(new IPoint(Window.this.w(), Window.this.title.h())); - } - } - } - }); - } - public void setTitle(final String title) { (this.title = new ControlTextCentered(this, 12, title)).setColour(4210752); } @SideOnly(Side.CLIENT) - @Nullable public final GuiCraftGUI getGui() { + Preconditions.checkState(this.gui != null, "tried to get gui on server-side, should not be possible"); return this.gui; } @@ -239,10 +241,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG @Nullable public ItemStack getHeldItemStack() { - if (this.player != null) { - return this.player.inventory.getItemStack(); - } - return null; + return this.player.inventory.getItemStack(); } @Nullable @@ -250,18 +249,11 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG return this.entityInventory; } - public void setInventories(final EntityPlayer player2, @Nullable final IInventory inventory) { - this.player = player2; - this.entityInventory = inventory; - } - public void onClose() { } public void setHeldItemStack(final ItemStack stack) { - if (this.player != null) { - this.player.inventory.setItemStack(stack); - } + this.player.inventory.setItemStack(stack); } public boolean isServer() { @@ -273,10 +265,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG } public World getWorld() { - if (this.getPlayer() != null) { - return this.getPlayer().worldObj; - } - return BinnieCore.getBinnieProxy().getWorld(); + return this.getPlayer().worldObj; } public void onInventoryUpdate() { @@ -320,6 +309,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG } public static T get(final IWidget widget) { - return (T) widget.getSuperParent(); + return (T) widget.getTopParent(); } } diff --git a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/craftgui/minecraft/WindowInventory.java index b06354e6..b4f4912c 100644 --- a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/craftgui/minecraft/WindowInventory.java @@ -41,6 +41,7 @@ public class WindowInventory implements IInventory { } @Override + @Nullable public ItemStack getStackInSlot(final int var1) { if (this.inventory.containsKey(var1)) { return this.inventory.get(var1); @@ -49,6 +50,7 @@ public class WindowInventory implements IInventory { } @Override + @Nullable public ItemStack decrStackSize(final int index, int amount) { if (this.inventory.containsKey(index)) { final ItemStack item = this.inventory.get(index); @@ -57,8 +59,7 @@ public class WindowInventory implements IInventory { if (amount > available) { amount = available; } - final ItemStack itemStack = item; - itemStack.stackSize -= amount; + item.stackSize -= amount; output.stackSize = amount; if (item.stackSize == 0) { this.setInventorySlotContents(index, null); @@ -69,8 +70,8 @@ public class WindowInventory implements IInventory { } @Override - public void setInventorySlotContents(final int var1, final ItemStack var2) { - this.inventory.put(var1, var2); + public void setInventorySlotContents(final int index, @Nullable final ItemStack stack) { + this.inventory.put(index, stack); this.markDirty(); } @@ -111,11 +112,11 @@ public class WindowInventory implements IInventory { return !this.disabledAutoDispenses.contains(i); } + @Nullable public SlotValidator getValidator(final int i) { return this.validators.get(i); } - @Override public boolean hasCustomName() { return false; @@ -136,10 +137,9 @@ public class WindowInventory implements IInventory { return "window.inventory"; } - //TODO INV @Override public void clear() { - + this.inventory.clear(); } @Override @@ -160,10 +160,9 @@ public class WindowInventory implements IInventory { @Nullable @Override public ItemStack removeStackFromSlot(int index) { - return null; + return this.inventory.remove(index); } - //TODO end inv @Override public ITextComponent getDisplayName() { return new TextComponentString("Inventory"); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java index c2a27f52..840b5902 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java @@ -49,7 +49,7 @@ public class ControlItemDisplay extends Control implements ITooltip { return; } - final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getSuperParent().getPosition()); + final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getTopParent().getPosition()); if (relativeToWindow.x() > Window.get(this).getSize().x() + 100 || relativeToWindow.y() > Window.get(this).getSize().y() + 100) { return; } @@ -67,7 +67,7 @@ public class ControlItemDisplay extends Control implements ITooltip { GlStateManager.enableAlpha(); } - public void setItemStack(final ItemStack itemStack) { + public void setItemStack(@Nullable final ItemStack itemStack) { this.itemStack = itemStack; } @@ -79,7 +79,7 @@ public class ControlItemDisplay extends Control implements ITooltip { @Override public void getTooltip(final Tooltip tooltip) { if (this.hastooltip && this.itemStack != null) { - tooltip.add(this.itemStack.getTooltip(((Window) this.getSuperParent()).getPlayer(), false)); + 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 f6753cfc..b81d515c 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java @@ -78,21 +78,20 @@ public class ControlLiquidTank extends Control implements ITooltip { public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(this.horizontal ? CraftGUITexture.HorizontalLiquidTank : CraftGUITexture.LiquidTank, IPoint.ZERO); GuiCraftGUI gui = Window.get(this).getGui(); - if (gui != null) { - if (this.isMouseOver() && gui.isHelpMode()) { - final int c = -1442840576 + MinecraftTooltip.getOutline(Tooltip.Type.Help); - RenderUtil.drawGradientRect(this.getArea().inset(1), c, c); - } else if (ControlLiquidTank.tankError.contains(this.tankID)) { - final int c = -1442840576 + MinecraftTooltip.getOutline(MinecraftTooltip.Type.Error); - RenderUtil.drawGradientRect(this.getArea().inset(1), c, c); - } else if (this.getSuperParent().getMousedOverWidget() == this) { - if (gui.getDraggedItem() != null) { - RenderUtil.drawGradientRect(this.getArea().inset(1), -1426089575, -1426089575); - } else { - RenderUtil.drawGradientRect(this.getArea().inset(1), -2130706433, -2130706433); - } + if (this.isMouseOver() && gui.isHelpMode()) { + final int c = -1442840576 + MinecraftTooltip.getOutline(Tooltip.Type.Help); + RenderUtil.drawGradientRect(this.getArea().inset(1), c, c); + } else if (ControlLiquidTank.tankError.contains(this.tankID)) { + 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) { + RenderUtil.drawGradientRect(this.getArea().inset(1), -1426089575, -1426089575); + } else { + RenderUtil.drawGradientRect(this.getArea().inset(1), -2130706433, -2130706433); } } + if (this.isTankValid()) { final int height = this.horizontal ? 16 : 58; final int squaled = Math.round(height * (this.getTank().getAmount() / this.getTank().getCapacity())); @@ -134,7 +133,7 @@ public class ControlLiquidTank extends Control implements ITooltip { public void onRenderForeground(int guiWidth, int guiHeight) { CraftGUI.render.texture(this.horizontal ? CraftGUITexture.HorizontalLiquidTankOverlay : CraftGUITexture.LiquidTankOverlay, IPoint.ZERO); GuiCraftGUI gui = Window.get(this).getGui(); - if (this.isMouseOver() && gui != null && gui.isHelpMode()) { + if (this.isMouseOver() && gui.isHelpMode()) { final IArea area = this.getArea(); RenderUtil.setColour(MinecraftTooltip.getOutline(Tooltip.Type.Help)); CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1)); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java index f0d4b528..e4d72134 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java @@ -6,33 +6,33 @@ import binnie.craftgui.minecraft.InventoryType; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; public class ControlPlayerInventory extends Control { - private List slots; + private final List slots; public ControlPlayerInventory(final IWidget parent, final boolean wide) { super(parent, parent.getSize().x() / 2 - (wide ? 110 : 81), parent.getSize().y() - (wide ? 54 : 76) - 12, wide ? 220 : 162, wide ? 54 : 76); this.slots = new ArrayList<>(); for (int row = 0; row < 3; ++row) { for (int column = 0; column < 9; ++column) { - final ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18); + final ControlSlot slot = new ControlSlot.Builder(this, (wide ? 58 : 0) + column * 18, row * 18).assign(InventoryType.Player, 9 + column + row * 9); this.slots.add(slot); } } if (wide) { for (int i1 = 0; i1 < 9; ++i1) { - final ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18); + final ControlSlot slot2 = new ControlSlot.Builder(this, i1 % 3 * 18, i1 / 3 * 18).assign(InventoryType.Player, i1); this.slots.add(slot2); } } else { for (int i1 = 0; i1 < 9; ++i1) { - final ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58); + final ControlSlot slot2 = new ControlSlot.Builder(this, i1 * 18, 58).assign(InventoryType.Player, i1); this.slots.add(slot2); } } - this.create(); } public ControlPlayerInventory(final IWidget parent) { @@ -44,30 +44,13 @@ public class ControlPlayerInventory extends Control { this.slots = new ArrayList<>(); for (int row = 0; row < 6; ++row) { for (int column = 0; column < 6; ++column) { - final ControlSlot slot = new ControlSlot(this, column * 18, row * 18); + final ControlSlot slot = new ControlSlot.Builder(this, column * 18, row * 18).assign(InventoryType.Player, 9 + column + row * 9); this.slots.add(slot); } } - this.create(); } - public void create() { - for (int row = 0; row < 3; ++row) { - for (int column = 0; column < 9; ++column) { - final ControlSlot slot = this.slots.get(column + row * 9); - slot.assign(InventoryType.Player, 9 + column + row * 9); - } - } - for (int i1 = 0; i1 < 9; ++i1) { - final ControlSlot slot2 = this.slots.get(27 + i1); - slot2.assign(InventoryType.Player, i1); - } - } - - public void addItem(final ItemStack item) { - if (item == null) { - return; - } + public void addItem(@Nullable final ItemStack item) { for (final ControlSlot slot : this.slots) { if (!slot.slot.getHasStack()) { slot.slot.putStack(item); @@ -77,10 +60,12 @@ public class ControlPlayerInventory extends Control { public void addInventory(final IInventory inventory) { for (int i = 0; i < inventory.getSizeInventory(); ++i) { - this.addItem(inventory.getStackInSlot(i)); + ItemStack stackInSlot = inventory.getStackInSlot(i); + this.addItem(stackInSlot); } } + @Nullable public ControlSlot getSlot(final int i) { if (i < 0 || i >= this.slots.size()) { return null; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java index 45a2d910..595f89eb 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java @@ -11,6 +11,7 @@ import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.CustomSlot; +import binnie.craftgui.minecraft.GuiCraftGUI; import binnie.craftgui.minecraft.InventoryType; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.WindowInventory; @@ -25,46 +26,69 @@ import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; import java.util.ArrayList; -import java.util.HashMap; +import java.util.EnumMap; import java.util.List; import java.util.Map; public class ControlSlot extends ControlSlotBase { - public static Map> highlighting = new HashMap<>(); + public static final Map> highlighting = new EnumMap<>(EnumHighlighting.class); public static boolean shiftClickActive = false; - public Slot slot; - public ControlSlot(final IWidget parent, final int x, final int y) { + static { + for (final EnumHighlighting h : EnumHighlighting.values()) { + ControlSlot.highlighting.put(h, new ArrayList<>()); + } + } + + public static class Builder { + private final IWidget parent; + private final int x; + private final int y; + + public Builder(final IWidget parent, final int x, final int y) { + this.parent = parent; + this.x = x; + this.y = y; + } + + public ControlSlot assign(final int index) { + return assign(InventoryType.Machine, index); + } + + public ControlSlot assign(final InventoryType inventory, final int index) { + Slot slot = ((Window) parent.getTopParent()).getContainer().getOrCreateSlot(inventory, index); + return new ControlSlot(parent, x, y, slot); + } + } + + public final Slot slot; + + public ControlSlot(final IWidget parent, final int x, final int y, final Slot slot) { super(parent, x, y); - this.slot = null; + this.slot = slot; this.addSelfEventHandler(new EventMouse.Down.Handler() { @Override public void onEvent(final EventMouse.Down event) { - if (ControlSlot.this.slot != null) { - final PlayerControllerMP playerController = ((Window) ControlSlot.this.getSuperParent()).getGui().getMinecraft().playerController; - final int windowId = ((Window) ControlSlot.this.getSuperParent()).getContainer().windowId; - final int slotNumber = ControlSlot.this.slot.slotNumber; - final int button = event.getButton(); - Window.get(ControlSlot.this.getWidget()).getGui(); - playerController.windowClick(windowId, slotNumber, button, GuiScreen.isShiftKeyDown() ? ClickType.QUICK_MOVE : ClickType.PICKUP, ((Window) ControlSlot.this.getSuperParent()).getGui().getMinecraft().thePlayer); + Window superParent = (Window) ControlSlot.this.getTopParent(); + GuiCraftGUI superParentGui = superParent.getGui(); + Minecraft minecraft = superParentGui.getMinecraft(); + final PlayerControllerMP playerController = minecraft.playerController; + final int windowId = superParent.getContainer().windowId; + final int slotNumber = ControlSlot.this.slot.slotNumber; + final int button = event.getButton(); + Window.get(ControlSlot.this.getWidget()).getGui(); + if (playerController != null) { + playerController.windowClick(windowId, slotNumber, button, GuiScreen.isShiftKeyDown() ? ClickType.QUICK_MOVE : ClickType.PICKUP, minecraft.thePlayer); } } }); } - public ControlSlot(final IWidget parent, final int x, final int y, final Slot slot) { - super(parent, x, y); - this.slot = null; - this.slot = slot; - } - @Override public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO); - if (this.slot == null) { - return; - } final InventorySlot islot = this.getInventorySlot(); if (islot != null) { SlotValidator validator = islot.getValidator(); @@ -89,8 +113,9 @@ public class ControlSlot extends ControlSlotBase { final int c = -1442840576 + Math.min(highlight.getKey().getColour(), 16777215); RenderUtil.drawGradientRect(new IArea(1, 1, 16, 16), c, c); } - if (!highlighted && this.getSuperParent().getMousedOverWidget() == this) { - if (Window.get(this).getGui().getDraggedItem() != null && !this.slot.isItemValid(Window.get(this).getGui().getDraggedItem())) { + if (!highlighted && this.getTopParent().getMousedOverWidget() == this) { + GuiCraftGUI gui = Window.get(this).getGui(); + if (gui.getDraggedItem() != null && !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); @@ -100,9 +125,6 @@ public class ControlSlot extends ControlSlotBase { @Override public void onRenderOverlay() { - if (this.slot == null) { - return; - } boolean highlighted = false; for (final Map.Entry> highlight : ControlSlot.highlighting.entrySet()) { if (highlight.getKey() == EnumHighlighting.ShiftClick && !ControlSlot.shiftClickActive) { @@ -126,18 +148,13 @@ public class ControlSlot extends ControlSlotBase { @Override public void onUpdateClient() { super.onUpdateClient(); - if (this.slot == null) { - return; - } if (this.isMouseOver() && GuiScreen.isShiftKeyDown()) { Window.get(this).getContainer().setMouseOverSlot(this.slot); ControlSlot.shiftClickActive = true; } if (Window.get(this).getGui().isHelpMode() && this.isMouseOver()) { for (final ControlSlot slot2 : this.getControlSlots()) { - if (slot2.slot != null) { - ControlSlot.highlighting.get(EnumHighlighting.Help).add(slot2.slot.slotNumber); - } + ControlSlot.highlighting.get(EnumHighlighting.Help).add(slot2.slot.slotNumber); } } } @@ -156,31 +173,13 @@ public class ControlSlot extends ControlSlotBase { @Override public ItemStack getItemStack() { - if (this.slot != null) { - return this.slot.getStack(); - } - return null; - } - - public ControlSlot assign(final int index) { - return this.assign(InventoryType.Machine, index); - } - - public ControlSlot assign(final InventoryType inventory, final int index) { - if (this.slot != null) { - return this; - } - this.slot = ((Window) this.getSuperParent()).getContainer().getOrCreateSlot(inventory, index); - return this; + return this.slot.getStack(); } @Override public void getHelpTooltip(final Tooltip tooltip) { - if (this.slot == null) { - return; - } final InventorySlot slot = this.getInventorySlot(); - if (this.getInventorySlot() != null) { + if (slot != null) { tooltip.add(slot.getName()); tooltip.add("Insert Side: " + MachineSide.asString(slot.getInputSides())); tooltip.add("Extract Side: " + MachineSide.asString(slot.getOutputSides())); @@ -196,13 +195,13 @@ public class ControlSlot extends ControlSlotBase { } } + @Nullable public InventorySlot getInventorySlot() { - return (this.slot instanceof CustomSlot) ? ((CustomSlot) this.slot).getInventorySlot() : null; - } - - static { - for (final EnumHighlighting h : EnumHighlighting.values()) { - ControlSlot.highlighting.put(h, new ArrayList<>()); + if (this.slot instanceof CustomSlot) { + CustomSlot customSlot = (CustomSlot) this.slot; + return customSlot.getInventorySlot(); + } else { + return null; } } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java index 6d37014f..e2f2a7a9 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java @@ -3,6 +3,7 @@ package binnie.craftgui.minecraft.control; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.IWidget; import binnie.craftgui.minecraft.InventoryType; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import java.util.ArrayList; @@ -10,24 +11,45 @@ import java.util.Iterator; import java.util.List; public class ControlSlotArray extends Control implements Iterable { - private int rows; - private int columns; - private List slots; + public static class Builder { + private final IWidget parent; + private final int x; + private final int y; + private final int columns; + private final int rows; - public ControlSlotArray(final IWidget parent, final int x, final int y, final int columns, final int rows) { - super(parent, x, y, columns * 18, rows * 18); - this.slots = new ArrayList<>(); - this.rows = rows; - this.columns = columns; - for (int row = 0; row < rows; ++row) { - for (int column = 0; column < columns; ++column) { - this.slots.add(this.createSlot(column * 18, row * 18)); + public Builder(final IWidget parent, final int x, final int y, final int columns, final int rows) { + this.parent = parent; + this.x = x; + this.y = y; + this.columns = columns; + this.rows = rows; + } + + public ControlSlotArray create(final int[] index) { + return this.create(InventoryType.Machine, index); + } + + public ControlSlotArray create(final InventoryType type, final int[] index) { + ControlSlotArray controlSlots = new ControlSlotArray(parent, x, y, columns, rows); + int i = 0; + for (int row = 0; row < rows; ++row) { + for (int column = 0; column < columns; ++column) { + ControlSlot.Builder slotBuilder = new ControlSlot.Builder(controlSlots, column * 18, row * 18); + ControlSlot slot = slotBuilder.assign(type, index[i++]); + controlSlots.slots.add(slot); + } } + + return controlSlots; } } - public ControlSlot createSlot(final int x, final int y) { - return new ControlSlot(this, x, y); + private List slots = new ArrayList<>(); + + private ControlSlotArray(final IWidget parent, final int x, final int y, final int columns, final int rows) { + super(parent, x, y, columns * 18, rows * 18); + this.slots = new ArrayList<>(); } public void setItemStacks(final ItemStack[] array) { @@ -36,30 +58,17 @@ public class ControlSlotArray extends Control implements Iterable { if (i >= this.slots.size()) { return; } - this.slots.get(i).slot.putStack(item); + ControlSlot controlSlot = this.slots.get(i); + Slot slot = controlSlot.slot; + slot.putStack(item); ++i; } } public ControlSlot getControlSlot(final int i) { - if (i < 0 || i >= this.slots.size()) { - return null; - } return this.slots.get(i); } - public ControlSlotArray create(final int[] index) { - return this.create(InventoryType.Machine, index); - } - - public ControlSlotArray create(final InventoryType type, final int[] index) { - int i = 0; - for (final ControlSlot slot : this.slots) { - slot.assign(type, index[i++]); - } - return this; - } - @Override public Iterator iterator() { return this.slots.iterator(); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java index 8b2040da..ed11ca51 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java @@ -14,6 +14,8 @@ import binnie.craftgui.minecraft.Window; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + public abstract class ControlSlotBase extends Control implements ITooltip { private ControlItemDisplay itemDisplay; @@ -43,7 +45,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip { public void onRenderBackground(int guiWidth, int guiHeight) { final int size = this.getSize().x(); CraftGUI.render.texture(CraftGUITexture.Slot, this.getArea()); - if (this.getSuperParent().getMousedOverWidget() == this) { + if (this.getTopParent().getMousedOverWidget() == this) { RenderUtil.drawGradientRect(new IArea(new IPoint(1, 1), this.getArea().size().sub(new IPoint(2, 2))), -2130706433, -2130706433); } } @@ -60,8 +62,9 @@ public abstract class ControlSlotBase extends Control implements ITooltip { if (item == null) { return; } - tooltip.add(item.getTooltip(((Window) this.getSuperParent()).getPlayer(), false)); + 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 70724f17..92b13fee 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java @@ -6,6 +6,8 @@ import binnie.craftgui.controls.tab.ControlTabBar; import binnie.craftgui.core.geometry.IPoint; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + public class ControlTabIcon extends ControlTab { private ControlItemDisplay item; @@ -15,6 +17,7 @@ public class ControlTabIcon extends ControlTab { this.item.hastooltip = false; } + @Nullable public ItemStack getItemStack() { if (this.value instanceof IItemStackRepresentitive) { return ((IItemStackRepresentitive) this.value).getItemStackRepresentitive(); @@ -26,7 +29,8 @@ public class ControlTabIcon extends ControlTab { public void onUpdateClient() { super.onUpdateClient(); this.item.setItemStack(this.getItemStack()); - final int x = ((ControlTabBar) this.getParent()).getDirection().x(); + ControlTabBar parent = (ControlTabBar) this.getParent(); + final int x = parent.getDirection().x(); this.item.setOffset(new IPoint((this.isCurrentSelection() || this.isMouseOver()) ? 0 : (-4 * x), 0)); } diff --git a/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java index e682d92c..a3eae6ba 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java @@ -54,7 +54,7 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme @Override public void onEvent(final EventMouse.Down event) { if (event.getButton() == 0 && ControlDatabaseIndividualDisplay.this.species != null && EnumDiscoveryState.Show == ControlDatabaseIndividualDisplay.this.discovered) { - ((WindowAbstractDatabase) ControlDatabaseIndividualDisplay.this.getSuperParent()).gotoSpeciesDelayed(ControlDatabaseIndividualDisplay.this.species); + ((WindowAbstractDatabase) ControlDatabaseIndividualDisplay.this.getTopParent()).gotoSpeciesDelayed(ControlDatabaseIndividualDisplay.this.species); } } }); diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java b/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java index b6902e87..894d33e8 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java @@ -30,7 +30,7 @@ class ControlMutationBox extends ControlListBox { this.species = species; this.index = 0; this.movePercentage(-100.0f); - final BreedingSystem system = ((WindowAbstractDatabase) this.getSuperParent()).getBreedingSystem(); + final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); final List discovered = system.getDiscoveredMutations(Window.get(this).getWorld(), Window.get(this).getUsername()); if (species != null) { if (this.type == Type.Resultant) { diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationItem.java b/src/main/java/binnie/craftgui/mod/database/ControlMutationItem.java index 87b1c2eb..3fdc22c2 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationItem.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlMutationItem.java @@ -21,8 +21,8 @@ class ControlMutationItem extends ControlOption { this.itemWidget3 = new ControlDatabaseIndividualDisplay(this, 104, 4); this.addSymbol = new ControlMutationSymbol(this, 24, 4, 0); this.arrowSymbol = new ControlMutationSymbol(this, 64, 4, 1); - final boolean isNEI = ((WindowAbstractDatabase) this.getSuperParent()).isNEI(); - final BreedingSystem system = ((WindowAbstractDatabase) this.getSuperParent()).getBreedingSystem(); + final boolean isNEI = ((WindowAbstractDatabase) this.getTopParent()).isNEI(); + final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); if (this.getValue() != null) { final boolean isMutationDiscovered = system.isMutationDiscovered(this.getValue(), Window.get(this).getWorld(), Window.get(this).getUsername()); IAlleleSpecies allele = null; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java b/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java index ad391012..4d27d11b 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java @@ -41,8 +41,8 @@ class ControlMutationSymbol extends Control implements ITooltip { public void setValue(final IMutation value) { this.value = value; - final boolean isNEI = ((WindowAbstractDatabase) this.getSuperParent()).isNEI(); - final BreedingSystem system = ((WindowAbstractDatabase) this.getSuperParent()).getBreedingSystem(); + final boolean isNEI = ((WindowAbstractDatabase) this.getTopParent()).isNEI(); + final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); this.discovered = (isNEI || system.isMutationDiscovered(value, Window.get(this).getWorld(), Window.get(this).getUsername())); if (this.discovered) { this.setColour(16777215); @@ -56,7 +56,7 @@ class ControlMutationSymbol extends Control implements ITooltip { if (this.type == 1 && this.discovered) { final IAllele species1 = this.value.getAllele0(); final IAllele species2 = this.value.getAllele1(); - final BreedingSystem system = ((WindowAbstractDatabase) this.getSuperParent()).getBreedingSystem(); + 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) { diff --git a/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java b/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java index 01897499..9dd3fe96 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java +++ b/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java @@ -24,7 +24,7 @@ public class PageBranchSpecies extends PageBranch { @Override public void onEvent(final EventValueChanged event) { if (event.isOrigin(PageBranchSpecies.this.pageBranchSpecies_speciesList)) { - ((WindowAbstractDatabase) PageBranchSpecies.this.getSuperParent()).gotoSpecies((IAlleleSpecies) event.getValue()); + ((WindowAbstractDatabase) PageBranchSpecies.this.getTopParent()).gotoSpecies((IAlleleSpecies) event.getValue()); } } }); diff --git a/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java b/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java index 6d10f224..747e81b2 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java +++ b/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java @@ -15,6 +15,6 @@ public class PageBreederStats extends Control { super(parent, 0, 0, w, h); this.player = player; final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.stats")); - final BreedingSystem system = ((WindowAbstractDatabase) this.getSuperParent()).getBreedingSystem(); + final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); } } diff --git a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java index 14326070..f6521f29 100644 --- a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java @@ -202,7 +202,7 @@ public abstract class WindowAbstractDatabase extends Window { public void onUpdateClient() { super.onUpdateClient(); if (this.gotoSpecies != null) { - ((WindowAbstractDatabase) this.getSuperParent()).gotoSpecies(this.gotoSpecies); + ((WindowAbstractDatabase) this.getTopParent()).gotoSpecies(this.gotoSpecies); this.gotoSpecies = null; } } diff --git a/src/main/java/binnie/craftgui/resource/Texture.java b/src/main/java/binnie/craftgui/resource/Texture.java index a75dbfd6..40f69760 100644 --- a/src/main/java/binnie/craftgui/resource/Texture.java +++ b/src/main/java/binnie/craftgui/resource/Texture.java @@ -5,7 +5,10 @@ import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.geometry.IBorder; import binnie.craftgui.core.geometry.Position; +import javax.annotation.Nullable; + public class Texture { + @Nullable public static final Texture NULL = null; IArea area; IBorder padding; diff --git a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java index 14e4d735..48b13cd8 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java @@ -11,6 +11,8 @@ import forestry.api.core.Tabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IItemModelRegister { EnumHiveFrame frame; @@ -53,6 +55,7 @@ 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()) { diff --git a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java b/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java index 795d57d7..3682aff9 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java @@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public class ItemIndustrialFrame extends Item { @@ -53,10 +54,12 @@ public class ItemIndustrialFrame extends Item { this.setUnlocalizedName("industrialFrame"); } + @Nullable public static IndustrialFrame getFrame(final ItemStack stack) { - if (stack == null || !stack.hasTagCompound() || !stack.getTagCompound().hasKey("frame")) { + NBTTagCompound tagCompound = stack.getTagCompound(); + if (tagCompound == null || !tagCompound.hasKey("frame")) { return null; } - return IndustrialFrame.values()[stack.getTagCompound().getInteger("frame")]; + return IndustrialFrame.values()[tagCompound.getInteger("frame")]; } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java index 487ab576..cb5bcf51 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java @@ -31,8 +31,7 @@ public class AlvearyFrame { public void createMachine(final Machine machine) { new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyFrame); final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(AlvearyFrame.slotFrame, "frame"); - inventory.getSlot(AlvearyFrame.slotFrame).setValidator(new SlotValidatorFrame()); + inventory.addSlot(AlvearyFrame.slotFrame, "frame").setValidator(new SlotValidatorFrame()); new ComponentFrameModifier(machine); } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java index a792c969..79a4eb33 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java @@ -60,8 +60,7 @@ public class AlvearyMutator { public void createMachine(final Machine machine) { new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyMutator); final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(AlvearyMutator.slotMutator, "mutator"); - inventory.getSlot(AlvearyMutator.slotMutator).setValidator(new SlotValidatorMutator()); + inventory.addSlot(AlvearyMutator.slotMutator, "mutator").setValidator(new SlotValidatorMutator()); new ComponentMutatorModifier(machine); } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java index 43919f90..1e6dd802 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java @@ -39,8 +39,7 @@ public class AlvearyStimulator { public void createMachine(final Machine machine) { new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator); final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(AlvearyStimulator.slotCircuit, "circuit"); - inventory.getSlot(AlvearyStimulator.slotCircuit).setValidator(new SlotValidatorCircuit()); + inventory.addSlot(AlvearyStimulator.slotCircuit, "circuit").setValidator(new SlotValidatorCircuit()); final ComponentPowerReceptor power = new ComponentPowerReceptor(machine); new ComponentStimulatorModifier(machine); } diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java b/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java index 5f2c454f..af5e10c0 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java @@ -14,6 +14,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public enum ExtraBeeGUID implements IBinnieGUID { Database, DatabaseNEI, @@ -24,6 +26,7 @@ public enum ExtraBeeGUID implements IBinnieGUID { AlvearyHatchery; @Override + @Nullable public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) { Window window = null; final TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z)); diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java index f651b2d0..8bcbcc40 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java @@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nullable; import java.util.List; public enum ExtraBeeItems implements IItemMiscProvider { @@ -48,7 +49,9 @@ public enum ExtraBeeItems implements IItemMiscProvider { String name; String modelPath; + @Nullable String metalString; + @Nullable String gemString; public static void init() { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java index 6cdfa559..7189ce02 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java @@ -6,6 +6,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; +import javax.annotation.Nullable; import java.util.LinkedHashSet; import java.util.Set; @@ -271,6 +272,7 @@ public enum ExtraBeesBranch implements IClassification { } @Override + @Nullable public IClassification[] getMemberGroups() { return null; } diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java index e2554628..29977d78 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java @@ -1,8 +1,6 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; -import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlPlayerInventory; import binnie.craftgui.minecraft.control.ControlSlot; @@ -11,17 +9,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public class WindowAlvearyFrame extends Window { - Machine machine; - ControlPlayerInventory playerInventory; public WindowAlvearyFrame(final EntityPlayer player, final IInventory inventory, final Side side) { super(176, 144, player, inventory, side); - this.machine = ((TileEntityMachine) inventory).getMachine(); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - if (player == null || inventory == null) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { return null; } return new WindowAlvearyFrame(player, inventory, side); @@ -30,9 +28,8 @@ public class WindowAlvearyFrame extends Window { @Override public void initialiseClient() { this.setTitle("Frame Housing"); - this.playerInventory = new ControlPlayerInventory(this); - final ControlSlot slot = new ControlSlot(this, 79, 30); - slot.assign(0); + ControlPlayerInventory playerInventory = new ControlPlayerInventory(this); + new ControlSlot.Builder(this, 79, 30).assign(0); } @Override diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java index b072a75b..95bb1492 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java @@ -12,17 +12,16 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; -public class WindowAlvearyHatchery extends Window { - Machine machine; - ControlPlayerInventory playerInventory; +import javax.annotation.Nullable; +public class WindowAlvearyHatchery extends Window { public WindowAlvearyHatchery(final EntityPlayer player, final IInventory inventory, final Side side) { super(176, 144, player, inventory, side); - this.machine = ((TileEntityMachine) inventory).getMachine(); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - if (player == null || inventory == null) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { return null; } return new WindowAlvearyHatchery(player, inventory, side); @@ -31,8 +30,8 @@ public class WindowAlvearyHatchery extends Window { @Override public void initialiseClient() { this.setTitle("Hatchery"); - this.playerInventory = new ControlPlayerInventory(this); - final ControlSlotArray slot = new ControlSlotArray(this, 43, 30, 5, 1); + ControlPlayerInventory playerInventory = new ControlPlayerInventory(this); + final ControlSlotArray.Builder slot = new ControlSlotArray.Builder(this, 43, 30, 5, 1); slot.create(AlvearyHatchery.slotLarvae); } diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java index ba280268..5a82c922 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java @@ -12,27 +12,19 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; public class WindowAlvearyIndustrialFrame extends Window { - Machine machine; - ControlPlayerInventory playerInventory; - public WindowAlvearyIndustrialFrame(final EntityPlayer player, final IInventory inventory, final Side side) { super(176, 144, player, inventory, side); - this.machine = ((TileEntityMachine) inventory).getMachine(); } public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - if (player == null || inventory == null) { - return null; - } return new WindowAlvearyIndustrialFrame(player, inventory, side); } @Override public void initialiseClient() { this.setTitle("Industrial Frame Housing"); - this.playerInventory = new ControlPlayerInventory(this); - final ControlSlot slot = new ControlSlot(this, 79, 30); - slot.assign(0); + ControlPlayerInventory playerInventory = new ControlPlayerInventory(this); + new ControlSlot.Builder(this, 79, 30).assign(0); } @Override diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java index 1bc64d87..2e188608 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java @@ -17,17 +17,16 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; -public class WindowAlvearyMutator extends Window { - Machine machine; - ControlPlayerInventory playerInventory; +import javax.annotation.Nullable; +public class WindowAlvearyMutator extends Window { public WindowAlvearyMutator(final EntityPlayer player, final IInventory inventory, final Side side) { super(176, 176, player, inventory, side); - this.machine = ((TileEntityMachine) inventory).getMachine(); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - if (player == null || inventory == null) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { return null; } return new WindowAlvearyMutator(player, inventory, side); @@ -36,9 +35,8 @@ public class WindowAlvearyMutator extends Window { @Override public void initialiseClient() { this.setTitle("Mutator"); - this.playerInventory = new ControlPlayerInventory(this); - final ControlSlot slot = new ControlSlot(this, 79, 30); - slot.assign(0); + new ControlPlayerInventory(this); + new ControlSlot.Builder(this, 79, 30).assign(0); new ControlText(this, new IArea(0, 52, this.w(), 16), "Possible Mutagens:", TextJustification.MiddleCenter).setColour(5592405); final int size = AlvearyMutator.getMutagens().size(); final int w = size * 18; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java index 52ea5676..46463d98 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java @@ -14,17 +14,16 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; -public class WindowAlvearyStimulator extends Window { - Machine machine; - ControlPlayerInventory playerInventory; +import javax.annotation.Nullable; +public class WindowAlvearyStimulator extends Window { public WindowAlvearyStimulator(final EntityPlayer player, final IInventory inventory, final Side side) { super(176, 144, player, inventory, side); - this.machine = ((TileEntityMachine) inventory).getMachine(); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - if (player == null || inventory == null) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { return null; } return new WindowAlvearyStimulator(player, inventory, side); @@ -34,9 +33,8 @@ public class WindowAlvearyStimulator extends Window { public void initialiseClient() { this.setTitle("Stimulator"); new ControlEnergyBar(this, 75, 29, 60, 16, Position.Left); - final ControlSlot slot = new ControlSlot(this, 41, 28); - slot.assign(AlvearyStimulator.slotCircuit); - this.playerInventory = new ControlPlayerInventory(this); + new ControlSlot.Builder(this, 41, 28).assign(AlvearyStimulator.slotCircuit); + new ControlPlayerInventory(this); } @Override diff --git a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java index 3987c94f..73cd79a7 100644 --- a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java +++ b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java @@ -63,7 +63,7 @@ public enum ExtraBeeLiquid implements ILiquidType { @Override public boolean showInCreative(final FluidContainerType container) { - return container == FluidContainerType.CAN || container == FluidContainerType.CAPSULE || container == FluidContainerType.REFARACTORY; + return container == FluidContainerType.CAN || container == FluidContainerType.CAPSULE || container == FluidContainerType.REFRACTORY; } @Override diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java index 1c4d3102..f8587e81 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java @@ -8,6 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nullable; + public enum EnumHoneyDrop implements IItemEnum { ENERGY(10242418, 14905713, ""), ACID(4961601, 4841020, "acid"), @@ -39,14 +41,13 @@ public enum EnumHoneyDrop implements IItemEnum { MAGENTA(15040472, 16711884, "for.honey"), LIGHTGRAY(10066329, 13224393, "for.honey"); - int[] colour; - String liquidName; - ItemStack remenant; - public boolean deprecated; + private int[] colour; + private String liquidName; + @Nullable + private ItemStack remnant; - public void addRemenant(final ItemStack stack) { - this.remenant = stack; - this.deprecated = true; + public void addRemnant(final ItemStack stack) { + this.remnant = stack; } EnumHoneyDrop() { @@ -54,23 +55,21 @@ public enum EnumHoneyDrop implements IItemEnum { } EnumHoneyDrop(final int colour, final int colour2, final String liquid) { - this.liquidName = ""; - this.remenant = null; - this.deprecated = false; + this.remnant = null; this.colour = new int[]{colour, colour2}; this.liquidName = liquid; } public void addRecipe() { - final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.liquidName, 200); + final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.getLiquidName(), 200); if (liquid != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{this.get(1)}, liquid, this.remenant, 100); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{this.get(1)}, liquid, this.getRemnant(), 100); } } @Override public boolean isActive() { - return !this.deprecated && (this.liquidName == null || FluidRegistry.isFluidRegistered(this.liquidName)); + return this.remnant != null && FluidRegistry.isFluidRegistered(this.getLiquidName()); } public static EnumHoneyDrop get(final ItemStack itemStack) { @@ -90,4 +89,17 @@ public enum EnumHoneyDrop implements IItemEnum { public String getName(final ItemStack stack) { return ExtraBees.proxy.localise("item.honeydrop." + this.name().toLowerCase()); } + + public int[] getColour() { + return colour; + } + + public String getLiquidName() { + return liquidName; + } + + @Nullable + public ItemStack getRemnant() { + return remnant; + } } diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index 6cd37fa3..75416210 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -12,6 +12,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nullable; + public class ItemHoneyComb extends ItemProduct implements IColoredItem { public ItemHoneyComb() { @@ -214,10 +216,11 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { } } type.addProduct(drop.get(1), 1.00f); - drop.addRemenant(dye); + drop.addRemnant(dye); } } + @Nullable private static ItemStack getOreDictionary(final String string) { if (OreDictionary.getOres(string).size() > 0) { return OreDictionary.getOres(string).get(0); @@ -228,13 +231,11 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { @SideOnly(Side.CLIENT) @Override public int getColorFromItemstack(ItemStack stack, int tintIndex) { - if (EnumHoneyComb.get(stack) == null) { - return 16777215; - } + EnumHoneyComb honeyComb = EnumHoneyComb.get(stack); if (tintIndex == 1) { - return EnumHoneyComb.get(stack).colour[0]; + return honeyComb.colour[0]; } - return EnumHoneyComb.get(stack).colour[1]; + return honeyComb.colour[1]; } public enum VanillaComb { diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java index 066fde7f..63742aaf 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java @@ -18,9 +18,9 @@ public class ItemHoneyDrop extends ItemProduct implements IColoredItem { @Override public int getColorFromItemstack(ItemStack itemStack, int tintIndex) { if (tintIndex == 0) { - return EnumHoneyDrop.get(itemStack).colour[0]; + return EnumHoneyDrop.get(itemStack).getColour()[0]; } - return EnumHoneyDrop.get(itemStack).colour[1]; + return EnumHoneyDrop.get(itemStack).getColour()[1]; } } diff --git a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java index 6ada7c10..34fd3a8c 100644 --- a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java +++ b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java @@ -24,9 +24,6 @@ public class HiveDrop implements IHiveDrop { public HiveDrop(IAllele[] template, final ItemStack[] bonus, final int chance) { this.additional = new ArrayList<>(); - if (template == null) { - template = Binnie.GENETICS.getBeeRoot().getDefaultTemplate(); - } this.template = template; this.chance = chance; Collections.addAll(this.additional, bonus); diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index b9e07f52..cc40e465 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -4,6 +4,8 @@ import binnie.Binnie; import binnie.extratrees.ExtraTrees; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + public enum Glassware { BeerMug(16, 10, 14), @@ -28,7 +30,7 @@ public enum Glassware { // public IIcon glass; // public IIcon contents; - public String getName(final String liquid) { + public String getName(@Nullable final String liquid) { if (liquid == null) { return ExtraTrees.proxy.localise("item.glassware." + this.name().toLowerCase()); } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java index d39f796c..083110f6 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java @@ -3,12 +3,14 @@ package binnie.extratrees.alcohol.drink; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; public class DrinkManager { static Map drinkLiquids = new HashMap<>(); + @Nullable public static IDrinkLiquid getLiquid(final String id) { return DrinkManager.drinkLiquids.get(id.toLowerCase()); } @@ -17,10 +19,12 @@ public class DrinkManager { DrinkManager.drinkLiquids.put(liquid.getIdentifier(), liquid); } + @Nullable public static IDrinkLiquid getLiquid(final Fluid fluid) { return getLiquid(fluid.getName()); } + @Nullable public static IDrinkLiquid getLiquid(final FluidStack fluid) { return getLiquid(fluid.getFluid()); } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java index 2d53b160..c1688c7f 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java @@ -14,8 +14,10 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; +// TODO use capabilities and remove IFluidContainerItem public class ItemDrink extends ItemFood implements IFluidContainerItem { public ItemDrink() { super(0, 0.0f, false); @@ -28,13 +30,14 @@ public class ItemDrink extends ItemFood implements IFluidContainerItem { } public Glassware getGlassware(final ItemStack container) { - if (!container.hasTagCompound() || !container.getTagCompound().hasKey("glassware")) { + NBTTagCompound nbt = container.getTagCompound(); + if (nbt == null || !nbt.hasKey("glassware")) { return Glassware.BeerMug; } - return Glassware.values()[container.getTagCompound().getShort("glassware")]; + return Glassware.values()[nbt.getShort("glassware")]; } - public ItemStack getStack(final Glassware glass, final FluidStack fluid) { + public ItemStack getStack(final Glassware glass, @Nullable final FluidStack fluid) { final ItemStack stack = new ItemStack(this); this.saveGlassware(glass, stack); this.saveFluid(fluid, stack); @@ -42,17 +45,21 @@ public class ItemDrink extends ItemFood implements IFluidContainerItem { } public void saveGlassware(final Glassware container, final ItemStack stack) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + NBTTagCompound nbt = stack.getTagCompound(); + if (nbt == null) { + nbt = new NBTTagCompound(); + stack.setTagCompound(nbt); } - stack.getTagCompound().setShort("glassware", (short) container.ordinal()); + nbt.setShort("glassware", (short) container.ordinal()); } - public void saveFluid(final FluidStack fluid, final ItemStack stack) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + public void saveFluid(@Nullable final FluidStack fluid, final ItemStack stack) { + NBTTagCompound nbt = stack.getTagCompound(); + if (nbt == null) { + nbt = new NBTTagCompound(); + stack.setTagCompound(nbt); } - final NBTTagCompound nbt = stack.getTagCompound(); + if (fluid == null) { nbt.removeTag("fluid"); } else { @@ -63,6 +70,7 @@ public class ItemDrink extends ItemFood implements IFluidContainerItem { } @Override + @Nullable public FluidStack getFluid(final ItemStack container) { if (container.getTagCompound() == null || !container.getTagCompound().hasKey("fluid")) { return null; @@ -109,6 +117,7 @@ public class ItemDrink extends ItemFood implements IFluidContainerItem { } @Override + @Nullable public FluidStack drain(final ItemStack container, final int maxDrain, final boolean doDrain) { if (!container.hasTagCompound()) { return null; @@ -143,8 +152,20 @@ public class ItemDrink extends ItemFood implements IFluidContainerItem { @Override public String getItemStackDisplayName(final ItemStack stack) { final FluidStack fluid = this.getFluid(stack); - final IDrinkLiquid liquid = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); - return this.getGlassware(stack).getName((liquid == null) ? null : liquid.getName()); + final IDrinkLiquid liquid; + if (fluid == null) { + liquid = null; + } else { + liquid = DrinkManager.getLiquid(fluid.getFluid()); + } + + final String liquidName; + if (liquid == null) { + liquidName = null; + } else { + liquidName = liquid.getName(); + } + return this.getGlassware(stack).getName(liquidName); } // @Override diff --git a/src/main/java/binnie/extratrees/api/IDesignSystem.java b/src/main/java/binnie/extratrees/api/IDesignSystem.java index f12ce5a1..49b29965 100644 --- a/src/main/java/binnie/extratrees/api/IDesignSystem.java +++ b/src/main/java/binnie/extratrees/api/IDesignSystem.java @@ -25,5 +25,6 @@ public interface IDesignSystem { ItemStack getAdhesive(); + @Nullable IDesignMaterial getMaterial(final ItemStack p0); } diff --git a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java index b9f165e5..482d44c5 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java @@ -1,6 +1,7 @@ package binnie.extratrees.block; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import binnie.Constants; import binnie.extratrees.block.property.PropertyETType; @@ -101,15 +102,6 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode } } - @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos) { - ETTreeDefinition treeDefinition = blockState.getValue(getVariant()); - if (TreeDefinition.Willow.equals(treeDefinition)) { - return null; - } - return super.getCollisionBoundingBox(blockState, worldIn, pos); - } - /** * Called When an Entity Collided with the Block */ diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 7bde0759..f76ff249 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -21,6 +21,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class BlockETDoor extends BlockDoor implements IBlockMetadata { @@ -285,6 +286,7 @@ 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/EnumETLog.java b/src/main/java/binnie/extratrees/block/EnumETLog.java index 0b78812f..f2e1dd5a 100644 --- a/src/main/java/binnie/extratrees/block/EnumETLog.java +++ b/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -53,9 +53,9 @@ public enum EnumETLog implements IWoodType { Shrub("Shrub", PlankType.VanillaPlanks.OAK); public static final EnumETLog[] VALUES = values(); - - String name; - IPlankType plank; + + private final String name; + private final IPlankType plank; EnumETLog(final String name, final IPlankType plank) { this.name = name; @@ -138,7 +138,7 @@ public enum EnumETLog implements IWoodType { public String getPlankTexture() { return plank.getPlankTextureName(); } - + public IPlankType getPlank() { return plank; } diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index df984b63..c009f27c 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -44,6 +44,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; +import javax.annotation.Nullable; + public class ModuleBlocks implements IInitializable { // public static int hedgeRenderID; @@ -280,10 +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) { - if (gate == null) { - continue; - } + if (planks2 != null && gate != null) { gate.stackSize = 1; GameRegistry.addRecipe(gate.copy(), "fpf", 'f', fenceNormal.copy(), 'p', planks2.copy()); fenceNormal.stackSize = 4; @@ -317,9 +316,6 @@ public class ModuleBlocks implements IInitializable { public static ItemStack getDecorativeLeaves(String speciesUid) { ItemStack itemStack = ExtraTrees.blocks().speciesToLeavesDecorative.get(speciesUid); - if (itemStack == null) { - return null; - } return itemStack.copy(); } } diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 543c4c8e..d1419e1c 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class WoodManager { public static String getDisplayName(IWoodTyped wood, IWoodType woodType) { @@ -61,15 +62,14 @@ public class WoodManager { return (index < 0) ? 0 : index; } + @Nullable public static FenceType getFenceType(final ItemStack stack) { final FenceDescription desc = getFenceDescription(stack); return (desc == null) ? null : desc.getFenceType(); } + @Nullable public static FenceDescription getFenceDescription(final ItemStack stack) { - if (stack == null) { - return null; - } if (stack.getItem() == Item.getItemFromBlock(ExtraTrees.blocks().blockMultiFence)) { final int damage = TileEntityMetadata.getItemDamage(stack); return getFenceDescription(damage); @@ -77,10 +77,9 @@ public class WoodManager { for (final IPlankType type : getAllPlankTypes()) { if (type instanceof IFenceProvider) { final ItemStack f = ((IFenceProvider) type).getFence(); - if (f != null && ItemStack.areItemStacksEqual(stack, f)) { + if (ItemStack.areItemStacksEqual(stack, f)) { return new FenceDescription(new FenceType(0), type, type); } - continue; } } return null; @@ -138,9 +137,10 @@ public class WoodManager { return list; } + @Nullable public static IPlankType get(final ItemStack species) { for (final IPlankType type : getAllPlankTypes()) { - if (type.getStack() != null && type.getStack().isItemEqual(species)) { + if (type.getStack().isItemEqual(species)) { return type; } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java index 1837dfa1..a0de1a29 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java @@ -23,6 +23,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { @@ -127,6 +128,7 @@ 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); } @@ -138,6 +140,6 @@ public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { @Override public boolean isPassable(IBlockAccess worldIn, BlockPos pos){ - return worldIn.getBlockState(pos).getValue(OPEN).booleanValue(); + return worldIn.getBlockState(pos).getValue(OPEN); } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index e5317e9e..10fd0c85 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -28,6 +28,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class BlockFence extends net.minecraft.block.BlockFence implements IBlockMetadata, IBlockFence { @@ -170,6 +171,7 @@ 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 e947a3ed..621cb421 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -10,9 +10,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class MultiFenceRecipeEmbedded implements IRecipe { - ItemStack cached; + @Nullable + private ItemStack cached; @Override public boolean matches(final InventoryCrafting inv, final World world) { @@ -29,8 +31,9 @@ public class MultiFenceRecipeEmbedded implements IRecipe { if (type != null && type2 != null) { if (type.equals(type2)) { final IPlankType pType = WoodManager.get(b); - if (WoodManager.getFenceDescription(a).getPlankType() == pType) { - this.cached = WoodManager.getFence(WoodManager.getFenceDescription(a).getPlankType(), WoodManager.getFenceDescription(a).getSecondaryPlankType(), new FenceType(type.size, type.solid, true), 2); + 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; } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 0287689f..9aef4a84 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -10,11 +10,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; public class MultiFenceRecipeSize implements IRecipe { - ItemStack cached; + @Nullable + private ItemStack cached; @Override public boolean matches(final InventoryCrafting inv, final World world) { diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 64f4cb54..0dd71202 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -9,9 +9,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class MultiFenceRecipeSolid implements IRecipe { - ItemStack cached; + @Nullable + private ItemStack cached; @Override public boolean matches(final InventoryCrafting inv, final World world) { @@ -28,7 +30,8 @@ public class MultiFenceRecipeSolid implements IRecipe { final FenceType type3 = WoodManager.getFenceType(c); if (type != null && type2 != null && type3 != null && type.equals(type2)) { if (type.equals(type3)) { - this.cached = WoodManager.getFence(WoodManager.getFenceDescription(a).getPlankType(), WoodManager.getFenceDescription(a).getSecondaryPlankType(), new FenceType(type.size, true, type.solid), 2); + FenceDescription fenceDescription = WoodManager.getFenceDescription(a); + this.cached = WoodManager.getFence(fenceDescription.getPlankType(), fenceDescription.getSecondaryPlankType(), new FenceType(type.size, true, type.solid), 2); return true; } } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index 38dd4e9e..fbef5664 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -40,7 +40,7 @@ public enum DesignSystem implements IDesignSystem { return PlankType.ExtraTreePlanks.Fir; } default: { - return null; + throw new IllegalStateException("Unknown design system: " + this); } } } @@ -55,7 +55,7 @@ public enum DesignSystem implements IDesignSystem { return PlankType.ExtraTreePlanks.Whitebeam; } default: { - return null; + throw new IllegalStateException("Unknown design system: " + this); } } } @@ -71,7 +71,7 @@ public enum DesignSystem implements IDesignSystem { return CarpentryManager.carpentryInterface.getWoodMaterial(id); } default: { - return null; + throw new IllegalStateException("Unknown design system: " + this); } } } @@ -86,7 +86,7 @@ public enum DesignSystem implements IDesignSystem { return CarpentryManager.carpentryInterface.getCarpentryWoodIndex(id); } default: { - return 0; + throw new IllegalStateException("Unknown design system: " + this); } } } @@ -100,12 +100,13 @@ public enum DesignSystem implements IDesignSystem { return "patterns"; } default: { - return ""; + throw new IllegalStateException("Unknown design system: " + this); } } } @Override + @Nullable public IDesignMaterial getMaterial(final ItemStack stack) { switch (this) { case Glass: { @@ -115,7 +116,7 @@ public enum DesignSystem implements IDesignSystem { return CarpentryManager.carpentryInterface.getWoodMaterial(stack); } default: { - return null; + throw new IllegalStateException("Unknown design system: " + this); } } } @@ -130,7 +131,7 @@ public enum DesignSystem implements IDesignSystem { return ExtraTreeItems.WoodWax.get(1); } default: { - return null; + throw new IllegalStateException("Unknown design system: " + this); } } } diff --git a/src/main/java/binnie/extratrees/carpentry/GlassType.java b/src/main/java/binnie/extratrees/carpentry/GlassType.java index 9522ac57..afcabb6e 100644 --- a/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -7,6 +7,7 @@ import binnie.extratrees.api.IDesignMaterial; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; import java.util.LinkedHashMap; import java.util.Map; @@ -58,10 +59,8 @@ public class GlassType implements IDesignMaterial { return GlassType.types.get(id); } + @Nullable public static IDesignMaterial get(final ItemStack stack) { - if (stack == null) { - return null; - } for (final Map.Entry entry : GlassType.types.entrySet()) { if (stack.isItemEqual(entry.getValue().getStack())) { return entry.getValue(); diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index d3012fa5..cb40add4 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -371,9 +371,9 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Nullable @Override public ResourceLocation getSprite(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { - if(sprite != null){ + if (sprite != null) { return sprite.getLocation(); - }else{ + } else { return null; } } @@ -437,9 +437,9 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Nullable @Override public String getModelName() { - if(pod != null){ + if (pod != null) { return pod.name(); - }else{ + } else { return null; } } @@ -523,9 +523,9 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Nullable @Override public ResourceLocation getDecorativeSprite() { - if(sprite != null){ + if (sprite != null) { return sprite.getLocation(); - }else{ + } else { return null; } } diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index c3f5776e..74b5d8f8 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -4,6 +4,7 @@ import binnie.Constants; import binnie.core.genetics.ForestryAllele; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.gen.*; +import com.google.common.base.Preconditions; import forestry.api.arboriculture.*; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -2258,9 +2259,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT } public & IChromosomeType> void set(T chromosomeType, IAllele allele) { - if (allele == null) { - throw new NullPointerException("Allele must not be null"); - } + Preconditions.checkNotNull(allele, "Allele must not be null"); if (!chromosomeType.getAlleleClass().isInstance(allele)) { throw new IllegalArgumentException("Allele is the wrong type. Expected: " + chromosomeType + " Got: " + allele); } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java index c5137be1..6bd475ce 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java @@ -41,11 +41,13 @@ public class ExtraTreeGrowthProvider implements IAlleleGrowth, IGrowthProvider { } @Override + @Nullable public String getDescription() { return null; } @Override + @Nullable public String[] getInfo() { return null; } diff --git a/src/main/java/binnie/extratrees/item/ItemETFood.java b/src/main/java/binnie/extratrees/item/ItemETFood.java index 46a18838..86ce01c8 100644 --- a/src/main/java/binnie/extratrees/item/ItemETFood.java +++ b/src/main/java/binnie/extratrees/item/ItemETFood.java @@ -48,18 +48,13 @@ public class ItemETFood extends ItemFood implements IItemModelRegister { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { IItemMiscProvider item = this.getItem(stack.getItemDamage()); - if (item != null) { - item.addInformation(tooltip); - } + item.addInformation(tooltip); } @Override public String getItemStackDisplayName(final ItemStack stack) { IItemMiscProvider item = this.getItem(stack.getItemDamage()); - if(item != null){ - return item.getName(stack); - } - return "null"; + return item.getName(stack); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index 97bd3730..d4b3f02a 100644 --- a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; public enum KitchenMachine implements IMachineType { + // TODO implement Worktop(null), Cupboard(null), BottleRack(BottleRack.PackageBottleRack.class); diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java index 8fab9321..49a9cf3c 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java @@ -50,7 +50,7 @@ public class ControlFluidDisplay extends Control implements ITooltip { if (this.fluidStack == null) { return; } - final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getSuperParent().getPosition()); + final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getTopParent().getPosition()); if (relativeToWindow.x() > Window.get(this).getSize().x() + 100 || relativeToWindow.y() > Window.get(this).getSize().y() + 100) { return; } diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index f7f21433..739272f0 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -40,7 +40,7 @@ public class ControlSlotFluid extends Control implements ITooltip { public void onRenderBackground(int guiWidth, int guiHeight) { final int size = this.getSize().x(); CraftGUI.render.texture(CraftGUITexture.Slot, this.getArea()); - if (this.getSuperParent().getMousedOverWidget() == this) { + if (this.getTopParent().getMousedOverWidget() == this) { RenderUtil.drawGradientRect(new IArea(new IPoint(1, 1), this.getArea().size().sub(new IPoint(2, 2))), -2130706433, -2130706433); } } diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java index 0f9bdbac..965b1d56 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java @@ -9,12 +9,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public class WindowBottleRack extends Window { public WindowBottleRack(final EntityPlayer player, final IInventory inventory, final Side side) { super(248, 180, player, inventory, side); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } return new WindowBottleRack(player, inventory, side); } diff --git a/src/main/java/binnie/extratrees/machines/Designer.java b/src/main/java/binnie/extratrees/machines/Designer.java index a53c671e..ed8deffc 100644 --- a/src/main/java/binnie/extratrees/machines/Designer.java +++ b/src/main/java/binnie/extratrees/machines/Designer.java @@ -170,6 +170,7 @@ public abstract class Designer { } @Override + @Nullable public ErrorState canWork() { if (this.getUtil().isSlotEmpty(Designer.beeswaxSlot)) { return new ErrorState.NoItem("Requires Adhesive to Function", Designer.beeswaxSlot); @@ -178,6 +179,7 @@ public abstract class Designer { } @Override + @Nullable public ErrorState canProgress() { return null; } diff --git a/src/main/java/binnie/extratrees/machines/Infuser.java b/src/main/java/binnie/extratrees/machines/Infuser.java index 637b5d89..2212710c 100644 --- a/src/main/java/binnie/extratrees/machines/Infuser.java +++ b/src/main/java/binnie/extratrees/machines/Infuser.java @@ -5,6 +5,7 @@ import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.MachineSide; +import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.inventory.TankValidator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.core.machines.power.ComponentProcessSetCost; @@ -18,18 +19,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; public class Infuser { - public static int tankInput = 0; - public static int tankOutput = 1; + public static final int tankInput = 0; + public static final int tankOutput = 1; static Map recipes = new HashMap<>(); + @Nullable public static FluidStack getOutput(final FluidStack fluid, final ItemStack stack) { - if (fluid == null) { - return null; - } return Infuser.recipes.get(fluid.getFluid()); } @@ -60,13 +60,16 @@ public class Infuser { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Infuser); final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); final ComponentTankContainer tanks = new ComponentTankContainer(machine); - tanks.addTank(Infuser.tankInput, "input", 5000); - tanks.getTankSlot(Infuser.tankInput).setValidator(new TankValidatorInfuserInput()); - tanks.getTankSlot(Infuser.tankInput).setOutputSides(MachineSide.TopAndBottom); - tanks.addTank(Infuser.tankOutput, "output", 5000); - tanks.getTankSlot(Infuser.tankOutput).setValidator(new TankValidatorInfuserOutput()); - tanks.getTankSlot(Infuser.tankOutput).setReadOnly(); - tanks.getTankSlot(Infuser.tankOutput).setOutputSides(MachineSide.Sides); + + final TankSlot input = tanks.addTank(Infuser.tankInput, "input", 5000); + input.setValidator(new TankValidatorInfuserInput()); + input.setOutputSides(MachineSide.TopAndBottom); + + final TankSlot output = tanks.addTank(Infuser.tankOutput, "output", 5000); + output.setValidator(new TankValidatorInfuserOutput()); + output.setReadOnly(); + output.setOutputSides(MachineSide.Sides); + new ComponentPowerReceptor(machine); new ComponentInfuserLogic(machine); } @@ -108,23 +111,31 @@ public class Infuser { @Override public ErrorState canProgress() { - if (!this.getUtil().isTankEmpty(Infuser.tankOutput) && this.getOutput() != null && !this.getOutput().isFluidEqual(this.getUtil().getFluid(Infuser.tankOutput))) { + FluidStack outputTankFluid = this.getUtil().getFluid(Infuser.tankOutput); + if (!this.getUtil().isTankEmpty(Infuser.tankOutput) && this.getOutput() != null && !this.getOutput().isFluidEqual(outputTankFluid)) { return new ErrorState.Tank("No Room", "No room for liquid", new int[]{Infuser.tankOutput}); } - if (this.getUtil().getFluid(Infuser.tankOutput) != null && !this.getUtil().getFluid(Infuser.tankOutput).isFluidEqual(this.getOutput())) { + if (outputTankFluid != null && !outputTankFluid.isFluidEqual(this.getOutput())) { return new ErrorState.TankSpace("Different fluid in tank", Infuser.tankOutput); } return super.canProgress(); } + @Nullable private FluidStack getOutput() { - return Infuser.getOutput(this.getUtil().getFluid(Infuser.tankInput), this.infusing); + FluidStack fluid = this.getUtil().getFluid(Infuser.tankInput); + if (fluid == null) { + return null; + } + return Infuser.getOutput(fluid, this.infusing); } @Override protected void onFinishTask() { - final FluidStack output = this.getOutput().copy(); - this.getUtil().fillTank(Infuser.tankOutput, output); + final FluidStack output = this.getOutput(); + if (output != null) { + this.getUtil().fillTank(Infuser.tankOutput, output.copy()); + } } @Override diff --git a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java index e1437fcc..778a79ad 100644 --- a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java +++ b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java @@ -12,6 +12,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; +import javax.annotation.Nullable; import java.util.HashSet; import java.util.Set; @@ -20,6 +21,7 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu super(pack); } + @Nullable IButterflyNursery getNursery() { return this.getMachine().getInterface(IButterflyNursery.class); } @@ -36,12 +38,12 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu @Override public EnumTemperature getTemperature() { - return null; + return EnumTemperature.NORMAL; } @Override public EnumHumidity getHumidity() { - return null; + return EnumHumidity.NORMAL; } public boolean addProduct(final ItemStack product, final boolean all) { @@ -49,19 +51,23 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu } @Override + @Nullable public IButterfly getCaterpillar() { - return this.hasNursery() ? this.getNursery().getCaterpillar() : null; + IButterflyNursery nursery = this.getNursery(); + return nursery != null ? nursery.getCaterpillar() : null; } @Override + @Nullable public IIndividual getNanny() { return null; } @Override public void setCaterpillar(final IButterfly butterfly) { - if (this.hasNursery()) { - this.getNursery().setCaterpillar(butterfly); + IButterflyNursery nursery = this.getNursery(); + if (nursery != null) { + nursery.setCaterpillar(butterfly); } } @@ -78,6 +84,7 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu public void setErrorState(final IErrorState state) { } + @Nullable public IErrorState getErrorState() { return null; } diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java index 193c8a76..7f000e8c 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java @@ -6,6 +6,7 @@ import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.MachineSide; +import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; @@ -41,22 +42,24 @@ public class BreweryMachine extends ExtraTreeMachine.PackageExtraTreeMachine imp for (final InventorySlot slot : inventory.getSlots(SLOTS_INVENTORY)) { slot.forbidExtraction(); } - inventory.addSlot(SLOT_YEAST, "yeast"); - inventory.getSlot(SLOT_YEAST).setValidator(new SlotValidatorBreweryYeast()); - inventory.getSlot(SLOT_YEAST).setType(InventorySlot.Type.Recipe); - inventory.addSlot(SLOT_RECIPE_INPUT, "ingredient"); - inventory.getSlot(SLOT_RECIPE_INPUT).setValidator(new SlotValidatorBreweryIngredient()); - inventory.getSlot(SLOT_RECIPE_INPUT).setType(InventorySlot.Type.Recipe); + final InventorySlot yeast = inventory.addSlot(SLOT_YEAST, "yeast"); + yeast.setValidator(new SlotValidatorBreweryYeast()); + yeast.setType(InventorySlot.Type.Recipe); + + final InventorySlot ingredient = inventory.addSlot(SLOT_RECIPE_INPUT, "ingredient"); + ingredient.setValidator(new SlotValidatorBreweryIngredient()); + ingredient.setType(InventorySlot.Type.Recipe); final ComponentTankContainer tanks = new ComponentTankContainer(machine); - tanks.addTank(TANK_INPUT, "input", 5000); - tanks.getTankSlot(TANK_INPUT).setValidator(new TankValidatorFermentInput()); - tanks.getTankSlot(TANK_INPUT).setOutputSides(MachineSide.TopAndBottom); - tanks.addTank(TANK_OUTPUT, "output", 5000); - tanks.getTankSlot(TANK_OUTPUT).setValidator(new TankValidatorFermentOutput()); - tanks.getTankSlot(TANK_OUTPUT).forbidInsertion(); - tanks.getTankSlot(TANK_OUTPUT).setOutputSides(MachineSide.Sides); + TankSlot input = tanks.addTank(TANK_INPUT, "input", 5000); + input.setValidator(new TankValidatorFermentInput()); + input.setOutputSides(MachineSide.TopAndBottom); + + final TankSlot output = tanks.addTank(TANK_OUTPUT, "output", 5000); + output.setValidator(new TankValidatorFermentOutput()); + output.forbidInsertion(); + output.setOutputSides(MachineSide.Sides); new ComponentPowerReceptor(machine); new BreweryLogic(machine); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java index 5ccdf79d..3011e30b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java @@ -11,6 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import javax.annotation.Nullable; + public class ControlRecipeSlot extends ControlSlotBase { public ControlRecipeSlot(final IWidget parent, final int x, final int y) { super(parent, x, y, 50); @@ -29,6 +31,7 @@ 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()) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index 1f6fab60..81ad90f4 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -134,6 +134,7 @@ public class ControlTileSelect extends Control implements IControlValue if (tile == null) { return; } + // TODO: why is recipe unused here? final Designer.ComponentWoodworkerRecipe recipe = tile.getMachine().getComponent(Designer.ComponentWoodworkerRecipe.class); final NBTTagCompound nbt = new NBTTagCompound(); nbt.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(ControlTile.this.getValue())); @@ -159,7 +160,7 @@ public class ControlTileSelect extends Control implements IControlValue @Override public void onRenderForeground(int guiWidth, int guiHeight) { - final ItemStack image = ((WindowWoodworker) this.getSuperParent()).getDesignerType().getDisplayStack(this.getValue()); + final ItemStack image = ((WindowWoodworker) this.getTopParent()).getDesignerType().getDisplayStack(this.getValue()); RenderUtil.drawItem(new IPoint(1, 1), image); if (((IControlValue) this.getParent()).getValue() != this.getValue()) { if (Window.get(this).getMousedOverWidget() == this) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java index e0d9fe01..fadc966b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java @@ -16,6 +16,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public class WindowBrewery extends Window { public WindowBrewery(final EntityPlayer player, final IInventory inventory, final Side side) { super(228, 218, player, inventory, side); @@ -34,19 +36,23 @@ public class WindowBrewery extends Window { @Override public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); - new ControlSlotArray(this, 42, 32, 1, 3).create(BreweryMachine.SLOT_RECIPE_GRAINS); - new ControlSlot(this, 16, 41).assign(BreweryMachine.SLOT_RECIPE_INPUT); - new ControlSlot(this, 105, 77).assign(BreweryMachine.SLOT_YEAST); + new ControlSlotArray.Builder(this, 42, 32, 1, 3).create(BreweryMachine.SLOT_RECIPE_GRAINS); + new ControlSlot.Builder(this, 16, 41).assign(BreweryMachine.SLOT_RECIPE_INPUT); + new ControlSlot.Builder(this, 105, 77).assign(BreweryMachine.SLOT_YEAST); new ControlLiquidTank(this, 76, 32).setTankID(BreweryMachine.TANK_INPUT); new ControlLiquidTank(this, 162, 32).setTankID(BreweryMachine.TANK_OUTPUT); new ControlEnergyBar(this, 196, 32, 16, 60, Position.Bottom); new ControlBreweryProgress(this, 110, 32); - new ControlSlotArray(this, this.getSize().x() / 2 - 81, 104, 9, 1).create(BreweryMachine.SLOTS_INVENTORY); + new ControlSlotArray.Builder(this, this.getSize().x() / 2 - 81, 104, 9, 1).create(BreweryMachine.SLOTS_INVENTORY); new ControlPlayerInventory(this); new ControlErrorState(this, 133, 79); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } return new WindowBrewery(player, inventory, side); } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java index 4c46d105..92dd725a 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java @@ -14,6 +14,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public class WindowDistillery extends Window { public WindowDistillery(final EntityPlayer player, final IInventory inventory, final Side side) { super(224, 192, player, inventory, side); @@ -44,7 +46,11 @@ public class WindowDistillery extends Window { new ControlErrorState(this, x + 21, 62); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } return new WindowDistillery(player, inventory, side); } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java index 65ebb536..f8d58b21 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java @@ -15,6 +15,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public class WindowLumbermill extends Window { public WindowLumbermill(final EntityPlayer player, final IInventory inventory, final Side side) { super(220, 192, player, inventory, side); @@ -33,10 +35,10 @@ public class WindowLumbermill extends Window { @Override public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); - new ControlSlot(this, 42, 43).assign(LumbermillMachine.SLOT_LOG); - new ControlSlot(this, 148, 43).assign(LumbermillMachine.SLOT_PLANKS); - new ControlSlot(this, 172, 28).assign(LumbermillMachine.SLOT_BARK); - new ControlSlot(this, 172, 58).assign(LumbermillMachine.SLOT_SAWDUST); + new ControlSlot.Builder(this, 42, 43).assign(LumbermillMachine.SLOT_LOG); + new ControlSlot.Builder(this, 148, 43).assign(LumbermillMachine.SLOT_PLANKS); + new ControlSlot.Builder(this, 172, 28).assign(LumbermillMachine.SLOT_BARK); + new ControlSlot.Builder(this, 172, 58).assign(LumbermillMachine.SLOT_SAWDUST); new ControlLumbermillProgress(this, 70, 43); new ControlLiquidTank(this, 16, 32); new ControlEnergyBar(this, 8, 112, 16, 60, Position.Bottom); @@ -44,7 +46,11 @@ public class WindowLumbermill extends Window { new ControlErrorState(this, 95, 73); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } return new WindowLumbermill(player, inventory, side); } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java index 31c8e24b..e2aab86f 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java @@ -19,6 +19,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public class WindowPress extends Window { public WindowPress(final EntityPlayer player, final IInventory inventory, final Side side) { super(194, 192, player, inventory, side); @@ -37,16 +39,20 @@ public class WindowPress extends Window { @Override public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); - new ControlSlot(this, 24, 52).assign(FruitPressMachine.SLOT_FRUIT); + new ControlSlot.Builder(this, 24, 52).assign(FruitPressMachine.SLOT_FRUIT); new ControlLiquidTank(this, 99, 32).setTankID(FruitPressMachine.TANK_OUTPUT); new ControlEnergyBar(this, 154, 32, 16, 60, Position.Bottom); new ControlPlayerInventory(this); new ControlErrorState(this, 128, 54); new ControlFruitPressProgress(this, 62, 24); - ((Window) this.getSuperParent()).getContainer().getOrCreateSlot(InventoryType.Machine, FruitPressMachine.SLOT_CURRENT); + ((Window) this.getTopParent()).getContainer().getOrCreateSlot(InventoryType.Machine, FruitPressMachine.SLOT_CURRENT); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } return new WindowPress(player, inventory, side); } @@ -54,10 +60,10 @@ public class WindowPress extends Window { public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { final FruitPressLogic logic = Machine.getInterface(FruitPressLogic.class, this.getInventory()); super.recieveGuiNBT(side, player, name, action); - if (side == Side.SERVER && name.equals("fruitpress-click")) { - if (logic.canWork() == null && (logic.canProgress() == null || logic.canProgress() instanceof ErrorState.InsufficientPower)) { + if (logic != null && side == Side.SERVER) { + if (name.equals("fruitpress-click") && logic.canWork() == null && (logic.canProgress() == null || logic.canProgress() instanceof ErrorState.InsufficientPower)) { logic.alterProgress(2.0f); - } else if (side == Side.SERVER && name.equals("clear-fruit")) { + } else if (name.equals("clear-fruit")) { logic.setProgress(0.0f); this.getInventory().setInventorySlotContents(FruitPressMachine.SLOT_CURRENT, null); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java index 2f2c9cac..b336b705 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java @@ -8,8 +8,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public class WindowSetSquare extends Window { - public WindowSetSquare(final EntityPlayer player, final IInventory inventory, final Side side) { + public WindowSetSquare(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { super(150, 150, player, inventory, side); } @@ -20,6 +22,7 @@ public class WindowSetSquare extends Window { @Override protected String getBackgroundTextureName() { + // TODO background should not be null return null; } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java index 722533fc..9e0c0bc8 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java @@ -24,6 +24,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nullable; + public class WindowWoodworker extends Window { ControlTextEdit textEdit; ControlTileSelect tileSelect; @@ -39,12 +41,9 @@ public class WindowWoodworker extends Window { new ControlPlayerInventory(this).setPosition(new IPoint(14, 96)); new ControlErrorState(this, 76, 65); if (this.getInventory() != null) { - final ControlSlot slotWood1 = new ControlSlot(this, 22, 34); - slotWood1.assign(Designer.design1Slot); - final ControlSlot slotWood2 = new ControlSlot(this, 62, 34); - slotWood2.assign(Designer.design2Slot); - final ControlSlot slotBeeswax = new ControlSlot(this, 42, 64); - slotBeeswax.assign(Designer.beeswaxSlot); + final ControlSlot slotWood1 = new ControlSlot.Builder(this, 22, 34).assign(Designer.design1Slot); + final ControlSlot slotWood2 = new ControlSlot.Builder(this, 62, 34).assign(Designer.design2Slot); + final ControlSlot slotBeeswax = new ControlSlot.Builder(this, 42, 64).assign(Designer.beeswaxSlot); final ControlRecipeSlot slotFinished = new ControlRecipeSlot(this, 112, 34); } } @@ -59,7 +58,11 @@ public class WindowWoodworker extends Window { }.setOrigin(EventHandler.Origin.DirectChild, this)); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } return new WindowWoodworker(player, inventory, side); } diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java index 10da4c5c..7d6189a0 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java @@ -5,6 +5,7 @@ import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.MachineSide; +import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; @@ -25,13 +26,16 @@ public class DistilleryMachine extends ExtraTreeMachine.PackageExtraTreeMachine new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Distillery); final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); final ComponentTankContainer tanks = new ComponentTankContainer(machine); - tanks.addTank(TANK_INPUT, "input", 5000); - tanks.getTankSlot(TANK_INPUT).setValidator(new TankValidatorDistilleryInput()); - tanks.getTankSlot(TANK_INPUT).setOutputSides(MachineSide.TopAndBottom); - tanks.addTank(TANK_OUTPUT, "output", 5000); - tanks.getTankSlot(TANK_OUTPUT).setValidator(new TankValidatorDistilleryOutput()); - tanks.getTankSlot(TANK_OUTPUT).setReadOnly(); - tanks.getTankSlot(TANK_OUTPUT).setOutputSides(MachineSide.Sides); + + final TankSlot input = tanks.addTank(TANK_INPUT, "input", 5000); + input.setValidator(new TankValidatorDistilleryInput()); + input.setOutputSides(MachineSide.TopAndBottom); + + final TankSlot output = tanks.addTank(TANK_OUTPUT, "output", 5000); + output.setValidator(new TankValidatorDistilleryOutput()); + output.setReadOnly(); + output.setOutputSides(MachineSide.Sides); + new ComponentPowerReceptor(machine); new DistilleryLogic(machine); } diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java index a1897fb4..88e2d84f 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java @@ -30,7 +30,9 @@ public class FruitPressLogic extends ComponentProcessSetCost implements IProcess if (!this.getUtil().spaceInTank(FruitPressMachine.TANK_OUTPUT, 5)) { return new ErrorState.TankSpace("No room in tank", FruitPressMachine.TANK_OUTPUT); } - if (this.getUtil().getFluid(FruitPressMachine.TANK_OUTPUT) != null && !this.getUtil().getFluid(FruitPressMachine.TANK_OUTPUT).isFluidEqual(FruitPressRecipes.getOutput(this.getUtil().getStack(FruitPressMachine.SLOT_CURRENT)))) { + FluidStack fluidOutputTank = this.getUtil().getFluid(FruitPressMachine.TANK_OUTPUT); + FluidStack recipeOutput = FruitPressRecipes.getOutput(this.getUtil().getStack(FruitPressMachine.SLOT_CURRENT)); + if (fluidOutputTank != null && !fluidOutputTank.isFluidEqual(recipeOutput)) { return new ErrorState.TankSpace("Different fluid in tank", FruitPressMachine.TANK_OUTPUT); } return super.canProgress(); diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java index 6f95ec0a..62445681 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java @@ -5,6 +5,7 @@ import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; @@ -26,12 +27,14 @@ public class FruitPressMachine extends ExtraTreeMachine.PackageExtraTreeMachine public void createMachine(final Machine machine) { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Press); final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(SLOT_FRUIT, "input"); - inventory.getSlot(SLOT_FRUIT).setValidator(new SlotValidatorSqueezable()); - inventory.getSlot(SLOT_FRUIT).forbidExtraction(); - inventory.addSlot(SLOT_CURRENT, "process"); - inventory.getSlot(SLOT_CURRENT).setValidator(new SlotValidatorSqueezable()); - inventory.getSlot(SLOT_CURRENT).forbidInteraction(); + final InventorySlot input = inventory.addSlot(SLOT_FRUIT, "input"); + input.setValidator(new SlotValidatorSqueezable()); + input.forbidExtraction(); + + final InventorySlot process = inventory.addSlot(SLOT_CURRENT, "process"); + process.setValidator(new SlotValidatorSqueezable()); + process.forbidInteraction(); + final ComponentTankContainer tanks = new ComponentTankContainer(machine); tanks.addTank(TANK_OUTPUT, "output", TANK_OUTPUT_CAPACITY); new ComponentPowerReceptor(machine); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java index 9acad450..1ad37f64 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java @@ -18,10 +18,10 @@ public class LumbermillLogic extends ComponentProcessSetCost implements IProcess @Override public ErrorState canWork() { - if (this.getUtil().isSlotEmpty(LumbermillMachine.SLOT_LOG)) { + ItemStack logStack = this.getUtil().getStack(LumbermillMachine.SLOT_LOG); + if (logStack == null) { return new ErrorState.NoItem("No Wood", LumbermillMachine.SLOT_LOG); } - ItemStack logStack = this.getUtil().getStack(LumbermillMachine.SLOT_LOG); final ItemStack plankResult = LumbermillRecipes.getPlankProduct(logStack); if (!this.getUtil().isSlotEmpty(LumbermillMachine.SLOT_PLANKS) && plankResult != null) { final ItemStack currentPlank = this.getUtil().getStack(LumbermillMachine.SLOT_PLANKS); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java index a87c639f..63c61466 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java @@ -4,6 +4,8 @@ import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.inventory.TankValidator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.craftgui.minecraft.IMachineInformation; @@ -13,12 +15,12 @@ import binnie.extratrees.machines.ExtraTreeMachine; import net.minecraft.tileentity.TileEntity; public class LumbermillMachine extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { - public static int SLOT_LOG = 0; - public static int SLOT_PLANKS = 1; - public static int SLOT_BARK = 2; - public static int SLOT_SAWDUST = 3; - public static int TANK_WATER = 0; - public static int TANK_WATER_CAPACITY = 10000; + public static final int SLOT_LOG = 0; + public static final int SLOT_PLANKS = 1; + public static final int SLOT_BARK = 2; + public static final int SLOT_SAWDUST = 3; + public static final int TANK_WATER = 0; + public static final int TANK_WATER_CAPACITY = 10000; public LumbermillMachine() { super("lumbermill", ExtraTreeTexture.lumbermillTexture, true); @@ -28,18 +30,19 @@ public class LumbermillMachine extends ExtraTreeMachine.PackageExtraTreeMachine public void createMachine(final Machine machine) { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Lumbermill); final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(SLOT_LOG, "input"); - inventory.getSlot(SLOT_LOG).setValidator(new SlotValidatorLog()); - inventory.getSlot(SLOT_LOG).forbidExtraction(); - inventory.addSlot(SLOT_PLANKS, "output"); - inventory.addSlot(SLOT_BARK, "byproduct"); - inventory.addSlot(SLOT_SAWDUST, "byproduct"); - inventory.getSlot(SLOT_PLANKS).setReadOnly(); - inventory.getSlot(SLOT_BARK).setReadOnly(); - inventory.getSlot(SLOT_SAWDUST).setReadOnly(); + + InventorySlot slotLog = inventory.addSlot(SLOT_LOG, "input"); + slotLog.setValidator(new SlotValidatorLog()); + slotLog.forbidExtraction(); + + inventory.addSlot(SLOT_PLANKS, "output").setReadOnly(); + inventory.addSlot(SLOT_BARK, "byproduct").setReadOnly(); + inventory.addSlot(SLOT_SAWDUST, "byproduct").setReadOnly(); + final ComponentTankContainer tanks = new ComponentTankContainer(machine); - tanks.addTank(TANK_WATER, "input", TANK_WATER_CAPACITY); - tanks.getTankSlot(TANK_WATER).setValidator(new TankValidator.Basic("water")); + TankSlot tankWater = tanks.addTank(TANK_WATER, "input", TANK_WATER_CAPACITY); + tankWater.setValidator(new TankValidator.Basic("water")); + new ComponentPowerReceptor(machine); new LumbermillLogic(machine); } diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java index c8fff786..732cd0da 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java @@ -9,6 +9,7 @@ public class BlockTypeLog extends BlockType { ITreeGenData treeGenData; public BlockTypeLog(ITreeGenData treeGenData) { + // TODO why is block param null here? super(null, 0); this.treeGenData = treeGenData; } diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java index 868777f6..54b39dcc 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java @@ -1,19 +1,9 @@ package binnie.extratrees.worldgen; -import forestry.api.world.ITreeGenData; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.init.Blocks; public class BlockTypeVoid extends BlockType { public BlockTypeVoid() { - super(null, 0); - } - - @Override - public void setBlock(final World world, final ITreeGenData tree, final BlockPos pos) { - world.setBlockToAir(pos); - if (world.getTileEntity(pos) != null) { - world.removeTileEntity(pos); - } + super(Blocks.AIR, 0); } } diff --git a/src/main/java/binnie/genetics/CreativeTabGenetics.java b/src/main/java/binnie/genetics/CreativeTabGenetics.java index 5ff3a7ac..48682fd0 100644 --- a/src/main/java/binnie/genetics/CreativeTabGenetics.java +++ b/src/main/java/binnie/genetics/CreativeTabGenetics.java @@ -34,6 +34,7 @@ public class CreativeTabGenetics extends CreativeTabs { @Override @SideOnly(Side.CLIENT) public Item getTabIconItem() { + //TODO add icon item for genetics return null; } diff --git a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java index d37e7379..085f0d14 100644 --- a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java +++ b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java @@ -7,9 +7,9 @@ import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nullable; public interface IIncubatorRecipe { - boolean isInputLiquid(final FluidStack p0); + boolean isInputLiquid(@Nullable final FluidStack fluid); - boolean isInputLiquidSufficient(final FluidStack p0); + boolean isInputLiquidSufficient(@Nullable final FluidStack fluid); void doTask(final MachineUtil p0); @@ -21,6 +21,7 @@ public interface IIncubatorRecipe { FluidStack getInput(); + @Nullable FluidStack getOutput(); ItemStack getInputStack(); diff --git a/src/main/java/binnie/genetics/core/GeneticsPacket.java b/src/main/java/binnie/genetics/core/GeneticsPacket.java index bdaf69d7..a9ed486a 100644 --- a/src/main/java/binnie/genetics/core/GeneticsPacket.java +++ b/src/main/java/binnie/genetics/core/GeneticsPacket.java @@ -17,8 +17,7 @@ public enum GeneticsPacket implements IPacketID { if (this == GeneticsPacket.GeneTrackerSync && context.side == Side.CLIENT) { final MessageNBT packet = new MessageNBT(message); final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); - GeneTracker tracker = null; - tracker = GeneTracker.getTracker(BinnieCore.getBinnieProxy().getWorld(), player.getGameProfile()); + GeneTracker tracker = GeneTracker.getTracker(BinnieCore.getBinnieProxy().getWorld(), player.getGameProfile()); if (tracker != null) { tracker.readFromNBT(packet.getTagCompound()); } diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index 3ff48d06..b8ef91ef 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -53,14 +53,16 @@ public class Engineering { return stack; } - public static IGene[] getGenes(final ItemStack serum) { - if (serum.getItem() instanceof IItemSerum) { - return ((IItemSerum) serum.getItem()).getGenes(serum); - } - if (serum.getItem() == Genetics.itemSequencer) { - SequencerItem sequencerItem = SequencerItem.create(serum); - if (sequencerItem != null) { - return new IGene[]{sequencerItem.getGene()}; + public static IGene[] getGenes(@Nullable final ItemStack serum) { + if (serum != null) { + if (serum.getItem() instanceof IItemSerum) { + return ((IItemSerum) serum.getItem()).getGenes(serum); + } + if (serum.getItem() == Genetics.itemSequencer) { + SequencerItem sequencerItem = SequencerItem.create(serum); + if (sequencerItem != null) { + return new IGene[]{sequencerItem.getGene()}; + } } } return new IGene[0]; diff --git a/src/main/java/binnie/genetics/genetics/GeneProject.java b/src/main/java/binnie/genetics/genetics/GeneProject.java index 213579f9..4d63cd03 100644 --- a/src/main/java/binnie/genetics/genetics/GeneProject.java +++ b/src/main/java/binnie/genetics/genetics/GeneProject.java @@ -6,18 +6,17 @@ import java.util.ArrayList; import java.util.List; public class GeneProject { - int id; - String name; - GameProfile leader; - List members; + private int id; + private String name; + private GameProfile leader; + private List members; public GeneProject(final int id, final String name, final GameProfile leader) { this.id = 0; - this.leader = null; + this.leader = leader; this.members = new ArrayList<>(); this.setID(id); - this.setName(name); - this.setLeader(leader); + this.name = name; } public int getID() { @@ -40,10 +39,6 @@ public class GeneProject { return this.leader; } - public void setLeader(final GameProfile leader) { - this.addPlayer(this.leader = leader); - } - public boolean isEmpty() { return this.members.isEmpty(); } diff --git a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java index fcde3f74..82eafdca 100644 --- a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java +++ b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java @@ -32,12 +32,8 @@ public class GeneticEngineeringSystem { try { final IAllele a1 = indiv.getGenome().getActiveAllele(chromosome); final IAllele a2 = indiv.getGenome().getInactiveAllele(chromosome); - if (a1 != null) { - this.chromosomeMap.get(chromosome).add(a1); - } - if (a2 != null) { - this.chromosomeMap.get(chromosome).add(a2); - } + this.chromosomeMap.get(chromosome).add(a1); + this.chromosomeMap.get(chromosome).add(a2); } catch (Exception ex) { throw Throwables.propagate(ex); } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java index 9b790cf3..719f13b3 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java @@ -25,6 +25,7 @@ public class AnalystPageAppearance extends ControlAnalystPage { y += 26; final int sections = ind.getGenome().getType().getSections(); final int w = (sections > 1) ? 50 : 100; + // TODO fix this control icon display new ControlIconDisplay(this, (this.w() - w) / 2, y - ((sections == 1) ? 0 : 0), null) { @Override public void onRenderForeground(int guiWidth, int guiHeight) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index c2653e00..44cd4270 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -27,13 +27,11 @@ import java.util.Collection; import java.util.Objects; public class AnalystPageDatabase extends ControlAnalystPage { - @Nullable - ControlScrollableContent scroll; + private final ControlScrollableContent scroll; boolean isMaster; public AnalystPageDatabase(final IWidget parent, final IArea area, final BreedingSystem system, final boolean isMaster) { super(parent, area); - this.scroll = null; this.isMaster = isMaster; final int cOfSystem = system.getColour(); final int cr = (0xFF0000 & cOfSystem) >> 16; @@ -109,7 +107,8 @@ public class AnalystPageDatabase extends ControlAnalystPage { } }; } else { - (this.scroll = new ControlScrollableContent(this, 4, y, this.w() - 8, this.h() - y - 8, 0)).setScrollableContent(this.getItemScrollList(system, options)); + this.scroll = new ControlScrollableContent(this, 4, y, this.w() - 8, this.h() - y - 8, 0); + this.scroll.setScrollableContent(this.getItemScrollList(system, options)); } new ControlScrollBar(this, this.scroll.x() + this.scroll.w() - 6, this.scroll.y() + 3, 3, this.scroll.h() - 6, this.scroll) { @Override @@ -139,7 +138,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { this.addSelfEventHandler(new EventMouse.Down.Handler() { @Override public void onEvent(final EventMouse.Down event) { - final WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getSuperParent(); + final WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getTopParent(); window.setIndividual(ind); } }); @@ -147,7 +146,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { @Override public void onRenderBackground(int guiWidth, int guiHeight) { - final WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getSuperParent(); + final WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getTopParent(); if (window.getIndividual() != null && window.getIndividual().getGenome().getPrimary() == species) { RenderUtil.setColour(15658734); CraftGUI.render.texture(CraftGUITexture.TabSolid, this.getArea().outset(1)); diff --git a/src/main/java/binnie/genetics/gui/ControlChromosome.java b/src/main/java/binnie/genetics/gui/ControlChromosome.java index 29dfeb9f..00b32627 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlChromosome.java @@ -10,6 +10,7 @@ import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.StandardTexture; +import com.google.common.base.Preconditions; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IChromosomeType; @@ -38,8 +39,8 @@ public class ControlChromosome extends Control implements IControlValue extends ComponentInventory im } @Override + @Nullable public ItemStack getStackInSlot(final int index) { if (index >= 0 && index < this.indexerInventory.size()) { return this.indexerInventory.get(index); @@ -53,6 +54,7 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } @Override + @Nullable public ItemStack decrStackSize(final int index, final int amount) { ItemStack stackInSlot = this.getStackInSlot(index); if (stackInSlot != null) { diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index 0c1c7e81..8029dc66 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -77,9 +77,6 @@ public enum LaboratoryMachine implements IMachineType { @Override public void readFromNBT(final NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); - if (nbttagcompound == null) { - return; - } this.stack = ItemStack.loadItemStackFromNBT(nbttagcompound.getCompoundTag("Item")); } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index f3bbd481..b949f85d 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -103,9 +103,9 @@ public class Acclimatiser { addHumidityItem(new ItemStack(Items.WATER_BUCKET), 0.75f); addHumidityItem(new ItemStack(Blocks.SAND), -0.15f); addTemperatureItem(FluidContainerType.CAN.getFilled(FluidRegistry.LAVA), 0.75f); - addTemperatureItem(FluidContainerType.REFARACTORY.getFilled(FluidRegistry.LAVA), 0.75f); + addTemperatureItem(FluidContainerType.REFRACTORY.getFilled(FluidRegistry.LAVA), 0.75f); addHumidityItem(FluidContainerType.CAN.getFilled(FluidRegistry.WATER), 0.75f); - addHumidityItem(FluidContainerType.REFARACTORY.getFilled(FluidRegistry.WATER), 0.75f); + addHumidityItem(FluidContainerType.REFRACTORY.getFilled(FluidRegistry.WATER), 0.75f); addHumidityItem(FluidContainerType.CAPSULE.getFilled(FluidRegistry.WATER), 0.75f); } diff --git a/src/main/java/binnie/genetics/machine/analyser/Analyser.java b/src/main/java/binnie/genetics/machine/analyser/Analyser.java index 41f1ca8e..887c7423 100644 --- a/src/main/java/binnie/genetics/machine/analyser/Analyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/Analyser.java @@ -21,7 +21,10 @@ public class Analyser { return ind != null || stack.getItem() instanceof IItemAnalysable || Binnie.GENETICS.getConversion(stack) != null; } - public static boolean isAnalysed(final ItemStack stack) { + public static boolean isAnalysed(@Nullable final ItemStack stack) { + if (stack == null) { + return false; + } final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); if (ind != null) { return ind.isAnalyzed(); @@ -29,7 +32,11 @@ 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; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowAcclimatiser.java b/src/main/java/binnie/genetics/machine/craftgui/WindowAcclimatiser.java index fa33b33e..795eb89b 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowAcclimatiser.java @@ -33,12 +33,12 @@ public class WindowAcclimatiser extends WindowMachine { super.initialiseClient(); int x = 16; final int y = 32; - new ControlSlotArray(this, x, y, 2, 2).create(Acclimatiser.SLOT_RESERVE); + new ControlSlotArray.Builder(this, x, y, 2, 2).create(Acclimatiser.SLOT_RESERVE); x += 54; - new ControlSlot(this, x + 18, y).assign(4); - new ControlSlotArray(this, x, y + 18 + 18, 3, 1).create(Acclimatiser.SLOT_ACCLIMATISER); + new ControlSlot.Builder(this, x + 18, y).assign(4); + new ControlSlotArray.Builder(this, x, y + 18 + 18, 3, 1).create(Acclimatiser.SLOT_ACCLIMATISER); x += 72; - new ControlSlotArray(this, x, y, 2, 2).create(Acclimatiser.SLOT_DRONE); + new ControlSlotArray.Builder(this, x, y, 2, 2).create(Acclimatiser.SLOT_DRONE); new ControlEnergyBar(this, 21, 115, 16, 60, Position.Bottom); new ControlErrorState(this, 181, 83); new ControlPlayerInventory(this); diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowAnalyser.java b/src/main/java/binnie/genetics/machine/craftgui/WindowAnalyser.java index db828870..a5554d8a 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowAnalyser.java @@ -38,9 +38,9 @@ public class WindowAnalyser extends WindowMachine { WindowAnalyser.Progress = new StandardTexture(66, 51, 66, 40, GeneticsTexture.GUIProcess.getTexture()); int x = 16; final int y = 32; - new ControlSlotArray(this, x, y, 2, 3).create(Analyser.SLOT_RESERVE); + new ControlSlotArray.Builder(this, x, y, 2, 3).create(Analyser.SLOT_RESERVE); x += 28; - new ControlSlot(this, x, y + 54 + 8).assign(13); + new ControlSlot.Builder(this, x, y + 54 + 8).assign(13); new ControlSlotCharge(this, x + 20, y + 54 + 8, 13).setColour(10040319); new ControlEnergyBar(this, x + 24 + 16, y + 54 + 8 + 1, 60, 16, Position.Left); new ControlErrorState(this, x + 24 + 16 + 60 + 16, y + 54 + 8 + 1); @@ -49,10 +49,10 @@ public class WindowAnalyser extends WindowMachine { x += 56; new Panel(this, x, y, 76, 50, MinecraftGUI.PanelType.Tinted); new ControlProgress(this, x + 5, y + 5, WindowAnalyser.ProgressBase, WindowAnalyser.Progress, Position.Left); - new ControlSlot(this, x + 38 - 9, y + 25 - 9).assign(6); + new ControlSlot.Builder(this, x + 38 - 9, y + 25 - 9).assign(6); new ControlIconDisplay(this, x + 76 + 2, y + 18, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 96; - new ControlSlotArray(this, x, y, 2, 3).create(Analyser.SLOT_FINISHED); + new ControlSlotArray.Builder(this, x, y, 2, 3).create(Analyser.SLOT_FINISHED); x += 52; new ControlPlayerInventory(this); } diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGenepool.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGenepool.java index e7ae9e5b..bc063659 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGenepool.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGenepool.java @@ -36,17 +36,17 @@ public class WindowGenepool extends WindowMachine { final int y = 32; new ControlLiquidTank(this, x, y).setTankID(1); x += 26; - new ControlSlotArray(this, x, y + 3, 2, 3).create(Genepool.SLOT_RESERVE); + new ControlSlotArray.Builder(this, x, y + 3, 2, 3).create(Genepool.SLOT_RESERVE); x += 38; new ControlIconDisplay(this, x, y + 3 + 18 + 1, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 18; - new ControlSlot(this, x, y + 3 + 18).assign(0); + new ControlSlot.Builder(this, x, y + 3 + 18).assign(0); x += 18; new ControlMachineProgress(this, x, y + 19, WindowGenepool.ProgressBase, WindowGenepool.Progress, Position.Left); x += 130; new ControlLiquidTank(this, x, y).setTankID(0); new ControlEnergyBar(this, 21, 115, 16, 60, Position.Bottom); - new ControlSlot(this, 121, 82).assign(7); + new ControlSlot.Builder(this, 121, 82).assign(7); new ControlSlotCharge(this, 143, 82, 7).setColour(15722671); new ControlErrorState(this, 181, 83); new ControlPlayerInventory(this); diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java b/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java index 65e1300c..c6126f2d 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java @@ -35,16 +35,16 @@ public class WindowIncubator extends WindowMachine { final int y = 32; new ControlLiquidTank(this, x, y).setTankID(0); x += 26; - new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.SLOT_QUEUE); + new ControlSlotArray.Builder(this, x, y + 3, 1, 3).create(Incubator.SLOT_QUEUE); x += 20; new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 18; new ControlMachineProgress(this, x, y + 6, WindowIncubator.ProgressBase, WindowIncubator.Progress, Position.Left); - new ControlSlot(this, x + 11, y + 3 + 10).assign(3); + new ControlSlot.Builder(this, x + 11, y + 3 + 10).assign(3); x += 40; new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 18; - new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.SLOT_OUTPUT); + new ControlSlotArray.Builder(this, x, y + 3, 1, 3).create(Incubator.SLOT_OUTPUT); x += 26; new ControlLiquidTank(this, x, y).setTankID(1); x += 34; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowInoculator.java b/src/main/java/binnie/genetics/machine/craftgui/WindowInoculator.java index 2fe343ad..3722cdb9 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowInoculator.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowInoculator.java @@ -37,11 +37,11 @@ public class WindowInoculator extends WindowMachine { final int y = 32; new ControlLiquidTank(this, x, y + 18 + 16).setTankID(0); CraftGUIUtil.horizontalGrid(x, y, - new ControlSlotArray(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_RESERVE), + new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_RESERVE), new ControlIconDisplay(this, 0, 0, GUIIcon.ArrowRight.getIcon().getResourceLocation()), - new ControlSlot(this, 0, 0).assign(0), + new ControlSlot.Builder(this, 0, 0).assign(0), new ControlIconDisplay(this, 0, 0, GUIIcon.ArrowRight.getIcon().getResourceLocation()), - new ControlSlotArray(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_EXPENDED) + new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_EXPENDED) ); x += 18; new ControlMachineProgress(this, x, y + 24, WindowInoculator.ProgressBase, WindowInoculator.Progress, Position.Left); @@ -49,9 +49,9 @@ public class WindowInoculator extends WindowMachine { new ControlErrorState(this, 161, 118); x += 142; CraftGUIUtil.verticalGrid(x, y, TextJustification.MiddleLeft, 8, - new ControlSlotArray(this, x, y, 4, 1).create(Inoculator.SLOT_RESERVE), - new ControlSlot(this, x, y + 18 + 8).assign(9), - new ControlSlotArray(this, x, y + 18 + 8 + 18 + 8, 4, 1).create(Inoculator.SLOT_FINISHED) + new ControlSlotArray.Builder(this, x, y, 4, 1).create(Inoculator.SLOT_RESERVE), + new ControlSlot.Builder(this, x, y + 18 + 8).assign(9), + new ControlSlotArray.Builder(this, x, y + 18 + 8 + 18 + 8, 4, 1).create(Inoculator.SLOT_FINISHED) ); new ControlIconDisplay(this, x + 18, y + 18 + 2, GUIIcon.ArrowUpLeft.getIcon().getResourceLocation()); new ControlIconDisplay(this, x + 18, y + 18 + 18, GUIIcon.ArrowLeftDown.getIcon().getResourceLocation()); diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowIsolator.java b/src/main/java/binnie/genetics/machine/craftgui/WindowIsolator.java index 58f46401..6994c446 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowIsolator.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowIsolator.java @@ -36,23 +36,23 @@ public class WindowIsolator extends WindowMachine { final int y = 32; new ControlLiquidTank(this, x, y).setTankID(0); x += 26; - new ControlSlotArray(this, x, y + 3, 1, 3).create(Isolator.SLOT_RESERVE); + new ControlSlotArray.Builder(this, x, y + 3, 1, 3).create(Isolator.SLOT_RESERVE); x += 20; new ControlIconDisplay(this, x, y + 3 + 1, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 18; - new ControlSlot(this, x, y + 3).assign(5); - new ControlSlot(this, x, y + 36 + 3).assign(0); + new ControlSlot.Builder(this, x, y + 3).assign(5); + new ControlSlot.Builder(this, x, y + 36 + 3).assign(0); new ControlSlotCharge(this, x + 18 + 2, y + 36 + 3, 0).setColour(15722671); x += 18; new ControlProgress(this, x, y + 3, WindowIsolator.ProgressBase, WindowIsolator.Progress, Position.Left); x += 142; - new ControlSlot(this, x, y + 3).assign(6); - new ControlSlot(this, x, y + 3 + 36).assign(1); + new ControlSlot.Builder(this, x, y + 3).assign(6); + new ControlSlot.Builder(this, x, y + 3 + 36).assign(1); new ControlIconDisplay(this, x + 1, y + 3 + 19, GUIIcon.ArrowUp.getIcon().getResourceLocation()); x += 20; new ControlIconDisplay(this, x, y + 3 + 1, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 18; - new ControlSlotArray(this, x, y + 3, 2, 3).create(Isolator.SLOT_FINISHED); + new ControlSlotArray.Builder(this, x, y + 3, 2, 3).create(Isolator.SLOT_FINISHED); new ControlEnergyBar(this, 260, 130, 16, 60, Position.Bottom); new ControlErrorState(this, 153, 81); new ControlPlayerInventory(this); diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowPolymeriser.java b/src/main/java/binnie/genetics/machine/craftgui/WindowPolymeriser.java index 9fdf138b..f7581415 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowPolymeriser.java @@ -34,19 +34,19 @@ public class WindowPolymeriser extends WindowMachine { super.initialiseClient(); int x = 16; final int y = 38; - new ControlSlotArray(this, x, y, 1, 4).create(Polymeriser.SLOT_SERUM_RESERVE); + new ControlSlotArray.Builder(this, x, y, 1, 4).create(Polymeriser.SLOT_SERUM_RESERVE); new ControlIconDisplay(this, x + 18, y + 1, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 34; new ControlMachineProgress(this, x + 18, y - 6, WindowPolymeriser.ProgressBase, WindowPolymeriser.Progress, Position.Left); - new ControlSlot(this, x, y).assign(0); + new ControlSlot.Builder(this, x, y).assign(0); new ControlLiquidTank(this, x, y + 18 + 16, true).setTankID(0); new ControlLiquidTank(this, x, y + 18 + 16 + 18 + 8, true).setTankID(1); new ControlEnergyBar(this, x + 120, 96, 64, 16, Position.Left); x += 40; - new ControlSlot(this, x + 30, y + 18 + 8).assign(1); + new ControlSlot.Builder(this, x + 30, y + 18 + 8).assign(1); new ControlSlotCharge(this, x + 30 + 20, y + 18 + 8, 1).setColour(16766976); x += 138; - new ControlSlotArray(this, x, y + 9, 2, 2).create(Polymeriser.SLOT_SERUM_FINISHED); + new ControlSlotArray.Builder(this, x, y + 9, 2, 2).create(Polymeriser.SLOT_SERUM_FINISHED); final ControlErrorState errorState = new ControlErrorState(this, 244, 97); new ControlPlayerInventory(this); } diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java b/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java index c8b16af8..7aa257d7 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java @@ -48,20 +48,18 @@ public class WindowSequencer extends WindowMachine { int x = 16; int y = 32; CraftGUIUtil.horizontalGrid(x, y, TextJustification.MiddleCenter, 2, - new ControlSlotArray(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE), + new ControlSlotArray.Builder(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE), new ControlIconDisplay(this, 0, 0, GUIIcon.ArrowRight.getIcon().getResourceLocation()), new ControlSequencerProgress(this, 0, 0), new ControlIconDisplay(this, 0, 0, GUIIcon.ArrowRight.getIcon().getResourceLocation()), - new ControlSlot(this, 0, 0).assign(6) + new ControlSlot.Builder(this, 0, 0).assign(6) ); - final ControlSlot slotTarget = new ControlSlot(this, x + 96, y + 16); - slotTarget.assign(5); + final ControlSlot slotTarget = new ControlSlot.Builder(this, x + 96, y + 16).assign(5); x = 34; y = 92; this.slotText = new ControlText(this, new IArea(0, y, this.w(), 12), TextFormatting.DARK_GRAY + Genetics.proxy.localise("machine.machine.sequencer.texts.userless"), TextJustification.MiddleCenter); y += 20; - final ControlSlot slotDye = new ControlSlot(this, x, y); - slotDye.assign(0); + final ControlSlot slotDye = new ControlSlot.Builder(this, x, y).assign(0); x += 20; new ControlSlotCharge(this, x, y, 0).setColour(16750848); x += 32; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowSplicer.java b/src/main/java/binnie/genetics/machine/craftgui/WindowSplicer.java index c7036f7d..903d728e 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowSplicer.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowSplicer.java @@ -35,21 +35,21 @@ public class WindowSplicer extends WindowMachine { int x = 16; new ControlSplicerProgress(this, 84, 32, this.w() - 172, 102); CraftGUIUtil.horizontalGrid(x, 62, - new ControlSlotArray(this, 0, 0, 2, 1).create(Splicer.SLOT_SERUM_RESERVE), + new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Splicer.SLOT_SERUM_RESERVE), new ControlIconDisplay(this, 0, 0, GUIIcon.ArrowRight.getIcon().getResourceLocation()), - new ControlSlot(this, 0, 0).assign(0) + new ControlSlot.Builder(this, 0, 0).assign(0) ); - new ControlSlotArray(this, x + 12, 84, 2, 1).create(Splicer.SLOT_SERUM_EXPENDED); + new ControlSlotArray.Builder(this, x + 12, 84, 2, 1).create(Splicer.SLOT_SERUM_EXPENDED); new ControlIconDisplay(this, x + 12 + 36 + 4, 86, GUIIcon.ArrowUpLeft.getIcon().getResourceLocation()); new ControlEnergyBar(this, 196, 64, 60, 16, Position.Left); new ControlErrorState(this, 218, 86); x += 142; CraftGUIUtil.verticalGrid((this.w() - 72) / 2, 32, TextJustification.MiddleCenter, 4, - new ControlSlotArray(this, 0, 0, 4, 1).create(Inoculator.SLOT_RESERVE), + new ControlSlotArray.Builder(this, 0, 0, 4, 1).create(Inoculator.SLOT_RESERVE), new ControlIconDisplay(this, 0, 0, GUIIcon.ArrowDown.getIcon().getResourceLocation()), - new ControlSlot(this, 0, 0).assign(9), + new ControlSlot.Builder(this, 0, 0).assign(9), new ControlIconDisplay(this, 0, 0, GUIIcon.ArrowDown.getIcon().getResourceLocation()), - new ControlSlotArray(this, 0, 0, 4, 1).create(Inoculator.SLOT_FINISHED) + new ControlSlotArray.Builder(this, 0, 0, 4, 1).create(Inoculator.SLOT_FINISHED) ); new ControlPlayerInventory(this); } diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java index ef05183e..9e00439c 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java @@ -48,7 +48,8 @@ public class GenepoolLogic extends ComponentProcessSetCost implements IProcess { @Override public ErrorState canProgress() { - if (!this.getUtil().spaceInTank(Genepool.TANK_DNA, getDNAAmount(this.getUtil().getStack(0)))) { + ItemStack individual = this.getUtil().getStack(Genepool.SLOT_BEE); + if (!this.getUtil().spaceInTank(Genepool.TANK_DNA, getDNAAmount(individual))) { return new ErrorState.NoSpace(Genetics.proxy.localise("machine.errors.tanks.no.room.desc"), new int[]{0}); } if (!this.getUtil().liquidInTank(Genepool.TANK_ETHANOL, 1)) { @@ -77,6 +78,7 @@ public class GenepoolLogic extends ComponentProcessSetCost implements IProcess { this.getUtil().drainTank(Genepool.TANK_ETHANOL, 1); --this.ethanolDrain; } - this.getMachine().getInterface(IChargedSlots.class).alterCharge(Genepool.SLOT_ENZYME, -ENZYME_PER_PROCESS * this.getProgressPerTick() / 100.0f); + IChargedSlots chargedSlots = this.getMachine().getInterface(IChargedSlots.class); + chargedSlots.alterCharge(Genepool.SLOT_ENZYME, -ENZYME_PER_PROCESS * this.getProgressPerTick() / 100.0f); } } diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/src/main/java/binnie/genetics/machine/incubator/Incubator.java index a445c9c8..61de337c 100644 --- a/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -11,6 +11,8 @@ import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import javax.annotation.Nullable; @@ -28,7 +30,7 @@ public class Incubator { private static IncubatorRecipeLarvae LARVAE_RECIPE; public static void addRecipes() { - Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), Binnie.LIQUID.getFluidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f)); + Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), new FluidStack(FluidRegistry.WATER, 25), GeneticLiquid.GrowthMedium.get(25), 0.2f)); Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.WHEAT), GeneticLiquid.GrowthMedium.get(25), GeneticLiquid.Bacteria.get(5), 0.2f)); Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), GeneticLiquid.Bacteria.get(0), GeneticLiquid.Bacteria.get(5), 0.05f)); Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.SUGAR), GeneticLiquid.Bacteria.get(2), null, 0.5f, 0.2f) diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java index 033c2c06..53ed07ae 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java @@ -10,10 +10,12 @@ import binnie.genetics.api.IIncubatorRecipe; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nullable; import java.util.Random; public class IncubatorLogic extends ComponentProcessIndefinate implements IProcess { - IIncubatorRecipe recipe; + @Nullable + private IIncubatorRecipe recipe; private Random rand; private boolean roomForOutput; @@ -57,6 +59,7 @@ public class IncubatorLogic extends ComponentProcessIndefinate implements IProce return this.recipe != null; } + @Nullable private IIncubatorRecipe getRecipe(final ItemStack stack, final FluidStack liquid) { for (final IIncubatorRecipe recipe : Incubator.getRecipes()) { final boolean rightLiquid = recipe.isInputLiquid(liquid); diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java index 081708c3..4d49032c 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java @@ -6,21 +6,24 @@ import binnie.genetics.api.IIncubatorRecipe; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nullable; import java.util.Random; public class IncubatorRecipe implements IIncubatorRecipe { private final FluidStack input; + @Nullable private final FluidStack output; private final ItemStack itemStack; private final float lossChance; private final float tickChance; + @Nullable private ItemStack outputStack; - public IncubatorRecipe(ItemStack itemStack, final FluidStack input, final FluidStack output, final float lossChance) { + public IncubatorRecipe(ItemStack itemStack, final FluidStack input, @Nullable final FluidStack output, final float lossChance) { this(itemStack, input, output, lossChance, 1.0f); } - public IncubatorRecipe(ItemStack itemStack, final FluidStack input, final FluidStack output, final float lossChance, final float chance) { + public IncubatorRecipe(ItemStack itemStack, final FluidStack input, @Nullable final FluidStack output, final float lossChance, final float chance) { this.itemStack = itemStack; this.input = input; this.output = output; @@ -39,12 +42,12 @@ public class IncubatorRecipe implements IIncubatorRecipe { } @Override - public boolean isInputLiquid(final FluidStack fluid) { + public boolean isInputLiquid(@Nullable final FluidStack fluid) { return fluid != null && this.input.isFluidEqual(fluid); } @Override - public boolean isInputLiquidSufficient(final FluidStack fluid) { + public boolean isInputLiquidSufficient(@Nullable final FluidStack fluid) { return fluid != null && fluid.amount >= 500; } @@ -54,6 +57,7 @@ public class IncubatorRecipe implements IIncubatorRecipe { } @Override + @Nullable public FluidStack getOutput() { return output; } @@ -91,6 +95,7 @@ public class IncubatorRecipe implements IIncubatorRecipe { return this; } + @Nullable protected ItemStack getOutputStack(final MachineUtil util) { return getExpectedOutput(); } @@ -98,7 +103,7 @@ public class IncubatorRecipe implements IIncubatorRecipe { @Override public boolean roomForOutput(final MachineUtil machine) { if (this.output != null && !machine.isTankEmpty(1)) { - if (!machine.getFluid(Incubator.TANK_OUTPUT).isFluidEqual(this.output)) { + if (!this.output.isFluidEqual(machine.getFluid(Incubator.TANK_OUTPUT))) { return false; } if (!machine.spaceInTank(Incubator.TANK_OUTPUT, this.output.amount)) { diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java index 758e017b..ea6f01cf 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java @@ -23,11 +23,11 @@ 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(ItemStack itemStack) { + public static int getProcessLength(@Nullable ItemStack itemStack) { return PROCESS_BASE_LENGTH * getNumberOfGenes(itemStack); } - public static int getProcessBaseEnergy(ItemStack itemStack) { + public static int getProcessBaseEnergy(@Nullable ItemStack itemStack) { return PROCESS_BASE_ENERGY * getNumberOfGenes(itemStack); } @@ -80,12 +80,14 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { if (state != null) { return state; } - if (this.getUtil().getStack(Inoculator.SLOT_SERUM_VIAL) != null && Engineering.getCharges(this.getUtil().getStack(Inoculator.SLOT_SERUM_VIAL)) == 0) { + ItemStack serum = this.getUtil().getStack(Inoculator.SLOT_SERUM_VIAL); + if (serum != null && Engineering.getCharges(serum) == 0) { return new ErrorState(Genetics.proxy.localise("machine.errors.empty.serum.desc"), Genetics.proxy.localise("machine.errors.empty.serum.info")); } return super.canWork(); } + @Nullable public ErrorState isValidSerum() { final ItemStack serum = this.getUtil().getStack(Inoculator.SLOT_SERUM_VIAL); final ItemStack target = this.getUtil().getStack(Inoculator.SLOT_TARGET);