From 0806d2ac38ba6ff08811eea06eee64c462459846 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 22 Oct 2016 19:18:25 +0200 Subject: [PATCH] Clean Up Api --- .../java/binnie/botany/api/IColourMix.java | 6 ++--- .../java/binnie/botany/api/IFlowerRoot.java | 24 +++++++++---------- .../botany/api/gardening/IBlockSoil.java | 16 ++++++------- .../binnie/botany/genetics/ColourMix.java | 4 ++-- .../craftgui/botany/ControlColourMixItem.java | 4 ++-- .../binnie/craftgui/botany/PageColourMix.java | 2 +- .../craftgui/minecraft/ContainerCraftGUI.java | 7 +----- 7 files changed, 29 insertions(+), 34 deletions(-) diff --git a/src/main/java/binnie/botany/api/IColourMix.java b/src/main/java/binnie/botany/api/IColourMix.java index 43b47b72..65f90cf4 100644 --- a/src/main/java/binnie/botany/api/IColourMix.java +++ b/src/main/java/binnie/botany/api/IColourMix.java @@ -1,11 +1,11 @@ package binnie.botany.api; public interface IColourMix { - IFlowerColour getColour1(); + IFlowerColour getColourFirst(); - IFlowerColour getColour2(); + IFlowerColour getColourSecond(); - boolean isMutation(final IFlowerColour p0, final IFlowerColour p1); + boolean isMutation(IFlowerColour colourFirst, IFlowerColour colourSecond); int getChance(); diff --git a/src/main/java/binnie/botany/api/IFlowerRoot.java b/src/main/java/binnie/botany/api/IFlowerRoot.java index 33cb5f1c..99d36029 100644 --- a/src/main/java/binnie/botany/api/IFlowerRoot.java +++ b/src/main/java/binnie/botany/api/IFlowerRoot.java @@ -11,36 +11,36 @@ import java.util.List; public interface IFlowerRoot extends ISpeciesRoot { @Override - IFlower getMember(final ItemStack p0); + IFlower getMember(ItemStack memberStack); @Override - IFlower templateAsIndividual(final IAllele[] p0); + IFlower templateAsIndividual(IAllele[] template); @Override - IFlower templateAsIndividual(final IAllele[] p0, final IAllele[] p1); + IFlower templateAsIndividual(IAllele[] templateFirst, IAllele[] templateSecond); @Override - IFlowerGenome templateAsGenome(final IAllele[] p0); + IFlowerGenome templateAsGenome(IAllele[] template); @Override - IFlowerGenome templateAsGenome(final IAllele[] p0, final IAllele[] p1); + IFlowerGenome templateAsGenome(IAllele[] templateFrist, IAllele[] templateSecond); @Override - IBotanistTracker getBreedingTracker(final World p0, final GameProfile p1); + IBotanistTracker getBreedingTracker(World world, GameProfile profile); @Override List getMutations(boolean shuffle); @Override EnumFlowerStage getType(ItemStack itemStack); + + IFlower getFlower(World world, IFlowerGenome genome); - IFlower getFlower(final World p0, final IFlowerGenome genome); + void addConversion(ItemStack memberStack, IAllele[] template); - void addConversion(final ItemStack p0, final IAllele[] p1); + IFlower getConversion(ItemStack memberStack); - IFlower getConversion(final ItemStack p0); + Collection getColourMixes(boolean p0); - Collection getColourMixes(final boolean p0); - - void registerColourMix(final IColourMix p0); + void registerColourMix(IColourMix colourMix); } diff --git a/src/main/java/binnie/botany/api/gardening/IBlockSoil.java b/src/main/java/binnie/botany/api/gardening/IBlockSoil.java index 2fce30b0..87ce9da5 100644 --- a/src/main/java/binnie/botany/api/gardening/IBlockSoil.java +++ b/src/main/java/binnie/botany/api/gardening/IBlockSoil.java @@ -7,19 +7,19 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public interface IBlockSoil { - EnumAcidity getPH(final World p0, final BlockPos pos); + EnumAcidity getPH(World world, BlockPos pos); - EnumMoisture getMoisture(final World p0, final BlockPos pos); + EnumMoisture getMoisture(World world, BlockPos pos); - EnumSoilType getType(final World p0, final BlockPos pos); + EnumSoilType getType(World world, BlockPos pos); - boolean fertilise(final World p0, final BlockPos pos, final EnumSoilType p4); + boolean fertilise(World world, BlockPos pos, EnumSoilType soilType); - boolean degrade(final World p0, final BlockPos pos, final EnumSoilType p4); + boolean degrade(World world, BlockPos pos, EnumSoilType soilType); - boolean setPH(final World p0, final BlockPos pos, final EnumAcidity p4); + boolean setPH(World world, BlockPos pos, EnumAcidity acidity); - boolean setMoisture(final World p0, final BlockPos pos, final EnumMoisture p4); + boolean setMoisture(World world, BlockPos pos, EnumMoisture moisture); - boolean resistsWeeds(final World p0, final BlockPos pos); + boolean resistsWeeds(World world, BlockPos pos); } diff --git a/src/main/java/binnie/botany/genetics/ColourMix.java b/src/main/java/binnie/botany/genetics/ColourMix.java index 40ccb8f4..f111d11d 100644 --- a/src/main/java/binnie/botany/genetics/ColourMix.java +++ b/src/main/java/binnie/botany/genetics/ColourMix.java @@ -10,12 +10,12 @@ public class ColourMix implements IColourMix { int chance; @Override - public IFlowerColour getColour1() { + public IFlowerColour getColourFirst() { return this.colour1; } @Override - public IFlowerColour getColour2() { + public IFlowerColour getColourSecond() { return this.colour2; } diff --git a/src/main/java/binnie/craftgui/botany/ControlColourMixItem.java b/src/main/java/binnie/craftgui/botany/ControlColourMixItem.java index d3d13379..97d2f647 100644 --- a/src/main/java/binnie/craftgui/botany/ControlColourMixItem.java +++ b/src/main/java/binnie/craftgui/botany/ControlColourMixItem.java @@ -22,8 +22,8 @@ public class ControlColourMixItem extends ControlOption { this.arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1); final BreedingSystem system = ((WindowAbstractDatabase) this.getSuperParent()).getBreedingSystem(); if (this.getValue() != null) { - this.itemWidget1.setValue(this.getValue().getColour1()); - this.itemWidget2.setValue(this.getValue().getColour2()); + this.itemWidget1.setValue(this.getValue().getColourFirst()); + this.itemWidget2.setValue(this.getValue().getColourSecond()); this.itemWidget3.setValue(this.getValue().getResult()); this.addSymbol.setValue(this.getValue()); this.arrowSymbol.setValue(this.getValue()); diff --git a/src/main/java/binnie/craftgui/botany/PageColourMix.java b/src/main/java/binnie/craftgui/botany/PageColourMix.java index 99220d87..79c65cd3 100644 --- a/src/main/java/binnie/craftgui/botany/PageColourMix.java +++ b/src/main/java/binnie/craftgui/botany/PageColourMix.java @@ -26,7 +26,7 @@ public class PageColourMix extends PageAbstract { public void onValueChanged(final IFlowerColour colour) { final List mixes = new ArrayList<>(); for (final IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) { - if (mix.getColour1() == colour || mix.getColour2() == colour) { + if (mix.getColourFirst() == colour || mix.getColourSecond() == colour) { mixes.add(mix); } } diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index 709067c1..c8c1559d 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -224,14 +224,9 @@ public class ContainerCraftGUI extends Container { return false; } + //TODO: Fix random NullPointerException @Override public void detectAndSendChanges() { - for (int i = 0; i < this.inventorySlots.size(); ++i){ - Object o = this.inventorySlots.get(i); - if(o == null){ - getClass(); - } - } super.detectAndSendChanges(); final ITankMachine tanks = Machine.getInterface(ITankMachine.class, this.window.getInventory()); final IPoweredMachine powered = Machine.getInterface(IPoweredMachine.class, this.window.getInventory());