diff --git a/gradle.properties b/gradle.properties index 7471338b..aa51f451 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,16 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G -mcversion=1.10.2 -forgeversion=12.18.2.2114 -mcp_mappings=snapshot_20160525 +mcversion=1.11.2 +forgeversion=13.20.0.2227 +mcp_mappings=snapshot_20161220 -forestry_version=5.2.17.360 +forestry_version=5.3.0.32 version_major=2 version_minor=0 version_patch=0 -jei_version=3.14.2.401 -jeibees_cf=2333/218 -jeibees_version=0.9.0.3-mc1.10.2 +jei_version=4.2.4.229 +jeibees_cf=2376/963 +jeibees_version=0.9.0.4-mc1.11.2 diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 0b3c1913..8bb27c29 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -176,7 +176,7 @@ public class Botany extends AbstractMod { if (pollen != null && flower.canMateWith(pollen)) { flower.mateWith(pollen); if (!player.capabilities.isCreativeMode) { - --heldItem.stackSize; + heldItem.shrink(1); } } } @@ -208,7 +208,7 @@ public class Botany extends AbstractMod { EnumSoilType type = soil.getType(world, pos); int next = Math.min(type.ordinal() + fertiliserStrength, 2); if (soil.fertilise(world, pos, EnumSoilType.values()[next]) && !player.capabilities.isCreativeMode) { - --heldItem.stackSize; + heldItem.shrink(1); return; } } @@ -216,7 +216,7 @@ public class Botany extends AbstractMod { EnumAcidity pH = soil.getPH(world, pos); int next = Math.max(pH.ordinal() - fertiliserStrength, 0); if (soil.setPH(world, pos, EnumAcidity.values()[next]) && !player.capabilities.isCreativeMode) { - --heldItem.stackSize; + heldItem.shrink(1); return; } } @@ -224,12 +224,12 @@ public class Botany extends AbstractMod { EnumAcidity pH = soil.getPH(world, pos); int next = Math.min(pH.ordinal() + fertiliserStrength, 2); if (soil.setPH(world, pos, EnumAcidity.values()[next]) && !player.capabilities.isCreativeMode) { - --heldItem.stackSize; + heldItem.shrink(1); return; } } if (Gardening.isWeedkiller(heldItem) && Gardening.addWeedKiller(world, pos) && !player.capabilities.isCreativeMode) { - --heldItem.stackSize; + heldItem.shrink(1); } } } @@ -270,7 +270,7 @@ public class Botany extends AbstractMod { if (py >= 0) { 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; + heldItem.shrink(1); } } } diff --git a/src/main/java/binnie/botany/CreativeTabBotany.java b/src/main/java/binnie/botany/CreativeTabBotany.java index 2cbc27b0..ee9f235d 100644 --- a/src/main/java/binnie/botany/CreativeTabBotany.java +++ b/src/main/java/binnie/botany/CreativeTabBotany.java @@ -20,6 +20,7 @@ public class CreativeTabBotany extends CreativeTabs { } @Override + @SideOnly(Side.CLIENT) public String getTranslatedTabLabel() { return this.getTabLabel(); } @@ -32,8 +33,8 @@ public class CreativeTabBotany extends CreativeTabs { @Override @SideOnly(Side.CLIENT) - public Item getTabIconItem() { - return Item.getItemFromBlock(Blocks.YELLOW_FLOWER); + public ItemStack getTabIconItem() { + return new ItemStack(Blocks.YELLOW_FLOWER); } } diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 14a63310..199b978b 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -86,7 +87,7 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(final Item item, final CreativeTabs tab, final List itemList) { + public void getSubBlocks(final Item item, final CreativeTabs tab, final NonNullList itemList) { for (EnumFlowerColor c : EnumFlowerColor.values()) { itemList.add(new ItemStack(item, 1, c.getID())); } diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 23c578aa..424f244d 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -140,7 +141,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (final EnumFlowerColor c : EnumFlowerColor.values()) { itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal())); } diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index e5e40517..afd2101b 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -6,26 +6,23 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; public class CeramicTileRecipe implements IRecipe { - @Nullable - private ItemStack cached; + private ItemStack cached = ItemStack.EMPTY; @Override public boolean matches(final InventoryCrafting inv, final World world) { this.cached = this.getCraftingResult(inv); - return this.cached != null; + return !this.cached.isEmpty(); } @Override - @Nullable public ItemStack getCraftingResult(final InventoryCrafting inv) { final Item ceramicBlock = Item.getItemFromBlock(Botany.ceramic); final Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile); @@ -36,7 +33,7 @@ public class CeramicTileRecipe implements IRecipe { int iy = -1; for (int i = 0; i < inv.getSizeInventory(); ++i) { final ItemStack stack = inv.getStackInSlot(i); - if (stack != null) { + if (!stack.isEmpty()) { final int x = i / 3; final int y = i % 3; if (ix == -1) { @@ -44,10 +41,10 @@ public class CeramicTileRecipe implements IRecipe { iy = y; } if (x - ix >= 2 || y - iy >= 2 || y < iy || x < ix) { - return null; + return ItemStack.EMPTY; } if (stack.getItem() != ceramicBlock && stack.getItem() != ceramicTile && stack.getItem() != ceramicBrick && stack.getItem() != mortar) { - return null; + return ItemStack.EMPTY; } stacks.add(stack); } @@ -58,7 +55,7 @@ public class CeramicTileRecipe implements IRecipe { return result; } } - return null; + return ItemStack.EMPTY; } @Override @@ -72,7 +69,7 @@ public class CeramicTileRecipe implements IRecipe { } @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public NonNullList getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index 2ce7f2d2..cdaf43a5 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -6,6 +6,7 @@ import binnie.botany.api.IFlower; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -15,28 +16,27 @@ import javax.annotation.Nullable; public class PigmentRecipe implements IRecipe { @Override public boolean matches(final InventoryCrafting crafting, final World world) { - return this.getCraftingResult(crafting) != null; + return !this.getCraftingResult(crafting).isEmpty(); } @Override - @Nullable public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Override - @Nullable public ItemStack getCraftingResult(final InventoryCrafting crafting) { int n = 0; - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; for (int i = 0; i < crafting.getSizeInventory(); ++i) { - if (crafting.getStackInSlot(i) != null) { + ItemStack stackInSlot = crafting.getStackInSlot(i); + if (!stackInSlot.isEmpty()) { if (++n > 1) { - return null; + return ItemStack.EMPTY; } - if (Binnie.GENETICS.getFlowerRoot().isMember(crafting.getStackInSlot(i))) { - final IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(crafting.getStackInSlot(i)); - if (flower.getAge() >= 1) { + if (Binnie.GENETICS.getFlowerRoot().isMember(stackInSlot)) { + final IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stackInSlot); + if (flower != null && flower.getAge() >= 1) { stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID()); } } @@ -51,7 +51,7 @@ public class PigmentRecipe implements IRecipe { } @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public NonNullList getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index 385be23c..70bbc9c8 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -16,8 +16,8 @@ import forestry.api.core.ISpriteRegister; import forestry.api.core.IStateMapperRegister; import forestry.api.core.ITextureManager; import forestry.core.blocks.IColoredBlock; -import forestry.core.blocks.propertys.UnlistedBlockAccess; -import forestry.core.blocks.propertys.UnlistedBlockPos; +import forestry.core.blocks.properties.UnlistedBlockAccess; +import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.BlockModelEntry; import forestry.core.render.TextureManager; import net.minecraft.block.Block; @@ -37,6 +37,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -99,7 +101,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock itemList) { + public void getSubBlocks(Item item, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (final EnumFlowerColor color : EnumFlowerColor.values()) { itemList.add(new CeramicBrickPair(color, color, CeramicBrickType.Tile).getStack(1)); } @@ -160,7 +162,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock> 16 & 0xFF)); } diff --git a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java index c2289618..3ef98cfe 100644 --- a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java @@ -26,7 +26,7 @@ public class TileCeramicBrick extends TileEntity{ public ItemStack getStack(final int i) { final ItemStack s = TileEntityMetadata.getItemStack(Botany.ceramicBrick, this.ordinal()); - s.stackSize = i; + s.setCount(i); return s; } diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index e9a8e564..36881046 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -29,20 +30,21 @@ import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; public class GardenLogic extends FarmLogic { - EnumMoisture moisture; + private EnumMoisture moisture; @Nullable - EnumAcidity acidity; - boolean fertilised; - String name; - ArrayList produce; + private EnumAcidity acidity; + private boolean fertilised; + private String name; + private NonNullList produce; private ItemStack icon; List farmables; public GardenLogic(EnumMoisture moisture2, @Nullable EnumAcidity acidity2, boolean isManual, boolean isFertilised, ItemStack icon2, String name2) { - this.produce = new ArrayList<>(); + this.produce = NonNullList.create(); (this.farmables = new ArrayList<>()).add(new FarmableFlower()); this.farmables.add(new FarmableVanillaFlower()); this.moisture = moisture2; @@ -65,19 +67,25 @@ public class GardenLogic extends FarmLogic { @Override public boolean isAcceptedResource(final ItemStack itemstack) { - return Gardening.isSoil(itemstack.getItem()) || itemstack.getItem() == Item.getItemFromBlock(Blocks.SAND) || itemstack.getItem() == Item.getItemFromBlock(Blocks.DIRT) || Gardening.isAcidFertiliser(itemstack) || Gardening.isAlkalineFertiliser(itemstack); + return Gardening.isSoil(itemstack.getItem()) || + itemstack.getItem() == Item.getItemFromBlock(Blocks.SAND) || + itemstack.getItem() == Item.getItemFromBlock(Blocks.DIRT) || + Gardening.isAcidFertiliser(itemstack) || + Gardening.isAlkalineFertiliser(itemstack); } @Override - public Collection collect(World world, IFarmHousing farmHousing) { - final Collection products = this.produce; - this.produce = new ArrayList<>(); + public NonNullList collect(World world, IFarmHousing farmHousing) { + final NonNullList products = this.produce; + this.produce = NonNullList.create(); return products; } @Override public boolean cultivate(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) { - return this.maintainSoil(world, pos, direction, extent, farmHousing) || (!this.isManual && this.maintainWater(world, pos, direction, extent, farmHousing)) || this.maintainCrops(world, pos.up(), direction, extent, farmHousing); + return this.maintainSoil(world, pos, direction, extent, farmHousing) || + (!this.isManual && this.maintainWater(world, pos, direction, extent, farmHousing)) || + this.maintainCrops(world, pos.up(), direction, extent, farmHousing); } private boolean isWaste(final ItemStack stack) { @@ -102,14 +110,18 @@ public class GardenLogic extends FarmLogic { if (pH.ordinal() < this.acidity.ordinal()) { ItemStack stack = this.getAvailableAlkaline(housing); if (stack != null && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() + 1])) { - housing.getFarmInventory().removeResources(new ItemStack[]{stack}); + NonNullList resources = NonNullList.create(); + resources.add(stack); + housing.getFarmInventory().removeResources(resources); continue; } } if (pH.ordinal() > this.acidity.ordinal()) { final ItemStack stack = this.getAvailableAcid(housing); if (stack != null && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() - 1])) { - housing.getFarmInventory().removeResources(new ItemStack[]{stack}); + NonNullList resources = NonNullList.create(); + resources.add(stack); + housing.getFarmInventory().removeResources(resources); continue; } } @@ -187,14 +199,19 @@ public class GardenLogic extends FarmLogic { for (final EnumAcidity acid : acidities) { for (final Block type : new Block[]{Botany.flowerbed, Botany.loam, Botany.soil}) { final int meta = acid.ordinal() * 3 + moist.ordinal(); - final ItemStack[] resource = {new ItemStack(type, 1, meta)}; - if (housing.getFarmInventory().hasResources(resource)) { - return resource[0]; + final NonNullList resources = NonNullList.create(); + ItemStack resourceStack = new ItemStack(type, 1, meta); + resources.add(resourceStack); + if (housing.getFarmInventory().hasResources(resources)) { + return resourceStack; } } } } - if (housing.getFarmInventory().hasResources(new ItemStack[]{new ItemStack(Blocks.DIRT)})) { + final NonNullList resources = NonNullList.create(); + ItemStack resourceStack = new ItemStack(Blocks.DIRT); + resources.add(resourceStack); + if (housing.getFarmInventory().hasResources(resources)) { return new ItemStack(Blocks.DIRT); } return null; @@ -211,7 +228,9 @@ public class GardenLogic extends FarmLogic { loam = new ItemStack(Botany.soil, 0, 4); } setBlock(world, position, ((ItemBlock) loam.getItem()).getBlock(), loam.getItemDamage()); - housing.getFarmInventory().removeResources(new ItemStack[]{copy}); + final NonNullList resources = NonNullList.create(); + resources.add(copy); + housing.getFarmInventory().removeResources(resources); return true; } return false; @@ -220,7 +239,7 @@ public class GardenLogic extends FarmLogic { private boolean trySetWater(World world, BlockPos position, IFarmHousing housing) { final FluidStack water = Binnie.LIQUID.getFluidStack("water", 1000); if (this.moisture == EnumMoisture.Damp) { - if (!housing.hasLiquid(water)) { + if (water == null || !housing.hasLiquid(water)) { return false; } this.setBlock(world, position, Blocks.WATER, 0); @@ -230,12 +249,14 @@ public class GardenLogic extends FarmLogic { if (this.moisture != EnumMoisture.Dry) { return trySetSoil(world, position, housing); } - final ItemStack[] sand = {new ItemStack(Blocks.SAND, 1)}; - if (!housing.getFarmInventory().hasResources(sand)) { + final ItemStack sand = new ItemStack(Blocks.SAND, 1); + final NonNullList resources = NonNullList.create(); + resources.add(sand); + if (!housing.getFarmInventory().hasResources(resources)) { return false; } this.setBlock(world, position, Blocks.SAND, 0); - housing.getFarmInventory().removeResources(sand); + housing.getFarmInventory().removeResources(resources); return true; } } @@ -255,9 +276,8 @@ public class GardenLogic extends FarmLogic { } @Override - @Nullable public Collection harvest(World world, BlockPos pos, FarmDirection direction, int extent) { - return null; + return Collections.emptyList(); } @Override @@ -309,8 +329,12 @@ public class GardenLogic extends FarmLogic { @Nullable public ItemStack getAvailableAcid(IFarmHousing housing) { for (final ItemStack stack : Gardening.getAcidFertilisers()) { - if (stack != null && stack.getItem() != null && housing.getFarmInventory().hasResources(new ItemStack[]{stack})) { - return stack; + if (!stack.isEmpty()) { + final NonNullList resources = NonNullList.create(); + resources.add(stack); + if (housing.getFarmInventory().hasResources(resources)) { + return stack; + } } } return null; @@ -319,8 +343,12 @@ public class GardenLogic extends FarmLogic { @Nullable public ItemStack getAvailableAlkaline(IFarmHousing housing) { for (final ItemStack stack : Gardening.getAlkalineFertilisers()) { - if (stack != null && stack.getItem() != null && housing.getFarmInventory().hasResources(new ItemStack[]{stack})) { - return stack; + if (!stack.isEmpty()) { + final NonNullList resources = NonNullList.create(); + resources.add(stack); + if (housing.getFarmInventory().hasResources(resources)) { + return stack; + } } } return null; diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 894edca6..fdd64b7d 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -70,7 +70,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState @Override @Nullable - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { return null; } @@ -215,14 +215,14 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn) { - this.checkAndDropBlock(world, pos); - final TileEntity tile = world.getTileEntity(pos); + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { + this.checkAndDropBlock(worldIn, pos); + final TileEntity tile = worldIn.getTileEntity(pos); if (tile instanceof TileEntityFlower) { final TileEntityFlower flower = (TileEntityFlower) tile; - if (flower.getSection() == 0 && flower.getFlower() != null && flower.getFlower().getAge() > 0 && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1 && world.getBlockState(pos.up()).getBlock() != Botany.flower) { - this.dropBlockAsItem(world, pos, world.getBlockState(pos), 0); - world.setBlockToAir(pos); + if (flower.getSection() == 0 && flower.getFlower() != null && flower.getFlower().getAge() > 0 && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1 && worldIn.getBlockState(pos.up()).getBlock() != Botany.flower) { + this.dropBlockAsItem(worldIn, pos, worldIn.getBlockState(pos), 0); + worldIn.setBlockToAir(pos); } } } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 9234376c..13e1a013 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -35,6 +35,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; @@ -84,6 +85,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } @Override + @SideOnly(Side.CLIENT) public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List list, final boolean flag) { if (!itemStack.hasTagCompound()) { return; @@ -147,11 +149,11 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } @Override - public void getSubItems(final Item item, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubItems(final Item item, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { this.addCreativeItems(itemList, true); } - public void addCreativeItems(final List itemList, final boolean hideSecrets) { + public void addCreativeItems(final NonNullList itemList, final boolean hideSecrets) { for (final IIndividual individual : BotanyCore.getFlowerRoot().getIndividualTemplates()) { if (hideSecrets && individual.isSecret() && !Config.isDebug) { continue; @@ -192,7 +194,8 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + ItemStack stack = player.getHeldItem(hand); if (type == EnumFlowerStage.POLLEN) { final IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stack); final TileEntity target = world.getTileEntity(pos); @@ -205,7 +208,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } pollinatable.mateWith(flower); if (!player.capabilities.isCreativeMode) { - --stack.stackSize; + stack.shrink(1); } return EnumActionResult.SUCCESS; } else { @@ -216,14 +219,14 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister pos = pos.offset(facing); } - if (stack.stackSize != 0 && player.canPlayerEdit(pos, facing, stack) && world.canBlockBePlaced(Botany.flower, pos, false, facing, null, stack)) { + if (stack.getCount() != 0 && player.canPlayerEdit(pos, facing, stack) && world.mayPlace(Botany.flower, pos, false, facing, null)) { int i = this.getMetadata(stack.getMetadata()); - IBlockState iblockstate1 = Botany.flower.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, i, player, stack); + IBlockState iblockstate1 = Botany.flower.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, i, player, hand); if (placeBlockAt(stack, player, world, pos, facing, hitX, hitY, hitZ, iblockstate1)) { SoundType soundtype = world.getBlockState(pos).getBlock().getSoundType(world.getBlockState(pos), world, pos, player); world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); - --stack.stackSize; + stack.shrink(1); } return EnumActionResult.SUCCESS; diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index fecdb9ad..62ef043d 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,7 +36,7 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List subItems) { + public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { for (Material mat : Material.values()) { for (Insulate ins : Insulate.values()) { subItems.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); @@ -64,6 +65,7 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { } @Override + @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { super.addInformation(itemstack, player, list, flag); Multimap circuits = getCircuits(itemstack); diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index 2063e2a0..e129f496 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -148,9 +148,9 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } final IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) individual.getGenome().getPrimary(); final IAlleleFlowerSpecies primary2 = this.getFlower().getGenome().getPrimary(); - if (primary == primary2 || this.worldObj.rand.nextInt(4) == 0) { + if (primary == primary2 || this.world.rand.nextInt(4) == 0) { this.getFlower().mate((IFlower) individual); - worldObj.markBlockRangeForRenderUpdate(pos, pos); + world.markBlockRangeForRenderUpdate(pos, pos); } } @@ -159,7 +159,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt if (this.getSection() <= 0) { return this.flower; } - TileEntity tile = this.worldObj.getTileEntity(pos.down(getSection())); + TileEntity tile = this.world.getTileEntity(pos.down(getSection())); if (tile instanceof TileEntityFlower) { return ((TileEntityFlower) tile).getFlower(); } @@ -172,7 +172,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } public void randomUpdate(final Random rand) { - if (this.worldObj.getBlockState(pos).getBlock() != Botany.flower) { + if (this.world.getBlockState(pos).getBlock() != Botany.flower) { this.invalidate(); return; } @@ -189,16 +189,16 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt if (!this.isBreeding()) { return; } - float light = this.worldObj.getLight(pos); + float light = this.world.getLight(pos); if (light < 6.0f) { for (int dx = -2; dx <= 2; ++dx) { for (int dy = -2; dy <= 2; ++dy) { - light -= (this.worldObj.canBlockSeeSky(pos) ? 0.0f : 0.5f); + light -= (this.world.canBlockSeeSky(pos) ? 0.0f : 0.5f); } } } - final boolean canTolerate = Gardening.canTolerate(this.getFlower(), this.worldObj, pos); - final EnumSoilType soil = Gardening.getSoilType(this.worldObj, pos.down()); + final boolean canTolerate = Gardening.canTolerate(this.getFlower(), this.world, pos); + final EnumSoilType soil = Gardening.getSoilType(this.world, pos.down()); if (rand.nextFloat() < this.getFlower().getGenome().getAgeChance()) { if (this.flower.getAge() < 1) { if (canTolerate && light > 6.0f) { @@ -231,7 +231,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt CHANCE_POLLINATE += 0.25f * this.flower.getGenome().getFertility(); CHANCE_POLLINATE *= 1.0f + soil.ordinal() * 0.5f; final float CHANCE_SELFPOLLINATE = 0.2f * CHANCE_POLLINATE; - if (this.worldObj.rand.nextFloat() < CHANCE_DISPERSAL && this.flower.hasFlowered() && !this.flower.isWilted()) { + if (this.world.rand.nextFloat() < CHANCE_DISPERSAL && this.flower.hasFlowered() && !this.flower.isWilted()) { final IFlowerGenome mate = this.flower.getMate(); if (mate != null) { boolean dispersed = false; @@ -241,11 +241,11 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt for (dx2 = 0, dz = 0; dx2 == 0 && dz == 0; dx2 = rand.nextInt(3) - 1, dz = rand.nextInt(3) - 1) { } - final Block b2 = worldObj.getBlockState(pos.add(dx2, -1, dz)).getBlock(); - if (worldObj.isAirBlock(pos.add(dx2, 0, dz)) && Gardening.isSoil(b2)) { - final IFlower offspring = this.flower.getOffspring(worldObj, pos); + final Block b2 = world.getBlockState(pos.add(dx2, -1, dz)).getBlock(); + if (world.isAirBlock(pos.add(dx2, 0, dz)) && Gardening.isSoil(b2)) { + final IFlower offspring = this.flower.getOffspring(world, pos); if (offspring != null) { - Gardening.plant(worldObj, pos.add(dx2, 0, dz), offspring, this.getOwner()); + Gardening.plant(world, pos.add(dx2, 0, dz), offspring, this.getOwner()); this.flower.removeMate(); dispersed = true; } @@ -253,19 +253,19 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } } } - if (this.worldObj.rand.nextFloat() < CHANCE_POLLINATE && this.flower.hasFlowered() && !this.flower.isWilted()) { + if (this.world.rand.nextFloat() < CHANCE_POLLINATE && this.flower.hasFlowered() && !this.flower.isWilted()) { for (int a2 = 0; a2 < 4; ++a2) { int dx3; int dz2; for (dx3 = 0, dz2 = 0; dx3 == 0 && dz2 == 0; dx3 = rand.nextInt(5) - 2, dz2 = rand.nextInt(5) - 2) { } - final TileEntity tile = worldObj.getTileEntity(pos.add(dx3, 0, dz2)); + final TileEntity tile = world.getTileEntity(pos.add(dx3, 0, dz2)); if (tile instanceof IPollinatable && ((IPollinatable) tile).canMateWith(this.getFlower())) { ((IPollinatable) tile).mateWith(this.getFlower()); } } } - if (this.worldObj.rand.nextFloat() < CHANCE_SELFPOLLINATE && this.flower.hasFlowered() && this.flower.getMate() == null) { + if (this.world.rand.nextFloat() < CHANCE_SELFPOLLINATE && this.flower.hasFlowered() && this.flower.getMate() == null) { this.mateWith(this.getFlower()); } this.spawnButterflies(); @@ -277,9 +277,9 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt private void doFlowerAge() { this.getFlower().age(); if (this.getFlower().getAge() == 1) { - Gardening.onGrowFromSeed(this.worldObj, pos); + Gardening.onGrowFromSeed(this.world, pos); if (this.getOwner() != null && this.getFlower() != null) { - BotanyCore.getFlowerRoot().getBreedingTracker(worldObj, this.getOwner()).registerBirth(this.getFlower()); + BotanyCore.getFlowerRoot().getBreedingTracker(world, this.getOwner()).registerBirth(this.getFlower()); } } } @@ -308,7 +308,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt this.setRender(newInfo); } } - final TileEntity above = this.worldObj.getTileEntity(pos.up()); + final TileEntity above = this.world.getTileEntity(pos.up()); if (above instanceof TileEntityFlower) { ((TileEntityFlower) above).updateRender(true); } @@ -320,7 +320,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public void setSection(final int i) { this.section = i; - if (BinnieCore.getBinnieProxy().isSimulating(this.worldObj)) { + if (BinnieCore.getBinnieProxy().isSimulating(this.world)) { this.updateRender(true); } } @@ -338,7 +338,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt if (this.getSection() == 0) { return null; } - final TileEntity tile = this.worldObj.getTileEntity(pos.down(getSection())); + final TileEntity tile = this.world.getTileEntity(pos.down(getSection())); return (tile instanceof TileEntityFlower) ? ((TileEntityFlower) tile) : null; } @@ -355,9 +355,9 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt final double d = rand.nextFloat() * f + (1.0f - f) * 0.5; final double d2 = rand.nextFloat() * f + (1.0f - f) * 0.5; final double d3 = rand.nextFloat() * f + (1.0f - f) * 0.5; - final EntityItem entityitem = new EntityItem(this.worldObj, pos.getX() + d, pos.getY() + d2, pos.getZ() + d3, cuttingStack); + final EntityItem entityitem = new EntityItem(this.world, pos.getX() + d, pos.getY() + d2, pos.getZ() + d3, cuttingStack); entityitem.setPickupDelay(10); - this.worldObj.spawnEntityInWorld(entityitem); + this.world.spawnEntity(entityitem); for (int maxAge = this.getFlower().getMaxAge(), i = 0; i < maxAge; ++i) { if (rand.nextBoolean()) { this.getFlower().age(); @@ -373,17 +373,17 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt if (this.getSection() != 0) { return this.getRoot().checkIfDead(wasCut); } - final EnumSoilType soil = Gardening.getSoilType(this.worldObj, pos); + final EnumSoilType soil = Gardening.getSoilType(this.world, pos); final int maxAge = (int) (this.flower.getMaxAge() * (1.0f + soil.ordinal() * 0.25f)); if (this.flower.getAge() > maxAge) { if (!wasCut && this.flower.getMate() != null) { - this.worldObj.setBlockToAir(pos); - final IFlower offspring = this.flower.getOffspring(worldObj, pos.down()); - final TileEntity above = this.worldObj.getTileEntity(pos.up()); + this.world.setBlockToAir(pos); + final IFlower offspring = this.flower.getOffspring(this.world, pos.down()); + final TileEntity above = this.world.getTileEntity(pos.up()); if (above instanceof TileEntityFlower) { - this.worldObj.setBlockToAir(pos.up()); + this.world.setBlockToAir(pos.up()); } - Gardening.plant(this.worldObj, pos, offspring, this.getOwner()); + Gardening.plant(this.world, pos, offspring, this.getOwner()); } else { this.kill(); } @@ -394,12 +394,12 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public void kill() { if (this.flower.getAge() > 0) { - this.worldObj.setBlockState(pos, Botany.plant.getStateFromMeta(BlockPlant.Type.DeadFlower.ordinal()), 2); + this.world.setBlockState(pos, Botany.plant.getStateFromMeta(BlockPlant.Type.DeadFlower.ordinal()), 2); } else { - this.worldObj.setBlockToAir(pos); + this.world.setBlockToAir(pos); } - for (int i = 1; this.worldObj.getTileEntity(pos.up(i)) instanceof TileEntityFlower; ++i) { - this.worldObj.setBlockToAir(pos.up(i)); + for (int i = 1; this.world.getTileEntity(pos.up(i)) instanceof TileEntityFlower; ++i) { + this.world.setBlockToAir(pos.up(i)); } } @@ -487,12 +487,12 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt @Override public EnumTemperature getTemperature() { - return EnumTemperature.getFromValue(this.worldObj.getBiome(getPos()).getTemperature()); + return EnumTemperature.getFromValue(this.world.getBiome(getPos()).getTemperature()); } @Override public EnumHumidity getHumidity() { - return EnumHumidity.getFromValue(this.worldObj.getBiome(getPos()).getRainfall()); + return EnumHumidity.getFromValue(this.world.getBiome(getPos()).getRainfall()); } public void setErrorState(final int state) { @@ -556,11 +556,11 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public void setRender(final RenderInfo render) { this.renderInfo = render; this.section = this.renderInfo.section; - if (!worldObj.isRemote) { - IBlockState blockState = worldObj.getBlockState(pos); - worldObj.notifyBlockUpdate(pos, blockState, blockState, 0); + if (!world.isRemote) { + IBlockState blockState = world.getBlockState(pos); + world.notifyBlockUpdate(pos, blockState, blockState, 0); } else { - worldObj.markBlockRangeForRenderUpdate(pos, pos); + world.markBlockRangeForRenderUpdate(pos, pos); } } diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index e97dbd81..93710939 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -16,6 +16,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -77,7 +78,7 @@ public class BlockPlant extends BlockBush implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(final Item p_149666_1_, final CreativeTabs p_149666_2_, final List subBlocks) { + public void getSubBlocks(final Item p_149666_1_, final CreativeTabs p_149666_2_, final NonNullList subBlocks) { for (final Type type : Type.values()) { subBlocks.add(type.get()); } diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index 10958238..a323f184 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -20,6 +20,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; @@ -29,6 +30,7 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; import java.util.Random; @@ -95,8 +97,9 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { return SOIL_BLOCK_AABB; } + @Nullable @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { return SOIL_BLOCK_AABB; } @@ -107,7 +110,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { + public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { for (int i = 0; i < 9; ++i) { par3List.add(new ItemStack(this, 1, i)); } @@ -185,8 +188,8 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { } @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { - super.neighborChanged(state, worldIn, pos, blockIn); + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { + super.neighborChanged(state, worldIn, pos, blockIn, fromPos); if (worldIn.getBlockState(pos.up()).getMaterial().isSolid()) { worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState()); diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 0df647b6..135c551a 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -10,6 +10,7 @@ import binnie.botany.flower.TileEntityFlower; import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import com.mojang.authlib.GameProfile; +import forestry.api.climate.IClimateInfo; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; import net.minecraft.block.Block; @@ -79,15 +80,17 @@ public class Gardening { } public static float getBiomeMoisture(World world, BlockPos pos) { - double humidity = ForestryAPI.climateManager.getHumidity(world, pos); - double temperature = ForestryAPI.climateManager.getTemperature(world, pos); + IClimateInfo info = ForestryAPI.climateManager.getInfo(world, pos); + double humidity = info.getHumidity(); + double temperature = info.getTemperature(); double m = 3.2 * (humidity - 0.5) - 0.4 * (1.0 + temperature + 0.5 * temperature * temperature) + 1.1 - 1.6 * (temperature - 0.9) * (temperature - 0.9) - 0.002 * (pos.getY() - 64); return (float) ((m == 0.0) ? m : ((m < 0.0) ? (-Math.sqrt(m * m)) : Math.sqrt(m * m))); } public static float getBiomePH(World world, BlockPos pos) { - double humidity = ForestryAPI.climateManager.getHumidity(world, pos); - double temperature = ForestryAPI.climateManager.getTemperature(world, pos); + IClimateInfo info = ForestryAPI.climateManager.getInfo(world, pos); + double humidity = info.getHumidity(); + double temperature = info.getTemperature(); return (float) (-3.0 * (humidity - 0.5) + 0.5 * (temperature - 0.699999988079071) * (temperature - 0.699999988079071) + 0.02f * (pos.getY() - 64) - 0.15000000596046448); } diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 994485e0..8e817cf5 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -39,26 +39,26 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - Block block = world.getBlockState(pos).getBlock(); + public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + Block block = worldIn.getBlockState(pos).getBlock(); if (!Gardening.isSoil(block)) { pos = pos.down(); - block = world.getBlockState(pos).getBlock(); + block = worldIn.getBlockState(pos).getBlock(); } if (!Gardening.isSoil(block)) { pos = pos.down(); - block = world.getBlockState(pos).getBlock(); + block = worldIn.getBlockState(pos).getBlock(); } - if (Gardening.isSoil(block) && !BinnieCore.getBinnieProxy().isSimulating(world)) { + if (Gardening.isSoil(block) && !BinnieCore.getBinnieProxy().isSimulating(worldIn)) { IBlockSoil soil = (IBlockSoil) block; String info = Binnie.LANGUAGE.localise("botany.soil.type") + ": "; - info = info + soil.getType(world, pos).getTranslated(true); + info = info + soil.getType(worldIn, pos).getTranslated(true); info += ", " + TextFormatting.WHITE + Binnie.LANGUAGE.localise("botany.moisture") + ": "; - info = info + soil.getMoisture(world, pos).getTranslated(true); + info = info + soil.getMoisture(worldIn, pos).getTranslated(true); info += ", " + TextFormatting.WHITE + Binnie.LANGUAGE.localise("botany.ph") + ": "; - info = info + soil.getPH(world, pos).getTranslated(true); + info = info + soil.getPH(worldIn, pos).getTranslated(true); ITextComponent chat = new TextComponentString(info); - player.addChatMessage(chat); + player.sendStatusMessage(chat, false); } return EnumActionResult.SUCCESS; } diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index 70ab8471..643bc3f6 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -53,21 +53,22 @@ public class ItemTrowel extends Item implements IItemModelRegister { } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + ItemStack stack = player.getHeldItem(hand); if (!player.canPlayerEdit(pos, facing, stack)) { return EnumActionResult.FAIL; } - Block block = world.getBlockState(pos).getBlock(); - if (facing == EnumFacing.DOWN || (!world.isAirBlock(pos.up()) && world.getBlockState(pos.up()).getBlock() != Botany.flower) || (block != Blocks.GRASS && block != Blocks.DIRT && block != Blocks.GRASS_PATH)) { + Block block = worldIn.getBlockState(pos).getBlock(); + if (facing == EnumFacing.DOWN || (!worldIn.isAirBlock(pos.up()) && worldIn.getBlockState(pos.up()).getBlock() != Botany.flower) || (block != Blocks.GRASS && block != Blocks.DIRT && block != Blocks.GRASS_PATH)) { return EnumActionResult.PASS; } - world.playSound(player, pos, SoundEvents.ITEM_SHOVEL_FLATTEN, SoundCategory.BLOCKS, 1.0F, 1.0F); - if (world.isRemote) { + worldIn.playSound(player, pos, SoundEvents.ITEM_SHOVEL_FLATTEN, SoundCategory.BLOCKS, 1.0F, 1.0F); + if (worldIn.isRemote) { return EnumActionResult.SUCCESS; } - EnumMoisture moisture = Gardening.getNaturalMoisture(world, pos); - EnumAcidity acidity = Gardening.getNaturalPH(world, pos); - Gardening.plantSoil(world, pos, EnumSoilType.SOIL, moisture, acidity); + EnumMoisture moisture = Gardening.getNaturalMoisture(worldIn, pos); + EnumAcidity acidity = Gardening.getNaturalPH(worldIn, pos); + Gardening.plantSoil(worldIn, pos, EnumSoilType.SOIL, moisture, acidity); stack.damageItem(1, player); return EnumActionResult.SUCCESS; } @@ -77,8 +78,8 @@ public class ItemTrowel extends Item implements IItemModelRegister { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Tool modifier", theToolMaterial.getDamageVsEntity() + 0.5, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -1.5, 0)); + multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Tool modifier", theToolMaterial.getDamageVsEntity() + 0.5, 0)); + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -1.5, 0)); } return multimap; diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 3e84ca92..1de64123 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -94,7 +94,6 @@ public class ModuleGardening implements IInitializable { Botany.proxy.registerBlock(Botany.ceramicTile, new ItemDesign(Botany.ceramicTile)); Botany.ceramicBrick = new BlockCeramicBrick(); Botany.proxy.registerBlock(Botany.ceramicBrick, new ItemCeramicBrick(Botany.ceramicBrick)); - GameRegistry.registerTileEntity(TileCeramicBrick.class, ""); BinnieCore.getBinnieProxy().registerTileEntity(TileCeramicBrick.class, "botany.tile.ceramicBrick"); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer()); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer()); @@ -187,7 +186,7 @@ public class ModuleGardening implements IInitializable { GameRegistry.addShapelessRecipe(clay, Items.CLAY_BALL, Items.CLAY_BALL, Items.CLAY_BALL, pigment); GameRegistry.addSmelting(clay, TileEntityMetadata.getItemStack(Botany.ceramic, c.ordinal()), 0.0f); final ItemStack glass = TileEntityMetadata.getItemStack(Botany.stained, c.ordinal()); - glass.stackSize = 4; + glass.setCount(4); GameRegistry.addShapedRecipe(glass, " g ", "gpg", " g ", 'g', Blocks.GLASS, 'p', pigment); } GameRegistry.addRecipe(new PigmentRecipe()); @@ -211,7 +210,7 @@ public class ModuleGardening implements IInitializable { final ItemStack start = this.getStack(type, pH, moisture); final ItemStack end = this.getStack(type, pH - strength, moisture); if (start != null && end != null) { - end.stackSize = numOfBlocks; + end.setCount(numOfBlocks); final Object[] stacks = new Object[numOfBlocks + 1]; for (int i = 0; i < numOfBlocks; ++i) { stacks[i] = start; @@ -236,7 +235,7 @@ public class ModuleGardening implements IInitializable { final ItemStack start = this.getStack(type, pH, moisture); final ItemStack end = this.getStack(type, pH + strength, moisture); if (end != null) { - end.stackSize = numOfBlocks; + end.setCount(numOfBlocks); final Object[] stacks = new Object[numOfBlocks + 1]; for (int i = 0; i < numOfBlocks; ++i) { stacks[i] = start; @@ -261,7 +260,7 @@ public class ModuleGardening implements IInitializable { final ItemStack start = this.getStack(type, pH, moisture); final ItemStack end = this.getStack(type + strength, pH, moisture); if (end != null) { - end.stackSize = numOfBlocks; + end.setCount(numOfBlocks); final Object[] stacks = new Object[numOfBlocks + 1]; for (int i = 0; i < numOfBlocks; ++i) { stacks[i] = start; diff --git a/src/main/java/binnie/botany/genetics/BotanistTracker.java b/src/main/java/binnie/botany/genetics/BotanistTracker.java index 60190d31..91624e91 100644 --- a/src/main/java/binnie/botany/genetics/BotanistTracker.java +++ b/src/main/java/binnie/botany/genetics/BotanistTracker.java @@ -1,7 +1,9 @@ package binnie.botany.genetics; import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.api.IBotanistTracker; +import binnie.botany.core.BotanyCore; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.core.genetics.BreedingTracker; @@ -9,7 +11,7 @@ import net.minecraft.entity.player.EntityPlayer; public class BotanistTracker extends BreedingTracker implements IBotanistTracker { public BotanistTracker(final String s) { - super(s); + super(s, "NORMAL"); } @Override @@ -18,7 +20,7 @@ public class BotanistTracker extends BreedingTracker implements IBotanistTracker @Override protected IBreedingTracker getBreedingTracker(final EntityPlayer player) { - return Binnie.GENETICS.getFlowerRoot().getBreedingTracker(player.worldObj, player.getGameProfile()); + return Binnie.GENETICS.getFlowerRoot().getBreedingTracker(player.world, player.getGameProfile()); } @Override diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index c59db58a..6173533e 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -39,11 +39,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); } @Override @@ -59,11 +59,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); } @Override @@ -79,9 +79,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); } @Override @@ -97,9 +97,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } @Override @@ -115,10 +115,10 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -133,10 +133,10 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @@ -153,11 +153,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -172,11 +172,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -193,9 +193,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.SeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.SeaGreen); } @Override @@ -212,9 +212,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.SeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.SeaGreen); } @Override @@ -230,11 +230,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); } @Override @@ -251,9 +251,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -269,9 +269,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } @Override @@ -286,10 +286,10 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -305,11 +305,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkGreen); } @Override @@ -325,10 +325,10 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); } @Override @@ -344,10 +344,10 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -362,11 +362,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkGreen); } @Override @@ -381,12 +381,12 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkGreen); } @Override @@ -402,11 +402,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); } @Override @@ -421,12 +421,12 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); } @Override @@ -442,11 +442,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } @Override @@ -462,12 +462,12 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); } @Override @@ -498,9 +498,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); } @Override @@ -515,8 +515,8 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGHER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGHER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); } @Override @@ -533,9 +533,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.SeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.SeaGreen); } @Override @@ -551,11 +551,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); } @Override @@ -571,11 +571,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); } @Override @@ -591,10 +591,10 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); } @Override @@ -610,11 +610,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); } @Override @@ -630,11 +630,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.SeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.SeaGreen); } @Override @@ -650,12 +650,12 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -671,10 +671,10 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); } @Override @@ -689,11 +689,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); } @Override @@ -708,8 +708,8 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); } @Override @@ -725,12 +725,12 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOWEST); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOWEST); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); } @Override @@ -745,11 +745,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -764,9 +764,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGHER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGHER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); } @Override @@ -782,13 +782,13 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGHER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGHER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -804,11 +804,11 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); } @Override @@ -826,9 +826,9 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkOliveGreen); } @Override @@ -843,10 +843,10 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGHER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGHER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.MediumSeaGreen); } @Override @@ -862,12 +862,12 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkGreen); } @Override @@ -884,12 +884,12 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.OliveDrab); } @Override @@ -905,12 +905,12 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkSeaGreen); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.DarkSeaGreen); } @Override @@ -925,10 +925,10 @@ public enum FlowerDefinition implements IFlowerDefinition { @Override protected void setAlleles(IAllele[] alleles) { - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.UP_1); } @Override @@ -1090,10 +1090,10 @@ public enum FlowerDefinition implements IFlowerDefinition { private void init() { template = Arrays.copyOf(FlowerTemplates.getDefaultTemplate(), EnumFlowerChromosome.values().length); - AlleleHelper.instance.set(template, EnumFlowerChromosome.SPECIES, species); - AlleleHelper.instance.set(template, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(template, EnumFlowerChromosome.PRIMARY, primaryColor); - AlleleHelper.instance.set(template, EnumFlowerChromosome.SECONDARY, secondaryColor); + AlleleHelper.getInstance().set(template, EnumFlowerChromosome.SPECIES, species); + AlleleHelper.getInstance().set(template, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.getInstance().set(template, EnumFlowerChromosome.PRIMARY, primaryColor); + AlleleHelper.getInstance().set(template, EnumFlowerChromosome.SECONDARY, secondaryColor); setAlleles(template); genome = BotanyCore.getFlowerRoot().templateAsGenome(template); diff --git a/src/main/java/binnie/botany/genetics/FlowerRoot.java b/src/main/java/binnie/botany/genetics/FlowerRoot.java index c237e4a9..2d22cb2c 100644 --- a/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -219,10 +219,10 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { @Override public IBotanistTracker getBreedingTracker(final World world, @Nullable final GameProfile player) { final String filename = "BotanistTracker." + ((player == null) ? "common" : player.getId()); - BotanistTracker tracker = (BotanistTracker) world.loadItemData(BotanistTracker.class, filename); + BotanistTracker tracker = (BotanistTracker) world.loadData(BotanistTracker.class, filename); if (tracker == null) { tracker = new BotanistTracker(filename); - world.setItemData(filename, tracker); + world.setData(filename, tracker); } return tracker; } diff --git a/src/main/java/binnie/botany/genetics/FlowerTemplates.java b/src/main/java/binnie/botany/genetics/FlowerTemplates.java index 5c1583a4..79167e0d 100644 --- a/src/main/java/binnie/botany/genetics/FlowerTemplates.java +++ b/src/main/java/binnie/botany/genetics/FlowerTemplates.java @@ -9,18 +9,18 @@ public class FlowerTemplates { public static IAllele[] getDefaultTemplate() { final IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length]; //TODO: Test flower reset - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SPECIES, FlowerDefinition.Poppy.getSpecies()); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PRIMARY, EnumFlowerColor.Red); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SECONDARY, EnumFlowerColor.Red); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.NORMAL); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TERRITORY, EnumAllele.Territory.AVERAGE); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.EFFECT, ModuleGenetics.alleleEffectNone); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.NONE); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.AVERAGE); - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.Green); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SPECIES, FlowerDefinition.Poppy.getSpecies()); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PRIMARY, EnumFlowerColor.Red); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SECONDARY, EnumFlowerColor.Red); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.NORMAL); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TERRITORY, EnumAllele.Territory.AVERAGE); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.EFFECT, ModuleGenetics.alleleEffectNone); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PH_TOLERANCE, EnumAllele.Tolerance.NONE); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SAPPINESS, EnumAllele.Sappiness.AVERAGE); + AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.STEM, EnumFlowerColor.Green); return alleles; } } diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index b50adced..ce0fd166 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -10,14 +10,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class ItemDictionary extends Item implements IItemModelRegister { public ItemDictionary() { @@ -29,7 +27,7 @@ public class ItemDictionary extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { super.getSubItems(par1, par2CreativeTabs, par3List); par3List.add(new ItemStack(par1, 1, 1)); } @@ -42,13 +40,14 @@ public class ItemDictionary extends Item implements IItemModelRegister { } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + ItemStack itemStack = playerIn.getHeldItem(handIn); if (itemStack.getMetadata() == 0) { - Botany.proxy.openGui(BotanyGUI.Database, player, player.getPosition()); + Botany.proxy.openGui(BotanyGUI.Database, playerIn, playerIn.getPosition()); } else { - Botany.proxy.openGui(BotanyGUI.DatabaseNEI, player, player.getPosition()); + Botany.proxy.openGui(BotanyGUI.DatabaseNEI, playerIn, playerIn.getPosition()); } - return ActionResult.newResult(EnumActionResult.SUCCESS, itemStack); + return super.onItemRightClick(worldIn, playerIn, handIn); } @Override diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index 069f3d2b..a48afd5a 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -8,6 +8,7 @@ import forestry.core.items.IColoredItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -42,7 +43,7 @@ public class ItemClay extends Item implements IColoredItem, IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item itemIn, final CreativeTabs tab, final List list) { + public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList list) { for (final EnumFlowerColor c : EnumFlowerColor.values()) { list.add(new ItemStack(this, 1, c.ordinal())); } diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index e05f7863..6492edd0 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -8,6 +8,7 @@ import forestry.core.items.IColoredItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -42,7 +43,7 @@ public class ItemPigment extends Item implements IItemModelRegister, IColoredIte @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item itemIn, final CreativeTabs tab, final List list) { + public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList list) { for (final EnumFlowerColor c : EnumFlowerColor.values()) { list.add(new ItemStack(this, 1, c.ordinal())); } diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index 2372b961..0be9b069 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -62,7 +62,7 @@ public enum PacketID implements IPacketID { info += ". " + Binnie.LANGUAGE.localise("botany.flowers.species.wilting"); } } - player.addChatMessage(new TextComponentString(info)); + player.sendStatusMessage(new TextComponentString(info), false); } } } diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index 3947c4ea..1f5cd577 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -58,8 +58,8 @@ public class TileEntityMetadata extends TileEntity { if (this.meta != meta) { this.meta = meta; if (notify) { - IBlockState state = worldObj.getBlockState(pos); - worldObj.notifyBlockUpdate(pos, state, state, 3); + IBlockState state = world.getBlockState(pos); + world.notifyBlockUpdate(pos, state, state, 3); } } } diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index e492ba96..8df130a8 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -17,7 +17,6 @@ import forestry.api.arboriculture.ITreeMutation; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAllelePlantType; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IChromosomeType; @@ -30,12 +29,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.common.EnumPlantType; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; -import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -62,7 +59,7 @@ public class TreeBreedingSystem extends BreedingSystem { public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) { final ITreeGenome genome0 = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species1.getUID())); final ITreeGenome genome2 = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2.getUID())); - return ((ITreeMutation) mutation).getChance(player.worldObj, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ), (IAlleleTreeSpecies) species1, (IAlleleTreeSpecies) species2, genome0, genome2); + return ((ITreeMutation) mutation).getChance(player.world, player.getPosition(), (IAlleleTreeSpecies) species1, (IAlleleTreeSpecies) species2, genome0, genome2); } @Override @@ -85,22 +82,10 @@ public class TreeBreedingSystem extends BreedingSystem { if (chromosome == EnumTreeChromosome.GIRTH) { return ((IAlleleInteger) allele).getValue() + "x" + ((IAlleleInteger) allele).getValue(); } - if (chromosome == EnumTreeChromosome.PLANT) { - final EnumSet types = ((IAllelePlantType) allele).getPlantTypes(); - return types.isEmpty() ? Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.none") : types.iterator().next().toString(); - } if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) { final IFruitProvider provider = ((IAlleleFruit) allele).getProvider(); return (provider.getProducts().size() == 0) ? Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.none") : provider.getProducts().keySet().iterator().next().getDisplayName(); } - if (chromosome == EnumTreeChromosome.GROWTH) { - if (allele.getUID().contains("Tropical")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.growth.tropical"); - } - if (allele.getUID().contains("Lightlevel")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.growth.lightlevel"); - } - } return super.getAlleleName(chromosome, allele); } @@ -289,12 +274,6 @@ public class TreeBreedingSystem extends BreedingSystem { } break; } - case TERRITORY: { - for (final ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) { - alleles.add(a6.getAllele()); - } - break; - } case YIELD: { for (final ForestryAllele.Yield a7 : ForestryAllele.Yield.values()) { alleles.add(a7.getAllele()); diff --git a/src/main/java/binnie/core/genetics/VirtualHousing.java b/src/main/java/binnie/core/genetics/VirtualHousing.java index 78d94205..d71abd91 100644 --- a/src/main/java/binnie/core/genetics/VirtualHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualHousing.java @@ -42,7 +42,7 @@ class VirtualHousing implements IHousing { } public World getWorld() { - return this.player.worldObj; + return this.player.world; } public void setErrorState(final int state) { @@ -61,7 +61,7 @@ class VirtualHousing implements IHousing { } public Biome getBiome() { - return this.player.worldObj.getBiome(getCoordinates()); + return this.player.world.getBiome(getCoordinates()); } // public EnumErrorCode getErrorState() { diff --git a/src/main/java/binnie/core/integration/jei/SimpleRecipeHandler.java b/src/main/java/binnie/core/integration/jei/SimpleRecipeHandler.java index 031a20d9..48d7792e 100644 --- a/src/main/java/binnie/core/integration/jei/SimpleRecipeHandler.java +++ b/src/main/java/binnie/core/integration/jei/SimpleRecipeHandler.java @@ -17,11 +17,6 @@ public class SimpleRecipeHandler implements IRecipeHan return recipeClass; } - @Override - public String getRecipeCategoryUid() { - return recipeCategoryUid; - } - @Override public String getRecipeCategoryUid(T recipe) { return recipeCategoryUid; diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index 79bae04c..ff107efb 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -64,11 +64,11 @@ public class ItemFieldKit extends ItemCore { } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { - if (!player.isSneaking() && hand == EnumHand.MAIN_HAND) { - BinnieCore.getBinnieProxy().openGui(BinnieCoreGUI.FieldKit, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + if (!playerIn.isSneaking() && handIn == EnumHand.MAIN_HAND) { + BinnieCore.getBinnieProxy().openGui(BinnieCoreGUI.FieldKit, playerIn, playerIn.getPosition()); } - return super.onItemRightClick(itemStack, world, player, hand); + return super.onItemRightClick(worldIn, playerIn, handIn); } @Override diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index 7ce98fe1..be421279 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -21,12 +21,12 @@ public class ItemGenesis extends ItemCore { } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { - BinnieCore.getBinnieProxy().openGui(BinnieCoreGUI.Genesis, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + ItemStack itemStack = playerIn.getHeldItem(handIn); + BinnieCore.getBinnieProxy().openGui(BinnieCoreGUI.Genesis, playerIn, playerIn.getPosition()); return new ActionResult<>(EnumActionResult.SUCCESS, itemStack); } - @Override public String getItemStackDisplayName(final ItemStack i) { return "Genesis"; diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 694d7e0f..00466054 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -5,6 +5,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -24,7 +25,7 @@ public class ItemMisc extends ItemCore { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item itemIn, final CreativeTabs creativeTabs, List subItems) { + public void getSubItems(final Item itemIn, final CreativeTabs creativeTabs, NonNullList subItems) { for (IItemMiscProvider item : this.items) { if (item.isActive()) { subItems.add(this.getStack(item, 1)); diff --git a/src/main/java/binnie/core/liquid/BinnieContainerPermission.java b/src/main/java/binnie/core/liquid/BinnieContainerPermission.java deleted file mode 100644 index f9f4230b..00000000 --- a/src/main/java/binnie/core/liquid/BinnieContainerPermission.java +++ /dev/null @@ -1,25 +0,0 @@ -package binnie.core.liquid; - -import forestry.api.core.IFluidContainerPermission; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -public class BinnieContainerPermission implements IFluidContainerPermission { - - private final FluidContainerType container; - - public BinnieContainerPermission(FluidContainerType container) { - this.container = container; - } - - @Override - public boolean contentsAllowed(FluidStack fluidStack) { - Fluid fluid = fluidStack.getFluid(); - if(fluid instanceof BinnieFluid){ - BinnieFluid binnie = (BinnieFluid) fluid; - return binnie.getType().canPlaceIn(container); - } - return true; - } - -} diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 6adf70f4..0659c0bd 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; @@ -59,7 +60,8 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { } @Override - public void getSubItems(final Item item, final CreativeTabs tab, final List subItems) { + @SideOnly(Side.CLIENT) + public void getSubItems(final Item item, final CreativeTabs tab, final NonNullList subItems) { super.getSubItems(item, tab, subItems); for (final IFluidType liquid : Binnie.LIQUID.fluids.values()) { if (!liquid.canPlaceIn(this.container)) { @@ -74,9 +76,9 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { @Nullable protected FluidStack getContained(ItemStack itemStack) { - if (itemStack.stackSize != 1) { + if (itemStack.getCount() != 1) { itemStack = itemStack.copy(); - itemStack.stackSize = 1; + itemStack.setCount(1); } IFluidHandler fluidHandler = new FluidHandlerItemBinnie(itemStack, container); return fluidHandler.drain(Integer.MAX_VALUE, false); @@ -121,14 +123,15 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { } return EnumAction.NONE; } - + @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - if (this.isDrinkable(stack) && player.canEat(false)) { - player.setActiveHand(hand); + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + ItemStack stack = playerIn.getHeldItem(handIn); + if (this.isDrinkable(stack) && playerIn.canEat(false)) { + playerIn.setActiveHand(handIn); return new ActionResult<>(EnumActionResult.SUCCESS, stack); }else{ - return super.onItemRightClick(stack, world, player, hand); + return super.onItemRightClick(worldIn, playerIn, handIn); } } diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 391821ec..d59a2657 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -1,7 +1,7 @@ package binnie.core.liquid; import binnie.core.ManagerBase; -import forestry.api.core.EnumContainerType; +import forestry.core.items.EnumContainerType; import forestry.core.render.TextureManager; import forestry.core.utils.OreDictUtil; import net.minecraft.init.Items; @@ -25,10 +25,6 @@ public class ManagerLiquid extends ManagerBase { public ManagerLiquid() { this.fluids = new LinkedHashMap<>(); - EnumContainerType.CAN.add(new BinnieContainerPermission(FluidContainerType.CAN)); - EnumContainerType.CAPSULE.add(new BinnieContainerPermission(FluidContainerType.CAPSULE)); - EnumContainerType.REFRACTORY.add(new BinnieContainerPermission(FluidContainerType.REFRACTORY)); - EnumContainerType.GLASS.add(new BinnieContainerPermission(FluidContainerType.GLASS)); } public Collection getFluidTypes() { diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 19ac449a..3ef2ad80 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -18,6 +18,7 @@ import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -44,7 +45,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList itemList) { for (final MachinePackage pack : this.group.getPackages()) { if (pack.isActive()) { itemList.add(new ItemStack(this, 1, pack.getMetadata())); @@ -66,9 +67,9 @@ class BlockMachine extends BlockContainer implements IBlockMachine { public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.MODEL; } - + @Override - public boolean canRenderInLayer(BlockRenderLayer layer) { + public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { return layer == BlockRenderLayer.CUTOUT; } @@ -114,23 +115,24 @@ class BlockMachine extends BlockContainer implements IBlockMachine { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, @Nullable ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { - if (!BinnieCore.getBinnieProxy().isSimulating(world)) { + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + if (!BinnieCore.getBinnieProxy().isSimulating(worldIn)) { return true; } - if (player.isSneaking()) { + if (playerIn.isSneaking()) { return true; } - TileEntity tileEntity = world.getTileEntity(pos); + TileEntity tileEntity = worldIn.getTileEntity(pos); if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { - IFluidHandler tileFluidHandler = tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - if (FluidUtil.interactWithFluidHandler(heldItem, tileFluidHandler, player)) { + if (tileEntity.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing)) { + IFluidHandler tileFluidHandler = tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing); + ItemStack heldItem = playerIn.getHeldItem(hand); + if (FluidUtil.interactWithFluidHandler(heldItem, tileFluidHandler, playerIn).isSuccess()) { return true; } } if (tileEntity instanceof TileEntityMachine) { - ((TileEntityMachine) tileEntity).getMachine().onRightClick(world, player, pos); + ((TileEntityMachine) tileEntity).getMachine().onRightClick(worldIn, playerIn, pos); } } return true; diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index 55bb27f0..89812b75 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -79,8 +79,8 @@ public class MachineUtil { if (merge == null) { this.setStack(slot, addition); } else { - if (merge.isItemEqual(addition) && merge.stackSize + addition.stackSize <= merge.getMaxStackSize()) { - merge.stackSize += addition.stackSize; + if (merge.isItemEqual(addition) && merge.getCount() + addition.getCount() <= merge.getMaxStackSize()) { + merge.grow(addition.getCount()); this.setStack(slot, merge); } } @@ -151,12 +151,12 @@ public class MachineUtil { for (int slot : inventorySlots) { ItemStack stackInSlot = this.getStack(slot); if (stackInSlot != null && ItemStack.areItemsEqual(requiredStack, stackInSlot) && ItemStack.areItemStackTagsEqual(requiredStack, stackInSlot)) { - if (requiredStack.stackSize >= stackInSlot.stackSize) { - requiredStack.stackSize -= stackInSlot.stackSize; + if (requiredStack.getCount() >= stackInSlot.getCount()) { + requiredStack.shrink(stackInSlot.getCount()); inventory.removeStackFromSlot(slot); } else { - stackInSlot.stackSize -= requiredStack.stackSize; - requiredStack.stackSize = 0; + stackInSlot.shrink(requiredStack.getCount()); + requiredStack.setCount(0); break; } } diff --git a/src/main/java/binnie/core/machines/base/DefaultInventory.java b/src/main/java/binnie/core/machines/base/DefaultInventory.java index 024331fa..e50afe43 100644 --- a/src/main/java/binnie/core/machines/base/DefaultInventory.java +++ b/src/main/java/binnie/core/machines/base/DefaultInventory.java @@ -1,36 +1,37 @@ package binnie.core.machines.base; -import binnie.core.machines.inventory.IInventoryMachine; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import javax.annotation.Nullable; -class DefaultInventory implements IInventoryMachine { +class DefaultInventory implements IInventory { @Override public int getSizeInventory() { return 0; } @Override - @Nullable + public boolean isEmpty() { + return true; + } + + @Override public ItemStack getStackInSlot(final int i) { - return null; + return ItemStack.EMPTY; } @Override - @Nullable public ItemStack decrStackSize(final int i, final int j) { - return null; + return ItemStack.EMPTY; } @Override - @Nullable public ItemStack removeStackFromSlot(int index) { - return null; + return ItemStack.EMPTY; } @Override @@ -43,7 +44,12 @@ class DefaultInventory implements IInventoryMachine { } @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { + public void markDirty() { + + } + + @Override + public boolean isUsableByPlayer(EntityPlayer player) { return false; } @@ -82,30 +88,6 @@ class DefaultInventory implements IInventoryMachine { } - @Override - public boolean isReadOnly(final int slot) { - return false; - } - - @Override - public void markDirty() { - } - - @Override - public int[] getSlotsForFace(EnumFacing side) { - return new int[0]; - } - - @Override - public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) { - return false; - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { - return false; - } - @Override public String getName() { return ""; diff --git a/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java b/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java new file mode 100644 index 00000000..a0614b8f --- /dev/null +++ b/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java @@ -0,0 +1,56 @@ +package binnie.core.machines.base; + +import binnie.core.machines.inventory.IInventoryMachine; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; + +class DefaultMachineInventory implements IInventoryMachine { + private final DefaultInventory inventory; + + public DefaultMachineInventory() { + this.inventory = new DefaultInventory(); + } + + @Override + public IInventory getInventory() { + return inventory; + } + + @Override + public boolean isUsableByPlayer(final EntityPlayer entityplayer) { + return false; + } + + @Override + public boolean isReadOnly(final int slot) { + return false; + } + + @Override + public void markDirty() { + } + + @Override + public int[] getSlotsForFace(EnumFacing side) { + return new int[0]; + } + + @Override + public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) { + return false; + } + + @Override + public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { + return false; + } + + @Override + public ITextComponent getDisplayName() { + return new TextComponentString(""); + } +} diff --git a/src/main/java/binnie/core/machines/base/DefaultTankContainer.java b/src/main/java/binnie/core/machines/base/DefaultTankContainer.java index b67c2adb..72682a5c 100644 --- a/src/main/java/binnie/core/machines/base/DefaultTankContainer.java +++ b/src/main/java/binnie/core/machines/base/DefaultTankContainer.java @@ -8,6 +8,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.IFluidHandler; +import javax.annotation.Nullable; + class DefaultTankContainer implements ITankMachine { @Override public TankInfo[] getTankInfos() { @@ -40,7 +42,8 @@ class DefaultTankContainer implements ITankMachine { } @Override - public IFluidHandler getHandler(EnumFacing from) { + @Nullable + public IFluidHandler getHandler(@Nullable EnumFacing from) { 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 8037a862..721727e1 100644 --- a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java +++ b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java @@ -28,7 +28,7 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi public IInventoryMachine getInventory() { final IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this); - return (inv == null || inv == this) ? new DefaultInventory() : inv; + return (inv == null || inv == this) ? new DefaultMachineInventory() : inv; } public ITankMachine getTankContainer() { @@ -41,65 +41,17 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi return (inv == null || inv == this) ? DefaultPower.INSTANCE : inv; } - @Override - public int getSizeInventory() { - return this.getInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(final int index) { - return this.getInventory().getStackInSlot(index); - } - - @Override - public ItemStack decrStackSize(final int index, final int amount) { - return this.getInventory().decrStackSize(index, amount); - } - - @Nullable - @Override - public ItemStack removeStackFromSlot(int index) { - return null; - } - // @Override // public ItemStack getStackInSlotOnClosing(final int var1) { // return this.getInventory().getStackInSlotOnClosing(var1); // } @Override - public void setInventorySlotContents(final int index, @Nullable final ItemStack itemStack) { - this.getInventory().setInventorySlotContents(index, itemStack); - } - - @Override - public String getName() { - return this.getInventory().getName(); - } - - @Override - public int getInventoryStackLimit() { - return this.getInventory().getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return !this.isInvalid() && this.getWorld().getTileEntity(getPos()) == this && entityplayer.getDistanceSq(getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5) <= 64.0 && this.getInventory().isUseableByPlayer(entityplayer); - } - - @Override - public void openInventory(EntityPlayer player) { - this.getInventory().openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) { - this.getInventory().closeInventory(player); - } - - @Override - public boolean hasCustomName() { - return this.getInventory().hasCustomName(); + public boolean isUsableByPlayer(final EntityPlayer entityplayer) { + return !this.isInvalid() && + this.getWorld().getTileEntity(getPos()) == this && + entityplayer.getDistanceSqToCenter(getPos()) <= 64.0 && + this.getInventory().isUsableByPlayer(entityplayer); } @Override @@ -108,31 +60,6 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi this.getInventory().markDirty(); } - @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemStack) { - return this.getInventory().isItemValidForSlot(slot, itemStack); - } - - @Override - public int getField(int id) { - return this.getInventory().getField(id); - } - - @Override - public void setField(int id, int value) { - this.getInventory().setField(id, value); - } - - @Override - public int getFieldCount() { - return this.getInventory().getFieldCount(); - } - - @Override - public void clear() { - this.getInventory().clear(); - } - @Override public int[] getSlotsForFace(EnumFacing side) { return this.getInventory().getSlotsForFace(side); @@ -248,12 +175,13 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { + public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { return (capability == CapabilityEnergy.ENERGY && (canExtract() || canReceive())) || capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, EnumFacing facing) { + @Nullable + public T getCapability(Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityEnergy.ENERGY) { return CapabilityEnergy.ENERGY.cast(this); } else if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { @@ -275,7 +203,8 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi } @Override - public IFluidHandler getHandler(EnumFacing from) { + @Nullable + public IFluidHandler getHandler(@Nullable EnumFacing from) { return getTankContainer().getHandler(from); } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index fb1dd1ab..6774ce83 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -119,7 +119,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - public boolean isUseableByPlayer(final EntityPlayer var1) { + public boolean isUsableByPlayer(final EntityPlayer var1) { return true; } @@ -231,15 +231,15 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve final float f = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; final float f2 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; final float f3 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; - if (stack.stackSize == 0) { - stack.stackSize = 1; + if (stack.getCount() == 0) { + stack.setCount(1); } final EntityItem entityitem = new EntityItem(this.getMachine().getWorld(), this.getMachine().getTileEntity().getPos().getX() + f, this.getMachine().getTileEntity().getPos().getY() + f2, this.getMachine().getTileEntity().getPos().getZ() + f3, stack.copy()); final float accel = 0.05f; entityitem.motionX = (float) this.getMachine().getWorld().rand.nextGaussian() * accel; entityitem.motionY = (float) this.getMachine().getWorld().rand.nextGaussian() * accel + 0.2f; entityitem.motionZ = (float) this.getMachine().getWorld().rand.nextGaussian() * accel; - this.getMachine().getWorld().spawnEntityInWorld(entityitem); + this.getMachine().getWorld().spawnEntity(entityitem); } } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 0380eeb1..4ad570ac 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -4,6 +4,7 @@ import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.TankInfo; +import com.google.common.collect.Iterables; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; @@ -12,6 +13,7 @@ import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.FluidTankProperties; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; +import net.minecraftforge.fluids.capability.templates.FluidHandlerConcatenate; import javax.annotation.Nullable; import java.util.ArrayList; @@ -158,7 +160,11 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac } @Override - public IFluidHandler getHandler(EnumFacing from) { + @Nullable + public IFluidHandler getHandler(@Nullable EnumFacing from) { + if (from == null) { + return new FluidHandlerConcatenate(handlers.values()); + } return handlers.get(from); } diff --git a/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java b/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java index 752a3115..073cbac9 100644 --- a/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java +++ b/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java @@ -1,7 +1,90 @@ package binnie.core.machines.inventory; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; public interface IInventoryMachine extends IInventory, ISidedInventory, IValidatedInventory { + IInventory getInventory(); + + @Override + default int getSizeInventory() { + return this.getInventory().getSizeInventory(); + } + + @Override + default ItemStack getStackInSlot(final int index) { + return this.getInventory().getStackInSlot(index); + } + + @Override + default ItemStack decrStackSize(final int index, final int amount) { + return this.getInventory().decrStackSize(index, amount); + } + + @Override + default ItemStack removeStackFromSlot(int index) { + return this.getInventory().removeStackFromSlot(index); + } + + @Override + default void setInventorySlotContents(final int index, final ItemStack itemStack) { + this.getInventory().setInventorySlotContents(index, itemStack); + } + + @Override + default boolean isEmpty() { + return this.getInventory().isEmpty(); + } + + @Override + default String getName() { + return this.getInventory().getName(); + } + + @Override + default int getInventoryStackLimit() { + return this.getInventory().getInventoryStackLimit(); + } + + @Override + default void openInventory(EntityPlayer player) { + this.getInventory().openInventory(player); + } + + @Override + default void closeInventory(EntityPlayer player) { + this.getInventory().closeInventory(player); + } + + @Override + default boolean hasCustomName() { + return this.getInventory().hasCustomName(); + } + + @Override + default boolean isItemValidForSlot(final int slot, final ItemStack itemStack) { + return this.getInventory().isItemValidForSlot(slot, itemStack); + } + + @Override + default int getField(int id) { + return this.getInventory().getField(id); + } + + @Override + default void setField(int id, int value) { + this.getInventory().setField(id, value); + } + + @Override + default int getFieldCount() { + return this.getInventory().getFieldCount(); + } + + @Override + default void clear() { + this.getInventory().clear(); + } } diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 4224d8cd..94a0a126 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -39,15 +39,15 @@ public class InventorySlot extends BaseSlot { if (this.itemStack == null) { return null; } - if (this.itemStack.stackSize <= amount) { + if (this.itemStack.getCount() <= amount) { final ItemStack returnStack = this.itemStack.copy(); this.itemStack = null; return returnStack; } final ItemStack returnStack = this.itemStack.copy(); final ItemStack itemStack = this.itemStack; - itemStack.stackSize -= amount; - returnStack.stackSize = amount; + itemStack.shrink(amount); + returnStack.setCount(amount); return returnStack; } @@ -55,7 +55,7 @@ public class InventorySlot extends BaseSlot { public void readFromNBT(final NBTTagCompound slotNBT) { if (slotNBT.hasKey("item")) { final NBTTagCompound itemNBT = slotNBT.getCompoundTag("item"); - this.itemStack = ItemStack.loadItemStackFromNBT(itemNBT); + this.itemStack = new ItemStack(itemNBT); } else { this.itemStack = null; } diff --git a/src/main/java/binnie/core/machines/power/ITankMachine.java b/src/main/java/binnie/core/machines/power/ITankMachine.java index b92bf2bd..172d2609 100644 --- a/src/main/java/binnie/core/machines/power/ITankMachine.java +++ b/src/main/java/binnie/core/machines/power/ITankMachine.java @@ -19,6 +19,7 @@ public interface ITankMachine extends IValidatedTankContainer { @Nullable TankSlot getTankSlot(final int index); - - IFluidHandler getHandler(EnumFacing from); + + @Nullable + IFluidHandler getHandler(@Nullable EnumFacing from); } diff --git a/src/main/java/binnie/core/machines/storage/CompartmentTab.java b/src/main/java/binnie/core/machines/storage/CompartmentTab.java index 354468c5..595a8e37 100644 --- a/src/main/java/binnie/core/machines/storage/CompartmentTab.java +++ b/src/main/java/binnie/core/machines/storage/CompartmentTab.java @@ -23,7 +23,7 @@ class CompartmentTab implements INbtWritable, INbtReadable { @Override public void readFromNBT(final NBTTagCompound nbt) { this.name = nbt.getString("name"); - this.icon = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("icon")); + this.icon = new ItemStack(nbt.getCompoundTag("icon")); this.color = EnumColor.values()[nbt.getByte("color")]; this.id = nbt.getByte("id"); } diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 1fe31d58..e5d688a4 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -245,7 +245,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } final CompartmentTab tab = WindowCompartment.this.getCurrentTab(); final ItemStack stack = WindowCompartment.this.getHeldItemStack().copy(); - stack.stackSize = 1; + stack.setCount(1); tab.setIcon(stack); final NBTTagCompound nbt = new NBTTagCompound(); tab.writeToNBT(nbt); diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index d0b80abd..e0627f7c 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -10,7 +10,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.IFluidHandler; @@ -221,13 +220,13 @@ public class TransferRequest { public static ItemStack[] mergeStacks(ItemStack itemstack, final ItemStack merged) { if (areItemsEqual(itemstack, merged)) { - final int space = merged.getMaxStackSize() - merged.stackSize; + final int space = merged.getMaxStackSize() - merged.getCount(); if (space > 0) { - if (itemstack.stackSize > space) { - itemstack.stackSize -= space; - merged.stackSize += space; - } else if (itemstack.stackSize <= space) { - merged.stackSize += itemstack.stackSize; + if (itemstack.getCount() > space) { + itemstack.shrink(space); + merged.grow(space); + } else if (itemstack.getCount() <= space) { + merged.grow(itemstack.getCount()); itemstack = null; } } @@ -238,10 +237,10 @@ public class TransferRequest { @Nullable public static ItemStack transferToTank(final ItemStack itemStack, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { Preconditions.checkNotNull(itemStack); - Preconditions.checkArgument(itemStack.stackSize >= 1); + Preconditions.checkArgument(itemStack.getCount() >= 1); final ItemStack singleCopy = itemStack.copy(); - singleCopy.stackSize = 1; + singleCopy.setCount(1); // TODO 1.11: use IFluidHandlerItem final IFluidHandler fluidHandler = FluidUtil.getFluidHandler(singleCopy); @@ -259,19 +258,19 @@ public class TransferRequest { // TODO 1.11: use IFluidHandlerItem fluidHandler.drain(amountAdded, true); - if (singleCopy.stackSize == 0 || transferItemToInventory(singleCopy, origin, false) == null) { + if (singleCopy.getCount() == 0 || transferItemToInventory(singleCopy, origin, false) == null) { if (doAdd) { tank.fill(containerLiquid, true); - if (singleCopy.stackSize > 0) { + if (singleCopy.getCount() > 0) { transferItemToInventory(singleCopy, origin, true); } } - if (itemStack.stackSize == 1) { + if (itemStack.getCount() == 1) { return null; } else { final ItemStack leftover = itemStack.copy(); - leftover.stackSize--; + leftover.shrink(1); return leftover; } } @@ -284,13 +283,13 @@ public class TransferRequest { @Nullable private static ItemStack transferFromTank(ItemStack itemStack, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { Preconditions.checkNotNull(itemStack); - Preconditions.checkArgument(itemStack.stackSize >= 1); + Preconditions.checkArgument(itemStack.getCount() >= 1); final IFluidTank tank = destination.getTanks()[tankID]; final FluidStack fluid = tank.getFluid(); if (fluid != null) { final ItemStack singleCopy = itemStack.copy(); - singleCopy.stackSize = 1; + singleCopy.setCount(1); // TODO 1.11: use IFluidHandlerItem IFluidHandler fluidHandler = FluidUtil.getFluidHandler(singleCopy); if (fluidHandler != null) { @@ -300,19 +299,19 @@ public class TransferRequest { if (fillFluid != null) { // TODO 1.11: use IFluidHandlerItem fluidHandler.fill(fillFluid, true); - if (singleCopy.stackSize == 0 || transferItemToInventory(singleCopy, origin, false) == null) { + if (singleCopy.getCount() == 0 || transferItemToInventory(singleCopy, origin, false) == null) { if (doAdd) { tank.drain(fillFluid.amount, true); - if (singleCopy.stackSize > 0) { + if (singleCopy.getCount() > 0) { transferItemToInventory(singleCopy, origin, true); } } - if (itemStack.stackSize == 1) { + if (itemStack.getCount() == 1) { return null; } else { ItemStack leftover = itemStack.copy(); - leftover.stackSize--; + leftover.shrink(1); return leftover; } } diff --git a/src/main/java/binnie/core/models/ModelMutlipass.java b/src/main/java/binnie/core/models/ModelMutlipass.java index 2621de0d..4dc8d253 100644 --- a/src/main/java/binnie/core/models/ModelMutlipass.java +++ b/src/main/java/binnie/core/models/ModelMutlipass.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; import binnie.core.block.IMultipassBlock; import forestry.api.core.IModelBaker; -import forestry.core.blocks.propertys.UnlistedBlockAccess; -import forestry.core.blocks.propertys.UnlistedBlockPos; +import forestry.core.blocks.properties.UnlistedBlockAccess; +import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.ModelBlockCached; import forestry.core.models.baker.ModelBaker; import net.minecraft.block.Block; @@ -58,7 +58,7 @@ public class ModelMutlipass, K> extends Mod IExtendedBlockState stateExtended = (IExtendedBlockState) state; IBlockAccess world = stateExtended.getValue(UnlistedBlockAccess.BLOCKACCESS); BlockPos pos = stateExtended.getValue(UnlistedBlockPos.POS); - baker.setRenderBounds(state.getBoundingBox(world, pos)); +// baker.setRenderBounds(state.getBoundingBox(world, pos)); } bakeBlock(bBlock, key, baker, false); @@ -75,7 +75,7 @@ public class ModelMutlipass, K> extends Mod for(EnumFacing facing : EnumFacing.VALUES){ sprites[facing.ordinal()] = block.getSprite(key, facing, pass); } - baker.addBlockModel(block, null, null, sprites, pass); + baker.addBlockModel(null, sprites, pass); } // Set the particle sprite @@ -96,7 +96,7 @@ public class ModelMutlipass, K> extends Mod } B bBlock = blockClass.cast(block); - baker.setRenderBounds(bBlock.getItemBoundingBox()); +// baker.setRenderBounds(bBlock.getItemBoundingBox()); bakeBlock(bBlock, key, baker, true); return itemModel = baker.bakeModel(true); diff --git a/src/main/java/binnie/core/models/PanelModelBaker.java b/src/main/java/binnie/core/models/PanelModelBaker.java index 0598e3cd..67609488 100644 --- a/src/main/java/binnie/core/models/PanelModelBaker.java +++ b/src/main/java/binnie/core/models/PanelModelBaker.java @@ -1,18 +1,8 @@ package binnie.core.models; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.apache.commons.lang3.tuple.Pair; -import org.lwjgl.util.vector.Vector3f; - import forestry.api.core.IModelBaker; import forestry.api.core.IModelBakerModel; import forestry.core.models.ModelManager; -import forestry.core.models.baker.ModelBaker; import forestry.core.models.baker.ModelBakerFace; import forestry.core.models.baker.ModelBakerModel; import forestry.core.proxy.Proxies; @@ -30,7 +20,16 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.model.IModelState; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.util.vector.Vector3f; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +@SideOnly(Side.CLIENT) public class PanelModelBaker implements IModelBaker { private final float[] quadsUV; @@ -38,7 +37,7 @@ public class PanelModelBaker implements IModelBaker { private final List> bakedModels = new ArrayList<>(); protected AxisAlignedBB renderBounds = Block.FULL_BLOCK_AABB; - protected ModelBakerModel currentModel = new ModelBakerModel(ModelManager.getInstance().DEFAULT_BLOCK); + protected ModelBakerModel currentModel = new ModelBakerModel(ModelManager.getInstance().getDefaultBlockState()); protected final FaceBakery faceBakery = new FaceBakery(); @@ -48,20 +47,20 @@ public class PanelModelBaker implements IModelBaker { quadsUV = new float[]{0, 0, 1, 1, 0, 0, 1, 1}; defUVs = new float[] { 0, 0, 1, 1 }; } - - @Override - public void setRenderBounds(AxisAlignedBB renderBounds) { - if (renderBounds == null) { - return; - } - this.renderBounds = renderBounds; - } - - @Override - public void setRenderBounds(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { - renderBounds = new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ); - } +// @Override +// public void setRenderBounds(AxisAlignedBB renderBounds) { +// if (renderBounds == null) { +// return; +// } +// +// this.renderBounds = renderBounds; +// } +// +// @Override +// public void setRenderBounds(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { +// renderBounds = new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ); +// } protected int colorIndex = -1; @@ -69,47 +68,46 @@ public class PanelModelBaker implements IModelBaker { public void setColorIndex(int colorIndex) { this.colorIndex = colorIndex; } - + @Override - public void addModel(AxisAlignedBB renderBounds, TextureAtlasSprite[] textures, int colorIndex) { - + public void addModel(TextureAtlasSprite[] textures, int colorIndex) { setColorIndex(colorIndex); - + for (EnumFacing facing : EnumFacing.VALUES) { addFace(facing, textures[facing.ordinal()]); } } - + @Override - public void addModel(AxisAlignedBB renderBounds, TextureAtlasSprite texture, int colorIndex) { - addModel(renderBounds, new TextureAtlasSprite[]{ texture, texture, texture, texture, texture, texture }, colorIndex); + public void addModel(TextureAtlasSprite texture, int colorIndex) { + addModel(new TextureAtlasSprite[]{texture, texture, texture, texture, texture, texture}, colorIndex); } - + @Override - public void addBlockModel(Block block, AxisAlignedBB renderBounds, @Nullable BlockPos pos, TextureAtlasSprite[] textures, int colorIndex) { + public void addBlockModel(@Nullable BlockPos pos, TextureAtlasSprite[] sprites, int colorIndex) { setColorIndex(colorIndex); - + if(pos != null){ World world = Proxies.common.getRenderWorld(); IBlockState blockState = world.getBlockState(pos); for (EnumFacing facing : EnumFacing.VALUES) { - if (block.shouldSideBeRendered(blockState, world, pos, facing)) { - addFace(facing, textures[facing.ordinal()]); + if (blockState.shouldSideBeRendered(world, pos, facing)) { + addFace(facing, sprites[facing.ordinal()]); } } }else { for (EnumFacing facing : EnumFacing.VALUES) { - addFace(facing, textures[facing.ordinal()]); + addFace(facing, sprites[facing.ordinal()]); } } } @Override - public void addBlockModel(Block block, AxisAlignedBB renderBounds, @Nullable BlockPos pos, TextureAtlasSprite texture, int colorIndex) { - addBlockModel(block, renderBounds, pos, new TextureAtlasSprite[]{ texture, texture, texture, texture, texture, texture }, colorIndex); + public void addBlockModel(@Nullable BlockPos pos, TextureAtlasSprite sprite, int colorIndex) { + addBlockModel(pos, new TextureAtlasSprite[]{sprite, sprite, sprite, sprite, sprite, sprite}, colorIndex); } - + @Override public void addBakedModel(@Nullable IBlockState state, IBakedModel model) { if(model != null){ @@ -124,43 +122,43 @@ public class PanelModelBaker implements IModelBaker { float to_b = 0; switch (face) { - case UP: - from_a = from_16.x / 16.0f; - from_b = from_16.z / 16.0f; - to_a = to_16.x / 16.0f; - to_b = to_16.z / 16.0f; - break; - case DOWN: - from_a = from_16.x / 16.0f; - from_b = from_16.z / 16.0f; - to_a = to_16.x / 16.0f; - to_b = to_16.z / 16.0f; - break; - case SOUTH: - from_a = from_16.y / 16.0f; - from_b = from_16.x / 16.0f; - to_a = to_16.y / 16.0f; - to_b = to_16.x / 16.0f; - break; - case NORTH: - from_a = from_16.y / 16.0f; - from_b = from_16.x / 16.0f; - to_a = to_16.y / 16.0f; - to_b = to_16.x / 16.0f; - break; - case EAST: - from_a = from_16.y / 16.0f; - from_b = from_16.z / 16.0f; - to_a = to_16.y / 16.0f; - to_b = to_16.z / 16.0f; - break; - case WEST: - from_a = from_16.y / 16.0f; - from_b = from_16.z / 16.0f; - to_a = to_16.y / 16.0f; - to_b = to_16.z / 16.0f; - break; - default: + case UP: + from_a = from_16.x / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.z / 16.0f; + break; + case DOWN: + from_a = from_16.x / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.z / 16.0f; + break; + case SOUTH: + from_a = from_16.y / 16.0f; + from_b = from_16.x / 16.0f; + to_a = to_16.y / 16.0f; + to_b = to_16.x / 16.0f; + break; + case NORTH: + from_a = from_16.y / 16.0f; + from_b = from_16.x / 16.0f; + to_a = to_16.y / 16.0f; + to_b = to_16.x / 16.0f; + break; + case EAST: + from_a = from_16.y / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.y / 16.0f; + to_b = to_16.z / 16.0f; + break; + case WEST: + from_a = from_16.y / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.y / 16.0f; + to_b = to_16.z / 16.0f; + break; + default: } from_a = 1.0f - from_a; @@ -189,10 +187,10 @@ public class PanelModelBaker implements IModelBaker { return; } - Vector3f to = new Vector3f((float) renderBounds.minX * 16.0f, (float) renderBounds.minY * 16.0f, (float) renderBounds.minZ * 16.0f); - Vector3f from = new Vector3f((float) renderBounds.maxX * 16.0f, (float) renderBounds.maxY * 16.0f, (float) renderBounds.maxZ * 16.0f); +// Vector3f to = new Vector3f((float) renderBounds.minX * 16.0f, (float) renderBounds.minY * 16.0f, (float) renderBounds.minZ * 16.0f); +// Vector3f from = new Vector3f((float) renderBounds.maxX * 16.0f, (float) renderBounds.maxY * 16.0f, (float) renderBounds.maxZ * 16.0f); - faces.add(new ModelBakerFace(facing, colorIndex, to, from, defUVs, sprite)); + faces.add(new ModelBakerFace(facing, colorIndex, sprite)); } @Override @@ -202,27 +200,31 @@ public class PanelModelBaker implements IModelBaker { if (flip) { mr = ModelRotation.X0_Y180; } - + //Add baked models to the current model. for(Pair bakedModel : bakedModels){ currentModel.addModelQuads(bakedModel); } + Vector3f to = new Vector3f((float) renderBounds.minX * 16.0f, (float) renderBounds.minY * 16.0f, (float) renderBounds.minZ * 16.0f); + Vector3f from = new Vector3f((float) renderBounds.maxX * 16.0f, (float) renderBounds.maxY * 16.0f, (float) renderBounds.maxZ * 16.0f); + for (ModelBakerFace face : faces) { + final EnumFacing myFace = face.face; - final float[] uvs = getFaceUvs(myFace, face.from, face.to); + final float[] uvs = getFaceUvs(myFace, from, to); final BlockFaceUV uv = new BlockFaceUV(uvs, 0); final BlockPartFace bpf = new BlockPartFace(myFace, face.colorIndex, "", uv); - BakedQuad bf = faceBakery.makeBakedQuad(face.to, face.from, bpf, face.spite, myFace, mr, null, true, true); + BakedQuad bf = faceBakery.makeBakedQuad(to, from, bpf, face.spite, myFace, mr, null, true, true); currentModel.addQuad(myFace, bf); } - + return currentModel; } - + @Override public void setModelState(IModelState modelState){ currentModel.setModelState(modelState); @@ -232,5 +234,5 @@ public class PanelModelBaker implements IModelBaker { public void setParticleSprite(TextureAtlasSprite particleSprite) { currentModel.setParticleSprite(particleSprite); } - + } diff --git a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java b/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java index ea9d9f9d..ccd1d031 100644 --- a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java +++ b/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java @@ -26,7 +26,7 @@ class TileEntityMultiblockMachine extends TileEntity { if (!this.inStructure) { return null; } - final TileEntity tile = this.worldObj.getTileEntity(this.getPos().add(this.tileX, this.tileY, this.tileZ)); + final TileEntity tile = this.world.getTileEntity(this.getPos().add(this.tileX, this.tileY, this.tileZ)); if (tile instanceof TileEntityMachine) { return ((TileEntityMachine) tile).getMachine(); } diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index f08c5b9f..3f68e849 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -54,7 +54,7 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { @Override public void openGui(final AbstractMod mod, final int id, final EntityPlayer player, final BlockPos pos) { - player.openGui(mod, id, player.worldObj, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(mod, id, player.world, pos.getX(), pos.getY(), pos.getZ()); } @Override diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 55012546..6ef4caaa 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -22,12 +22,15 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import javax.annotation.Nullable; import java.io.File; import java.io.IOException; +@SideOnly(Side.CLIENT) public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { public static ModelManager modelManager = new ModelManager(Constants.CORE_MOD_ID); @@ -110,7 +113,7 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy @Override public World getWorld() { - return this.getMinecraftInstance().theWorld; + return this.getMinecraftInstance().world; } @Override @@ -178,7 +181,7 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy @Override public EntityPlayer getPlayer() { - return Minecraft.getMinecraft().thePlayer; + return Minecraft.getMinecraft().player; } // public void handlePreTextureRefresh(final IIconRegister register, final int type) { diff --git a/src/main/java/binnie/core/util/FakeCraftingWorld.java b/src/main/java/binnie/core/util/FakeCraftingWorld.java index f461b282..b6064aaf 100644 --- a/src/main/java/binnie/core/util/FakeCraftingWorld.java +++ b/src/main/java/binnie/core/util/FakeCraftingWorld.java @@ -10,21 +10,16 @@ import net.minecraft.world.World; import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldType; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.EmptyChunk; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.storage.ISaveHandler; -import net.minecraft.world.storage.SaveDataMemoryStorage; -import net.minecraft.world.storage.SaveHandlerMP; import net.minecraft.world.storage.WorldInfo; -import javax.annotation.Nonnull; import javax.annotation.Nullable; public class FakeCraftingWorld extends World { private static final WorldSettings worldSettings = new WorldSettings(0, GameType.SURVIVAL, false, false, WorldType.DEFAULT); private static final WorldInfo worldInfo = new WorldInfo(worldSettings, "fake"); - private static final ISaveHandler saveHandler = new SaveHandlerMP(); + private static final ISaveHandler saveHandler = new FakeSaveHandler(); private static final WorldProvider worldProvider = new WorldProvider() { @Override public DimensionType getDimensionType() { @@ -43,8 +38,8 @@ public class FakeCraftingWorld extends World { private FakeCraftingWorld() { super(saveHandler, worldInfo, worldProvider, new Profiler(), true); - this.provider.registerWorld(this); - this.mapStorage = new SaveDataMemoryStorage(); + this.provider.setWorld(this); + this.mapStorage = new FakeMapStorage(); } @Override @@ -59,28 +54,7 @@ public class FakeCraftingWorld extends World { @Override protected IChunkProvider createChunkProvider() { - return new IChunkProvider() { - @Nullable - @Override - public Chunk getLoadedChunk(int x, int z) { - return new EmptyChunk(FakeCraftingWorld.this, x, z); - } - - @Override - public Chunk provideChunk(int x, int z) { - return new EmptyChunk(FakeCraftingWorld.this, x, z); - } - - @Override - public boolean unloadQueuedChunks() { - return true; - } - - @Override - public String makeString() { - return ""; - } - }; + throw new UnsupportedOperationException(); } @Override diff --git a/src/main/java/binnie/core/util/FakeMapStorage.java b/src/main/java/binnie/core/util/FakeMapStorage.java new file mode 100644 index 00000000..382c21e8 --- /dev/null +++ b/src/main/java/binnie/core/util/FakeMapStorage.java @@ -0,0 +1,32 @@ +package binnie.core.util; + +import net.minecraft.world.WorldSavedData; +import net.minecraft.world.storage.MapStorage; + +import javax.annotation.Nullable; + +public class FakeMapStorage extends MapStorage { + public FakeMapStorage() { + super(null); + } + + @Override + @Nullable + public WorldSavedData getOrLoadData(Class clazz, String dataIdentifier) { + return this.loadedDataMap.get(dataIdentifier); + } + + @Override + public void setData(String dataIdentifier, WorldSavedData data) { + this.loadedDataMap.put(dataIdentifier, data); + } + + @Override + public void saveAllData() { + } + + @Override + public int getUniqueDataId(String key) { + return 0; + } +} diff --git a/src/main/java/binnie/core/util/FakeSaveHandler.java b/src/main/java/binnie/core/util/FakeSaveHandler.java new file mode 100644 index 00000000..f858b2b0 --- /dev/null +++ b/src/main/java/binnie/core/util/FakeSaveHandler.java @@ -0,0 +1,70 @@ +package binnie.core.util; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.MinecraftException; +import net.minecraft.world.WorldProvider; +import net.minecraft.world.chunk.storage.IChunkLoader; +import net.minecraft.world.gen.structure.template.TemplateManager; +import net.minecraft.world.storage.IPlayerFileData; +import net.minecraft.world.storage.ISaveHandler; +import net.minecraft.world.storage.WorldInfo; + +import java.io.File; + +public class FakeSaveHandler implements ISaveHandler { + @Override + public WorldInfo loadWorldInfo() + { + return null; + } + + @Override + public void checkSessionLock() throws MinecraftException + { + } + + @Override + public IChunkLoader getChunkLoader(WorldProvider provider) + { + return null; + } + + @Override + public void saveWorldInfoWithPlayer(WorldInfo worldInformation, NBTTagCompound tagCompound) + { + } + + @Override + public void saveWorldInfo(WorldInfo worldInformation) + { + } + + @Override + public IPlayerFileData getPlayerNBTManager() + { + return null; + } + + @Override + public void flush() + { + } + + @Override + public File getMapFileFromName(String mapName) + { + return null; + } + + @Override + public File getWorldDirectory() + { + return null; + } + + @Override + public TemplateManager getStructureTemplateManager() + { + return null; + } +} diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index 98476041..da144e76 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -38,7 +38,7 @@ public class ItemStackSet implements Set { if (existing == null) { return this.itemStacks.add(e.copy()); } - existing.stackSize += e.stackSize; + existing.grow(e.getCount()); } return false; } @@ -86,8 +86,8 @@ public class ItemStackSet implements Set { if (this.contains(o)) { final ItemStack r = (ItemStack) o; final ItemStack existing = this.getExisting(r); - if (existing != null && existing.stackSize > r.stackSize) { - existing.stackSize -= r.stackSize; + if (existing != null && existing.getCount() > r.getCount()) { + existing.shrink(r.getCount()); } else { this.itemStacks.remove(existing); } diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java index 5cbf63ad..f0528d98 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java @@ -206,7 +206,7 @@ public class WindowFieldKit extends Window { if (this.isServer()) { final ItemStack kit = this.getPlayer().getHeldItemMainhand(); final int sheets = 64 - kit.getItemDamage(); - final int size = (this.getWindowInventory().getStackInSlot(1) == null) ? 0 : this.getWindowInventory().getStackInSlot(1).stackSize; + final int size = (this.getWindowInventory().getStackInSlot(1) == null) ? 0 : this.getWindowInventory().getStackInSlot(1).getCount(); if (sheets != size) { kit.setItemDamage(64 - size); } diff --git a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java index 4e3a41b7..9ef7ee2f 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java @@ -197,7 +197,7 @@ public class WindowGenesis extends Window { public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { super.recieveGuiNBT(side, player, name, action); if (side == Side.SERVER && name.equals("genesis")) { - final ItemStack stack = ItemStack.loadItemStackFromNBT(action); + final ItemStack stack = new ItemStack(action); final InventoryPlayer playerInv = player.inventory; if (stack == null) { return; @@ -205,11 +205,11 @@ public class WindowGenesis extends Window { if (playerInv.getItemStack() == null) { playerInv.setItemStack(stack); } else if (playerInv.getItemStack().isItemEqual(stack) && ItemStack.areItemStackTagsEqual(playerInv.getItemStack(), stack)) { - final int fit = stack.getMaxStackSize() - (stack.stackSize + playerInv.getItemStack().stackSize); + final int fit = stack.getMaxStackSize() - (stack.getCount() + playerInv.getItemStack().getCount()); if (fit >= 0) { final ItemStack itemStack; final ItemStack rec = itemStack = stack; - itemStack.stackSize += playerInv.getItemStack().stackSize; + itemStack.grow(playerInv.getItemStack().getCount()); playerInv.setItemStack(rec); } } diff --git a/src/main/java/binnie/craftgui/controls/core/Control.java b/src/main/java/binnie/craftgui/controls/core/Control.java index c6599789..ee6f933f 100644 --- a/src/main/java/binnie/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/craftgui/controls/core/Control.java @@ -9,6 +9,8 @@ import binnie.craftgui.core.Widget; import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.minecraft.Window; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -38,6 +40,7 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { } diff --git a/src/main/java/binnie/craftgui/core/IWidget.java b/src/main/java/binnie/craftgui/core/IWidget.java index 10e98801..addce752 100644 --- a/src/main/java/binnie/craftgui/core/IWidget.java +++ b/src/main/java/binnie/craftgui/core/IWidget.java @@ -4,6 +4,8 @@ import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.events.Event; import binnie.craftgui.events.EventHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.List; @@ -54,6 +56,7 @@ public interface IWidget { int getColour(); + @SideOnly(Side.CLIENT) void render(int guiWidth, int guiHeight); void updateClient(); @@ -94,6 +97,7 @@ public interface IWidget { void recieveEvent(final Event p0); + @SideOnly(Side.CLIENT) void onUpdateClient(); void delete(); @@ -138,5 +142,6 @@ public interface IWidget { int h(); + @SideOnly(Side.CLIENT) void onRender(final RenderStage stage, int guiWidth, int guiHeight); } diff --git a/src/main/java/binnie/craftgui/core/Widget.java b/src/main/java/binnie/craftgui/core/Widget.java index cf62921f..ce5d2062 100644 --- a/src/main/java/binnie/craftgui/core/Widget.java +++ b/src/main/java/binnie/craftgui/core/Widget.java @@ -5,6 +5,8 @@ import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.events.Event; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventWidget; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.ArrayList; @@ -278,6 +280,7 @@ public class Widget implements IWidget { } @Override + @SideOnly(Side.CLIENT) public final void render(int guiWidth, int guiHeight) { if (this.isVisible()) { CraftGUI.render.preRender(this, guiWidth, guiHeight); @@ -413,6 +416,7 @@ public class Widget implements IWidget { } @Override + @SideOnly(Side.CLIENT) public void onRender(final RenderStage stage, int guiWidth, int guiHeight) { if (stage == RenderStage.PreChildren) { this.onRenderBackground(guiWidth, guiHeight); @@ -425,16 +429,20 @@ public class Widget implements IWidget { } } + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { } + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { } + @SideOnly(Side.CLIENT) public void onRenderOverlay() { } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { } diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index 909ec4c7..c300d6ae 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -63,7 +63,6 @@ public class ContainerCraftGUI extends Container { this.window = window; final IMachine machine = Machine.getMachine(window.getInventory()); if (this.getSide() == Side.SERVER) { - this.inventoryItemStacks = new ListMap<>(); this.inventorySlots = new ListMap<>(); if (machine != null) { final GameProfile user = machine.getOwner(); diff --git a/src/main/java/binnie/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/craftgui/minecraft/CustomSlot.java index ba804e35..190474e0 100644 --- a/src/main/java/binnie/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/CustomSlot.java @@ -42,7 +42,7 @@ public class CustomSlot extends Slot { this.putStack(null); } else { stack = stack.copy(); - stack.stackSize = 1; + stack.setCount(1); this.putStack(stack); } } diff --git a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java index 99bf159b..68766162 100644 --- a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java @@ -57,7 +57,7 @@ public class GuiCraftGUI extends GuiContainer { @Override public void initGui() { super.initGui(); - this.mc.thePlayer.openContainer = this.inventorySlots; + this.mc.player.openContainer = this.inventorySlots; this.guiLeft = (this.width - this.xSize) / 2; this.guiTop = (this.height - this.ySize) / 2; this.window.setSize(new IPoint(this.xSize, this.ySize)); @@ -86,9 +86,9 @@ public class GuiCraftGUI extends GuiContainer { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f); - final InventoryPlayer playerInventory = this.mc.thePlayer.inventory; + final InventoryPlayer playerInventory = this.mc.player.inventory; this.draggedItem = playerInventory.getItemStack(); - if (this.draggedItem != null) { + if (!this.draggedItem.isEmpty()) { RenderUtil.drawItem(new IPoint(mouseX - 8, mouseY - 8), this.draggedItem, false); } RenderHelper.enableGUIStandardItemLighting(); @@ -177,7 +177,7 @@ public class GuiCraftGUI extends GuiContainer { final String split = s2.split("~~~")[1]; try { final NBTTagCompound nbt = JsonToNBT.getTagFromJson(split); - final ItemStack stack = ItemStack.loadItemStackFromNBT(nbt); + final ItemStack stack = new ItemStack(nbt); GlStateManager.pushMatrix(); GlStateManager.translate(i1, j1 - 1.5f, 0.0f); GlStateManager.scale(0.6f, 0.6f, 1.0f); @@ -218,7 +218,7 @@ public class GuiCraftGUI extends GuiContainer { @Override protected void keyTyped(final char c, final int key) { if (key == 1 || (key == this.mc.gameSettings.keyBindInventory.getKeyCode() && this.window.getFocusedWidget() == null)) { - this.mc.thePlayer.closeScreen(); + this.mc.player.closeScreen(); } final IWidget origin = (this.window.getFocusedWidget() == null) ? this.window : this.window.getFocusedWidget(); this.window.callEvent(new EventKey.Down(origin, c, key)); diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index 7cbafed8..59c95e5d 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -265,7 +265,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG } public World getWorld() { - return this.getPlayer().worldObj; + return this.getPlayer().world; } public void onInventoryUpdate() { diff --git a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/craftgui/minecraft/WindowInventory.java index b4f4912c..eb07029d 100644 --- a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/craftgui/minecraft/WindowInventory.java @@ -41,36 +41,39 @@ public class WindowInventory implements IInventory { } @Override - @Nullable + public boolean isEmpty() { + return this.inventory.isEmpty(); + } + + @Override public ItemStack getStackInSlot(final int var1) { if (this.inventory.containsKey(var1)) { return this.inventory.get(var1); } - return null; + return ItemStack.EMPTY; } @Override - @Nullable public ItemStack decrStackSize(final int index, int amount) { if (this.inventory.containsKey(index)) { final ItemStack item = this.inventory.get(index); final ItemStack output = item.copy(); - final int available = item.stackSize; + final int available = item.getCount(); if (amount > available) { amount = available; } - item.stackSize -= amount; - output.stackSize = amount; - if (item.stackSize == 0) { - this.setInventorySlotContents(index, null); + item.shrink(amount); + output.setCount(amount); + if (item.isEmpty()) { + this.setInventorySlotContents(index, ItemStack.EMPTY); } return output; } - return null; + return ItemStack.EMPTY; } @Override - public void setInventorySlotContents(final int index, @Nullable final ItemStack stack) { + public void setInventorySlotContents(final int index, final ItemStack stack) { this.inventory.put(index, stack); this.markDirty(); } @@ -87,7 +90,7 @@ public class WindowInventory implements IInventory { } @Override - public boolean isUseableByPlayer(final EntityPlayer var1) { + public boolean isUsableByPlayer(final EntityPlayer var1) { return true; } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java index 595f89eb..ac7368d0 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java @@ -25,6 +25,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.ArrayList; @@ -70,6 +72,7 @@ public class ControlSlot extends ControlSlotBase { this.slot = slot; this.addSelfEventHandler(new EventMouse.Down.Handler() { @Override + @SideOnly(Side.CLIENT) public void onEvent(final EventMouse.Down event) { Window superParent = (Window) ControlSlot.this.getTopParent(); GuiCraftGUI superParentGui = superParent.getGui(); @@ -80,13 +83,14 @@ public class ControlSlot extends ControlSlotBase { 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); + playerController.windowClick(windowId, slotNumber, button, GuiScreen.isShiftKeyDown() ? ClickType.QUICK_MOVE : ClickType.PICKUP, minecraft.player); } } }); } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO); final InventorySlot islot = this.getInventorySlot(); @@ -146,6 +150,7 @@ public class ControlSlot extends ControlSlotBase { } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { super.onUpdateClient(); if (this.isMouseOver() && GuiScreen.isShiftKeyDown()) { diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java index ed11ca51..2b71e7aa 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java @@ -13,6 +13,8 @@ import binnie.craftgui.events.EventWidget; import binnie.craftgui.minecraft.Window; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -42,6 +44,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { final int size = this.getSize().x(); CraftGUI.render.texture(CraftGUITexture.Slot, this.getArea()); @@ -51,6 +54,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { super.onUpdateClient(); this.itemDisplay.setItemStack(this.getItemStack()); diff --git a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java b/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java index 3682aff9..0842e138 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -20,7 +21,7 @@ public class ItemIndustrialFrame extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { for (final IndustrialFrame frame : IndustrialFrame.values()) { final ItemStack stack = new ItemStack(this); final NBTTagCompound nbt = new NBTTagCompound(); diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java index 06092729..446727c8 100644 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java @@ -16,13 +16,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import javax.annotation.Nullable; import java.util.LinkedList; import java.util.List; public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyComponent.Active, IAlvearyComponent.BeeModifier, IAlvearyComponent.BeeListener, IBeeListener, IBeeModifier { - IMultiblockLogicAlveary structureLogic; - BlockPos min; - BlockPos max; + private IMultiblockLogicAlveary structureLogic; + @Nullable + private BlockPos min; + @Nullable + private BlockPos max; public TileExtraBeeAlveary() { this.structureLogic = MultiblockManager.logicFactory.createAlvearyLogic(); @@ -91,18 +94,18 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo @Override public void invalidate() { super.invalidate(); - structureLogic.invalidate(worldObj, this); + structureLogic.invalidate(world, this); } @Override public void onChunkUnload() { super.onChunkUnload(); - structureLogic.onChunkUnload(worldObj, this); + structureLogic.onChunkUnload(world, this); } @Override public void validate() { - structureLogic.validate(worldObj, this); + structureLogic.validate(world, this); } @Override diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index 3d59ddbd..fa8d110a 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -15,6 +15,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -22,8 +23,11 @@ import java.util.List; public class ExtraBeeMutation implements IBeeMutation { public static List mutations = new ArrayList<>(); + @Nullable MutationRequirement req; + @Nullable IAlleleBeeSpecies species0; + @Nullable IAlleleBeeSpecies species1; IAllele[] template; int chance; @@ -199,7 +203,7 @@ public class ExtraBeeMutation implements IBeeMutation { this(allele0, allele1, mutation, chance, null); } - public ExtraBeeMutation(final IAlleleBeeSpecies allele0, final IAlleleBeeSpecies allele1, final IAllele[] mutation, final int chance, final MutationRequirement req) { + public ExtraBeeMutation(final IAlleleBeeSpecies allele0, final IAlleleBeeSpecies allele1, final IAllele[] mutation, final int chance, @Nullable final MutationRequirement req) { this.species0 = null; this.species1 = null; this.template = new IAllele[0]; @@ -306,7 +310,7 @@ public class ExtraBeeMutation implements IBeeMutation { @Override public boolean fufilled(final IBeeHousing housing, final IAllele allele0, final IAllele allele1, final IGenome genome0, final IGenome genome1) { - return BiomeDictionary.isBiomeOfType(housing.getBiome(), this.type); + return BiomeDictionary.hasType(housing.getBiome(), this.type); } } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index a9a4420e..016f1830 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -17,11 +17,11 @@ import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; -import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -212,10 +212,10 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo } @Override - public ItemStack[] affectProducts(World world, IIndividual individual, BlockPos pos, ItemStack[] products) { + public NonNullList affectProducts(World world, IIndividual individual, BlockPos pos, NonNullList products) { if (this == ExtraBeesFlowers.Mystical) { - final List prods = new ArrayList<>(); - Collections.addAll(prods, products); + final NonNullList prods = NonNullList.create(); + prods.addAll(products); for (int k = 0; k < 50; ++k) { final int tX = 7; final int tY = 7; @@ -233,7 +233,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo } } } - return prods.toArray(new ItemStack[0]); + return prods; } return products; } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index d8202d3f..59b2e84b 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -34,6 +34,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -1100,8 +1101,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } @Override - public ItemStack[] getResearchBounty(final World world, final GameProfile researcher, final IIndividual individual, final int bountyLevel) { - final ArrayList bounty = new ArrayList<>(); + public NonNullList getResearchBounty(final World world, final GameProfile researcher, final IIndividual individual, final int bountyLevel) { + final NonNullList bounty = NonNullList.create(); ItemStack research = null; if (world.rand.nextFloat() < 10.0f / bountyLevel) { final Collection combinations = this.getRoot().getCombinations(this); @@ -1116,16 +1117,16 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { if (bountyLevel > 10) { for (final ItemStack stack : this.specialties.keySet()) { final ItemStack stack2 = stack.copy(); - stack2.stackSize = world.rand.nextInt((int) (bountyLevel / 2.0f)) + 1; + stack2.setCount(world.rand.nextInt((int) (bountyLevel / 2.0f)) + 1); bounty.add(stack2); } } for (final ItemStack stack : this.products.keySet()) { final ItemStack stack2 = stack.copy(); - stack2.stackSize = world.rand.nextInt((int) (bountyLevel / 2.0f)) + 1; + stack2.setCount(world.rand.nextInt((int) (bountyLevel / 2.0f)) + 1); bounty.add(stack2); } - return bounty.toArray(new ItemStack[0]); + return bounty; } // @Override diff --git a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java index 0a3dd13c..d840bfb6 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java +++ b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java @@ -14,6 +14,11 @@ public class EntityBeeLightning extends EntityLightningBolt { int lightningState; int boltLivingTime; + @SuppressWarnings("unused") + public EntityBeeLightning(final World world) { + super(world, 0, 0, 0, true); + } + public EntityBeeLightning(final World par1World, final double par2, final double par4, final double par6) { super(par1World, par2, par4, par6, false); this.lightningState = 2; @@ -31,23 +36,23 @@ public class EntityBeeLightning extends EntityLightningBolt { --this.boltLivingTime; this.lightningState = 1; this.boltVertex = this.rand.nextLong(); - final int i = MathHelper.floor_double(this.posX); - final int j = MathHelper.floor_double(this.posY); - final int k = MathHelper.floor_double(this.posZ); + final int i = MathHelper.floor(this.posX); + final int j = MathHelper.floor(this.posY); + final int k = MathHelper.floor(this.posZ); final BlockPos pos = new BlockPos(i, j, k); - if (!this.worldObj.isRemote && this.worldObj.isAreaLoaded(pos, 10)) { - if (this.worldObj.isAirBlock(pos) && Blocks.FIRE.canPlaceBlockAt(this.worldObj, pos)) { - this.worldObj.setBlockState(pos, Blocks.FIRE.getDefaultState()); + if (!this.world.isRemote && this.world.isAreaLoaded(pos, 10)) { + if (this.world.isAirBlock(pos) && Blocks.FIRE.canPlaceBlockAt(this.world, pos)) { + this.world.setBlockState(pos, Blocks.FIRE.getDefaultState()); } } } } if (this.lightningState >= 0) { - if (this.worldObj.isRemote) { - this.worldObj.setLastLightningBolt(2); + if (this.world.isRemote) { + this.world.setLastLightningBolt(2); } else { final double d0 = 3.0; - final List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, new AxisAlignedBB(this.posX - d0, this.posY - d0, this.posZ - d0, this.posX + d0, this.posY + 6.0 + d0, this.posZ + d0)); + final List list = this.world.getEntitiesWithinAABBExcludingEntity(this, new AxisAlignedBB(this.posX - d0, this.posY - d0, this.posZ - d0, this.posX + d0, this.posY + 6.0 + d0, this.posZ + d0)); for (Entity entity : list) { entity.onStruckByLightning(this); } diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index 589a6281..8d2c9dcb 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -30,6 +31,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3i; @@ -132,14 +134,14 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return this.dominant; } - public void spawnMob(final World world, final BlockPos pos, final String name) { + public void spawnMob(final World world, final BlockPos pos, final ResourceLocation name) { if (this.anyPlayerInRange(world, pos, 16)) { final double var1 = pos.getX() + world.rand.nextFloat(); final double var2 = pos.getY() + world.rand.nextFloat(); final double var3 = pos.getZ() + world.rand.nextFloat(); world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var1, var2, var3, 0.0, 0.0, 0.0); world.spawnParticle(EnumParticleTypes.FLAME, var1, var2, var3, 0.0, 0.0, 0.0); - final EntityLiving entity = (EntityLiving) EntityList.createEntityByName(name, world); + final EntityLiving entity = (EntityLiving) EntityList.createEntityByIDFromName(name, world); if (entity != null) { final int nearbyEntityCount = world.getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(pos, pos.add(1, 1, 1)).expand(8.0, 4.0, 8.0)).size(); if (nearbyEntityCount < 6) { @@ -148,7 +150,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { final double var8 = pos.getZ() + (world.rand.nextDouble() - world.rand.nextDouble()) * 4.0; entity.setLocationAndAngles(var6, var7, var8, world.rand.nextFloat() * 360.0f, 0.0f); if (entity.getCanSpawnHere()) { - world.spawnEntityInWorld(entity); + world.spawnEntity(entity); world.playEvent(2004, pos, 0);//playSFX entity.spawnExplosionParticle(); } @@ -209,21 +211,21 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } case SPAWN_ZOMBIE: { if (world.rand.nextInt(200) < 2) { - this.spawnMob(world, pos, "Zombie"); + this.spawnMob(world, pos, new ResourceLocation("zombie")); break; } break; } case SPAWN_SKELETON: { if (world.rand.nextInt(200) < 2) { - this.spawnMob(world, pos, "Skeleton"); + this.spawnMob(world, pos, new ResourceLocation("skeleton")); break; } break; } case SPAWN_CREEPER: { if (world.rand.nextInt(200) < 2) { - this.spawnMob(world, pos, "Creeper"); + this.spawnMob(world, pos, new ResourceLocation("creeper")); break; } break; @@ -237,7 +239,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } case METEOR: { if (world.rand.nextInt(100) < 1 && world.canBlockSeeSky(pos)) { - world.spawnEntityInWorld(new EntitySmallFireball(world, x1, y1 + 64, z1, 0.0, -0.6, 0.0)); + world.spawnEntity(new EntitySmallFireball(world, x1, y1 + 64, z1, 0.0, -0.6, 0.0)); break; } break; @@ -258,7 +260,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { damage = 3; } } - entity.attackEntityFrom(DamageSource.generic, damage); + entity.attackEntityFrom(DamageSource.GENERIC, damage); } break; } @@ -353,7 +355,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } final EntityFireworkRocket var11 = new EntityFireworkRocket(world, x1, y1, z1, firework.getFirework()); if (world.canBlockSeeSky(pos)) { - world.spawnEntityInWorld(var11); + world.spawnEntity(var11); } break; } @@ -509,41 +511,8 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return housing.getWorldObj().getEntitiesWithinAABB(eClass, box); } - public static boolean wearsHelmet(final EntityPlayer player) { - final ItemStack armorItem = player.inventory.armorInventory[3]; - return armorItem != null && armorItem.getItem() instanceof IArmorApiarist; - } - - public static boolean wearsChest(final EntityPlayer player) { - final ItemStack armorItem = player.inventory.armorInventory[2]; - return armorItem != null && armorItem.getItem() instanceof IArmorApiarist; - } - - public static boolean wearsLegs(final EntityPlayer player) { - final ItemStack armorItem = player.inventory.armorInventory[1]; - return armorItem != null && armorItem.getItem() instanceof IArmorApiarist; - } - - public static boolean wearsBoots(final EntityPlayer player) { - final ItemStack armorItem = player.inventory.armorInventory[0]; - return armorItem != null && armorItem.getItem() instanceof IArmorApiarist; - } - public static int wearsItems(final EntityPlayer player) { - int count = 0; - if (wearsHelmet(player)) { - ++count; - } - if (wearsChest(player)) { - ++count; - } - if (wearsLegs(player)) { - ++count; - } - if (wearsBoots(player)) { - ++count; - } - return count; + return BeeManager.armorApiaristHelper.wearsItems(player, "", false); } @Override diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index 847171da..a13d6b64 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -11,6 +11,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -38,20 +39,23 @@ public class ItemDictionary extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { super.getSubItems(par1, par2CreativeTabs, par3List); par3List.add(new ItemStack(par1, 1, 1)); } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + final ItemStack itemStack = playerIn.getHeldItem(handIn); + final ExtraBeeGUID id; if (itemStack.getItemDamage() == 0) { - ExtraBees.proxy.openGui(ExtraBeeGUID.Database, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + id = ExtraBeeGUID.Database; } else { - ExtraBees.proxy.openGui(ExtraBeeGUID.DatabaseNEI, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + id = ExtraBeeGUID.DatabaseNEI; } + ExtraBees.proxy.openGui(id, playerIn, playerIn.getPosition()); - return super.onItemRightClick(itemStack, world, player, hand); + return super.onItemRightClick(worldIn, playerIn, handIn); } @Override @@ -60,6 +64,7 @@ public class ItemDictionary extends Item implements IItemModelRegister { } @Override + @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, 0, getRegistryName().getResourcePath()); manager.registerItemModel(item, 1, getRegistryName().getResourcePath() + "Master"); diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java b/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java index 568fd5f2..69cbeac1 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java @@ -29,11 +29,12 @@ public class ItemPunnettSquare extends Item { return "Punnett Square"; } - @Override - public ActionResult onItemRightClick(ItemStack itemStackIn, World world, EntityPlayer player, EnumHand hand) { - if (hand == EnumHand.MAIN_HAND) - ExtraBees.proxy.openGui(ExtraBeeGUID.PunnettSquare, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); - return new ActionResult<>(EnumActionResult.PASS, itemStackIn); + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + if (handIn == EnumHand.MAIN_HAND) { + ExtraBees.proxy.openGui(ExtraBeeGUID.PunnettSquare, playerIn, playerIn.getPosition()); + } + ItemStack itemStack = playerIn.getHeldItem(handIn); + return new ActionResult<>(EnumActionResult.PASS, itemStack); } } diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java index f8587e81..8e901687 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java @@ -8,8 +8,6 @@ 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"), @@ -43,7 +41,6 @@ public enum EnumHoneyDrop implements IItemEnum { private int[] colour; private String liquidName; - @Nullable private ItemStack remnant; public void addRemnant(final ItemStack stack) { @@ -55,7 +52,7 @@ public enum EnumHoneyDrop implements IItemEnum { } EnumHoneyDrop(final int colour, final int colour2, final String liquid) { - this.remnant = null; + this.remnant = ItemStack.EMPTY; this.colour = new int[]{colour, colour2}; this.liquidName = liquid; } @@ -63,13 +60,13 @@ public enum EnumHoneyDrop implements IItemEnum { public void addRecipe() { final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.getLiquidName(), 200); if (liquid != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{this.get(1)}, liquid, this.getRemnant(), 100); + RecipeManagers.squeezerManager.addRecipe(10, this.get(1), liquid, this.getRemnant(), 100); } } @Override public boolean isActive() { - return this.remnant != null && FluidRegistry.isFluidRegistered(this.getLiquidName()); + return !this.remnant.isEmpty() && FluidRegistry.isFluidRegistered(this.getLiquidName()); } public static EnumHoneyDrop get(final ItemStack itemStack) { @@ -98,7 +95,6 @@ public enum EnumHoneyDrop implements IItemEnum { return liquidName; } - @Nullable public ItemStack getRemnant() { return remnant; } diff --git a/src/main/java/binnie/extrabees/products/EnumPropolis.java b/src/main/java/binnie/extrabees/products/EnumPropolis.java index a16f5061..efaa919a 100644 --- a/src/main/java/binnie/extrabees/products/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/products/EnumPropolis.java @@ -38,7 +38,7 @@ public enum EnumPropolis implements IItemEnum { public void addRecipe() { final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.liquidName, 500); if (liquid != null) { - RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[]{this.get(1)}, liquid, null, 0); + RecipeManagers.squeezerManager.addRecipe(20, this.get(1), liquid, ItemStack.EMPTY, 0); } } diff --git a/src/main/java/binnie/extrabees/products/ItemProduct.java b/src/main/java/binnie/extrabees/products/ItemProduct.java index ebd464d2..9dff84c7 100644 --- a/src/main/java/binnie/extrabees/products/ItemProduct.java +++ b/src/main/java/binnie/extrabees/products/ItemProduct.java @@ -6,6 +6,9 @@ import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; @@ -33,7 +36,7 @@ public class ItemProduct extends Item implements IItemModelRegister { } @Override - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (final IItemEnum type : this.types) { if (type.isActive()) { itemList.add(new ItemStack(this, 1, type.ordinal())); @@ -42,6 +45,7 @@ public class ItemProduct extends Item implements IItemModelRegister { } @Override + @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { for (IItemEnum type : types) { manager.registerItemModel(item, type.ordinal(), getRegistryName().getResourcePath()); diff --git a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java index accd43c3..f3227fcf 100644 --- a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java +++ b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java @@ -9,6 +9,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -34,7 +35,7 @@ public class BlockExtraBeeHive extends Block { } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (int i = 0; i < EnumHiveType.values().length; ++i) { itemList.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java index 34fd3a8c..0460c40c 100644 --- a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java +++ b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java @@ -6,33 +6,29 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IHiveDrop; import forestry.api.genetics.IAllele; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; - public class HiveDrop implements IHiveDrop { private IAllele[] template; - private ArrayList additional; + private NonNullList extra; private int chance; public HiveDrop(final IAlleleBeeSpecies species, final int chance) { - this(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID()), new ItemStack[0], chance); + this(Binnie.GENETICS.getBeeRoot().getTemplate(species), NonNullList.create(), chance); } - public HiveDrop(IAllele[] template, final ItemStack[] bonus, final int chance) { - this.additional = new ArrayList<>(); + public HiveDrop(IAllele[] template, final NonNullList extra, final int chance) { + this.extra = extra; this.template = template; this.chance = chance; - Collections.addAll(this.additional, bonus); } @Override - public Collection getExtraItems(IBlockAccess world, BlockPos pos, int fortune) { - final ArrayList ret = new ArrayList<>(); - for (final ItemStack stack : this.additional) { + public NonNullList getExtraItems(IBlockAccess world, BlockPos pos, int fortune) { + final NonNullList ret = NonNullList.create(); + for (final ItemStack stack : this.extra) { ret.add(stack.copy()); } return ret; @@ -45,7 +41,7 @@ public class HiveDrop implements IHiveDrop { @Override public double getIgnobleChance(IBlockAccess world, BlockPos pos, int fortune) { - return 0; //TODO implement + return 0.5; //TODO implement } @Override diff --git a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java index 0db8ff9f..d32db4d1 100644 --- a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java @@ -5,6 +5,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import java.util.List; @@ -22,7 +23,7 @@ public class ItemBeehive extends ItemBlock { } @Override - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (int i = 0; i < EnumHiveType.values().length; ++i) { itemList.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java index a36f4f74..e41db3e9 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java @@ -15,7 +15,7 @@ public class WorldGenHiveNether extends WorldGenerator { @Override public boolean generate(final World world, final Random random, final BlockPos pos) { final Biome biome = world.getBiome(pos); - if (!BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.NETHER)) { + if (!BiomeDictionary.hasType(biome, BiomeDictionary.Type.NETHER)) { return true; } if (this.embedInWall(world, Blocks.NETHERRACK, pos)) { diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index db006c35..1590fcfb 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,5 +1,6 @@ package binnie.extratrees; +import binnie.Binnie; import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -23,6 +24,7 @@ import binnie.extratrees.proxy.Proxy; import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.AlleleSpeciesRegisterEvent; +import forestry.api.genetics.IClassification; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; @@ -42,6 +44,8 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import com.google.common.base.Preconditions; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraTrees extends AbstractMod { @@ -175,8 +179,8 @@ public class ExtraTrees extends AbstractMod { PlankType.ExtraTreePlanks.initWoodTypes(); if (BinnieCore.isLepidopteryActive()) { - for (final ButterflySpecies species2 : ButterflySpecies.values()) { - AlleleManager.alleleRegistry.registerAllele(species2); + for (final ButterflySpecies species : ButterflySpecies.values()) { + AlleleManager.alleleRegistry.registerAllele(species); } } } @@ -189,6 +193,7 @@ public class ExtraTrees extends AbstractMod { } @SubscribeEvent + @SideOnly(Side.CLIENT) public void onBakedEvent(ModelBakeEvent e) { //Find all ExtraTrees saplings List models = e.getModelRegistry().getKeys().stream() diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index cc40e465..a72d6769 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -8,21 +8,21 @@ import javax.annotation.Nullable; public enum Glassware { - BeerMug(16, 10, 14), - Pint(20, 6, 20), - Snifter(17, 14, 11), - Flute(6, 13, 15), - Cocktail(8, 20, 8), - Cordial(2, 15, 7), - Collins(12, 8, 18), - Highball(8, 10, 14), - Hurricane(15, 10, 18), - Margarita(12, 18, 9), - OldFashioned(8, 13, 8), - Wine(8, 17, 10), - Shot(1, 13, 7), - Sherry(2, 17, 7), - Coupe(6, 19, 8); + BeerMug(480, 10, 14), + Pint(600, 6, 20), + Snifter(510, 14, 11), + Flute(180, 13, 15), + Cocktail(240, 20, 8), + Cordial(60, 15, 7), + Collins(360, 8, 18), + Highball(240, 10, 14), + Hurricane(450, 10, 18), + Margarita(360, 18, 9), + OldFashioned(240, 13, 8), + Wine(240, 17, 10), + Shot(30, 13, 7), + Sherry(60, 17, 7), + Coupe(180, 19, 8); private int capacity; float contentBottom; @@ -42,7 +42,7 @@ public enum Glassware { } Glassware(final int capacity, final int contentBottom, final int contentHeight) { - this.capacity = 30 * capacity; + this.capacity = capacity; this.contentBottom = contentBottom / 32.0f; this.contentHeight = contentHeight / 32.0f; } diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index 354817b5..cdc7df0c 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -76,7 +76,7 @@ public class ModuleAlcohol implements IInitializable { } for (final ItemStack stack : ores) { for (final ISqueezerRecipe entry : RecipeManagers.squeezerManager.recipes()) { - final ItemStack input = entry.getResources()[0]; + final ItemStack input = entry.getResources().get(0); final FluidStack output = entry.getFluidOutput(); if (!ItemStack.areItemStacksEqual(stack, input) && !OreDictionary.itemMatches(input, stack, true)) { continue; diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java index 083110f6..948776a1 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java @@ -8,15 +8,15 @@ import java.util.HashMap; import java.util.Map; public class DrinkManager { - static Map drinkLiquids = new HashMap<>(); + private static final Map DRINK_LIQUIDS = new HashMap<>(); @Nullable public static IDrinkLiquid getLiquid(final String id) { - return DrinkManager.drinkLiquids.get(id.toLowerCase()); + return DrinkManager.DRINK_LIQUIDS.get(id.toLowerCase()); } public static void registerDrinkLiquid(final IDrinkLiquid liquid) { - DrinkManager.drinkLiquids.put(liquid.getIdentifier(), liquid); + DrinkManager.DRINK_LIQUIDS.put(liquid.getIdentifier(), liquid); } @Nullable diff --git a/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java b/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java new file mode 100644 index 00000000..dd060f1e --- /dev/null +++ b/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java @@ -0,0 +1,30 @@ +package binnie.extratrees.alcohol.drink; + +import binnie.extratrees.alcohol.Glassware; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple; + +// TODO implement cocktails and only allow glassware to hold the correct cocktails. +public class FluidHandlerItemGlassware extends FluidHandlerItemStackSimple { + + public FluidHandlerItemGlassware(ItemStack container, Glassware glassware) { + super(container, glassware.getCapacity()); + } + + private boolean contentsAllowed(FluidStack fluidStack) { + Fluid fluid = fluidStack.getFluid(); + return fluid != null && DrinkManager.getLiquid(fluidStack) != null; + } + + @Override + public boolean canFillFluidType(FluidStack fluid) { + return contentsAllowed(fluid); + } + + @Override + public boolean canDrainFluidType(FluidStack fluid) { + return contentsAllowed(fluid); + } +} diff --git a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java index c1688c7f..722ec7a1 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java @@ -9,16 +9,16 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.FluidUtil; 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 class ItemDrink extends ItemFood { public ItemDrink() { super(0, 0.0f, false); this.setCreativeTab(Tabs.tabArboriculture); @@ -69,89 +69,24 @@ 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; - } - return FluidStack.loadFluidStackFromNBT(container.getTagCompound().getCompoundTag("fluid")); - } - @Override - public int getCapacity(final ItemStack container) { - return this.getGlassware(container).getCapacity(); - } - - @Override - public int fill(final ItemStack container, final FluidStack resource, final boolean doFill) { - if (resource == null || !container.hasTagCompound()) { - return 0; - } - if (DrinkManager.getLiquid(resource.getFluid()) == null) { - return 0; - } - final FluidStack existing = this.getFluid(container); - final int space = this.getGlassware(container).getCapacity() - ((existing == null) ? 0 : existing.amount); - final int added = Math.min(space, resource.amount); - if (space <= 0) { - return 0; - } - if (existing == null) { - if (doFill) { - final FluidStack fill = resource.copy(); - fill.amount = added; - this.saveFluid(fill, container); - } - return added; - } - if (!existing.isFluidEqual(resource)) { - return 0; - } - if (doFill) { - final FluidStack fill = existing.copy(); - fill.amount += added; - this.saveFluid(fill, container); - } - return added; - } - - @Override - @Nullable - public FluidStack drain(final ItemStack container, final int maxDrain, final boolean doDrain) { - if (!container.hasTagCompound()) { - return null; - } - final FluidStack content = this.getFluid(container); - if (content == null) { - return null; - } - final int toRemove = Math.min(maxDrain, content.amount); - FluidStack fill = content.copy(); - final FluidStack drain = content.copy(); - drain.amount = toRemove; - fill.amount -= toRemove; - if (fill.amount == 0) { - fill = null; - } - if (doDrain) { - this.saveFluid(fill, container); - } - return drain; + public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { + return new FluidHandlerItemGlassware(stack, getGlassware(stack)); } @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { + public void getSubItems(final Item item, final CreativeTabs creativeTabs, final NonNullList itemList) { for (final Glassware glassware : Glassware.values()) { - par3List.add(this.getStack(glassware, null)); + itemList.add(this.getStack(glassware, null)); } - par3List.add(this.getStack(Glassware.Wine, Alcohol.RedWine.get(Glassware.Wine.getCapacity()))); + itemList.add(this.getStack(Glassware.Wine, Alcohol.RedWine.get(Glassware.Wine.getCapacity()))); } @Override public String getItemStackDisplayName(final ItemStack stack) { - final FluidStack fluid = this.getFluid(stack); + final FluidStack fluid = FluidUtil.getFluidContained(stack); final IDrinkLiquid liquid; if (fluid == null) { liquid = null; @@ -203,8 +138,12 @@ public class ItemDrink extends ItemFood implements IFluidContainerItem { // } @Override - public EnumAction getItemUseAction(final ItemStack p_77661_1_) { - return (this.getFluid(p_77661_1_) == null) ? EnumAction.NONE : EnumAction.DRINK; + public EnumAction getItemUseAction(final ItemStack itemStack) { + if (FluidUtil.getFluidContained(itemStack) != null) { + return EnumAction.DRINK; + } else { + return EnumAction.NONE; + } } // @Override diff --git a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java index 482d44c5..318437d6 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java @@ -24,6 +24,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -94,7 +96,7 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode */ @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, NonNullList list) { for (IBlockState state : getBlockState().getValidStates()) { int meta = getMetaFromState(state); ItemStack itemStack = new ItemStack(item, 1, meta); @@ -120,12 +122,12 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode } @Override - public boolean isVisuallyOpaque() - { + public boolean causesSuffocation(IBlockState state) { return false; } @Override + @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { return (Proxies.render.fancyGraphicsEnabled() || blockAccess.getBlockState(pos.offset(side)).getBlock() != this) && super.shouldSideBeRendered(blockState, blockAccess, pos, side); } @@ -187,11 +189,8 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode return Collections.emptyList(); } - /** - * Called by ItemBlocks just before a block is actually set in the world, to allow for adjustments to the IBlockstate - */ @Override - public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { ETTreeDefinition type = getTreeType(meta); return getDefaultState().withProperty(getVariant(), type); } diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index f76ff249..7ef83a64 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -16,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -240,7 +241,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (final IPlankType type : PlankType.ExtraTreePlanks.values()) { itemList.add(WoodManager.getDoor(type, DoorType.Standard)); } diff --git a/src/main/java/binnie/extratrees/block/EnumETLog.java b/src/main/java/binnie/extratrees/block/EnumETLog.java index f2e1dd5a..01a0bf89 100644 --- a/src/main/java/binnie/extratrees/block/EnumETLog.java +++ b/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -83,12 +83,12 @@ public enum EnumETLog implements IWoodType { } ItemStack log = TreeManager.woodAccess.getStack(this, WoodBlockKind.LOG, false); ItemStack result = plank.getStack(false); - result.stackSize = 4; + result.setCount(4); GameRegistry.addShapelessRecipe(result, log); ItemStack logFireproof = TreeManager.woodAccess.getStack(this, WoodBlockKind.LOG, true); ItemStack resultFireproof = plank.getStack(true); - resultFireproof.stackSize = 4; + resultFireproof.setCount(4); GameRegistry.addShapelessRecipe(resultFireproof, logFireproof); } diff --git a/src/main/java/binnie/extratrees/block/ItemETDoor.java b/src/main/java/binnie/extratrees/block/ItemETDoor.java index 2ad6fb3f..6a1bbac0 100644 --- a/src/main/java/binnie/extratrees/block/ItemETDoor.java +++ b/src/main/java/binnie/extratrees/block/ItemETDoor.java @@ -27,7 +27,7 @@ public class ItemETDoor extends ItemMetadata { } @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing facing, float par8, float par9, float par10) { + public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { // if (par7 != 1) { // return false; // } @@ -39,10 +39,10 @@ public class ItemETDoor extends ItemMetadata { // if (!block.canPlaceBlockAt(par3World, pos)) { // return false; // } -// final int i1 = MathHelper.floor_double((par2EntityPlayer.rotationYaw + 180.0f) * 4.0f / 360.0f - 0.5) & 0x3; +// final int i1 = MathHelper.floor((par2EntityPlayer.rotationYaw + 180.0f) * 4.0f / 360.0f - 0.5) & 0x3; // placeDoorBlock(par3World, par4, par5, par6, i1, block, par1ItemStack, par2EntityPlayer); -// --par1ItemStack.stackSize; - return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, pos, hand, facing, par8, par9, par10); +// par1ItemStack.shrink(1); + return super.onItemUse(player, worldIn, pos, hand, facing, hitX, hitY, hitZ); } public static void placeDoorBlock(final World par0World, final int par1, final int par2, final int par3, final int par4, final Block par5Block, final ItemStack item, final EntityPlayer player) { diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index c009f27c..41b7de2f 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -260,14 +260,14 @@ public class ModuleBlocks implements IInitializable { ItemStack slabs = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.SLAB, fireproof); ItemStack stairs = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.STAIRS, fireproof); - stairs.stackSize = 4; + stairs.setCount(4); RecipeUtil.addPriorityRecipe(stairs.copy(), "# ", "## ", "###", '#', planks.copy()); - slabs.stackSize = 6; + slabs.setCount(6); RecipeUtil.addPriorityRecipe(slabs.copy(), "###", '#', planks.copy()); } } @@ -283,9 +283,9 @@ public class ModuleBlocks implements IInitializable { final ItemStack doorSplit = WoodManager.getDoor(plank2, DoorType.Double); final ItemStack doorFull = WoodManager.getDoor(plank2, DoorType.Full); if (planks2 != null && gate != null) { - gate.stackSize = 1; + gate.setCount(1); GameRegistry.addRecipe(gate.copy(), "fpf", 'f', fenceNormal.copy(), 'p', planks2.copy()); - fenceNormal.stackSize = 4; + fenceNormal.setCount(4); GameRegistry.addRecipe(fenceNormal.copy(), "###", "# #", '#', planks2.copy()); GameRegistry.addRecipe(doorSolid.copy(), "###", "###", "###", '#', planks2.copy()); GameRegistry.addRecipe(doorStandard.copy(), "# #", "###", "###", '#', planks2.copy()); @@ -298,7 +298,8 @@ public class ModuleBlocks implements IInitializable { public void addSqueezer(final IWoodType log, final ILiquidType liquid, final int amount, final float pulpChance) { final FluidStack liquidStack = liquid.get(amount); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{TreeManager.woodAccess.getStack(log, WoodBlockKind.LOG, false)}, liquidStack, Mods.Forestry.stack("woodPulp"), (int) (100.0f * pulpChance)); + ItemStack logStack = TreeManager.woodAccess.getStack(log, WoodBlockKind.LOG, false); + RecipeManagers.squeezerManager.addRecipe(10, logStack, liquidStack, Mods.Forestry.stack("woodPulp"), (int) (100.0f * pulpChance)); } public void addSqueezer(final IWoodType log, final ILiquidType liquid, final int amount) { diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index d1419e1c..2af0062e 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -108,14 +108,14 @@ public class WoodManager { if (plank instanceof IFenceProvider && plank == plank2 && type.isPlain()) { final ItemStack original = ((IFenceProvider) plank).getFence(); if (original != null) { - original.stackSize = amount; + original.setCount(amount); return original; } } final int ord = type.ordinal(); final int i = getPlankTypeIndex(plank) + 256 * ord; final ItemStack stack = TileEntityMetadata.getItemStack(ExtraTrees.blocks().blockMultiFence, i + 65536 * getPlankTypeIndex(plank2)); - stack.stackSize = amount; + stack.setCount(amount); return stack; } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java index a0de1a29..6b0919e4 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java @@ -18,6 +18,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -37,7 +38,7 @@ public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (final IPlankType type : WoodManager.getAllPlankTypes()) { final ItemStack gate = WoodManager.getGate(type); itemList.add(gate); diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index 10fd0c85..9043e28c 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -23,6 +23,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -42,7 +43,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (final IFenceProvider type : PlankType.ExtraTreePlanks.values()) { itemList.add(type.getFence()); } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java index 7fc6aef3..5720fa15 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java @@ -14,6 +14,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerFoliage; @@ -33,7 +34,7 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { } @Override - public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn) { + public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean p_185477_7_) { final boolean connectNegZ = this.canConnectFenceTo(world, pos.north()); final boolean connectPosZ = this.canConnectFenceTo(world, pos.south()); final boolean connectNegX = this.canConnectFenceTo(world, pos.west()); @@ -164,7 +165,7 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { + public void getSubBlocks(final Item item, final CreativeTabs tab, final NonNullList list) { for (int i = 0; i < 6; ++i) { for (int f = 0; f < 2; ++f) { list.add(new ItemStack(item, 1, i + f * 8)); diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index eb6d44e8..cc489037 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -10,6 +10,7 @@ import binnie.extratrees.block.WoodManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import java.util.List; @@ -19,7 +20,7 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata { } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (final FenceType type : FenceType.values()) { itemList.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1)); } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 621cb421..5fba51d3 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -6,6 +6,7 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -60,7 +61,7 @@ public class MultiFenceRecipeEmbedded implements IRecipe { } @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public NonNullList getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 9aef4a84..7d127d6a 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -6,6 +6,7 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -24,11 +25,11 @@ public class MultiFenceRecipeSize implements IRecipe { final List types = new ArrayList<>(); for (int i = 0; i < inv.getSizeInventory(); ++i) { final ItemStack stack = inv.getStackInSlot(i); - final IPlankType type = (stack == null) ? null : WoodManager.get(stack); - if (stack != null && type == null) { + final IPlankType type = (stack.isEmpty()) ? null : WoodManager.get(stack); + if (!stack.isEmpty() && type == null) { return false; } - if (stack == null) { + if (stack.isEmpty()) { pattern += " "; } else { if (!types.contains(type)) { @@ -76,6 +77,7 @@ public class MultiFenceRecipeSize implements IRecipe { return (this.cached == null) ? new ItemStack(Blocks.OAK_FENCE) : this.cached; } + // TODO: what is this? public static void generateTypes() { final int type = 0; for (int type2 = 0; type2 < 2; ++type2) { @@ -83,7 +85,7 @@ public class MultiFenceRecipeSize implements IRecipe { } @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public NonNullList getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 0dd71202..97100284 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -5,6 +5,7 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -23,8 +24,8 @@ public class MultiFenceRecipeSolid implements IRecipe { final ItemStack a = inv.getStackInSlot(row * 3); final ItemStack b = inv.getStackInSlot(row * 3 + 1); final ItemStack c = inv.getStackInSlot(row * 3 + 2); - if (a != null && b != null) { - if (c != null) { + if (!a.isEmpty() && !b.isEmpty()) { + if (!c.isEmpty()) { type = WoodManager.getFenceType(a); final FenceType type2 = WoodManager.getFenceType(b); final FenceType type3 = WoodManager.getFenceType(c); @@ -57,7 +58,7 @@ public class MultiFenceRecipeSolid implements IRecipe { } @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public NonNullList getRemainingItems(InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java index e857d27a..e486ef63 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java @@ -1,15 +1,12 @@ package binnie.extratrees.block.property; -import java.util.Collection; - -import javax.annotation.Nonnull; - -import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; - import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.PlankType; -import forestry.arboriculture.blocks.property.PropertyWoodType; +import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; +import forestry.arboriculture.blocks.PropertyWoodType; + +import java.util.Collection; public class PropertyETWoodType extends PropertyWoodType { diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java index 34404543..d4fc7975 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java @@ -1,19 +1,17 @@ package binnie.extratrees.block.wood; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import binnie.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; import forestry.api.core.IItemModelRegister; import forestry.api.core.IStateMapperRegister; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.blocks.fence.BlockForestryFence; +import forestry.arboriculture.blocks.BlockForestryFence; import net.minecraft.util.ResourceLocation; +import java.util.ArrayList; +import java.util.List; + public abstract class BlockETFence extends BlockForestryFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { public static List create(boolean fireproof) { List blocks = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java index 78290255..c12f9e2a 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java @@ -3,12 +3,11 @@ package binnie.extratrees.block.wood; import binnie.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; -import forestry.arboriculture.blocks.log.BlockForestryLog; -import forestry.arboriculture.blocks.property.PropertyWoodType; +import forestry.arboriculture.blocks.BlockForestryLog; +import forestry.arboriculture.blocks.PropertyWoodType; import net.minecraft.util.ResourceLocation; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; public abstract class BlockETLog extends BlockForestryLog { public static List create(boolean fireproof) { @@ -17,7 +16,7 @@ public abstract class BlockETLog extends BlockForestryLog { for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETLog block = new BlockETLog(fireproof, i) { - @Override + @Override public PropertyWoodType getVariant() { return variant; } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java index 02e8abc0..3f9af283 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java @@ -3,7 +3,7 @@ package binnie.extratrees.block.wood; import binnie.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; -import forestry.arboriculture.blocks.planks.BlockForestryPlanks; +import forestry.arboriculture.blocks.BlockForestryPlanks; import net.minecraft.util.ResourceLocation; import java.util.ArrayList; import java.util.List; @@ -18,7 +18,7 @@ public abstract class BlockETPlank extends BlockForestryPlanks { for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETPlank block = new BlockETPlank(fireproof, i) { - @Override + @Override public PropertyETWoodType getVariant() { return variant; } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java index c8d13a07..9bebebf6 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java @@ -3,9 +3,8 @@ package binnie.extratrees.block.wood; import binnie.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; -import forestry.arboriculture.blocks.slab.BlockForestrySlab; +import forestry.arboriculture.blocks.BlockForestrySlab; import net.minecraft.util.ResourceLocation; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -17,7 +16,7 @@ public abstract class BlockETSlab extends BlockForestrySlab { for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETSlab block = new BlockETSlab(fireproof, i) { - @Override + @Override public PropertyETWoodType getVariant() { return variant; } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index b8474ca0..97b8dcbe 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -9,6 +9,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -25,7 +26,7 @@ public class BlockCarpentryPanel extends BlockCarpentry { } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index d5d98b20..02199bb9 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -17,8 +17,8 @@ import forestry.api.core.ISpriteRegister; import forestry.api.core.IStateMapperRegister; import forestry.api.core.ITextureManager; import forestry.core.blocks.IColoredBlock; -import forestry.core.blocks.propertys.UnlistedBlockAccess; -import forestry.core.blocks.propertys.UnlistedBlockPos; +import forestry.core.blocks.properties.UnlistedBlockAccess; +import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.BlockModelEntry; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -34,6 +34,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -90,7 +91,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo public abstract ItemStack getCreativeStack(final IDesign p0); @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList itemList) { for (final IDesign design : CarpentryManager.carpentryInterface.getSortedDesigns()) { itemList.add(this.getCreativeStack(design)); } @@ -113,7 +114,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } @Override - public boolean canRenderInLayer(BlockRenderLayer layer) { + public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { return layer == BlockRenderLayer.CUTOUT_MIPPED; } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 1c2858f3..1a0abe9a 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -40,7 +40,7 @@ public class BlockStainedDesign extends BlockDesign { } @Override - public boolean canRenderInLayer(BlockRenderLayer layer) { + public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { return layer == BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index cb40add4..8bf8ae7d 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -21,10 +21,13 @@ import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; import forestry.core.genetics.alleles.AlleleCategorized; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -360,6 +363,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF } @Override + @SideOnly(Side.CLIENT) public void registerSprites() { if(this == Apple){ for(FruitSprite sprite : FruitSprite.VALUES){ @@ -396,42 +400,38 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Override public boolean trySpawnFruitBlock(ITreeGenome genome, World world, Random rand, BlockPos pos) { if(this.pod != null && world.rand.nextFloat() <= genome.getSappiness()){ - TreeManager.treeRoot.setFruitBlock(world, this, genome.getSappiness(), pos); + TreeManager.treeRoot.setFruitBlock(world, genome, this, genome.getSappiness(), pos); } return false; } @Override - public List getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { + public NonNullList getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { + NonNullList products = NonNullList.create(); if (this.pod != null) { if (ripeningTime >= 2) { - List products = new ArrayList(); for (Map.Entry product : this.products.entrySet()) { ItemStack single = product.getKey().copy(); - single.stackSize = 1; - for (int i = 0; i < product.getKey().stackSize; ++i) { + single.setCount(1); + for (int i = 0; i < product.getKey().getCount(); ++i) { if (world.rand.nextFloat() <= product.getValue()) { products.add(single.copy()); } } } - return products; } - return Collections.emptyList(); } else { - ArrayList products = new ArrayList(); float stage = this.getRipeningStage(ripeningTime); - if (stage < 0.5f) { - return Collections.emptyList(); - } - float modeYieldMod = 1.0f; - for (final Map.Entry product : this.products.entrySet()) { - if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * product.getValue() * 5.0f * stage) { - products.add(product.getKey().copy()); + if (stage >= 0.5f) { + float modeYieldMod = 1.0f; + for (final Map.Entry product : this.products.entrySet()) { + if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * product.getValue() * 5.0f * stage) { + products.add(product.getKey().copy()); + } } } - return products; } + return products; } @Nullable diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 5b480cf3..2696fc8e 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -5,6 +5,7 @@ import binnie.core.Mods; import binnie.core.resource.BinnieResource; import binnie.core.resource.ResourceType; import binnie.extratrees.ExtraTrees; +import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -17,12 +18,16 @@ import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterflyRoot; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.BiomeDictionary; +import javax.annotation.Nullable; +import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; +import java.util.Set; public enum ButterflySpecies implements IAlleleButterflySpecies { WhiteAdmiral("White Admiral", "Limenitis camilla", 16448250), @@ -48,12 +53,12 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { Monarch("Monarch", "Danaus plexippus", 16757254), MarbledWhite("Marbled White", "Melanargia galathea", 15527148); - String name; - String branchName; - String scientific; - BinnieResource texture; - public IClassification branch; - int colour; + private String name; + private String branchName; + private String scientific; + private BinnieResource texture; + private IClassification branch; + private int colour; private Map butterflyLoot; private Map caterpillarLoot; @@ -65,6 +70,22 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { this.scientific = scientific.split(" ")[1]; this.texture = Binnie.RESOURCE.getPNG(ExtraTrees.instance, ResourceType.Entity, this.toString()); this.colour = colour; + + final String uid = "trees." + branchName.toLowerCase(); + IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); + if (branch == null) { + branch = AlleleManager.alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); + } + this.branch = branch; + +// final String scientific = species2.branchName.substring(0, 1).toUpperCase() + species2.branchName.substring(1).toLowerCase(); +// final String uid = "trees." + species2.branchName.toLowerCase(); +// IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); +// if (branch == null) { +// branch = AlleleManager.alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); +// } +// (species2.branch = branch).addMemberSpecies(species2); + } @@ -115,6 +136,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { @Override public IClassification getBranch() { + Preconditions.checkState(this.branch != null, "branch has not been initialized yet"); return this.branch; } @@ -237,13 +259,16 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { } @Override - public ItemStack[] getResearchBounty(final World world, final GameProfile researcher, final IIndividual individual, final int bountyLevel) { - return new ItemStack[]{this.getRoot().getMemberStack(individual.copy(), EnumFlutterType.SERUM)}; + public NonNullList getResearchBounty(final World world, final GameProfile researcher, final IIndividual individual, final int bountyLevel) { + NonNullList bounty = NonNullList.create(); + ItemStack serum = this.getRoot().getMemberStack(individual.copy(), EnumFlutterType.SERUM); + bounty.add(serum); + return bounty; } @Override - public EnumSet getSpawnBiomes() { - return EnumSet.noneOf(BiomeDictionary.Type.class); + public Set getSpawnBiomes() { + return Collections.emptySet(); } @Override diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 74b5d8f8..ce9be4e6 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -2223,13 +2223,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT @Override public boolean setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos) { - boolean placed = world.setBlockState(pos, PluginArboriculture.blocks.leaves.getDefaultState()); + boolean placed = world.setBlockState(pos, PluginArboriculture.getBlocks().leaves.getDefaultState()); if (!placed) { return false; } Block block = world.getBlockState(pos).getBlock(); - if (PluginArboriculture.blocks.leaves != block) { + if (PluginArboriculture.getBlocks().leaves != block) { world.setBlockToAir(pos); return false; } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java deleted file mode 100644 index 6bd475ce..00000000 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java +++ /dev/null @@ -1,64 +0,0 @@ -package binnie.extratrees.genetics; - -import forestry.api.arboriculture.IAlleleGrowth; -import forestry.api.arboriculture.IGrowthProvider; -import forestry.api.arboriculture.ITreeGenome; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class ExtraTreeGrowthProvider implements IAlleleGrowth, IGrowthProvider { - @Override - public String getUID() { - return "extratrees.fruit." + this.toString().toLowerCase(); - } - - @Override - public boolean isDominant() { - return true; - } - - @Override - public IGrowthProvider getProvider() { - return this; - } - -// @Override -// public boolean canGrow(final ITreeGenome genome, final World world, final int xPos, final int yPos, final int zPos, final int expectedGirth, final int expectedHeight) { -// return false; -// } -// -// @Override -// public EnumGrowthConditions getGrowthConditions(final ITreeGenome genome, final World world, final int xPos, final int yPos, final int zPos) { -// return null; -// } - - @Nullable - @Override - public BlockPos canGrow(ITreeGenome genome, World world, BlockPos pos, int expectedGirth, int expectedHeight) { - return null; - } - - @Override - @Nullable - public String getDescription() { - return null; - } - - @Override - @Nullable - public String[] getInfo() { - return null; - } - - @Override - public String getName() { - return this.getProvider().getDescription(); - } - - @Override - public String getUnlocalizedName() { - return this.getUID(); - } -} diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 30cc6f4c..46da3489 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -38,13 +38,7 @@ public class ModuleGenetics implements IInitializable { for (final ButterflySpecies species2 : ButterflySpecies.values()) { //AlleleManager.alleleRegistry.registerAllele(species2); Binnie.GENETICS.getButterflyRoot().registerTemplate(species2.getTemplate()); - final String scientific = species2.branchName.substring(0, 1).toUpperCase() + species2.branchName.substring(1).toLowerCase(); - final String uid = "trees." + species2.branchName.toLowerCase(); - IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); - if (branch == null) { - branch = AlleleManager.alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); - } - (species2.branch = branch).addMemberSpecies(species2); + species2.getBranch().addMemberSpecies(species2); } } } diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 3fcfe70e..ba62f535 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -123,15 +123,15 @@ public enum Food implements IItemMiscProvider { } public void addJuice(final Juice juice, final int time, final int amount, final int mulch) { - RecipeManagers.squeezerManager.addRecipe(time, new ItemStack[]{this.get(1)}, Fluids.JUICE.getFluid(amount), Mods.Forestry.stack("mulch"), mulch); + RecipeManagers.squeezerManager.addRecipe(time, this.get(1), Fluids.JUICE.getFluid(amount), Mods.Forestry.stack("mulch"), mulch); } public void addJuice(final int time, final int amount, final int mulch) { - RecipeManagers.squeezerManager.addRecipe(time, new ItemStack[]{this.get(1)}, Fluids.JUICE.getFluid(amount), Mods.Forestry.stack("mulch"), mulch); + RecipeManagers.squeezerManager.addRecipe(time, this.get(1), Fluids.JUICE.getFluid(amount), Mods.Forestry.stack("mulch"), mulch); } public void addOil(final int time, final int amount, final int mulch) { - RecipeManagers.squeezerManager.addRecipe(time, new ItemStack[]{this.get(1)}, Fluids.SEED_OIL.getFluid(amount), Mods.Forestry.stack("mulch"), mulch); + RecipeManagers.squeezerManager.addRecipe(time, this.get(1), Fluids.SEED_OIL.getFluid(amount), Mods.Forestry.stack("mulch"), mulch); } public static void registerOreDictionary() { diff --git a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java index 488d8803..45e2051b 100644 --- a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java @@ -11,6 +11,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -39,7 +40,7 @@ public class ItemArboristDatabase extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { super.getSubItems(par1, par2CreativeTabs, par3List); par3List.add(new ItemStack(par1, 1, 1)); } @@ -52,13 +53,16 @@ public class ItemArboristDatabase extends Item implements IItemModelRegister { } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + final ItemStack itemStack = playerIn.getHeldItem(handIn); + final ExtraTreesGUID id; if (itemStack.getItemDamage() == 0) { - ExtraTrees.proxy.openGui(ExtraTreesGUID.Database, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + id = ExtraTreesGUID.Database; } else { - ExtraTrees.proxy.openGui(ExtraTreesGUID.DatabaseNEI, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + id = ExtraTreesGUID.DatabaseNEI; } - return super.onItemRightClick(itemStack, world, player, hand); + ExtraTrees.proxy.openGui(id, playerIn, playerIn.getPosition()); + return super.onItemRightClick(worldIn, playerIn, handIn); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemETFood.java b/src/main/java/binnie/extratrees/item/ItemETFood.java index 86ce01c8..af69c637 100644 --- a/src/main/java/binnie/extratrees/item/ItemETFood.java +++ b/src/main/java/binnie/extratrees/item/ItemETFood.java @@ -9,6 +9,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -28,7 +29,7 @@ public class ItemETFood extends ItemFood implements IItemModelRegister { @SideOnly(Side.CLIENT) @Override - public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) { + public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) { for (IItemMiscProvider item : this.items) { if (item.isActive()) { subItems.add(this.getStack(item, 1)); diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 02d8f6f7..5a8cba87 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -11,6 +11,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -46,19 +47,24 @@ public class ItemMothDatabase extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { super.getSubItems(par1, par2CreativeTabs, par3List); par3List.add(new ItemStack(par1, 1, 1)); } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { - if (itemStack.getItemDamage() == 0) { - ExtraTrees.proxy.openGui(ExtraTreesGUID.MothDatabase, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + final ItemStack itemStack = playerIn.getHeldItem(handIn); + final ExtraTreesGUID id; + if (itemStack.getMetadata() == 0) { + id = ExtraTreesGUID.MothDatabase; } else { - ExtraTrees.proxy.openGui(ExtraTreesGUID.MothDatabaseNEI, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + id = ExtraTreesGUID.MothDatabaseNEI; } - return super.onItemRightClick(itemStack, world, player, hand); + + ExtraTrees.proxy.openGui(id, playerIn, playerIn.getPosition()); + + return super.onItemRightClick(worldIn, playerIn, handIn); } @Override diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 7610cf2d..8c62f971 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -16,7 +16,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -152,11 +151,7 @@ public class ModuleItems implements IInitializable { if (Binnie.LIQUID.getFluidStack("Creosote Oil", 100) != null) { RecipeManagers.carpenterManager.addRecipe(25, Binnie.LIQUID.getFluidStack("Creosote Oil", 50), null, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); } - for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (data.fluid.isFluidEqual(Binnie.LIQUID.getFluidStack("water", 0)) && data.fluid.amount == 1000) { - CraftingManager.getInstance().addRecipe(Mods.Forestry.stack("mulch"), " b ", "bwb", " b ", 'b', ExtraTreeItems.Bark.get(1), 'w', data.filledContainer.copy()); - } - } + FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Sap.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Sap.get(1).getFluid(), 20, 10000, 1)); FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Resin.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Resin.get(1).getFluid(), 30, 10000, 1)); for (EnumETLog log : EnumETLog.values()) { diff --git a/src/main/java/binnie/extratrees/machines/Designer.java b/src/main/java/binnie/extratrees/machines/Designer.java index ed8deffc..c8faf734 100644 --- a/src/main/java/binnie/extratrees/machines/Designer.java +++ b/src/main/java/binnie/extratrees/machines/Designer.java @@ -148,10 +148,10 @@ public abstract class Designer { if (playerInv.getItemStack() == null) { playerInv.setItemStack(this.doRecipe(true)); } else if (playerInv.getItemStack().isItemEqual(recipe) && ItemStack.areItemStackTagsEqual(playerInv.getItemStack(), recipe)) { - final int fit = recipe.getMaxStackSize() - (recipe.stackSize + playerInv.getItemStack().stackSize); + final int fit = recipe.getMaxStackSize() - (recipe.getCount() + playerInv.getItemStack().getCount()); if (fit >= 0) { this.doRecipe(true); - recipe.stackSize += playerInv.getItemStack().stackSize; + recipe.grow(playerInv.getItemStack().getCount()); playerInv.setItemStack(recipe); } } diff --git a/src/main/java/binnie/extratrees/machines/DesignerType.java b/src/main/java/binnie/extratrees/machines/DesignerType.java index 02a377b8..2c233762 100644 --- a/src/main/java/binnie/extratrees/machines/DesignerType.java +++ b/src/main/java/binnie/extratrees/machines/DesignerType.java @@ -48,7 +48,7 @@ public enum DesignerType { stackSize = 1; } final ItemStack stack = ModuleCarpentry.getItemStack(this.getBlock(), type1, type2, design); - stack.stackSize = stackSize; + stack.setCount(stackSize); return stack; } diff --git a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java index 778a79ad..5a833bf9 100644 --- a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java +++ b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java @@ -32,7 +32,7 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu @Override public World getWorld() { - return this.worldObj; + return this.world; } diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java index 295158ad..180ad67b 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java @@ -26,13 +26,13 @@ public class BreweryCrafting implements INbtWritable { public static BreweryCrafting create(final NBTTagCompound nbt) { FluidStack inputFluid = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("fluid")); - ItemStack ingredient = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("ingr")); + ItemStack ingredient = new ItemStack(nbt.getCompoundTag("ingr")); ItemStack[] inputGrains = new ItemStack[] { - ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in1")), - ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in2")), - ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in3")) + new ItemStack(nbt.getCompoundTag("in1")), + new ItemStack(nbt.getCompoundTag("in2")), + new ItemStack(nbt.getCompoundTag("in3")) }; - ItemStack yeast = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("yeast")); + ItemStack yeast = new ItemStack(nbt.getCompoundTag("yeast")); return new BreweryCrafting(inputFluid, ingredient, inputGrains, yeast); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index 9d9fb198..0838aa78 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -58,7 +58,6 @@ public class PageSpeciesTreeGenome extends PageSpecies { final int th = 14; final int th2 = 18; final BreedingSystem syst = Binnie.GENETICS.treeBreedingSystem; - new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.PLANT) + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MiddleLeft); y += th; new ControlText(contents, new IArea(0, y, w2, th), BinnieCore.getBinnieProxy().localise("gui.temperature.short") + " : ", TextJustification.MiddleRight); @@ -94,9 +93,6 @@ public class PageSpeciesTreeGenome extends PageSpecies { display.setTooltip(); y += th2; } - new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.GROWTH) + " : ", TextJustification.MiddleRight); - //new ControlText(contents, new IArea(w2, y, w3, th), genome.getGrowthProvider().getDescription(), TextJustification.MiddleLeft); - y += th; new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.HEIGHT) + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), genome.getHeight() + "x", TextJustification.MiddleLeft); y += th; diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java index 1ad37f64..306caff7 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java @@ -25,7 +25,7 @@ public class LumbermillLogic extends ComponentProcessSetCost implements IProcess final ItemStack plankResult = LumbermillRecipes.getPlankProduct(logStack); if (!this.getUtil().isSlotEmpty(LumbermillMachine.SLOT_PLANKS) && plankResult != null) { final ItemStack currentPlank = this.getUtil().getStack(LumbermillMachine.SLOT_PLANKS); - if (!plankResult.isItemEqual(currentPlank) || plankResult.stackSize + currentPlank.stackSize > currentPlank.getMaxStackSize()) { + if (!plankResult.isItemEqual(currentPlank) || plankResult.getCount() + currentPlank.getCount() > currentPlank.getMaxStackSize()) { return new ErrorState.NoSpace("No room for new planks", new int[]{LumbermillMachine.SLOT_PLANKS}); } } diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java index 169ca82d..aacdcda0 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java @@ -59,7 +59,7 @@ public class LumbermillRecipes { for (IWoodType woodType : registeredWoodTypes) { ItemStack logStack = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.LOG, false); ItemStack logCopy = logStack.copy(); - logCopy.stackSize = 1; + logCopy.setCount(1); fakeCraftingInventory.clear(); fakeCraftingInventory.setInventorySlotContents(0, logCopy); @@ -70,7 +70,7 @@ public class LumbermillRecipes { if (OreDictionaryUtil.hasOreId(recipeOutput, plankOreId)) { Item logItem = logCopy.getItem(); ItemStack outputCopy = recipeOutput.copy(); - outputCopy.stackSize = (int) Math.ceil(outputCopy.stackSize * 1.5f); // turns stack of 4 up to 6 + outputCopy.setCount((int) Math.ceil(outputCopy.getCount() * 1.5f)); // turns stack of 4 up to 6 recipes.put(logItem, Pair.of(logCopy, outputCopy)); } } diff --git a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java index c3712a94..caae28a7 100644 --- a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java @@ -19,7 +19,10 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ModelETDecorativeLeaves extends ModelBlockCached { public ModelETDecorativeLeaves() { super(BlockETDecorativeLeaves.class); @@ -57,35 +60,33 @@ public class ModelETDecorativeLeaves extends ModelBlockCached biomes = new ArrayList<>(); for (final Biome biome : Biome.EXPLORATION_BIOMES_LIST) { //TODO check - if (biome != null) { - if (BiomeDictionary.isBiomeRegistered(biome)) { - if (biome != Biomes.FROZEN_OCEAN) { - if (Tolerance.canTolerate(temp, EnumTemperature.getFromBiome(biome), tempTol)) { - if (Tolerance.canTolerate(humid, EnumHumidity.getFromValue(biome.getRainfall()), humidTol)) { - boolean match = false; - for (final Biome eBiome : biomes) { - if (biome.getBiomeName().contains(eBiome.getBiomeName()) && EnumHumidity.getFromValue(eBiome.getRainfall()) == EnumHumidity.getFromValue(biome.getRainfall()) && EnumTemperature.getFromBiome(eBiome) == EnumTemperature.getFromBiome(biome)) { - match = true; - } - } - if (!match) { - biomes.add(biome); - } - } - } + if (biome != null && + biome != Biomes.FROZEN_OCEAN && + Tolerance.canTolerate(temp, EnumTemperature.getFromBiome(biome), tempTol) && + Tolerance.canTolerate(humid, EnumHumidity.getFromValue(biome.getRainfall()), humidTol)) { + boolean match = false; + for (final Biome eBiome : biomes) { + if (biome.getBiomeName().contains(eBiome.getBiomeName()) && EnumHumidity.getFromValue(eBiome.getRainfall()) == EnumHumidity.getFromValue(biome.getRainfall()) && EnumTemperature.getFromBiome(eBiome) == EnumTemperature.getFromBiome(biome)) { + match = true; } } + if (!match) { + biomes.add(biome); + } } } final int maxBiomePerLine = (this.w() + 2 - 16) / 18; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java index c97b1765..f3e2d84f 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java @@ -206,7 +206,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { dy += 18; } final FluidStack fluid = FluidUtil.getFluidContained(soilStack); - soilStack.stackSize = 1; + soilStack.setCount(1); final ControlItemDisplay display = new ControlItemDisplay(this, biomeListX + dx, y + dy, soilStack, fluid == null); if (fluid != null) { display.addTooltip(fluid.getLocalizedName()); diff --git a/src/main/java/binnie/genetics/gui/ControlBiome.java b/src/main/java/binnie/genetics/gui/ControlBiome.java index ee58d9f0..8531f1ec 100644 --- a/src/main/java/binnie/genetics/gui/ControlBiome.java +++ b/src/main/java/binnie/genetics/gui/ControlBiome.java @@ -21,40 +21,40 @@ public class ControlBiome extends Control implements ITooltip { @Override public void onRenderBackground(int guiWidth, int guiHeight) { - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.MOUNTAIN)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.MOUNTAIN)) { this.iconCategory = "hills"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.HILLS)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.HILLS)) { this.iconCategory = "hills"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.SANDY)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.SANDY)) { this.iconCategory = "desert"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.SNOWY)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.SNOWY)) { this.iconCategory = "snow"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.FOREST)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.FOREST)) { this.iconCategory = "forest"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.SWAMP)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.SWAMP)) { this.iconCategory = "swamp"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.JUNGLE)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.JUNGLE)) { this.iconCategory = "jungle"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.COLD) && BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.FOREST)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.COLD) && BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.FOREST)) { this.iconCategory = "taiga"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.MUSHROOM)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.MUSHROOM)) { this.iconCategory = "mushroom"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.OCEAN)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.OCEAN)) { this.iconCategory = "ocean"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.NETHER)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.NETHER)) { this.iconCategory = "nether"; } - if (BiomeDictionary.isBiomeOfType(this.biome, BiomeDictionary.Type.END)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.END)) { this.iconCategory = "end"; } // final IIcon icon = TextureManager.getInstance().getDefault("habitats/" + this.iconCategory); diff --git a/src/main/java/binnie/genetics/gui/ControlChromosome.java b/src/main/java/binnie/genetics/gui/ControlChromosome.java index 00b32627..794a554e 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlChromosome.java @@ -16,6 +16,8 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.EnumButterflyChromosome; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -64,14 +66,11 @@ public class ControlChromosome extends Control implements IControlValue> inputs = ingredients.getInputs(ItemStack.class); - itemStacks.set(0, inputs.get(0)); - itemStacks.set(1, inputs.get(1)); - itemStacks.set(2, ingredients.getOutputs(ItemStack.class)); + itemStacks.set(ingredients); } } diff --git a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java index 4ebac0b0..1b854cf3 100644 --- a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java @@ -8,9 +8,12 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.awt.Color; import java.util.Arrays; +import java.util.Collections; import java.util.List; public class DatabaseRecipeWrapper extends BlankRecipeWrapper { @@ -26,6 +29,7 @@ public class DatabaseRecipeWrapper extends BlankRecipeWrapper { } @Override + @SideOnly(Side.CLIENT) public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { IDrawable arrow = GeneticsJeiPlugin.drawables.getArrow(); arrow.draw(minecraft, 60, 4); @@ -42,6 +46,6 @@ public class DatabaseRecipeWrapper extends BlankRecipeWrapper { new ItemStack(Genetics.database) )); - ingredients.setOutputs(ItemStack.class, outputs); + ingredients.setOutputLists(ItemStack.class, Collections.singletonList(outputs)); } } diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java index edde3a47..9d622913 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java @@ -12,11 +12,6 @@ public class IncubatorRecipeHandler implements IRecipeHandler return IIncubatorRecipe.class; } - @Override - public String getRecipeCategoryUid() { - return RecipeUids.INCUBATOR; - } - @Override public String getRecipeCategoryUid(IIncubatorRecipe recipe) { return RecipeUids.INCUBATOR; diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index 8a941e61..bf0cc830 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -26,9 +26,9 @@ public class ItemAnalyst extends ItemCore { } @Override - public ActionResult onItemRightClick(ItemStack itemStackIn, World world, EntityPlayer player, EnumHand hand) { - Genetics.proxy.openGui(GeneticsGUI.Analyst, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); - return super.onItemRightClick(itemStackIn, world, player, hand); + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + Genetics.proxy.openGui(GeneticsGUI.Analyst, playerIn, playerIn.getPosition()); + return super.onItemRightClick(worldIn, playerIn, handIn); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index b09d347e..f06f9a84 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -11,6 +11,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -36,19 +37,20 @@ public class ItemDatabase extends ItemCore { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) { + public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) { super.getSubItems(itemIn, tab, subItems); subItems.add(new ItemStack(itemIn, 1, 1)); } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World worldIn, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + final ItemStack itemStack = playerIn.getHeldItem(handIn); if (itemStack.getItemDamage() == 0) { - Genetics.proxy.openGui(GeneticsGUI.Database, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + Genetics.proxy.openGui(GeneticsGUI.Database, playerIn, playerIn.getPosition()); } else { - Genetics.proxy.openGui(GeneticsGUI.DatabaseNEI, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); + Genetics.proxy.openGui(GeneticsGUI.DatabaseNEI, playerIn, playerIn.getPosition()); } - return super.onItemRightClick(itemStack, worldIn, player, hand); + return super.onItemRightClick(worldIn, playerIn, handIn); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index 59d76b2a..9101c388 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -8,6 +8,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -61,7 +62,7 @@ public abstract class ItemGene extends ItemCore { public abstract String getItemStackDisplayName(final ItemStack p0); @Override - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { } @Nullable diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index fe3029a8..d8336f97 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -26,9 +26,9 @@ public class ItemMasterRegistry extends ItemCore { } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { - Genetics.proxy.openGui(GeneticsGUI.MasterRegistry, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); - return super.onItemRightClick(itemStack, world, player, hand); + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + Genetics.proxy.openGui(GeneticsGUI.MasterRegistry, playerIn, playerIn.getPosition()); + return super.onItemRightClick(worldIn, playerIn, handIn); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index 5b62cac9..a91dcfaf 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -26,9 +26,9 @@ public class ItemRegistry extends ItemCore { } @Override - public ActionResult onItemRightClick(ItemStack itemStackIn, World world, EntityPlayer player, EnumHand hand) { - Genetics.proxy.openGui(GeneticsGUI.Registry, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ)); - return super.onItemRightClick(itemStackIn, world, player, hand); + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { + Genetics.proxy.openGui(GeneticsGUI.Registry, playerIn, playerIn.getPosition()); + return super.onItemRightClick(worldIn, playerIn, handIn); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index b92748f2..4a96668a 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -73,7 +74,7 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar // } @Override - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { final IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows"); itemList.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.GENETICS.getBeeRoot()), false)); } diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index aed525df..ed49cdb5 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -17,6 +17,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -47,7 +48,7 @@ public class ItemSerum extends ItemGene implements IItemSerum { } @Override - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { final Map> chromosomeMap = Binnie.GENETICS.getChromosomeMap(root); for (final Map.Entry> entry : chromosomeMap.entrySet()) { diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 8f1ae755..67841cdd 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -83,7 +84,7 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { } @Override - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { for (final IIndividual template : root.getIndividualTemplates()) { if (template.getGenome().getPrimary().isSecret()) { diff --git a/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java b/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java index 2a270c7b..3e386c82 100644 --- a/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java +++ b/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java @@ -45,24 +45,22 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } @Override - @Nullable public ItemStack getStackInSlot(final int index) { if (index >= 0 && index < this.indexerInventory.size()) { return this.indexerInventory.get(index); } - return null; + return ItemStack.EMPTY; } @Override - @Nullable public ItemStack decrStackSize(final int index, final int amount) { ItemStack stackInSlot = this.getStackInSlot(index); - if (stackInSlot != null) { + if (!stackInSlot.isEmpty()) { final ItemStack returnStack = stackInSlot.copy(); - this.setInventorySlotContents(index, null); + this.setInventorySlotContents(index, ItemStack.EMPTY); return returnStack; } - return null; + return ItemStack.EMPTY; } @Override @@ -72,10 +70,10 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } @Override - public void setInventorySlotContents(final int index, @Nullable final ItemStack itemStack) { + public void setInventorySlotContents(final int index, final ItemStack itemStack) { if (index >= 0 && index < this.indexerInventory.size()) { this.indexerInventory.set(index, itemStack); - } else if (itemStack != null) { + } else if (!itemStack.isEmpty()) { this.indexerInventory.add(itemStack); } this.needsSorting = true; @@ -98,7 +96,7 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } @Override - public boolean isUseableByPlayer(final EntityPlayer var1) { + public boolean isUsableByPlayer(final EntityPlayer var1) { return true; } @@ -140,7 +138,7 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im this.indexerInventory.clear(); for (int i = 0; i < indexerNBT.tagCount(); ++i) { final NBTTagCompound itemNBT = indexerNBT.getCompoundTagAt(i); - this.setInventorySlotContents(i, ItemStack.loadItemStackFromNBT(itemNBT)); + this.setInventorySlotContents(i, new ItemStack(itemNBT)); } this.needsSorting = true; this.markDirty(); @@ -271,10 +269,14 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } - @Nullable + @Override + public boolean isEmpty() { + return this.sortedInventory.isEmpty(); + } + @Override public ItemStack removeStackFromSlot(int index) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index 8029dc66..f9f463be 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -77,7 +77,7 @@ public enum LaboratoryMachine implements IMachineType { @Override public void readFromNBT(final NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); - this.stack = ItemStack.loadItemStackFromNBT(nbttagcompound.getCompoundTag("Item")); + this.stack = new ItemStack(nbttagcompound.getCompoundTag("Item")); } @Override @@ -108,15 +108,15 @@ public enum LaboratoryMachine implements IMachineType { final float f = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; final float f2 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; final float f3 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; - if (this.stack.stackSize == 0) { - this.stack.stackSize = 1; + if (this.stack.getCount() == 0) { + this.stack.setCount(1); } final EntityItem entityitem = new EntityItem(this.getMachine().getWorld(), this.getMachine().getTileEntity().getPos().getX() + f, this.getMachine().getTileEntity().getPos().getY() + f2, this.getMachine().getTileEntity().getPos().getZ() + f3, this.stack.copy()); final float accel = 0.05f; entityitem.motionX = (float) this.getMachine().getWorld().rand.nextGaussian() * accel; entityitem.motionY = (float) this.getMachine().getWorld().rand.nextGaussian() * accel + 0.2f; entityitem.motionZ = (float) this.getMachine().getWorld().rand.nextGaussian() * accel; - this.getMachine().getWorld().spawnEntityInWorld(entityitem); + this.getMachine().getWorld().spawnEntity(entityitem); } } @@ -134,7 +134,7 @@ public enum LaboratoryMachine implements IMachineType { // final double d3 = world.rand.nextFloat() * f + (1.0f - f) * 0.5; // final EntityItem entityitem = new EntityItem(world, x + d0, y + d2, z + d3, this.stack); // entityitem.delayBeforeCanPickup = 10; -// world.spawnEntityInWorld(entityitem); +// world.spawnEntity(entityitem); // this.stack = null; // ((IToolWrench) player.getHeldItem().getItem()).wrenchUsed(player, x, y, z); // this.getUtil().refreshBlock(); @@ -161,7 +161,7 @@ public enum LaboratoryMachine implements IMachineType { // if (this.stack == null && validSelections.contains(player.getHeldItem().getItem())) { // this.stack = player.getHeldItem().copy(); // final ItemStack heldItem = player.getHeldItem(); -// --heldItem.stackSize; +// heldItem.shrink(1); // world.markBlockForUpdate(x, y, z); // return; // } diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index d20b397a..ea1a59d4 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -21,7 +21,7 @@ public class MachineRendererLab { private long lastTick; public MachineRendererLab() { - World world = Minecraft.getMinecraft().theWorld; + World world = Minecraft.getMinecraft().world; this.dummyEntityItem = new EntityItem(world); this.itemSides = new EntityItem[]{new EntityItem(world), new EntityItem(world), new EntityItem(world), new EntityItem(world)}; } @@ -46,7 +46,7 @@ public class MachineRendererLab { BinnieCore.getBinnieProxy().getMinecraftInstance(); if (Minecraft.isFancyGraphicsEnabled()) { final ItemStack stack = holder.getStack(); - this.dummyEntityItem.worldObj = world; + this.dummyEntityItem.world = world; this.dummyEntityItem.setEntityItemStack(stack); if (world.getTotalWorldTime() != this.lastTick) { this.lastTick = world.getTotalWorldTime(); @@ -70,7 +70,7 @@ public class MachineRendererLab { int rot = 0; for (EntityItem item : this.itemSides) { GlStateManager.pushMatrix(); - item.worldObj = world; + item.world = world; item.setEntityItemStack(stack); GlStateManager.rotate(rot, 0.0f, 1.0f, 0.0f); GlStateManager.rotate(180.0f, 1.0f, 0.0f, 0.0f); diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java index 19e9dd53..1375e42a 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java @@ -45,7 +45,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, this.motionY = 0.0; this.particleMaxAge = 25; this.particleGravity = 0.05f; - this.field_190017_n = true; + this.canCollide = true; this.setRBGColorF(0.6f, 0.0f, 1.0f); } @@ -70,7 +70,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, return; } final ItemStack stack = this.getUtil().getStack(6); - this.dummyEntityItem.worldObj = this.getMachine().getWorld(); + this.dummyEntityItem.world = this.getMachine().getWorld(); this.dummyEntityItem.setEntityItemStack(stack); final EntityItem dummyEntityItem = this.dummyEntityItem; dummyEntityItem.setAgeToCreativeDespawnTime(); //++dummyEntityItem.age; @@ -102,7 +102,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, @Override public void syncFromNBT(final NBTTagCompound nbt) { if (nbt.hasKey("item")) { - this.getUtil().setStack(6, ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("item"))); + this.getUtil().setStack(6, new ItemStack(nbt.getCompoundTag("item"))); } else { this.getUtil().setStack(6, null); } diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index ad782b60..3055fab6 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -56,7 +56,7 @@ public class ControlGene extends Control implements IControlValue, IToolt } private boolean canFill(final ItemStack stack) { - return stack != null && stack.stackSize == 1 && Engineering.isGeneAcceptor(stack) && Engineering.canAcceptGene(stack, this.getValue()); + return stack != null && stack.getCount() == 1 && Engineering.isGeneAcceptor(stack) && Engineering.canAcceptGene(stack, this.getValue()); } @Override diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java index 7175dbed..938711af 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java @@ -35,7 +35,7 @@ public class GenepoolFX extends MachineComponent implements IRender.DisplayTick this.motionY = this.rand.nextFloat() * 0.01; this.particleMaxAge = 25; this.particleGravity = 0.0f; - this.field_190017_n = true; + this.canCollide = true; this.setRBGColorF(0.4f + 0.6f * this.rand.nextFloat(), 0.6f * this.rand.nextFloat(), 0.6f + 0.4f * this.rand.nextFloat()); } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java index ff38a562..1cb18e36 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java @@ -35,7 +35,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 0.92, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; - double angle = (int) (this.worldObj.getTotalWorldTime() % 4L) * 0.5 * 3.1415; + double angle = (int) (this.world.getTotalWorldTime() % 4L) * 0.5 * 3.1415; { this.axisX = 0.0; @@ -46,7 +46,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic this.motionY = 0.007 + this.rand.nextDouble() * 0.002; this.particleMaxAge = 240; this.particleGravity = 0.0f; - this.field_190017_n = true; + this.canCollide = true; this.setRBGColorF(0.8f, 0.0f, 1.0f); } @@ -81,7 +81,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic return; } final ItemStack stack = this.getUtil().getStack(9); - this.dummyEntityItem.worldObj = this.getMachine().getWorld(); + this.dummyEntityItem.world = this.getMachine().getWorld(); this.dummyEntityItem.setEntityItemStack(stack); final EntityItem dummyEntityItem = this.dummyEntityItem; dummyEntityItem.setAgeToCreativeDespawnTime(); // ++dummyEntityItem.age; @@ -113,7 +113,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic @Override public void syncFromNBT(final NBTTagCompound nbt) { if (nbt.hasKey("item")) { - this.getUtil().setStack(9, ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("item"))); + this.getUtil().setStack(9, new ItemStack(nbt.getCompoundTag("item"))); } else { this.getUtil().setStack(9, null); } diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java b/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java index 9aee8e3e..f6691c57 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java @@ -34,7 +34,7 @@ public class IsolaterFX extends MachineComponent implements IRender.RandomDispla this.motionY = -0.012; this.particleMaxAge = 100; this.particleGravity = 0.0f; - this.field_190017_n = true; + this.canCollide = true; this.setRBGColorF(0.8f, 0.4f, 0.0f); } @@ -60,7 +60,7 @@ public class IsolaterFX extends MachineComponent implements IRender.RandomDispla BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; - double angle = 0.7 + (int) (this.worldObj.getTotalWorldTime() % 2L) * 3.1415; + double angle = 0.7 + (int) (this.world.getTotalWorldTime() % 2L) * 3.1415; { this.axisX = 0.0; @@ -71,7 +71,7 @@ public class IsolaterFX extends MachineComponent implements IRender.RandomDispla this.motionY = 0.012; this.particleMaxAge = 100; this.particleGravity = 0.0f; - this.field_190017_n = true; + this.canCollide = true; this.setRBGColorF(0.8f, 0.0f, 1.0f); } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java index 0d743680..ec01df51 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java @@ -25,7 +25,7 @@ public class PolymeriserFX extends MachineComponent implements IRender.DisplayTi BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.8, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; - double angle = 0.7 + (int) (this.worldObj.getTotalWorldTime() % 2L) * 3.1415; + double angle = 0.7 + (int) (this.world.getTotalWorldTime() % 2L) * 3.1415; { this.axisX = 0.0; @@ -36,7 +36,7 @@ public class PolymeriserFX extends MachineComponent implements IRender.DisplayTi this.motionY = -0.006; this.particleMaxAge = 140; this.particleGravity = 0.0f; - this.field_190017_n = true; + this.canCollide = true; this.setRBGColorF(0.8f, 0.0f, 1.0f); } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java index 49eaf7c7..437f3c5a 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java @@ -37,7 +37,7 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl this.motionY = 0.0; this.particleMaxAge = 200; this.particleGravity = 0.0f; - this.field_190017_n = true; + this.canCollide = true; this.setRBGColorF(0.6f + this.rand.nextFloat() * 0.2f, 1.0f, 0.8f * this.rand.nextFloat() * 0.2f); } @@ -73,7 +73,7 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl this.motionY = 0.012; this.particleMaxAge = 50; this.particleGravity = 0.0f; - this.field_190017_n = true; + this.canCollide = true; this.particleScale = 2.0f; //TODO: Add sprites //this.setParticleIcon((new BinnieIcon[] { Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, Sequencer.fxSeqT })[this.rand.nextInt(4)].getIcon()); diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java index fa54786a..f04de1e9 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java @@ -54,7 +54,7 @@ public class SequencerLogic extends ComponentProcess implements IProcess { return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.sequencer.errors.insufficient.dye"), Sequencer.SLOT_DYE); } ItemStack stackDone = this.getUtil().getStack(Sequencer.SLOT_DONE); - if (stackDone != null && stackDone.stackSize >= 64) { + if (stackDone != null && stackDone.getCount() >= 64) { return new ErrorState.NoSpace(Genetics.proxy.localise("machine.machine.sequencer.errors.no.space"), new int[]{Sequencer.SLOT_DONE}); } return super.canProgress(); diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java index 32c8c8ce..0435cee5 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java @@ -35,7 +35,7 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { double axisX = this.posX; double axisZ = this.posZ; - double angle = (int) (this.worldObj.getTotalWorldTime() % 4L) * 0.5 * 3.1415; + double angle = (int) (this.world.getTotalWorldTime() % 4L) * 0.5 * 3.1415; { this.axisX = 0.0; @@ -46,11 +46,12 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, this.motionY = (this.rand.nextDouble() - 0.5) * 0.02; this.particleMaxAge = 240; this.particleGravity = 0.0f; - this.field_190017_n = true; + this.canCollide = true; this.setRBGColorF(0.3f + this.rand.nextFloat() * 0.5f, 0.3f + this.rand.nextFloat() * 0.5f, 0.0f); } @Override + @SideOnly(Side.CLIENT) public void onUpdate() { super.onUpdate(); final double speed = 0.04; @@ -75,7 +76,7 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, return; } final ItemStack stack = this.getUtil().getStack(9); - this.dummyEntityItem.worldObj = this.getMachine().getWorld(); + this.dummyEntityItem.world = this.getMachine().getWorld(); this.dummyEntityItem.setEntityItemStack(stack); final EntityItem dummyEntityItem = this.dummyEntityItem; dummyEntityItem.setAgeToCreativeDespawnTime(); //++dummyEntityItem.age; @@ -107,7 +108,7 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, @Override public void syncFromNBT(final NBTTagCompound nbt) { if (nbt.hasKey("item")) { - this.getUtil().setStack(9, ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("item"))); + this.getUtil().setStack(9, new ItemStack(nbt.getCompoundTag("item"))); } else { this.getUtil().setStack(9, null); }