From 1276bd4b1872b3a32f8415cdc7d631763577ac29 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 24 Jan 2017 01:47:00 -0800 Subject: [PATCH] Fix some TODOs --- .../botany/ceramic/CeramicTileRecipe.java | 4 +- .../binnie/botany/ceramic/PigmentRecipe.java | 26 ++- .../core/circuits/BinnieCircuitLayout.java | 22 ++- .../circuits/BinnieCircuitSocketType.java | 23 +++ .../binnie/extrabees/apiary/ModuleApiary.java | 3 +- .../block/decor/MultiFenceRecipeEmbedded.java | 5 +- .../block/decor/MultiFenceRecipeSize.java | 4 +- .../block/decor/MultiFenceRecipeSolid.java | 5 +- .../block/decor/NBTShapedRecipe.java | 150 ------------------ .../block/decor/NBTShapedRecipes.java | 54 ------- .../genetics/gui/AnalystPageProducts.java | 38 +++-- 11 files changed, 86 insertions(+), 248 deletions(-) create mode 100644 src/main/java/binnie/core/circuits/BinnieCircuitSocketType.java delete mode 100644 src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java delete mode 100644 src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index 41aed351..0b03c847 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -9,6 +9,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -67,8 +68,9 @@ public class CeramicTileRecipe implements IRecipe { return this.cached; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index b8be27b7..ed5eaafd 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -7,30 +7,23 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; + +import javax.annotation.Nonnull; public class PigmentRecipe implements IRecipe { - private final ItemStack unknown; - ItemStack cached; - - public PigmentRecipe() { - this.unknown = null; - } - @Override - public boolean matches(final InventoryCrafting crafting, final World world) { + public boolean matches(@Nonnull final InventoryCrafting crafting, @Nonnull final World world) { return this.getCraftingResult(crafting) != null; } @Override public ItemStack getRecipeOutput() { - if (this.cached != null) { - return this.cached; - } - return this.unknown; + return null; } @Override - public ItemStack getCraftingResult(final InventoryCrafting crafting) { + public ItemStack getCraftingResult(@Nonnull final InventoryCrafting crafting) { int n = 0; ItemStack stack = null; for (int i = 0; i < crafting.getSizeInventory(); ++i) { @@ -54,10 +47,9 @@ public class PigmentRecipe implements IRecipe { return 1; } - - //TODO IMPLEMENT + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { - return new ItemStack[0]; + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java index a1e817f6..a55834f2 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java @@ -3,37 +3,47 @@ package binnie.core.circuits; import binnie.Binnie; import binnie.core.AbstractMod; import forestry.api.circuits.ChipsetManager; -import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitSocketType; -public class BinnieCircuitLayout implements ICircuitLayout { - private String uid; - private AbstractMod mod; +import javax.annotation.Nonnull; - public BinnieCircuitLayout(final AbstractMod mod, final String uid) { +public class BinnieCircuitLayout implements ICircuitLayout { + @Nonnull + private final String uid; + @Nonnull + private final AbstractMod mod; + @Nonnull + private final ICircuitSocketType socketType; + + public BinnieCircuitLayout(@Nonnull final AbstractMod mod, @Nonnull final String uid, @Nonnull final ICircuitSocketType socketType) { this.uid = uid; this.mod = mod; + this.socketType = socketType; ChipsetManager.circuitRegistry.registerLayout(this); } + @Nonnull @Override public String getUID() { return "binnie.circuitLayout" + this.uid; } + @Nonnull @Override public String getName() { return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase()); } + @Nonnull @Override public String getUsage() { return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase() + ".usage"); } + @Nonnull @Override public ICircuitSocketType getSocketType() { - return CircuitSocketType.NONE;// TODO hmm? CircuitSocketType + return this.socketType; } } diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitSocketType.java b/src/main/java/binnie/core/circuits/BinnieCircuitSocketType.java new file mode 100644 index 00000000..5adb526a --- /dev/null +++ b/src/main/java/binnie/core/circuits/BinnieCircuitSocketType.java @@ -0,0 +1,23 @@ +package binnie.core.circuits; + +import forestry.api.circuits.ICircuitSocketType; + +public enum BinnieCircuitSocketType implements ICircuitSocketType { + STIMULATOR("binnie.extrabees.stimulator"); + + private final String uid; + + BinnieCircuitSocketType(String uid) { + this.uid = uid; + } + + @Override + public String getUid() { + return uid; + } + + @Override + public boolean equals(ICircuitSocketType socketType) { + return uid.equals(socketType.getUid()); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index a0a5db79..6037846f 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -5,6 +5,7 @@ import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.circuits.BinnieCircuitLayout; +import binnie.core.circuits.BinnieCircuitSocketType; import binnie.core.machines.MachineGroup; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.AlvearyMachine; @@ -82,6 +83,6 @@ public class ModuleApiary implements IInitializable { @Override public void init() { - this.stimulatorLayout = new BinnieCircuitLayout(ExtraBees.instance, "Stimulator"); + this.stimulatorLayout = new BinnieCircuitLayout(ExtraBees.instance, "Stimulator", BinnieCircuitSocketType.STIMULATOR); } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 80d15746..3c79d5a3 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -9,6 +9,8 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import javax.annotation.Nonnull; + public class MultiFenceRecipeEmbedded implements IRecipe { ItemStack cached; @@ -54,8 +56,9 @@ public class MultiFenceRecipeEmbedded implements IRecipe { return (this.cached == null) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index c19323ca..5ace5942 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -9,6 +9,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -79,8 +80,9 @@ public class MultiFenceRecipeSize implements IRecipe { } } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 250016e0..c28d4159 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -8,6 +8,8 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import javax.annotation.Nonnull; + public class MultiFenceRecipeSolid implements IRecipe { ItemStack cached; @@ -51,8 +53,9 @@ public class MultiFenceRecipeSolid implements IRecipe { return (this.cached == null) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java deleted file mode 100644 index 7928db2b..00000000 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java +++ /dev/null @@ -1,150 +0,0 @@ -package binnie.extratrees.block.decor; - -import net.minecraft.block.Block; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.util.HashMap; - -public class NBTShapedRecipe implements IRecipe { - public final int recipeWidth; - public final int recipeHeight; - public final ItemStack[] recipeItems; - @Nonnull - private ItemStack recipeOutput; - private boolean field_92101_f; - private static final String __OBFID = "CL_00000093"; - - @Nonnull - @Override - public ItemStack getRecipeOutput() { - return this.recipeOutput; - } - - //TODO INV - @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { - return new ItemStack[0]; - } - - @Override - public boolean matches(final InventoryCrafting p_77569_1_, final World p_77569_2_) { - for (int i = 0; i <= 3 - this.recipeWidth; ++i) { - for (int j = 0; j <= 3 - this.recipeHeight; ++j) { - if (this.checkMatch(p_77569_1_, i, j, true)) { - return true; - } - if (this.checkMatch(p_77569_1_, i, j, false)) { - return true; - } - } - } - return false; - } - - private boolean checkMatch(final InventoryCrafting p_77573_1_, final int p_77573_2_, final int p_77573_3_, final boolean p_77573_4_) { - for (int k = 0; k < 3; ++k) { - for (int l = 0; l < 3; ++l) { - final int i1 = k - p_77573_2_; - final int j1 = l - p_77573_3_; - ItemStack itemstack = null; - if (i1 >= 0 && j1 >= 0 && i1 < this.recipeWidth && j1 < this.recipeHeight) { - if (p_77573_4_) { - itemstack = this.recipeItems[this.recipeWidth - i1 - 1 + j1 * this.recipeWidth]; - } else { - itemstack = this.recipeItems[i1 + j1 * this.recipeWidth]; - } - } - final ItemStack itemstack2 = p_77573_1_.getStackInRowAndColumn(k, l); - if (itemstack2 != null || itemstack != null) { - if ((itemstack2 == null && itemstack != null) || (itemstack2 != null && itemstack == null)) { - return false; - } - if (itemstack.getItem() != itemstack2.getItem()) { - return false; - } - if (itemstack.getItemDamage() != 32767 && itemstack.getItemDamage() != itemstack2.getItemDamage()) { - return false; - } - if (itemstack.hasTagCompound() && itemstack2.hasTagCompound() && !ItemStack.areItemStackTagsEqual(itemstack, itemstack2)) { - return false; - } - } - } - } - return true; - } - - @Override - public ItemStack getCraftingResult(final InventoryCrafting p_77572_1_) { - final ItemStack itemstack = this.getRecipeOutput().copy(); - if (this.field_92101_f) { - for (int i = 0; i < p_77572_1_.getSizeInventory(); ++i) { - final ItemStack itemstack2 = p_77572_1_.getStackInSlot(i); - if (itemstack2 != null && itemstack2.hasTagCompound()) { - itemstack.setTagCompound(itemstack2.getTagCompound().copy()); - } - } - } - return itemstack; - } - - @Override - public int getRecipeSize() { - return this.recipeWidth * this.recipeHeight; - } - - public NBTShapedRecipe(@Nonnull final ItemStack recipeOutput, final Object... p_92103_2_) { - String s = ""; - int i = 0; - int j = 0; - int k = 0; - if (p_92103_2_[i] instanceof String[]) { - final String[] astring = (String[]) p_92103_2_[i++]; - for (final String s2 : astring) { - ++k; - j = s2.length(); - s += s2; - } - } else { - while (p_92103_2_[i] instanceof String) { - final String s3 = (String) p_92103_2_[i++]; - ++k; - j = s3.length(); - s += s3; - } - } - final HashMap hashmap = new HashMap(); - while (i < p_92103_2_.length) { - final Character character = (Character) p_92103_2_[i]; - ItemStack itemstack1 = null; - if (p_92103_2_[i + 1] instanceof Item) { - itemstack1 = new ItemStack((Item) p_92103_2_[i + 1]); - } else if (p_92103_2_[i + 1] instanceof Block) { - itemstack1 = new ItemStack((Block) p_92103_2_[i + 1], 1, 32767); - } else if (p_92103_2_[i + 1] instanceof ItemStack) { - itemstack1 = (ItemStack) p_92103_2_[i + 1]; - } - hashmap.put(character, itemstack1); - i += 2; - } - final ItemStack[] aitemstack = new ItemStack[j * k]; - for (int i2 = 0; i2 < j * k; ++i2) { - final char c0 = s.charAt(i2); - if (hashmap.containsKey(c0)) { - aitemstack[i2] = ((ItemStack) hashmap.get(c0)).copy(); - } else { - aitemstack[i2] = null; - } - } - this.recipeWidth = j; - this.recipeHeight = k; - this.recipeItems = aitemstack; - this.recipeOutput = recipeOutput; - NBTShapedRecipes.addRecipe(this); - } -} diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java deleted file mode 100644 index 22d64811..00000000 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java +++ /dev/null @@ -1,54 +0,0 @@ -package binnie.extratrees.block.decor; - -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class NBTShapedRecipes implements IRecipe { - static List recipes = new ArrayList<>(); - - @Override - public boolean matches(final InventoryCrafting inventory, final World world) { - for (final NBTShapedRecipe recipe : NBTShapedRecipes.recipes) { - if (recipe.matches(inventory, world)) { - return true; - } - } - return false; - } - - @Override - public ItemStack getCraftingResult(final InventoryCrafting inventory) { - for (final NBTShapedRecipe recipe : NBTShapedRecipes.recipes) { - if (recipe.matches(inventory, null)) { - return recipe.getCraftingResult(inventory); - } - } - return null; - } - - @Override - public int getRecipeSize() { - return 9; - } - - @Override - public ItemStack getRecipeOutput() { - return null; - } - - //TODO INV - @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { - return new ItemStack[0]; - } - - public static void addRecipe(final NBTShapedRecipe nbtShapedRecipe) { - NBTShapedRecipes.recipes.add(nbtShapedRecipe); - } - -} diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java index 10ba34ec..08a4d3d2 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java @@ -24,7 +24,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.IFluidHandler; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -117,22 +120,7 @@ public class AnalystPageProducts extends AnalystPageProduce { dx = 0; dy += 18; } - ItemStack container = null; - //TODO - for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (data.emptyContainer.isItemEqual(new ItemStack(Items.GLASS_BOTTLE)) && data.fluid.isFluidEqual(soilStack2)) { - container = data.filledContainer; - break; - } - if (data.emptyContainer.isItemEqual(new ItemStack(Items.BUCKET)) && data.fluid.isFluidEqual(soilStack2)) { - container = data.filledContainer; - break; - } - if (data.fluid.isFluidEqual(soilStack2)) { - container = data.filledContainer; - break; - } - } + ItemStack container = getContainer(soilStack2); if (container == null) { final ControlFluidDisplay display2 = new ControlFluidDisplay(this, biomeListX + dx, y + dy); display2.setItemStack(soilStack2); @@ -147,6 +135,24 @@ public class AnalystPageProducts extends AnalystPageProduce { this.setSize(new IPoint(this.w(), y + dy + 18 + 8)); } + @Nullable + private static ItemStack getContainer(final FluidStack fluidStack) { + ItemStack[] containers = { + new ItemStack(Items.GLASS_BOTTLE), + new ItemStack(Items.BUCKET) + }; + + for (ItemStack container : containers) { + // TODO 1.11 update for IFluidHandlerItem + IFluidHandler fluidHandler = FluidUtil.getFluidHandler(container); + if (fluidHandler != null && fluidHandler.fill(fluidStack, true) > 0) { + return container; + } + } + + return null; + } + private void createProductEntry(final ItemStack key, final Float value, final int y, final float speed) { final ControlItemDisplay item = new ControlItemDisplay(this, 16.0f, y) { @Override