diff --git a/src/main/java/binnie/Constants.java b/src/main/java/binnie/Constants.java index 1a1033ba..befe139b 100644 --- a/src/main/java/binnie/Constants.java +++ b/src/main/java/binnie/Constants.java @@ -13,5 +13,4 @@ public final class Constants { public static final String LIQUID_CREOSOTE = "Creosote Oil"; public static final String LIQUID_BIO_ETHANOL = "bioethanol"; public static final String LIQUID_FOR_HONEY = "for.honey"; - } diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 095f8d4e..51652490 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -16,7 +16,12 @@ import binnie.botany.flower.BlockFlower; import binnie.botany.flower.ItemBotany; import binnie.botany.flower.ItemInsulatedTube; import binnie.botany.flower.TileEntityFlower; -import binnie.botany.gardening.*; +import binnie.botany.gardening.BlockPlant; +import binnie.botany.gardening.BlockSoil; +import binnie.botany.gardening.Gardening; +import binnie.botany.gardening.ItemSoilMeter; +import binnie.botany.gardening.ItemTrowel; +import binnie.botany.gardening.ModuleGardening; import binnie.botany.genetics.ItemDictionary; import binnie.botany.genetics.ModuleGenetics; import binnie.botany.items.ItemClay; @@ -51,22 +56,20 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = Constants.BOTANY_MOD_ID, name = "Binnie's Botany", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class Botany extends AbstractMod { + public static final float AGE_CHANCE = 0.2f; @SuppressWarnings("NullableProblems") @Mod.Instance(Constants.BOTANY_MOD_ID) public static Botany instance; - @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer") public static Proxy proxy; - /* MODULE GENETIC */ public static BlockFlower flower; public static ItemBotany flowerItem; public static ItemBotany seed; public static ItemBotany pollen; public static ItemDictionary database; - /* MODULE GARDENING */ public static BlockPlant plant; public static ItemTrowel trowelWood; @@ -90,8 +93,6 @@ public class Botany extends AbstractMod { public static BlockStainedGlass stained; public static BlockCeramicBrick ceramicBrick; - public static final float AGE_CHANCE = 0.2f; - @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { this.preInit(); @@ -157,24 +158,30 @@ public class Botany extends AbstractMod { @SubscribeEvent public void onShearFlower(final PlayerInteractEvent.RightClickBlock event) { EntityPlayer player = event.getEntityPlayer(); - if (player != null) { - ItemStack heldItem = player.getHeldItemMainhand(); - if (!heldItem.isEmpty()) { - TileEntity tile = event.getWorld().getTileEntity(event.getPos()); - if (tile instanceof TileEntityFlower) { - TileEntityFlower flower = (TileEntityFlower) tile; - if (heldItem.getItem() == Items.SHEARS) { - flower.onShear(); - heldItem.damageItem(1, player); - } else if (heldItem.getItem() == Botany.pollen) { - IFlower pollen = BotanyCore.getFlowerRoot().getMember(heldItem); - if (pollen != null && flower.canMateWith(pollen)) { - flower.mateWith(pollen); - if (!player.capabilities.isCreativeMode) { - heldItem.shrink(1); - } - } - } + if (player == null) { + return; + } + + ItemStack heldItem = player.getHeldItemMainhand(); + if (heldItem.isEmpty()) { + return; + } + + TileEntity tile = event.getWorld().getTileEntity(event.getPos()); + if (!(tile instanceof TileEntityFlower)) { + return; + } + + TileEntityFlower flower = (TileEntityFlower) tile; + if (heldItem.getItem() == Items.SHEARS) { + flower.onShear(); + heldItem.damageItem(1, player); + } else if (heldItem.getItem() == Botany.pollen) { + IFlower pollen = BotanyCore.getFlowerRoot().getMember(heldItem); + if (pollen != null && flower.canMateWith(pollen)) { + flower.mateWith(pollen); + if (!player.capabilities.isCreativeMode) { + heldItem.shrink(1); } } } @@ -186,49 +193,60 @@ public class Botany extends AbstractMod { if (world == null) { return; } + BlockPos pos = event.getPos(); EntityPlayer player = event.getEntityPlayer(); - if (player != null) { - ItemStack heldItem = player.getHeldItemMainhand(); - if (!heldItem.isEmpty()) { - Block block = world.getBlockState(event.getPos()).getBlock(); - if (!Gardening.isSoil(block)) { - pos = pos.down(); - block = world.getBlockState(pos).getBlock(); - } - if (Gardening.isSoil(block)) { - IBlockSoil soil = (IBlockSoil) block; - int fertiliserStrength = Gardening.getFertiliserStrength(heldItem); - if (Gardening.isNutrientFertiliser(heldItem) && soil.getType(world, pos) != EnumSoilType.FLOWERBED) { - 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.shrink(1); - return; - } - } - if (Gardening.isAcidFertiliser(heldItem) && soil.getPH(world, pos) != EnumAcidity.Acid) { - 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.shrink(1); - return; - } - } - if (Gardening.isAlkalineFertiliser(heldItem) && soil.getPH(world, pos) != EnumAcidity.Alkaline) { - 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.shrink(1); - return; - } - } - if (Gardening.isWeedkiller(heldItem) && Gardening.addWeedKiller(world, pos) && !player.capabilities.isCreativeMode) { - heldItem.shrink(1); - } - } + if (player == null) { + return; + } + + ItemStack heldItem = player.getHeldItemMainhand(); + if (heldItem.isEmpty()) { + return; + } + + Block block = world.getBlockState(event.getPos()).getBlock(); + if (!Gardening.isSoil(block)) { + pos = pos.down(); + block = world.getBlockState(pos).getBlock(); + } + + if (!Gardening.isSoil(block)) { + return; + } + + IBlockSoil soil = (IBlockSoil) block; + int fertiliserStrength = Gardening.getFertiliserStrength(heldItem); + if (Gardening.isNutrientFertiliser(heldItem) && soil.getType(world, pos) != EnumSoilType.FLOWERBED) { + 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.shrink(1); + return; } } + + if (Gardening.isAcidFertiliser(heldItem) && soil.getPH(world, pos) != EnumAcidity.ACID) { + 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.shrink(1); + return; + } + } + + if (Gardening.isAlkalineFertiliser(heldItem) && soil.getPH(world, pos) != EnumAcidity.ALKALINE) { + 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.shrink(1); + return; + } + } + + if (Gardening.isWeedkiller(heldItem) && Gardening.addWeedKiller(world, pos) && !player.capabilities.isCreativeMode) { + heldItem.shrink(1); + } } @SubscribeEvent @@ -318,5 +336,4 @@ public class Botany extends AbstractMod { super(Botany.instance); } } - } diff --git a/src/main/java/binnie/botany/CreativeTabBotany.java b/src/main/java/binnie/botany/CreativeTabBotany.java index 1379b093..9ca1f3e9 100644 --- a/src/main/java/binnie/botany/CreativeTabBotany.java +++ b/src/main/java/binnie/botany/CreativeTabBotany.java @@ -9,15 +9,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class CreativeTabBotany extends CreativeTabs { public static CreativeTabs instance = new CreativeTabBotany(); + public CreativeTabBotany() { + super("Botany"); + } + @Override public ItemStack getIconItemStack() { return new ItemStack(Blocks.RED_FLOWER, 1, 5); } - public CreativeTabBotany() { - super("Botany"); - } - @Override @SideOnly(Side.CLIENT) public String getTranslatedTabLabel() { @@ -35,5 +35,4 @@ public class CreativeTabBotany extends CreativeTabs { public ItemStack getTabIconItem() { return new ItemStack(Blocks.YELLOW_FLOWER); } - } diff --git a/src/main/java/binnie/botany/api/EnumAcidity.java b/src/main/java/binnie/botany/api/EnumAcidity.java index f187c5e5..22716fd8 100644 --- a/src/main/java/binnie/botany/api/EnumAcidity.java +++ b/src/main/java/binnie/botany/api/EnumAcidity.java @@ -7,9 +7,9 @@ import net.minecraft.util.text.translation.I18n; import javax.annotation.Nullable; public enum EnumAcidity implements IStringSerializable { - Acid(TextFormatting.RED), - Neutral(null), - Alkaline(TextFormatting.AQUA); + ACID(TextFormatting.RED), + NEUTRAL(null), + ALKALINE(TextFormatting.AQUA); @Nullable final TextFormatting color; diff --git a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java index d0483486..41e89ae0 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java +++ b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java @@ -1,6 +1,13 @@ package binnie.botany.api; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleArea; +import forestry.api.genetics.IAlleleFloat; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; import java.util.Locale; diff --git a/src/main/java/binnie/botany/api/EnumFlowerStage.java b/src/main/java/binnie/botany/api/EnumFlowerStage.java index 90199c15..be7a2c4a 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerStage.java +++ b/src/main/java/binnie/botany/api/EnumFlowerStage.java @@ -19,7 +19,9 @@ public enum EnumFlowerStage implements ISpeciesType { } public static EnumFlowerStage getStage(int age) { - return age == 0 ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER; + return age == 0 + ? EnumFlowerStage.SEED + : EnumFlowerStage.FLOWER; } public String getName() { diff --git a/src/main/java/binnie/botany/api/EnumMoisture.java b/src/main/java/binnie/botany/api/EnumMoisture.java index 1f2483ce..8c4500a1 100644 --- a/src/main/java/binnie/botany/api/EnumMoisture.java +++ b/src/main/java/binnie/botany/api/EnumMoisture.java @@ -7,9 +7,9 @@ import net.minecraft.util.text.translation.I18n; import javax.annotation.Nullable; public enum EnumMoisture implements IStringSerializable { - Dry(TextFormatting.YELLOW), - Normal(null), - Damp(TextFormatting.DARK_BLUE); + DRY(TextFormatting.YELLOW), + NORMAL(null), + DAMP(TextFormatting.DARK_BLUE); @Nullable final TextFormatting color; diff --git a/src/main/java/binnie/botany/api/FlowerManager.java b/src/main/java/binnie/botany/api/FlowerManager.java index 9d570703..bb98d711 100644 --- a/src/main/java/binnie/botany/api/FlowerManager.java +++ b/src/main/java/binnie/botany/api/FlowerManager.java @@ -1,7 +1,6 @@ package binnie.botany.api; public class FlowerManager { - /** * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers") */ @@ -11,5 +10,4 @@ public class FlowerManager { * Used to create new flowers. */ public static IFlowerFactory flowerFactory; - } diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java index 373edb02..c9d9da92 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java @@ -9,7 +9,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty { - IFlowerType getType(); EnumAcidity getPH(); diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerSpeciesBuilder.java b/src/main/java/binnie/botany/api/IAlleleFlowerSpeciesBuilder.java index 317b1c33..328015df 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerSpeciesBuilder.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerSpeciesBuilder.java @@ -3,12 +3,10 @@ package binnie.botany.api; import forestry.api.genetics.IAlleleSpeciesBuilder; public interface IAlleleFlowerSpeciesBuilder extends IAlleleSpeciesBuilder { - @Override IAlleleFlowerSpecies build(); IAlleleFlowerSpeciesBuilder setPH(EnumAcidity acidity); IAlleleFlowerSpeciesBuilder setMoisture(EnumMoisture moisture); - } diff --git a/src/main/java/binnie/botany/api/IFlower.java b/src/main/java/binnie/botany/api/IFlower.java index 4a42e103..56bbcecd 100644 --- a/src/main/java/binnie/botany/api/IFlower.java +++ b/src/main/java/binnie/botany/api/IFlower.java @@ -17,10 +17,10 @@ public interface IFlower extends IIndividual { int getAge(); - void age(); - void setAge(final int age); + void age(); + IFlower getOffspring(final World world, final BlockPos pos); int getMaxAge(); diff --git a/src/main/java/binnie/botany/api/IFlowerDefinition.java b/src/main/java/binnie/botany/api/IFlowerDefinition.java index 471224f3..87632611 100644 --- a/src/main/java/binnie/botany/api/IFlowerDefinition.java +++ b/src/main/java/binnie/botany/api/IFlowerDefinition.java @@ -4,7 +4,6 @@ import forestry.core.genetics.IGeneticDefinition; import net.minecraft.item.ItemStack; public interface IFlowerDefinition extends IGeneticDefinition { - @Override IFlowerGenome getGenome(); @@ -12,5 +11,4 @@ public interface IFlowerDefinition extends IGeneticDefinition { IFlower getIndividual(); ItemStack getMemberStack(EnumFlowerStage flowerStage); - } diff --git a/src/main/java/binnie/botany/api/IFlowerFactory.java b/src/main/java/binnie/botany/api/IFlowerFactory.java index df1283cf..dd44d932 100644 --- a/src/main/java/binnie/botany/api/IFlowerFactory.java +++ b/src/main/java/binnie/botany/api/IFlowerFactory.java @@ -4,9 +4,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; public interface IFlowerFactory { - IAlleleFlowerSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, IFlowerType flowerType); IFlowerMutationBuilder createMutation(IAlleleFlowerSpecies parentFlower0, IAlleleFlowerSpecies parentFlower1, IAllele[] result, int chance); - } diff --git a/src/main/java/binnie/botany/api/IFlowerMutationBuilder.java b/src/main/java/binnie/botany/api/IFlowerMutationBuilder.java index 8538fa53..d2876914 100644 --- a/src/main/java/binnie/botany/api/IFlowerMutationBuilder.java +++ b/src/main/java/binnie/botany/api/IFlowerMutationBuilder.java @@ -3,5 +3,4 @@ package binnie.botany.api; import forestry.api.genetics.IMutationBuilder; public interface IFlowerMutationBuilder extends IMutationBuilder { - } diff --git a/src/main/java/binnie/botany/api/IFlowerType.java b/src/main/java/binnie/botany/api/IFlowerType.java index a678f145..644bc31b 100644 --- a/src/main/java/binnie/botany/api/IFlowerType.java +++ b/src/main/java/binnie/botany/api/IFlowerType.java @@ -7,7 +7,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public interface IFlowerType> extends Comparable { - @SideOnly(Side.CLIENT) void registerModels(Item item, IModelManager manager, EnumFlowerStage type); diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 2a832d2b..70400b93 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -45,7 +45,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored } @Override - public int quantityDropped(final Random p_149745_1_) { + public int quantityDropped(final Random rand) { return 0; } diff --git a/src/main/java/binnie/botany/ceramic/CeramicColor.java b/src/main/java/binnie/botany/ceramic/CeramicColor.java index 84d1a4d5..a95152e0 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicColor.java +++ b/src/main/java/binnie/botany/ceramic/CeramicColor.java @@ -10,9 +10,16 @@ import java.util.LinkedHashMap; import java.util.Map; public class CeramicColor implements IDesignMaterial { - EnumFlowerColor color; private final static Map map = new LinkedHashMap<>(); + static { + for (final EnumFlowerColor c : EnumFlowerColor.values()) { + CeramicColor.map.put(c, new CeramicColor(c)); + } + } + + EnumFlowerColor color; + CeramicColor(final EnumFlowerColor color) { this.color = color; } @@ -40,10 +47,4 @@ public class CeramicColor implements IDesignMaterial { public int getColour() { return this.color.getColor(false); } - - static { - for (final EnumFlowerColor c : EnumFlowerColor.values()) { - CeramicColor.map.put(c, new CeramicColor(c)); - } - } } diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index 1e5b637c..2e96adda 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -103,5 +103,4 @@ public class CeramicDesignSystem implements IDesignSystem { public IDesignMaterial getMaterial(final ItemStack itemStack) { return (itemStack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? this.getMaterial(itemStack.getItemDamage()) : null; } - } diff --git a/src/main/java/binnie/botany/ceramic/ItemStainedGlass.java b/src/main/java/binnie/botany/ceramic/ItemStainedGlass.java index bc7a8a77..62618c13 100644 --- a/src/main/java/binnie/botany/ceramic/ItemStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/ItemStainedGlass.java @@ -10,7 +10,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ItemStainedGlass extends ItemMetadata implements IColoredItem { - public ItemStainedGlass(Block block) { super(block); } @@ -20,5 +19,4 @@ public class ItemStainedGlass extends ItemMetadata implements IColoredItem { public int getColorFromItemstack(ItemStack stack, int tintIndex) { return EnumFlowerColor.get(TileEntityMetadata.getItemDamage(stack)).getColor(false); } - } diff --git a/src/main/java/binnie/botany/ceramic/TileCeramic.java b/src/main/java/binnie/botany/ceramic/TileCeramic.java index 32c301aa..e18bc3a1 100644 --- a/src/main/java/binnie/botany/ceramic/TileCeramic.java +++ b/src/main/java/binnie/botany/ceramic/TileCeramic.java @@ -9,14 +9,14 @@ import net.minecraft.tileentity.TileEntity; public class TileCeramic extends TileEntity { protected EnumFlowerColor color = EnumFlowerColor.Black; - public void setColor(EnumFlowerColor color) { - this.color = color; - } - public EnumFlowerColor getColor() { return color; } + public void setColor(EnumFlowerColor color) { + this.color = color; + } + @Override public NBTTagCompound writeToNBT(NBTTagCompound compound) { compound.setInteger("Color", color.getID()); @@ -39,7 +39,5 @@ public class TileCeramic extends TileEntity { ID = color.getID(); } return new ItemStack(Botany.ceramic, amount, ID); - } - } diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index 92d3213d..4d15ab81 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -10,7 +10,11 @@ import binnie.core.models.DefaultStateMapper; import binnie.core.models.ModelManager; import binnie.core.models.ModelMutlipass; import binnie.core.util.TileUtil; -import forestry.api.core.*; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.ISpriteRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.ITextureManager; import forestry.core.blocks.IColoredBlock; import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; @@ -32,7 +36,11 @@ 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.*; +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; import net.minecraft.world.IBlockAccess; @@ -50,8 +58,7 @@ import java.util.Collections; import java.util.List; public class BlockCeramicBrick extends Block implements IMultipassBlock, IColoredBlock, ISpriteRegister, IStateMapperRegister, IItemModelRegister { - - public static final PropertyEnum TYPE = PropertyEnum.create("type", CeramicBrickType.class); + private static final PropertyEnum TYPE = PropertyEnum.create("type", CeramicBrickType.class); public BlockCeramicBrick() { super(Material.ROCK); @@ -114,9 +121,10 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock(BlockCeramicBrick.class), this)); + new ModelResourceLocation(resourceLocation, "normal"), + new ModelResourceLocation(resourceLocation, "inventory"), + new ModelMutlipass<>(BlockCeramicBrick.class), this + )); } @SideOnly(Side.CLIENT) @@ -125,15 +133,6 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock> 8 & 0xFF); this.type = CeramicBrickType.get(id >> 16 & 0xFF); } + public boolean isTwoColors() { + return this.type.canDouble() && this.colorSecond != this.colorFirst; + } + + public ItemStack getStack(int i) { + return new ItemStack(Botany.ceramicBrick, i, this.ordinal()); + } + public String getName() { String name = this.colorFirst.getColourName(); if (this.type.canDouble() && this.colorSecond != this.colorFirst) { @@ -58,7 +58,7 @@ public class CeramicBrickPair { Preconditions.checkState(sprites != null, "Sprites have not been registered."); return sprites[pass]; } - + @Override public int hashCode() { return Integer.hashCode(ordinal()); @@ -66,10 +66,7 @@ public class CeramicBrickPair { @Override public boolean equals(Object obj) { - if (!(obj instanceof CeramicBrickPair)) { - return false; - } - return ((CeramicBrickPair) obj).ordinal() == ordinal(); + return obj instanceof CeramicBrickPair + && ((CeramicBrickPair) obj).ordinal() == ordinal(); } - } diff --git a/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java index 2d39a80f..7fa8cd05 100644 --- a/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java @@ -25,7 +25,7 @@ public class ItemCeramicBrick extends ItemBlock implements IColoredItem { } else if (tintIndex == 2) { return ceramic.colorSecond.getColor(false); } - return 16777215; + return 0xffffff; } @Override diff --git a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java index c5d39769..276aa7c7 100644 --- a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java @@ -73,5 +73,4 @@ public class TileCeramicBrick extends TileEntity { colorSecond = EnumFlowerColor.VALUES[compound.getInteger("Second")]; } } - } diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java b/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java index 16553e99..c0504e2a 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java @@ -8,18 +8,18 @@ public class ControlColourMixBox extends ControlListBox { private int index; private Type type; - @Override - public IWidget createOption(final IColourMix value, final int y) { - return new ControlColourMixItem(this.getContent(), value, y); - } - public ControlColourMixBox(final IWidget parent, final int x, final int y, final int width, final int height, final Type type) { super(parent, x, y, width, height, 12); this.type = type; } + @Override + public IWidget createOption(final IColourMix value, final int y) { + return new ControlColourMixItem(this.getContent(), value, y); + } + enum Type { Resultant, - Further; + Further, } } diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index 2238ae6f..272cbed3 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -1,7 +1,11 @@ package binnie.botany.craftgui; import binnie.botany.api.IColourMix; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; @@ -16,6 +20,13 @@ public class ControlColourMixSymbol extends Control implements ITooltip { IColourMix value; int type; + protected ControlColourMixSymbol(final IWidget parent, final int x, final int y, final int type, final IColourMix value) { + super(parent, x, y, 16 + type * 16, 16); + this.value = value; + this.type = type; + this.addAttribute(Attribute.MouseOver); + } + @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { @@ -27,16 +38,9 @@ public class ControlColourMixSymbol extends Control implements ITooltip { } } - protected ControlColourMixSymbol(final IWidget parent, final int x, final int y, final int type, final IColourMix value) { - super(parent, x, y, 16 + type * 16, 16); - this.value = value; - this.type = type; - this.addAttribute(Attribute.MouseOver); - } - public void setValue(final IColourMix value) { this.value = value; - this.setColour(16777215); + this.setColour(0xffffff); } @Override @@ -46,5 +50,4 @@ public class ControlColourMixSymbol extends Control implements ITooltip { tooltip.add("Current Chance - " + chance + "%"); } } - } diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index 5da7d68c..b64c30dd 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -1,7 +1,11 @@ package binnie.botany.craftgui; import binnie.Binnie; -import binnie.botany.api.*; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerGenome; import binnie.botany.core.BotanyCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -23,6 +27,13 @@ public class PageSpeciesFlowerGenome extends PageSpecies { super(parent, tab); } + public static String tolerated(final boolean t) { + if (t) { + return "Tolerated"; + } + return "Not Tolerated"; + } + @Override public void onValueChanged(final IAlleleSpecies species) { this.deleteAllChildren(); @@ -87,11 +98,4 @@ public class PageSpeciesFlowerGenome extends PageSpecies { contents.setSize(new Point(contents.size().x(), y)); scrollable.setScrollableContent(contents); } - - public static String tolerated(final boolean t) { - if (t) { - return "Tolerated"; - } - return "Not Tolerated"; - } } diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index ba56616b..39815763 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -7,7 +7,16 @@ import binnie.botany.genetics.EnumFlowerColor; import binnie.core.AbstractMod; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.database.*; +import binnie.core.craftgui.database.DatabaseTab; +import binnie.core.craftgui.database.IDatabaseMode; +import binnie.core.craftgui.database.PageBranchOverview; +import binnie.core.craftgui.database.PageBranchSpecies; +import binnie.core.craftgui.database.PageBreeder; +import binnie.core.craftgui.database.PageSpeciesClassification; +import binnie.core.craftgui.database.PageSpeciesMutations; +import binnie.core.craftgui.database.PageSpeciesOverview; +import binnie.core.craftgui.database.PageSpeciesResultant; +import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index a52dbb2c..bf4f43da 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -23,23 +23,23 @@ public class CircuitGarden extends BinnieCircuit { this.isManual = manual; this.logic = new GardenLogic(moisture, ph, this.isManual, fertilised, icon, Binnie.LANGUAGE.localise(this.getUnlocalizedName())); StringBuilder info = new StringBuilder("Flowers (") - .append(TextFormatting.GRAY.toString()) - .append(Binnie.LANGUAGE.localise("botany.moisture")) - .append(": ") - .append(moisture.getTranslated(true)); + .append(TextFormatting.GRAY.toString()) + .append(Binnie.LANGUAGE.localise("botany.moisture")) + .append(": ") + .append(moisture.getTranslated(true)); if (ph != null) { info.append(TextFormatting.GRAY.toString()) - .append(", ") - .append(Binnie.LANGUAGE.localise("botany.ph")) - .append(": ") - .append(ph.getTranslated(true)); + .append(", ") + .append(Binnie.LANGUAGE.localise("botany.ph")) + .append(": ") + .append(ph.getTranslated(true)); } String fertilizedKey = fertilised ? "for.binnie.circuit.garden.fertilized" : "for.binnie.circuit.garden.unfertilized"; info.append(TextFormatting.RESET.toString()) - .append(" ") - .append(Binnie.LANGUAGE.localise(fertilizedKey)) - .append(")"); + .append(" ") + .append(Binnie.LANGUAGE.localise(fertilizedKey)) + .append(")"); this.addTooltipString(info.toString()); } @@ -112,5 +112,4 @@ public class CircuitGarden extends BinnieCircuit { @Override public void onTick(int slot, Object tile) { } - } diff --git a/src/main/java/binnie/botany/farm/FarmableFlower.java b/src/main/java/binnie/botany/farm/FarmableFlower.java index a4392592..29f6fa5a 100644 --- a/src/main/java/binnie/botany/farm/FarmableFlower.java +++ b/src/main/java/binnie/botany/farm/FarmableFlower.java @@ -44,6 +44,4 @@ public class FarmableFlower implements IFarmable { Gardening.plant(world, pos, flower, player.getGameProfile()); return true; } - - } diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index 431625bd..5f55c75e 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -34,6 +34,7 @@ import java.util.Collections; import java.util.List; public class GardenLogic extends FarmLogic { + List farmables; private EnumMoisture moisture; @Nullable private EnumAcidity acidity; @@ -41,7 +42,6 @@ public class GardenLogic extends FarmLogic { 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 = NonNullList.create(); @@ -68,10 +68,10 @@ 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); + itemstack.getItem() == Item.getItemFromBlock(Blocks.SAND) || + itemstack.getItem() == Item.getItemFromBlock(Blocks.DIRT) || + Gardening.isAcidFertiliser(itemstack) || + Gardening.isAlkalineFertiliser(itemstack); } @Override @@ -84,8 +84,8 @@ public class GardenLogic extends FarmLogic { @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); + (!this.isManual && this.maintainWater(world, pos, direction, extent, farmHousing)) || + this.maintainCrops(world, pos.up(), direction, extent, farmHousing); } private boolean isWaste(final ItemStack stack) { @@ -174,7 +174,7 @@ public class GardenLogic extends FarmLogic { } else if (world.isAirBlock(position.north())) { isEnclosed = false; } - isEnclosed = (isEnclosed || this.moisture != EnumMoisture.Damp); + isEnclosed = (isEnclosed || this.moisture != EnumMoisture.DAMP); if (isEnclosed) { return this.trySetWater(world, position, housing); } @@ -186,14 +186,14 @@ public class GardenLogic extends FarmLogic { private ItemStack getAvailableLoam(IFarmHousing housing) { EnumMoisture[] moistures; - if (this.moisture == EnumMoisture.Damp) { - moistures = new EnumMoisture[]{EnumMoisture.Damp, EnumMoisture.Normal, EnumMoisture.Dry}; - } else if (this.moisture == EnumMoisture.Dry) { - moistures = new EnumMoisture[]{EnumMoisture.Dry, EnumMoisture.Damp, EnumMoisture.Dry}; + if (this.moisture == EnumMoisture.DAMP) { + moistures = new EnumMoisture[]{EnumMoisture.DAMP, EnumMoisture.NORMAL, EnumMoisture.DRY}; + } else if (this.moisture == EnumMoisture.DRY) { + moistures = new EnumMoisture[]{EnumMoisture.DRY, EnumMoisture.DAMP, EnumMoisture.DRY}; } else { - moistures = new EnumMoisture[]{EnumMoisture.Dry, EnumMoisture.Normal, EnumMoisture.Damp}; + moistures = new EnumMoisture[]{EnumMoisture.DRY, EnumMoisture.NORMAL, EnumMoisture.DAMP}; } - final EnumAcidity[] acidities = {EnumAcidity.Neutral, EnumAcidity.Acid, EnumAcidity.Alkaline}; + final EnumAcidity[] acidities = {EnumAcidity.NEUTRAL, EnumAcidity.ACID, EnumAcidity.ALKALINE}; for (final EnumMoisture moist : moistures) { for (final EnumAcidity acid : acidities) { for (final Block type : new Block[]{Botany.flowerbed, Botany.loam, Botany.soil}) { @@ -237,7 +237,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 (this.moisture == EnumMoisture.DAMP) { if (water == null || !housing.hasLiquid(water)) { return false; } @@ -245,7 +245,7 @@ public class GardenLogic extends FarmLogic { housing.removeLiquid(water); return true; } else { - if (this.moisture != EnumMoisture.Dry) { + if (this.moisture != EnumMoisture.DRY) { return trySetSoil(world, position, housing); } final ItemStack sand = new ItemStack(Blocks.SAND, 1); @@ -350,5 +350,4 @@ public class GardenLogic extends FarmLogic { } return ItemStack.EMPTY; } - } diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index dec71fac..275d1136 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -29,7 +29,11 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +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.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -43,7 +47,6 @@ import java.util.List; import java.util.Random; public class BlockFlower extends BlockContainer implements IColoredBlock, IStateMapperRegister { - public static final AxisAlignedBB FLOWER_BLOCK_AABB = new AxisAlignedBB(0.3D, 0.0D, 0.3D, 0.7D, 0.6D, 0.7D); /* PROPERTYS */ public static final PropertyFlower FLOWER = new PropertyFlower("flower", IFlowerType.class); @@ -69,6 +72,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState public void registerStateMapper() { ModelLoader.setCustomStateMapper(this, new StateMapperFlower()); } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { ItemStack heldItem = player.getHeldItemMainhand(); @@ -180,7 +184,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState } } } - return 16777215; + return 0xffffff; } @Override @@ -300,5 +304,4 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState } return hasBeenBroken; } - } diff --git a/src/main/java/binnie/botany/flower/EnumTubeInsulate.java b/src/main/java/binnie/botany/flower/EnumTubeInsulate.java new file mode 100644 index 00000000..6b2435c2 --- /dev/null +++ b/src/main/java/binnie/botany/flower/EnumTubeInsulate.java @@ -0,0 +1,59 @@ +package binnie.botany.flower; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + +enum EnumTubeInsulate { + Clay(0xa1aacc, "Clay"), + Cobble(0x7b7b7b, "Cobblestone"), + Sand(0xefeab5, "Sand"), + HardenedClay(0x935c43, "Hardened Clay"), + Stone(0x6d6d6d, "Smooth Stone"), + Sandstone(0xc1b989, "Sandstone"); + + int color; + String name; + + EnumTubeInsulate(final int color, final String name) { + this.color = color; + this.name = name; + } + + public static EnumTubeInsulate get(final int i) { + return values()[i / 128 % values().length]; + } + + public int getColor() { + return this.color; + } + + public String getName() { + return this.name; + } + + public ItemStack getStack() { + switch (this) { + case Clay: { + return new ItemStack(Blocks.CLAY); + } + case Cobble: { + return new ItemStack(Blocks.COBBLESTONE); + } + case HardenedClay: { + return new ItemStack(Blocks.HARDENED_CLAY); + } + case Sand: { + return new ItemStack(Blocks.SAND); + } + case Sandstone: { + return new ItemStack(Blocks.SANDSTONE); + } + case Stone: { + return new ItemStack(Blocks.STONE); + } + default: { + throw new IllegalStateException("Unknown insulated tube type: " + this); + } + } + } +} diff --git a/src/main/java/binnie/botany/flower/EnumTubeMaterial.java b/src/main/java/binnie/botany/flower/EnumTubeMaterial.java new file mode 100644 index 00000000..d26866ce --- /dev/null +++ b/src/main/java/binnie/botany/flower/EnumTubeMaterial.java @@ -0,0 +1,28 @@ +package binnie.botany.flower; + +enum EnumTubeMaterial { + Copper(0xe3b78e, "Copper"), + Tin(0xe1eef4, "Tin"), + Bronze(0xddc276, "Bronze"), + Iron(0xd8d8d8, "Iron"); + + int color; + String name; + + EnumTubeMaterial(final int color, final String name) { + this.color = color; + this.name = name; + } + + public static EnumTubeMaterial get(final int i) { + return values()[i % values().length]; + } + + public int getColor() { + return this.color; + } + + public String getName() { + return this.name; + } +} diff --git a/src/main/java/binnie/botany/flower/FlowerSpriteManager.java b/src/main/java/binnie/botany/flower/FlowerSpriteManager.java index 48883f62..03e3cf6e 100644 --- a/src/main/java/binnie/botany/flower/FlowerSpriteManager.java +++ b/src/main/java/binnie/botany/flower/FlowerSpriteManager.java @@ -13,53 +13,52 @@ import java.util.HashMap; import java.util.Map; public class FlowerSpriteManager { - private static final Map flowerSprites = new HashMap<>(); - + public static void initSprites(IFlowerType type) { - if(flowerSprites.containsKey(type)){ + if (flowerSprites.containsKey(type)) { return; } flowerSprites.put(type, new FlowerSprites(type)); } - + @Nullable @SideOnly(Side.CLIENT) - public static TextureAtlasSprite getStem(IFlowerType type, int section, boolean flowered){ + public static TextureAtlasSprite getStem(IFlowerType type, int section, boolean flowered) { FlowerSprites flower = flowerSprites.get(type); - if(flower == null){ + if (flower == null) { return null; } return flower.getStem(type, section, flowered); } - + @Nullable @SideOnly(Side.CLIENT) - public static TextureAtlasSprite getPetal(IFlowerType type, int section, boolean flowered){ + public static TextureAtlasSprite getPetal(IFlowerType type, int section, boolean flowered) { FlowerSprites flower = flowerSprites.get(type); - if(flower == null){ + if (flower == null) { return null; } return flower.getPetal(type, section, flowered); } - + @Nullable @SideOnly(Side.CLIENT) - public static TextureAtlasSprite getVariant(IFlowerType type, int section, boolean flowered){ + public static TextureAtlasSprite getVariant(IFlowerType type, int section, boolean flowered) { FlowerSprites flower = flowerSprites.get(type); - if(flower == null){ + if (flower == null) { return null; } return flower.getVariant(type, section, flowered); } - - private static class FlowerSprites{ + + private static class FlowerSprites { private BinnieSprite[] stem; private BinnieSprite[] variant; private BinnieSprite[] petal; private BinnieSprite[] unflowered; private int sections; - + public FlowerSprites(IFlowerType type) { this.sections = type.getSections(); this.stem = new BinnieSprite[sections]; @@ -77,21 +76,19 @@ public class FlowerSpriteManager { } @SideOnly(Side.CLIENT) - public TextureAtlasSprite getStem(IFlowerType type, int section, boolean flowered){ + public TextureAtlasSprite getStem(IFlowerType type, int section, boolean flowered) { return stem[section % sections].getSprite(); } @SideOnly(Side.CLIENT) - public TextureAtlasSprite getPetal(IFlowerType type, int section, boolean flowered){ + public TextureAtlasSprite getPetal(IFlowerType type, int section, boolean flowered) { return (flowered ? petal[section % this.sections] : this.unflowered[section % this.sections]).getSprite(); } - + @Nullable @SideOnly(Side.CLIENT) - public TextureAtlasSprite getVariant(IFlowerType type, int section, boolean flowered){ + public TextureAtlasSprite getVariant(IFlowerType type, int section, boolean flowered) { return flowered ? variant[section % this.sections].getSprite() : null; } - } - } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 1fb0e3f5..927f264e 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -3,7 +3,12 @@ package binnie.botany.flower; import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; -import binnie.botany.api.*; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; import binnie.botany.genetics.Flower; import com.google.common.base.Preconditions; @@ -26,7 +31,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +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; import net.minecraft.world.World; @@ -37,7 +46,6 @@ import javax.annotation.Nullable; import java.util.List; public class ItemBotany extends Item implements IColoredItem, IItemModelRegister { - private EnumFlowerStage type; private String tag; @@ -170,19 +178,6 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister manager.registerItemModel(item, new BotanyMeshDefinition()); } - @SideOnly(Side.CLIENT) - private class BotanyMeshDefinition implements ItemMeshDefinition { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - IFlower flower = BotanyCore.getFlowerRoot().getMember(stack); - Preconditions.checkNotNull(flower); - IAlleleFlowerSpecies flowerSpecies = flower.getGenome().getPrimary(); - IFlowerType flowerType = flowerSpecies.getType(); - return flowerSpecies.getFlowerModel(type, flower.hasFlowered()); - } - - } - @Override public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); @@ -239,4 +234,16 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister return true; } + + @SideOnly(Side.CLIENT) + private class BotanyMeshDefinition implements ItemMeshDefinition { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + IFlower flower = BotanyCore.getFlowerRoot().getMember(stack); + Preconditions.checkNotNull(flower); + IAlleleFlowerSpecies flowerSpecies = flower.getGenome().getPrimary(); + IFlowerType flowerType = flowerSpecies.getType(); + return flowerSpecies.getFlowerModel(type, flower.hasFlowered()); + } + } } diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index e9f7e89c..8c26fe23 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -14,7 +14,6 @@ import forestry.core.utils.Translator; import net.minecraft.client.gui.GuiScreen; import net.minecraft.creativetab.CreativeTabs; 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; @@ -26,7 +25,6 @@ import java.util.Collection; import java.util.List; public class ItemInsulatedTube extends ItemCore implements IColoredItem { - public ItemInsulatedTube() { super("insulated_tube"); setUnlocalizedName("insulated_tube"); @@ -34,11 +32,31 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { setHasSubtypes(true); } + private static Multimap getCircuits(ItemStack itemStack) { + Multimap circuits = ArrayListMultimap.create(); + Collection allLayouts = ChipsetManager.circuitRegistry.getRegisteredLayouts().values(); + for (ICircuitLayout circuitLayout : allLayouts) { + ICircuit circuit = SolderManager.getCircuit(circuitLayout, itemStack); + if (circuit != null) { + circuits.put(circuitLayout, circuit); + } + } + return circuits; + } + + public static String getInsulate(ItemStack stack) { + return EnumTubeInsulate.get(stack.getItemDamage()).getName(); + } + + public static ItemStack getInsulateStack(ItemStack stack) { + return EnumTubeInsulate.get(stack.getItemDamage()).getStack(); + } + @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { - for (Material mat : Material.values()) { - for (Insulate ins : Insulate.values()) { + for (EnumTubeMaterial mat : EnumTubeMaterial.values()) { + for (EnumTubeInsulate ins : EnumTubeInsulate.values()) { subItems.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); } } @@ -47,8 +65,8 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - for (Material mat : Material.values()) { - for (Insulate ins : Insulate.values()) { + for (EnumTubeMaterial mat : EnumTubeMaterial.values()) { + for (EnumTubeInsulate ins : EnumTubeInsulate.values()) { manager.registerItemModel(item, mat.ordinal() + ins.ordinal() * 128); } } @@ -57,11 +75,11 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { @Override public int getColorFromItemstack(ItemStack stack, int tintIndex) { if (tintIndex == 0) { - return 16777215; + return 0xffffff; } else if (tintIndex == 1) { - return Material.get(stack.getItemDamage()).getColor(); + return EnumTubeMaterial.get(stack.getItemDamage()).getColor(); } - return Insulate.get(stack.getItemDamage()).getColor(); + return EnumTubeInsulate.get(stack.getItemDamage()).getColor(); } @Override @@ -86,111 +104,9 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { } } - private static Multimap getCircuits(ItemStack itemStack) { - Multimap circuits = ArrayListMultimap.create(); - Collection allLayouts = ChipsetManager.circuitRegistry.getRegisteredLayouts().values(); - for (ICircuitLayout circuitLayout : allLayouts) { - ICircuit circuit = SolderManager.getCircuit(circuitLayout, itemStack); - if (circuit != null) { - circuits.put(circuitLayout, circuit); - } - } - return circuits; - } - @Override public String getItemStackDisplayName(ItemStack itemStack) { int meta = itemStack.getMetadata(); - return Material.get(meta).getName() + " " + Insulate.get(meta).getName() + " " + super.getItemStackDisplayName(itemStack); - } - - public static String getInsulate(ItemStack stack) { - return Insulate.get(stack.getItemDamage()).getName(); - } - - public static ItemStack getInsulateStack(ItemStack stack) { - return Insulate.get(stack.getItemDamage()).getStack(); - } - - enum Material { - Copper(14923662, "Copper"), - Tin(14806772, "Tin"), - Bronze(14533238, "Bronze"), - Iron(14211288, "Iron"); - - int color; - String name; - - public int getColor() { - return this.color; - } - - public String getName() { - return this.name; - } - - Material(final int color, final String name) { - this.color = color; - this.name = name; - } - - public static Material get(final int i) { - return values()[i % values().length]; - } - } - - enum Insulate { - Clay(10595020, "Clay"), - Cobble(8092539, "Cobblestone"), - Sand(15723189, "Sand"), - HardenedClay(9657411, "Hardened Clay"), - Stone(7171437, "Smooth Stone"), - Sandstone(12695945, "Sandstone"); - - int color; - String name; - - public int getColor() { - return this.color; - } - - public String getName() { - return this.name; - } - - Insulate(final int color, final String name) { - this.color = color; - this.name = name; - } - - public static Insulate get(final int i) { - return values()[i / 128 % values().length]; - } - - public ItemStack getStack() { - switch (this) { - case Clay: { - return new ItemStack(Blocks.CLAY); - } - case Cobble: { - return new ItemStack(Blocks.COBBLESTONE); - } - case HardenedClay: { - return new ItemStack(Blocks.HARDENED_CLAY); - } - case Sand: { - return new ItemStack(Blocks.SAND); - } - case Sandstone: { - return new ItemStack(Blocks.SANDSTONE); - } - case Stone: { - return new ItemStack(Blocks.STONE); - } - default: { - throw new IllegalStateException("Unknown insulated tube type: " + this); - } - } - } + return EnumTubeMaterial.get(meta).getName() + " " + EnumTubeInsulate.get(meta).getName() + " " + super.getItemStackDisplayName(itemStack); } } diff --git a/src/main/java/binnie/botany/flower/PropertyFlower.java b/src/main/java/binnie/botany/flower/PropertyFlower.java index 6f9105a1..06b2b5ea 100644 --- a/src/main/java/binnie/botany/flower/PropertyFlower.java +++ b/src/main/java/binnie/botany/flower/PropertyFlower.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.Locale; public class PropertyFlower> extends PropertyHelper { - public PropertyFlower(String name, Class flowerTypeClass) { super(name, flowerTypeClass); } @@ -48,5 +47,4 @@ public class PropertyFlower> extends PropertyHelper } return Optional.absent(); } - } \ No newline at end of file diff --git a/src/main/java/binnie/botany/flower/StateMapperFlower.java b/src/main/java/binnie/botany/flower/StateMapperFlower.java index efb745b9..6ae95d4b 100644 --- a/src/main/java/binnie/botany/flower/StateMapperFlower.java +++ b/src/main/java/binnie/botany/flower/StateMapperFlower.java @@ -14,7 +14,6 @@ import java.util.Map; @SideOnly(Side.CLIENT) public class StateMapperFlower extends StateMapperBase { - @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { final Map, Comparable> properties = Maps.newLinkedHashMap(state.getProperties()); @@ -34,5 +33,4 @@ public class StateMapperFlower extends StateMapperBase { return new ModelResourceLocation(Constants.BOTANY_MOD_ID + ":flower", getPropertyString(properties)); } - } diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index 085bfa62..031b0473 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -2,7 +2,13 @@ package binnie.botany.flower; import binnie.Binnie; import binnie.botany.Botany; -import binnie.botany.api.*; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerColour; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; import binnie.botany.gardening.BlockPlant; import binnie.botany.gardening.Gardening; @@ -57,7 +63,6 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt this.matureTime = 0; } - @Override public NBTTagCompound getUpdateTag() { updateRender(true); @@ -426,47 +431,47 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } public void spawnButterflies() { -// if (!BinnieCore.isLepidopteryActive()) { -// return; -// } -// final int x = this.xCoord; -// final int y = this.yCoord; -// final int z = this.zCoord; -// final World world = this.worldObj; -// if (this.getCaterpillar() != null) { -// return; -// } -// if (world.rand.nextFloat() >= this.getFlower().getGenome().getSappiness()) { -// return; -// } -// if (this.worldObj.rand.nextFloat() >= 0.2f) { -// return; -// } -// final IButterfly spawn = Binnie.Genetics.getButterflyRoot().getIndividualTemplates().get(this.worldObj.rand.nextInt(Binnie.Genetics.getButterflyRoot().getIndividualTemplates().size())); -// if (this.worldObj.rand.nextFloat() >= spawn.getGenome().getPrimary().getRarity() * 0.5f) { -// return; -// } -// if (this.worldObj.countEntities(EntityButterfly.class) > 100) { -// return; -// } -// if (!spawn.canSpawn(this.worldObj, x, y, z)) { -// return; -// } -// if (world.isAirBlock(x, y + 1, z)) { -// this.attemptButterflySpawn(world, spawn, x, y + 1, z); -// } -// else if (world.isAirBlock(x - 1, y, z)) { -// this.attemptButterflySpawn(world, spawn, x - 1, y, z); -// } -// else if (world.isAirBlock(x + 1, y, z)) { -// this.attemptButterflySpawn(world, spawn, x + 1, y, z); -// } -// else if (world.isAirBlock(x, y, z - 1)) { -// this.attemptButterflySpawn(world, spawn, x, y, z - 1); -// } -// else if (world.isAirBlock(x, y, z + 1)) { -// this.attemptButterflySpawn(world, spawn, x, y, z + 1); -// } + /*if (!BinnieCore.isLepidopteryActive()) { + return; + } + final int x = this.xCoord; + final int y = this.yCoord; + final int z = this.zCoord; + final World world = this.worldObj; + if (this.getCaterpillar() != null) { + return; + } + if (world.rand.nextFloat() >= this.getFlower().getGenome().getSappiness()) { + return; + } + if (this.worldObj.rand.nextFloat() >= 0.2f) { + return; + } + final IButterfly spawn = Binnie.Genetics.getButterflyRoot().getIndividualTemplates().get(this.worldObj.rand.nextInt(Binnie.Genetics.getButterflyRoot().getIndividualTemplates().size())); + if (this.worldObj.rand.nextFloat() >= spawn.getGenome().getPrimary().getRarity() * 0.5f) { + return; + } + if (this.worldObj.countEntities(EntityButterfly.class) > 100) { + return; + } + if (!spawn.canSpawn(this.worldObj, x, y, z)) { + return; + } + if (world.isAirBlock(x, y + 1, z)) { + this.attemptButterflySpawn(world, spawn, x, y + 1, z); + } + else if (world.isAirBlock(x - 1, y, z)) { + this.attemptButterflySpawn(world, spawn, x - 1, y, z); + } + else if (world.isAirBlock(x + 1, y, z)) { + this.attemptButterflySpawn(world, spawn, x + 1, y, z); + } + else if (world.isAirBlock(x, y, z - 1)) { + this.attemptButterflySpawn(world, spawn, x, y, z - 1); + } + else if (world.isAirBlock(x, y, z + 1)) { + this.attemptButterflySpawn(world, spawn, x, y, z + 1); + }*/ } private void attemptButterflySpawn(final World world, final IButterfly butterfly, final double x, final double y, final double z) { @@ -479,7 +484,6 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return this.getOwner(); } - @Override public EnumTemperature getTemperature() { return EnumTemperature.getFromValue(this.world.getBiome(getPos()).getTemperature()); @@ -507,17 +511,17 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return this.caterpillar; } - @Override - public IIndividual getNanny() { - return this.getFlower(); - } - @Override public void setCaterpillar(@Nullable final IButterfly butterfly) { this.caterpillar = butterfly; this.matureTime = 0; } + @Override + public IIndividual getNanny() { + return this.getFlower(); + } + @Override public boolean canNurse(final IButterfly butterfly) { return this.getFlower() != null && !this.getFlower().isWilted() && this.getFlower().getAge() > 1; @@ -597,14 +601,14 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return this.getWorld().getBiome(getPos()); } - public void setErrorState(final IErrorState state) { - } - @Nullable public IErrorState getErrorState() { return null; } + public void setErrorState(final IErrorState state) { + } + public boolean setErrorCondition(final boolean condition, final IErrorState errorState) { return false; } @@ -613,6 +617,21 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return new HashSet<>(); } + @Override + public BlockPos getCoordinates() { + return getPos(); + } + + @Override + public boolean isPollinated() { + return isBreeding(); + } + + @Override + public World getWorldObj() { + return world; + } + public static class RenderInfo { public IFlowerColour primary; public IFlowerColour secondary; @@ -623,15 +642,6 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public boolean flowered; public byte section; - @Override - public boolean equals(final Object obj) { - if (obj instanceof RenderInfo) { - final RenderInfo o = (RenderInfo) obj; - return o.age == this.age && o.wilted == this.wilted && o.flowered == this.flowered && o.primary == this.primary && o.secondary == this.secondary && o.stem == this.stem && o.type == this.type; - } - return super.equals(obj); - } - public RenderInfo() { } @@ -645,22 +655,14 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt this.flowered = flower.hasFlowered(); this.type = flower.getGenome().getType(); } + + @Override + public boolean equals(final Object obj) { + if (obj instanceof RenderInfo) { + final RenderInfo o = (RenderInfo) obj; + return o.age == this.age && o.wilted == this.wilted && o.flowered == this.flowered && o.primary == this.primary && o.secondary == this.secondary && o.stem == this.stem && o.type == this.type; + } + return super.equals(obj); + } } - - @Override - public BlockPos getCoordinates() { - return getPos(); - } - - @Override - public boolean isPollinated() { - return isBreeding(); - } - - - @Override - public World getWorldObj() { - return world; - } - } diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index 46920201..1289ba48 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -37,6 +37,14 @@ public class BlockPlant extends BlockBush implements IItemModelRegister { this.setSoundType(SoundType.PLANT); } + public static boolean isWeed(final IBlockAccess world, final BlockPos pos) { + if (!(world.getBlockState(pos).getBlock() instanceof BlockPlant)) { + return false; + } + final Type type = world.getBlockState(pos).getValue(PLANT_TYPE); + return type == Type.Weeds || type == Type.WeedsLong || type == Type.WeedsVeryLong; + } + @Override @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { @@ -129,14 +137,6 @@ public class BlockPlant extends BlockBush implements IItemModelRegister { return true; } - public static boolean isWeed(final IBlockAccess world, final BlockPos pos) { - if (!(world.getBlockState(pos).getBlock() instanceof BlockPlant)) { - return false; - } - final Type type = world.getBlockState(pos).getValue(PLANT_TYPE); - return type == Type.Weeds || type == Type.WeedsLong || type == Type.WeedsVeryLong; - } - @Override public EnumOffsetType getOffsetType() { return EnumOffsetType.XZ; @@ -155,14 +155,14 @@ public class BlockPlant extends BlockBush implements IItemModelRegister { this.name = name; } - public ItemStack get() { - return new ItemStack(Botany.plant, 1, this.ordinal()); - } - public static Type get(final int id) { return values()[id % values().length]; } + public ItemStack get() { + return new ItemStack(Botany.plant, 1, this.ordinal()); + } + @Override public String getName() { return name; diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index 47541fc9..0a89a9bb 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -34,13 +34,11 @@ import javax.annotation.Nullable; import java.util.Random; public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { - - private final boolean weedKilled; - private final EnumSoilType type; - public static final PropertyEnum MOISTURE = PropertyEnum.create("moisture", EnumMoisture.class); public static final PropertyEnum ACIDITY = PropertyEnum.create("acidity", EnumAcidity.class); public static final AxisAlignedBB SOIL_BLOCK_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.9375D, 1.0D); + private final boolean weedKilled; + private final EnumSoilType type; public BlockSoil(EnumSoilType type, String blockName, boolean weedKilled) { super(Material.GROUND); @@ -55,6 +53,30 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { this.type = type; } + public static int getMeta(final EnumAcidity acid, final EnumMoisture moisture) { + return acid.ordinal() * 3 + moisture.ordinal(); + } + + public static String getPH(ItemStack stack, boolean withColor, boolean byNeutralNone) { + EnumAcidity ph = EnumAcidity.values()[stack.getItemDamage() / 3]; + if (byNeutralNone) { + if (ph == EnumAcidity.NEUTRAL) { + return ""; + } + } + return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor); + } + + public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) { + EnumMoisture moisure = EnumMoisture.values()[stack.getItemDamage() % 3]; + if (byNormalNone) { + if (moisure == EnumMoisture.NORMAL) { + return ""; + } + } + return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); + } + @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { @@ -121,10 +143,10 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { for (EnumAcidity acidity : EnumAcidity.values()) { for (EnumMoisture moisture : EnumMoisture.values()) { String modelName = ""; - if (acidity != EnumAcidity.Neutral) { + if (acidity != EnumAcidity.NEUTRAL) { modelName += acidity.getName(); } - if (moisture != EnumMoisture.Normal) { + if (moisture != EnumMoisture.NORMAL) { if (!modelName.isEmpty()) { modelName += "_"; } @@ -142,7 +164,6 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { manager.registerItemModel(item, moisture.ordinal() + acidity.ordinal() * 3, identifier); } } - } @Override @@ -178,10 +199,10 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { EnumAcidity acidity = EnumAcidity.values()[meta / 3]; EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, pos); if (desiredMoisture.ordinal() > moisture.ordinal()) { - moisture = ((moisture == EnumMoisture.Dry) ? EnumMoisture.Normal : EnumMoisture.Damp); + moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP); } if (desiredMoisture.ordinal() < moisture.ordinal()) { - moisture = ((moisture == EnumMoisture.Damp) ? EnumMoisture.Normal : EnumMoisture.Dry); + moisture = ((moisture == EnumMoisture.DAMP) ? EnumMoisture.NORMAL : EnumMoisture.DRY); } int meta2 = getMeta(acidity, moisture); if (meta != meta2) { @@ -248,10 +269,6 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { return world.setBlockState(pos, world.getBlockState(pos).withProperty(MOISTURE, moisture)); } - public static int getMeta(final EnumAcidity acid, final EnumMoisture moisture) { - return acid.ordinal() * 3 + moisture.ordinal(); - } - @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { super.onNeighborChange(world, pos, neighbor); @@ -260,26 +277,6 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { } } - public static String getPH(ItemStack stack, boolean withColor, boolean byNeutralNone) { - EnumAcidity ph = EnumAcidity.values()[stack.getItemDamage() / 3]; - if (byNeutralNone) { - if (ph == EnumAcidity.Neutral) { - return ""; - } - } - return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor); - } - - public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) { - EnumMoisture moisure = EnumMoisture.values()[stack.getItemDamage() % 3]; - if (byNormalNone) { - if (moisure == EnumMoisture.Normal) { - return ""; - } - } - return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); - } - @Override public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { IBlockState plant = plantable.getPlant(world, pos.up()); diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 634c1ae1..7a8cb9bc 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -1,7 +1,11 @@ package binnie.botany.gardening; import binnie.botany.Botany; -import binnie.botany.api.*; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.IBlockSoil; +import binnie.botany.api.IFlower; import binnie.botany.flower.TileEntityFlower; import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; @@ -67,12 +71,12 @@ public class Gardening { } } } - return (bias <= -1.0f) ? EnumMoisture.Dry : ((bias >= 1.0f) ? EnumMoisture.Damp : EnumMoisture.Normal); + return (bias <= -1.0f) ? EnumMoisture.DRY : ((bias >= 1.0f) ? EnumMoisture.DAMP : EnumMoisture.NORMAL); } public static EnumAcidity getNaturalPH(World world, BlockPos pos) { final float bias = getBiomePH(world, pos); - return (bias <= -1.0f) ? EnumAcidity.Acid : ((bias >= 1.0f) ? EnumAcidity.Alkaline : EnumAcidity.Neutral); + return (bias <= -1.0f) ? EnumAcidity.ACID : ((bias >= 1.0f) ? EnumAcidity.ALKALINE : EnumAcidity.NEUTRAL); } public static float getBiomeMoisture(World world, BlockPos pos) { diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 85f06598..a7750eac 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -24,7 +24,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSoilMeter extends Item implements IItemModelRegister { - public ItemSoilMeter() { this.setCreativeTab(CreativeTabBotany.instance); this.setUnlocalizedName("soil_meter"); @@ -32,6 +31,26 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { setRegistryName("soil_meter"); } + public static String getPH(ItemStack stack, boolean withColor, boolean byNeutralNone) { + EnumAcidity ph = EnumAcidity.values()[stack.getItemDamage() / 3]; + if (byNeutralNone) { + if (ph == EnumAcidity.NEUTRAL) { + return ""; + } + } + return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor); + } + + public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) { + EnumMoisture moisure = EnumMoisture.values()[stack.getItemDamage() % 3]; + if (byNormalNone) { + if (moisure == EnumMoisture.NORMAL) { + return ""; + } + } + return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); + } + @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { @@ -63,26 +82,6 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { return EnumActionResult.SUCCESS; } - public static String getPH(ItemStack stack, boolean withColor, boolean byNeutralNone) { - EnumAcidity ph = EnumAcidity.values()[stack.getItemDamage() / 3]; - if (byNeutralNone) { - if (ph == EnumAcidity.Neutral) { - return ""; - } - } - return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor); - } - - public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) { - EnumMoisture moisure = EnumMoisture.values()[stack.getItemDamage() % 3]; - if (byNormalNone) { - if (moisure == EnumMoisture.Normal) { - return ""; - } - } - return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); - } - @Override public String getItemStackDisplayName(final ItemStack i) { return "Soil Meter"; diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index a03ad9e2..a8d23f62 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -21,7 +21,11 @@ import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/botany/gardening/ItemWeed.java b/src/main/java/binnie/botany/gardening/ItemWeed.java index 6be1a495..2c8798c9 100644 --- a/src/main/java/binnie/botany/gardening/ItemWeed.java +++ b/src/main/java/binnie/botany/gardening/ItemWeed.java @@ -21,5 +21,4 @@ public class ItemWeed extends ItemBlock { public int getMetadata(int damage) { return damage; } - } diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index ae178f3f..bfbcea45 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -5,7 +5,14 @@ import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; -import binnie.botany.ceramic.*; +import binnie.botany.ceramic.BlockCeramic; +import binnie.botany.ceramic.BlockCeramicPatterned; +import binnie.botany.ceramic.BlockStainedGlass; +import binnie.botany.ceramic.CeramicTileRecipe; +import binnie.botany.ceramic.ItemCeramic; +import binnie.botany.ceramic.ItemStainedGlass; +import binnie.botany.ceramic.PigmentRecipe; +import binnie.botany.ceramic.TileCeramic; import binnie.botany.ceramic.brick.BlockCeramicBrick; import binnie.botany.ceramic.brick.ItemCeramicBrick; import binnie.botany.ceramic.brick.TileCeramicBrick; @@ -78,17 +85,17 @@ public class ModuleGardening implements IInitializable { Botany.ceramic = new BlockCeramic(); Botany.proxy.registerBlock(Botany.ceramic, new ItemCeramic(Botany.ceramic)); BinnieCore.getBinnieProxy().registerTileEntity(TileCeramic.class, "botany.tile.ceramic"); -// BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramic), new ItemMetadataRenderer()); + //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramic), new ItemMetadataRenderer()); Botany.stained = new BlockStainedGlass(); Botany.proxy.registerBlock(Botany.stained, new ItemStainedGlass(Botany.stained)); -// BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.stained), new ItemMetadataRenderer()); + //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.stained), new ItemMetadataRenderer()); Botany.ceramicTile = new BlockCeramicPatterned(); Botany.proxy.registerBlock(Botany.ceramicTile, new ItemDesign(Botany.ceramicTile)); Botany.ceramicBrick = new BlockCeramicBrick(); Botany.proxy.registerBlock(Botany.ceramicBrick, new ItemCeramicBrick(Botany.ceramicBrick)); 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()); + //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer()); + //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer()); } @Override @@ -103,9 +110,9 @@ public class ModuleGardening implements IInitializable { for (boolean fertilised : new boolean[]{true, false}) { for (EnumMoisture moist : EnumMoisture.values()) { ItemStack icon; - if (moist == EnumMoisture.Dry) { + if (moist == EnumMoisture.DRY) { icon = yellow; - } else if (moist == EnumMoisture.Normal) { + } else if (moist == EnumMoisture.NORMAL) { icon = red; } else { icon = blue; @@ -115,9 +122,9 @@ public class ModuleGardening implements IInitializable { insulate += 3; } new CircuitGarden(moist, null, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 0 + 128 * insulate), icon); - new CircuitGarden(moist, EnumAcidity.Acid, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 1 + 128 * insulate), icon); - new CircuitGarden(moist, EnumAcidity.Neutral, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 2 + 128 * insulate), icon); - new CircuitGarden(moist, EnumAcidity.Alkaline, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 3 + 128 * insulate), icon); + new CircuitGarden(moist, EnumAcidity.ACID, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 1 + 128 * insulate), icon); + new CircuitGarden(moist, EnumAcidity.NEUTRAL, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 2 + 128 * insulate), icon); + new CircuitGarden(moist, EnumAcidity.ALKALINE, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 3 + 128 * insulate), icon); } } } diff --git a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java index 0dfabd08..32747234 100644 --- a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java @@ -1,6 +1,12 @@ package binnie.botany.genetics; -import binnie.botany.api.*; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IAlleleFlowerSpeciesBuilder; +import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; import forestry.api.core.IModelManager; import forestry.api.genetics.AlleleManager; @@ -13,20 +19,19 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerSpecies, IAlleleFlowerSpeciesBuilder { - private final IFlowerType flowerType; - private EnumAcidity acidity = EnumAcidity.Neutral; - private EnumMoisture moisture = EnumMoisture.Normal; + private EnumAcidity acidity = EnumAcidity.NEUTRAL; + private EnumMoisture moisture = EnumMoisture.NORMAL; public AlleleFlowerSpecies( - String uid, - String unlocalizedName, - String authority, - String unlocalizedDescription, - boolean isDominant, - IClassification branch, - String binomial, - IFlowerType flowerType) { + String uid, + String unlocalizedName, + String authority, + String unlocalizedDescription, + boolean isDominant, + IClassification branch, + String binomial, + IFlowerType flowerType) { super(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial); this.flowerType = flowerType; } @@ -95,5 +100,4 @@ public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerS public int compareTo(IAlleleFlowerSpecies o) { return 0; } - } diff --git a/src/main/java/binnie/botany/genetics/ColourMix.java b/src/main/java/binnie/botany/genetics/ColourMix.java index d9529fa2..0cf315c7 100644 --- a/src/main/java/binnie/botany/genetics/ColourMix.java +++ b/src/main/java/binnie/botany/genetics/ColourMix.java @@ -9,6 +9,13 @@ public class ColourMix implements IColourMix { IFlowerColour result; int chance; + public ColourMix(final IFlowerColour colour1, final IFlowerColour colour2, final IFlowerColour result, final int chance) { + this.colour1 = colour1; + this.colour2 = colour2; + this.result = result; + this.chance = chance; + } + @Override public IFlowerColour getColourFirst() { return this.colour1; @@ -33,11 +40,4 @@ public class ColourMix implements IColourMix { public IFlowerColour getResult() { return this.result; } - - public ColourMix(final IFlowerColour colour1, final IFlowerColour colour2, final IFlowerColour result, final int chance) { - this.colour1 = colour1; - this.colour2 = colour2; - this.result = result; - this.chance = chance; - } } diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index eb2cf753..158dba61 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -111,21 +111,6 @@ public enum EnumFlowerColor implements IFlowerColour, IAlleleInteger, IStringSer this.colorDis = (r << 16) + (g << 8) + b; } - @Override - public int getColor(final boolean dis) { - return dis ? this.colorDis : this.color; - } - - @Override - public IAlleleInteger getAllele() { - return this; - } - - @Override - public int getID() { - return this.ordinal(); - } - public static void addMix(final EnumFlowerColor start1, final EnumFlowerColor start2, final EnumFlowerColor result, final int chance) { BotanyCore.getFlowerRoot().registerColourMix(new ColourMix(start1, start2, result, chance)); } @@ -2954,6 +2939,25 @@ public enum EnumFlowerColor implements IFlowerColour, IAlleleInteger, IStringSer } } + public static EnumFlowerColor get(final int i) { + return values()[Math.max(0, i) % values().length]; + } + + @Override + public int getColor(final boolean dis) { + return dis ? this.colorDis : this.color; + } + + @Override + public IAlleleInteger getAllele() { + return this; + } + + @Override + public int getID() { + return this.ordinal(); + } + @Override public String getColourName() { return Botany.proxy.localise("colour." + getName()); @@ -2964,10 +2968,6 @@ public enum EnumFlowerColor implements IFlowerColour, IAlleleInteger, IStringSer return name().toLowerCase(); } - public static EnumFlowerColor get(final int i) { - return values()[Math.max(0, i) % values().length]; - } - public String getHTMLName() { return this.name(); } diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index 34d06d64..d66686d3 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -1,6 +1,12 @@ package binnie.botany.genetics; -import binnie.botany.api.*; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IColourMix; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerColour; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerMutation; import binnie.botany.core.BotanyCore; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAllele; @@ -152,6 +158,11 @@ public class Flower extends Individual implements IFlower { return this.age; } + @Override + public void setAge(final int i) { + this.age = i; + } + @Override public void age() { if (this.age < 15) { @@ -159,11 +170,6 @@ public class Flower extends Individual implements IFlower { } } - @Override - public void setAge(final int i) { - this.age = i; - } - @Override public int getMaxAge() { return this.getGenome().getLifespan(); diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index 40a7d3bd..9c91b8d6 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -9,14 +9,20 @@ import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.genetics.Tolerance; -import forestry.api.genetics.*; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import java.util.TreeSet; public class FlowerBreedingSystem extends BreedingSystem { - public FlowerBreedingSystem() { this.iconUndiscovered = Binnie.RESOURCE.getUndiscoveredBeeSprite(); this.iconDiscovered = Binnie.RESOURCE.getDiscoveredBeeSprite(); diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index 88ac03df..1007d215 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -1,12 +1,29 @@ package binnie.botany.genetics; import binnie.Constants; -import binnie.botany.api.*; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.FlowerManager; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IAlleleFlowerSpeciesBuilder; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerDefinition; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerMutationBuilder; +import binnie.botany.api.IFlowerRoot; +import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.AlleleSpeciesRegisterEvent; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleRegistry; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IClassification; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; import net.minecraft.init.Blocks; @@ -62,7 +79,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Orchid("Orchid", "vanda", "coerulea", EnumFlowerType.Orchid, EnumFlowerColor.DeepSkyBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); } @Override @@ -80,7 +97,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Allium("Allium", "allium", "giganteum", EnumFlowerType.Allium, EnumFlowerColor.MediumPurple) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Alkaline); + flowerSpecies.setPH(EnumAcidity.ALKALINE); } @Override @@ -98,7 +115,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Bluet("Bluet", "houstonia", "caerulea", EnumFlowerType.Bluet, EnumFlowerColor.Lavender, EnumFlowerColor.Khaki) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setMoisture(EnumMoisture.Damp); + flowerSpecies.setMoisture(EnumMoisture.DAMP); } @Override @@ -125,7 +142,6 @@ public enum FlowerDefinition implements IFlowerDefinition { 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); - } @Override @@ -175,7 +191,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Pansy("Pansy", "viola", "tricolor", EnumFlowerType.Pansy, EnumFlowerColor.Pink, EnumFlowerColor.Purple) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); flowerSpecies.setTemperature(EnumTemperature.WARM); } @@ -194,7 +210,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Iris("Iris", "iris", "germanica", EnumFlowerType.Iris, EnumFlowerColor.LightGray, EnumFlowerColor.Purple) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); flowerSpecies.setTemperature(EnumTemperature.WARM); } @@ -229,12 +245,11 @@ public enum FlowerDefinition implements IFlowerDefinition { protected void registerMutations() { registerMutation(Allium, Viola, 10); } - }, Viola("Viola", "viola", "odorata", EnumFlowerType.Viola, EnumFlowerColor.MediumPurple, EnumFlowerColor.SlateBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); } @Override @@ -248,7 +263,6 @@ public enum FlowerDefinition implements IFlowerDefinition { protected void registerMutations() { registerMutation(Orchid, Poppy, 15); } - }, Daffodil("Daffodil", "narcissus", "pseudonarcissus", EnumFlowerType.Daffodil, EnumFlowerColor.Yellow, EnumFlowerColor.Gold) { @Override @@ -288,7 +302,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Peony("Peony", "paeonia", "suffruticosa", EnumFlowerType.Peony, EnumFlowerColor.Thistle) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Alkaline); + flowerSpecies.setPH(EnumAcidity.ALKALINE); } @Override @@ -308,7 +322,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Rose("Rose", "rosa", "rubiginosa", EnumFlowerType.Rose, EnumFlowerColor.Red) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); } @Override @@ -327,7 +341,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Lilac("Lilac", "syringa", "vulgaris", EnumFlowerType.Lilac, EnumFlowerColor.Plum) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Alkaline); + flowerSpecies.setPH(EnumAcidity.ALKALINE); } @Override @@ -345,7 +359,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Hydrangea("Hydrangea", "hydrangea", "macrophylla", EnumFlowerType.Hydrangea, EnumFlowerColor.DeepSkyBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setMoisture(EnumMoisture.Damp); + flowerSpecies.setMoisture(EnumMoisture.DAMP); } @Override @@ -466,7 +480,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Azalea("Azalea", "rhododendrons", "aurigeranum", EnumFlowerType.Azalea, EnumFlowerColor.HotPink) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); } @Override @@ -481,7 +495,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Primrose("Primrose", "primula", "vulgaris", EnumFlowerType.Primrose, EnumFlowerColor.Red, EnumFlowerColor.Gold) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); } @Override @@ -511,12 +525,11 @@ public enum FlowerDefinition implements IFlowerDefinition { protected void registerMutations() { registerMutation(Daisy, Tulip, 10); } - }, Carnation("Carnation", "dianthus", "caryophyllus", EnumFlowerType.Carnation, EnumFlowerColor.Crimson, EnumFlowerColor.White) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Alkaline); + flowerSpecies.setPH(EnumAcidity.ALKALINE); } @Override @@ -554,7 +567,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Yarrow("Yarrow", "achillea", "millefolium", EnumFlowerType.Yarrow, EnumFlowerColor.Yellow) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); } @Override @@ -633,7 +646,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Dianthus("Dianthus", "dianthus", "barbatus", EnumFlowerType.Dianthus, EnumFlowerColor.Crimson, EnumFlowerColor.HotPink) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Alkaline); + flowerSpecies.setPH(EnumAcidity.ALKALINE); } @Override @@ -654,7 +667,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Forget("Forget-me-nots", "myosotis", "arvensis", EnumFlowerType.Forget, EnumFlowerColor.LightSteelBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); } @Override @@ -708,7 +721,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Edelweiss("Edelweiss", "leontopodium", "alpinum", EnumFlowerType.Edelweiss, EnumFlowerColor.White, EnumFlowerColor.Khaki) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Alkaline); + flowerSpecies.setPH(EnumAcidity.ALKALINE); } @Override @@ -765,7 +778,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Gaillardia("Gaillardia", "gaillardia", "aristata", EnumFlowerType.Gaillardia, EnumFlowerColor.DarkOrange, EnumFlowerColor.Yellow) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setMoisture(EnumMoisture.Damp); + flowerSpecies.setMoisture(EnumMoisture.DAMP); } @Override @@ -787,7 +800,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Auricula("Auricula", "primula", "auricula", EnumFlowerType.Auricula, EnumFlowerColor.Red, EnumFlowerColor.Yellow) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); + flowerSpecies.setPH(EnumAcidity.ACID); } @Override @@ -807,8 +820,8 @@ public enum FlowerDefinition implements IFlowerDefinition { Camellia("Camellia", "camellia", "japonica", EnumFlowerType.Camellia, EnumFlowerColor.Crimson) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setPH(EnumAcidity.Acid); - flowerSpecies.setMoisture(EnumMoisture.Damp); + flowerSpecies.setPH(EnumAcidity.ACID); + flowerSpecies.setMoisture(EnumMoisture.DAMP); flowerSpecies.setTemperature(EnumTemperature.WARM); } @@ -866,7 +879,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Penstemon("Penstemon", "penstemon", "digitalis", EnumFlowerType.Penstemon, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Thistle) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setMoisture(EnumMoisture.Dry); + flowerSpecies.setMoisture(EnumMoisture.DRY); flowerSpecies.setTemperature(EnumTemperature.WARM); } @@ -888,7 +901,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Delphinium("Delphinium", "delphinium", "staphisagria", EnumFlowerType.Delphinium, EnumFlowerColor.DarkSlateBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { - flowerSpecies.setMoisture(EnumMoisture.Damp); + flowerSpecies.setMoisture(EnumMoisture.DAMP); } @Override @@ -925,6 +938,8 @@ public enum FlowerDefinition implements IFlowerDefinition { } }; + public static FlowerDefinition[] VALUES = values(); + private final IAlleleFlowerSpecies species; IFlowerType type; String name; String binomial; @@ -933,28 +948,6 @@ public enum FlowerDefinition implements IFlowerDefinition { @Nullable IClassification branch; EnumFlowerColor primaryColor, secondaryColor; - - private static void setupVariants() { - IFlowerRoot flowerRood = BotanyCore.getFlowerRoot(); - flowerRood.addConversion(new ItemStack(Blocks.YELLOW_FLOWER, 1, 0), Dandelion.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 0), Poppy.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 1), Orchid.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 2), Allium.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 3), Bluet.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 7), Tulip.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 8), Daisy.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.DOUBLE_PLANT, 1, 1), Lilac.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.DOUBLE_PLANT, 1, 4), Rose.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.DOUBLE_PLANT, 1, 5), Peony.getTemplate()); - flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 6), Tulip.addVariant(EnumFlowerColor.White)); - flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 4), Tulip.addVariant(EnumFlowerColor.Crimson)); - flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 5), Tulip.addVariant(EnumFlowerColor.DarkOrange)); - } - - public static FlowerDefinition[] VALUES = values(); - - private final IAlleleFlowerSpecies species; - private IAllele[] template; private IFlowerGenome genome; @@ -991,6 +984,52 @@ public enum FlowerDefinition implements IFlowerDefinition { } } + private static void setupVariants() { + IFlowerRoot flowerRood = BotanyCore.getFlowerRoot(); + flowerRood.addConversion(new ItemStack(Blocks.YELLOW_FLOWER, 1, 0), Dandelion.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 0), Poppy.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 1), Orchid.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 2), Allium.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 3), Bluet.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 7), Tulip.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 8), Daisy.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.DOUBLE_PLANT, 1, 1), Lilac.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.DOUBLE_PLANT, 1, 4), Rose.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.DOUBLE_PLANT, 1, 5), Peony.getTemplate()); + flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 6), Tulip.addVariant(EnumFlowerColor.White)); + flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 4), Tulip.addVariant(EnumFlowerColor.Crimson)); + flowerRood.addConversion(new ItemStack(Blocks.RED_FLOWER, 1, 5), Tulip.addVariant(EnumFlowerColor.DarkOrange)); + } + + public static void preInitFlowers() { + MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(FlowerManager.flowerRoot, IAlleleFlowerSpecies.class)); + for (FlowerDefinition def : values()) { + @SuppressWarnings("unchecked") + IFlowerType type = def.species.getType(); + if (EnumFlowerType.highestSection < type.getSections()) { + EnumFlowerType.highestSection = type.getSections(); + } + } + } + + public static void initFlowers() { + for (FlowerDefinition flower : values()) { + flower.init(); + } + setupVariants(); + for (FlowerDefinition flower : values()) { + flower.registerMutations(); + } + } + + private static void markAllelesAsValid(IChromosomeType existingType, IChromosomeType newType) { + IAlleleRegistry alleleRegistry = AlleleManager.alleleRegistry; + Collection alleles = alleleRegistry.getRegisteredAlleles(existingType); + for (IAllele allele : alleles) { + alleleRegistry.addValidAlleleTypes(allele, newType); + } + } + protected abstract void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies); protected abstract void setAlleles(IAllele[] alleles); @@ -1013,10 +1052,6 @@ public enum FlowerDefinition implements IFlowerDefinition { return this.variantTemplates; } - public void setBranch(final IClassification branch) { - this.branch = branch; - } - public IClassification getBranch() { if (branch == null) { final String scientific = branchName.substring(0, 1).toUpperCase() + branchName.substring(1).toLowerCase(); @@ -1030,6 +1065,10 @@ public enum FlowerDefinition implements IFlowerDefinition { return this.branch; } + public void setBranch(final IClassification branch) { + this.branch = branch; + } + @Override public final IAllele[] getTemplate() { return Arrays.copyOf(template, template.length); @@ -1055,27 +1094,6 @@ public enum FlowerDefinition implements IFlowerDefinition { return BotanyCore.getFlowerRoot().getMemberStack(flower, flowerStage); } - public static void preInitFlowers() { - MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(FlowerManager.flowerRoot, IAlleleFlowerSpecies.class)); - for (FlowerDefinition def : values()) { - @SuppressWarnings("unchecked") - IFlowerType type = def.species.getType(); - if (EnumFlowerType.highestSection < type.getSections()) { - EnumFlowerType.highestSection = type.getSections(); - } - } - } - - public static void initFlowers() { - for (FlowerDefinition flower : values()) { - flower.init(); - } - setupVariants(); - for (FlowerDefinition flower : values()) { - flower.registerMutations(); - } - } - private void init() { markAllelesAsValid(EnumBeeChromosome.FERTILITY, EnumFlowerChromosome.FERTILITY); markAllelesAsValid(EnumBeeChromosome.TERRITORY, EnumFlowerChromosome.TERRITORY); @@ -1100,14 +1118,6 @@ public enum FlowerDefinition implements IFlowerDefinition { } } - private static void markAllelesAsValid(IChromosomeType existingType, IChromosomeType newType) { - IAlleleRegistry alleleRegistry = AlleleManager.alleleRegistry; - Collection alleles = alleleRegistry.getRegisteredAlleles(existingType); - for (IAllele allele : alleles) { - alleleRegistry.addValidAlleleTypes(allele, newType); - } - } - protected final IFlowerMutationBuilder registerMutation(final FlowerDefinition parent1, final FlowerDefinition parent2, final int chance) { return FlowerManager.flowerFactory.createMutation(parent1.species, parent2.species, getTemplate(), chance); } diff --git a/src/main/java/binnie/botany/genetics/FlowerFactory.java b/src/main/java/binnie/botany/genetics/FlowerFactory.java index ef888966..c23dc743 100644 --- a/src/main/java/binnie/botany/genetics/FlowerFactory.java +++ b/src/main/java/binnie/botany/genetics/FlowerFactory.java @@ -1,12 +1,16 @@ package binnie.botany.genetics; -import binnie.botany.api.*; +import binnie.botany.api.FlowerManager; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IAlleleFlowerSpeciesBuilder; +import binnie.botany.api.IFlowerFactory; +import binnie.botany.api.IFlowerMutationBuilder; +import binnie.botany.api.IFlowerType; import binnie.botany.flower.FlowerSpriteManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; public class FlowerFactory implements IFlowerFactory { - @Override public IAlleleFlowerSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, IFlowerType flowerType) { FlowerSpriteManager.initSprites(flowerType); @@ -19,5 +23,4 @@ public class FlowerFactory implements IFlowerFactory { FlowerManager.flowerRoot.registerMutation(mutation); return mutation; } - } diff --git a/src/main/java/binnie/botany/genetics/FlowerGenome.java b/src/main/java/binnie/botany/genetics/FlowerGenome.java index 9e7cef36..e13d7c94 100644 --- a/src/main/java/binnie/botany/genetics/FlowerGenome.java +++ b/src/main/java/binnie/botany/genetics/FlowerGenome.java @@ -1,10 +1,22 @@ package binnie.botany.genetics; import binnie.Binnie; -import binnie.botany.api.*; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.FlowerManager; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.*; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAlleleFloat; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IChromosome; +import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.Genome; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/binnie/botany/genetics/FlowerMutation.java b/src/main/java/binnie/botany/genetics/FlowerMutation.java index 7ca5144f..8755e41e 100644 --- a/src/main/java/binnie/botany/genetics/FlowerMutation.java +++ b/src/main/java/binnie/botany/genetics/FlowerMutation.java @@ -1,6 +1,10 @@ package binnie.botany.genetics; -import binnie.botany.api.*; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerMutation; +import binnie.botany.api.IFlowerMutationBuilder; +import binnie.botany.api.IFlowerRoot; import binnie.botany.core.BotanyCore; import forestry.api.core.ForestryAPI; import forestry.api.genetics.IAllele; @@ -10,7 +14,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class FlowerMutation extends Mutation implements IFlowerMutation, IFlowerMutationBuilder { - public FlowerMutation(final IAlleleFlowerSpecies allele0, final IAlleleFlowerSpecies allele1, final IAllele[] template, final int chance) { super(allele0, allele1, template, chance); } diff --git a/src/main/java/binnie/botany/genetics/FlowerRoot.java b/src/main/java/binnie/botany/genetics/FlowerRoot.java index b23fb46f..afb06540 100644 --- a/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -1,9 +1,23 @@ package binnie.botany.genetics; import binnie.botany.Botany; -import binnie.botany.api.*; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IBotanistTracker; +import binnie.botany.api.IColourMix; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerMutation; +import binnie.botany.api.IFlowerRoot; import com.mojang.authlib.GameProfile; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlyzerPlugin; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesType; import forestry.core.genetics.SpeciesRoot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -11,15 +25,20 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { - public static int flowerSpeciesCount = -1; static final String UID = "rootFlowers"; + public static int flowerSpeciesCount = -1; public static ArrayList flowerTemplates = new ArrayList<>(); private static ArrayList flowerMutations = new ArrayList<>(); - Map conversions; private static ArrayList colourMixes = new ArrayList<>(); + Map conversions; public FlowerRoot() { this.conversions = new HashMap<>(); @@ -227,7 +246,6 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { return EnumFlowerChromosome.SPECIES; } - @Override public void addConversion(final ItemStack itemstack, final IAllele[] template) { final IFlower flower = this.getFlower(this.templateAsGenome(template)); @@ -257,5 +275,4 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { } return FlowerRoot.colourMixes; } - } diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 9affa4c9..7a122484 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -17,7 +17,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ItemDictionary extends Item implements IItemModelRegister { - public ItemDictionary() { this.setCreativeTab(CreativeTabBotany.instance); this.setUnlocalizedName("database"); diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index 028468b8..20834706 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -52,15 +52,15 @@ public class ModuleGenetics implements IInitializable { public void postInit() { FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla"); RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(Botany.database), - "X#X", - "YEY", - "RDR", - '#', Blocks.GLASS_PANE, - 'X', Items.GOLD_INGOT, - 'Y', Items.GOLD_NUGGET, - 'R', Items.REDSTONE, - 'D', Items.DIAMOND, - 'E', Items.EMERALD); + "X#X", + "YEY", + "RDR", + '#', Blocks.GLASS_PANE, + 'X', Items.GOLD_INGOT, + 'Y', Items.GOLD_NUGGET, + 'R', Items.REDSTONE, + 'D', Items.DIAMOND, + 'E', Items.EMERALD + ); } - } diff --git a/src/main/java/binnie/botany/network/PacketFlowerUpdate.java b/src/main/java/binnie/botany/network/PacketFlowerUpdate.java index 11bd783c..de36aa4f 100644 --- a/src/main/java/binnie/botany/network/PacketFlowerUpdate.java +++ b/src/main/java/binnie/botany/network/PacketFlowerUpdate.java @@ -44,5 +44,4 @@ public class PacketFlowerUpdate extends SPacketUpdateTileEntity { buf.writeBoolean(this.render.wilted); buf.writeBoolean(this.render.flowered); } - } diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index 701de538..9dacd1b0 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -24,8 +24,8 @@ public enum PacketID implements IPacketID { onUseFieldKit(packet.getTagCompound()); } } - - public void onUseFieldKit(NBTTagCompound data){ + + public void onUseFieldKit(NBTTagCompound data) { EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); String info = ""; if (data == null || data.hasNoTags()) { diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 95713f8c..fb321e29 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -18,9 +18,9 @@ import java.util.ArrayList; import java.util.List; public abstract class AbstractMod implements IPacketProvider, IInitializable { + protected List modules; @Nullable private SimpleNetworkWrapper wrapper; - protected List modules; public AbstractMod() { this.modules = new ArrayList<>(); @@ -59,7 +59,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { protected abstract Class getPacketHandler(); - public Object getMod(){ + public Object getMod() { return this; } diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index a781faf3..b5ce55ca 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -52,30 +52,23 @@ import java.util.ArrayList; import java.util.List; @Mod( - modid = Constants.CORE_MOD_ID, - name = "Binnie Core", - useMetadata = true, - dependencies = "required-after:forge@[13.20.0.2279,);" + - "required-after:forestry@[5.3.3.89,);" + - "after:jei@[4.3.1,);" + modid = Constants.CORE_MOD_ID, + name = "Binnie Core", + useMetadata = true, + dependencies = "required-after:forge@[13.20.0.2279,);" + + "required-after:forestry@[5.3.3.89,);" + + "after:jei@[4.3.1,);" ) public final class BinnieCore extends AbstractMod { - public BinnieCore() { - FluidRegistry.enableUniversalBucket(); - } - + private static final List modList = new ArrayList<>(); + public static int multipassRenderID; @SuppressWarnings("NullableProblems") @Mod.Instance(Constants.CORE_MOD_ID) private static BinnieCore instance; - @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer") private static BinnieProxy proxy; - - public static int multipassRenderID; - private static final List modList = new ArrayList<>(); - @Nullable private static MachineGroup packageCompartment; @Nullable @@ -83,6 +76,10 @@ public final class BinnieCore extends AbstractMod { @Nullable private static ItemFieldKit fieldKit; + public BinnieCore() { + FluidRegistry.enableUniversalBucket(); + } + public static MachineGroup getPackageCompartment() { Preconditions.checkState(packageCompartment != null, "packageCompartment has not been init"); return packageCompartment; @@ -114,6 +111,52 @@ public final class BinnieCore extends AbstractMod { return instance; } + public static BinnieProxy getBinnieProxy() { + return proxy; + } + + public static boolean isLepidopteryActive() { + return PluginManager.configDisabledPlugins.stream().noneMatch(e -> e instanceof forestry.lepidopterology.PluginLepidopterology); + } + + public static boolean isApicultureActive() { + return PluginManager.configDisabledPlugins.stream().noneMatch(e -> e instanceof forestry.arboriculture.PluginArboriculture); + } + + public static boolean isArboricultureActive() { + return PluginManager.configDisabledPlugins.stream().noneMatch(e -> e instanceof forestry.arboriculture.PluginArboriculture); + } + + public static boolean isBotanyActive() { + return ConfigurationMods.botany; + } + + public static boolean isGeneticsActive() { + return ConfigurationMods.genetics; + } + + public static boolean isExtraBeesActive() { + return ExtraBeesIntegration.isLoaded() && isApicultureActive(); + } + + public static boolean isExtraTreesActive() { + return ConfigurationMods.extraTrees && isArboricultureActive(); + } + + static void registerMod(final AbstractMod mod) { + BinnieCore.modList.add(mod); + } + + private static List getActiveMods() { + final List list = new ArrayList<>(); + for (final AbstractMod mod : BinnieCore.modList) { + if (mod.isActive()) { + list.add(mod); + } + } + return list; + } + @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { MinecraftForge.EVENT_BUS.register(Binnie.LIQUID); @@ -150,7 +193,7 @@ public final class BinnieCore extends AbstractMod { if (Loader.isModLoaded("BuildCraft|Silicon")) { this.addModule(new ModuleTrigger()); } - if (ExtraBeesIntegration.isLoaded()){ + if (ExtraBeesIntegration.isLoaded()) { this.addModule(new ExtraBeesIntegration()); } } @@ -170,9 +213,7 @@ public final class BinnieCore extends AbstractMod { return proxy; } - public static BinnieProxy getBinnieProxy() { - return proxy; - } + //Module handling @Override public String getModID() { @@ -218,9 +259,9 @@ public final class BinnieCore extends AbstractMod { @SubscribeEvent @SideOnly(Side.CLIENT) public void handleTextureRemap(final TextureStitchEvent.Pre event) { -// if (event.map.getTextureType() == 0) { -// Binnie.Liquid.reloadIcons(event.map); -// } + /*if (event.map.getTextureType() == 0) { + Binnie.Liquid.reloadIcons(event.map); + }*/ Binnie.RESOURCE.registerSprites(); } @@ -235,49 +276,4 @@ public final class BinnieCore extends AbstractMod { super(BinnieCore.getInstance()); } } - - //Module handling - - public static boolean isLepidopteryActive() { - return PluginManager.configDisabledPlugins.stream().noneMatch(e -> e instanceof forestry.lepidopterology.PluginLepidopterology); - } - - public static boolean isApicultureActive() { - return PluginManager.configDisabledPlugins.stream().noneMatch(e -> e instanceof forestry.arboriculture.PluginArboriculture); - } - - public static boolean isArboricultureActive() { - return PluginManager.configDisabledPlugins.stream().noneMatch(e -> e instanceof forestry.arboriculture.PluginArboriculture); - } - - public static boolean isBotanyActive() { - return ConfigurationMods.botany; - } - - public static boolean isGeneticsActive() { - return ConfigurationMods.genetics; - } - - public static boolean isExtraBeesActive() { - return ExtraBeesIntegration.isLoaded() && isApicultureActive(); - } - - public static boolean isExtraTreesActive() { - return ConfigurationMods.extraTrees && isArboricultureActive(); - } - - static void registerMod(final AbstractMod mod) { - BinnieCore.modList.add(mod); - } - - private static List getActiveMods() { - final List list = new ArrayList<>(); - for (final AbstractMod mod : BinnieCore.modList) { - if (mod.isActive()) { - list.add(mod); - } - } - return list; - } - } diff --git a/src/main/java/binnie/core/block/BaseBakedModel.java b/src/main/java/binnie/core/block/BaseBakedModel.java index ef56fead..6d21b816 100644 --- a/src/main/java/binnie/core/block/BaseBakedModel.java +++ b/src/main/java/binnie/core/block/BaseBakedModel.java @@ -37,6 +37,7 @@ import java.util.EnumMap; @SideOnly(Side.CLIENT) public abstract class BaseBakedModel implements IPerspectiveAwareModel { + private static final TRSRTransformation flipX = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null); private final EnumMap transformMap = new EnumMap<>(ItemCameraTransforms.TransformType.class); private final ResourceLocation particle; @@ -48,10 +49,24 @@ public abstract class BaseBakedModel implements IPerspectiveAwareModel { this.particle = particle != null ? particle : TextureMap.LOCATION_MISSING_TEXTURE; } + protected static TRSRTransformation toLeftHand(TRSRTransformation transform) { + return TRSRTransformation.blockCenterToCorner(flipX.compose(TRSRTransformation.blockCornerToCenter(transform)).compose(flipX)); + } + + protected static TRSRTransformation getTransformation(float tx, float ty, float tz, float ax, float ay, float az, float s) { + return TRSRTransformation.blockCenterToCorner(new TRSRTransformation( + new Vector3f(tx / 16, ty / 16, tz / 16), + TRSRTransformation.quatFromXYZDegrees(new Vector3f(ax, ay, az)), + new Vector3f(s, s, s), + null + )); + } + @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { return ImmutablePair.of(this, - transformMap.containsKey(cameraTransformType) ? transformMap.get(cameraTransformType).getMatrix() : null); + transformMap.containsKey(cameraTransformType) ? transformMap.get(cameraTransformType).getMatrix() : null + ); } @Override @@ -84,6 +99,8 @@ public abstract class BaseBakedModel implements IPerspectiveAwareModel { return ItemOverrideList.NONE; } + // ForgeBlockStateV1 transforms + public void addTransformation(ItemCameraTransforms.TransformType type, TRSRTransformation transformation) { transformMap.put(type, TRSRTransformation.blockCornerToCenter(transformation)); } @@ -98,22 +115,6 @@ public abstract class BaseBakedModel implements IPerspectiveAwareModel { addTransformation(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, toLeftHand(transformation)); } - // ForgeBlockStateV1 transforms - - private static final TRSRTransformation flipX = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null); - - protected static TRSRTransformation toLeftHand(TRSRTransformation transform) { - return TRSRTransformation.blockCenterToCorner(flipX.compose(TRSRTransformation.blockCornerToCenter(transform)).compose(flipX)); - } - - protected static TRSRTransformation getTransformation(float tx, float ty, float tz, float ax, float ay, float az, float s) { - return TRSRTransformation.blockCenterToCorner(new TRSRTransformation( - new Vector3f(tx / 16, ty / 16, tz / 16), - TRSRTransformation.quatFromXYZDegrees(new Vector3f(ax, ay, az)), - new Vector3f(s, s, s), - null)); - } - public BaseBakedModel addDefaultBlockTransforms() { TRSRTransformation thirdperson = getTransformation(0, 2.5f, 0, 75, 45, 0, 0.375f); addTransformation(ItemCameraTransforms.TransformType.GUI, getTransformation(0, 0, 0, 30, 225, 0, 0.625f)); diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index c7cfa6cd..bc393b52 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -26,47 +26,6 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { super(material); } - @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return getBlockDroppedAsList(this, world, pos); - } - - @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { - return breakBlock(this, player, world, pos); - } - - @Override - public TileEntity createNewTileEntity(final World var1, final int i) { - return new TileEntityMetadata(); - } - - @Override - public boolean hasTileEntity(IBlockState state) { - return true; - } - - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return getPickBlock(world, pos); - } - - /* IBLOCKMETADATA */ - @Override - public String getDisplayName(final ItemStack itemStack) { - return this.getLocalizedName(); - } - - @Override - public int getPlacedMeta(final ItemStack item, final World world, final BlockPos pos, final EnumFacing clickedBlock) { - return TileEntityMetadata.getItemDamage(item); - } - - @Override - public int getDroppedMeta(IBlockState state, int tileMetadata) { - return getMetaFromState(state); - } - public static ItemStack getBlockDropped(IBlockMetadata block, IBlockAccess world, BlockPos pos) { TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); if (tile != null && !tile.hasDroppedBlock()) { @@ -109,4 +68,44 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { return getBlockDropped((IBlockMetadata) block, world, pos); } + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + return getBlockDroppedAsList(this, world, pos); + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + return breakBlock(this, player, world, pos); + } + + @Override + public TileEntity createNewTileEntity(final World var1, final int i) { + return new TileEntityMetadata(); + } + + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return getPickBlock(world, pos); + } + + /* IBLOCKMETADATA */ + @Override + public String getDisplayName(final ItemStack itemStack) { + return this.getLocalizedName(); + } + + @Override + public int getPlacedMeta(final ItemStack item, final World world, final BlockPos pos, final EnumFacing clickedBlock) { + return TileEntityMetadata.getItemDamage(item); + } + + @Override + public int getDroppedMeta(IBlockState state, int tileMetadata) { + return getMetaFromState(state); + } } diff --git a/src/main/java/binnie/core/block/IMultipassBlock.java b/src/main/java/binnie/core/block/IMultipassBlock.java index edf7e792..8ed490e5 100644 --- a/src/main/java/binnie/core/block/IMultipassBlock.java +++ b/src/main/java/binnie/core/block/IMultipassBlock.java @@ -12,7 +12,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; public interface IMultipassBlock { - default AxisAlignedBB getItemBoundingBox() { return Block.FULL_BLOCK_AABB; } diff --git a/src/main/java/binnie/core/block/ItemMetadataRenderer.java b/src/main/java/binnie/core/block/ItemMetadataRenderer.java index 6a1dfd44..2f3eaa89 100644 --- a/src/main/java/binnie/core/block/ItemMetadataRenderer.java +++ b/src/main/java/binnie/core/block/ItemMetadataRenderer.java @@ -2,37 +2,37 @@ package binnie.core.block; public class ItemMetadataRenderer //implements IItemRenderer { -// @Override -// public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { -// return type == IItemRenderer.ItemRenderType.INVENTORY || type == IItemRenderer.ItemRenderType.ENTITY || type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON; -// } -// -// @Override -// public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { -// if (type == IItemRenderer.ItemRenderType.INVENTORY) { -// return helper == IItemRenderer.ItemRendererHelper.INVENTORY_BLOCK; -// } -// if (type == IItemRenderer.ItemRenderType.ENTITY) { -// return helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING || helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION; -// } -// return (type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) && helper == IItemRenderer.ItemRendererHelper.EQUIPPED_BLOCK; -// } -// -// @Override -// public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { -// GlStateManager.pushMatrix(); -// final Block block = Block.getBlockFromItem(item.getItem()); -// if (type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) { -// GlStateManager.translate(0.5, 0.5, 0.5); -// } -// if (type == IItemRenderer.ItemRenderType.INVENTORY && block.getRenderBlockPass() != 0) { -// GL11.glAlphaFunc(516, 0.1f); -// GlStateManager.enableBlend(); -// OpenGlHelper.glBlendFunc(770, 771, 1, 0); -// } -// GlStateManager.pushMatrix(); -// ((RenderBlocks) data[0]).renderBlockAsItem(block, TileEntityMetadata.getItemDamage(item), 1.0f); -// GlStateManager.popMatrix(); -// GlStateManager.popMatrix(); -// } + /*@Override + public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { + return type == IItemRenderer.ItemRenderType.INVENTORY || type == IItemRenderer.ItemRenderType.ENTITY || type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON; + } + + @Override + public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { + if (type == IItemRenderer.ItemRenderType.INVENTORY) { + return helper == IItemRenderer.ItemRendererHelper.INVENTORY_BLOCK; + } + if (type == IItemRenderer.ItemRenderType.ENTITY) { + return helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING || helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION; + } + return (type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) && helper == IItemRenderer.ItemRendererHelper.EQUIPPED_BLOCK; + } + + @Override + public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { + GlStateManager.pushMatrix(); + final Block block = Block.getBlockFromItem(item.getItem()); + if (type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) { + GlStateManager.translate(0.5, 0.5, 0.5); + } + if (type == IItemRenderer.ItemRenderType.INVENTORY && block.getRenderBlockPass() != 0) { + GL11.glAlphaFunc(516, 0.1f); + GlStateManager.enableBlend(); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + } + GlStateManager.pushMatrix(); + ((RenderBlocks) data[0]).renderBlockAsItem(block, TileEntityMetadata.getItemDamage(item), 1.0f); + GlStateManager.popMatrix(); + GlStateManager.popMatrix(); + }*/ } diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index 8b463cc5..b3c6c6ae 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -23,6 +23,42 @@ public class TileEntityMetadata extends TileEntity { this.droppedBlock = false; } + @Nullable + public static TileEntityMetadata getTile(final IBlockAccess world, final BlockPos pos) { + final TileEntity tile = world.getTileEntity(pos); + if (!(tile instanceof TileEntityMetadata)) { + return null; + } + return (TileEntityMetadata) tile; + } + + public static ItemStack getItemStack(final Block block, final int damage) { + final Item item = Item.getItemFromBlock(block); + Preconditions.checkNotNull(item, "Could not get item for block %s", block); + final ItemStack itemStack = new ItemStack(item, 1, 0); + setItemDamage(itemStack, damage); + return itemStack; + } + + public static void setItemDamage(final ItemStack item, final int i) { + item.setItemDamage((i < 16387) ? i : 16387); + final NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("meta", i); + item.setTagCompound(tag); + } + + public static int getItemDamage(final ItemStack item) { + if (item.hasTagCompound() && item.getTagCompound().hasKey("meta")) { + return item.getTagCompound().getInteger("meta"); + } + return item.getItemDamage(); + } + + public static int getTileMetadata(final IBlockAccess world, final BlockPos pos) { + final TileEntityMetadata tile = getTile(world, pos); + return (tile == null) ? 0 : tile.getTileMetadata(); + } + @Override public boolean receiveClientEvent(final int id, final int type) { if (id == 42) { @@ -78,42 +114,6 @@ public class TileEntityMetadata extends TileEntity { return new PacketMetadata(pos, meta, getUpdateTag()); } - @Nullable - public static TileEntityMetadata getTile(final IBlockAccess world, final BlockPos pos) { - final TileEntity tile = world.getTileEntity(pos); - if (!(tile instanceof TileEntityMetadata)) { - return null; - } - return (TileEntityMetadata) tile; - } - - public static ItemStack getItemStack(final Block block, final int damage) { - final Item item = Item.getItemFromBlock(block); - Preconditions.checkNotNull(item, "Could not get item for block %s", block); - final ItemStack itemStack = new ItemStack(item, 1, 0); - setItemDamage(itemStack, damage); - return itemStack; - } - - public static void setItemDamage(final ItemStack item, final int i) { - item.setItemDamage((i < 16387) ? i : 16387); - final NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("meta", i); - item.setTagCompound(tag); - } - - public static int getItemDamage(final ItemStack item) { - if (item.hasTagCompound() && item.getTagCompound().hasKey("meta")) { - return item.getTagCompound().getInteger("meta"); - } - return item.getItemDamage(); - } - - public static int getTileMetadata(final IBlockAccess world, final BlockPos pos) { - final TileEntityMetadata tile = getTile(world, pos); - return (tile == null) ? 0 : tile.getTileMetadata(); - } - public boolean hasDroppedBlock() { return this.droppedBlock; } diff --git a/src/main/java/binnie/core/craftgui/CraftGUI.java b/src/main/java/binnie/core/craftgui/CraftGUI.java index 9754b053..f2bf7890 100644 --- a/src/main/java/binnie/core/craftgui/CraftGUI.java +++ b/src/main/java/binnie/core/craftgui/CraftGUI.java @@ -7,6 +7,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class CraftGUI { - public static CraftGUIResourceManager resourceManager; public static final TextureRenderer render = new TextureRenderer(); + public static CraftGUIResourceManager resourceManager; } diff --git a/src/main/java/binnie/core/craftgui/IWidget.java b/src/main/java/binnie/core/craftgui/IWidget.java index bee5fb8c..6ea366b0 100644 --- a/src/main/java/binnie/core/craftgui/IWidget.java +++ b/src/main/java/binnie/core/craftgui/IWidget.java @@ -24,16 +24,16 @@ public interface IWidget { Point getPosition(); - Point pos(); - void setPosition(final Point p0); + Point pos(); + Point getSize(); - Point size(); - void setSize(final Point p0); + Point size(); + Point getOriginalPosition(); Point getAbsolutePosition(); @@ -42,20 +42,20 @@ public interface IWidget { Point getOffset(); + void setOffset(final Point p0); + Area getArea(); Area area(); - void setOffset(final Point p0); - Point getMousePosition(); Point getRelativeMousePosition(); - void setColour(final int p0); - int getColour(); + void setColour(final int p0); + @SideOnly(Side.CLIENT) void render(int guiWidth, int guiHeight); diff --git a/src/main/java/binnie/core/craftgui/Tooltip.java b/src/main/java/binnie/core/craftgui/Tooltip.java index 580b7b8d..f5417be3 100644 --- a/src/main/java/binnie/core/craftgui/Tooltip.java +++ b/src/main/java/binnie/core/craftgui/Tooltip.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; public class Tooltip { + public int maxWidth; List tooltip; ITooltipType type; - public int maxWidth; private ItemStack itemStack = ItemStack.EMPTY; public Tooltip() { @@ -19,13 +19,6 @@ public class Tooltip { this.maxWidth = 256; } - /** - * Sets the itemStack seen by tooltip event handlers. - */ - public void setItemStack(ItemStack itemStack) { - this.itemStack = itemStack; - } - /** * Gets the itemStack seen by tooltip event handlers. */ @@ -33,6 +26,13 @@ public class Tooltip { return itemStack; } + /** + * Sets the itemStack seen by tooltip event handlers. + */ + public void setItemStack(ItemStack itemStack) { + this.itemStack = itemStack; + } + public void add(final String string) { this.tooltip.add(string); } @@ -53,10 +53,6 @@ public class Tooltip { return this.tooltip.size() > 0; } - public void setType(final ITooltipType type) { - this.type = type; - } - public void setMaxWidth(final int w) { this.maxWidth = w; } @@ -65,6 +61,10 @@ public class Tooltip { return this.type; } + public void setType(final ITooltipType type) { + this.type = type; + } + /** * Add a tooltip that also displays an itemStack on the tooltip directly. */ diff --git a/src/main/java/binnie/core/craftgui/TopLevelWidget.java b/src/main/java/binnie/core/craftgui/TopLevelWidget.java index df76f736..8f321721 100644 --- a/src/main/java/binnie/core/craftgui/TopLevelWidget.java +++ b/src/main/java/binnie/core/craftgui/TopLevelWidget.java @@ -7,16 +7,21 @@ import binnie.core.craftgui.geometry.Point; import org.lwjgl.input.Mouse; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Deque; +import java.util.List; +import java.util.ListIterator; public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { + protected Point mousePosition; @Nullable IWidget mousedOverWidget; @Nullable IWidget draggedWidget; @Nullable IWidget focusedWidget; - protected Point mousePosition; Point dragStart; public TopLevelWidget() { @@ -47,6 +52,25 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { }); } + public void setDraggedWidget(@Nullable final IWidget widget, final int button) { + if (this.draggedWidget == widget) { + return; + } + if (this.draggedWidget != null) { + this.callEvent(new EventWidget.EndDrag(this.draggedWidget)); + } + this.draggedWidget = widget; + if (this.draggedWidget != null) { + this.callEvent(new EventWidget.StartDrag(this.draggedWidget, button)); + } + } + + @Override + @Nullable + public IWidget getMousedOverWidget() { + return this.mousedOverWidget; + } + public void setMousedOverWidget(@Nullable final IWidget widget) { if (this.mousedOverWidget == widget) { return; @@ -60,21 +84,20 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { } } + @Override + @Nullable + public IWidget getDraggedWidget() { + return this.draggedWidget; + } + public void setDraggedWidget(@Nullable final IWidget widget) { this.setDraggedWidget(widget, -1); } - public void setDraggedWidget(@Nullable final IWidget widget, final int button) { - if (this.draggedWidget == widget) { - return; - } - if (this.draggedWidget != null) { - this.callEvent(new EventWidget.EndDrag(this.draggedWidget)); - } - this.draggedWidget = widget; - if (this.draggedWidget != null) { - this.callEvent(new EventWidget.StartDrag(this.draggedWidget, button)); - } + @Override + @Nullable + public IWidget getFocusedWidget() { + return this.focusedWidget; } public void setFocusedWidget(@Nullable final IWidget widget) { @@ -94,24 +117,6 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { } } - @Override - @Nullable - public IWidget getMousedOverWidget() { - return this.mousedOverWidget; - } - - @Override - @Nullable - public IWidget getDraggedWidget() { - return this.draggedWidget; - } - - @Override - @Nullable - public IWidget getFocusedWidget() { - return this.focusedWidget; - } - @Override public boolean isMouseOver(final IWidget widget) { return this.getMousedOverWidget() == widget; diff --git a/src/main/java/binnie/core/craftgui/Widget.java b/src/main/java/binnie/core/craftgui/Widget.java index 3e7230aa..0d755226 100644 --- a/src/main/java/binnie/core/craftgui/Widget.java +++ b/src/main/java/binnie/core/craftgui/Widget.java @@ -16,17 +16,17 @@ import java.util.List; public class Widget implements IWidget { @Nullable private final IWidget parent; - private List subWidgets; - private List attributes; - private Point position; - private Point size; - private Point offset; @Nullable Area cropArea; @Nullable IWidget cropWidget; boolean cropped; int colour; + private List subWidgets; + private List attributes; + private Point position; + private Point size; + private Point offset; private Collection> globalEventHandlers; private boolean enabled; private boolean visible; @@ -138,6 +138,14 @@ public class Widget implements IWidget { return this.pos(); } + @Override + public final void setPosition(final Point vector) { + if (!vector.equals(this.position)) { + this.position = new Point(vector); + this.callEvent(new EventWidget.ChangePosition(this)); + } + } + @Override public final Area getArea() { return new Area(Point.ZERO, this.size()); @@ -178,19 +186,6 @@ public class Widget implements IWidget { return this.size(); } - @Override - public final Point getOffset() { - return this.offset; - } - - @Override - public final void setPosition(final Point vector) { - if (!vector.equals(this.position)) { - this.position = new Point(vector); - this.callEvent(new EventWidget.ChangePosition(this)); - } - } - @Override public final void setSize(final Point vector) { if (!vector.equals(this.size)) { @@ -199,6 +194,11 @@ public class Widget implements IWidget { } } + @Override + public final Point getOffset() { + return this.offset; + } + @Override public final void setOffset(final Point vector) { if (vector != this.offset) { @@ -207,6 +207,11 @@ public class Widget implements IWidget { } } + @Override + public final int getColour() { + return this.colour; + } + @Override public final void setColour(final int colour) { if (this.colour != colour) { @@ -215,11 +220,6 @@ public class Widget implements IWidget { } } - @Override - public final int getColour() { - return this.colour; - } - @Override public boolean canMouseOver() { return this.hasAttribute(Attribute.MouseOver); diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index 6aad145b..740086af 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -3,6 +3,7 @@ package binnie.core.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventHandler; @@ -18,10 +19,13 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.resource.StyleSheetPunnett; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.machines.inventory.SlotValidator; -import binnie.core.ExtraBeeTexture; import binnie.genetics.gui.ControlChromosome; import binnie.genetics.machine.analyser.Analyser; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; @@ -32,7 +36,11 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; public class WindowFieldKit extends Window { private int glassOffsetX; @@ -264,5 +272,4 @@ public class WindowFieldKit extends Window { this.getWindowInventory().decrStackSize(1, 1); } } - } diff --git a/src/main/java/binnie/core/craftgui/WindowGenesis.java b/src/main/java/binnie/core/craftgui/WindowGenesis.java index 80ffebc2..c5eef0ff 100644 --- a/src/main/java/binnie/core/craftgui/WindowGenesis.java +++ b/src/main/java/binnie/core/craftgui/WindowGenesis.java @@ -21,7 +21,11 @@ import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.gui.ControlGenesisOption; -import forestry.api.genetics.*; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/binnie/core/craftgui/controls/ControlText.java b/src/main/java/binnie/core/craftgui/controls/ControlText.java index 3aeefb2f..c4fbe844 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlText.java @@ -34,13 +34,13 @@ public class ControlText extends Control implements IControlValue { RenderUtil.drawText(this.getArea(), this.align, this.text, this.getColour()); } - @Override - public void setValue(final String text) { - this.text = text; - } - @Override public String getValue() { return this.text; } + + @Override + public void setValue(final String text) { + this.text = text; + } } diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java index f6f891cf..01c0d2fd 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java @@ -5,7 +5,11 @@ import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.*; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventKey; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventTextEdit; +import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.gui.GuiTextField; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java index d4840505..0d897e4f 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java @@ -33,15 +33,15 @@ public class ControlButton extends Control { }.setOrigin(EventHandler.Origin.Self, this)); } - protected void onMouseClick(final EventMouse.Down event) { - } - public ControlButton(final IWidget parent, final int x, final int y, final int width, final int height, final String text) { this(parent, x, y, width, height); this.text = text; this.textWidget = new ControlText(this, this.getArea(), text, TextJustification.MiddleCenter); } + protected void onMouseClick(final EventMouse.Down event) { + } + @Override public void onUpdateClient() { if (this.textWidget != null) { diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java index 68db4fe3..34e67a98 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java @@ -40,6 +40,11 @@ public class ControlEnumButton extends ControlButton implements IControlValue this.setValue(newEnum); } + @Override + public T getValue() { + return this.currentSelection; + } + @Override public void setValue(final T selection) { if (this.currentSelection != selection) { @@ -47,9 +52,4 @@ public class ControlEnumButton extends ControlButton implements IControlValue this.callEvent(new EventValueChanged(this, this.getValue())); } } - - @Override - public T getValue() { - return this.currentSelection; - } } diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java index 001d6058..26b380ee 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java @@ -7,12 +7,12 @@ import binnie.core.craftgui.events.EventToggleButtonClicked; public class ControlToggleButton extends ControlButton { boolean toggled; + public ControlToggleButton(final IWidget parent, final int x, final int y, final int width, final int height) { + super(parent, x, y, width, height); + } + @Override public void onMouseClick(final EventMouse.Down event) { this.callEvent(new EventToggleButtonClicked(this, this.toggled)); } - - public ControlToggleButton(final IWidget parent, final int x, final int y, final int width, final int height) { - super(parent, x, y, width, height); - } } diff --git a/src/main/java/binnie/core/craftgui/controls/core/Control.java b/src/main/java/binnie/core/craftgui/controls/core/Control.java index ee61b3f3..3a8c9cc8 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/core/craftgui/controls/core/Control.java @@ -1,6 +1,11 @@ package binnie.core.craftgui.controls.core; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.ITooltipHelp; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.Widget; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.Window; @@ -12,9 +17,9 @@ import java.util.ArrayList; import java.util.List; public class Control extends Widget implements ITooltipHelp, ITooltip { + public int extraLevel; List helpStrings; List tooltipStrings; - public int extraLevel; public Control(final IWidget parent, final int x, final int y, final int w, final int h) { super(parent); diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java index 6930e72d..6f26a3de 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java @@ -14,15 +14,15 @@ import java.util.Map; public class ControlList extends Control implements IControlValue { ControlListBox parent; - @Nullable - private T defaultValue; - @Nullable - private T value; Map allOptions; Map optionWidgets; boolean creating; @Nullable IValidator validator; + @Nullable + private T defaultValue; + @Nullable + private T value; protected ControlList(final ControlListBox parent, final int x, final int y, final int w, final int h, @Nullable final T defaultValue) { super(parent, x, y, w, h); @@ -40,11 +40,6 @@ public class ControlList extends Control implements IControlValue { return this.value; } - @Nullable - public T getDefaultValue() { - return defaultValue; - } - @Override public void setValue(@Nullable final T value) { if (value == this.value) { @@ -58,14 +53,9 @@ public class ControlList extends Control implements IControlValue { this.parent.callEvent(new EventValueChanged(this.parent, value)); } - public void setOptions(final Collection options) { - this.deleteAllChildren(); - this.allOptions.clear(); - for (final T option : options) { - final IWidget optionWidget = this.parent.createOption(option, 0); - this.allOptions.put(option, optionWidget); - } - this.filterOptions(); + @Nullable + public T getDefaultValue() { + return defaultValue; } public void filterOptions() { @@ -90,6 +80,16 @@ public class ControlList extends Control implements IControlValue { return this.optionWidgets.keySet(); } + public void setOptions(final Collection options) { + this.deleteAllChildren(); + this.allOptions.clear(); + for (final T option : options) { + final IWidget optionWidget = this.parent.createOption(option, 0); + this.allOptions.put(option, optionWidget); + } + this.filterOptions(); + } + public Collection getAllOptions() { return this.allOptions.keySet(); } diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java index a5c18260..0e97e817 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java @@ -30,9 +30,9 @@ public class ControlOption extends Control implements IControlValue { @Override public void onUpdateClient() { - int colour = 10526880; + int colour = 0xa0a0a0; if (this.isCurrentSelection()) { - colour = 16777215; + colour = 0xffffff; } this.setColour(colour); } diff --git a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java index 0ac8f1a8..7767f2af 100644 --- a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java +++ b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java @@ -13,16 +13,16 @@ import java.util.List; public class ControlPages extends Control implements IControlValues, IControlValue { T value; - @Override - public boolean isChildVisible(final IWidget child) { - return child != null && this.value == ((IControlValue) child).getValue(); - } - public ControlPages(final IWidget parent, final int x, final int y, final int w, final int h) { super(parent, x, y, w, h); this.value = null; } + @Override + public boolean isChildVisible(final IWidget child) { + return child != null && this.value == ((IControlValue) child).getValue(); + } + @Override public void onAddChild(final IWidget widget) { } diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java index 851592b8..78c952a0 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java @@ -74,6 +74,11 @@ public class ControlScrollableContent extends Control impleme return this.percentageIndex; } + @Override + public void setPercentageIndex(final float index) { + this.movePercentage(index - this.percentageIndex); + } + @Override public void movePercentage(final float percentage) { if (this.controlChild == null) { @@ -91,11 +96,6 @@ public class ControlScrollableContent extends Control impleme this.controlChild.setOffset(new Point(0, Math.round(-this.percentageIndex * this.getMovementRange()))); } - @Override - public void setPercentageIndex(final float index) { - this.movePercentage(index - this.percentageIndex); - } - @Override public float getMovementRange() { if (this.controlChild == null) { diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java b/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java index 3a5878a8..7a7f7d98 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java @@ -7,9 +7,9 @@ public interface IControlScrollable extends IWidget { float getPercentageIndex(); - void movePercentage(final float p0); - void setPercentageIndex(final float p0); + void movePercentage(final float p0); + float getMovementRange(); } diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java index 8002fc7e..190e2d22 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java @@ -20,8 +20,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ControlTab extends Control implements ITooltip, IControlValue { - private ControlTabBar tabBar; protected T value; + private ControlTabBar tabBar; public ControlTab(final ControlTabBar parent, final int x, final int y, final int w, final int h, final T value) { super(parent, x, y, w, h); diff --git a/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java b/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java index ceccf8f8..98b68707 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java @@ -5,12 +5,12 @@ import binnie.core.craftgui.controls.listbox.ControlListBox; import forestry.api.genetics.IClassification; class ControlBranchBox extends ControlListBox { + public ControlBranchBox(final IWidget parent, final int x, final int y, final int width, final int height) { + super(parent, x, y, width, height, 12); + } + @Override public IWidget createOption(final IClassification value, final int y) { return new ControlBranchBoxOption(this.getContent(), value, y); } - - public ControlBranchBox(final IWidget parent, final int x, final int y, final int width, final int height) { - super(parent, x, y, width, height, 12); - } } diff --git a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java index 07dc92bb..3e5cb76e 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java @@ -23,9 +23,27 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; public class ControlDatabaseIndividualDisplay extends ControlItemDisplay implements ITooltip { + EnumDiscoveryState discovered; @Nullable private IAlleleSpecies species; - EnumDiscoveryState discovered; + + public ControlDatabaseIndividualDisplay(final IWidget parent, final int x, final int y) { + this(parent, x, y, 16); + } + + public ControlDatabaseIndividualDisplay(final IWidget parent, final int x, final int y, final int size) { + super(parent, x, y, size); + this.species = null; + this.discovered = EnumDiscoveryState.Show; + this.addSelfEventHandler(new EventMouse.Down.Handler() { + @Override + public void onEvent(final EventMouse.Down event) { + if (event.getButton() == 0 && ControlDatabaseIndividualDisplay.this.species != null && EnumDiscoveryState.Show == ControlDatabaseIndividualDisplay.this.discovered) { + ((WindowAbstractDatabase) ControlDatabaseIndividualDisplay.this.getTopParent()).gotoSpeciesDelayed(ControlDatabaseIndividualDisplay.this.species); + } + } + }); + } public void setSpecies(final IAlleleSpecies species) { this.setSpecies(species, EnumDiscoveryState.Show); @@ -49,24 +67,6 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme this.addAttribute(Attribute.MouseOver); } - public ControlDatabaseIndividualDisplay(final IWidget parent, final int x, final int y) { - this(parent, x, y, 16); - } - - public ControlDatabaseIndividualDisplay(final IWidget parent, final int x, final int y, final int size) { - super(parent, x, y, size); - this.species = null; - this.discovered = EnumDiscoveryState.Show; - this.addSelfEventHandler(new EventMouse.Down.Handler() { - @Override - public void onEvent(final EventMouse.Down event) { - if (event.getButton() == 0 && ControlDatabaseIndividualDisplay.this.species != null && EnumDiscoveryState.Show == ControlDatabaseIndividualDisplay.this.discovered) { - ((WindowAbstractDatabase) ControlDatabaseIndividualDisplay.this.getTopParent()).gotoSpeciesDelayed(ControlDatabaseIndividualDisplay.this.species); - } - } - }); - } - @Override @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java index eee76006..3083a0df 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java @@ -14,17 +14,17 @@ class ControlMutationBox extends ControlListBox { private Type type; private IAlleleSpecies species; - @Override - public IWidget createOption(final IMutation value, final int y) { - return new ControlMutationItem(this.getContent(), value, this.species, y); - } - public ControlMutationBox(final IWidget parent, final int x, final int y, final int width, final int height, final Type type) { super(parent, x, y, width, height, 12); this.species = null; this.type = type; } + @Override + public IWidget createOption(final IMutation value, final int y) { + return new ControlMutationItem(this.getContent(), value, this.species, y); + } + public void setSpecies(final IAlleleSpecies species) { if (species != this.species) { this.species = species; diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java index c3395acf..9557fc7a 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java @@ -1,6 +1,10 @@ package binnie.core.craftgui.database; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.Window; @@ -20,6 +24,13 @@ class ControlMutationSymbol extends Control implements ITooltip { private boolean discovered; private int type; + protected ControlMutationSymbol(final IWidget parent, final int x, final int y, final int type) { + super(parent, x, y, 16 + type * 16, 16); + this.value = null; + this.type = type; + this.addAttribute(Attribute.MouseOver); + } + @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { @@ -31,13 +42,6 @@ class ControlMutationSymbol extends Control implements ITooltip { } } - protected ControlMutationSymbol(final IWidget parent, final int x, final int y, final int type) { - super(parent, x, y, 16 + type * 16, 16); - this.value = null; - this.type = type; - this.addAttribute(Attribute.MouseOver); - } - public void setValue(final IMutation value) { this.value = value; final boolean isNEI = ((WindowAbstractDatabase) this.getTopParent()).isNEI(); diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java index a4369cb1..38a1bf0a 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java @@ -17,16 +17,16 @@ import java.util.List; public class ControlSpeciesBox extends ControlListBox { private IClassification branch; - @Override - public IWidget createOption(final IAlleleSpecies value, final int y) { - return new ControlSpeciesBoxOption(this.getContent(), value, y); - } - public ControlSpeciesBox(final IWidget parent, final int x, final int y, final int width, final int height) { super(parent, x, y, width, height, 12); this.branch = null; } + @Override + public IWidget createOption(final IAlleleSpecies value, final int y) { + return new ControlSpeciesBoxOption(this.getContent(), value, y); + } + public void setBranch(final IClassification branch) { if (branch != this.branch) { this.branch = branch; diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java index 545d318d..920ea044 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java @@ -15,9 +15,9 @@ public class PageBranchSpecies extends PageBranch { private ControlText pageBranchSpecies_title; private ControlSpeciesBox pageBranchSpecies_speciesList; -// @Mod.EventHandler -// public void onHandleEvent(final EventValueChanged event) { -// } + /*@Mod.EventHandler + public void onHandleEvent(final EventValueChanged event) { + }*/ public PageBranchSpecies(final IWidget parent, final DatabaseTab tab) { super(parent, tab); diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index 2d01a68f..e640ab3a 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -36,14 +36,14 @@ import java.util.Map; import java.util.Objects; public abstract class WindowAbstractDatabase extends Window { - private int selectionBoxWidth; private final int infoBoxWidth = 144; private final int infoBoxHeight = 176; private final int infoTabWidth = 16; private final int modeTabWidth = 22; private final int searchBoxHeight = 16; - private Map modes; boolean isNEI; + private int selectionBoxWidth; + private Map modes; private BreedingSystem system; @Nullable private Panel panelInformation; @@ -54,10 +54,6 @@ public abstract class WindowAbstractDatabase extends Window { @Nullable private IAlleleSpecies gotoSpecies; - public void changeMode(final IDatabaseMode mode) { - this.modePages.setValue(mode); - } - public WindowAbstractDatabase(final EntityPlayer player, final Side side, final boolean nei, final BreedingSystem system, final int wid) { super(100, 192, player, null, side); this.selectionBoxWidth = 95; @@ -71,6 +67,14 @@ public abstract class WindowAbstractDatabase extends Window { this.selectionBoxWidth = wid; } + public WindowAbstractDatabase(final EntityPlayer player, final Side side, final boolean nei, final BreedingSystem system) { + this(player, side, nei, system, 95); + } + + public void changeMode(final IDatabaseMode mode) { + this.modePages.setValue(mode); + } + public ControlPages getInfoPages(final IDatabaseMode mode) { return this.modes.get(mode).infoPages; } @@ -83,10 +87,6 @@ public abstract class WindowAbstractDatabase extends Window { return this.system; } - public WindowAbstractDatabase(final EntityPlayer player, final Side side, final boolean nei, final BreedingSystem system) { - this(player, side, nei, system, 95); - } - protected ModeWidgets createMode(final IDatabaseMode mode, final ModeWidgets widgets) { this.modes.put(mode, widgets); return widgets; @@ -204,8 +204,8 @@ public abstract class WindowAbstractDatabase extends Window { public abstract static class ModeWidgets { public WindowAbstractDatabase database; public ControlPage modePage; - private ControlPages infoPages; public ControlListBox listBox; + private ControlPages infoPages; private ControlTabBar infoTabs; public ModeWidgets(final IDatabaseMode mode, final WindowAbstractDatabase database) { diff --git a/src/main/java/binnie/core/craftgui/events/EventMouse.java b/src/main/java/binnie/core/craftgui/events/EventMouse.java index bc121e65..c5353cf5 100644 --- a/src/main/java/binnie/core/craftgui/events/EventMouse.java +++ b/src/main/java/binnie/core/craftgui/events/EventMouse.java @@ -12,6 +12,13 @@ public abstract class EventMouse extends Event { int y; int button; + public Button(final IWidget currentMousedOverWidget, final int x, final int y, final int button) { + super(currentMousedOverWidget); + this.x = x; + this.y = y; + this.button = button; + } + public int getX() { return this.x; } @@ -23,13 +30,6 @@ public abstract class EventMouse extends Event { public int getButton() { return this.button; } - - public Button(final IWidget currentMousedOverWidget, final int x, final int y, final int button) { - super(currentMousedOverWidget); - this.x = x; - this.y = y; - this.button = button; - } } public static class Down extends Button { @@ -60,6 +60,12 @@ public abstract class EventMouse extends Event { float dx; float dy; + public Move(final IWidget origin, final float dx, final float dy) { + super(origin); + this.dx = dx; + this.dy = dy; + } + public float getDx() { return this.dx; } @@ -68,12 +74,6 @@ public abstract class EventMouse extends Event { return this.dy; } - public Move(final IWidget origin, final float dx, final float dy) { - super(origin); - this.dx = dx; - this.dy = dy; - } - public abstract static class Handler extends EventHandler { public Handler() { super(Move.class); diff --git a/src/main/java/binnie/core/craftgui/geometry/Area.java b/src/main/java/binnie/core/craftgui/geometry/Area.java index 3d0ff66f..9ec82609 100644 --- a/src/main/java/binnie/core/craftgui/geometry/Area.java +++ b/src/main/java/binnie/core/craftgui/geometry/Area.java @@ -72,7 +72,7 @@ public final class Area { public int height() { return this.size().y(); } - + public void setXPos(final int xPos) { this.pos = new Point(xPos, this.pos.y()); } diff --git a/src/main/java/binnie/core/craftgui/geometry/Border.java b/src/main/java/binnie/core/craftgui/geometry/Border.java index c198065f..56258b2c 100644 --- a/src/main/java/binnie/core/craftgui/geometry/Border.java +++ b/src/main/java/binnie/core/craftgui/geometry/Border.java @@ -98,5 +98,4 @@ public class Border { public String toString() { return this.t() + "-" + this.r() + "-" + this.b() + "-" + this.l(); } - } diff --git a/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java b/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java index f9cf8aad..aa946de3 100644 --- a/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java +++ b/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java @@ -61,5 +61,4 @@ public class CraftGUIUtil { } }); } - } diff --git a/src/main/java/binnie/core/craftgui/geometry/Point.java b/src/main/java/binnie/core/craftgui/geometry/Point.java index 1fb39be1..6ffe25c6 100644 --- a/src/main/java/binnie/core/craftgui/geometry/Point.java +++ b/src/main/java/binnie/core/craftgui/geometry/Point.java @@ -50,5 +50,4 @@ public class Point { public boolean equals(final Point other) { return this.x() == other.x() && this.y() == other.y(); } - } diff --git a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java index b2c98f54..863bacf6 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java @@ -6,7 +6,14 @@ import binnie.core.craftgui.minecraft.control.EnumHighlighting; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; -import binnie.core.machines.power.*; +import binnie.core.machines.power.ErrorState; +import binnie.core.machines.power.IErrorStateSource; +import binnie.core.machines.power.IPoweredMachine; +import binnie.core.machines.power.IProcess; +import binnie.core.machines.power.ITankMachine; +import binnie.core.machines.power.PowerInfo; +import binnie.core.machines.power.ProcessInfo; +import binnie.core.machines.power.TankInfo; import binnie.core.machines.transfer.TransferRequest; import binnie.core.network.packet.MessageContainerUpdate; import com.google.common.base.Preconditions; @@ -14,16 +21,26 @@ import com.google.common.collect.Sets; import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.*; +import net.minecraft.inventory.ClickType; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; public class ContainerCraftGUI extends Container { + private final Set crafters = Sets.newConcurrentHashSet(); private Window window; private Map syncedNBT; private Map sentNBT; @@ -34,7 +51,6 @@ public class ContainerCraftGUI extends Container { @Nullable private ErrorState error; private int mousedOverSlotNumber; - private final Set crafters = Sets.newConcurrentHashSet(); public ContainerCraftGUI(final Window window) { this.syncedNBT = new HashMap<>(); @@ -243,7 +259,7 @@ public class ContainerCraftGUI extends Container { if (shouldSend) { //TODO INVENTORY this.crafters.stream().filter(Objects::nonNull).forEach(entityPlayer -> - BinnieCore.getBinnieProxy().sendToPlayer(new MessageContainerUpdate(nbt.getValue()), entityPlayer)); + BinnieCore.getBinnieProxy().sendToPlayer(new MessageContainerUpdate(nbt.getValue()), entityPlayer)); sentThisTime.put(nbt.getKey(), nbt.getValue()); } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java index 710f31ea..b33cfded 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java @@ -12,15 +12,15 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nullable; public class CustomSlot extends Slot { + public CustomSlot(final IInventory inventory, final int index) { + super(inventory, index, 0, 0); + } + @Override public boolean isItemValid(final ItemStack stack) { return !stack.isEmpty() && this.inventory.isItemValidForSlot(this.getSlotIndex(), stack); } - public CustomSlot(final IInventory inventory, final int index) { - super(inventory, index, 0, 0); - } - @Nullable public InventorySlot getInventorySlot() { final IInventorySlots slots = Machine.getInterface(IInventorySlots.class, this.inventory); diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java index 527ff6d2..c894d692 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java @@ -33,6 +33,14 @@ public class GuiCraftGUI extends GuiContainer { private Window window; private ItemStack draggedItem; + public GuiCraftGUI(final Window window) { + super(window.getContainer()); + this.mousePos = Point.ZERO; + this.window = window; + this.draggedItem = ItemStack.EMPTY; + this.resize(window.getSize()); + } + @Override public void updateScreen() { this.window.updateClient(); @@ -42,14 +50,6 @@ public class GuiCraftGUI extends GuiContainer { return this.mc; } - public GuiCraftGUI(final Window window) { - super(window.getContainer()); - this.mousePos = Point.ZERO; - this.window = window; - this.draggedItem = ItemStack.EMPTY; - this.resize(window.getSize()); - } - @Override protected void drawGuiContainerBackgroundLayer(final float var1, final int var2, final int var3) { } @@ -234,7 +234,6 @@ public class GuiCraftGUI extends GuiContainer { this.window.callEvent(new EventKey.Down(origin, c, key)); } - @Override protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) { //super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick); @@ -258,7 +257,6 @@ public class GuiCraftGUI extends GuiContainer { } } - @Override public void handleMouseInput() throws IOException { super.handleMouseInput(); @@ -289,5 +287,4 @@ public class GuiCraftGUI extends GuiContainer { this.guiTop = (this.height - this.ySize) / 2; this.window.setPosition(new Point(this.guiLeft, this.guiTop)); } - } diff --git a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java index 386c3167..6529f66b 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java @@ -1,7 +1,12 @@ package binnie.core.craftgui.minecraft; import javax.annotation.Nullable; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; // TODO: remove this, it's very questionable class ListMap implements List { diff --git a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java index d6d72af2..7c4b1cb6 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java @@ -10,7 +10,6 @@ public class ModuleCraftGUI implements IInitializable { } } - @Override public void init() { } diff --git a/src/main/java/binnie/core/craftgui/minecraft/Window.java b/src/main/java/binnie/core/craftgui/minecraft/Window.java index bf4d3b08..a6460d7b 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Window.java @@ -3,12 +3,23 @@ package binnie.core.craftgui.minecraft; import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.ITooltipHelp; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.TopLevelWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlHelp; +import binnie.core.craftgui.minecraft.control.ControlInfo; +import binnie.core.craftgui.minecraft.control.ControlPowerSystem; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlUser; +import binnie.core.craftgui.minecraft.control.EnumHighlighting; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.StyleSheetManager; import binnie.core.craftgui.resource.Texture; @@ -37,14 +48,15 @@ import java.util.ArrayList; import java.util.Deque; public abstract class Window extends TopLevelWidget implements INetwork.ReceiveGuiNBT { + private final Side side; + protected int titleButtonLeft; + protected int titleButtonRight; @Nullable // client side only private GuiCraftGUI gui; private ContainerCraftGUI container; private WindowInventory windowInventory; @Nullable private ControlText title; - protected int titleButtonLeft; - protected int titleButtonRight; @Nullable private StandardTexture bgText1; @Nullable @@ -53,7 +65,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG private EntityPlayer player; @Nullable private IInventory entityInventory; - private final Side side; public Window(final int width, final int height, final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { this.titleButtonLeft = 8; @@ -96,6 +107,10 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG } } + public static T get(final IWidget widget) { + return (T) widget.getTopParent(); + } + public void getTooltip(final Tooltip tooltip) { final Deque queue = this.calculateMousedOverWidgets(); while (!queue.isEmpty()) { @@ -234,6 +249,10 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG return this.player.inventory.getItemStack(); } + public void setHeldItemStack(final ItemStack stack) { + this.player.inventory.setItemStack(stack); + } + @Nullable public IInventory getInventory() { return this.entityInventory; @@ -242,10 +261,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG public void onClose() { } - public void setHeldItemStack(final ItemStack stack) { - this.player.inventory.setItemStack(stack); - } - public boolean isServer() { return !this.isClient(); } @@ -302,8 +317,4 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG public Texture getBackground2() { return this.bgText2; } - - public static T get(final IWidget widget) { - return (T) widget.getTopParent(); - } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java index cb925519..ef70df6c 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java @@ -78,7 +78,6 @@ public class WindowInventory implements IInventory { this.markDirty(); } - @Override public int getInventoryStackLimit() { return 64; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 4de0e8ec..760ee0c1 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -1,6 +1,10 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java index fe0c4039..89957d61 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java @@ -1,6 +1,10 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.CustomSlot; @@ -19,6 +23,12 @@ public class ControlErrorState extends Control implements ITooltip { private ErrorState errorState; private int type; + public ControlErrorState(final IWidget parent, final int x, final int y) { + super(parent, x, y, 16, 16); + this.type = 0; + this.addAttribute(Attribute.MouseOver); + } + @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { @@ -73,12 +83,6 @@ public class ControlErrorState extends Control implements ITooltip { } } - public ControlErrorState(final IWidget parent, final int x, final int y) { - super(parent, x, y, 16, 16); - this.type = 0; - this.addAttribute(Attribute.MouseOver); - } - @Override public void getTooltip(final Tooltip tooltipOrig) { final MinecraftTooltip tooltip = (MinecraftTooltip) tooltipOrig; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java index 387a6fa9..7595eaeb 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java @@ -1,6 +1,10 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java index 546024b5..05f0c884 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java @@ -19,17 +19,17 @@ public class ControlIconDisplay extends Control { super(parent, x, y, 16, 16); this.sprite = null; } - + public ControlIconDisplay(final IWidget parent, final int x, final int y, final ResourceLocation icon) { super(parent, x, y, 16, 16); this.sprite = BinnieCore.getBinnieProxy().getTextureAtlasSprite(icon); } - + public ControlIconDisplay(final IWidget parent, final int x, final int y, BinnieSprite sprite) { super(parent, x, y, 16, 16); this.sprite = sprite.getSprite(); } - + public ControlIconDisplay(final IWidget parent, final int x, final int y, TextureAtlasSprite sprite) { super(parent, x, y, 16, 16); this.sprite = sprite; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java index 76d255b3..879b0bc2 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java @@ -1,6 +1,10 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java index f2f74659..737a9ab1 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java @@ -17,15 +17,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; public class ControlItemDisplay extends Control implements ITooltip { - private ItemStack itemStack; public boolean hastooltip; + private ItemStack itemStack; private boolean rotating; - public void setTooltip() { - this.hastooltip = true; - this.addAttribute(Attribute.MouseOver); - } - public ControlItemDisplay(final IWidget parent, final int x, final int y) { this(parent, x, y, 16); } @@ -45,6 +40,11 @@ public class ControlItemDisplay extends Control implements ITooltip { this.rotating = false; } + public void setTooltip() { + this.hastooltip = true; + this.addAttribute(Attribute.MouseOver); + } + @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { @@ -70,14 +70,14 @@ public class ControlItemDisplay extends Control implements ITooltip { GlStateManager.enableAlpha(); } - public void setItemStack(ItemStack itemStack) { - this.itemStack = itemStack; - } - public ItemStack getItemStack() { return this.itemStack; } + public void setItemStack(ItemStack itemStack) { + this.itemStack = itemStack; + } + @Override @SideOnly(Side.CLIENT) public void getTooltip(final Tooltip tooltip) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java index 74c89bb3..3335aed6 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java @@ -1,7 +1,11 @@ package binnie.core.craftgui.minecraft.control; import binnie.core.BinnieCore; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.Area; @@ -177,5 +181,4 @@ public class ControlLiquidTank extends Control implements ITooltip { final ITankMachine tank = Machine.getInterface(ITankMachine.class, Window.get(this).getInventory()); return (tank != null) ? tank.getTankSlot(this.tankID) : null; } - } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java index 7f448df9..5d1a1924 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java @@ -1,6 +1,10 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.power.PowerSystem; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java index 30fed5d6..0ac5d4c2 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java @@ -18,6 +18,26 @@ public class ControlProgressBase extends Control { this.addAttribute(Attribute.MouseOver); } + public static String convertTime(final int time) { + int seconds = (int) (time / 20.0f); + int minutes = 0; + while (seconds >= 60) { + ++minutes; + seconds -= 60; + } + String ts = ""; + if (minutes > 0) { + ts = ts + minutes + " minute" + ((minutes == 1) ? "" : "s"); + } + if (seconds > 0) { + if (ts.length() > 0) { + ts += " "; + } + ts = ts + seconds + " second" + ((seconds == 1) ? "" : "s"); + } + return ts; + } + public void setProgress(final float progress) { this.progress = progress; if (this.progress < 0.0f) { @@ -61,24 +81,4 @@ public class ControlProgressBase extends Control { } } } - - public static String convertTime(final int time) { - int seconds = (int) (time / 20.0f); - int minutes = 0; - while (seconds >= 60) { - ++minutes; - seconds -= 60; - } - String ts = ""; - if (minutes > 0) { - ts = ts + minutes + " minute" + ((minutes == 1) ? "" : "s"); - } - if (seconds > 0) { - if (ts.length() > 0) { - ts += " "; - } - ts = ts + seconds + " second" + ((seconds == 1) ? "" : "s"); - } - return ts; - } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java index 43f80a9a..bf78b956 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java @@ -4,7 +4,11 @@ import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.*; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java index 7e2aa12b..ced5a484 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java @@ -6,7 +6,11 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.minecraft.*; +import binnie.core.craftgui.minecraft.CustomSlot; +import binnie.core.craftgui.minecraft.GuiCraftGUI; +import binnie.core.craftgui.minecraft.InventoryType; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.WindowInventory; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.inventory.InventorySlot; @@ -40,27 +44,6 @@ public class ControlSlot extends ControlSlotBase { } } - public static class Builder { - private final IWidget parent; - private final int x; - private final int y; - - public Builder(final IWidget parent, final int x, final int y) { - this.parent = parent; - this.x = x; - this.y = y; - } - - public ControlSlot assign(final int index) { - return assign(InventoryType.Machine, index); - } - - public ControlSlot assign(final InventoryType inventory, final int index) { - Slot slot = ((Window) parent.getTopParent()).getContainer().getOrCreateSlot(inventory, index); - return new ControlSlot(parent, x, y, slot); - } - } - public final Slot slot; public ControlSlot(final IWidget parent, final int x, final int y, final Slot slot) { @@ -206,4 +189,25 @@ public class ControlSlot extends ControlSlotBase { return null; } } + + public static class Builder { + private final IWidget parent; + private final int x; + private final int y; + + public Builder(final IWidget parent, final int x, final int y) { + this.parent = parent; + this.x = x; + this.y = y; + } + + public ControlSlot assign(final int index) { + return assign(InventoryType.Machine, index); + } + + public ControlSlot assign(final InventoryType inventory, final int index) { + Slot slot = ((Window) parent.getTopParent()).getContainer().getOrCreateSlot(inventory, index); + return new ControlSlot(parent, x, y, slot); + } + } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java index 4a1c0d68..0ddce79b 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java @@ -11,6 +11,35 @@ import java.util.Iterator; import java.util.List; public class ControlSlotArray extends Control implements Iterable { + private List slots = new ArrayList<>(); + + private ControlSlotArray(final IWidget parent, final int x, final int y, final int columns, final int rows) { + super(parent, x, y, columns * 18, rows * 18); + this.slots = new ArrayList<>(); + } + + public void setItemStacks(final ItemStack[] array) { + int i = 0; + for (final ItemStack item : array) { + if (i >= this.slots.size()) { + return; + } + ControlSlot controlSlot = this.slots.get(i); + Slot slot = controlSlot.slot; + slot.putStack(item); + ++i; + } + } + + public ControlSlot getControlSlot(final int i) { + return this.slots.get(i); + } + + @Override + public Iterator iterator() { + return this.slots.iterator(); + } + public static class Builder { private final IWidget parent; private final int x; @@ -44,33 +73,4 @@ public class ControlSlotArray extends Control implements Iterable { return controlSlots; } } - - private List slots = new ArrayList<>(); - - private ControlSlotArray(final IWidget parent, final int x, final int y, final int columns, final int rows) { - super(parent, x, y, columns * 18, rows * 18); - this.slots = new ArrayList<>(); - } - - public void setItemStacks(final ItemStack[] array) { - int i = 0; - for (final ItemStack item : array) { - if (i >= this.slots.size()) { - return; - } - ControlSlot controlSlot = this.slots.get(i); - Slot slot = controlSlot.slot; - slot.putStack(item); - ++i; - } - } - - public ControlSlot getControlSlot(final int i) { - return this.slots.get(i); - } - - @Override - public Iterator iterator() { - return this.slots.iterator(); - } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java index dc518dff..4ccbff91 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java @@ -1,6 +1,10 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Area; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java index 9a472993..97487f97 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java @@ -15,6 +15,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ControlSlotCharge extends Control { private int slot; + public ControlSlotCharge(final IWidget parent, final int x, final int y, final int slot) { + super(parent, x, y, 4, 18); + this.slot = slot; + } + float getCharge() { final IChargedSlots slots = Machine.getInterface(IChargedSlots.class, Window.get(this).getInventory()); return (slots == null) ? 0.0f : slots.getCharge(this.slot); @@ -27,11 +32,6 @@ public class ControlSlotCharge extends Control { CraftGUI.render.texturePercentage(CraftGUI.render.getTexture(CraftGUITexture.SlotCharge), this.getArea().inset(1), Position.BOTTOM, this.getCharge()); } - public ControlSlotCharge(final IWidget parent, final int x, final int y, final int slot) { - super(parent, x, y, 4, 18); - this.slot = slot; - } - @Override public void getHelpTooltip(final Tooltip tooltip) { tooltip.add("Charge Remaining: " + (int) (this.getCharge() * 100.0f) + "%"); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java index 981f392c..cf1d2793 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java @@ -1,6 +1,10 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; @@ -9,8 +13,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Objects; public class ControlUser extends Control implements ITooltip { - private String username; String team; + private String username; public ControlUser(final IWidget parent, final int x, final int y, final String username) { super(parent, x, y, 16, 16); diff --git a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java index 025d8747..8be47711 100644 --- a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java +++ b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java @@ -41,7 +41,7 @@ public class RenderUtil { Minecraft minecraft = Minecraft.getMinecraft(); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); FontRenderer font = getFontRenderer(minecraft, itemStack); - + if (rotating) { GlStateManager.pushMatrix(); final float phase = Minecraft.getSystemTime() / 20; @@ -164,7 +164,7 @@ public class RenderUtil { drawTexture(pos.x(), pos.y(), icon, 0, 0, 0); } } - + public static void drawGuiSprite(final Point pos, @Nullable final TextureAtlasSprite icon) { if (icon != null) { BinnieCore.getBinnieProxy().bindTexture(ForestryAPI.textureManager.getGuiTextureMap()); diff --git a/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java b/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java index 4ba20c90..1a2d318c 100644 --- a/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java +++ b/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java @@ -20,6 +20,8 @@ import javax.annotation.Nullable; @SideOnly(Side.CLIENT) public class TextureRenderer { + private IStyleSheet styleSheet; + private static void renderTexturePadded(final Area area, final Area texture, final Border padding) { int borderLeft = padding.l(); int borderRight = padding.r(); @@ -86,8 +88,6 @@ public class TextureRenderer { } } - private IStyleSheet styleSheet; - public void setStyleSheet(IStyleSheet styleSheet) { this.styleSheet = styleSheet; } @@ -102,7 +102,6 @@ public class TextureRenderer { final Area cropZone = widget.getCroppedZone(); GL11.glEnable(GL11.GL_SCISSOR_TEST); this.limitArea(new Area(pos.add(cropZone.pos()), cropZone.size()), guiWidth, guiHeight); - } GlStateManager.disableDepth(); } diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java index 6a8500ff..0b980beb 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java @@ -1,9 +1,9 @@ package binnie.core.craftgui.resource; +import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.resource.minecraft.PaddedTexture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.core.ExtraBeeTexture; import binnie.genetics.gui.punnett.ExtraBeeGUITexture; public class StyleSheetPunnett extends StyleSheet { diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index 9a47e8cc..bf27f7bc 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -2,8 +2,19 @@ package binnie.core.genetics; import binnie.Binnie; import binnie.core.BinnieCore; -import forestry.api.apiculture.*; -import forestry.api.genetics.*; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IApiaristTracker; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeMutation; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,12 +31,13 @@ class BeeBreedingSystem extends BreedingSystem { @Override public float getChance(final IMutation mutation, final EntityPlayer player, final IAlleleSpecies species1, final IAlleleSpecies species2) { return ((IBeeMutation) mutation). - getChance(new VirtualBeeHousing(player), - (IAlleleBeeSpecies) species1, - (IAlleleBeeSpecies) species2, - (IBeeGenome) this.getSpeciesRoot(). - templateAsGenome(this.getSpeciesRoot().getTemplate(species1)), - (IBeeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2))); + getChance(new VirtualBeeHousing(player), + (IAlleleBeeSpecies) species1, + (IAlleleBeeSpecies) species2, + (IBeeGenome) this.getSpeciesRoot(). + templateAsGenome(this.getSpeciesRoot().getTemplate(species1)), + (IBeeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2)) + ); } @Override diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 3891a073..c44f1091 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -5,7 +5,18 @@ import binnie.core.BinnieCore; import binnie.core.resource.BinnieSprite; import com.mojang.authlib.GameProfile; import forestry.api.core.ForestryEvent; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleBoolean; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IClassification; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,19 +27,17 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; public abstract class BreedingSystem implements IItemStackRepresentitive { - protected BinnieSprite iconUndiscovered; - protected BinnieSprite iconDiscovered; - private List allBranches; - List allActiveSpecies; - private List allSpecies; - private List allMutations; - private Map> resultantMutations; - private Map> furtherMutations; - private Map> allResultantMutations; - private Map> allFurtherMutations; public float discoveredSpeciesPercentage; public int totalSpeciesCount; public int discoveredSpeciesCount; @@ -37,9 +46,19 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { public float discoveredBranchPercentage; public int totalBranchCount; public int discoveredBranchCount; + protected BinnieSprite iconUndiscovered; + protected BinnieSprite iconDiscovered; + List allActiveSpecies; + String currentEpithet; + private List allBranches; + private List allSpecies; + private List allMutations; + private Map> resultantMutations; + private Map> furtherMutations; + private Map> allResultantMutations; + private Map> allFurtherMutations; private int totalSecretBranchCount; private int discoveredSecretBranchCount; - String currentEpithet; public BreedingSystem() { this.allBranches = new ArrayList<>(); diff --git a/src/main/java/binnie/core/genetics/ForestryAllele.java b/src/main/java/binnie/core/genetics/ForestryAllele.java index a68dcc7f..f38ff2eb 100644 --- a/src/main/java/binnie/core/genetics/ForestryAllele.java +++ b/src/main/java/binnie/core/genetics/ForestryAllele.java @@ -162,13 +162,13 @@ public class ForestryAllele { True, False; - public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.bool" + this.toString()); - } - public static IAllele get(final boolean bool) { return (bool ? Bool.True : Bool.False).getAllele(); } + + public IAllele getAllele() { + return AlleleManager.alleleRegistry.getAllele("forestry.bool" + this.toString()); + } } public enum Growth { diff --git a/src/main/java/binnie/core/genetics/Gene.java b/src/main/java/binnie/core/genetics/Gene.java index 003f22d9..fcc6bf71 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/src/main/java/binnie/core/genetics/Gene.java @@ -14,16 +14,6 @@ public class Gene implements IGene { private IChromosomeType chromosome; private ISpeciesRoot root; - @Override - public ISpeciesRoot getSpeciesRoot() { - return this.root; - } - - @Override - public String toString() { - return this.getAlleleName(); - } - public Gene(final IAllele allele, final IChromosomeType chromosome, final ISpeciesRoot root) { this.allele = allele; this.chromosome = chromosome; @@ -41,6 +31,24 @@ public class Gene implements IGene { this.chromosome = this.root.getKaryotype()[chromoID]; } + public static Gene create(final NBTTagCompound nbt) { + return new Gene(nbt); + } + + public static Gene create(final IAllele allele, final IChromosomeType chromosome, final ISpeciesRoot root) { + return new Gene(allele, chromosome, root); + } + + @Override + public ISpeciesRoot getSpeciesRoot() { + return this.root; + } + + @Override + public String toString() { + return this.getAlleleName(); + } + @Override public void readFromNBT(final NBTTagCompound nbt) { this.allele = AlleleManager.alleleRegistry.getAllele(nbt.getString("allele")); @@ -61,14 +69,6 @@ public class Gene implements IGene { return nbt; } - public static Gene create(final NBTTagCompound nbt) { - return new Gene(nbt); - } - - public static Gene create(final IAllele allele, final IChromosomeType chromosome, final ISpeciesRoot root) { - return new Gene(allele, chromosome, root); - } - @Override public NBTTagCompound getNBTTagCompound() { final NBTTagCompound nbt = new NBTTagCompound(); diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index b917a9f3..a1a36b74 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -11,7 +11,16 @@ import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeRoot; import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleFloat; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterflyRoot; import net.minecraft.item.ItemStack; @@ -20,14 +29,20 @@ import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; public class ManagerGenetics extends ManagerBase { + private final Map BREEDING_SYSTEMS; public BreedingSystem beeBreedingSystem; public BreedingSystem treeBreedingSystem; public BreedingSystem mothBreedingSystem; public BreedingSystem flowerBreedingSystem; - private final Map BREEDING_SYSTEMS; private List invalidChromosomeTypes; private Map>> chromosomeArray; diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index b152b17c..5c06a3de 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -3,7 +3,14 @@ package binnie.core.genetics; import binnie.Binnie; import binnie.core.BinnieCore; import binnie.extratrees.ExtraTrees; -import forestry.api.genetics.*; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.ILepidopteristTracker; diff --git a/src/main/java/binnie/core/genetics/Tolerance.java b/src/main/java/binnie/core/genetics/Tolerance.java index df58e7ae..3781e3f2 100644 --- a/src/main/java/binnie/core/genetics/Tolerance.java +++ b/src/main/java/binnie/core/genetics/Tolerance.java @@ -28,6 +28,14 @@ public enum Tolerance { this.bounds = new int[]{a, b}; } + public static Tolerance get(final EnumTolerance tol) { + return values()[tol.ordinal()]; + } + + public static > boolean canTolerate(final T base, final T test, final EnumTolerance tol) { + return get(tol).canTolerate(base, test); + } + public String getUID() { return "forestry.tolerance" + this.toString(); } @@ -36,10 +44,6 @@ public enum Tolerance { return this.bounds; } - public static Tolerance get(final EnumTolerance tol) { - return values()[tol.ordinal()]; - } - public IAllele getAllele() { return AlleleManager.alleleRegistry.getAllele(this.getUID()); } @@ -47,8 +51,4 @@ public enum Tolerance { public > boolean canTolerate(final T base, final T test) { return test.ordinal() <= base.ordinal() + this.bounds[1] && test.ordinal() >= base.ordinal() + this.bounds[0]; } - - public static > boolean canTolerate(final T base, final T test, final EnumTolerance tol) { - return get(tol).canTolerate(base, test); - } } diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 4126b163..eba40a7a 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -6,21 +6,43 @@ import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.LumbermillRecipes; import com.mojang.authlib.GameProfile; -import forestry.api.arboriculture.*; -import forestry.api.genetics.*; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IArboristTracker; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.ITreeMutation; +import forestry.api.arboriculture.TreeManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IFruitFamily; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; public class TreeBreedingSystem extends BreedingSystem { public UniqueItemStackSet allFruits; public UniqueItemStackSet allWoods; + public UniqueItemStackSet discoveredPlanks; private UniqueItemStackSet discoveredFruits; private UniqueItemStackSet discoveredWoods; - public UniqueItemStackSet discoveredPlanks; public TreeBreedingSystem() { this.allFruits = new UniqueItemStackSet(); @@ -81,11 +103,9 @@ public class TreeBreedingSystem extends BreedingSystem { this.discoveredWoods.add(wood); } - // for (final ItemStack wood : - // tSpecies.getRoot().templateAsIndividual(getSpeciesRoot().getTemplate(tSpecies.getUID())).getProduceList()) - // { - // this.discoveredWoods.add(wood); - // } + /*for (final ItemStack wood : tSpecies.getRoot().templateAsIndividual(getSpeciesRoot().getTemplate(tSpecies.getUID())).getProduceList()) { + this.discoveredWoods.add(wood); + }*/ this.discoveredFruits.addAll(genome.getFruitProvider().getProducts().keySet()); for (ItemStack wood2 : this.discoveredWoods) { } @@ -105,11 +125,9 @@ public class TreeBreedingSystem extends BreedingSystem { this.allWoods.add(wood); } - // for (final ItemStack wood : - // tSpecies.getRoot().templateAsIndividual(getSpeciesRoot().getTemplate(tSpecies.getUID())).getProduceList()) - // { - // this.allWoods.add(wood); - // } + /*for (final ItemStack wood : tSpecies.getRoot().templateAsIndividual(getSpeciesRoot().getTemplate(tSpecies.getUID())).getProduceList()) { + this.allWoods.add(wood); + }*/ this.allFruits.addAll(genome.getFruitProvider().getProducts().keySet()); } } @@ -203,11 +221,11 @@ public class TreeBreedingSystem extends BreedingSystem { @Override @Nullable public IIndividual getConversion(final ItemStack stack) { -// for (final Map.Entry entry : TreeManager.treeRoot.getIndividualTemplates()) { -// if (ItemStack.areItemStacksEqual(stack, entry.getKey())) { -// return entry.getValue(); -// } -// } + /*for (final Map.Entry entry : TreeManager.treeRoot.getIndividualTemplates()) { + if (ItemStack.areItemStacksEqual(stack, entry.getKey())) { + return entry.getValue(); + } + }*/ return TreeManager.treeRoot.getMember(stack); } diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index 3bba6141..74dd39f9 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -1,7 +1,13 @@ package binnie.core.genetics; import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.*; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeHousingInventory; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.core.IErrorLogic; import forestry.api.genetics.IIndividual; import forestry.apiculture.FakeBeekeepingLogic; @@ -25,7 +31,6 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB super(player); beeModifier.add(this); beeInventory = new InventoryBeeHousing(12); - } @Override @@ -52,11 +57,11 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB return ItemStack.EMPTY; } - public ItemStack getDrone() { - return ItemStack.EMPTY; + public void setQueen(final ItemStack itemstack) { } - public void setQueen(final ItemStack itemstack) { + public ItemStack getDrone() { + return ItemStack.EMPTY; } public void setDrone(final ItemStack itemstack) { @@ -175,5 +180,4 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB public GameProfile getOwner() { return getOwnerName(); } - } diff --git a/src/main/java/binnie/core/genetics/VirtualHousing.java b/src/main/java/binnie/core/genetics/VirtualHousing.java index d71abd91..5b1bb781 100644 --- a/src/main/java/binnie/core/genetics/VirtualHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualHousing.java @@ -64,9 +64,9 @@ class VirtualHousing implements IHousing { return this.player.world.getBiome(getCoordinates()); } - // public EnumErrorCode getErrorState() { - // return null; - // } + /*public EnumErrorCode getErrorState() { + return null; + }*/ public void setErrorState(final IErrorState state) { } diff --git a/src/main/java/binnie/core/genetics/VirtualMothHousing.java b/src/main/java/binnie/core/genetics/VirtualMothHousing.java index c708c7ce..d3dad2ab 100644 --- a/src/main/java/binnie/core/genetics/VirtualMothHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualMothHousing.java @@ -20,13 +20,13 @@ public class VirtualMothHousing extends VirtualHousing implements IButterflyNurs } @Override - @Nullable - public IIndividual getNanny() { - return null; + public void setCaterpillar(@Nullable final IButterfly butterfly) { } @Override - public void setCaterpillar(@Nullable final IButterfly butterfly) { + @Nullable + public IIndividual getNanny() { + return null; } @Override diff --git a/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java b/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java index 676b5546..3479fa07 100644 --- a/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java +++ b/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java @@ -10,9 +10,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.registry.ForgeRegistries; -/** - * Created by Elec332 on 13-5-2017. - */ public class ExtraBeesIntegration implements IInitializable { private static final boolean loaded; @@ -20,6 +17,14 @@ public class ExtraBeesIntegration implements IInitializable { public static Block hive; public static Item dictionary; + static { + loaded = Loader.isModLoaded("extrabees"); + } + + public static boolean isLoaded() { + return loaded; + } + @Override public void preInit() { @@ -39,16 +44,7 @@ public class ExtraBeesIntegration implements IInitializable { } - private IAlleleBeeSpecies getExtraBeesSpecies(String species){ - return Preconditions.checkNotNull((IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("extrabees.species."+species)); + private IAlleleBeeSpecies getExtraBeesSpecies(String species) { + return Preconditions.checkNotNull((IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("extrabees.species." + species)); } - - public static boolean isLoaded(){ - return loaded; - } - - static { - loaded = Loader.isModLoaded("extrabees"); - } - } diff --git a/src/main/java/binnie/core/integration/jei/Drawables.java b/src/main/java/binnie/core/integration/jei/Drawables.java index 0fa9d5e0..51f5b891 100644 --- a/src/main/java/binnie/core/integration/jei/Drawables.java +++ b/src/main/java/binnie/core/integration/jei/Drawables.java @@ -9,19 +9,10 @@ import net.minecraft.util.ResourceLocation; import javax.annotation.Nullable; public class Drawables { - @Nullable - private static Drawables INSTANCE; - - public static Drawables getDrawables(IGuiHelper guiHelper) { - if (INSTANCE == null) { - INSTANCE = new Drawables(guiHelper); - } - return INSTANCE; - } - public static final ResourceLocation guiTank = new ResourceLocation("binniecore:textures/gui/craftgui-slots.png"); public static final ResourceLocation guiArrow = new ResourceLocation("binniecore:textures/gui/craftgui-panels.png"); - + @Nullable + private static Drawables INSTANCE; private final IGuiHelper guiHelper; private final IDrawable tank; private final IDrawable tankOverlay; @@ -38,6 +29,13 @@ public class Drawables { this.arrowAnimated = createArrowAnimated(60); } + public static Drawables getDrawables(IGuiHelper guiHelper) { + if (INSTANCE == null) { + INSTANCE = new Drawables(guiHelper); + } + return INSTANCE; + } + public IDrawable getTank() { return tank; } diff --git a/src/main/java/binnie/core/item/IItemMiscProvider.java b/src/main/java/binnie/core/item/IItemMiscProvider.java index 6fee44bb..29e60f24 100644 --- a/src/main/java/binnie/core/item/IItemMiscProvider.java +++ b/src/main/java/binnie/core/item/IItemMiscProvider.java @@ -7,5 +7,4 @@ public interface IItemMiscProvider extends IItemEnum { void addInformation(List tooltip); String getModelPath(); - } diff --git a/src/main/java/binnie/core/item/ItemCore.java b/src/main/java/binnie/core/item/ItemCore.java index 3faffdab..7a58ef23 100644 --- a/src/main/java/binnie/core/item/ItemCore.java +++ b/src/main/java/binnie/core/item/ItemCore.java @@ -18,5 +18,4 @@ public class ItemCore extends Item implements IItemModelRegister { public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, 0); } - } diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index ffc0e1b2..8b6575e4 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -44,24 +44,6 @@ public class ItemFieldKit extends ItemCore { ModelBakery.registerItemVariants(item, fieldKit, fieldKit1, fieldKit2, fieldKit3); } - @SideOnly(Side.CLIENT) - private class FieldKitMeshDefinition implements ItemMeshDefinition { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - final int damage = stack.getItemDamage(); - if (damage < 24) { - return fieldKit3; - } - if (damage < 48) { - return fieldKit2; - } - if (damage < 64) { - return fieldKit1; - } - return fieldKit; - } - } - @Override public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { if (!playerIn.isSneaking() && handIn == EnumHand.MAIN_HAND) { @@ -86,4 +68,22 @@ public class ItemFieldKit extends ItemCore { public String getItemStackDisplayName(final ItemStack p_77653_1_) { return "Field Kit"; } + + @SideOnly(Side.CLIENT) + private class FieldKitMeshDefinition implements ItemMeshDefinition { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + final int damage = stack.getItemDamage(); + if (damage < 24) { + return fieldKit3; + } + if (damage < 48) { + return fieldKit2; + } + if (damage < 64) { + return fieldKit1; + } + return fieldKit; + } + } } diff --git a/src/main/java/binnie/core/liquid/BinnieFluid.java b/src/main/java/binnie/core/liquid/BinnieFluid.java index 73603299..b5ef3577 100644 --- a/src/main/java/binnie/core/liquid/BinnieFluid.java +++ b/src/main/java/binnie/core/liquid/BinnieFluid.java @@ -3,18 +3,13 @@ package binnie.core.liquid; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import java.awt.*; +import java.awt.Color; class BinnieFluid extends Fluid { private final String name; private final IFluidType fluidType; private final int color; - @Override - public String getLocalizedName(FluidStack stack) { - return this.name; - } - public BinnieFluid(final IFluidType fluid) { super(fluid.getIdentifier(), fluid.getStill(), fluid.getFlowing()); this.fluidType = fluid; @@ -22,6 +17,11 @@ class BinnieFluid extends Fluid { this.color = new Color(this.fluidType.getColour()).getRGB(); } + @Override + public String getLocalizedName(FluidStack stack) { + return this.name; + } + @Override public int getColor() { return color; diff --git a/src/main/java/binnie/core/liquid/FluidContainerType.java b/src/main/java/binnie/core/liquid/FluidContainerType.java index 7211db8f..a4aa99a4 100644 --- a/src/main/java/binnie/core/liquid/FluidContainerType.java +++ b/src/main/java/binnie/core/liquid/FluidContainerType.java @@ -20,14 +20,14 @@ public enum FluidContainerType { @Nullable private ItemFluidContainer item; - public int getMaxStackSize() { - return 16; - } - public static FluidContainerType[] getBinnieContainers() { return new FluidContainerType[]{GLASS, CYLINDER}; } + public int getMaxStackSize() { + return 16; + } + public String getName() { return this.name().toLowerCase(); } diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 8e05bfaf..1f1478e0 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -18,7 +18,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +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; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.Fluid; @@ -188,7 +193,5 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { } return location; } - } - } diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 0c3d50f4..fab22a66 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -62,8 +62,9 @@ public class ManagerLiquid extends ManagerBase { GameRegistry.addShapelessRecipe(FluidContainerType.GLASS.get(1), Items.GLASS_BOTTLE); GameRegistry.addShapelessRecipe(new ItemStack(Items.GLASS_BOTTLE), FluidContainerType.GLASS.get(1)); GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.GLASS.get(3), - " b ", "g g", " g ", - 'g', OreDictUtil.BLOCK_GLASS, 'b', OreDictUtil.SLAB_WOOD)); + " b ", "g g", " g ", + 'g', OreDictUtil.BLOCK_GLASS, 'b', OreDictUtil.SLAB_WOOD + )); } public IFluidType getFluidType(final String liquid) { diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index a106157b..dddac2f5 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -15,7 +15,11 @@ 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.*; +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; @@ -31,8 +35,8 @@ import java.util.List; import java.util.Random; class BlockMachine extends BlockContainer implements IBlockMachine { - private MachineGroup group; public static final PropertyInteger MACHINE_TYPE = PropertyInteger.create("machine_type", 0, 15); + private MachineGroup group; public BlockMachine(MachineGroup group, String blockName) { super(Material.IRON); diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index 0a7a4ca7..19f79fbf 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -1,6 +1,5 @@ package binnie.core.machines; - import binnie.core.BinnieCore; import binnie.core.machines.component.IInteraction; import binnie.core.machines.component.IRender; @@ -26,7 +25,11 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT { private MachinePackage machinePackage; @@ -47,6 +50,32 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN this.machinePackage = pack; } + @Nullable + public static IMachine getMachine(@Nullable final Object inventory) { + if (inventory instanceof IMachine) { + return (IMachine) inventory; + } + if (inventory instanceof TileEntityMachine) { + return ((TileEntityMachine) inventory).getMachine(); + } + if (inventory instanceof MachineComponent) { + return ((MachineComponent) inventory).getMachine(); + } + return null; + } + + @Nullable + public static T getInterface(final Class interfac, @Nullable final Object inventory) { + final IMachine machine = getMachine(inventory); + if (machine != null) { + return machine.getInterface(interfac); + } + if (interfac.isInstance(inventory)) { + return interfac.cast(inventory); + } + return null; + } + @Override public void addComponent(final MachineComponent component) { Preconditions.checkNotNull(component, "Can't have a null machine component!"); @@ -213,32 +242,6 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN return this.machinePackage; } - @Nullable - public static IMachine getMachine(@Nullable final Object inventory) { - if (inventory instanceof IMachine) { - return (IMachine) inventory; - } - if (inventory instanceof TileEntityMachine) { - return ((TileEntityMachine) inventory).getMachine(); - } - if (inventory instanceof MachineComponent) { - return ((MachineComponent) inventory).getMachine(); - } - return null; - } - - @Nullable - public static T getInterface(final Class interfac, @Nullable final Object inventory) { - final IMachine machine = getMachine(inventory); - if (machine != null) { - return machine.getInterface(interfac); - } - if (interfac.isInstance(inventory)) { - return interfac.cast(inventory); - } - return null; - } - @Override public MachineUtil getMachineUtil() { return new MachineUtil(this); diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/src/main/java/binnie/core/machines/MachineComponent.java index 24e85988..d4640d35 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/src/main/java/binnie/core/machines/MachineComponent.java @@ -15,14 +15,14 @@ public class MachineComponent implements INbtReadable, INbtWritable { machine.addComponent(this); } - public void setMachine(final IMachine machine) { - this.machine = machine; - } - public IMachine getMachine() { return this.machine; } + public void setMachine(final IMachine machine) { + this.machine = machine; + } + @Override public void readFromNBT(final NBTTagCompound nbttagcompound) { } diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index 08f1afe2..c0430d68 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -13,13 +13,13 @@ import java.util.LinkedHashMap; import java.util.Map; public class MachineGroup { + public boolean customRenderer; private AbstractMod mod; private String blockName; private String uid; private Map packages; private Map packagesID; private BlockMachine block; - public boolean customRenderer; private boolean renderedTileEntity; public MachineGroup(final AbstractMod mod, final String uid, final String blockName, final IMachineType[] types) { @@ -43,8 +43,8 @@ public class MachineGroup { pack.register(); } } - - private void createPackages(IMachineType[] types){ + + private void createPackages(IMachineType[] types) { for (IMachineType type : types) { if (type.getPackageClass() != null) { if (type.isActive()) { diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index fef0ccc5..7148c480 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -6,16 +6,12 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public abstract class MachinePackage { + boolean powered; private String uid; private boolean active; - boolean powered; private int metadata; private MachineGroup group; - public String getUID() { - return this.uid; - } - protected MachinePackage(final String uid, final boolean powered) { this.active = true; this.powered = false; @@ -24,6 +20,10 @@ public abstract class MachinePackage { this.powered = powered; } + public String getUID() { + return this.uid; + } + public abstract void createMachine(final Machine p0); public abstract TileEntity createTileEntity(); diff --git a/src/main/java/binnie/core/machines/MachineRendererBlock.java b/src/main/java/binnie/core/machines/MachineRendererBlock.java index 9417d05f..234a34a7 100644 --- a/src/main/java/binnie/core/machines/MachineRendererBlock.java +++ b/src/main/java/binnie/core/machines/MachineRendererBlock.java @@ -27,5 +27,4 @@ public class MachineRendererBlock { GlStateManager.popMatrix(); } - } diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 92555652..1db30741 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -7,7 +7,11 @@ import binnie.core.machines.inventory.ValidatorSprite; import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; public class ManagerMachine extends ManagerBase { private Map, Class[]> componentInterfaceMap; diff --git a/src/main/java/binnie/core/machines/TileEntityMachine.java b/src/main/java/binnie/core/machines/TileEntityMachine.java index ec0c598e..45273325 100644 --- a/src/main/java/binnie/core/machines/TileEntityMachine.java +++ b/src/main/java/binnie/core/machines/TileEntityMachine.java @@ -10,14 +10,6 @@ import net.minecraft.nbt.NBTTagCompound; public class TileEntityMachine extends TileEntityMachineBase implements INetworkedEntity { private Machine machine; - @Override - public void update() { - super.update(); - if (this.machine != null) { - this.machine.onUpdate(); - } - } - public TileEntityMachine(final MachinePackage pack) { this.setMachine(pack); } @@ -25,9 +17,11 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork public TileEntityMachine() { } - public void setMachine(final MachinePackage pack) { - if (pack != null) { - this.machine = new Machine(pack, this); + @Override + public void update() { + super.update(); + if (this.machine != null) { + this.machine.onUpdate(); } } @@ -70,16 +64,22 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork return this.machine; } + public void setMachine(final MachinePackage pack) { + if (pack != null) { + this.machine = new Machine(pack, this); + } + } + public void onBlockDestroy() { if (this.getMachine() != null) { this.getMachine().onBlockDestroy(); } } -//TODO NETWORK UPDATE -// @Override -// public final Packet getDescriptionPacket() { -// return (this.getMachine() != null) ? this.getMachine().getDescriptionPacket() : null; -// } + //TODO NETWORK UPDATE + /*@Override + public final Packet getDescriptionPacket() { + return (this.getMachine() != null) ? this.getMachine().getDescriptionPacket() : null; + }*/ @Override public void invalidate() { diff --git a/src/main/java/binnie/core/machines/base/DefaultPower.java b/src/main/java/binnie/core/machines/base/DefaultPower.java index 9d77f723..9389d339 100644 --- a/src/main/java/binnie/core/machines/base/DefaultPower.java +++ b/src/main/java/binnie/core/machines/base/DefaultPower.java @@ -12,29 +12,29 @@ class DefaultPower implements IPoweredMachine { return new PowerInfo(this, 0.0f); } -// @Override -// @Optional.Method(modid = "IC2") -// public double getDemandedEnergy() { -// return 0.0; -// } -// -// @Override -// @Optional.Method(modid = "IC2") -// public int getSinkTier() { -// return 0; -// } + /*@Override + @Optional.Method(modid = "IC2") + public double getDemandedEnergy() { + return 0.0; + } -// @Override -// @Optional.Method(modid = "IC2") -// public double injectEnergy(final EnumFacing directionFrom, final double amount, final double voltage) { -// return 0.0; -// } -// -// @Override -// @Optional.Method(modid = "IC2") -// public boolean acceptsEnergyFrom(final TileEntity emitter, final EnumFacing direction) { -// return false; -// } + @Override + @Optional.Method(modid = "IC2") + public int getSinkTier() { + return 0; + } + + @Override + @Optional.Method(modid = "IC2") + public double injectEnergy(final EnumFacing directionFrom, final double amount, final double voltage) { + return 0.0; + } + + @Override + @Optional.Method(modid = "IC2") + public boolean acceptsEnergyFrom(final TileEntity emitter, final EnumFacing direction) { + return false; + }*/ @Override public PowerInterface getInterface() { @@ -70,5 +70,4 @@ class DefaultPower implements IPoweredMachine { public boolean canReceive() { return false; } - } diff --git a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java index 3eda6825..c0a7cfc0 100644 --- a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java +++ b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java @@ -3,7 +3,11 @@ package binnie.core.machines.base; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IInventoryMachine; import binnie.core.machines.inventory.TankSlot; -import binnie.core.machines.power.*; +import binnie.core.machines.power.IPoweredMachine; +import binnie.core.machines.power.ITankMachine; +import binnie.core.machines.power.PowerInfo; +import binnie.core.machines.power.PowerInterface; +import binnie.core.machines.power.TankInfo; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -38,17 +42,17 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi return (inv == null || inv == this) ? DefaultPower.INSTANCE : inv; } -// @Override -// public ItemStack getStackInSlotOnClosing(final int var1) { -// return this.getInventory().getStackInSlotOnClosing(var1); -// } + /*@Override + public ItemStack getStackInSlotOnClosing(final int var1) { + return this.getInventory().getStackInSlotOnClosing(var1); + }*/ @Override public boolean isUsableByPlayer(final EntityPlayer entityplayer) { return !this.isInvalid() && - this.getWorld().getTileEntity(getPos()) == this && - entityplayer.getDistanceSqToCenter(getPos()) <= 64.0 && - this.getInventory().isUsableByPlayer(entityplayer); + this.getWorld().getTileEntity(getPos()) == this && + entityplayer.getDistanceSqToCenter(getPos()) <= 64.0 && + this.getInventory().isUsableByPlayer(entityplayer); } @Override @@ -117,29 +121,29 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi return this.getTankContainer().getTanks(); } -// @Override -// @Optional.Method(modid = "IC2") -// public double getDemandedEnergy() { -// return this.getPower().getDemandedEnergy(); -// } -// -// @Override -// @Optional.Method(modid = "IC2") -// public int getSinkTier() { -// return this.getPower().getSinkTier(); -// } -// -// @Override -// @Optional.Method(modid = "IC2") -// public double injectEnergy(final ForgeDirection directionFrom, final double amount, final double voltage) { -// return this.getPower().injectEnergy(directionFrom, amount, voltage); -// } -// -// @Override -// @Optional.Method(modid = "IC2") -// public boolean acceptsEnergyFrom(final TileEntity emitter, final ForgeDirection direction) { -// return this.getPower().acceptsEnergyFrom(emitter, direction); -// } + /*@Override + @Optional.Method(modid = "IC2") + public double getDemandedEnergy() { + return this.getPower().getDemandedEnergy(); + } + + @Override + @Optional.Method(modid = "IC2") + public int getSinkTier() { + return this.getPower().getSinkTier(); + } + + @Override + @Optional.Method(modid = "IC2") + public double injectEnergy(final ForgeDirection directionFrom, final double amount, final double voltage) { + return this.getPower().injectEnergy(directionFrom, amount, voltage); + } + + @Override + @Optional.Method(modid = "IC2") + public boolean acceptsEnergyFrom(final TileEntity emitter, final ForgeDirection direction) { + return this.getPower().acceptsEnergyFrom(emitter, direction); + }*/ @Override public int receiveEnergy(int maxReceive, boolean simulate) { @@ -204,5 +208,4 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi public IFluidHandler getHandler(@Nullable EnumFacing from) { return getTankContainer().getHandler(from); } - } diff --git a/src/main/java/binnie/core/machines/component/IBuildcraft.java b/src/main/java/binnie/core/machines/component/IBuildcraft.java index 05eb77c6..ad360096 100644 --- a/src/main/java/binnie/core/machines/component/IBuildcraft.java +++ b/src/main/java/binnie/core/machines/component/IBuildcraft.java @@ -11,6 +11,6 @@ public interface IBuildcraft { interface ActionProvider //extends IActionReceptor { -// void getActions(final List p0); + //void getActions(final List p0); } } diff --git a/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/src/main/java/binnie/core/machines/inventory/BaseSlot.java index e3bc0489..8f7684e5 100644 --- a/src/main/java/binnie/core/machines/inventory/BaseSlot.java +++ b/src/main/java/binnie/core/machines/inventory/BaseSlot.java @@ -10,12 +10,12 @@ import java.util.Collection; import java.util.EnumSet; public abstract class BaseSlot implements INbtWritable, INbtReadable, IValidator { - private SidedAccess access; + protected String unlocName; @Nullable Validator validator; + private SidedAccess access; private boolean readOnly; private int index; - protected String unlocName; public BaseSlot(final int index, final String unlocName) { this.access = new SidedAccess(); @@ -41,11 +41,6 @@ public abstract class BaseSlot implements INbtWritable, INbtReadable, IValida public abstract void setContent(final T content); - public BaseSlot setValidator(final Validator val) { - this.validator = val; - return this; - } - public boolean isEmpty() { return this.getContent() == null; } @@ -75,22 +70,6 @@ public abstract class BaseSlot implements INbtWritable, INbtReadable, IValida this.forbidExtraction(); } - public void setInputSides(final EnumSet sides) { - for (final EnumFacing side : EnumSet.complementOf(sides)) { - //if (side != ForgeDirection.UNKNOWN) { - this.access.setInsert(side, false); - //} - } - } - - public void setOutputSides(final EnumSet sides) { - for (final EnumFacing side : EnumSet.complementOf(sides)) { - //if (side != ForgeDirection.UNKNOWN) { - this.access.setExtract(side, false); - //} - } - } - public void forbidExtraction() { this.access.setExtract(false); this.access.forbidExtractChange(); @@ -113,10 +92,26 @@ public abstract class BaseSlot implements INbtWritable, INbtReadable, IValida return this.access.getInsertionSides(); } + public void setInputSides(final EnumSet sides) { + for (final EnumFacing side : EnumSet.complementOf(sides)) { + //if (side != ForgeDirection.UNKNOWN) { + this.access.setInsert(side, false); + //} + } + } + public Collection getOutputSides() { return this.access.getExtractionSides(); } + public void setOutputSides(final EnumSet sides) { + for (final EnumFacing side : EnumSet.complementOf(sides)) { + //if (side != ForgeDirection.UNKNOWN) { + this.access.setExtract(side, false); + //} + } + } + public void setUnlocalisedName(final String name) { this.unlocName = name; } @@ -127,4 +122,9 @@ public abstract class BaseSlot implements INbtWritable, INbtReadable, IValida public Validator getValidator() { return this.validator; } + + public BaseSlot setValidator(final Validator val) { + this.validator = val; + return this; + } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java index c3f062cd..be60b589 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java @@ -51,10 +51,17 @@ public class ComponentInventoryTransfer extends MachineComponent { this.transfers.add(transfer); } + public abstract static class Condition { + @Nullable + public Transfer transfer; + + public abstract boolean fulfilled(final ItemStack p0); + } + public abstract class Transfer { + protected final IMachine machine; @Nullable protected Condition condition; - protected final IMachine machine; private Transfer(final IMachine machine) { this.machine = machine; @@ -141,11 +148,4 @@ public class ComponentInventoryTransfer extends MachineComponent { return !stack.isEmpty() && (this.condition == null || this.condition.fulfilled(stack)); } } - - public abstract static class Condition { - @Nullable - public Transfer transfer; - - public abstract boolean fulfilled(final ItemStack p0); - } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 81a30a69..35fd011c 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -15,7 +15,11 @@ import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fluids.capability.templates.FluidHandlerConcatenate; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; public class ComponentTankContainer extends MachineComponent implements ITankMachine { private Map tanks; diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 3287be76..1bbb0fa6 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -23,20 +23,24 @@ public class InventorySlot extends BaseSlot { return this.itemStack.isEmpty() ? null : this.itemStack; } + @Override + public void setContent(final ItemStack itemStack) { + this.itemStack = itemStack; + } + public ItemStack getItemStack() { return this.itemStack; } + public void setItemStack(final ItemStack duplicate) { + this.setContent(duplicate); + } + @Override public boolean isEmpty() { return this.itemStack.isEmpty(); } - @Override - public void setContent(final ItemStack itemStack) { - this.itemStack = itemStack; - } - public ItemStack decrStackSize(final int amount) { if (this.itemStack.isEmpty()) { return ItemStack.EMPTY; @@ -73,15 +77,15 @@ public class InventorySlot extends BaseSlot { return slotNBT; } - public void setItemStack(final ItemStack duplicate) { - this.setContent(duplicate); - } - @Override public SlotValidator getValidator() { return (SlotValidator) this.validator; } + public Type getType() { + return this.type; + } + public void setType(final Type type) { this.type = type; if (type == Type.Recipe) { @@ -90,10 +94,6 @@ public class InventorySlot extends BaseSlot { } } - public Type getType() { - return this.type; - } - public boolean isRecipe() { return this.type == Type.Recipe; } diff --git a/src/main/java/binnie/core/machines/inventory/MachineSide.java b/src/main/java/binnie/core/machines/inventory/MachineSide.java index a3f43de1..d4501bb5 100644 --- a/src/main/java/binnie/core/machines/inventory/MachineSide.java +++ b/src/main/java/binnie/core/machines/inventory/MachineSide.java @@ -6,12 +6,12 @@ import java.util.Collection; import java.util.EnumSet; public class MachineSide { - private static EnumSet All = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST); public static EnumSet TopAndBottom = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN); public static EnumSet None = EnumSet.noneOf(EnumFacing.class); public static EnumSet Top = EnumSet.of(EnumFacing.UP); public static EnumSet Bottom = EnumSet.of(EnumFacing.DOWN); public static EnumSet Sides = EnumSet.of(EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST); + private static EnumSet All = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST); public static String asString(final Collection sides) { if (sides.containsAll(MachineSide.All)) { @@ -66,5 +66,4 @@ public class MachineSide { } return text; } - } diff --git a/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/src/main/java/binnie/core/machines/inventory/SidedAccess.java index 80c84aa1..35af77cd 100644 --- a/src/main/java/binnie/core/machines/inventory/SidedAccess.java +++ b/src/main/java/binnie/core/machines/inventory/SidedAccess.java @@ -2,7 +2,11 @@ package binnie.core.machines.inventory; import net.minecraft.util.EnumFacing; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; class SidedAccess { private Map accesses; diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index 9d37f9d9..a4725633 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -50,5 +50,4 @@ public class TankSlot extends BaseSlot { public String getName() { return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.slot." + this.unlocName); } - } diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java b/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java index 74c70a00..f635a94c 100644 --- a/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java +++ b/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java @@ -9,6 +9,9 @@ import java.util.List; public class ValidatorSprite { + private List spritesInput; + private List spritesOutput; + public ValidatorSprite(final AbstractMod mod, final String pathInput, final String pathOutput) { this.spritesInput = new ArrayList<>(); this.spritesOutput = new ArrayList<>(); @@ -16,11 +19,7 @@ public class ValidatorSprite { this.spritesOutput.add(Binnie.RESOURCE.getItemSprite(mod, pathOutput)); } - private List spritesInput; - private List spritesOutput; - public BinnieSprite getSprite(final boolean input) { return input ? this.spritesInput.get(0) : this.spritesOutput.get(0); } - } diff --git a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java index 0380773a..c534c93e 100644 --- a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java +++ b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java @@ -10,10 +10,10 @@ import java.util.LinkedList; @Optional.Interface(iface = "binnie.core.machines.component.IBuildcraft.TriggerProvider", modid = "BuildCraft|Silicon") public class ComponentPowerReceptor extends MachineComponent implements IPoweredMachine/*, IBuildcraft.TriggerProvider*/, IInteraction.ChunkUnload, IInteraction.Invalidation { - private boolean registeredToIC2EnergyNet; + static final int inputAverageTicks = 20; float previousPower; LinkedList inputs; - static final int inputAverageTicks = 20; + private boolean registeredToIC2EnergyNet; private PowerInterface container; public ComponentPowerReceptor(final IMachine machine) { @@ -26,18 +26,18 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered this.previousPower = 0.0f; this.inputs = new LinkedList<>(); this.container = new PowerInterface(storage); -// if (!this.registeredToIC2EnergyNet) { -// this.addToEnergyNet(); -// } + /*if (!this.registeredToIC2EnergyNet) { + this.addToEnergyNet(); + }*/ } @Override public void readFromNBT(final NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); this.container.readFromNBT(nbttagcompound); -// if (!this.registeredToIC2EnergyNet) { -// this.addToEnergyNet(); -// } + /*if (!this.registeredToIC2EnergyNet) { + this.addToEnergyNet(); + }*/ } @Override @@ -47,52 +47,52 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered return nbttagcompound; } -// @Override -// public void onUpdate() { -// if (!this.registeredToIC2EnergyNet && !this.getMachine().getTileEntity().isInvalid()) { -// this.addToEnergyNet(); -// } -// } + /*@Override + public void onUpdate() { + if (!this.registeredToIC2EnergyNet && !this.getMachine().getTileEntity().isInvalid()) { + this.addToEnergyNet(); + } + }*/ @Override public PowerInfo getPowerInfo() { return new PowerInfo(this, 0.0f); } -// @Optional.Method(modid = "BuildCraft|Silicon") -// @Override -// public final void getTriggers(final List triggers) { -//// triggers.add(TriggerPower.powerNone(this)); -//// triggers.add(TriggerPower.powerLow(this)); -//// triggers.add(TriggerPower.powerMedium(this)); -//// triggers.add(TriggerPower.powerHigh(this)); -//// triggers.add(TriggerPower.powerFull(this)); -// } + /*@Optional.Method(modid = "BuildCraft|Silicon") + @Override + public final void getTriggers(final List triggers) { + //triggers.add(TriggerPower.powerNone(this)); + //triggers.add(TriggerPower.powerLow(this)); + //triggers.add(TriggerPower.powerMedium(this)); + //triggers.add(TriggerPower.powerHigh(this)); + //triggers.add(TriggerPower.powerFull(this)); + } -// @Override -// @Optional.Method(modid = "IC2") -// public double getDemandedEnergy() { -// return this.container.getEnergySpace(PowerSystem.EU); -// } -// -// @Override -// @Optional.Method(modid = "IC2") -// public int getSinkTier() { -// return 1; -// } -// -// @Override -// @Optional.Method(modid = "IC2") -// public double injectEnergy(final EnumFacing directionFrom, final double amount, final double voltage) { -// this.container.addEnergy(PowerSystem.EU, amount, true); -// return 0.0; -// } -// -// @Override -// @Optional.Method(modid = "IC2") -// public boolean acceptsEnergyFrom(final TileEntity emitter, final EnumFacing direction) { -// return this.acceptsPowerSystem(PowerSystem.EU); -// } + @Override + @Optional.Method(modid = "IC2") + public double getDemandedEnergy() { + return this.container.getEnergySpace(PowerSystem.EU); + } + + @Override + @Optional.Method(modid = "IC2") + public int getSinkTier() { + return 1; + } + + @Override + @Optional.Method(modid = "IC2") + public double injectEnergy(final EnumFacing directionFrom, final double amount, final double voltage) { + this.container.addEnergy(PowerSystem.EU, amount, true); + return 0.0; + } + + @Override + @Optional.Method(modid = "IC2") + public boolean acceptsEnergyFrom(final TileEntity emitter, final EnumFacing direction) { + return this.acceptsPowerSystem(PowerSystem.EU); + }*/ @Override public int receiveEnergy(final int maxReceive, final boolean simulate) { @@ -143,33 +143,33 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered //this.removeFromEnergyNet(); } -// private void addToEnergyNet() { -// if (this.getMachine().getWorld() == null) { -// return; -// } -// if (Mods.IC2.active()) { -// this.do_addToEnergyNet(); -// } -// } -// -// private void removeFromEnergyNet() { -// if (this.getMachine().getWorld() == null) { -// return; -// } -// if (Mods.IC2.active()) { -// this.do_removeFromEnergyNet(); -// } -// } + /*private void addToEnergyNet() { + if (this.getMachine().getWorld() == null) { + return; + } + if (Mods.IC2.active()) { + this.do_addToEnergyNet(); + } + } -// @Optional.Method(modid = "IC2") -// private void do_addToEnergyNet() { -// MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile) this.getMachine().getTileEntity())); -// this.registeredToIC2EnergyNet = true; -// } -// -// @Optional.Method(modid = "IC2") -// private void do_removeFromEnergyNet() { -// MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) this.getMachine().getTileEntity())); -// this.registeredToIC2EnergyNet = false; -// } + private void removeFromEnergyNet() { + if (this.getMachine().getWorld() == null) { + return; + } + if (Mods.IC2.active()) { + this.do_removeFromEnergyNet(); + } + } + + @Optional.Method(modid = "IC2") + private void do_addToEnergyNet() { + MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile) this.getMachine().getTileEntity())); + this.registeredToIC2EnergyNet = true; + } + + @Optional.Method(modid = "IC2") + private void do_removeFromEnergyNet() { + MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) this.getMachine().getTileEntity())); + this.registeredToIC2EnergyNet = false; + }*/ } diff --git a/src/main/java/binnie/core/machines/power/ComponentProcess.java b/src/main/java/binnie/core/machines/power/ComponentProcess.java index 17da7eb6..e82e6cd4 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcess.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcess.java @@ -44,10 +44,6 @@ public abstract class ComponentProcess extends ComponentProcessIndefinate implem this.progressAmount += f; } - public void setProgress(final float f) { - this.progressAmount = f; - } - @Override protected void progressTick() { super.progressTick(); @@ -64,6 +60,10 @@ public abstract class ComponentProcess extends ComponentProcessIndefinate implem return this.progressAmount; } + public void setProgress(final float f) { + this.progressAmount = f; + } + protected void onFinishTask() { } diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index f678457b..0568eb61 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -9,12 +9,21 @@ import net.minecraft.nbt.NBTTagCompound; import javax.annotation.Nullable; public abstract class ComponentProcessIndefinate extends MachineComponent implements IProcess, INetwork.TilePacketSync { + int clientEnergyPerSecond; + int clientInProgress; private float energyPerTick; private boolean inProgress; private float actionPauseProcess; private float actionCancelTask; - int clientEnergyPerSecond; - int clientInProgress; + + public ComponentProcessIndefinate(final IMachine machine, final float energyPerTick) { + super(machine); + this.energyPerTick = 0.1f; + this.actionPauseProcess = 0.0f; + this.actionCancelTask = 0.0f; + this.clientEnergyPerSecond = 0; + this.energyPerTick = energyPerTick; + } @Override public void syncFromNBT(final NBTTagCompound nbt) { @@ -26,15 +35,6 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem nbt.setBoolean("progress", this.inProgress); } - public ComponentProcessIndefinate(final IMachine machine, final float energyPerTick) { - super(machine); - this.energyPerTick = 0.1f; - this.actionPauseProcess = 0.0f; - this.actionCancelTask = 0.0f; - this.clientEnergyPerSecond = 0; - this.energyPerTick = energyPerTick; - } - protected final IPoweredMachine getPower() { return this.getMachine().getInterface(IPoweredMachine.class); } diff --git a/src/main/java/binnie/core/machines/power/PowerSystem.java b/src/main/java/binnie/core/machines/power/PowerSystem.java index bdc3c779..321b8be5 100644 --- a/src/main/java/binnie/core/machines/power/PowerSystem.java +++ b/src/main/java/binnie/core/machines/power/PowerSystem.java @@ -14,6 +14,10 @@ public enum PowerSystem { this.conversion = conversion; } + public static PowerSystem get(final int i) { + return values()[i % values().length]; + } + public double convertTo(final int value) { return value / this.conversion; } @@ -22,10 +26,6 @@ public enum PowerSystem { return (int) (value * this.conversion); } - public static PowerSystem get(final int i) { - return values()[i % values().length]; - } - public String getUnitName() { return this.name(); } diff --git a/src/main/java/binnie/core/machines/power/TankInfo.java b/src/main/java/binnie/core/machines/power/TankInfo.java index fe4067c2..78e43ba4 100644 --- a/src/main/java/binnie/core/machines/power/TankInfo.java +++ b/src/main/java/binnie/core/machines/power/TankInfo.java @@ -23,6 +23,14 @@ public class TankInfo implements INbtReadable, INbtWritable { this.capacity = 0.0f; } + public static TankInfo[] get(final ITankMachine machine) { + final TankInfo[] info = new TankInfo[machine.getTanks().length]; + for (int i = 0; i < info.length; ++i) { + info[i] = new TankInfo(machine.getTanks()[i]); + } + return info; + } + public float getAmount() { return (this.liquid == null) ? 0.0f : this.liquid.amount; } @@ -31,14 +39,14 @@ public class TankInfo implements INbtReadable, INbtWritable { return this.capacity; } + /*public IIcon getIcon() { + return this.liquid.getFluid().getStillIcon(); + }*/ + public boolean isEmpty() { return this.liquid == null; } -// public IIcon getIcon() { -// return this.liquid.getFluid().getStillIcon(); -// } - public String getName() { return (this.liquid == null) ? "" : this.liquid.getFluid().getLocalizedName(this.liquid); } @@ -62,12 +70,4 @@ public class TankInfo implements INbtReadable, INbtWritable { nbt.setTag("liquid", tag); return nbt; } - - public static TankInfo[] get(final ITankMachine machine) { - final TankInfo[] info = new TankInfo[machine.getTanks().length]; - for (int i = 0; i < info.length; ++i) { - info[i] = new TankInfo(machine.getTanks()[i]); - } - return info; - } } diff --git a/src/main/java/binnie/core/machines/storage/CompartmentTab.java b/src/main/java/binnie/core/machines/storage/CompartmentTab.java index ae8c3fe5..6e625fe4 100644 --- a/src/main/java/binnie/core/machines/storage/CompartmentTab.java +++ b/src/main/java/binnie/core/machines/storage/CompartmentTab.java @@ -43,27 +43,27 @@ class CompartmentTab implements INbtWritable, INbtReadable { return this.name; } - public ItemStack getIcon() { - return this.icon; - } - - public EnumColor getColor() { - return this.color; - } - - public int getId() { - return this.id; - } - public void setName(final String name) { this.name = name; } + public ItemStack getIcon() { + return this.icon; + } + public void setIcon(final ItemStack icon) { this.icon = icon; } + public EnumColor getColor() { + return this.color; + } + public void setColor(final EnumColor color) { this.color = color; } + + public int getId() { + return this.id; + } } diff --git a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java index c77d4572..55586cc7 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java +++ b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java @@ -17,7 +17,6 @@ class ComponentBinnieCoreGUI extends MachineComponent implements IInteraction.Ri this.id = id; } - @Override public void onRightClick(final World world, final EntityPlayer player, final BlockPos pos) { BinnieCore.getBinnieProxy().openGui(this.id, player, pos); diff --git a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java index 36a0b93b..f4eab677 100644 --- a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java +++ b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java @@ -34,5 +34,4 @@ class MachineRendererCompartment { GlStateManager.popMatrix(); } - } diff --git a/src/main/java/binnie/core/machines/storage/ModelCompartment.java b/src/main/java/binnie/core/machines/storage/ModelCompartment.java index 891a6ed9..87022f26 100644 --- a/src/main/java/binnie/core/machines/storage/ModelCompartment.java +++ b/src/main/java/binnie/core/machines/storage/ModelCompartment.java @@ -115,25 +115,25 @@ class ModelCompartment extends ModelBase { @Override public void render(final Entity entity, final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { -// super.render(entity, f, f1, f2, f3, f4, f5); -// this.setRotationAngles(f, f1, f2, f3, f4, f5); -// this.Column1.render(f5); -// this.Column4.render(f5); -// this.Column2.render(f5); -// this.Column3.render(f5); -// this.Lid_1.render(f5); -// this.Body_1.render(f5); -// this.Lock_1.render(f5); -// this.Lid_2.render(f5); -// this.Body_2.render(f5); -// this.Lock_2.render(f5); -// this.Body.render(f5); -// this.Lid_3.render(f5); -// this.Body_3.render(f5); -// this.Lock_3.render(f5); -// this.Lid_4.render(f5); -// this.Body_4.render(f5); -// this.Lock_4.render(f5); + /*super.render(entity, f, f1, f2, f3, f4, f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5); + this.Column1.render(f5); + this.Column4.render(f5); + this.Column2.render(f5); + this.Column3.render(f5); + this.Lid_1.render(f5); + this.Body_1.render(f5); + this.Lock_1.render(f5); + this.Lid_2.render(f5); + this.Body_2.render(f5); + this.Lock_2.render(f5); + this.Body.render(f5); + this.Lid_3.render(f5); + this.Body_3.render(f5); + this.Lock_3.render(f5); + this.Lid_4.render(f5); + this.Body_4.render(f5); + this.Lock_4.render(f5);*/ } private void setRotation(final ModelRenderer model, final float x, final float y, final float z) { diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 703b6925..e8d5cccb 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -23,8 +23,17 @@ import binnie.core.craftgui.geometry.Border; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.minecraft.*; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.Dialog; +import binnie.core.craftgui.minecraft.EnumColor; +import binnie.core.craftgui.minecraft.IWindowAffectsShiftClick; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlide; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlTabIcon; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; @@ -43,27 +52,32 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class WindowCompartment extends WindowMachine implements IWindowAffectsShiftClick { private final Map panels; + boolean dueUpdate; private ControlTextEdit tabName; private ControlItemDisplay tabIcon; private ControlColourSelector tabColour; - boolean dueUpdate; private int currentTab; - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowCompartment(player, inventory, side); - } - public WindowCompartment(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { super(320, 226, player, inventory, side); this.panels = new HashMap<>(); this.currentTab = 0; } + public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + return new WindowCompartment(player, inventory, side); + } + @Override @SideOnly(Side.CLIENT) public void initialiseClient() { diff --git a/src/main/java/binnie/core/machines/storage/WindowTest.java b/src/main/java/binnie/core/machines/storage/WindowTest.java index da653b5d..ba7cccdf 100644 --- a/src/main/java/binnie/core/machines/storage/WindowTest.java +++ b/src/main/java/binnie/core/machines/storage/WindowTest.java @@ -9,14 +9,14 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; public class WindowTest extends WindowMachine { - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowCompartment(player, inventory, side); - } - public WindowTest(final EntityPlayer player, final IInventory inventory, final Side side) { super(320, 240, player, inventory, side); } + public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + return new WindowCompartment(player, inventory, side); + } + @Override public void initialiseClient() { } diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index e608400f..372c6d55 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -98,116 +98,6 @@ public class TransferRequest { return returnItem; } - private void setItemToTransfer(final ItemStack itemToTransfer) { - this.itemToTransfer = itemToTransfer; - } - - private void setReturnItem(final ItemStack returnItem) { - this.returnItem = returnItem; - } - - public TransferRequest setOrigin(@Nullable final IInventory origin) { - this.origin = origin; - return this; - } - - private void setDestination(final IInventory destination) { - this.destination = destination; - } - - public TransferRequest setTargetSlots(final int[] targetSlots) { - this.targetSlots = targetSlots; - return this; - } - - public TransferRequest setTargetTanks(final int[] targetTanks) { - this.targetTanks = targetTanks; - return this; - } - - public TransferRequest ignoreValidation() { - this.ignoreReadOnly = true; - return this; - } - - public ItemStack getReturnItem() { - return this.returnItem; - } - - public ItemStack transfer(final boolean doAdd) { - ItemStack item = this.returnItem; - if (item.isEmpty() || this.destination == null) { - return ItemStack.EMPTY; - } - if (this.transferLiquids && this.destination instanceof ITankMachine) { - if(origin == null){ - return ItemStack.EMPTY; - } - ItemStack itemIn = item.copy(); - for (final int tankID : this.targetTanks) { - item = transferToTank(item, this.origin, (ITankMachine) this.destination, tankID, doAdd); - if (item.isEmpty() || !ItemStack.areItemStacksEqual(item, itemIn)) { - break; - } - - item = transferFromTank(item, this.origin, (ITankMachine) this.destination, tankID, doAdd); - if (item.isEmpty() || !ItemStack.areItemStacksEqual(item, itemIn)) { - break; - } - } - } - if (!item.isEmpty()) { - for (final int slot : this.targetSlots) { - if (this.destination.isItemValidForSlot(slot, item) || this.ignoreReadOnly) { - if (this.destination instanceof IInventorySlots) { - InventorySlot inventorySlot = ((IInventorySlots) this.destination).getSlot(slot); - if (inventorySlot != null && inventorySlot.isRecipe()) { - continue; - } - } - ItemStack stackInSlot = this.destination.getStackInSlot(slot); - if (!stackInSlot.isEmpty()) { - if (item.isStackable()) { - final ItemStack merged = stackInSlot.copy(); - final NonNullList newStacks = mergeStacks(item.copy(), merged.copy()); - item = newStacks.get(0); - if (!areItemsEqual(merged, newStacks.get(1))) { - this.insertedSlots.add(new TransferSlot(slot, this.destination)); - } - if (doAdd) { - this.destination.setInventorySlotContents(slot, newStacks.get(1)); - } - if (item.isEmpty()) { - return ItemStack.EMPTY; - } - } - } - } - } - } - if (!item.isEmpty()) { - for (final int slot : this.targetSlots) { - if (this.destination.isItemValidForSlot(slot, item) || this.ignoreReadOnly) { - if (this.destination instanceof IInventorySlots) { - InventorySlot inventorySlot = ((IInventorySlots) this.destination).getSlot(slot); - if (inventorySlot != null && inventorySlot.isRecipe()) { - continue; - } - } - if (this.destination.getStackInSlot(slot).isEmpty()) { - this.insertedSlots.add(new TransferSlot(slot, this.destination)); - if (doAdd) { - this.destination.setInventorySlotContents(slot, item.copy()); - } - return ItemStack.EMPTY; - } - } - } - } - this.setReturnItem(item); - return this.getReturnItem(); - } - private static boolean areItemsEqual(final ItemStack merged, final ItemStack itemstack) { return ItemStack.areItemStackTagsEqual(itemstack, merged) && itemstack.isItemEqual(merged); } @@ -308,6 +198,93 @@ public class TransferRequest { return itemStack; } + public TransferRequest ignoreValidation() { + this.ignoreReadOnly = true; + return this; + } + + public ItemStack getReturnItem() { + return this.returnItem; + } + + private void setReturnItem(final ItemStack returnItem) { + this.returnItem = returnItem; + } + + public ItemStack transfer(final boolean doAdd) { + ItemStack item = this.returnItem; + if (item.isEmpty() || this.destination == null) { + return ItemStack.EMPTY; + } + if (this.transferLiquids && this.destination instanceof ITankMachine) { + if (origin == null) { + return ItemStack.EMPTY; + } + ItemStack itemIn = item.copy(); + for (final int tankID : this.targetTanks) { + item = transferToTank(item, this.origin, (ITankMachine) this.destination, tankID, doAdd); + if (item.isEmpty() || !ItemStack.areItemStacksEqual(item, itemIn)) { + break; + } + + item = transferFromTank(item, this.origin, (ITankMachine) this.destination, tankID, doAdd); + if (item.isEmpty() || !ItemStack.areItemStacksEqual(item, itemIn)) { + break; + } + } + } + if (!item.isEmpty()) { + for (final int slot : this.targetSlots) { + if (this.destination.isItemValidForSlot(slot, item) || this.ignoreReadOnly) { + if (this.destination instanceof IInventorySlots) { + InventorySlot inventorySlot = ((IInventorySlots) this.destination).getSlot(slot); + if (inventorySlot != null && inventorySlot.isRecipe()) { + continue; + } + } + ItemStack stackInSlot = this.destination.getStackInSlot(slot); + if (!stackInSlot.isEmpty()) { + if (item.isStackable()) { + final ItemStack merged = stackInSlot.copy(); + final NonNullList newStacks = mergeStacks(item.copy(), merged.copy()); + item = newStacks.get(0); + if (!areItemsEqual(merged, newStacks.get(1))) { + this.insertedSlots.add(new TransferSlot(slot, this.destination)); + } + if (doAdd) { + this.destination.setInventorySlotContents(slot, newStacks.get(1)); + } + if (item.isEmpty()) { + return ItemStack.EMPTY; + } + } + } + } + } + } + if (!item.isEmpty()) { + for (final int slot : this.targetSlots) { + if (this.destination.isItemValidForSlot(slot, item) || this.ignoreReadOnly) { + if (this.destination instanceof IInventorySlots) { + InventorySlot inventorySlot = ((IInventorySlots) this.destination).getSlot(slot); + if (inventorySlot != null && inventorySlot.isRecipe()) { + continue; + } + } + if (this.destination.getStackInSlot(slot).isEmpty()) { + this.insertedSlots.add(new TransferSlot(slot, this.destination)); + if (doAdd) { + this.destination.setInventorySlotContents(slot, item.copy()); + } + return ItemStack.EMPTY; + } + } + } + } + this.setReturnItem(item); + return this.getReturnItem(); + } + public List getInsertedSlots() { return this.insertedSlots; } @@ -321,23 +298,46 @@ public class TransferRequest { return this.origin; } + public TransferRequest setOrigin(@Nullable final IInventory origin) { + this.origin = origin; + return this; + } + @Nullable public IInventory getDestination() { return this.destination; } + private void setDestination(final IInventory destination) { + this.destination = destination; + } + public ItemStack getItemToTransfer() { return this.itemToTransfer; } + private void setItemToTransfer(final ItemStack itemToTransfer) { + this.itemToTransfer = itemToTransfer; + } + public int[] getTargetSlots() { return this.targetSlots; } + public TransferRequest setTargetSlots(final int[] targetSlots) { + this.targetSlots = targetSlots; + return this; + } + public int[] getTargetTanks() { return this.targetTanks; } + public TransferRequest setTargetTanks(final int[] targetTanks) { + this.targetTanks = targetTanks; + return this; + } + public static class TransferSlot { public int id; public IInventory inventory; diff --git a/src/main/java/binnie/core/mod/config/ManagerConfig.java b/src/main/java/binnie/core/mod/config/ManagerConfig.java index 8392b72c..5ebbb787 100644 --- a/src/main/java/binnie/core/mod/config/ManagerConfig.java +++ b/src/main/java/binnie/core/mod/config/ManagerConfig.java @@ -7,7 +7,11 @@ import net.minecraftforge.common.config.Configuration; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; public class ManagerConfig extends ManagerBase { private Map, Configuration> configurations; diff --git a/src/main/java/binnie/core/mod/config/PropertyBase.java b/src/main/java/binnie/core/mod/config/PropertyBase.java index 7bf596c7..f0bb8bb8 100644 --- a/src/main/java/binnie/core/mod/config/PropertyBase.java +++ b/src/main/java/binnie/core/mod/config/PropertyBase.java @@ -12,8 +12,8 @@ abstract class PropertyBase { Configuration file; Property property; ValueType defaultValue; - private ConfigProperty configProperty; AnnotationType annotatedProperty; + private ConfigProperty configProperty; private List comments; private Field field; diff --git a/src/main/java/binnie/core/models/AABBModelBaker.java b/src/main/java/binnie/core/models/AABBModelBaker.java index 0c17d487..27497b7e 100644 --- a/src/main/java/binnie/core/models/AABBModelBaker.java +++ b/src/main/java/binnie/core/models/AABBModelBaker.java @@ -8,7 +8,12 @@ import forestry.core.models.baker.ModelBakerModel; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.*; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.BlockFaceUV; +import net.minecraft.client.renderer.block.model.BlockPartFace; +import net.minecraft.client.renderer.block.model.FaceBakery; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelRotation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; @@ -27,28 +32,25 @@ import java.util.List; //AABB = AxisAlignedBoundingBox @SideOnly(Side.CLIENT) public class AABBModelBaker implements IModelBaker { + protected final FaceBakery faceBakery = new FaceBakery(); private final List faces = new ArrayList<>(); private final List> bakedModels = new ArrayList<>(); protected AxisAlignedBB modelBounds; - protected ModelBakerModel currentModel = new ModelBakerModel(ModelManager.getInstance().getDefaultBlockState()); - - protected final FaceBakery faceBakery = new FaceBakery(); + protected int colorIndex = -1; public AABBModelBaker() { this(Block.FULL_BLOCK_AABB); } - + public AABBModelBaker(AxisAlignedBB modelBounds) { this.modelBounds = modelBounds; } - + public void setModelBounds(AxisAlignedBB modelBounds) { this.modelBounds = modelBounds; } - protected int colorIndex = -1; - @Override public void setColorIndex(int colorIndex) { this.colorIndex = colorIndex; @@ -85,7 +87,6 @@ public class AABBModelBaker implements IModelBaker { addFace(facing, sprites[facing.ordinal()]); } } - } @Override @@ -105,46 +106,46 @@ public class AABBModelBaker implements IModelBaker { float minV; float maxU; float maxV; - switch(face){ - case SOUTH:{ - minU= from.x; + switch (face) { + case SOUTH: { + minU = from.x; minV = from.y; - maxU= to.x; + maxU = to.x; maxV = to.y; break; } - case NORTH:{ - minU= from.x; + case NORTH: { + minU = from.x; minV = from.y; - maxU= to.x; + maxU = to.x; maxV = to.y; break; } - case WEST:{ - minU= from.z; + case WEST: { + minU = from.z; minV = from.y; - maxU= to.z; + maxU = to.z; maxV = to.y; break; } - case EAST:{ - minU= from.z; + case EAST: { + minU = from.z; minV = from.y; - maxU= to.z; + maxU = to.z; maxV = to.y; break; } - case UP:{ - minU= from.x; + case UP: { + minU = from.x; minV = from.z; - maxU= to.x; + maxU = to.x; maxV = to.z; break; } - case DOWN:{ - minU= from.x; + case DOWN: { + minU = from.x; minV = from.z; - maxU= to.x; + maxU = to.x; maxV = to.z; break; } @@ -156,24 +157,24 @@ public class AABBModelBaker implements IModelBaker { break; } } - if (minU < 0 || maxU > 16) { - minU = 0; - maxU = 16; - } - if (minV < 0 || maxV > 16) { - minV = 0; - maxV = 16; - } + if (minU < 0 || maxU > 16) { + minU = 0; + maxU = 16; + } + if (minV < 0 || maxV > 16) { + minV = 0; + maxV = 16; + } minU = 16 - minU; minV = 16 - minV; maxU = 16 - maxU; maxV = 16 - maxV; - return new float[]{ - minU, - minV, + return new float[]{ + minU, + minV, - maxU, - maxV + maxU, + maxV }; } @@ -185,18 +186,6 @@ public class AABBModelBaker implements IModelBaker { faces.add(new BoundModelBakerFace(facing, colorIndex, sprite, modelBounds)); } - - private static class BoundModelBakerFace extends ModelBakerFace{ - - protected final AxisAlignedBB modelBounds; - - public BoundModelBakerFace(EnumFacing face, int colorIndex, TextureAtlasSprite sprite, AxisAlignedBB modelBounds) { - super(face, colorIndex, sprite); - - this.modelBounds = modelBounds; - } - - } @Override public IModelBakerModel bakeModel(boolean flip) { @@ -239,4 +228,14 @@ public class AABBModelBaker implements IModelBaker { currentModel.setParticleSprite(particleSprite); } + private static class BoundModelBakerFace extends ModelBakerFace { + + protected final AxisAlignedBB modelBounds; + + public BoundModelBakerFace(EnumFacing face, int colorIndex, TextureAtlasSprite sprite, AxisAlignedBB modelBounds) { + super(face, colorIndex, sprite); + + this.modelBounds = modelBounds; + } + } } diff --git a/src/main/java/binnie/core/models/DefaultStateMapper.java b/src/main/java/binnie/core/models/DefaultStateMapper.java index 536a453b..50378710 100644 --- a/src/main/java/binnie/core/models/DefaultStateMapper.java +++ b/src/main/java/binnie/core/models/DefaultStateMapper.java @@ -17,5 +17,4 @@ public class DefaultStateMapper extends StateMapperBase { protected ModelResourceLocation getModelResourceLocation(IBlockState state) { return new ModelResourceLocation(resourceLocation, "normal"); } - } diff --git a/src/main/java/binnie/core/models/DoublePassBakedModel.java b/src/main/java/binnie/core/models/DoublePassBakedModel.java index bdd5b532..7d0600bc 100644 --- a/src/main/java/binnie/core/models/DoublePassBakedModel.java +++ b/src/main/java/binnie/core/models/DoublePassBakedModel.java @@ -17,11 +17,11 @@ import java.util.List; @SideOnly(Side.CLIENT) public class DoublePassBakedModel implements IBakedModel { + private static final int c = DefaultVertexFormats.ITEM.getColorOffset() / 4; + private static final int v = DefaultVertexFormats.ITEM.getNextOffset() / 4; private IBakedModel mainModel; private int primaryColor = 0xFF000000; private int secondaryColor = 0xFF000000; - private static final int c = DefaultVertexFormats.ITEM.getColorOffset() / 4; - private static final int v = DefaultVertexFormats.ITEM.getNextOffset() / 4; /** * It colorizes the quads according to tintindex, which is defined in the json file. diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index 3c93e380..8f6f5ed0 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -3,7 +3,11 @@ package binnie.core.models; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import forestry.api.core.*; +import forestry.api.core.ForestryAPI; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.ISpriteRegister; +import forestry.api.core.IStateMapperRegister; import forestry.core.blocks.IColoredBlock; import forestry.core.items.IColoredItem; import forestry.core.models.BlockModelEntry; @@ -43,23 +47,66 @@ import java.util.Map; @SideOnly(Side.CLIENT) public class ModelManager implements IModelManager { - private final String modID; - private final static List customBlockModels = new ArrayList<>(); private final static List customModels = new ArrayList<>(); - + private final static List spriteRegister = new ArrayList<>(); + public static IModelState defaultFenceState; + private final String modID; private final List itemModelRegisters = new ArrayList<>(); private final List stateMapperRegisters = new ArrayList<>(); private final List blockColorList = new ArrayList<>(); private final List itemColorList = new ArrayList<>(); - private final static List spriteRegister = new ArrayList<>(); - - public static IModelState defaultFenceState; public ModelManager(String modID) { this.modID = modID; } + public static IModelState getDefaultFenceState() { + return defaultFenceState; + } + + @SideOnly(Side.CLIENT) + public static void reloadSprites() { + for (ISpriteRegister spriteRegister : spriteRegister) { + if (spriteRegister != null) { + spriteRegister.registerSprites(ForestryAPI.textureManager); + } + } + } + + public static void registerCustomModels(ModelBakeEvent event) { + IRegistry registry = event.getModelRegistry(); + for (final BlockModelEntry entry : customBlockModels) { + registry.putObject(entry.blockModelLocation, entry.model); + if (entry.itemModelLocation != null) { + registry.putObject(entry.itemModelLocation, entry.model); + } + } + + for (final ModelEntry entry : customModels) { + registry.putObject(entry.modelLocation, entry.model); + } + IModelState defaultBlockState = ModelUtil.loadModelState(new ResourceLocation("minecraft:models/block/block")); + IModelState defaultFenceState = ModelUtil.loadModelState(new ResourceLocation("minecraft:models/block/fence_inventory")); + ModelManager.defaultFenceState = mergeStates(defaultBlockState, defaultFenceState); + } + + private static IModelState mergeStates(IModelState state, IModelState secondaryState) { + Map tMap = Maps.newHashMap(); + TRSRTransformation guiTransformation = secondaryState.apply(Optional.of(TransformType.GUI)).get(); + tMap.putAll(IPerspectiveAwareModel.MapWrapper.getTransforms(state)); + tMap.put(TransformType.GUI, guiTransformation); + return new SimpleModelState(ImmutableMap.copyOf(tMap)); + } + + public static void registerCustomBlockModel(BlockModelEntry index) { + customBlockModels.add(index); + } + + public static void registerCustomModel(ModelEntry index) { + customModels.add(index); + } + @Override public void registerItemModel(Item item, int meta, String identifier) { ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(identifier)); @@ -96,10 +143,6 @@ public class ModelManager implements IModelManager { return new ModelResourceLocation(new ResourceLocation(modID, identifier), "inventory"); } - public static IModelState getDefaultFenceState() { - return defaultFenceState; - } - @SideOnly(Side.CLIENT) public void registerBlockClient(Block block) { if (block instanceof IItemModelRegister) { @@ -149,15 +192,6 @@ public class ModelManager implements IModelManager { } } - @SideOnly(Side.CLIENT) - public static void reloadSprites() { - for (ISpriteRegister spriteRegister : spriteRegister) { - if (spriteRegister != null) { - spriteRegister.registerSprites(ForestryAPI.textureManager); - } - } - } - @SideOnly(Side.CLIENT) public void registerItemAndBlockColors() { Minecraft minecraft = Minecraft.getMinecraft(); @@ -212,38 +246,4 @@ public class ModelManager implements IModelManager { return 0xffffff; } } - - public static void registerCustomModels(ModelBakeEvent event) { - IRegistry registry = event.getModelRegistry(); - for (final BlockModelEntry entry : customBlockModels) { - registry.putObject(entry.blockModelLocation, entry.model); - if (entry.itemModelLocation != null) { - registry.putObject(entry.itemModelLocation, entry.model); - } - } - - for (final ModelEntry entry : customModels) { - registry.putObject(entry.modelLocation, entry.model); - } - IModelState defaultBlockState = ModelUtil.loadModelState(new ResourceLocation("minecraft:models/block/block")); - IModelState defaultFenceState = ModelUtil.loadModelState(new ResourceLocation("minecraft:models/block/fence_inventory")); - ModelManager.defaultFenceState = mergeStates(defaultBlockState, defaultFenceState); - } - - private static IModelState mergeStates(IModelState state, IModelState secondaryState){ - Map tMap = Maps.newHashMap(); - TRSRTransformation guiTransformation = secondaryState.apply(Optional.of(TransformType.GUI)).get(); - tMap.putAll(IPerspectiveAwareModel.MapWrapper.getTransforms(state)); - tMap.put(TransformType.GUI, guiTransformation); - return new SimpleModelState(ImmutableMap.copyOf(tMap)); - } - - public static void registerCustomBlockModel(BlockModelEntry index) { - customBlockModels.add(index); - } - - public static void registerCustomModel(ModelEntry index) { - customModels.add(index); - } - } \ No newline at end of file diff --git a/src/main/java/binnie/core/models/ModelMutlipass.java b/src/main/java/binnie/core/models/ModelMutlipass.java index 86d7d306..9a96aa0f 100644 --- a/src/main/java/binnie/core/models/ModelMutlipass.java +++ b/src/main/java/binnie/core/models/ModelMutlipass.java @@ -34,7 +34,7 @@ public class ModelMutlipass, K> extends Mod protected K getWorldKey(IBlockState state) { return ((B) state.getBlock()).getWorldKey(state); } - + @Override protected IBakedModel bakeModel(IBlockState state, K key, B block) { if (key == null) { @@ -47,7 +47,7 @@ public class ModelMutlipass, K> extends Mod IBlockAccess world = stateExtended.getValue(UnlistedBlockAccess.BLOCKACCESS); BlockPos pos = stateExtended.getValue(UnlistedBlockPos.POS); baker.setModelBounds(state.getBoundingBox(world, pos)); - }else{ + } else { baker.setModelBounds(block.getItemBoundingBox()); } @@ -91,5 +91,4 @@ public class ModelMutlipass, K> extends Mod return itemModel = baker.bakeModel(true); } - } diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index 80021390..705cd59b 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -6,7 +6,11 @@ import binnie.core.craftgui.minecraft.ContainerCraftGUI; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; -import binnie.core.network.packet.*; +import binnie.core.network.packet.MessageBinnie; +import binnie.core.network.packet.MessageCraftGUI; +import binnie.core.network.packet.MessageMetadata; +import binnie.core.network.packet.MessageTileNBT; +import binnie.core.network.packet.MessageUpdate; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/core/network/BinniePacketHandler.java b/src/main/java/binnie/core/network/BinniePacketHandler.java index c93d5056..eae99986 100644 --- a/src/main/java/binnie/core/network/BinniePacketHandler.java +++ b/src/main/java/binnie/core/network/BinniePacketHandler.java @@ -28,15 +28,15 @@ public abstract class BinniePacketHandler implements IMessageHandler id.onMessage(message, ctx)); } } + + public abstract void onMessage(final IPacketID id, final MessageBinnie message, final MessageContext ctx); } @SuppressWarnings("unused") diff --git a/src/main/java/binnie/core/network/packet/MessageBinnie.java b/src/main/java/binnie/core/network/packet/MessageBinnie.java index d27016be..123d6161 100644 --- a/src/main/java/binnie/core/network/packet/MessageBinnie.java +++ b/src/main/java/binnie/core/network/packet/MessageBinnie.java @@ -5,11 +5,10 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import java.io.IOException; - public final class MessageBinnie implements IMessage { public int id; - private MessageBase message; ByteBuf data; + private MessageBase message; public MessageBinnie() { } diff --git a/src/main/java/binnie/core/network/packet/MessageNBT.java b/src/main/java/binnie/core/network/packet/MessageNBT.java index b46b9d44..281c2550 100644 --- a/src/main/java/binnie/core/network/packet/MessageNBT.java +++ b/src/main/java/binnie/core/network/packet/MessageNBT.java @@ -10,15 +10,6 @@ public class MessageNBT extends MessageBase { @Nullable NBTTagCompound nbt; - @Nullable - public NBTTagCompound getTagCompound() { - return this.nbt; - } - - void setTagCompound(final NBTTagCompound nbt) { - this.nbt = nbt; - } - public MessageNBT(final int id) { super(id); } @@ -32,6 +23,15 @@ public class MessageNBT extends MessageBase { super(message); } + @Nullable + public NBTTagCompound getTagCompound() { + return this.nbt; + } + + void setTagCompound(final NBTTagCompound nbt) { + this.nbt = nbt; + } + @Override public void writeData(final ByteBuf data) throws IOException { this.writeNBTTagCompound(this.nbt, data); diff --git a/src/main/java/binnie/core/network/packet/PacketMetadata.java b/src/main/java/binnie/core/network/packet/PacketMetadata.java index 313a69f8..44ac7c98 100644 --- a/src/main/java/binnie/core/network/packet/PacketMetadata.java +++ b/src/main/java/binnie/core/network/packet/PacketMetadata.java @@ -31,5 +31,4 @@ public class PacketMetadata extends SPacketUpdateTileEntity { public int getMetadata() { return metadata; } - } diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 9613b030..8a490b53 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -27,16 +27,16 @@ public class BinnieModProxy implements IBinnieModProxy { public BinnieModProxy() { } - @Override - public void setMod(final AbstractMod mod) { - this.mod = mod; - } - private AbstractMod getMod() { Preconditions.checkState(mod != null, "Mod has not been set"); return mod; } + @Override + public void setMod(final AbstractMod mod) { + this.mod = mod; + } + @Override public Item registerItem(Item item) { ForgeRegistries.ITEMS.register(item); @@ -103,10 +103,10 @@ public class BinnieModProxy implements IBinnieModProxy { } -// @Override -// public IIcon getIcon(final IIconRegister register, final String string) { -// return BinnieCore.proxy.getIcon(register, this.mod.getModID(), string); -// } + /*@Override + public IIcon getIcon(final IIconRegister register, final String string) { + return BinnieCore.proxy.getIcon(register, this.mod.getModID(), string); + }*/ @Override public void preInit() { @@ -128,5 +128,4 @@ public class BinnieModProxy implements IBinnieModProxy { public String localiseOrBlank(final String string) { return Binnie.LANGUAGE.localiseOrBlank(this.getMod(), string); } - } diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index 18898471..d156782d 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -47,10 +47,10 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { return false; } -// @Override -// public int getUniqueRenderID() { -// return RenderingRegistry.getNextAvailableRenderId(); -// } + /*@Override + public int getUniqueRenderID() { + return RenderingRegistry.getNextAvailableRenderId(); + }*/ @Override public void openGui(final AbstractMod mod, final int id, final EntityPlayer player, final BlockPos pos) { @@ -62,9 +62,9 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { return true; } -// @Override -// public void registerCustomItemRenderer(final Item item, final IItemRenderer itemRenderer) { -// } + /*@Override + public void registerCustomItemRenderer(final Item item, final IItemRenderer itemRenderer) { + }*/ public TextureAtlasSprite getTextureAtlasSprite(ResourceLocation location) { throw new UnsupportedOperationException("Cannot call getTextureAtlasSprite on server side"); @@ -137,16 +137,16 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { } -// @Override -// public IIcon getIcon(final IIconRegister register, final String mod, final String name) { -// return null; -// } -// -// public void handleTextureRefresh(final IIconRegister register, final int type) { -// } -// -// public void handlePostTextureRefresh(final IIconRegister register, final int type) { -// } + /*@Override + public IIcon getIcon(final IIconRegister register, final String mod, final String name) { + return null; + } + + public void handleTextureRefresh(final IIconRegister register, final int type) { + } + + public void handlePostTextureRefresh(final IIconRegister register, final int type) { + }*/ public short getUniqueTextureUID() { final short uniqueTextureUID = this.uniqueTextureUID; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index cb57e314..ec0f6985 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -105,10 +105,10 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy return !world.isRemote; } -// @Override -// public void registerCustomItemRenderer(final Item item, final IItemRenderer itemRenderer) { -// MinecraftForgeClient.registerItemRenderer(item, itemRenderer); -// } + /*@Override + public void registerCustomItemRenderer(final Item item, final IItemRenderer itemRenderer) { + MinecraftForgeClient.registerItemRenderer(item, itemRenderer); + }*/ @Override public World getWorld() { @@ -168,10 +168,10 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy throw new IllegalArgumentException("Could not create object for class name " + renderer); } -// @Override -// public IIcon getIcon(final IIconRegister register, final String mod, final String name) { -// return register.registerIcon(mod + ":" + name); -// } + /*@Override + public IIcon getIcon(final IIconRegister register, final String mod, final String name) { + return register.registerIcon(mod + ":" + name); + }*/ @Override public TextureAtlasSprite getTextureAtlasSprite(ResourceLocation location) { @@ -183,11 +183,11 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy return Minecraft.getMinecraft().player; } -// public void handlePreTextureRefresh(final IIconRegister register, final int type) { -// if (type == 0) { -// Binnie.Liquid.reloadIcons(register); -// } -// } + /*public void handlePreTextureRefresh(final IIconRegister register, final int type) { + if (type == 0) { + Binnie.Liquid.reloadIcons(register); + } + }*/ @Override public void preInit() { diff --git a/src/main/java/binnie/core/proxy/IBinnieModProxy.java b/src/main/java/binnie/core/proxy/IBinnieModProxy.java index 708392f7..8ba9583c 100644 --- a/src/main/java/binnie/core/proxy/IBinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieModProxy.java @@ -16,5 +16,5 @@ public interface IBinnieModProxy extends IProxyCore { String localise(final String string); -// IIcon getIcon(final IIconRegister p0, final String p1); + //IIcon getIcon(final IIconRegister p0, final String p1); } diff --git a/src/main/java/binnie/core/proxy/IBinnieProxy.java b/src/main/java/binnie/core/proxy/IBinnieProxy.java index b2441454..4b7228db 100644 --- a/src/main/java/binnie/core/proxy/IBinnieProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieProxy.java @@ -1,6 +1,5 @@ package binnie.core.proxy; - import binnie.core.AbstractMod; import binnie.core.resource.BinnieResource; import net.minecraft.client.Minecraft; @@ -25,19 +24,19 @@ public interface IBinnieProxy extends IProxyCore { void bindTexture(final ResourceLocation p0); -// int getUniqueRenderID(); + //int getUniqueRenderID(); -// void registerCustomItemRenderer(final Item p0, final IItemRenderer p1); + //void registerCustomItemRenderer(final Item p0, final IItemRenderer p1); void openGui(final AbstractMod p0, final int p1, final EntityPlayer p2, final BlockPos pos); boolean isSimulating(final World p0); World getWorld(); -// -// EntityPlayer getPlayer(); -// -// MinecraftServer getServer(); + + //EntityPlayer getPlayer(); + + //MinecraftServer getServer(); Minecraft getMinecraftInstance(); @@ -54,24 +53,24 @@ public interface IBinnieProxy extends IProxyCore { boolean isDebug(); void registerBlockRenderer(final Object p0); -// -// String localise(final String string); -// -// void sendToPlayer(final MessageBase packet, final EntityPlayer entityplayer); -// -// void sendToServer(final MessageBase packet); -// -// void sendNetworkEntityPacket(final INetworkedEntity entity); -// -// TextureAtlasSprite getTextureAtlasSprite(ResourceLocation location); -// -// void reloadSprites(); -// -// void registerSprite(ResourceLocation location); -// -// short getUniqueTextureUID(); -// -// boolean checkTexture(final BinnieResource location); -// -// IIcon getIcon(final IIconRegister p0, final String p1, final String p2); + + //String localise(final String string); + + //void sendToPlayer(final MessageBase packet, final EntityPlayer entityplayer); + + //void sendToServer(final MessageBase packet); + + //void sendNetworkEntityPacket(final INetworkedEntity entity); + + //TextureAtlasSprite getTextureAtlasSprite(ResourceLocation location); + + //void reloadSprites(); + + //void registerSprite(ResourceLocation location); + + //short getUniqueTextureUID(); + + //boolean checkTexture(final BinnieResource location); + + //IIcon getIcon(final IIconRegister p0, final String p1, final String p2); } diff --git a/src/main/java/binnie/core/proxy/IProxyCore.java b/src/main/java/binnie/core/proxy/IProxyCore.java index 8fdce221..4a821b30 100644 --- a/src/main/java/binnie/core/proxy/IProxyCore.java +++ b/src/main/java/binnie/core/proxy/IProxyCore.java @@ -19,6 +19,4 @@ public interface IProxyCore extends IInitializable { void registerModels(); void registerItemAndBlockColors(); - - } diff --git a/src/main/java/binnie/core/resource/BinnieResource.java b/src/main/java/binnie/core/resource/BinnieResource.java index 5563e824..e619c4e1 100644 --- a/src/main/java/binnie/core/resource/BinnieResource.java +++ b/src/main/java/binnie/core/resource/BinnieResource.java @@ -5,8 +5,8 @@ import net.minecraft.util.ResourceLocation; public class BinnieResource { String mod; - private ResourceType type; String path; + private ResourceType type; public BinnieResource(final AbstractMod mod, final ResourceType type, final String path) { this(mod.getModID(), type, path); @@ -18,9 +18,9 @@ public class BinnieResource { this.path = path; } -// public String getFullPath() { -// return "/assets/" + this.mod + "/textures/" + this.type.toString() + "/" + this.path; -// } + /*public String getFullPath() { + return "/assets/" + this.mod + "/textures/" + this.type.toString() + "/" + this.path; + }*/ public ResourceLocation getResourceLocation() { return this.path.endsWith(".png") ? new ResourceLocation(this.mod, "textures/" + this.type.toString() + "/" + this.path) : new ResourceLocation(this.mod, this.type.toString() + "/" + this.path); diff --git a/src/main/java/binnie/core/resource/BinnieSprite.java b/src/main/java/binnie/core/resource/BinnieSprite.java index 53f345af..efe50235 100644 --- a/src/main/java/binnie/core/resource/BinnieSprite.java +++ b/src/main/java/binnie/core/resource/BinnieSprite.java @@ -1,6 +1,5 @@ package binnie.core.resource; - import binnie.Binnie; import binnie.core.AbstractMod; import com.google.common.base.Preconditions; @@ -14,19 +13,19 @@ import javax.annotation.Nullable; public class BinnieSprite extends BinnieResource { + @Nullable + private TextureAtlasSprite sprite; + public BinnieSprite(final AbstractMod mod, final ResourceType type, final String path) { this(mod.getModID(), type, path); } - public BinnieSprite(final String modid, final ResourceType type, final String path){ + public BinnieSprite(final String modid, final ResourceType type, final String path) { super(modid, type, path); this.sprite = null; Binnie.RESOURCE.registerSprite(this); } - @Nullable - private TextureAtlasSprite sprite; - @SideOnly(Side.CLIENT) public TextureAtlasSprite getSprite() { Preconditions.checkState(this.sprite != null, "Tried to get sprite before it is registered."); diff --git a/src/main/java/binnie/core/resource/ManagerResource.java b/src/main/java/binnie/core/resource/ManagerResource.java index 9e8c9558..408a2a5f 100644 --- a/src/main/java/binnie/core/resource/ManagerResource.java +++ b/src/main/java/binnie/core/resource/ManagerResource.java @@ -48,12 +48,12 @@ public class ManagerResource { } //Todo: move asset to binnie core assets - public BinnieSprite getUndiscoveredBeeSprite(){ + public BinnieSprite getUndiscoveredBeeSprite() { return getItemSprite("extrabees", "icon/undiscovered_bee"); } //Todo: move asset to binnie core assets - public BinnieSprite getDiscoveredBeeSprite(){ + public BinnieSprite getDiscoveredBeeSprite() { return getItemSprite("extrabees", "icon/discovered_bee"); } @@ -64,6 +64,4 @@ public class ManagerResource { } BinnieCore.getBinnieProxy().reloadSprites(); } - - } diff --git a/src/main/java/binnie/core/texture/TextureManager.java b/src/main/java/binnie/core/texture/TextureManager.java index 7c2ba3bc..5e48213a 100644 --- a/src/main/java/binnie/core/texture/TextureManager.java +++ b/src/main/java/binnie/core/texture/TextureManager.java @@ -3,7 +3,7 @@ package binnie.core.texture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.swing.*; +import javax.swing.Icon; import java.util.ArrayList; import java.util.List; @@ -13,5 +13,4 @@ public class TextureManager { public static void init() { } - } diff --git a/src/main/java/binnie/core/triggers/ActionProvider.java b/src/main/java/binnie/core/triggers/ActionProvider.java index 768d1bf8..2d7c51af 100644 --- a/src/main/java/binnie/core/triggers/ActionProvider.java +++ b/src/main/java/binnie/core/triggers/ActionProvider.java @@ -2,26 +2,26 @@ package binnie.core.triggers; class ActionProvider //implements IActionProvider { -// @Override -// @Optional.Method(modid = "BuildCraft|Silicon") -// public Collection getInternalActions(final IStatementContainer container) { -// return null; -// } -// -// -// @Override -// @Optional.Method(modid = "BuildCraft|Silicon") -// public Collection getExternalActions(final EnumFacing side, final TileEntity tile) { -// final LinkedList list = new LinkedList(); -// if (tile instanceof IBuildcraft.ActionProvider) { -// ((IBuildcraft.ActionProvider) tile).getActions(list); -// } -// final LinkedList list2 = new LinkedList(); -// for (final IActionExternal action : list2) { -// if (action != null && action.getUniqueTag() != null) { -// list.add(action); -// } -// } -// return list2; -// } + /*@Override + @Optional.Method(modid = "BuildCraft|Silicon") + public Collection getInternalActions(final IStatementContainer container) { + return null; + } + + + @Override + @Optional.Method(modid = "BuildCraft|Silicon") + public Collection getExternalActions(final EnumFacing side, final TileEntity tile) { + final LinkedList list = new LinkedList(); + if (tile instanceof IBuildcraft.ActionProvider) { + ((IBuildcraft.ActionProvider) tile).getActions(list); + } + final LinkedList list2 = new LinkedList(); + for (final IActionExternal action : list2) { + if (action != null && action.getUniqueTag() != null) { + list.add(action); + } + } + return list2; + }*/ } diff --git a/src/main/java/binnie/core/triggers/BinnieAction.java b/src/main/java/binnie/core/triggers/BinnieAction.java index 3ff69af0..bc7c69ac 100644 --- a/src/main/java/binnie/core/triggers/BinnieAction.java +++ b/src/main/java/binnie/core/triggers/BinnieAction.java @@ -2,74 +2,74 @@ package binnie.core.triggers; class BinnieAction //implements IActionExternal { -// private static int incrementalID; -// public static BinnieAction actionPauseProcess; -// public static BinnieAction actionCancelTask; -// private String desc; -// private BinnieIcon icon; -// private String tag; -// private int id; -// -// BinnieAction(final String desc, final String tag, final String iconFile) { -// this(desc, tag, BinnieCore.instance, iconFile); -// } -// -// private BinnieAction(final String desc, final String tag, final AbstractMod mod, final String iconFile) { -// this.id = 0; -// this.id = BinnieAction.incrementalID++; -// this.tag = tag; -// StatementManager.registerStatement(this); -// this.icon = Binnie.Resource.getItemIcon(mod, iconFile); -// this.desc = desc; -// } -// -// @Override -// public String getDescription() { -// return this.desc; -// } -// -// @Override -// public String getUniqueTag() { -// return this.tag; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon() { -// return this.icon.getIcon(); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister iconRegister) { -// this.icon.registerIcon(iconRegister); -// } -// -// @Override -// public int maxParameters() { -// return 0; -// } -// -// @Override -// public int minParameters() { -// return 0; -// } -// -// @Override -// public IStatementParameter createParameter(final int index) { -// return null; -// } -// -// @Override -// public IStatement rotateLeft() { -// return this; -// } -// -// @Override -// public void actionActivate(final TileEntity target, final ForgeDirection side, final IStatementContainer source, final IStatementParameter[] parameters) { -// } + /*private static int incrementalID; + public static BinnieAction actionPauseProcess; + public static BinnieAction actionCancelTask; + private String desc; + private BinnieIcon icon; + private String tag; + private int id; -// static { -// BinnieAction.incrementalID = 800; -// } + BinnieAction(final String desc, final String tag, final String iconFile) { + this(desc, tag, BinnieCore.instance, iconFile); + } + + private BinnieAction(final String desc, final String tag, final AbstractMod mod, final String iconFile) { + this.id = 0; + this.id = BinnieAction.incrementalID++; + this.tag = tag; + StatementManager.registerStatement(this); + this.icon = Binnie.Resource.getItemIcon(mod, iconFile); + this.desc = desc; + } + + @Override + public String getDescription() { + return this.desc; + } + + @Override + public String getUniqueTag() { + return this.tag; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon() { + return this.icon.getIcon(); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(final IIconRegister iconRegister) { + this.icon.registerIcon(iconRegister); + } + + @Override + public int maxParameters() { + return 0; + } + + @Override + public int minParameters() { + return 0; + } + + @Override + public IStatementParameter createParameter(final int index) { + return null; + } + + @Override + public IStatement rotateLeft() { + return this; + } + + @Override + public void actionActivate(final TileEntity target, final ForgeDirection side, final IStatementContainer source, final IStatementParameter[] parameters) { + } + + static { + BinnieAction.incrementalID = 800; + }*/ } diff --git a/src/main/java/binnie/core/triggers/BinnieTrigger.java b/src/main/java/binnie/core/triggers/BinnieTrigger.java index d6a2e9bb..de6d613d 100644 --- a/src/main/java/binnie/core/triggers/BinnieTrigger.java +++ b/src/main/java/binnie/core/triggers/BinnieTrigger.java @@ -2,98 +2,98 @@ package binnie.core.triggers; final class BinnieTrigger //implements ITriggerExternal { -// private static int incrementalID; -// protected static BinnieTrigger triggerNoBlankTemplate; -// protected static BinnieTrigger triggerNoTemplate; -// protected static BinnieTrigger triggerIsWorking; -// protected static BinnieTrigger triggerIsNotWorking; -// protected static BinnieTrigger triggerCanWork; -// protected static BinnieTrigger triggerCannotWork; -// protected static BinnieTrigger triggerPowerNone; -// protected static BinnieTrigger triggerPowerLow; -// protected static BinnieTrigger triggerPowerMedium; -// protected static BinnieTrigger triggerPowerHigh; -// protected static BinnieTrigger triggerPowerFull; -// protected static BinnieTrigger triggerSerumFull; -// protected static BinnieTrigger triggerSerumPure; -// protected static BinnieTrigger triggerSerumEmpty; -// protected static BinnieTrigger triggerAcclimatiserNone; -// protected static BinnieTrigger triggerAcclimatiserHot; -// protected static BinnieTrigger triggerAcclimatiserCold; -// protected static BinnieTrigger triggerAcclimatiserWet; -// protected static BinnieTrigger triggerAcclimatiserDry; -// private String desc; -// private String tag; -// private BinnieIcon icon; -// private int id; -// -// public BinnieTrigger(final String desc, final String tag, final String iconFile) { -// this(desc, tag, BinnieCore.instance, iconFile); -// } -// -// public BinnieTrigger(final String desc, final String tag, final AbstractMod mod, final String iconFile) { -// this.id = 0; -// this.id = BinnieTrigger.incrementalID++; -// this.tag = tag; -// StatementManager.registerStatement(this); -// TriggerProvider.triggers.add(this); -// this.icon = Binnie.Resource.getItemIcon(mod, iconFile); -// this.desc = desc; -// } -// -// @Override -// public String getDescription() { -// return this.desc; -// } -// -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final IIconRegister register) { -// return this.icon.getIcon(register); -// } -// -// @Override -// public String getUniqueTag() { -// return this.tag; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon() { -// return this.icon.getIcon(); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister iconRegister) { -// this.icon.registerIcon(iconRegister); -// } -// -// @Override -// public int maxParameters() { -// return 0; -// } -// -// @Override -// public int minParameters() { -// return 0; -// } -// -// @Override -// public IStatementParameter createParameter(final int index) { -// return null; -// } -// -// @Override -// public IStatement rotateLeft() { -// return null; -// } -// -// @Override -// public boolean isTriggerActive(final TileEntity target, final ForgeDirection side, final IStatementContainer source, final IStatementParameter[] parameters) { -// return false; -// } -// -// static { -// BinnieTrigger.incrementalID = 800; -// } + /*private static int incrementalID; + protected static BinnieTrigger triggerNoBlankTemplate; + protected static BinnieTrigger triggerNoTemplate; + protected static BinnieTrigger triggerIsWorking; + protected static BinnieTrigger triggerIsNotWorking; + protected static BinnieTrigger triggerCanWork; + protected static BinnieTrigger triggerCannotWork; + protected static BinnieTrigger triggerPowerNone; + protected static BinnieTrigger triggerPowerLow; + protected static BinnieTrigger triggerPowerMedium; + protected static BinnieTrigger triggerPowerHigh; + protected static BinnieTrigger triggerPowerFull; + protected static BinnieTrigger triggerSerumFull; + protected static BinnieTrigger triggerSerumPure; + protected static BinnieTrigger triggerSerumEmpty; + protected static BinnieTrigger triggerAcclimatiserNone; + protected static BinnieTrigger triggerAcclimatiserHot; + protected static BinnieTrigger triggerAcclimatiserCold; + protected static BinnieTrigger triggerAcclimatiserWet; + protected static BinnieTrigger triggerAcclimatiserDry; + private String desc; + private String tag; + private BinnieIcon icon; + private int id; + + public BinnieTrigger(final String desc, final String tag, final String iconFile) { + this(desc, tag, BinnieCore.instance, iconFile); + } + + public BinnieTrigger(final String desc, final String tag, final AbstractMod mod, final String iconFile) { + this.id = 0; + this.id = BinnieTrigger.incrementalID++; + this.tag = tag; + StatementManager.registerStatement(this); + TriggerProvider.triggers.add(this); + this.icon = Binnie.Resource.getItemIcon(mod, iconFile); + this.desc = desc; + } + + @Override + public String getDescription() { + return this.desc; + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(final IIconRegister register) { + return this.icon.getIcon(register); + } + + @Override + public String getUniqueTag() { + return this.tag; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon() { + return this.icon.getIcon(); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(final IIconRegister iconRegister) { + this.icon.registerIcon(iconRegister); + } + + @Override + public int maxParameters() { + return 0; + } + + @Override + public int minParameters() { + return 0; + } + + @Override + public IStatementParameter createParameter(final int index) { + return null; + } + + @Override + public IStatement rotateLeft() { + return null; + } + + @Override + public boolean isTriggerActive(final TileEntity target, final ForgeDirection side, final IStatementContainer source, final IStatementParameter[] parameters) { + return false; + } + + static { + BinnieTrigger.incrementalID = 800; + }*/ } diff --git a/src/main/java/binnie/core/triggers/ModuleTrigger.java b/src/main/java/binnie/core/triggers/ModuleTrigger.java index 02d80286..e42f9242 100644 --- a/src/main/java/binnie/core/triggers/ModuleTrigger.java +++ b/src/main/java/binnie/core/triggers/ModuleTrigger.java @@ -9,24 +9,24 @@ public class ModuleTrigger implements IInitializable { @Override public void init() { -// BinnieAction.actionPauseProcess = new BinnieAction("Pause Process", "binnie.action.pauseProcess", "actions/PauseProcess"); -// BinnieAction.actionCancelTask = new BinnieAction("Cancel Task", "binnie.action.cancelTask", "actions/CancelTask"); -// StatementManager.registerActionProvider(new ActionProvider()); -// BinnieTrigger.triggerNoBlankTemplate = new BinnieTrigger("No Blank Template", "binnie.trigger.noBlankTemplate", ExtraBees.instance, "triggers/NoBlankTemplate"); -// BinnieTrigger.triggerNoTemplate = new BinnieTrigger("No Template", "binnie.trigger.noTemplate", ExtraBees.instance, "triggers/NoTemplate"); -// BinnieTrigger.triggerIsWorking = new BinnieTrigger("Is Working", "binnie.trigger.isWorking", "triggers/IsWorking"); -// BinnieTrigger.triggerIsNotWorking = new BinnieTrigger("Is Not Working", "binnie.trigger.isNotWorking", "triggers/IsNotWorking"); -// BinnieTrigger.triggerCanWork = new BinnieTrigger("Can Work", "binnie.trigger.canWork", "triggers/CanWork"); -// BinnieTrigger.triggerCannotWork = new BinnieTrigger("Cannot Work", "binnie.trigger.cannotWork", "triggers/CannotWork"); -// BinnieTrigger.triggerPowerNone = new BinnieTrigger("Power None", "binnie.trigger.powerNone", "triggers/PowerNone"); -// BinnieTrigger.triggerPowerLow = new BinnieTrigger("Power Low", "binnie.trigger.powerLow", "triggers/PowerLow"); -// BinnieTrigger.triggerPowerMedium = new BinnieTrigger("Power Medium", "binnie.trigger.powerMedium", "triggers/PowerMedium"); -// BinnieTrigger.triggerPowerHigh = new BinnieTrigger("Power High", "binnie.trigger.powerHigh", "triggers/PowerHigh"); -// BinnieTrigger.triggerPowerFull = new BinnieTrigger("Power Full", "binnie.trigger.powerFull", "triggers/PowerFull"); -// BinnieTrigger.triggerSerumFull = new BinnieTrigger("Serum Full", "binnie.trigger.serumFull", ExtraBees.instance, "triggers/SerumFull"); -// BinnieTrigger.triggerSerumPure = new BinnieTrigger("Serum Pure", "binnie.trigger.serumPure", ExtraBees.instance, "triggers/SerumPure"); -// BinnieTrigger.triggerSerumEmpty = new BinnieTrigger("Serum Pure", "binnie.trigger.serumEmpty", ExtraBees.instance, "triggers/SerumEmpty"); -// StatementManager.registerTriggerProvider(new TriggerProvider()); + /*BinnieAction.actionPauseProcess = new BinnieAction("Pause Process", "binnie.action.pauseProcess", "actions/PauseProcess"); + BinnieAction.actionCancelTask = new BinnieAction("Cancel Task", "binnie.action.cancelTask", "actions/CancelTask"); + StatementManager.registerActionProvider(new ActionProvider()); + BinnieTrigger.triggerNoBlankTemplate = new BinnieTrigger("No Blank Template", "binnie.trigger.noBlankTemplate", ExtraBees.instance, "triggers/NoBlankTemplate"); + BinnieTrigger.triggerNoTemplate = new BinnieTrigger("No Template", "binnie.trigger.noTemplate", ExtraBees.instance, "triggers/NoTemplate"); + BinnieTrigger.triggerIsWorking = new BinnieTrigger("Is Working", "binnie.trigger.isWorking", "triggers/IsWorking"); + BinnieTrigger.triggerIsNotWorking = new BinnieTrigger("Is Not Working", "binnie.trigger.isNotWorking", "triggers/IsNotWorking"); + BinnieTrigger.triggerCanWork = new BinnieTrigger("Can Work", "binnie.trigger.canWork", "triggers/CanWork"); + BinnieTrigger.triggerCannotWork = new BinnieTrigger("Cannot Work", "binnie.trigger.cannotWork", "triggers/CannotWork"); + BinnieTrigger.triggerPowerNone = new BinnieTrigger("Power None", "binnie.trigger.powerNone", "triggers/PowerNone"); + BinnieTrigger.triggerPowerLow = new BinnieTrigger("Power Low", "binnie.trigger.powerLow", "triggers/PowerLow"); + BinnieTrigger.triggerPowerMedium = new BinnieTrigger("Power Medium", "binnie.trigger.powerMedium", "triggers/PowerMedium"); + BinnieTrigger.triggerPowerHigh = new BinnieTrigger("Power High", "binnie.trigger.powerHigh", "triggers/PowerHigh"); + BinnieTrigger.triggerPowerFull = new BinnieTrigger("Power Full", "binnie.trigger.powerFull", "triggers/PowerFull"); + BinnieTrigger.triggerSerumFull = new BinnieTrigger("Serum Full", "binnie.trigger.serumFull", ExtraBees.instance, "triggers/SerumFull"); + BinnieTrigger.triggerSerumPure = new BinnieTrigger("Serum Pure", "binnie.trigger.serumPure", ExtraBees.instance, "triggers/SerumPure"); + BinnieTrigger.triggerSerumEmpty = new BinnieTrigger("Serum Pure", "binnie.trigger.serumEmpty", ExtraBees.instance, "triggers/SerumEmpty"); + StatementManager.registerTriggerProvider(new TriggerProvider());*/ } @Override diff --git a/src/main/java/binnie/core/triggers/TriggerData.java b/src/main/java/binnie/core/triggers/TriggerData.java index 3b94e177..0eb15a77 100644 --- a/src/main/java/binnie/core/triggers/TriggerData.java +++ b/src/main/java/binnie/core/triggers/TriggerData.java @@ -2,31 +2,31 @@ package binnie.core.triggers; public class TriggerData //implements Map.Entry { -// private final ITriggerExternal key; -// private Boolean value; -// -// public TriggerData(final ITriggerExternal key, final Boolean value) { -// if (key == null) { -// throw new NullPointerException(); -// } -// this.key = key; -// this.value = value; -// } -// -// @Override -// public ITriggerExternal getKey() { -// return this.key; -// } -// -// @Override -// public Boolean getValue() { -// return this.value; -// } -// -// @Override -// public Boolean setValue(final Boolean value) { -// final Boolean old = this.value; -// this.value = value; -// return old; -// } + /*private final ITriggerExternal key; + private Boolean value; + + public TriggerData(final ITriggerExternal key, final Boolean value) { + if (key == null) { + throw new NullPointerException(); + } + this.key = key; + this.value = value; + } + + @Override + public ITriggerExternal getKey() { + return this.key; + } + + @Override + public Boolean getValue() { + return this.value; + } + + @Override + public Boolean setValue(final Boolean value) { + final Boolean old = this.value; + this.value = value; + return old; + }*/ } diff --git a/src/main/java/binnie/core/triggers/TriggerPower.java b/src/main/java/binnie/core/triggers/TriggerPower.java index bbdb92a9..01646484 100644 --- a/src/main/java/binnie/core/triggers/TriggerPower.java +++ b/src/main/java/binnie/core/triggers/TriggerPower.java @@ -1,35 +1,35 @@ package binnie.core.triggers; public class TriggerPower { -// public static TriggerData powerNone(final Object tile) { -// return new TriggerData(BinnieTrigger.triggerPowerNone, getPercentage(tile) < 0.05000000074505806); -// } -// -// public static TriggerData powerLow(final Object tile) { -// return new TriggerData(BinnieTrigger.triggerPowerLow, getPercentage(tile) < 0.3499999940395355); -// } -// -// public static TriggerData powerMedium(final Object tile) { -// final double p = getPercentage(tile); -// return new TriggerData(BinnieTrigger.triggerPowerMedium, p >= 0.3499999940395355 && p <= 0.6499999761581421); -// } -// -// public static TriggerData powerHigh(final Object tile) { -// final double p = getPercentage(tile); -// return new TriggerData(BinnieTrigger.triggerPowerHigh, getPercentage(tile) > 0.6499999761581421); -// } -// -// public static TriggerData powerFull(final Object tile) { -// final double p = getPercentage(tile); -// return new TriggerData(BinnieTrigger.triggerPowerFull, getPercentage(tile) > 0.949999988079071); -// } -// -// private static double getPercentage(final Object tile) { -// final IPoweredMachine process = Machine.getInterface(IPoweredMachine.class, tile); -// if (process != null) { -// final double percentage = process.getInterface().getEnergy() / process.getInterface().getCapacity(); -// return percentage; -// } -// return 0.0; -// } + /*public static TriggerData powerNone(final Object tile) { + return new TriggerData(BinnieTrigger.triggerPowerNone, getPercentage(tile) < 0.05000000074505806); + } + + public static TriggerData powerLow(final Object tile) { + return new TriggerData(BinnieTrigger.triggerPowerLow, getPercentage(tile) < 0.3499999940395355); + } + + public static TriggerData powerMedium(final Object tile) { + final double p = getPercentage(tile); + return new TriggerData(BinnieTrigger.triggerPowerMedium, p >= 0.3499999940395355 && p <= 0.6499999761581421); + } + + public static TriggerData powerHigh(final Object tile) { + final double p = getPercentage(tile); + return new TriggerData(BinnieTrigger.triggerPowerHigh, getPercentage(tile) > 0.6499999761581421); + } + + public static TriggerData powerFull(final Object tile) { + final double p = getPercentage(tile); + return new TriggerData(BinnieTrigger.triggerPowerFull, getPercentage(tile) > 0.949999988079071); + } + + private static double getPercentage(final Object tile) { + final IPoweredMachine process = Machine.getInterface(IPoweredMachine.class, tile); + if (process != null) { + final double percentage = process.getInterface().getEnergy() / process.getInterface().getCapacity(); + return percentage; + } + return 0.0; + }*/ } diff --git a/src/main/java/binnie/core/triggers/TriggerProvider.java b/src/main/java/binnie/core/triggers/TriggerProvider.java index ec766678..6e93fef9 100644 --- a/src/main/java/binnie/core/triggers/TriggerProvider.java +++ b/src/main/java/binnie/core/triggers/TriggerProvider.java @@ -2,45 +2,45 @@ package binnie.core.triggers; class TriggerProvider// implements ITriggerProvider { -// static TriggerProvider instance; -// public static List triggers; -// -// @Override -// public Collection getExternalTriggers(final ForgeDirection side, final TileEntity tile) { -// final LinkedList list = new LinkedList(); -// final LinkedList triggerData = new LinkedList(); -// if (tile instanceof IBuildcraft.TriggerProvider) { -// ((IBuildcraft.TriggerProvider) tile).getTriggers(list); -// } -// for (final TriggerData data : list) { -// if (data.getKey() != null && data.getKey().getUniqueTag() != null) { -// triggerData.add(data.getKey()); -// } -// } -// return triggerData; -// } -// -// public static boolean isTriggerActive(final ITriggerExternal trigger, final TileEntity tile) { -// final LinkedList list = new LinkedList(); -// final LinkedList triggerData = new LinkedList(); -// if (tile instanceof IBuildcraft.TriggerProvider) { -// ((IBuildcraft.TriggerProvider) tile).getTriggers(list); -// } -// for (final TriggerData data : list) { -// if (data.getKey() == trigger) { -// return data.getValue(); -// } -// } -// return false; -// } -// -// @Override -// public Collection getInternalTriggers(final IStatementContainer container) { -// return new ArrayList(); -// } -// -// static { -// TriggerProvider.instance = new TriggerProvider(); -// TriggerProvider.triggers = new ArrayList(); -// } + /*static TriggerProvider instance; + public static List triggers; + + @Override + public Collection getExternalTriggers(final ForgeDirection side, final TileEntity tile) { + final LinkedList list = new LinkedList(); + final LinkedList triggerData = new LinkedList(); + if (tile instanceof IBuildcraft.TriggerProvider) { + ((IBuildcraft.TriggerProvider) tile).getTriggers(list); + } + for (final TriggerData data : list) { + if (data.getKey() != null && data.getKey().getUniqueTag() != null) { + triggerData.add(data.getKey()); + } + } + return triggerData; + } + + public static boolean isTriggerActive(final ITriggerExternal trigger, final TileEntity tile) { + final LinkedList list = new LinkedList(); + final LinkedList triggerData = new LinkedList(); + if (tile instanceof IBuildcraft.TriggerProvider) { + ((IBuildcraft.TriggerProvider) tile).getTriggers(list); + } + for (final TriggerData data : list) { + if (data.getKey() == trigger) { + return data.getValue(); + } + } + return false; + } + + @Override + public Collection getInternalTriggers(final IStatementContainer container) { + return new ArrayList(); + } + + static { + TriggerProvider.instance = new TriggerProvider(); + TriggerProvider.triggers = new ArrayList(); + }*/ } diff --git a/src/main/java/binnie/core/triggers/TriggerWorking.java b/src/main/java/binnie/core/triggers/TriggerWorking.java index 3022d87f..cc1dcc55 100644 --- a/src/main/java/binnie/core/triggers/TriggerWorking.java +++ b/src/main/java/binnie/core/triggers/TriggerWorking.java @@ -1,39 +1,39 @@ package binnie.core.triggers; public class TriggerWorking { -// public static TriggerData isNotWorking(final Object inventory) { -// final IProcess process = Machine.getInterface(IProcess.class, inventory); -// boolean b = false; -// if (process != null) { -// b = (process.canWork() != null && process.canProgress() != null); -// } -// return new TriggerData(BinnieTrigger.triggerIsNotWorking, b); -// } -// -// public static TriggerData isWorking(final Object inventory) { -// final IProcess process = Machine.getInterface(IProcess.class, inventory); -// boolean b = false; -// if (process != null) { -// b = (process.canWork() == null && process.canProgress() == null); -// } -// return new TriggerData(BinnieTrigger.triggerIsWorking, b); -// } -// -// public static TriggerData canWork(final Object inventory) { -// final IProcess process = Machine.getInterface(IProcess.class, inventory); -// boolean b = false; -// if (process != null) { -// b = (process.canWork() == null); -// } -// return new TriggerData(BinnieTrigger.triggerCanWork, b); -// } -// -// public static TriggerData cannotWork(final Object inventory) { -// final IProcess process = Machine.getInterface(IProcess.class, inventory); -// boolean b = false; -// if (process != null) { -// b = (process.canWork() != null); -// } -// return new TriggerData(BinnieTrigger.triggerCannotWork, b); -// } + /*public static TriggerData isNotWorking(final Object inventory) { + final IProcess process = Machine.getInterface(IProcess.class, inventory); + boolean b = false; + if (process != null) { + b = (process.canWork() != null && process.canProgress() != null); + } + return new TriggerData(BinnieTrigger.triggerIsNotWorking, b); + } + + public static TriggerData isWorking(final Object inventory) { + final IProcess process = Machine.getInterface(IProcess.class, inventory); + boolean b = false; + if (process != null) { + b = (process.canWork() == null && process.canProgress() == null); + } + return new TriggerData(BinnieTrigger.triggerIsWorking, b); + } + + public static TriggerData canWork(final Object inventory) { + final IProcess process = Machine.getInterface(IProcess.class, inventory); + boolean b = false; + if (process != null) { + b = (process.canWork() == null); + } + return new TriggerData(BinnieTrigger.triggerCanWork, b); + } + + public static TriggerData cannotWork(final Object inventory) { + final IProcess process = Machine.getInterface(IProcess.class, inventory); + boolean b = false; + if (process != null) { + b = (process.canWork() != null); + } + return new TriggerData(BinnieTrigger.triggerCannotWork, b); + }*/ } diff --git a/src/main/java/binnie/core/util/FakeCraftingWorld.java b/src/main/java/binnie/core/util/FakeCraftingWorld.java index 633b7b5e..e5ae7e9c 100644 --- a/src/main/java/binnie/core/util/FakeCraftingWorld.java +++ b/src/main/java/binnie/core/util/FakeCraftingWorld.java @@ -4,7 +4,12 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.profiler.Profiler; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.*; +import net.minecraft.world.DimensionType; +import net.minecraft.world.GameType; +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.IChunkProvider; import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.WorldInfo; @@ -24,6 +29,12 @@ public class FakeCraftingWorld extends World { @Nullable private static FakeCraftingWorld INSTANCE; + private FakeCraftingWorld() { + super(saveHandler, worldInfo, worldProvider, new Profiler(), true); + this.provider.setWorld(this); + this.mapStorage = new FakeMapStorage(); + } + public static FakeCraftingWorld getInstance() { if (INSTANCE == null) { INSTANCE = new FakeCraftingWorld(); @@ -31,12 +42,6 @@ public class FakeCraftingWorld extends World { return INSTANCE; } - private FakeCraftingWorld() { - super(saveHandler, worldInfo, worldProvider, new Profiler(), true); - this.provider.setWorld(this); - this.mapStorage = new FakeMapStorage(); - } - @Override public BlockPos getSpawnPoint() { return new BlockPos(0, 0, 0); diff --git a/src/main/java/binnie/core/util/FluidStackSet.java b/src/main/java/binnie/core/util/FluidStackSet.java index b23a2cef..1d899726 100644 --- a/src/main/java/binnie/core/util/FluidStackSet.java +++ b/src/main/java/binnie/core/util/FluidStackSet.java @@ -3,7 +3,11 @@ package binnie.core.util; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Set; class FluidStackSet implements Set { protected final List fluidStacks; diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index 55d7ae74..7198fed0 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -2,7 +2,11 @@ package binnie.core.util; import net.minecraft.item.ItemStack; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Set; public class ItemStackSet implements Set { List itemStacks; diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 27e05490..24517daa 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -82,7 +82,7 @@ public class ExtraBees { Method m = GuiIdRegistry.class.getDeclaredMethod("registerGuiHandlers", GuiType.class, List.class); m.setAccessible(true); m.invoke(null, new Object[]{GuiType.Tile, Lists.newArrayList(TileEntityExtraBeesAlvearyPart.class)}); - } catch (Exception e){ + } catch (Exception e) { throw new RuntimeException(e); } Proxies.render.registerModels(); @@ -115,5 +115,4 @@ public class ExtraBees { AlvearyMutationHandler.addMutationItem(new ItemStack(Items.ENDER_PEARL), 2.0f); AlvearyMutationHandler.addMutationItem(new ItemStack(Items.ENDER_EYE), 4.0f); } - } diff --git a/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java b/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java index 2c198ad0..2ee72734 100644 --- a/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java +++ b/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java @@ -17,9 +17,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; import javax.annotation.Nullable; -/** - * Created by Elec332 on 13-5-2017. - */ public abstract class AbstractAlvearyLogic implements IBeeModifier, IBeeListener, ICapabilityProvider { @Override @@ -87,11 +84,11 @@ public abstract class AbstractAlvearyLogic implements IBeeModifier, IBeeListener return false; } - public void updateClient(TileEntityExtraBeesAlvearyPart tile){ + public void updateClient(TileEntityExtraBeesAlvearyPart tile) { } - public void updateServer(TileEntityExtraBeesAlvearyPart tile){ + public void updateServer(TileEntityExtraBeesAlvearyPart tile) { } @@ -117,12 +114,11 @@ public abstract class AbstractAlvearyLogic implements IBeeModifier, IBeeListener return null; } - public IEnergyStorage getEnergyStorage(){ + public IEnergyStorage getEnergyStorage() { return null; } - public boolean hasGui(){ + public boolean hasGui() { return false; } - } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java index ae070a11..b94063c0 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java @@ -21,30 +21,26 @@ import net.minecraftforge.items.ItemStackHandler; import javax.annotation.Nonnull; import javax.annotation.Nullable; -/** - * Created by Elec332 on 13-5-2017. - */ public class AlvearyLogicFrameHousing extends AbstractAlvearyLogic { - public AlvearyLogicFrameHousing(TileEntityExtraBeesAlvearyPart tile){ + private final IItemHandlerModifiable inv; + private TileEntityExtraBeesAlvearyPart tile; + + public AlvearyLogicFrameHousing(TileEntityExtraBeesAlvearyPart tile) { this.tile = tile; - inv = new ItemStackHandler(1){ + inv = new ItemStackHandler(1) { @Nonnull @Override public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { - if (!(stack.getItem() instanceof IHiveFrame)){ + if (!(stack.getItem() instanceof IHiveFrame)) { return stack; } return super.insertItem(slot, stack, simulate); } - }; } - private TileEntityExtraBeesAlvearyPart tile; - private final IItemHandlerModifiable inv; - public IItemHandlerModifiable getInventory() { return inv; } @@ -118,5 +114,4 @@ public class AlvearyLogicFrameHousing extends AbstractAlvearyLogic { public boolean hasGui() { return true; } - } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java index 133abeb0..2164ad6e 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java @@ -19,28 +19,24 @@ import net.minecraftforge.items.ItemStackHandler; import javax.annotation.Nonnull; import javax.annotation.Nullable; -/** - * Created by Elec332 on 13-5-2017. - */ public class AlvearyLogicHatchery extends AbstractAlvearyLogic { - public AlvearyLogicHatchery(){ - inv = new ItemStackHandler(5){ + private final IItemHandlerModifiable inv; + + public AlvearyLogicHatchery() { + inv = new ItemStackHandler(5) { @Nonnull @Override public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { - if (!stack.isEmpty() && Utils.getBeeRoot().getType(stack) != EnumBeeType.LARVAE){ + if (!stack.isEmpty() && Utils.getBeeRoot().getType(stack) != EnumBeeType.LARVAE) { return stack; } return super.insertItem(slot, stack, simulate); } - }; } - private final IItemHandlerModifiable inv; - public IItemHandlerModifiable getInventory() { return inv; } @@ -56,7 +52,7 @@ public class AlvearyLogicHatchery extends AbstractAlvearyLogic { if (queen != null) { ItemStack larvae = beeRoot.getMemberStack(beeRoot.getBee(queen.getGenome()), EnumBeeType.LARVAE); for (int i = 0; i < 5; i++) { - if (inv.insertItem(i, larvae, false).isEmpty()){ + if (inv.insertItem(i, larvae, false).isEmpty()) { return; } } @@ -82,5 +78,4 @@ public class AlvearyLogicHatchery extends AbstractAlvearyLogic { public boolean hasGui() { return true; } - } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicLighting.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicLighting.java index 1698b8e7..cccc3de1 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicLighting.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicLighting.java @@ -3,18 +3,15 @@ package binnie.extrabees.alveary; import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.energy.IEnergyStorage; -/** - * Created by Elec332 on 13-5-2017. - */ public class AlvearyLogicLighting extends AbstractAlvearyLogic { - public AlvearyLogicLighting(){ - this.energyStorage = new EnergyStorage(2000); - } - private final IEnergyStorage energyStorage; private boolean lighted; + public AlvearyLogicLighting() { + this.energyStorage = new EnergyStorage(2000); + } + @Override public void updateServer(TileEntityExtraBeesAlvearyPart tile) { lighted = energyStorage.extractEnergy(10, false) >= 10; @@ -24,5 +21,4 @@ public class AlvearyLogicLighting extends AbstractAlvearyLogic { public boolean isSelfLighted() { return lighted; } - } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java index e2ca164d..3ad74f42 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java @@ -16,28 +16,24 @@ import net.minecraftforge.items.ItemStackHandler; import javax.annotation.Nonnull; import javax.annotation.Nullable; -/** - * Created by Elec332 on 13-5-2017. - */ public class AlvearyLogicMutator extends AbstractAlvearyLogic { - public AlvearyLogicMutator(){ - this.inv = new ItemStackHandler(1){ + private final IItemHandlerModifiable inv; + + public AlvearyLogicMutator() { + this.inv = new ItemStackHandler(1) { @Nonnull @Override public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { - if (!AlvearyMutationHandler.isMutationItem(stack)){ + if (!AlvearyMutationHandler.isMutationItem(stack)) { return stack; } return super.insertItem(slot, stack, simulate); } - }; } - private final IItemHandlerModifiable inv; - public IItemHandlerModifiable getInventory() { return inv; } @@ -71,5 +67,4 @@ public class AlvearyLogicMutator extends AbstractAlvearyLogic { public boolean hasGui() { return true; } - } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicRainShield.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicRainShield.java index 3ce53423..ad2e1961 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicRainShield.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicRainShield.java @@ -1,13 +1,9 @@ package binnie.extrabees.alveary; -/** - * Created by Elec332 on 13-5-2017. - */ public class AlvearyLogicRainShield extends AbstractAlvearyLogic { @Override public boolean isSealed() { return true; } - } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java index 7d7e11ec..2f2d6732 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java @@ -22,37 +22,33 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -/** - * Created by Elec332 on 13-5-2017. - */ public class AlvearyLogicStimulator extends AbstractAlvearyLogic { + private final IEnergyStorage energyStorage; + private final IItemHandlerModifiable inv; + private final List containers = Lists.newArrayList(); + private int powerUsage; + private boolean powered; + private StimulatorCircuit[] modifiers; + public AlvearyLogicStimulator() { this.powerUsage = 0; this.powered = false; this.modifiers = new StimulatorCircuit[0]; this.energyStorage = new EnergyStorage(10000); - this.inv = new ItemStackHandler(1){ + this.inv = new ItemStackHandler(1) { @Nonnull @Override public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { - if (!ChipsetManager.circuitRegistry.isChipset(stack)){ + if (!ChipsetManager.circuitRegistry.isChipset(stack)) { return stack; } return super.insertItem(slot, stack, simulate); } - }; } - private int powerUsage; - private boolean powered; - private StimulatorCircuit[] modifiers; - private final IEnergyStorage energyStorage; - private final IItemHandlerModifiable inv; - private final List containers = Lists.newArrayList(); - public IItemHandlerModifiable getInventory() { return inv; } @@ -65,16 +61,16 @@ public class AlvearyLogicStimulator extends AbstractAlvearyLogic { this.powerUsage += beeMod.getPowerUsage(); } this.powered = energyStorage.extractEnergy(powerUsage, true) >= powerUsage; - for (ContainerStimulator c : containers){ + for (ContainerStimulator c : containers) { c.checkPower(); } } - public void onContainerOpened(ContainerStimulator container){ + public void onContainerOpened(ContainerStimulator container) { containers.add(container); } - public void onGuiClosed(ContainerStimulator container){ + public void onGuiClosed(ContainerStimulator container) { containers.remove(container); } @@ -251,5 +247,4 @@ public class AlvearyLogicStimulator extends AbstractAlvearyLogic { public boolean hasGui() { return true; } - } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java index 22907051..9469ee9e 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java @@ -11,29 +11,26 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -/** - * Created by Elec332 on 13-5-2017. - */ public class AlvearyLogicTransmitter extends AbstractAlvearyLogic implements IEnergyStorage { - public AlvearyLogicTransmitter(){ - internalStorage = new EnergyStorage(2000); - } - private IEnergyStorage internalStorage; + public AlvearyLogicTransmitter() { + internalStorage = new EnergyStorage(2000); + } + @Override public void updateServer(TileEntityExtraBeesAlvearyPart tile) { - if (internalStorage.getEnergyStored() < 2){ + if (internalStorage.getEnergyStored() < 2) { return; } List esL = Lists.newArrayList(); - for (TileEntityExtraBeesAlvearyPart part : tile.getExtraBeesParts()){ - if (part.getAlvearyLogic().getEnergyStorage() != null){ + for (TileEntityExtraBeesAlvearyPart part : tile.getExtraBeesParts()) { + if (part.getAlvearyLogic().getEnergyStorage() != null) { esL.add(part.getAlvearyLogic().getEnergyStorage()); } } - if (esL.isEmpty()){ + if (esL.isEmpty()) { return; } int div = esL.size(); @@ -95,5 +92,4 @@ public class AlvearyLogicTransmitter extends AbstractAlvearyLogic implements IEn public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityEnergy.ENERGY ? (T) this : null; } - } diff --git a/src/main/java/binnie/extrabees/alveary/BlockAlveary.java b/src/main/java/binnie/extrabees/alveary/BlockAlveary.java index 7dabc967..79c0509e 100644 --- a/src/main/java/binnie/extrabees/alveary/BlockAlveary.java +++ b/src/main/java/binnie/extrabees/alveary/BlockAlveary.java @@ -22,23 +22,20 @@ import net.minecraft.world.World; import javax.annotation.Nonnull; import javax.annotation.Nullable; -/** - * Created by Elec332 on 13-5-2017. - */ @SuppressWarnings("deprecation") public class BlockAlveary extends Block implements ITileEntityProvider { + private static final PropertyEnum TYPE = PropertyEnum.create("type", EnumAlvearyLogicType.class); + public BlockAlveary() { super(new MaterialBeehive(false)); setRegistryName("alveary"); } - private static final PropertyEnum TYPE = PropertyEnum.create("type", EnumAlvearyLogicType.class); - @Override public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { TileEntityExtraBeesAlvearyPart tile = TileUtil.getTile(worldIn, pos, TileEntityExtraBeesAlvearyPart.class); - if (tile != null && tile.hasGui()){ + if (tile != null && tile.hasGui()) { GuiHandler.openGui(playerIn, tile); } return true; @@ -50,7 +47,7 @@ public class BlockAlveary extends Block implements ITileEntityProvider { return new TileEntityExtraBeesAlvearyPart(getType(meta)); } - private EnumAlvearyLogicType getType(int meta){ + private EnumAlvearyLogicType getType(int meta) { IBlockState state = getStateFromMeta(meta); return state.getValue(TYPE); } @@ -76,7 +73,7 @@ public class BlockAlveary extends Block implements ITileEntityProvider { @Nonnull public String getUnlocalizedName(int meta) { - return "extrabees.machine.alveay."+getType(meta).getName(); + return "extrabees.machine.alveay." + getType(meta).getName(); } @Override @@ -90,5 +87,4 @@ public class BlockAlveary extends Block implements ITileEntityProvider { meta = meta >= 0 && meta < EnumAlvearyLogicType.VALUES.length ? meta : 0; return getDefaultState().withProperty(TYPE, EnumAlvearyLogicType.VALUES[meta]); } - } diff --git a/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java b/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java index 88f91660..2107d10b 100644 --- a/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java +++ b/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java @@ -4,75 +4,58 @@ import net.minecraft.util.IStringSerializable; import javax.annotation.Nonnull; -/** - * Created by Elec332 on 13-5-2017. - */ public enum EnumAlvearyLogicType implements IStringSerializable { FRAME { - @Override public AbstractAlvearyLogic createLogic(TileEntityExtraBeesAlvearyPart tile) { return new AlvearyLogicFrameHousing(tile); } - }, HATCHERY { - @Override public AbstractAlvearyLogic createLogic(TileEntityExtraBeesAlvearyPart tile) { return new AlvearyLogicHatchery(); } - }, LIGHTING { - @Override public AbstractAlvearyLogic createLogic(TileEntityExtraBeesAlvearyPart tile) { return new AlvearyLogicLighting(); } - }, MUTATOR { - @Override public AbstractAlvearyLogic createLogic(TileEntityExtraBeesAlvearyPart tile) { return new AlvearyLogicMutator(); } - }, RAINSHIELD { - @Override public AbstractAlvearyLogic createLogic(TileEntityExtraBeesAlvearyPart tile) { return new AlvearyLogicRainShield(); } - }, STIMULATOR { - @Override public AbstractAlvearyLogic createLogic(TileEntityExtraBeesAlvearyPart tile) { return new AlvearyLogicStimulator(); } - }, TRANSMISSION { - @Override public AbstractAlvearyLogic createLogic(TileEntityExtraBeesAlvearyPart tile) { return new AlvearyLogicTransmitter(); } - }; + public static EnumAlvearyLogicType[] VALUES = values(); + public abstract AbstractAlvearyLogic createLogic(TileEntityExtraBeesAlvearyPart tile); @Nonnull - public String getName(){ + public String getName() { return toString().toLowerCase(); } - public static EnumAlvearyLogicType[] VALUES = values(); - } diff --git a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java index 16edd777..d99ecdee 100644 --- a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java +++ b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java @@ -25,12 +25,16 @@ import java.util.Collection; import java.util.Set; import java.util.stream.Collectors; -/** - * Created by Elec332 on 13-5-2017. - */ -public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry implements IAlvearyComponent.Active, IAlvearyComponent.BeeModifier, IAlvearyComponent.BeeListener { +public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry implements + IAlvearyComponent.Active, + IAlvearyComponent.BeeModifier, + IAlvearyComponent.BeeListener { - public TileEntityExtraBeesAlvearyPart(){ + private String unlocalizedTitle; + private EnumAlvearyLogicType type; + private AbstractAlvearyLogic alvearyLogic; + + public TileEntityExtraBeesAlvearyPart() { this(null); } @@ -42,18 +46,14 @@ public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry } } - private void initFromType(){ - if (alvearyLogic == null){ + private void initFromType() { + if (alvearyLogic == null) { this.unlocalizedTitle = "tile.for.alveary." + type.getName() + ".name"; this.alvearyLogic = type.createLogic(this); } } - private String unlocalizedTitle; - private EnumAlvearyLogicType type; - private AbstractAlvearyLogic alvearyLogic; - - public boolean hasGui(){ + public boolean hasGui() { return alvearyLogic.hasGui(); } @@ -146,12 +146,11 @@ public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry return alvearyLogic.hasCapability(capability, facing) ? alvearyLogic.getCapability(capability, facing) : super.getCapability(capability, facing); } - public Collection getConnectedComponents(){ + public Collection getConnectedComponents() { return getMultiblockLogic().getController().getComponents(); } - public Set getExtraBeesParts(){ + public Set getExtraBeesParts() { return getConnectedComponents().stream().filter(p -> p instanceof TileEntityExtraBeesAlvearyPart).map(p -> (TileEntityExtraBeesAlvearyPart) p).collect(Collectors.toSet()); } - } diff --git a/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java b/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java index 96ba4273..7f1ac005 100644 --- a/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java +++ b/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java @@ -29,5 +29,4 @@ public class BlockEctoplasm extends BlockWeb { public String getUnlocalizedName() { return "extrabees.block.ectoplasm"; } - } diff --git a/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java b/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java index a4858efb..32f3fbdc 100644 --- a/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java +++ b/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java @@ -22,6 +22,8 @@ import java.util.List; public class BlockExtraBeeHive extends Block { + public static final PropertyEnum hiveType = PropertyEnum.create("type", EnumHiveType.class); + public BlockExtraBeeHive() { super(ExtraBees.materialBeehive); this.setLightLevel(0.2f); @@ -31,8 +33,6 @@ public class BlockExtraBeeHive extends Block { this.setCreativeTab(Tabs.tabApiculture); } - public static final PropertyEnum hiveType = PropertyEnum.create("type", EnumHiveType.class); - public String getUnlocalizedName(final ItemStack itemStack) { return "extrabees.block.hive." + itemStack.getItemDamage(); } @@ -70,28 +70,27 @@ public class BlockExtraBeeHive extends Block { Collections.shuffle(dropList); int tries = 0; //TODO HIVE DROP -// for (boolean hasPrincess = false; tries <= 10 && !hasPrincess; hasPrincess = true) { -// ++tries; -// for (final IHiveDrop drop : dropList) { -// if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) { -// ret.add(drop.getPrincess(world, x, y, z, fortune)); -// break; -// } -// } -// } -// for (final IHiveDrop drop : dropList) { -// if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) { -// ret.addAll(drop.getDrones(world, x, y, z, fortune)); -// break; -// } -// } -// for (final IHiveDrop drop : dropList) { -// if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) { -// ret.addAll(drop.getAdditional(world, x, y, z, fortune)); -// break; -// } -// } + /*for (boolean hasPrincess = false; tries <= 10 && !hasPrincess; hasPrincess = true) { + ++tries; + for (final IHiveDrop drop : dropList) { + if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) { + ret.add(drop.getPrincess(world, x, y, z, fortune)); + break; + } + } + } + for (final IHiveDrop drop : dropList) { + if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) { + ret.addAll(drop.getDrones(world, x, y, z, fortune)); + break; + } + } + for (final IHiveDrop drop : dropList) { + if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) { + ret.addAll(drop.getAdditional(world, x, y, z, fortune)); + break; + } + }*/ return ret; } - } diff --git a/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java b/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java index f33ac2a6..20c79209 100644 --- a/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java +++ b/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java @@ -10,9 +10,6 @@ import forestry.api.circuits.ICircuitLayout; import javax.annotation.Nonnull; import javax.annotation.Nullable; -/** - * Created by Elec332 on 13-5-2017. - */ public enum AlvearySimulatorCircuitType implements IBeeModifier { LowVoltage(3, 10), @@ -25,6 +22,22 @@ public enum AlvearySimulatorCircuitType implements IBeeModifier { Inhibitor(1, 10), Territory(2, 10); + static { + LowVoltage.logic.setModifier(EnumBeeModifier.Production, 1.5f, 5.0f); + HighVoltage.logic.setModifier(EnumBeeModifier.Production, 2.5f, 10.0f); + Plant.logic.setModifier(EnumBeeModifier.Flowering, 1.5f, 5.0f); + Death.logic.setModifier(EnumBeeModifier.Lifespan, 0.8f, 0.2f); + Life.logic.setModifier(EnumBeeModifier.Lifespan, 1.5f, 5.0f); + Nether.logic.setModifier(EnumBeeBooleanModifier.Hellish); + Mutation.logic.setModifier(EnumBeeModifier.Mutation, 1.5f, 5.0f); + Inhibitor.logic.setModifier(EnumBeeModifier.Territory, 0.4f, 0.1f); + Inhibitor.logic.setModifier(EnumBeeModifier.Production, 0.9f, 0.5f); + Territory.logic.setModifier(EnumBeeModifier.Territory, 1.5f, 5.0f); + for (final AlvearySimulatorCircuitType type : values()) { + type.logic.setModifier(EnumBeeModifier.GeneticDecay, 1.5f, 10.0f); + } + } + public int recipe; public int power; BeeModifierLogic logic; @@ -100,20 +113,4 @@ public enum AlvearySimulatorCircuitType implements IBeeModifier { public boolean isHellish() { return this.logic.getModifier(EnumBeeBooleanModifier.Hellish); } - - static { - LowVoltage.logic.setModifier(EnumBeeModifier.Production, 1.5f, 5.0f); - HighVoltage.logic.setModifier(EnumBeeModifier.Production, 2.5f, 10.0f); - Plant.logic.setModifier(EnumBeeModifier.Flowering, 1.5f, 5.0f); - Death.logic.setModifier(EnumBeeModifier.Lifespan, 0.8f, 0.2f); - Life.logic.setModifier(EnumBeeModifier.Lifespan, 1.5f, 5.0f); - Nether.logic.setModifier(EnumBeeBooleanModifier.Hellish); - Mutation.logic.setModifier(EnumBeeModifier.Mutation, 1.5f, 5.0f); - Inhibitor.logic.setModifier(EnumBeeModifier.Territory, 0.4f, 0.1f); - Inhibitor.logic.setModifier(EnumBeeModifier.Production, 0.9f, 0.5f); - Territory.logic.setModifier(EnumBeeModifier.Territory, 1.5f, 5.0f); - for (final AlvearySimulatorCircuitType type : values()) { - type.logic.setModifier(EnumBeeModifier.GeneticDecay, 1.5f, 10.0f); - } - } } diff --git a/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java b/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java index fed40789..9f2ebe8e 100644 --- a/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java +++ b/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java @@ -7,15 +7,15 @@ import net.minecraft.util.text.translation.I18n; public class BinnieCircuitLayout implements ICircuitLayout { + private final String uid; + private final ICircuitSocketType socketType; + public BinnieCircuitLayout(final String uid, final ICircuitSocketType socketType) { this.uid = uid; this.socketType = socketType; ChipsetManager.circuitRegistry.registerLayout(this); } - private final String uid; - private final ICircuitSocketType socketType; - @Override public String getUID() { return "binnie.circuitLayout" + this.uid; @@ -35,5 +35,4 @@ public class BinnieCircuitLayout implements ICircuitLayout { public ICircuitSocketType getSocketType() { return this.socketType; } - } diff --git a/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java b/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java index 9c693ef7..fb707fe3 100644 --- a/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java +++ b/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java @@ -13,11 +13,12 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -/** - * Created by Elec332 on 13-5-2017. - */ public class StimulatorCircuit implements ICircuit, IBeeModifier { + private final AlvearySimulatorCircuitType type; + private final String uid; + private final List tooltip; + public StimulatorCircuit(final AlvearySimulatorCircuitType type, final ICircuitLayout layout) { uid = "binnie.circuit.stimulator." + type.toString().toLowerCase(); this.type = type; @@ -27,15 +28,11 @@ public class StimulatorCircuit implements ICircuit, IBeeModifier { tooltip = Lists.newArrayList(); } - private final AlvearySimulatorCircuitType type; - private final String uid; - private final List tooltip; - public int getPowerUsage() { return this.type.power; } - public void addTooltip(String tt){ + public void addTooltip(String tt) { this.tooltip.add(tt); } @@ -103,7 +100,7 @@ public class StimulatorCircuit implements ICircuit, IBeeModifier { @Override public boolean isCircuitable(@Nonnull Object tile) { - System.out.println("isCircuitable: "+tile); + System.out.println("isCircuitable: " + tile); return false; } @@ -131,5 +128,4 @@ public class StimulatorCircuit implements ICircuit, IBeeModifier { public void addTooltip(@Nonnull List list) { list.addAll(tooltip); } - } diff --git a/src/main/java/binnie/extrabees/client/BeeModelProvider.java b/src/main/java/binnie/extrabees/client/BeeModelProvider.java index c656ca91..658d1ac4 100644 --- a/src/main/java/binnie/extrabees/client/BeeModelProvider.java +++ b/src/main/java/binnie/extrabees/client/BeeModelProvider.java @@ -17,7 +17,6 @@ import java.util.Locale; public class BeeModelProvider implements IBeeModelProvider { public static final BeeModelProvider instance = new BeeModelProvider(); - @SideOnly(Side.CLIENT) private static ModelResourceLocation[] models = new ModelResourceLocation[EnumBeeType.values().length]; @@ -40,7 +39,6 @@ public class BeeModelProvider implements IBeeModelProvider { return models[type.ordinal()]; } - public ModelResourceLocation getModelLocation(String modID, String identifier) { return new ModelResourceLocation(modID + ":" + identifier, "inventory"); } diff --git a/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java b/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java index 97918889..e02fb9f6 100644 --- a/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java +++ b/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java @@ -10,24 +10,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.items.IItemHandlerModifiable; import javax.annotation.Nonnull; -import java.awt.*; +import java.awt.Dimension; -/** - * Created by Elec332 on 13-5-2017. - */ public abstract class AbstractAlvearyContainer extends Container { - public AbstractAlvearyContainer(EntityPlayer player, IItemHandlerModifiable inv, EnumAlvearyLogicType type, Dimension dimension){ - this.player = player; - this.inv = inv; - this.dimension = dimension; - String base = "extrabees.machine.alveay."+type.getName(); - title = ExtraBees.proxy.localise(base+".name"); - tooltip = ExtraBees.proxy.localise(base+".info"); - background = new ExtraBeesResourceLocation("textures/gui/gui"+ type.getName()+".png"); - setupContainer(); - } - protected static final Dimension DEFAULT_DIMENSION = new Dimension(176, 144); public final Dimension dimension; protected final EntityPlayer player; @@ -36,9 +22,20 @@ public abstract class AbstractAlvearyContainer extends Container { protected int offset = 0; protected String tooltip, title; + public AbstractAlvearyContainer(EntityPlayer player, IItemHandlerModifiable inv, EnumAlvearyLogicType type, Dimension dimension) { + this.player = player; + this.inv = inv; + this.dimension = dimension; + String base = "extrabees.machine.alveay." + type.getName(); + title = ExtraBees.proxy.localise(base + ".name"); + tooltip = ExtraBees.proxy.localise(base + ".info"); + background = new ExtraBeesResourceLocation("textures/gui/gui" + type.getName() + ".png"); + setupContainer(); + } + protected abstract void setupContainer(); - protected final void addPlayerInventory(){ + protected final void addPlayerInventory() { for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, (84 + this.offset) + i * 18)); @@ -54,5 +51,4 @@ public abstract class AbstractAlvearyContainer extends Container { public boolean canInteractWith(@Nonnull EntityPlayer playerIn) { return true; } - } diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java b/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java index 18493ffa..3969580f 100644 --- a/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java @@ -5,9 +5,6 @@ import binnie.extrabees.alveary.EnumAlvearyLogicType; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.items.SlotItemHandler; -/** - * Created by Elec332 on 13-5-2017. - */ public class ContainerFrameHousing extends AbstractAlvearyContainer { public ContainerFrameHousing(EntityPlayer player, AlvearyLogicFrameHousing logic) { @@ -20,5 +17,4 @@ public class ContainerFrameHousing extends AbstractAlvearyContainer { addPlayerInventory(); addSlotToContainer(new SlotItemHandler(inv, 0, 80, 37)); } - } diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java b/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java index 0ef037f7..4aeeb67d 100644 --- a/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java @@ -5,9 +5,6 @@ import binnie.extrabees.alveary.EnumAlvearyLogicType; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.items.SlotItemHandler; -/** - * Created by Elec332 on 13-5-2017. - */ public class ContainerHatchery extends AbstractAlvearyContainer { public ContainerHatchery(EntityPlayer player, AlvearyLogicHatchery logic) { @@ -22,5 +19,4 @@ public class ContainerHatchery extends AbstractAlvearyContainer { addSlotToContainer(new SlotItemHandler(inv, i, 44 + i * 18, 37)); } } - } diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java b/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java index b82bba4a..860a8498 100644 --- a/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java @@ -5,11 +5,8 @@ import binnie.extrabees.alveary.EnumAlvearyLogicType; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.items.SlotItemHandler; -import java.awt.*; +import java.awt.Dimension; -/** - * Created by Elec332 on 13-5-2017. - */ public class ContainerMutator extends AbstractAlvearyContainer { public ContainerMutator(EntityPlayer player, AlvearyLogicMutator logic) { @@ -21,5 +18,4 @@ public class ContainerMutator extends AbstractAlvearyContainer { addPlayerInventory(); addSlotToContainer(new SlotItemHandler(inv, 0, 81, 29)); } - } diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java b/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java index d11e0499..2c083d0b 100644 --- a/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java @@ -7,25 +7,22 @@ import net.minecraft.inventory.IContainerListener; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.items.SlotItemHandler; -/** - * Created by Elec332 on 13-5-2017. - */ public class ContainerStimulator extends AbstractAlvearyContainer { + private final AlvearyLogicStimulator logic; + private final IEnergyStorage storage; + protected int power, maxPower; + public ContainerStimulator(EntityPlayer player, AlvearyLogicStimulator logic) { super(player, logic.getInventory(), EnumAlvearyLogicType.STIMULATOR, DEFAULT_DIMENSION); this.storage = logic.getEnergyStorage(); this.logic = logic; this.maxPower = storage.getMaxEnergyStored(); - if (!player.world.isRemote){ + if (!player.world.isRemote) { logic.onContainerOpened(this); } } - private final AlvearyLogicStimulator logic; - private final IEnergyStorage storage; - protected int power, maxPower; - @Override protected void setupContainer() { offset = -21; @@ -34,9 +31,9 @@ public class ContainerStimulator extends AbstractAlvearyContainer { addSlotToContainer(new SlotItemHandler(inv, 0, 44, 37)); } - public void checkPower(){ - if (power != storage.getEnergyStored()){ - for (IContainerListener listener : listeners){ + public void checkPower() { + if (power != storage.getEnergyStored()) { + for (IContainerListener listener : listeners) { listener.sendProgressBarUpdate(this, 9, power = storage.getEnergyStored()); } } @@ -50,9 +47,8 @@ public class ContainerStimulator extends AbstractAlvearyContainer { @Override public void updateProgressBar(int id, int data) { - if (id == 9){ + if (id == 9) { power = data; } } - } diff --git a/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java b/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java index 8f6aaa22..17cbc633 100644 --- a/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java +++ b/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java @@ -8,40 +8,35 @@ import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; -/** - * Created by Elec332 on 13-5-2017. - */ @SideOnly(Side.CLIENT) public class GuiContainerAlvearyPart extends GuiContainer { + @SuppressWarnings("all") + protected FontRenderer font; + protected AbstractAlvearyContainer container; + private int titleS = -1; + public GuiContainerAlvearyPart(AbstractAlvearyContainer container) { super(container); this.container = container; font = Minecraft.getMinecraft().fontRendererObj; } - @SuppressWarnings("all") - protected FontRenderer font; - protected AbstractAlvearyContainer container; - private int titleS = -1; - @Override protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { int i = (this.width - this.xSize) / 2; int j = (this.height - this.ySize) / 2; Minecraft.getMinecraft().getTextureManager().bindTexture(container.background); - if (titleS == -1){ + if (titleS == -1) { titleS = (i + (xSize / 2)) - (font.getStringWidth(container.title) / 2); } drawTexturedModalRect(i, j, 0, 0, container.dimension.width, container.dimension.height); font.drawString(container.title, titleS, j + 8, Color.DARK_GRAY.getRGB()); - if (mouseX > i + 6 && mouseX < i + 23 && mouseY > j + 5 && mouseY < j + 22){ + if (mouseX > i + 6 && mouseX < i + 23 && mouseY > j + 5 && mouseY < j + 22) { GuiUtils.drawHoveringText(Lists.newArrayList(container.tooltip), mouseX, mouseY, width, height, 150, font); } - } - } diff --git a/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java b/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java index 8cafbfee..2f949177 100644 --- a/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java +++ b/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java @@ -5,28 +5,25 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import org.apache.commons.lang3.tuple.Pair; -import java.awt.*; +import java.awt.Color; -/** - * Created by Elec332 on 13-5-2017. - */ public class GuiContainerMutator extends GuiContainerAlvearyPart { + private String mutagens; + private int titleS = -1; + public GuiContainerMutator(AbstractAlvearyContainer container) { super(container); mutagens = "Possible Mutagens:"; } - private String mutagens; - private int titleS = -1; - @Override protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY); int i = (this.width - this.xSize) / 2; int j = (this.height - this.ySize) / 2; int mid = i + (xSize / 2); - if (titleS == -1){ + if (titleS == -1) { titleS = mid - (font.getStringWidth(mutagens) / 2); } font.drawString(mutagens, titleS, j + 50, Color.DARK_GRAY.getRGB()); @@ -39,5 +36,4 @@ public class GuiContainerMutator extends GuiContainerAlvearyPart { q++; } } - } diff --git a/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java b/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java index 2bcee005..67b0190c 100644 --- a/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java +++ b/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java @@ -3,18 +3,15 @@ package binnie.extrabees.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -/** - * Created by Elec332 on 13-5-2017. - */ public class GuiContainerStimulator extends GuiContainerAlvearyPart { + private ContainerStimulator container; + public GuiContainerStimulator(ContainerStimulator container) { super(container); this.container = container; } - private ContainerStimulator container; - @Override protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY); @@ -27,5 +24,4 @@ public class GuiContainerStimulator extends GuiContainerAlvearyPart { drawTexturedModalRect(i + 71, j + 38, 0, 185, (int) bar, 14); drawTexturedModalRect(i + 71, j + 38, 0, 165, 70, 14); } - } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index 845e3844..dba0f46f 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -15,7 +15,36 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.BiomeDictionary; -import static forestry.apiculture.genetics.BeeDefinition.*; +import static forestry.apiculture.genetics.BeeDefinition.AUSTERE; +import static forestry.apiculture.genetics.BeeDefinition.BOGGY; +import static forestry.apiculture.genetics.BeeDefinition.COMMON; +import static forestry.apiculture.genetics.BeeDefinition.CULTIVATED; +import static forestry.apiculture.genetics.BeeDefinition.DEMONIC; +import static forestry.apiculture.genetics.BeeDefinition.DILIGENT; +import static forestry.apiculture.genetics.BeeDefinition.ENDED; +import static forestry.apiculture.genetics.BeeDefinition.EXOTIC; +import static forestry.apiculture.genetics.BeeDefinition.FARMERLY; +import static forestry.apiculture.genetics.BeeDefinition.FIENDISH; +import static forestry.apiculture.genetics.BeeDefinition.FOREST; +import static forestry.apiculture.genetics.BeeDefinition.FRUGAL; +import static forestry.apiculture.genetics.BeeDefinition.HERMITIC; +import static forestry.apiculture.genetics.BeeDefinition.IMPERIAL; +import static forestry.apiculture.genetics.BeeDefinition.INDUSTRIOUS; +import static forestry.apiculture.genetics.BeeDefinition.MAJESTIC; +import static forestry.apiculture.genetics.BeeDefinition.MARSHY; +import static forestry.apiculture.genetics.BeeDefinition.MEADOWS; +import static forestry.apiculture.genetics.BeeDefinition.MIRY; +import static forestry.apiculture.genetics.BeeDefinition.MODEST; +import static forestry.apiculture.genetics.BeeDefinition.MONASTIC; +import static forestry.apiculture.genetics.BeeDefinition.NOBLE; +import static forestry.apiculture.genetics.BeeDefinition.RURAL; +import static forestry.apiculture.genetics.BeeDefinition.SECLUDED; +import static forestry.apiculture.genetics.BeeDefinition.SINISTER; +import static forestry.apiculture.genetics.BeeDefinition.SPECTRAL; +import static forestry.apiculture.genetics.BeeDefinition.TROPICAL; +import static forestry.apiculture.genetics.BeeDefinition.UNWEARY; +import static forestry.apiculture.genetics.BeeDefinition.VALIANT; +import static forestry.apiculture.genetics.BeeDefinition.WINTRY; public class ExtraBeeMutation { @@ -199,29 +228,27 @@ public class ExtraBeeMutation { static class ConditionPerson implements IMutationCondition { + String name; + public ConditionPerson(final String name) { this.name = name; } - String name; - @Override public String getDescription() { return "Can only be bred by " + this.name; } - + @Override public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) { TileEntity tileEnity = world.getTileEntity(pos); - if(tileEnity instanceof IBeeHousing){ + if (tileEnity instanceof IBeeHousing) { IBeeHousing housing = (IBeeHousing) tileEnity; - if(housing.getOwner() != null && housing.getOwner().getName() != null && housing.getOwner().getName().equals(this.name)){ + if (housing.getOwner() != null && housing.getOwner().getName() != null && housing.getOwner().getName().equals(this.name)) { return 1; } } return 0; } - } - } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java index c4e10207..8322ed3b 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java @@ -42,30 +42,10 @@ public enum ExtraBeesBranch implements IClassification { QUANTUM("Quantapis"), BOTANIA("Botaniapis"); //TODO There is 1 bee in here, that produces the petal of the flowers around, move to MagicBEes? + IClassification parent; private String uid; private String scientific; private Set speciesSet; - IClassification parent; - - @Override - public String getUID() { - return "extrabees.genus." + this.uid; - } - - @Override - public String getName() { - return ExtraBees.proxy.localise("branch." + this.toString().toLowerCase() + ".name"); - } - - @Override - public String getScientific() { - return this.scientific; - } - - @Override - public String getDescription() { - return ExtraBees.proxy.localise("branch." + this.toString().toLowerCase() + ".desc"); - } ExtraBeesBranch(final String scientific) { this.uid = ""; @@ -75,17 +55,6 @@ public enum ExtraBeesBranch implements IClassification { this.uid = this.toString().toLowerCase(); } - public void register() { - if (!this.speciesSet.isEmpty()) { - AlleleManager.alleleRegistry.registerClassification(this); - final IClassification parent = AlleleManager.alleleRegistry.getClassification("family.apidae"); - if (parent != null) { - parent.addMemberGroup(this); - this.setParent(parent); - } - } - } - public static void setSpeciesBranches() { final IClassification frozenBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.frozen"); if (frozenBranch != null) { @@ -267,6 +236,37 @@ public enum ExtraBeesBranch implements IClassification { ExtraBeesBranch.BOTANIA.register(); } + @Override + public String getUID() { + return "extrabees.genus." + this.uid; + } + + @Override + public String getName() { + return ExtraBees.proxy.localise("branch." + this.toString().toLowerCase() + ".name"); + } + + @Override + public String getScientific() { + return this.scientific; + } + + @Override + public String getDescription() { + return ExtraBees.proxy.localise("branch." + this.toString().toLowerCase() + ".desc"); + } + + public void register() { + if (!this.speciesSet.isEmpty()) { + AlleleManager.alleleRegistry.registerClassification(this); + final IClassification parent = AlleleManager.alleleRegistry.getClassification("family.apidae"); + if (parent != null) { + parent.addMemberGroup(this); + this.setParent(parent); + } + } + } + @Override public IClassification.EnumClassLevel getLevel() { return IClassification.EnumClassLevel.GENUS; diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index f4a648f4..0e1ad3e5 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -3,7 +3,15 @@ package binnie.extrabees.genetics; import binnie.extrabees.ExtraBees; import binnie.extrabees.utils.Utils; import forestry.api.apiculture.FlowerManager; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleFlowers; +import forestry.api.genetics.ICheckPollinatable; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IFlowerProvider; +import forestry.api.genetics.IFruitBearer; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -36,6 +44,12 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo this.dominant = true; } + public static void doInit() { + for (final ExtraBeesFlowers effect : values()) { + effect.register(); + } + } + @Override public String getUID() { return "extrabees.flower." + this.toString().toLowerCase(); @@ -66,12 +80,6 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo AlleleManager.alleleRegistry.registerAllele(this, this); } - public static void doInit() { - for (final ExtraBeesFlowers effect : values()) { - effect.register(); - } - } - public List getAcceptableBlocks() { switch (this) { case WATER: { @@ -152,21 +160,20 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo } } - -// @Override -// public boolean growFlower(final World world, final IIndividual individual, final BlockPos pos) { -// switch (this) { -// case WATER: { -// return world.isAirBlock(x, y, z) && world.getBlock(x, y - 1, z) == Blocks.water && world.setBlock(x, y, z, Blocks.waterlily, 0, 2); -// } -// case SUGAR: { -// return world.getBlock(x, y - 1, z) == Blocks.reeds && world.isAirBlock(x, y, z) && world.setBlock(x, y, z, Blocks.reeds, 0, 0); -// } -// default: { -// return false; -// } -// } -// } + /*@Override + public boolean growFlower(final World world, final IIndividual individual, final BlockPos pos) { + switch (this) { + case WATER: { + return world.isAirBlock(x, y, z) && world.getBlock(x, y - 1, z) == Blocks.water && world.setBlock(x, y, z, Blocks.waterlily, 0, 2); + } + case SUGAR: { + return world.getBlock(x, y - 1, z) == Blocks.reeds && world.isAirBlock(x, y, z) && world.setBlock(x, y, z, Blocks.reeds, 0, 0); + } + default: { + return false; + } + } + }*/ @Override public String getName() { @@ -183,10 +190,10 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo return this.getUID(); } -// @Override -// public Set getFlowers() { -// return new HashSet(); -// } + /*@Override + public Set getFlowers() { + return new HashSet(); + }*/ @Override public Class getAlleleClass() { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index 5fefb658..49ae36e7 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -9,11 +9,23 @@ import binnie.extrabees.items.types.IEBEnumItem; import binnie.extrabees.utils.Utils; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.*; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeRoot; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IModelManager; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleFlowers; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IClassification; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; import forestry.apiculture.PluginApiculture; import forestry.apiculture.genetics.BeeDefinition; import forestry.core.genetics.alleles.AlleleHelper; @@ -163,28 +175,28 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { BLUTONIUM("caruthus", 1769702), MYSTICAL("mystica", 4630306); + public final Map allProducts; + public final Map allSpecialties; private final int primaryColor; + private final String binomial; + private final Map products; + private final Map specialties; + public State state; + boolean nocturnal; private int secondaryColor; private EnumTemperature temperature; private EnumHumidity humidity; private boolean hasEffect; private boolean isSecret; private boolean isCounted; - private final String binomial; @Nullable private IClassification branch; private String uid; @Nullable private Achievement achievement; private boolean dominant; - private final Map products; - private final Map specialties; - public final Map allProducts; - public final Map allSpecialties; @Nullable private IAllele[] template; - public State state; - boolean nocturnal; ExtraBeesSpecies(final String binomial, final int colour) { this.primaryColor = 16777215; @@ -212,172 +224,10 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { this("", 16777215); } - @Override - public String getName() { - return ExtraBees.proxy.localise(getUnlocalizedName()); - } - - @Override - public String getDescription() { - return ExtraBees.proxy.localise(getUID() + ".desc"); - } - - @Override - public EnumTemperature getTemperature() { - return this.temperature; - } - - @Override - public EnumHumidity getHumidity() { - return this.humidity; - } - - @Override - public boolean hasEffect() { - return this.hasEffect; - } - - @Override - public boolean isSecret() { - return this.isSecret; - } - - @Override - public boolean isCounted() { - return this.isCounted; - } - - @Override - public String getBinomial() { - return this.binomial; - } - - @Override - public String getAuthority() { - return "Binnie"; - } - - @Override - public IClassification getBranch() { - return this.branch; - } - - @Override - public String getUID() { - return "extrabees.species." + this.uid; - } - - @Override - public boolean isDominant() { - return this.dominant; - } - - public Map getProducts() { - return this.products; - } - - public Map getSpecialty() { - return this.specialties; - } - - private void setState(final State state) { - this.state = state; - } - - public void registerTemplate() { - Utils.getBeeRoot().registerTemplate(this.getTemplate()); - if (this.state != State.Active) { - AlleleManager.alleleRegistry.blacklistAllele(this.getUID()); - } - } - - public void addProduct(final ItemStack product, final Float chance) { - if (product.isEmpty()) { - this.setState(State.Inactive); - } else { - this.products.put(product, chance); - this.allProducts.put(product, chance); - } - } - - public void addProduct(final IEBEnumItem product, final Float chance) { - if (product.isActive()) { - this.addProduct(product.get(1), chance); - } else { - this.allProducts.put(product.get(1), chance); - this.setState(State.Inactive); - } - } - - public void addSpecialty(final ItemStack product, final Float chance) { - if (product.isEmpty()) { - this.setState(State.Inactive); - } else { - this.specialties.put(product, chance); - this.allSpecialties.put(product, chance); - } - } - - private void addSpecialty(final IEBEnumItem product, final Float chance) { - if (product.isActive()) { - this.addSpecialty(product.get(1), chance); - } else { - this.setState(State.Inactive); - this.allSpecialties.put(product.get(1), chance); - } - } - - private void setHumidity(final EnumHumidity humidity) { - this.humidity = humidity; - } - - private void setTemperature(final EnumTemperature temperature) { - this.temperature = temperature; - } - public static IAllele[] getDefaultTemplate() { return Utils.getBeeRoot().getDefaultTemplate(); } - public IAllele[] getTemplate() { - Preconditions.checkState(this.template != null, "Species Template has not been set: %s", name()); - this.template[EnumBeeChromosome.SPECIES.ordinal()] = this; - return this.template; - } - - public void importTemplate(final BeeDefinition species) { - this.importTemplate(species.getTemplate()); - } - - public void importTemplate(final ExtraBeesSpecies species) { - this.importTemplate(species.getTemplate()); - } - - public void importTemplate(final IAllele[] template) { - IAllele[] templateCopy = template.clone(); - this.setHumidity(((IAlleleSpecies) template[0]).getHumidity()); - this.setTemperature(((IAlleleSpecies) template[0]).getTemperature()); - this.setSecondaryColor(((IAlleleSpecies) template[0]).getSpriteColour(1)); - templateCopy[EnumBeeChromosome.SPECIES.ordinal()] = this; - this.template = templateCopy; - } - - public void setRecessive() { - this.dominant = false; - } - - public void setIsSecret(final boolean secret) { - this.isSecret = secret; - } - - public void setHasEffect() { - this.hasEffect = true; - } - - public void setSecondaryColor(final int colour) { - this.secondaryColor = colour; - } - public static void doInit() { final int aridBody = 13362036; final int rockBody = 10066329; @@ -915,13 +765,174 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { species2.registerTemplate(); ExtraBees.proxy.registerBeeModel(species2); } + } + @Override + public String getName() { + return ExtraBees.proxy.localise(getUnlocalizedName()); + } + + @Override + public String getDescription() { + return ExtraBees.proxy.localise(getUID() + ".desc"); + } + + @Override + public EnumTemperature getTemperature() { + return this.temperature; + } + + private void setTemperature(final EnumTemperature temperature) { + this.temperature = temperature; + } + + @Override + public EnumHumidity getHumidity() { + return this.humidity; + } + + private void setHumidity(final EnumHumidity humidity) { + this.humidity = humidity; + } + + @Override + public boolean hasEffect() { + return this.hasEffect; + } + + @Override + public boolean isSecret() { + return this.isSecret; + } + + @Override + public boolean isCounted() { + return this.isCounted; + } + + @Override + public String getBinomial() { + return this.binomial; + } + + @Override + public String getAuthority() { + return "Binnie"; + } + + @Override + public IClassification getBranch() { + return this.branch; } void setBranch(final IClassification branch) { this.branch = branch; } + @Override + public String getUID() { + return "extrabees.species." + this.uid; + } + + @Override + public boolean isDominant() { + return this.dominant; + } + + public Map getProducts() { + return this.products; + } + + public Map getSpecialty() { + return this.specialties; + } + + private void setState(final State state) { + this.state = state; + } + + public void registerTemplate() { + Utils.getBeeRoot().registerTemplate(this.getTemplate()); + if (this.state != State.Active) { + AlleleManager.alleleRegistry.blacklistAllele(this.getUID()); + } + } + + public void addProduct(final ItemStack product, final Float chance) { + if (product.isEmpty()) { + this.setState(State.Inactive); + } else { + this.products.put(product, chance); + this.allProducts.put(product, chance); + } + } + + public void addProduct(final IEBEnumItem product, final Float chance) { + if (product.isActive()) { + this.addProduct(product.get(1), chance); + } else { + this.allProducts.put(product.get(1), chance); + this.setState(State.Inactive); + } + } + + public void addSpecialty(final ItemStack product, final Float chance) { + if (product.isEmpty()) { + this.setState(State.Inactive); + } else { + this.specialties.put(product, chance); + this.allSpecialties.put(product, chance); + } + } + + private void addSpecialty(final IEBEnumItem product, final Float chance) { + if (product.isActive()) { + this.addSpecialty(product.get(1), chance); + } else { + this.setState(State.Inactive); + this.allSpecialties.put(product.get(1), chance); + } + } + + public IAllele[] getTemplate() { + Preconditions.checkState(this.template != null, "Species Template has not been set: %s", name()); + this.template[EnumBeeChromosome.SPECIES.ordinal()] = this; + return this.template; + } + + public void importTemplate(final BeeDefinition species) { + this.importTemplate(species.getTemplate()); + } + + public void importTemplate(final ExtraBeesSpecies species) { + this.importTemplate(species.getTemplate()); + } + + public void importTemplate(final IAllele[] template) { + IAllele[] templateCopy = template.clone(); + this.setHumidity(((IAlleleSpecies) template[0]).getHumidity()); + this.setTemperature(((IAlleleSpecies) template[0]).getTemperature()); + this.setSecondaryColor(((IAlleleSpecies) template[0]).getSpriteColour(1)); + templateCopy[EnumBeeChromosome.SPECIES.ordinal()] = this; + this.template = templateCopy; + } + + public void setRecessive() { + this.dominant = false; + } + + public void setIsSecret(final boolean secret) { + this.isSecret = secret; + } + + public void setHasEffect() { + this.hasEffect = true; + } + + public void setSecondaryColor(final int colour) { + this.secondaryColor = colour; + } + public boolean isJubilant(final World world, final int biomeid, final int x, final int y, final int z) { return true; } @@ -931,49 +942,49 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { return true; } -// @Override -// public int getIconColour(final int renderPass) { -// return (renderPass == 0) ? this.primaryColor : ((renderPass == 1) ? this.secondaryColor : 16777215); -// } -// -// @Override -// public IIconProvider getIconProvider() { -// return this; -// } -// -// @Override -// public IIcon getIcon(final short texUID) { -// return null; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// String iconType = "default"; -// String mod = "forestry"; -// if (this == ExtraBeesSpecies.JADED) { -// iconType = "jaded"; -// mod = "extrabees"; -// } -// this.icons = new IIcon[EnumBeeType.values().length][3]; -// final IIcon body1 = BinnieCore.proxy.getIcon(register, mod, "bees/" + iconType + "/body1"); -// for (int i = 0; i < EnumBeeType.values().length; ++i) { -// if (EnumBeeType.values()[i] != EnumBeeType.NONE) { -// this.icons[i][0] = BinnieCore.proxy.getIcon(register, mod, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".outline"); -// this.icons[i][1] = ((EnumBeeType.values()[i] != EnumBeeType.LARVAE) ? body1 : BinnieCore.proxy.getIcon(register, mod, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body")); -// this.icons[i][2] = BinnieCore.proxy.getIcon(register, mod, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2"); -// } -// } -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final EnumBeeType type, final int renderPass) { -// if (this.icons == null) { -// return ExtraBeesSpecies.ARID.getIcon(type, renderPass); -// } -// return this.icons[type.ordinal()][renderPass]; -// } + /*@Override + public int getIconColour(final int renderPass) { + return (renderPass == 0) ? this.primaryColor : ((renderPass == 1) ? this.secondaryColor : 16777215); + } + + @Override + public IIconProvider getIconProvider() { + return this; + } + + @Override + public IIcon getIcon(final short texUID) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(final IIconRegister register) { + String iconType = "default"; + String mod = "forestry"; + if (this == ExtraBeesSpecies.JADED) { + iconType = "jaded"; + mod = "extrabees"; + } + this.icons = new IIcon[EnumBeeType.values().length][3]; + final IIcon body1 = BinnieCore.proxy.getIcon(register, mod, "bees/" + iconType + "/body1"); + for (int i = 0; i < EnumBeeType.values().length; ++i) { + if (EnumBeeType.values()[i] != EnumBeeType.NONE) { + this.icons[i][0] = BinnieCore.proxy.getIcon(register, mod, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".outline"); + this.icons[i][1] = ((EnumBeeType.values()[i] != EnumBeeType.LARVAE) ? body1 : BinnieCore.proxy.getIcon(register, mod, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body")); + this.icons[i][2] = BinnieCore.proxy.getIcon(register, mod, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2"); + } + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(final EnumBeeType type, final int renderPass) { + if (this.icons == null) { + return ExtraBeesSpecies.ARID.getIcon(type, renderPass); + } + return this.icons[type.ordinal()][renderPass]; + }*/ @Override public IBeeRoot getRoot() { @@ -1118,7 +1129,6 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { return bounty; } - @Override public int getComplexity() { return 1 + this.getGeneticAdvancement(this, new ArrayList<>()); @@ -1161,12 +1171,6 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { return this.getSpecialty(); } - public enum State { - Active, - Inactive, - Deprecated; - } - @Override public int getSpriteColour(int renderPass) { return (renderPass == 0) ? this.primaryColor : ((renderPass == 1) ? this.secondaryColor : 16777215); @@ -1184,4 +1188,9 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { BeeModelProvider.instance.registerModels(item, manager); } + public enum State { + Active, + Inactive, + Deprecated, + } } diff --git a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java index 1f0c6576..34bd4cc8 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java +++ b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java @@ -12,6 +12,8 @@ import java.util.List; public class EntityBeeLightning extends EntityLightningBolt { + private int lightningState; + private int boltLivingTime; public EntityBeeLightning(final World world) { super(world, 0, 0, 0, true); @@ -23,9 +25,6 @@ public class EntityBeeLightning extends EntityLightningBolt { this.boltLivingTime = this.rand.nextInt(3) + 1; } - private int lightningState; - private int boltLivingTime; - @Override public void onUpdate() { this.onEntityUpdate(); @@ -60,5 +59,4 @@ public class EntityBeeLightning extends EntityLightningBolt { } } } - } diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index 86c4b7b4..81eaeed6 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -3,7 +3,11 @@ package binnie.extrabees.genetics.effect; import binnie.extrabees.ExtraBees; import binnie.extrabees.genetics.ExtraBeesFlowers; import binnie.extrabees.utils.Utils; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; import forestry.core.render.ParticleRender; @@ -72,17 +76,18 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { BonemealMushroom, Power; - private String fx; - private boolean combinable; - private boolean dominant; - private int id; - private String uid; private static final List birthdays = new ArrayList<>(); static { birthdays.add(new Birthday(3, 10, "Binnie")); } + private String fx; + private boolean combinable; + private boolean dominant; + private int id; + private String uid; + ExtraBeesEffect() { this.fx = ""; this.uid = this.toString().toLowerCase(); @@ -106,8 +111,18 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } } - private void setFX(final String string) { - this.fx = "particles/" + string; + public static void doAcid(final World world, final BlockPos pos) { + final IBlockState blockState = world.getBlockState(pos); + final Block block = blockState.getBlock(); + if (block == Blocks.COBBLESTONE || block == Blocks.STONE) { + world.setBlockState(pos, Blocks.GRAVEL.getDefaultState()); + } else if (block == Blocks.DIRT | block == Blocks.GRASS) { + world.setBlockState(pos, Blocks.SAND.getDefaultState()); + } + } + + public static int wearsItems(final EntityPlayer player) { + return BeeManager.armorApiaristHelper.wearsItems(player, "", false); } public void register() { @@ -163,16 +178,6 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return world.getClosestPlayer(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, distance, false) != null; } - public static void doAcid(final World world, final BlockPos pos) { - final IBlockState blockState = world.getBlockState(pos); - final Block block = blockState.getBlock(); - if (block == Blocks.COBBLESTONE || block == Blocks.STONE) { - world.setBlockState(pos, Blocks.GRAVEL.getDefaultState()); - } else if (block == Blocks.DIRT | block == Blocks.GRASS) { - world.setBlockState(pos, Blocks.SAND.getDefaultState()); - } - } - @Override public String getUID() { return "extrabees.effect." + this.uid; @@ -472,9 +477,9 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { protected Vec3i getModifiedArea(final IBeeGenome genome, final IBeeHousing housing) { Vec3i territory = genome.getTerritory(); territory = new Vec3i( - territory.getX() * (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f), - territory.getY() * (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f), - territory.getZ() * (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f) + territory.getX() * (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f), + territory.getY() * (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f), + territory.getZ() * (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f) ); if (territory.getX() < 1) { territory = new Vec3i(1, territory.getY(), territory.getZ()); @@ -501,6 +506,10 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return this.fx; } + private void setFX(final String string) { + this.fx = "particles/" + string; + } + public List getEntities(final Class eClass, final IBeeGenome genome, final IBeeHousing housing) { final Vec3i area = genome.getTerritory(); final int[] offset = {-Math.round(area.getX() / 2), -Math.round(area.getY() / 2), -Math.round(area.getZ() / 2)}; @@ -510,10 +519,6 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return housing.getWorldObj().getEntitiesWithinAABB(eClass, box); } - public static int wearsItems(final EntityPlayer player) { - return BeeManager.armorApiaristHelper.wearsItems(player, "", false); - } - @Override public String getUnlocalizedName() { return this.getUID(); @@ -521,16 +526,16 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { public static class Birthday { + private final int month; + private final int date; + private final String name; + private Birthday(final int month, final int date, final String name) { this.month = month; this.date = date + 1; this.name = name; } - private final int month; - private final int date; - private final String name; - public boolean isToday() { return Calendar.getInstance().get(Calendar.DATE) == this.date && Calendar.getInstance().get(Calendar.MONTH) == this.month; } @@ -538,6 +543,5 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { public String getName() { return this.name; } - } } diff --git a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java index bb03cf37..dadaca9c 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java +++ b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java @@ -19,6 +19,11 @@ public class FireworkCreator { public static class Firework { + boolean flicker; + boolean trail; + ArrayList colors; + byte shape; + public Firework() { this.flicker = false; this.trail = false; @@ -26,11 +31,6 @@ public class FireworkCreator { this.shape = 0; } - boolean flicker; - boolean trail; - ArrayList colors; - byte shape; - public void setFlicker() { this.flicker = true; } @@ -79,7 +79,5 @@ public class FireworkCreator { item.setTagCompound(var15); return item; } - } - } diff --git a/src/main/java/binnie/extrabees/init/BlockRegister.java b/src/main/java/binnie/extrabees/init/BlockRegister.java index 0df486e0..bc90ce38 100644 --- a/src/main/java/binnie/extrabees/init/BlockRegister.java +++ b/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -14,32 +14,29 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.apiculture.genetics.BeeDefinition; import net.minecraftforge.fml.common.registry.GameRegistry; -/** - * Created by Elec332 on 12-5-2017. - */ public final class BlockRegister { - public static void preInitBlocks(){ + public static void preInitBlocks() { registerHives(); registerMisc(); ExtraBees.alveary = ExtraBees.proxy.registerBlock(new BlockAlveary()); GameRegistry.registerTileEntity(TileEntityExtraBeesAlvearyPart.class, "TileEntityExtraBeesAlvearyPart"); } - public static void postInitBlocks(){ + public static void postInitBlocks() { registerHiveDrops(); } - private static void registerMisc(){ + private static void registerMisc() { GameRegistry.register(ExtraBees.ectoplasm = new BlockEctoplasm()); } @SuppressWarnings("all") - private static void registerHives(){ + private static void registerHives() { GameRegistry.register(ExtraBees.hive = new BlockExtraBeeHive()); } - private static void registerHiveDrops(){ + private static void registerHiveDrops() { IAlleleBeeSpecies valiantSpecies = Utils.getSpecies(BeeDefinition.VALIANT); EnumHiveType.Water.drops.add(new HiveDrop(ExtraBeesSpecies.WATER, 80)); EnumHiveType.Water.drops.add(new HiveDrop(valiantSpecies, 3)); @@ -55,5 +52,4 @@ public final class BlockRegister { //BuildCraftAPI.softBlocks.add(ExtraBees.hive); } } - } diff --git a/src/main/java/binnie/extrabees/init/FluidRegister.java b/src/main/java/binnie/extrabees/init/FluidRegister.java index 228746e6..1eef32b8 100644 --- a/src/main/java/binnie/extrabees/init/FluidRegister.java +++ b/src/main/java/binnie/extrabees/init/FluidRegister.java @@ -4,30 +4,26 @@ import binnie.extrabees.utils.ExtraBeesResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -/** - * Created by Elec332 on 12-5-2017. - */ public final class FluidRegister { //Fluids seem unused, //TODO: find out what they were used for public static Fluid acid, poison, liquid_nitrogen; - public static void preInitFluids(){ + public static void preInitFluids() { acid = createFluid("acid"); poison = createFluid("poison"); liquid_nitrogen = createFluid("liquidnitrogen"); } - private static Fluid createFluid(String name){ + private static Fluid createFluid(String name) { name = name.toLowerCase(); - Fluid ret = new Fluid(name, new ExtraBeesResourceLocation("blocks/liquids/" + name), new ExtraBeesResourceLocation("blocks/liquids/" + name)){ + Fluid ret = new Fluid(name, new ExtraBeesResourceLocation("blocks/liquids/" + name), new ExtraBeesResourceLocation("blocks/liquids/" + name)) { @Override public int getColor() { return 16777215; } - }; FluidRegistry.registerFluid(ret); return ret; @@ -97,6 +93,4 @@ public enum ExtraBeeLiquid implements ILiquidType { return this.colour; } }*/ - - } diff --git a/src/main/java/binnie/extrabees/init/ItemRegister.java b/src/main/java/binnie/extrabees/init/ItemRegister.java index fb92ea12..1badf262 100644 --- a/src/main/java/binnie/extrabees/init/ItemRegister.java +++ b/src/main/java/binnie/extrabees/init/ItemRegister.java @@ -4,7 +4,13 @@ import binnie.extrabees.ExtraBees; import binnie.extrabees.alveary.BlockAlveary; import binnie.extrabees.alveary.EnumAlvearyLogicType; import binnie.extrabees.blocks.type.EnumHiveType; -import binnie.extrabees.items.*; +import binnie.extrabees.items.ItemBeehive; +import binnie.extrabees.items.ItemHoneyComb; +import binnie.extrabees.items.ItemHoneyCrystal; +import binnie.extrabees.items.ItemHoneyCrystalEmpty; +import binnie.extrabees.items.ItemHoneyDrop; +import binnie.extrabees.items.ItemMiscProduct; +import binnie.extrabees.items.ItemPropolis; import binnie.extrabees.items.types.EnumHiveFrame; import binnie.extrabees.items.types.EnumHoneyComb; import binnie.extrabees.items.types.ExtraBeeItems; @@ -16,20 +22,17 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -/** - * Created by Elec332 on 12-5-2017. - */ public final class ItemRegister { - public static void preInitItems(){ + public static void preInitItems() { registerProducts(); registerMisc(); registerOreDict(); } @SuppressWarnings("all") - private static void registerMisc(){ - Item i = GameRegistry.register(new ItemBlock(ExtraBees.alveary){ + private static void registerMisc() { + Item i = GameRegistry.register(new ItemBlock(ExtraBees.alveary) { @Override public int getMetadata(int damage) { @@ -45,7 +48,6 @@ public final class ItemRegister { public boolean getHasSubtypes() { return true; } - }.setRegistryName(ExtraBees.alveary.getRegistryName())); for (int j = 0; j < EnumAlvearyLogicType.VALUES.length; j++) { ExtraBees.proxy.registerModel(i, j); @@ -61,7 +63,7 @@ public final class ItemRegister { } } - private static void registerProducts(){ + private static void registerProducts() { ExtraBees.honeyCrystal = new ItemHoneyCrystal("honey_crystal"); ExtraBees.honeyCrystalEmpty = new ItemHoneyCrystalEmpty("honey_crystal_empty"); ExtraBees.honeyDrop = new ItemHoneyDrop(); @@ -82,7 +84,7 @@ public final class ItemRegister { } } - private static void registerOreDict(){ + private static void registerOreDict() { OreDictionary.registerOre("ingotIron", Items.IRON_INGOT); OreDictionary.registerOre("ingotGold", Items.GOLD_INGOT); OreDictionary.registerOre("gemDiamond", Items.DIAMOND); @@ -97,5 +99,4 @@ public final class ItemRegister { OreDictionary.registerOre("gearWood", ExtraBeeItems.ScentedGear.get(1)); } - } diff --git a/src/main/java/binnie/extrabees/init/RecipeRegister.java b/src/main/java/binnie/extrabees/init/RecipeRegister.java index a7325569..0c12ec0c 100644 --- a/src/main/java/binnie/extrabees/init/RecipeRegister.java +++ b/src/main/java/binnie/extrabees/init/RecipeRegister.java @@ -5,7 +5,11 @@ import binnie.extrabees.alveary.EnumAlvearyLogicType; import binnie.extrabees.circuit.AlvearySimulatorCircuitType; import binnie.extrabees.circuit.BinnieCircuitLayout; import binnie.extrabees.circuit.BinnieCircuitSocketType; -import binnie.extrabees.items.types.*; +import binnie.extrabees.items.types.EnumHiveFrame; +import binnie.extrabees.items.types.EnumHoneyComb; +import binnie.extrabees.items.types.EnumHoneyDrop; +import binnie.extrabees.items.types.EnumPropolis; +import binnie.extrabees.items.types.ExtraBeeItems; import binnie.extrabees.utils.Utils; import forestry.api.circuits.ICircuitLayout; import forestry.api.recipes.RecipeManagers; @@ -21,12 +25,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; -/** - * Created by Elec332 on 12-5-2017. - */ public final class RecipeRegister { - public static void postInitRecipes(){ + public static void postInitRecipes() { GameRegistry.addRecipe(new ItemStack(ExtraBees.honeyCrystalEmpty), "#@#", "@#@", "#@#", '@', PluginApiculture.getItems().honeyDrop, '#', EnumHoneyDrop.ENERGY.get(1)); for (final EnumHoneyComb info : EnumHoneyComb.values()) { info.addRecipe(); @@ -43,7 +44,7 @@ public final class RecipeRegister { addAlvearyRecipes(); } - private static void addAlvearyRecipes(){ + private static void addAlvearyRecipes() { ItemStack alveary = PluginApiculture.getBlocks().getAlvearyBlock(BlockAlvearyType.PLAIN); Item thermionicTubes = PluginCore.getItems().tubes; Item chipsets = PluginCore.getItems().circuitboards; @@ -61,15 +62,15 @@ public final class RecipeRegister { } } - private static ItemStack getAlvearyPart(EnumAlvearyLogicType type){ + private static ItemStack getAlvearyPart(EnumAlvearyLogicType type) { return new ItemStack(ExtraBees.alveary, 1, type.ordinal()); } - private static void addForestryRecipes(){ + private static void addForestryRecipes() { RecipeManagers.carpenterManager.addRecipe(100, Utils.getFluidFromName("water", 2000), ItemStack.EMPTY, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); } - private static void addMiscItemRecipes(){ + private static void addMiscItemRecipes() { final ItemStack lapisShard = ExtraBeeItems.LapisShard.get(1); GameRegistry.addShapelessRecipe(new ItemStack(Items.DYE, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard); for (final ExtraBeeItems item : ExtraBeeItems.values()) { @@ -111,7 +112,5 @@ public final class RecipeRegister { gear = new ItemStack(woodGear, 1); } RecipeManagers.carpenterManager.addRecipe(100, Fluids.FOR_HONEY.getFluid(500), ItemStack.EMPTY, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', PluginApiculture.getItems().royalJelly, 'b', PluginCore.getItems().beeswax, 'p', PluginApiculture.getItems().pollenCluster, 'g', gear); - } - } diff --git a/src/main/java/binnie/extrabees/items/ItemBeehive.java b/src/main/java/binnie/extrabees/items/ItemBeehive.java index bea02da8..81418c1e 100644 --- a/src/main/java/binnie/extrabees/items/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/items/ItemBeehive.java @@ -37,5 +37,4 @@ public class ItemBeehive extends ItemBlock { public String getItemStackDisplayName(final ItemStack itemStack) { return EnumHiveType.values()[itemStack.getItemDamage()].toString() + " Hive"; } - } diff --git a/src/main/java/binnie/extrabees/items/ItemHiveFrame.java b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java index 95912261..d781dd2f 100644 --- a/src/main/java/binnie/extrabees/items/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java @@ -2,7 +2,11 @@ package binnie.extrabees.items; import binnie.extrabees.items.types.EnumHiveFrame; import binnie.extrabees.utils.ExtraBeesResourceLocation; -import forestry.api.apiculture.*; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; @@ -20,6 +24,8 @@ import java.util.List; public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IItemModelRegister { + private final EnumHiveFrame frame; + public ItemHiveFrame(final EnumHiveFrame frame) { this.frame = frame; this.setMaxDamage(frame.getMaxDamage()); @@ -28,8 +34,6 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt this.setUnlocalizedName("hive_frame"); } - private final EnumHiveFrame frame; - @Override public String getItemStackDisplayName(final ItemStack itemStack) { return this.frame.getName(); @@ -115,5 +119,4 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt public IBeeModifier getBeeModifier() { return this; } - } diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java index 6fda8840..b17ea958 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java @@ -264,5 +264,4 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { } } - } diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java b/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java index a1c3217a..00e6dfbe 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java @@ -7,6 +7,11 @@ import net.minecraft.item.ItemStack; public class ItemHoneyCrystal extends Item { + //TODO: Usage?? + private int maxCharge; + private int transferLimit; + private int tier; + public ItemHoneyCrystal(String name) { this.maxCharge = 8000; this.transferLimit = 500; @@ -19,14 +24,8 @@ public class ItemHoneyCrystal extends Item { ExtraBees.proxy.registerModel(this, 0); } - //TODO: Usage?? - private int maxCharge; - private int transferLimit; - private int tier; - @Override public String getItemStackDisplayName(final ItemStack i) { return ExtraBees.proxy.localise("item.honeycrystal"); } - } diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyCrystalEmpty.java b/src/main/java/binnie/extrabees/items/ItemHoneyCrystalEmpty.java index 2fc6ecbf..3e9c63ff 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyCrystalEmpty.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyCrystalEmpty.java @@ -16,5 +16,4 @@ public class ItemHoneyCrystalEmpty extends ItemHoneyCrystal { public String getItemStackDisplayName(final ItemStack i) { return ExtraBees.proxy.localise("item.honeycrystal.empty"); } - } diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java b/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java index 04bd96b6..c0833542 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java @@ -5,7 +5,6 @@ import forestry.api.core.Tabs; import forestry.core.items.IColoredItem; import net.minecraft.item.ItemStack; - public class ItemHoneyDrop extends ItemProduct implements IColoredItem { public ItemHoneyDrop() { @@ -13,7 +12,6 @@ public class ItemHoneyDrop extends ItemProduct implements IColoredItem { this.setCreativeTab(Tabs.tabApiculture); this.setUnlocalizedName("honey_drop"); setRegistryName("honey_drop"); - } @Override @@ -23,5 +21,4 @@ public class ItemHoneyDrop extends ItemProduct implements IColoredItem { } return EnumHoneyDrop.get(itemStack).getColour()[1]; } - } diff --git a/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java index 6e88c372..f1203c7f 100644 --- a/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java @@ -15,6 +15,22 @@ import java.util.List; public class ItemIndustrialFrame extends Item { + public ItemIndustrialFrame() { + this.setCreativeTab(CreativeTabs.MISC); + this.setMaxDamage(400); + this.setMaxStackSize(1); + this.setUnlocalizedName("industrialFrame"); + } + + @Nullable + public static IndustrialFrame getFrame(final ItemStack stack) { + NBTTagCompound tagCompound = stack.getTagCompound(); + if (tagCompound == null || !tagCompound.hasKey("frame")) { + return null; + } + return IndustrialFrame.values()[tagCompound.getInteger("frame")]; + } + @Override @SideOnly(Side.CLIENT) public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { @@ -43,21 +59,4 @@ public class ItemIndustrialFrame extends Item { public String getItemStackDisplayName(final ItemStack itemStack) { return "Industrial Frame"; } - - public ItemIndustrialFrame() { - this.setCreativeTab(CreativeTabs.MISC); - this.setMaxDamage(400); - this.setMaxStackSize(1); - this.setUnlocalizedName("industrialFrame"); - } - - @Nullable - public static IndustrialFrame getFrame(final ItemStack stack) { - NBTTagCompound tagCompound = stack.getTagCompound(); - if (tagCompound == null || !tagCompound.hasKey("frame")) { - return null; - } - return IndustrialFrame.values()[tagCompound.getInteger("frame")]; - } - } diff --git a/src/main/java/binnie/extrabees/items/ItemMiscProduct.java b/src/main/java/binnie/extrabees/items/ItemMiscProduct.java index 2795780d..d7677100 100644 --- a/src/main/java/binnie/extrabees/items/ItemMiscProduct.java +++ b/src/main/java/binnie/extrabees/items/ItemMiscProduct.java @@ -15,9 +15,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -/** - * Created by Elec332 on 13-5-2017. - */ public class ItemMiscProduct extends ItemProduct { public ItemMiscProduct(CreativeTabs tab, IEBItemMiscProvider[] types) { @@ -41,5 +38,4 @@ public class ItemMiscProduct extends ItemProduct { ModelLoader.setCustomModelResourceLocation(item, type.ordinal(), new ModelResourceLocation(new ExtraBeesResourceLocation("misc/" + ((IEBItemMiscProvider) type).getModelPath()), "inventory")); } } - } diff --git a/src/main/java/binnie/extrabees/items/ItemProduct.java b/src/main/java/binnie/extrabees/items/ItemProduct.java index c0caefc3..7ab50699 100644 --- a/src/main/java/binnie/extrabees/items/ItemProduct.java +++ b/src/main/java/binnie/extrabees/items/ItemProduct.java @@ -14,6 +14,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemProduct extends Item implements IItemModelRegister { + protected IEBEnumItem[] types; + public ItemProduct(final IEBEnumItem[] types) { this.setMaxStackSize(64); this.setMaxDamage(0); @@ -21,8 +23,6 @@ public class ItemProduct extends Item implements IItemModelRegister { this.types = types; } - protected IEBEnumItem[] types; - public IEBEnumItem get(final ItemStack stack) { final int i = stack.getItemDamage(); if (i >= 0 && i < this.types.length) { @@ -53,5 +53,4 @@ public class ItemProduct extends Item implements IItemModelRegister { ModelLoader.setCustomModelResourceLocation(item, type.ordinal(), new ModelResourceLocation(getRegistryName(), "inventory")); } } - } diff --git a/src/main/java/binnie/extrabees/items/ItemPropolis.java b/src/main/java/binnie/extrabees/items/ItemPropolis.java index 23469ff5..8913bdab 100644 --- a/src/main/java/binnie/extrabees/items/ItemPropolis.java +++ b/src/main/java/binnie/extrabees/items/ItemPropolis.java @@ -21,5 +21,4 @@ public class ItemPropolis extends ItemProduct implements IColoredItem { } return EnumPropolis.get(itemStack).colour[1]; } - } diff --git a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java index 00ba4f93..52245164 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java @@ -5,7 +5,11 @@ import binnie.extrabees.items.ItemHiveFrame; import binnie.extrabees.utils.BeeModifierLogic; import binnie.extrabees.utils.EnumBeeBooleanModifier; import binnie.extrabees.utils.EnumBeeModifier; -import forestry.api.apiculture.*; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; import forestry.apiculture.PluginApiculture; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -27,6 +31,20 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { Clay, Debug; + private final Item item; + private final int maxDamage; + private final BeeModifierLogic logic; + + EnumHiveFrame() { + this(240); + } + + EnumHiveFrame(int maxDamage) { + this.maxDamage = maxDamage; + this.logic = new BeeModifierLogic(); + this.item = new ItemHiveFrame(this).setRegistryName("hive_frame." + name().toLowerCase()); + } + public static void init() { EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.Lifespan, 0.75f, 0.25f); EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.Production, 1.5f, 5.0f); @@ -47,20 +65,6 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Clay.item), " c ", "cFc", " c ", 'F', impregnatedFrame, 'c', Items.CLAY_BALL); } - EnumHiveFrame() { - this(240); - } - - EnumHiveFrame(int maxDamage) { - this.maxDamage = maxDamage; - this.logic = new BeeModifierLogic(); - this.item = new ItemHiveFrame(this).setRegistryName("hive_frame." + name().toLowerCase()); - } - - private final Item item; - private final int maxDamage; - private final BeeModifierLogic logic; - public int getIconIndex() { return 55 + this.ordinal(); } diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java index 8cd986f4..9560d451 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java @@ -101,6 +101,11 @@ public enum EnumHoneyComb implements IEBEnumItem { CYANITE(2564173, 34541), BLUTONIUM(2564173, 1769702); + public int[] colour; + public Map products; + public boolean active; + public boolean deprecated; + EnumHoneyComb() { this(16777215, 16777215); this.active = false; @@ -115,10 +120,13 @@ public enum EnumHoneyComb implements IEBEnumItem { this.colour = new int[]{colour, colour2}; } - public int[] colour; - public Map products; - public boolean active; - public boolean deprecated; + public static EnumHoneyComb get(final ItemStack itemStack) { + final int i = itemStack.getItemDamage(); + if (i >= 0 && i < values().length) { + return values()[i]; + } + return values()[0]; + } public void addRecipe() { RecipeManagers.centrifugeManager.addRecipe(20, this.get(1), this.products); @@ -129,14 +137,6 @@ public enum EnumHoneyComb implements IEBEnumItem { return this.active; } - public static EnumHoneyComb get(final ItemStack itemStack) { - final int i = itemStack.getItemDamage(); - if (i >= 0 && i < values().length) { - return values()[i]; - } - return values()[0]; - } - @Override public ItemStack get(final int size) { return new ItemStack(ExtraBees.comb, size, this.ordinal()); @@ -147,7 +147,7 @@ public enum EnumHoneyComb implements IEBEnumItem { return ExtraBees.proxy.localise("item.comb." + this.name().toLowerCase()); } - public boolean addProduct(@Nullable Item item, final Float chance){ + public boolean addProduct(@Nullable Item item, final Float chance) { return addProduct(new ItemStack(Objects.firstNonNull(item, Item.getItemFromBlock(Blocks.AIR))), chance); } diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java index 5aef2ae1..d0ae205e 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java @@ -39,6 +39,10 @@ public enum EnumHoneyDrop implements IEBEnumItem { MAGENTA(15040472, 16711884, "for.honey"), LIGHTGRAY(10066329, 13224393, "for.honey"); + private int[] colour; + private String liquidName; + private ItemStack remnant; + EnumHoneyDrop() { this(16777215, 16777215, ""); } @@ -49,9 +53,13 @@ public enum EnumHoneyDrop implements IEBEnumItem { this.liquidName = liquid; } - private int[] colour; - private String liquidName; - private ItemStack remnant; + public static EnumHoneyDrop get(final ItemStack itemStack) { + final int i = itemStack.getItemDamage(); + if (i >= 0 && i < values().length) { + return values()[i]; + } + return values()[0]; + } public void addRemnant(final ItemStack stack) { this.remnant = stack; @@ -69,14 +77,6 @@ public enum EnumHoneyDrop implements IEBEnumItem { return !this.remnant.isEmpty() && FluidRegistry.isFluidRegistered(this.getLiquidName()); } - public static EnumHoneyDrop get(final ItemStack itemStack) { - final int i = itemStack.getItemDamage(); - if (i >= 0 && i < values().length) { - return values()[i]; - } - return values()[0]; - } - @Override public ItemStack get(final int size) { return new ItemStack(ExtraBees.honeyDrop, size, this.ordinal()); diff --git a/src/main/java/binnie/extrabees/items/types/EnumPropolis.java b/src/main/java/binnie/extrabees/items/types/EnumPropolis.java index 6accc012..f66a62aa 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/items/types/EnumPropolis.java @@ -18,6 +18,10 @@ public enum EnumPropolis implements IEBEnumItem { GLACIAL, PEAT; + public int[] colour; + public String liquidName; + public boolean active; + EnumPropolis() { this(16777215, 16777215, ""); this.active = false; @@ -30,9 +34,13 @@ public enum EnumPropolis implements IEBEnumItem { this.liquidName = liquid; } - public int[] colour; - public String liquidName; - public boolean active; + public static EnumPropolis get(final ItemStack itemStack) { + final int i = itemStack.getItemDamage(); + if (i >= 0 && i < values().length) { + return values()[i]; + } + return values()[0]; + } public void addRecipe() { final FluidStack liquid = Utils.getFluidFromName(this.liquidName, 500); @@ -46,14 +54,6 @@ public enum EnumPropolis implements IEBEnumItem { return this.active && Utils.getFluidFromName(this.liquidName, 100) != null; } - public static EnumPropolis get(final ItemStack itemStack) { - final int i = itemStack.getItemDamage(); - if (i >= 0 && i < values().length) { - return values()[i]; - } - return values()[0]; - } - @Override public ItemStack get(final int size) { return new ItemStack(ExtraBees.propolis, size, this.ordinal()); diff --git a/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java b/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java index 4fd5243c..fcd2364b 100644 --- a/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java @@ -40,11 +40,26 @@ public enum ExtraBeeItems implements IEBItemMiscProvider { BlutoniumDust("Blutonium Grains", "blutonium_dust"), CyaniteDust("Cyanite Grains", "cyanite_dust"); - ExtraBeeItems(String name, String modelPath) { - this.metalString = null; - this.gemString = null; - this.name = name; - this.modelPath = modelPath; + static { + ExtraBeeItems.TinDust.setMetal("Tin"); + ExtraBeeItems.ZincDust.setMetal("Zinc"); + ExtraBeeItems.CopperDust.setMetal("Copper"); + ExtraBeeItems.IronDust.setMetal("Iron"); + ExtraBeeItems.NickelDust.setMetal("Nickel"); + ExtraBeeItems.LeadDust.setMetal("Lead"); + ExtraBeeItems.SilverDust.setMetal("Silver"); + ExtraBeeItems.GoldDust.setMetal("Gold"); + ExtraBeeItems.PlatinumDust.setMetal("Platinum"); + ExtraBeeItems.TungstenDust.setMetal("Tungsten"); + ExtraBeeItems.TitaniumDust.setMetal("Titanium"); + ExtraBeeItems.CoalDust.setMetal("Coal"); + ExtraBeeItems.YelloriumDust.setMetal("Yellorium"); + ExtraBeeItems.BlutoniumDust.setMetal("Blutonium"); + ExtraBeeItems.CyaniteDust.setMetal("Cyanite"); + ExtraBeeItems.DiamondShard.setGem("Diamond"); + ExtraBeeItems.EmeraldShard.setGem("Emerald"); + ExtraBeeItems.RubyShard.setGem("Ruby"); + ExtraBeeItems.SapphireShard.setGem("Sapphire"); } public final String name; @@ -54,6 +69,13 @@ public enum ExtraBeeItems implements IEBItemMiscProvider { @Nullable public String gemString; + ExtraBeeItems(String name, String modelPath) { + this.metalString = null; + this.gemString = null; + this.name = name; + this.modelPath = modelPath; + } + private void setGem(final String string) { this.gemString = string; } @@ -89,26 +111,4 @@ public enum ExtraBeeItems implements IEBItemMiscProvider { return modelPath; } - static { - ExtraBeeItems.TinDust.setMetal("Tin"); - ExtraBeeItems.ZincDust.setMetal("Zinc"); - ExtraBeeItems.CopperDust.setMetal("Copper"); - ExtraBeeItems.IronDust.setMetal("Iron"); - ExtraBeeItems.NickelDust.setMetal("Nickel"); - ExtraBeeItems.LeadDust.setMetal("Lead"); - ExtraBeeItems.SilverDust.setMetal("Silver"); - ExtraBeeItems.GoldDust.setMetal("Gold"); - ExtraBeeItems.PlatinumDust.setMetal("Platinum"); - ExtraBeeItems.TungstenDust.setMetal("Tungsten"); - ExtraBeeItems.TitaniumDust.setMetal("Titanium"); - ExtraBeeItems.CoalDust.setMetal("Coal"); - ExtraBeeItems.YelloriumDust.setMetal("Yellorium"); - ExtraBeeItems.BlutoniumDust.setMetal("Blutonium"); - ExtraBeeItems.CyaniteDust.setMetal("Cyanite"); - ExtraBeeItems.DiamondShard.setGem("Diamond"); - ExtraBeeItems.EmeraldShard.setGem("Emerald"); - ExtraBeeItems.RubyShard.setGem("Ruby"); - ExtraBeeItems.SapphireShard.setGem("Sapphire"); - } - } diff --git a/src/main/java/binnie/extrabees/items/types/IEBEnumItem.java b/src/main/java/binnie/extrabees/items/types/IEBEnumItem.java index ea014ea6..5f497f49 100644 --- a/src/main/java/binnie/extrabees/items/types/IEBEnumItem.java +++ b/src/main/java/binnie/extrabees/items/types/IEBEnumItem.java @@ -2,9 +2,6 @@ package binnie.extrabees.items.types; import net.minecraft.item.ItemStack; -/** - * Created by Elec332 on 12-5-2017. - */ public interface IEBEnumItem { boolean isActive(); @@ -16,5 +13,4 @@ public interface IEBEnumItem { ItemStack get(final int p0); String name(); - } diff --git a/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java b/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java index a383c614..9573bc55 100644 --- a/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java +++ b/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java @@ -2,13 +2,9 @@ package binnie.extrabees.items.types; import java.util.List; -/** - * Created by Elec332 on 13-5-2017. - */ public interface IEBItemMiscProvider extends IEBEnumItem { void addInformation(List tooltip); String getModelPath(); - } diff --git a/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java b/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java index 595faabd..b5989872 100644 --- a/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java +++ b/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java @@ -27,6 +27,25 @@ public enum IndustrialFrame implements IBeeModifier { NetherStar("Immortality Gate", 12, 50), Poison("Mortality Inhibitor", 8, 18); + static { + IndustrialFrame.Light.lighted = true; + IndustrialFrame.Rain.rain = true; + IndustrialFrame.Sunlight.lighted = true; + IndustrialFrame.Sunlight.sunlight = true; + IndustrialFrame.Soul.mutationMod = 1.3f; + IndustrialFrame.Uranium.mutationMod = 2.0f; + IndustrialFrame.Cage.territoryMod = 0.4f; + IndustrialFrame.Freedom.territoryMod = 1.4f; + IndustrialFrame.Honey.productionMod = 1.4f; + IndustrialFrame.Jelly.productionMod = 1.8f; + IndustrialFrame.Leaf.floweringMod = 1.4f; + IndustrialFrame.Pollen.floweringMod = 2.0f; + IndustrialFrame.Clay.lifespanMod = 1.4f; + IndustrialFrame.Emerald.lifespanMod = 2.0f; + IndustrialFrame.NetherStar.lifespanMod = 20.0f; + IndustrialFrame.Poison.lifespanMod = 0.5f; + } + String name; float territoryMod; float mutationMod; @@ -123,23 +142,4 @@ public enum IndustrialFrame implements IBeeModifier { return 1.0f; } - static { - IndustrialFrame.Light.lighted = true; - IndustrialFrame.Rain.rain = true; - IndustrialFrame.Sunlight.lighted = true; - IndustrialFrame.Sunlight.sunlight = true; - IndustrialFrame.Soul.mutationMod = 1.3f; - IndustrialFrame.Uranium.mutationMod = 2.0f; - IndustrialFrame.Cage.territoryMod = 0.4f; - IndustrialFrame.Freedom.territoryMod = 1.4f; - IndustrialFrame.Honey.productionMod = 1.4f; - IndustrialFrame.Jelly.productionMod = 1.8f; - IndustrialFrame.Leaf.floweringMod = 1.4f; - IndustrialFrame.Pollen.floweringMod = 2.0f; - IndustrialFrame.Clay.lifespanMod = 1.4f; - IndustrialFrame.Emerald.lifespanMod = 2.0f; - IndustrialFrame.NetherStar.lifespanMod = 20.0f; - IndustrialFrame.Poison.lifespanMod = 0.5f; - } - } diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java index 6bfcc23f..9a59a11e 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java @@ -23,13 +23,27 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import javax.annotation.Nonnull; import javax.annotation.Nullable; -/** - * Created by Elec332 on 12-5-2017. - */ public class ExtraBeesClientProxy extends ExtraBeesCommonProxy { private static final ModelManager modelManager = ModelManager.getInstance(); + private static IBakedModel bakeModelFor(Block block) { + return new BlankModel() { + + @Override + protected ItemOverrideList createOverrides() { + return new ItemOverrideList(ImmutableList.of()) { + + @Override + @SuppressWarnings("deprecation") + public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) { + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(block.getStateFromMeta(stack.getMetadata())); + } + }; + } + }; + } + @Override public Block registerBlock(Block block) { modelManager.registerBlockClient(block); @@ -49,34 +63,14 @@ public class ExtraBeesClientProxy extends ExtraBeesCommonProxy { } @SubscribeEvent - public void onModelsBaked(ModelBakeEvent event){ + public void onModelsBaked(ModelBakeEvent event) { IRegistry registry = event.getModelRegistry(); registerItemBlockLink(new ExtraBeesResourceLocation("alveary"), ExtraBees.alveary, registry); registerItemBlockLink(new ExtraBeesResourceLocation("ectoplasm"), ExtraBees.ectoplasm, registry); registerItemBlockLink(new ExtraBeesResourceLocation("hive"), ExtraBees.hive, registry); } - private void registerItemBlockLink(ResourceLocation item, Block block, IRegistry registry){ + private void registerItemBlockLink(ResourceLocation item, Block block, IRegistry registry) { registry.putObject(new ModelResourceLocation(item, "inventory"), bakeModelFor(block)); } - - private static IBakedModel bakeModelFor(Block block){ - return new BlankModel() { - - @Override - protected ItemOverrideList createOverrides() { - return new ItemOverrideList(ImmutableList.of()){ - - @Override - @SuppressWarnings("deprecation") - public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) { - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(block.getStateFromMeta(stack.getMetadata())); - } - - }; - } - - }; - } - } diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java index 7ae07fb4..954bb252 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java @@ -6,28 +6,24 @@ import net.minecraft.item.Item; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.GameRegistry; -/** - * Created by Elec332 on 12-5-2017. - */ public class ExtraBeesCommonProxy { public void registerBeeModel(ExtraBeesSpecies type) { } - public Block registerBlock(Block block){ + public Block registerBlock(Block block) { return GameRegistry.register(block); } - public Item registerItem(Item item){ + public Item registerItem(Item item) { return GameRegistry.register(item); } @SuppressWarnings("deprecation") - public String localise(String s){ + public String localise(String s) { return I18n.translateToLocal(s); } public void registerModel(Item item, int meta) { } - } diff --git a/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java b/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java index 235797d0..a46baafb 100644 --- a/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java +++ b/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java @@ -13,9 +13,6 @@ import java.util.List; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; -/** - * Created by Elec332 on 13-5-2017. - */ public class AlvearyMutationHandler { private static final List> MUTATIONS = new ArrayList<>(); @@ -36,7 +33,7 @@ public class AlvearyMutationHandler { return 1.0f; } - public static void addMutationItem(@Nullable Item item, float chance){ + public static void addMutationItem(@Nullable Item item, float chance) { addMutationItem(new ItemStack(firstNonNull(item, Item.getItemFromBlock(Blocks.AIR))), chance); } @@ -51,5 +48,4 @@ public class AlvearyMutationHandler { public static List> getMutagens() { return Collections.unmodifiableList(MUTATIONS); } - } diff --git a/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java b/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java index fd356a2c..0c6a5853 100644 --- a/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java +++ b/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java @@ -13,14 +13,14 @@ import java.util.Map; public class BeeModifierLogic { + private Map modifiers; + private List booleanModifiers; + public BeeModifierLogic() { this.modifiers = new HashMap<>(); this.booleanModifiers = new ArrayList<>(); } - private Map modifiers; - private List booleanModifiers; - public float getModifier(final EnumBeeModifier modifier, final float currentModifier) { if (!this.modifiers.containsKey(modifier)) { return 1.0f; @@ -71,5 +71,4 @@ public class BeeModifierLogic { tooltip.add(modifierName + ": " + valueString); } } - } diff --git a/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java b/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java index 7faf130e..3f90a1df 100644 --- a/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java +++ b/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java @@ -3,13 +3,9 @@ package binnie.extrabees.utils; import binnie.extrabees.ExtraBees; import net.minecraft.util.ResourceLocation; -/** - * Created by Elec332 on 12-5-2017. - */ public class ExtraBeesResourceLocation extends ResourceLocation { public ExtraBeesResourceLocation(String resourceName) { super(ExtraBees.MODID, resourceName); } - } diff --git a/src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java b/src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java index 28d23b54..c1c61840 100644 --- a/src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java +++ b/src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java @@ -6,9 +6,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** - * Created by Elec332 on 14-5-2017. - */ @Nonnull @TypeQualifierDefault(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/binnie/extrabees/utils/HiveDrop.java b/src/main/java/binnie/extrabees/utils/HiveDrop.java index 805632ab..781aaeba 100644 --- a/src/main/java/binnie/extrabees/utils/HiveDrop.java +++ b/src/main/java/binnie/extrabees/utils/HiveDrop.java @@ -11,6 +11,10 @@ import net.minecraft.world.IBlockAccess; public class HiveDrop implements IHiveDrop { + private IAllele[] template; + private NonNullList extra; + private int chance; + public HiveDrop(final IAlleleBeeSpecies species, final int chance) { this(Utils.getBeeRoot().getTemplate(species), NonNullList.create(), chance); } @@ -21,10 +25,6 @@ public class HiveDrop implements IHiveDrop { this.chance = chance; } - private IAllele[] template; - private NonNullList extra; - private int chance; - @Override public NonNullList getExtraItems(IBlockAccess world, BlockPos pos, int fortune) { final NonNullList ret = NonNullList.create(); @@ -48,5 +48,4 @@ public class HiveDrop implements IHiveDrop { public IBee getBeeType(IBlockAccess world, BlockPos pos) { return Utils.getBeeRoot().getBee(Utils.getBeeRoot().templateAsGenome(this.template)); } - } diff --git a/src/main/java/binnie/extrabees/utils/MaterialBeehive.java b/src/main/java/binnie/extrabees/utils/MaterialBeehive.java index 961aeb43..1b255910 100644 --- a/src/main/java/binnie/extrabees/utils/MaterialBeehive.java +++ b/src/main/java/binnie/extrabees/utils/MaterialBeehive.java @@ -15,5 +15,4 @@ public class MaterialBeehive extends Material { public boolean isOpaque() { return true; } - } diff --git a/src/main/java/binnie/extrabees/utils/Utils.java b/src/main/java/binnie/extrabees/utils/Utils.java index 1b12fa2c..aebab3c1 100644 --- a/src/main/java/binnie/extrabees/utils/Utils.java +++ b/src/main/java/binnie/extrabees/utils/Utils.java @@ -19,36 +19,33 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import javax.annotation.Nullable; -/** - * Created by Elec332 on 12-5-2017. - */ public class Utils { public static IBeeRoot getBeeRoot() { return BeeManager.beeRoot; } - public static IAlleleBeeSpecies getSpecies(BeeDefinition species){ + public static IAlleleBeeSpecies getSpecies(BeeDefinition species) { return species.getGenome().getPrimary(); } @Nullable - public static Item getIC2Item(String name){ + public static Item getIC2Item(String name) { return getModItem("ic2", name); } @Nullable - public static Item getBotaniaItem(String name){ + public static Item getBotaniaItem(String name) { return getModItem("botania", name); } @Nullable - public static Block getBotaniaBlock(String name){ + public static Block getBotaniaBlock(String name) { ResourceLocation key = new ResourceLocation("botania", name); return ForgeRegistries.BLOCKS.containsKey(key) ? ForgeRegistries.BLOCKS.getValue(key) : null; } - private static Item getModItem(String mod, String name){ + private static Item getModItem(String mod, String name) { ResourceLocation key = new ResourceLocation(mod, name); return ForgeRegistries.ITEMS.containsKey(key) ? ForgeRegistries.ITEMS.getValue(key) : null; } @@ -72,8 +69,7 @@ public class Utils { return null; } - public static FluidStack getFluidFromName(String name, int amount){ + public static FluidStack getFluidFromName(String name, int amount) { return FluidRegistry.getFluidStack(name.toLowerCase(), amount); } - } diff --git a/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java b/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java index 333f363f..f4d2f95c 100644 --- a/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java +++ b/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java @@ -7,33 +7,29 @@ import net.minecraftforge.common.config.Configuration; import java.io.File; import java.util.Set; -/** - * Created by Elec332 on 12-5-2017. - */ public class ConfigHandler { - public ConfigHandler(File location){ - config = new Configuration(location); - configurables = Sets.newHashSet(); - } - - public boolean addConfigurable(IConfigurable configurable){ - return configurables.add(Preconditions.checkNotNull(configurable)); - } - - public void reload(boolean load){ - if (load){ - config.load(); - } - for (IConfigurable configurable : configurables){ - configurable.configure(config); - } - if (config.hasChanged()){ - config.save(); - } - } - private final Configuration config; private final Set configurables; + public ConfigHandler(File location) { + config = new Configuration(location); + configurables = Sets.newHashSet(); + } + + public boolean addConfigurable(IConfigurable configurable) { + return configurables.add(Preconditions.checkNotNull(configurable)); + } + + public void reload(boolean load) { + if (load) { + config.load(); + } + for (IConfigurable configurable : configurables) { + configurable.configure(config); + } + if (config.hasChanged()) { + config.save(); + } + } } diff --git a/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java b/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java index 386b425a..15e1249c 100644 --- a/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java +++ b/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java @@ -2,19 +2,13 @@ package binnie.extrabees.utils.config; import net.minecraftforge.common.config.Configuration; -/** - * Created by Elec332 on 12-5-2017. - */ public class ConfigurationMain implements IConfigurable { + private static final String WORLDGEN = "World-Gen"; public static boolean canQuarryMineHives = true; - public static int waterHiveRate = 1; - public static int rockHiveRate = 2; - public static int netherHiveRate = 2; - public static int marbleHiveRate = 2; @Override @@ -27,7 +21,4 @@ public class ConfigurationMain implements IConfigurable { netherHiveRate = config.getInt("netherHiveRate", WORLDGEN, 2, 0, 10, "Sets the worldgen spawn chance for nether hives."); marbleHiveRate = config.getInt("marbleHiveRate", WORLDGEN, 2, 0, 10, "Sets the worldgen spawn chance for marble hives."); } - - private static final String WORLDGEN = "World-Gen"; - } diff --git a/src/main/java/binnie/extrabees/utils/config/IConfigurable.java b/src/main/java/binnie/extrabees/utils/config/IConfigurable.java index c1c2fb1f..23fb940b 100644 --- a/src/main/java/binnie/extrabees/utils/config/IConfigurable.java +++ b/src/main/java/binnie/extrabees/utils/config/IConfigurable.java @@ -2,11 +2,7 @@ package binnie.extrabees.utils.config; import net.minecraftforge.common.config.Configuration; -/** - * Created by Elec332 on 12-5-2017. - */ public interface IConfigurable { - public void configure(Configuration config); - + void configure(Configuration config); } diff --git a/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java b/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java index 64f8fa34..c177f1be 100644 --- a/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java +++ b/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java @@ -9,9 +9,6 @@ import net.minecraftforge.fml.common.IWorldGenerator; import java.util.Random; -/** - * Created by Elec332 on 12-5-2017. - */ public class ExtraBeesWorldGenerator implements IWorldGenerator { @Override @@ -36,7 +33,5 @@ public class ExtraBeesWorldGenerator implements IWorldGenerator { final int randPosZ = chunkZ + rand.nextInt(16); new WorldGenHiveNether().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ)); } - } - } diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java index fe1c8fa1..542b7921 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java @@ -29,18 +29,17 @@ public class WorldGenHiveNether extends WorldGenerator { } public boolean embedInWall(final World world, final Block blockID, final BlockPos pos) { - if (world.getBlockState(pos).getBlock() != blockID){ + if (world.getBlockState(pos).getBlock() != blockID) { return false; } - for (EnumFacing facing : EnumFacing.VALUES){ - if (facing.getAxis() == EnumFacing.Axis.Y && world.getBlockState(pos.up()).getBlock() != blockID){ + for (EnumFacing facing : EnumFacing.VALUES) { + if (facing.getAxis() == EnumFacing.Axis.Y && world.getBlockState(pos.up()).getBlock() != blockID) { return false; } - if (world.isAirBlock(pos.offset(facing))){ + if (world.isAirBlock(pos.offset(facing))) { return true; } } return false; } - } diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java index 604e02f8..f42f877b 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java @@ -1,6 +1,5 @@ package binnie.extrabees.worldgen; - import binnie.extrabees.ExtraBees; import binnie.extrabees.blocks.BlockExtraBeeHive; import binnie.extrabees.blocks.type.EnumHiveType; @@ -26,5 +25,4 @@ public class WorldGenHiveRock extends WorldGenerator { } return true; } - } diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java index 71140927..5077a3a5 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java @@ -27,5 +27,4 @@ public class WorldGenHiveWater extends WorldGenerator { } return true; } - } diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index ae0a02c6..8b6deddc 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -59,7 +59,7 @@ public class ExtraTrees extends AbstractMod { @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer") public static Proxy proxy; - + @Nullable private static ModuleBlocks blocks; @Nullable @@ -72,11 +72,41 @@ public class ExtraTrees extends AbstractMod { private static ModuleMachine machine; @Nullable private static ModuleKitchen kitchen; - + public ExtraTrees() { MinecraftForge.EVENT_BUS.register(ModuleGenetics.class); } + public static ModuleItems items() { + Preconditions.checkState(items != null); + return items; + } + + public static ModuleBlocks blocks() { + Preconditions.checkState(blocks != null); + return blocks; + } + + public static ModuleAlcohol alcohol() { + Preconditions.checkState(alcohol != null); + return alcohol; + } + + public static ModuleCarpentry carpentry() { + Preconditions.checkState(carpentry != null); + return carpentry; + } + + public static ModuleMachine machine() { + Preconditions.checkState(machine != null); + return machine; + } + + public static ModuleKitchen getKitchen() { + Preconditions.checkState(kitchen != null); + return kitchen; + } + @Mod.EventHandler public void onConstruction(FMLConstructionEvent e) { MinecraftForge.EVENT_BUS.register(this); @@ -97,37 +127,6 @@ public class ExtraTrees extends AbstractMod { this.postInit(); } - public static ModuleItems items() { - Preconditions.checkState(items != null); - return items; - } - - public static ModuleBlocks blocks() { - Preconditions.checkState(blocks != null); - return blocks; - } - - public static ModuleAlcohol alcohol() { - Preconditions.checkState(alcohol != null); - return alcohol; - } - - - public static ModuleCarpentry carpentry() { - Preconditions.checkState(carpentry != null); - return carpentry; - } - - public static ModuleMachine machine() { - Preconditions.checkState(machine != null); - return machine; - } - - public static ModuleKitchen getKitchen() { - Preconditions.checkState(kitchen != null); - return kitchen; - } - @Override protected void registerModules() { this.addModule(blocks = new ModuleBlocks()); @@ -164,13 +163,13 @@ public class ExtraTrees extends AbstractMod { public String getModID() { return Constants.EXTRA_TREES_MOD_ID; } - + @SubscribeEvent public void speciesRegister(AlleleSpeciesRegisterEvent event) { if (event.getRoot() instanceof ITreeRoot) { ETTreeDefinition.preInitTrees(); PlankType.ExtraTreePlanks.initWoodTypes(); - }else if(event.getRoot() instanceof IButterflyRoot && BinnieCore.isLepidopteryActive()) { + } else if (event.getRoot() instanceof IButterflyRoot && BinnieCore.isLepidopteryActive()) { ButterflySpecies.preInit(); } } @@ -185,19 +184,13 @@ public class ExtraTrees extends AbstractMod { return BinnieCore.isExtraTreesActive(); } - public static class PacketHandler extends BinniePacketHandler { - public PacketHandler() { - super(ExtraTrees.instance); - } - } - @SubscribeEvent @SideOnly(Side.CLIENT) public void onBakedEvent(ModelBakeEvent e) { //Find all ExtraTrees saplings List models = e.getModelRegistry().getKeys().stream() - .filter(mrl -> mrl.getResourceDomain().startsWith(Constants.EXTRA_TREES_MOD_ID)) - .filter(mrl -> mrl.getResourcePath().startsWith("germlings")).collect(Collectors.toList()); + .filter(mrl -> mrl.getResourceDomain().startsWith(Constants.EXTRA_TREES_MOD_ID)) + .filter(mrl -> mrl.getResourcePath().startsWith("germlings")).collect(Collectors.toList()); //Replace model Map map = Arrays.stream(ETTreeDefinition.values()).collect(Collectors.toMap(o -> o.name().toLowerCase(), o -> o)); models.forEach(model -> { @@ -207,9 +200,8 @@ public class ExtraTrees extends AbstractMod { int secondaryColor = treeSpecies.getWoodColor().getRGB(); e.getModelRegistry().putObject(model, new DoublePassBakedModel(e.getModelRegistry().getObject(model), primaryColor, secondaryColor)); }); - } - + @SubscribeEvent @SideOnly(Side.CLIENT) public void registerSprites(TextureStitchEvent.Pre event) { @@ -217,15 +209,20 @@ public class ExtraTrees extends AbstractMod { sprite.registerSprites(); } TextureMap map = Minecraft.getMinecraft().getTextureMapBlocks(); - for(IPlankType type : PlankType.ExtraTreePlanks.VALUES){ + for (IPlankType type : PlankType.ExtraTreePlanks.VALUES) { type.registerSprites(map); } - for(IPlankType type : PlankType.ForestryPlanks.values()){ + for (IPlankType type : PlankType.ForestryPlanks.values()) { type.registerSprites(map); } - for(IPlankType type : PlankType.VanillaPlanks.values()){ + for (IPlankType type : PlankType.VanillaPlanks.values()) { type.registerSprites(map); } } + public static class PacketHandler extends BinniePacketHandler { + public PacketHandler() { + super(ExtraTrees.instance); + } + } } diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/src/main/java/binnie/extratrees/alcohol/Alcohol.java index 71f21006..7f643491 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -42,6 +42,28 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { Rye("mash.rye", 10836007, 0.9, 0.05), Corn("mash.corn", 13411364, 0.9, 0.05); + static { + Alcohol.Apple.setFementation(Juice.Apple); + Alcohol.Apricot.setFementation(Juice.Apricot); + Alcohol.Banana.setFementation(Juice.Banana); + Alcohol.Cherry.setFementation(Juice.Cherry); + Alcohol.Elderberry.setFementation(Juice.Elderberry); + Alcohol.Peach.setFementation(Juice.Peach); + Alcohol.Pear.setFementation(Juice.Pear); + Alcohol.Plum.setFementation(Juice.Plum); + Alcohol.Carrot.setFementation(Juice.Carrot); + Alcohol.WhiteWine.setFementation(Juice.WhiteGrape); + Alcohol.RedWine.setFementation(Juice.RedGrape); + Alcohol.Citrus.setFementation(Juice.Lemon); + Alcohol.Citrus.setFementation(Juice.Lime); + Alcohol.Citrus.setFementation(Juice.Orange); + Alcohol.Citrus.setFementation(Juice.Grapefruit); + Alcohol.Tomato.setFementation(Juice.Tomato); + Alcohol.Cranberry.setFementation(Juice.Cranberry); + Alcohol.Pineapple.setFementation(Juice.Pineapple); + Alcohol.Potato.setFementation("cropPotato"); + } + List fermentationLiquid; String fermentationSolid; String ident; @@ -49,14 +71,6 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { float transparency; float abv; - private void setFementation(final Juice juice) { - this.fermentationLiquid.add(juice.getIdentifier()); - } - - private void setFementation(final String oreDict) { - this.fermentationSolid = oreDict; - } - Alcohol(final String ident, final int colour, final double transparency, final double abv) { this.fermentationLiquid = new ArrayList<>(); this.fermentationSolid = ""; @@ -66,6 +80,14 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { this.abv = (float) abv; } + private void setFementation(final Juice juice) { + this.fermentationLiquid.add(juice.getIdentifier()); + } + + private void setFementation(final String oreDict) { + this.fermentationSolid = oreDict; + } + @Override public String toString() { return this.getDisplayName(); @@ -130,26 +152,4 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { public float getABV() { return this.abv; } - - static { - Alcohol.Apple.setFementation(Juice.Apple); - Alcohol.Apricot.setFementation(Juice.Apricot); - Alcohol.Banana.setFementation(Juice.Banana); - Alcohol.Cherry.setFementation(Juice.Cherry); - Alcohol.Elderberry.setFementation(Juice.Elderberry); - Alcohol.Peach.setFementation(Juice.Peach); - Alcohol.Pear.setFementation(Juice.Pear); - Alcohol.Plum.setFementation(Juice.Plum); - Alcohol.Carrot.setFementation(Juice.Carrot); - Alcohol.WhiteWine.setFementation(Juice.WhiteGrape); - Alcohol.RedWine.setFementation(Juice.RedGrape); - Alcohol.Citrus.setFementation(Juice.Lemon); - Alcohol.Citrus.setFementation(Juice.Lime); - Alcohol.Citrus.setFementation(Juice.Orange); - Alcohol.Citrus.setFementation(Juice.Grapefruit); - Alcohol.Tomato.setFementation(Juice.Tomato); - Alcohol.Cranberry.setFementation(Juice.Cranberry); - Alcohol.Pineapple.setFementation(Juice.Pineapple); - Alcohol.Potato.setFementation("cropPotato"); - } } diff --git a/src/main/java/binnie/extratrees/alcohol/Cocktail.java b/src/main/java/binnie/extratrees/alcohol/Cocktail.java index 736b1bd4..b517438c 100644 --- a/src/main/java/binnie/extratrees/alcohol/Cocktail.java +++ b/src/main/java/binnie/extratrees/alcohol/Cocktail.java @@ -40,52 +40,6 @@ public enum Cocktail { SexOnTheBeach("Sex on the Beach", Glassware.Highball, 16677426); static final Map cocktailIngredients = new HashMap<>(); - public String name; - public Glassware glassware; - public int colour; - public Map ingredients; - - Cocktail(final String name, final Glassware glassware, final int colour) { - this.ingredients = new HashMap<>(); - this.name = name; - this.glassware = glassware; - this.colour = colour; - } - - private void add(final ICocktailIngredient ingredient, final int ratio) { - this.ingredients.put(ingredient, ratio); - } - - @Nullable - public static Cocktail get(final Map ingredients) { - for (final Cocktail cocktail : values()) { - boolean is = true; - for (final Map.Entry entry : ingredients.entrySet()) { - if (!Objects.equals(cocktail.ingredients.get(entry.getKey()), entry.getValue())) { - is = false; - } - } - if (is) { - return cocktail; - } - } - return null; - } - - public static void registerIngredient(final ICocktailIngredient ingredient) { - String id = ingredient.getIdentifier().toLowerCase(); - Cocktail.cocktailIngredients.put(id, ingredient); - DrinkLiquid liquid = new DrinkLiquid(ingredient.getDisplayName(), ingredient.getColour(), ingredient.getTransparency(), ingredient.getABV(), id); - DrinkManager.registerDrinkLiquid(liquid); - } - - public static ICocktailIngredient getIngredient(final String name2) { - return Cocktail.cocktailIngredients.get(name2.toLowerCase()); - } - - public static boolean isIngredient(final String name) { - return Cocktail.cocktailIngredients.containsKey(name.toLowerCase()); - } static { Cocktail.Bellini.add(Alcohol.SparklingWine, 2); @@ -172,4 +126,51 @@ public enum Cocktail { Cocktail.SexOnTheBeach.add(Juice.Orange, 2); Cocktail.SexOnTheBeach.add(Juice.Cranberry, 2); } + + public String name; + public Glassware glassware; + public int colour; + public Map ingredients; + + Cocktail(final String name, final Glassware glassware, final int colour) { + this.ingredients = new HashMap<>(); + this.name = name; + this.glassware = glassware; + this.colour = colour; + } + + @Nullable + public static Cocktail get(final Map ingredients) { + for (final Cocktail cocktail : values()) { + boolean is = true; + for (final Map.Entry entry : ingredients.entrySet()) { + if (!Objects.equals(cocktail.ingredients.get(entry.getKey()), entry.getValue())) { + is = false; + } + } + if (is) { + return cocktail; + } + } + return null; + } + + public static void registerIngredient(final ICocktailIngredient ingredient) { + String id = ingredient.getIdentifier().toLowerCase(); + Cocktail.cocktailIngredients.put(id, ingredient); + DrinkLiquid liquid = new DrinkLiquid(ingredient.getDisplayName(), ingredient.getColour(), ingredient.getTransparency(), ingredient.getABV(), id); + DrinkManager.registerDrinkLiquid(liquid); + } + + public static ICocktailIngredient getIngredient(final String name2) { + return Cocktail.cocktailIngredients.get(name2.toLowerCase()); + } + + public static boolean isIngredient(final String name) { + return Cocktail.cocktailIngredients.containsKey(name.toLowerCase()); + } + + private void add(final ICocktailIngredient ingredient, final int ratio) { + this.ingredients.put(ingredient, ratio); + } } diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index a72d6769..488a4168 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -6,7 +6,6 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nullable; - public enum Glassware { BeerMug(480, 10, 14), Pint(600, 6, 20), @@ -24,11 +23,17 @@ public enum Glassware { Sherry(60, 17, 7), Coupe(180, 19, 8); - private int capacity; float contentBottom; float contentHeight; -// public IIcon glass; -// public IIcon contents; + private int capacity; + //public IIcon glass; + //public IIcon contents; + + Glassware(final int capacity, final int contentBottom, final int contentHeight) { + this.capacity = capacity; + this.contentBottom = contentBottom / 32.0f; + this.contentHeight = contentHeight / 32.0f; + } public String getName(@Nullable final String liquid) { if (liquid == null) { @@ -41,16 +46,10 @@ public enum Glassware { return this.capacity; } - Glassware(final int capacity, final int contentBottom, final int contentHeight) { - this.capacity = capacity; - this.contentBottom = contentBottom / 32.0f; - this.contentHeight = contentHeight / 32.0f; - } - -// public void registerIcons(final IIconRegister par1IconRegister) { -// this.glass = ExtraTrees.proxy.getIcon(par1IconRegister, "glassware/" + this.toString().toLowerCase() + ".glass"); -// this.contents = ExtraTrees.proxy.getIcon(par1IconRegister, "glassware/" + this.toString().toLowerCase() + ".contents"); -// } + /*public void registerIcons(final IIconRegister par1IconRegister) { + this.glass = ExtraTrees.proxy.getIcon(par1IconRegister, "glassware/" + this.toString().toLowerCase() + ".glass"); + this.contents = ExtraTrees.proxy.getIcon(par1IconRegister, "glassware/" + this.toString().toLowerCase() + ".contents"); + }*/ public ItemStack get(final int i) { return ExtraTrees.alcohol().drink.getStack(this, null); diff --git a/src/main/java/binnie/extratrees/alcohol/Juice.java b/src/main/java/binnie/extratrees/alcohol/Juice.java index d47a837a..bdbef293 100644 --- a/src/main/java/binnie/extratrees/alcohol/Juice.java +++ b/src/main/java/binnie/extratrees/alcohol/Juice.java @@ -28,17 +28,13 @@ public enum Juice implements IFluidType, ICocktailLiquid { WhiteGrape("White Grape Juice", "juice.white.grape", 16507769, 0.6, "WhiteGrape"), RedGrape("Red Grape Juice", "juice.red.grape", 9775412, 0.6, "RedGrape"); + public String squeezing; String name; String ident; - public String squeezing; //IIcon icon; int colour; float transparency; - private void addSqueezing(final String oreDict) { - this.squeezing = oreDict; - } - Juice(final String name, final String ident, final int colour, final double transparency, final String squeezing) { this.name = name; this.ident = ident; @@ -47,6 +43,10 @@ public enum Juice implements IFluidType, ICocktailLiquid { this.addSqueezing("crop" + squeezing); } + private void addSqueezing(final String oreDict) { + this.squeezing = oreDict; + } + @Override public String toString() { return this.name; @@ -62,7 +62,6 @@ public enum Juice implements IFluidType, ICocktailLiquid { return container == FluidContainerType.GLASS; } - @Override public ResourceLocation getFlowing() { return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); diff --git a/src/main/java/binnie/extratrees/alcohol/Liqueur.java b/src/main/java/binnie/extratrees/alcohol/Liqueur.java index d83934ad..2701dba8 100644 --- a/src/main/java/binnie/extratrees/alcohol/Liqueur.java +++ b/src/main/java/binnie/extratrees/alcohol/Liqueur.java @@ -26,15 +26,32 @@ public enum Liqueur implements IFluidType, ICocktailLiquid { Blackberry("Blackberry", 6837581, 0.5, 0.2), Raspberry("Raspberry", 10158848, 0.5, 0.2); + static { + Liqueur.Almond.addFlavour("cropAlmond"); + Liqueur.Orange.addFlavour("cropOrange"); + Liqueur.Banana.addFlavour("cropBanana"); + Liqueur.Chocolate.addFlavour("cropCocoa"); + Liqueur.Mint.addFlavour("cropMint"); + Liqueur.Hazelnut.addFlavour("cropHazelnut"); + Liqueur.Cinnamon.addFlavour("cropCinnamon"); + Liqueur.Coffee.addFlavour("cropCoffee"); + Liqueur.Melon.addFlavour("cropMelon"); + Liqueur.Anise.addFlavour("cropAnise"); + Liqueur.Peach.addFlavour("cropPeach"); + Liqueur.Lemon.addFlavour("cropLemon"); + Liqueur.Herbal.addFlavour("cropHerbal"); + Liqueur.Cherry.addFlavour("cropCherry"); + Liqueur.Blackcurrant.addFlavour("cropBlackcurrant"); + Liqueur.Blackberry.addFlavour("cropBlackberry"); + Liqueur.Raspberry.addFlavour("cropRaspberry"); + } + String name; String ident; int colour; float transparency; float abv; - private void addFlavour(final String oreDict) { - } - Liqueur(final String name, final int colour, final double transparency, final double abv) { this(name + " Liqueur", "liqueur." + name.toLowerCase(), colour, transparency, abv); } @@ -47,6 +64,9 @@ public enum Liqueur implements IFluidType, ICocktailLiquid { this.abv = (float) abv; } + private void addFlavour(final String oreDict) { + } + @Override public String toString() { return this.name; @@ -111,24 +131,4 @@ public enum Liqueur implements IFluidType, ICocktailLiquid { public float getABV() { return this.abv; } - - static { - Liqueur.Almond.addFlavour("cropAlmond"); - Liqueur.Orange.addFlavour("cropOrange"); - Liqueur.Banana.addFlavour("cropBanana"); - Liqueur.Chocolate.addFlavour("cropCocoa"); - Liqueur.Mint.addFlavour("cropMint"); - Liqueur.Hazelnut.addFlavour("cropHazelnut"); - Liqueur.Cinnamon.addFlavour("cropCinnamon"); - Liqueur.Coffee.addFlavour("cropCoffee"); - Liqueur.Melon.addFlavour("cropMelon"); - Liqueur.Anise.addFlavour("cropAnise"); - Liqueur.Peach.addFlavour("cropPeach"); - Liqueur.Lemon.addFlavour("cropLemon"); - Liqueur.Herbal.addFlavour("cropHerbal"); - Liqueur.Cherry.addFlavour("cropCherry"); - Liqueur.Blackcurrant.addFlavour("cropBlackcurrant"); - Liqueur.Blackberry.addFlavour("cropBlackberry"); - Liqueur.Raspberry.addFlavour("cropRaspberry"); - } } diff --git a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java index 5a67eddf..ae16e2d8 100644 --- a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java +++ b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java @@ -19,7 +19,7 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid { String name; String ident; - // IIcon icon; + //IIcon icon; int colour; float transparency; diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index cdc7df0c..d90abae4 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -99,17 +99,17 @@ public class ModuleAlcohol implements IInitializable { } BreweryRecipes.addRecipes( - new BrewedGrainRecipe(Alcohol.Ale, BreweryRecipes.GRAIN_BARLEY, BreweryRecipes.HOPS), - new BrewedGrainRecipe(Alcohol.Lager, BreweryRecipes.GRAIN_BARLEY, BreweryRecipes.HOPS, ExtraTreeItems.LagerYeast.get(1)), - new BrewedGrainRecipe(Alcohol.Stout, BreweryRecipes.GRAIN_ROASTED, BreweryRecipes.HOPS), - new BrewedGrainRecipe(Alcohol.CornBeer, BreweryRecipes.GRAIN_CORN, BreweryRecipes.HOPS), - new BrewedGrainRecipe(Alcohol.RyeBeer, BreweryRecipes.GRAIN_RYE, BreweryRecipes.HOPS), - new BrewedGrainRecipe(Alcohol.WheatBeer, BreweryRecipes.GRAIN_WHEAT, BreweryRecipes.HOPS), + new BrewedGrainRecipe(Alcohol.Ale, BreweryRecipes.GRAIN_BARLEY, BreweryRecipes.HOPS), + new BrewedGrainRecipe(Alcohol.Lager, BreweryRecipes.GRAIN_BARLEY, BreweryRecipes.HOPS, ExtraTreeItems.LagerYeast.get(1)), + new BrewedGrainRecipe(Alcohol.Stout, BreweryRecipes.GRAIN_ROASTED, BreweryRecipes.HOPS), + new BrewedGrainRecipe(Alcohol.CornBeer, BreweryRecipes.GRAIN_CORN, BreweryRecipes.HOPS), + new BrewedGrainRecipe(Alcohol.RyeBeer, BreweryRecipes.GRAIN_RYE, BreweryRecipes.HOPS), + new BrewedGrainRecipe(Alcohol.WheatBeer, BreweryRecipes.GRAIN_WHEAT, BreweryRecipes.HOPS), - new BrewedGrainRecipe(Alcohol.Barley, BreweryRecipes.GRAIN_BARLEY), - new BrewedGrainRecipe(Alcohol.Corn, BreweryRecipes.GRAIN_CORN), - new BrewedGrainRecipe(Alcohol.Rye, BreweryRecipes.GRAIN_RYE), - new BrewedGrainRecipe(Alcohol.Wheat, BreweryRecipes.GRAIN_WHEAT) + new BrewedGrainRecipe(Alcohol.Barley, BreweryRecipes.GRAIN_BARLEY), + new BrewedGrainRecipe(Alcohol.Corn, BreweryRecipes.GRAIN_CORN), + new BrewedGrainRecipe(Alcohol.Rye, BreweryRecipes.GRAIN_RYE), + new BrewedGrainRecipe(Alcohol.Wheat, BreweryRecipes.GRAIN_WHEAT) ); this.addDistillery(Alcohol.Apple, Spirit.AppleBrandy, Spirit.AppleLiquor, Spirit.NeutralSpirit); diff --git a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java b/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java index b1a2a358..14c495a6 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java @@ -13,29 +13,29 @@ public class BlockDrink extends BlockContainer { this.setCreativeTab(CreativeTabs.TOOLS); } -// @Override -// @SideOnly(Side.CLIENT) -// public int getRenderBlockPass() { -// return 1; -// } + /*@Override + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() { + return 1; + }*/ @Override public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) { return new TileEntityDrink(); } -// @Override -// public int getRenderType() { -// return ModuleAlcohol.drinkRendererID; -// } -// -// @Override -// public boolean isNormalCube() { -// return false; -// } -// -// @Override -// public boolean isOpaqueCube() { -// return true; -// } + /*@Override + public int getRenderType() { + return ModuleAlcohol.drinkRendererID; + } + + @Override + public boolean isNormalCube() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return true; + }*/ } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java b/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java index 49f56993..a6148a20 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java @@ -3,38 +3,38 @@ package binnie.extratrees.alcohol.drink; //TODO RENDERING public class BlockDrinkRenderer //implements ISimpleBlockRenderingHandler { -// @Override -// public void renderInventoryBlock(final Block block, final int metadata, final int modelId, final RenderBlocks renderer) { -// } -// -// @Override -// public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) { -// GlStateManager.pushMatrix(); -// Tessellator.instance.setColorRGBA(255, 255, 255, 150); -// final Tessellator tess = Tessellator.instance; -// renderer.renderFaceYPos(block, x, y, z, Blocks.dirt.getIcon(0, 0)); -// final float s = 0.0625f; -// for (int h = 0; h < 16; ++h) { -// final float d1 = 8.0f * s; -// final float d2 = 8.0f * s; -// final float h2 = h * s; -// final float h3 = h * s; -// tess.addVertexWithUV(x + 0.5f - d1, y + h2, z + 0.5f - d1, 0.0, 0.0); -// tess.addVertexWithUV(x + 0.5f - d1, y + h3, z + 0.5f - d1, 0.0, 0.0); -// tess.addVertexWithUV(x + 0.5f + d1, y + h3, z + 0.5f - d1, 0.0, 0.0); -// tess.addVertexWithUV(x + 0.5f + d1, y + h2, z + 0.5f - d1, 0.0, 0.0); -// } -// GlStateManager.popMatrix(); -// return false; -// } -// -// @Override -// public boolean shouldRender3DInInventory(final int modelId) { -// return false; -// } -// -// @Override -// public int getRenderId() { -// return ModuleAlcohol.drinkRendererID; -// } + /*@Override + public void renderInventoryBlock(final Block block, final int metadata, final int modelId, final RenderBlocks renderer) { + } + + @Override + public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) { + GlStateManager.pushMatrix(); + Tessellator.instance.setColorRGBA(255, 255, 255, 150); + final Tessellator tess = Tessellator.instance; + renderer.renderFaceYPos(block, x, y, z, Blocks.dirt.getIcon(0, 0)); + final float s = 0.0625f; + for (int h = 0; h < 16; ++h) { + final float d1 = 8.0f * s; + final float d2 = 8.0f * s; + final float h2 = h * s; + final float h3 = h * s; + tess.addVertexWithUV(x + 0.5f - d1, y + h2, z + 0.5f - d1, 0.0, 0.0); + tess.addVertexWithUV(x + 0.5f - d1, y + h3, z + 0.5f - d1, 0.0, 0.0); + tess.addVertexWithUV(x + 0.5f + d1, y + h3, z + 0.5f - d1, 0.0, 0.0); + tess.addVertexWithUV(x + 0.5f + d1, y + h2, z + 0.5f - d1, 0.0, 0.0); + } + GlStateManager.popMatrix(); + return false; + } + + @Override + public boolean shouldRender3DInInventory(final int modelId) { + return false; + } + + @Override + public int getRenderId() { + return ModuleAlcohol.drinkRendererID; + }*/ } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/CocktailRenderer.java b/src/main/java/binnie/extratrees/alcohol/drink/CocktailRenderer.java index 059229e2..e024835d 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/CocktailRenderer.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/CocktailRenderer.java @@ -2,210 +2,210 @@ package binnie.extratrees.alcohol.drink; public class CocktailRenderer //implements IItemRenderer { -// private void renderCocktail(final RenderBlocks renderBlocks, final ItemStack item, final float p, final float q, final float r) { -// final RenderItem renderItem = new RenderItem(); -// GlStateManager.enableBlend(); -// GL11.glBlendFunc(770, 771); -// final Glassware glass = ExtraTrees.drink.getGlassware(item); -// final FluidStack fluid = ExtraTrees.drink.getFluid(item); -// final IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); -// this.setColor(16777215, 0.8f); -// renderItem.renderIcon(0, 0, glass.glass, 16, 16); -// if (drink != null) { -// this.setColor(drink.getColour(), 1.2f * drink.getTransparency() + 0.3f); -// final IIcon icon = glass.contents; -// final float amount = fluid.amount / glass.getVolume(); -// final float level = glass.getContentHeight() * (1.0f - amount); -// final float gapAtTop = 1.0f - (glass.getContentBottom() + glass.getContentHeight()); -// final float x = 0.0f; -// final float y = 16.0f * (gapAtTop + level); -// final float w = 16.0f; -// final float h = 16.0f - y; -// final float minV = icon.getInterpolatedV(y); -// final float maxV = icon.getInterpolatedV(16.0); -// final Tessellator tessellator = Tessellator.instance; -// tessellator.startDrawingQuads(); -// tessellator.addVertexWithUV(x + 0.0f, y + h, renderItem.zLevel, icon.getMinU(), maxV); -// tessellator.addVertexWithUV(x + w, y + h, renderItem.zLevel, icon.getMaxU(), maxV); -// tessellator.addVertexWithUV(x + w, y + 0.0f, renderItem.zLevel, icon.getMaxU(), minV); -// tessellator.addVertexWithUV(x + 0.0f, y + 0.0f, renderItem.zLevel, icon.getMinU(), minV); -// tessellator.draw(); -// } -// GlStateManager.disableBlend(); -// } -// -// private void setColor(final int i1, final float alpha) { -// final float f = (i1 >> 16 & 0xFF) / 255.0f; -// final float f2 = (i1 >> 8 & 0xFF) / 255.0f; -// final float f3 = (i1 & 0xFF) / 255.0f; -// GL11.glColor4f(f, f2, f3, (alpha > 1.0f) ? 1.0f : alpha); -// } -// -// private void renderFace(final Tessellator tessellator, final ForgeDirection dir) { -// switch (dir) { -// case DOWN: { -// tessellator.addVertex(0.0, 0.0, 0.0); -// tessellator.addVertex(0.0, 0.0, 1.0); -// tessellator.addVertex(1.0, 0.0, 1.0); -// tessellator.addVertex(1.0, 0.0, 0.0); -// break; -// } -// } -// } -// -// @Override -// public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { -// switch (type) { -// case ENTITY: { -// return true; -// } -// case EQUIPPED: { -// return true; -// } -// case INVENTORY: { -// return true; -// } -// case EQUIPPED_FIRST_PERSON: { -// return true; -// } -// default: { -// return false; -// } -// } -// } -// -// @Override -// public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { -// return helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION || helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING; -// } -// -// @Override -// public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { -// switch (type) { -// case ENTITY: -// case EQUIPPED: -// case EQUIPPED_FIRST_PERSON: { -// if (type == IItemRenderer.ItemRenderType.ENTITY) { -// GlStateManager.translate(-0.5f, -0.25f, -0.0f); -// } -// final TextureManager texturemanager = BinnieCore.proxy.getMinecraftInstance().getTextureManager(); -// final Glassware glass = ExtraTrees.drink.getGlassware(item); -// final FluidStack fluid = ExtraTrees.drink.getFluid(item); -// IIcon iicon = glass.glass; -// final float f = iicon.getMinU(); -// final float f2 = iicon.getMaxU(); -// final float f3 = iicon.getMinV(); -// final float f4 = iicon.getMaxV(); -// texturemanager.bindTexture(texturemanager.getResourceLocation(item.getItemSpriteNumber())); -// TextureUtil.func_152777_a(false, false, 1.0f); -// this.setColor(16777215, 0.8f); -// final IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); -// this.setColor(16777215, 0.8f); -// ItemRenderer.renderItemIn2D(Tessellator.instance, f2, f3, f, f4, iicon.getIconWidth(), iicon.getIconHeight(), 0.0625f); -// if (drink != null) { -// this.setColor(drink.getColour(), 1.2f * drink.getTransparency() + 0.3f); -// iicon = glass.contents; -// final IIcon icon = glass.contents; -// final float amount = fluid.amount / glass.getVolume(); -// final float level = glass.getContentHeight() * (1.0f - amount); -// final float gapAtTop = 1.0f - (glass.getContentBottom() + glass.getContentHeight()); -// final float x = 0.0f; -// final float y = 1.0f * (gapAtTop + level); -// final float w = 1.0f; -// final float h = 1.0f - y; -// final float minV = icon.getInterpolatedV(y * 16.0f); -// final float maxV = icon.getInterpolatedV(16.0); -// final float minU = icon.getMinU(); -// final float maxU = icon.getMaxU(); -// final Tessellator tessellator = Tessellator.instance; -// tessellator.setNormal(0.0f, 0.0f, -1.0f); -// tessellator.startDrawingQuads(); -// tessellator.addVertexWithUV(0.0, 1.0 - y, -0.03125, maxU, minV); -// tessellator.addVertexWithUV(1.0, 1.0 - y, -0.03125, minU, minV); -// tessellator.addVertexWithUV(1.0, 0.0, -0.03125, minU, maxV); -// tessellator.addVertexWithUV(0.0, 0.0, -0.03125, maxU, maxV); -// tessellator.draw(); -// tessellator.setNormal(0.0f, 0.0f, 1.0f); -// tessellator.startDrawingQuads(); -// tessellator.addVertexWithUV(0.0, 1.0 - y, -0.03125, maxU, minV); -// tessellator.addVertexWithUV(0.0, 0.0, -0.03125, maxU, maxV); -// tessellator.addVertexWithUV(1.0, 0.0, -0.03125, minU, maxV); -// tessellator.addVertexWithUV(1.0, 1.0 - y, -0.03125, minU, minV); -// tessellator.draw(); -// break; -// } -// break; -// } -// case INVENTORY: { -// this.renderCocktail((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); -// break; -// } -// } -// } -// -// public void renderItemIn2DPercentage(final Tessellator tesselator, final float maxU, final float minV, final float minU, float maxV, final int width, final int height, final float depth, final float percent) { -// maxV = minV + (maxV - minV) * 1.0f; -// tesselator.startDrawingQuads(); -// tesselator.setNormal(0.0f, 0.0f, 1.0f); -// tesselator.addVertexWithUV(0.0, 0.0, 0.0, maxU, maxV); -// tesselator.addVertexWithUV(1.0, 0.0, 0.0, minU, maxV); -// tesselator.addVertexWithUV(1.0, 1.0, 0.0, minU, minV); -// tesselator.addVertexWithUV(0.0, 1.0, 0.0, maxU, minV); -// tesselator.draw(); -// tesselator.startDrawingQuads(); -// tesselator.setNormal(0.0f, 0.0f, -1.0f); -// tesselator.addVertexWithUV(0.0, percent, 0.0f - depth, maxU, minV); -// tesselator.addVertexWithUV(1.0, percent, 0.0f - depth, minU, minV); -// tesselator.addVertexWithUV(1.0, 0.0, 0.0f - depth, minU, maxV); -// tesselator.addVertexWithUV(0.0, 0.0, 0.0f - depth, maxU, maxV); -// tesselator.draw(); -// final float f5 = 0.5f * (maxU - minU) / width; -// final float f6 = 0.5f * (maxV - minV) / height; -// tesselator.startDrawingQuads(); -// tesselator.setNormal(-1.0f, 0.0f, 0.0f); -// for (int k = 0; k < width; ++k) { -// final float f7 = k / width; -// final float f8 = maxU + (minU - maxU) * f7 - f5; -// tesselator.addVertexWithUV(f7, 0.0, 0.0f - depth, f8, maxV); -// tesselator.addVertexWithUV(f7, 0.0, 0.0, f8, maxV); -// tesselator.addVertexWithUV(f7, 1.0, 0.0, f8, minV); -// tesselator.addVertexWithUV(f7, 1.0, 0.0f - depth, f8, minV); -// } -// tesselator.draw(); -// tesselator.startDrawingQuads(); -// tesselator.setNormal(1.0f, 0.0f, 0.0f); -// for (int k = 0; k < width; ++k) { -// final float f7 = k / width; -// final float f8 = maxU + (minU - maxU) * f7 - f5; -// final float f9 = f7 + 1.0f / width; -// tesselator.addVertexWithUV(f9, 1.0, 0.0f - depth, f8, minV); -// tesselator.addVertexWithUV(f9, 1.0, 0.0, f8, minV); -// tesselator.addVertexWithUV(f9, 0.0, 0.0, f8, maxV); -// tesselator.addVertexWithUV(f9, 0.0, 0.0f - depth, f8, maxV); -// } -// tesselator.draw(); -// tesselator.startDrawingQuads(); -// tesselator.setNormal(0.0f, 1.0f, 0.0f); -// for (int k = 0; k < height; ++k) { -// final float f7 = k / height; -// final float f8 = maxV + (minV - maxV) * f7 - f6; -// final float f9 = f7 + 1.0f / height; -// tesselator.addVertexWithUV(0.0, f9, 0.0, maxU, f8); -// tesselator.addVertexWithUV(1.0, f9, 0.0, minU, f8); -// tesselator.addVertexWithUV(1.0, f9, 0.0f - depth, minU, f8); -// tesselator.addVertexWithUV(0.0, f9, 0.0f - depth, maxU, f8); -// } -// tesselator.draw(); -// tesselator.startDrawingQuads(); -// tesselator.setNormal(0.0f, -1.0f, 0.0f); -// for (int k = 0; k < height; ++k) { -// final float f7 = k / height; -// final float f8 = maxV + (minV - maxV) * f7 - f6; -// tesselator.addVertexWithUV(1.0, f7, 0.0, minU, f8); -// tesselator.addVertexWithUV(0.0, f7, 0.0, maxU, f8); -// tesselator.addVertexWithUV(0.0, f7, 0.0f - depth, maxU, f8); -// tesselator.addVertexWithUV(1.0, f7, 0.0f - depth, minU, f8); -// } -// tesselator.draw(); -// } + /*private void renderCocktail(final RenderBlocks renderBlocks, final ItemStack item, final float p, final float q, final float r) { + final RenderItem renderItem = new RenderItem(); + GlStateManager.enableBlend(); + GL11.glBlendFunc(770, 771); + final Glassware glass = ExtraTrees.drink.getGlassware(item); + final FluidStack fluid = ExtraTrees.drink.getFluid(item); + final IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); + this.setColor(16777215, 0.8f); + renderItem.renderIcon(0, 0, glass.glass, 16, 16); + if (drink != null) { + this.setColor(drink.getColour(), 1.2f * drink.getTransparency() + 0.3f); + final IIcon icon = glass.contents; + final float amount = fluid.amount / glass.getVolume(); + final float level = glass.getContentHeight() * (1.0f - amount); + final float gapAtTop = 1.0f - (glass.getContentBottom() + glass.getContentHeight()); + final float x = 0.0f; + final float y = 16.0f * (gapAtTop + level); + final float w = 16.0f; + final float h = 16.0f - y; + final float minV = icon.getInterpolatedV(y); + final float maxV = icon.getInterpolatedV(16.0); + final Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(x + 0.0f, y + h, renderItem.zLevel, icon.getMinU(), maxV); + tessellator.addVertexWithUV(x + w, y + h, renderItem.zLevel, icon.getMaxU(), maxV); + tessellator.addVertexWithUV(x + w, y + 0.0f, renderItem.zLevel, icon.getMaxU(), minV); + tessellator.addVertexWithUV(x + 0.0f, y + 0.0f, renderItem.zLevel, icon.getMinU(), minV); + tessellator.draw(); + } + GlStateManager.disableBlend(); + } + + private void setColor(final int i1, final float alpha) { + final float f = (i1 >> 16 & 0xFF) / 255.0f; + final float f2 = (i1 >> 8 & 0xFF) / 255.0f; + final float f3 = (i1 & 0xFF) / 255.0f; + GL11.glColor4f(f, f2, f3, (alpha > 1.0f) ? 1.0f : alpha); + } + + private void renderFace(final Tessellator tessellator, final ForgeDirection dir) { + switch (dir) { + case DOWN: { + tessellator.addVertex(0.0, 0.0, 0.0); + tessellator.addVertex(0.0, 0.0, 1.0); + tessellator.addVertex(1.0, 0.0, 1.0); + tessellator.addVertex(1.0, 0.0, 0.0); + break; + } + } + } + + @Override + public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { + switch (type) { + case ENTITY: { + return true; + } + case EQUIPPED: { + return true; + } + case INVENTORY: { + return true; + } + case EQUIPPED_FIRST_PERSON: { + return true; + } + default: { + return false; + } + } + } + + @Override + public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { + return helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION || helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING; + } + + @Override + public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { + switch (type) { + case ENTITY: + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: { + if (type == IItemRenderer.ItemRenderType.ENTITY) { + GlStateManager.translate(-0.5f, -0.25f, -0.0f); + } + final TextureManager texturemanager = BinnieCore.proxy.getMinecraftInstance().getTextureManager(); + final Glassware glass = ExtraTrees.drink.getGlassware(item); + final FluidStack fluid = ExtraTrees.drink.getFluid(item); + IIcon iicon = glass.glass; + final float f = iicon.getMinU(); + final float f2 = iicon.getMaxU(); + final float f3 = iicon.getMinV(); + final float f4 = iicon.getMaxV(); + texturemanager.bindTexture(texturemanager.getResourceLocation(item.getItemSpriteNumber())); + TextureUtil.func_152777_a(false, false, 1.0f); + this.setColor(16777215, 0.8f); + final IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); + this.setColor(16777215, 0.8f); + ItemRenderer.renderItemIn2D(Tessellator.instance, f2, f3, f, f4, iicon.getIconWidth(), iicon.getIconHeight(), 0.0625f); + if (drink != null) { + this.setColor(drink.getColour(), 1.2f * drink.getTransparency() + 0.3f); + iicon = glass.contents; + final IIcon icon = glass.contents; + final float amount = fluid.amount / glass.getVolume(); + final float level = glass.getContentHeight() * (1.0f - amount); + final float gapAtTop = 1.0f - (glass.getContentBottom() + glass.getContentHeight()); + final float x = 0.0f; + final float y = 1.0f * (gapAtTop + level); + final float w = 1.0f; + final float h = 1.0f - y; + final float minV = icon.getInterpolatedV(y * 16.0f); + final float maxV = icon.getInterpolatedV(16.0); + final float minU = icon.getMinU(); + final float maxU = icon.getMaxU(); + final Tessellator tessellator = Tessellator.instance; + tessellator.setNormal(0.0f, 0.0f, -1.0f); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(0.0, 1.0 - y, -0.03125, maxU, minV); + tessellator.addVertexWithUV(1.0, 1.0 - y, -0.03125, minU, minV); + tessellator.addVertexWithUV(1.0, 0.0, -0.03125, minU, maxV); + tessellator.addVertexWithUV(0.0, 0.0, -0.03125, maxU, maxV); + tessellator.draw(); + tessellator.setNormal(0.0f, 0.0f, 1.0f); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(0.0, 1.0 - y, -0.03125, maxU, minV); + tessellator.addVertexWithUV(0.0, 0.0, -0.03125, maxU, maxV); + tessellator.addVertexWithUV(1.0, 0.0, -0.03125, minU, maxV); + tessellator.addVertexWithUV(1.0, 1.0 - y, -0.03125, minU, minV); + tessellator.draw(); + break; + } + break; + } + case INVENTORY: { + this.renderCocktail((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + break; + } + } + } + + public void renderItemIn2DPercentage(final Tessellator tesselator, final float maxU, final float minV, final float minU, float maxV, final int width, final int height, final float depth, final float percent) { + maxV = minV + (maxV - minV) * 1.0f; + tesselator.startDrawingQuads(); + tesselator.setNormal(0.0f, 0.0f, 1.0f); + tesselator.addVertexWithUV(0.0, 0.0, 0.0, maxU, maxV); + tesselator.addVertexWithUV(1.0, 0.0, 0.0, minU, maxV); + tesselator.addVertexWithUV(1.0, 1.0, 0.0, minU, minV); + tesselator.addVertexWithUV(0.0, 1.0, 0.0, maxU, minV); + tesselator.draw(); + tesselator.startDrawingQuads(); + tesselator.setNormal(0.0f, 0.0f, -1.0f); + tesselator.addVertexWithUV(0.0, percent, 0.0f - depth, maxU, minV); + tesselator.addVertexWithUV(1.0, percent, 0.0f - depth, minU, minV); + tesselator.addVertexWithUV(1.0, 0.0, 0.0f - depth, minU, maxV); + tesselator.addVertexWithUV(0.0, 0.0, 0.0f - depth, maxU, maxV); + tesselator.draw(); + final float f5 = 0.5f * (maxU - minU) / width; + final float f6 = 0.5f * (maxV - minV) / height; + tesselator.startDrawingQuads(); + tesselator.setNormal(-1.0f, 0.0f, 0.0f); + for (int k = 0; k < width; ++k) { + final float f7 = k / width; + final float f8 = maxU + (minU - maxU) * f7 - f5; + tesselator.addVertexWithUV(f7, 0.0, 0.0f - depth, f8, maxV); + tesselator.addVertexWithUV(f7, 0.0, 0.0, f8, maxV); + tesselator.addVertexWithUV(f7, 1.0, 0.0, f8, minV); + tesselator.addVertexWithUV(f7, 1.0, 0.0f - depth, f8, minV); + } + tesselator.draw(); + tesselator.startDrawingQuads(); + tesselator.setNormal(1.0f, 0.0f, 0.0f); + for (int k = 0; k < width; ++k) { + final float f7 = k / width; + final float f8 = maxU + (minU - maxU) * f7 - f5; + final float f9 = f7 + 1.0f / width; + tesselator.addVertexWithUV(f9, 1.0, 0.0f - depth, f8, minV); + tesselator.addVertexWithUV(f9, 1.0, 0.0, f8, minV); + tesselator.addVertexWithUV(f9, 0.0, 0.0, f8, maxV); + tesselator.addVertexWithUV(f9, 0.0, 0.0f - depth, f8, maxV); + } + tesselator.draw(); + tesselator.startDrawingQuads(); + tesselator.setNormal(0.0f, 1.0f, 0.0f); + for (int k = 0; k < height; ++k) { + final float f7 = k / height; + final float f8 = maxV + (minV - maxV) * f7 - f6; + final float f9 = f7 + 1.0f / height; + tesselator.addVertexWithUV(0.0, f9, 0.0, maxU, f8); + tesselator.addVertexWithUV(1.0, f9, 0.0, minU, f8); + tesselator.addVertexWithUV(1.0, f9, 0.0f - depth, minU, f8); + tesselator.addVertexWithUV(0.0, f9, 0.0f - depth, maxU, f8); + } + tesselator.draw(); + tesselator.startDrawingQuads(); + tesselator.setNormal(0.0f, -1.0f, 0.0f); + for (int k = 0; k < height; ++k) { + final float f7 = k / height; + final float f8 = maxV + (minV - maxV) * f7 - f6; + tesselator.addVertexWithUV(1.0, f7, 0.0, minU, f8); + tesselator.addVertexWithUV(0.0, f7, 0.0, maxU, f8); + tesselator.addVertexWithUV(0.0, f7, 0.0f - depth, maxU, f8); + tesselator.addVertexWithUV(1.0, f7, 0.0f - depth, minU, f8); + } + tesselator.draw(); + }*/ } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java index 948776a1..3e50f8ad 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java @@ -28,5 +28,4 @@ public class DrinkManager { public static IDrinkLiquid getLiquid(final FluidStack fluid) { return getLiquid(fluid.getFluid()); } - } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java index 722ec7a1..441a33ad 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java @@ -103,39 +103,39 @@ public class ItemDrink extends ItemFood { return this.getGlassware(stack).getName(liquidName); } -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister par1IconRegister) { -// for (final Glassware glassware : Glassware.values()) { -// glassware.registerIcons(par1IconRegister); -// } -// } -// -// @Override -// public IIcon getIcon(final ItemStack stack, final int pass) { -// final Glassware glass = this.getGlassware(stack); -// return (pass == 0) ? glass.glass : ((this.getFluid(stack) == null) ? glass.glass : glass.contents); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public int getColorFromItemStack(final ItemStack stack, final int pass) { -// final FluidStack fluid = this.getFluid(stack); -// final IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); -// return (pass == 0) ? 16777215 : ((drink == null) ? 16777215 : drink.getColour()); -// } -// -// @Override -// public int getRenderPasses(final int metadata) { -// return 2; -// } -// -// @Override -// public ItemStack onEaten(final ItemStack p_77654_1_, final World p_77654_2_, final EntityPlayer p_77654_3_) { -// this.drain(p_77654_1_, 30, true); -// AlcoholEffect.makeDrunk(p_77654_3_, 2.1f); -// return p_77654_1_; -// } + /*@Override + @SideOnly(Side.CLIENT) + public void registerIcons(final IIconRegister par1IconRegister) { + for (final Glassware glassware : Glassware.values()) { + glassware.registerIcons(par1IconRegister); + } + } + + @Override + public IIcon getIcon(final ItemStack stack, final int pass) { + final Glassware glass = this.getGlassware(stack); + return (pass == 0) ? glass.glass : ((this.getFluid(stack) == null) ? glass.glass : glass.contents); + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(final ItemStack stack, final int pass) { + final FluidStack fluid = this.getFluid(stack); + final IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); + return (pass == 0) ? 16777215 : ((drink == null) ? 16777215 : drink.getColour()); + } + + @Override + public int getRenderPasses(final int metadata) { + return 2; + } + + @Override + public ItemStack onEaten(final ItemStack p_77654_1_, final World p_77654_2_, final EntityPlayer p_77654_3_) { + this.drain(p_77654_1_, 30, true); + AlcoholEffect.makeDrunk(p_77654_3_, 2.1f); + return p_77654_1_; + }*/ @Override public EnumAction getItemUseAction(final ItemStack itemStack) { @@ -146,20 +146,20 @@ public class ItemDrink extends ItemFood { } } -// @Override -// @SideOnly(Side.CLIENT) -// public boolean requiresMultipleRenderPasses() { -// return true; -// } + /*@Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() { + return true; + }*/ @Override public int getMaxItemUseDuration(final ItemStack p_77626_1_) { return 16; } -// @Override -// public ItemStack onItemRightClick(final ItemStack p_77659_1_, final World p_77659_2_, final EntityPlayer p_77659_3_) { -// p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); -// return p_77659_1_; -// } + /*@Override + public ItemStack onItemRightClick(final ItemStack p_77659_1_, final World p_77659_2_, final EntityPlayer p_77659_3_) { + p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); + return p_77659_1_; + }*/ } diff --git a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java index 0557d618..8c40fcf9 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java @@ -21,7 +21,11 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +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.world.IBlockAccess; import net.minecraft.world.World; @@ -37,6 +41,19 @@ import java.util.List; public abstract class BlockETDecorativeLeaves extends Block implements IItemModelRegister, IColoredBlock, IShearable { private static final int VARIANTS_PER_BLOCK = 16; + private final int blockNumber; + + public BlockETDecorativeLeaves(int blockNumber) { + super(Material.LEAVES); + this.blockNumber = blockNumber; + this.setCreativeTab(Tabs.tabArboriculture); + this.setHardness(0.2F); + this.setLightOpacity(1); + this.setSoundType(SoundType.PLANT); + String name = "leaves.decorative." + blockNumber; + setUnlocalizedName(name); + setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); + } public static List create() { List blocks = new ArrayList<>(); @@ -54,20 +71,6 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode return blocks; } - private final int blockNumber; - - public BlockETDecorativeLeaves(int blockNumber) { - super(Material.LEAVES); - this.blockNumber = blockNumber; - this.setCreativeTab(Tabs.tabArboriculture); - this.setHardness(0.2F); - this.setLightOpacity(1); - this.setSoundType(SoundType.PLANT); - String name = "leaves.decorative." + blockNumber; - setUnlocalizedName(name); - setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); - } - public int getBlockNumber() { return blockNumber; } @@ -156,7 +159,7 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode */ @Override public int getMetaFromState(IBlockState state) { - /* + /* Gets the metadata of the item this Block can drop. This method is called when the block gets destroyed. It returns the metadata of the dropped item based on the old metadata of the block. */ @@ -164,8 +167,8 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode } /** - * Gets the metadata of the item this Block can drop. This method is called when the block gets destroyed. It returns - * the metadata of the dropped item based on the old metadata of the block. + * Gets the metadata of the item this Block can drop. This method is called when the block gets destroyed. It + * returns the metadata of the dropped item based on the old metadata of the block. */ @Override public int damageDropped(IBlockState state) { diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 675ef056..6e2ef43d 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -28,18 +28,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntityProvider { -// private IIcon getFlippedIcon(final boolean upper, final boolean flip, final int tileMeta) { -// final DoorType type = getDoorType(tileMeta); -// return upper ? (flip ? type.iconDoorUpperFlip : type.iconDoorUpper) : (flip ? type.iconDoorLowerFlip : type.iconDoorLower); -// } - - public static DoorType getDoorType(final int tileMeta) { - final int type = (tileMeta & 0xF00) >> 8; - if (type >= 0 && type < DoorType.values().length) { - return DoorType.values()[type]; - } - return DoorType.Standard; - } + /*private IIcon getFlippedIcon(final boolean upper, final boolean flip, final int tileMeta) { + final DoorType type = getDoorType(tileMeta); + return upper ? (flip ? type.iconDoorUpperFlip : type.iconDoorUpper) : (flip ? type.iconDoorLowerFlip : type.iconDoorLower); + }*/ protected BlockETDoor() { super(Material.WOOD); @@ -49,144 +41,152 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntit this.setRegistryName("door"); } -// @Override -// public IIcon getIcon(final int side, final int meta) { -// return DoorType.Standard.iconDoorLower; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4, final int par5) { -// if (par5 != 1 && par5 != 0) { -// final int i1 = this.getFullMetadata(par1IBlockAccess, par2, par3, par4); -// final int j1 = i1 & 0x3; -// final boolean flag = (i1 & 0x4) != 0x0; -// boolean flag2 = false; -// final boolean flag3 = (i1 & 0x8) != 0x0; -// if (flag) { -// if (j1 == 0 && par5 == 2) { -// flag2 = !flag2; -// } -// else if (j1 == 1 && par5 == 5) { -// flag2 = !flag2; -// } -// else if (j1 == 2 && par5 == 3) { -// flag2 = !flag2; -// } -// else if (j1 == 3 && par5 == 4) { -// flag2 = !flag2; -// } -// } -// else { -// if (j1 == 0 && par5 == 5) { -// flag2 = !flag2; -// } -// else if (j1 == 1 && par5 == 3) { -// flag2 = !flag2; -// } -// else if (j1 == 2 && par5 == 4) { -// flag2 = !flag2; -// } -// else if (j1 == 3 && par5 == 2) { -// flag2 = !flag2; -// } -// if ((i1 & 0x10) != 0x0) { -// flag2 = !flag2; -// } -// } -// int tileMeta = 0; -// if (flag3) { -// tileMeta = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3 - 1, par4); -// } -// else { -// tileMeta = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3, par4); -// } -// return this.getFlippedIcon(flag3, flag2, tileMeta); -// } -// return DoorType.Standard.iconDoorLower; -// } + public static DoorType getDoorType(final int tileMeta) { + final int type = (tileMeta & 0xF00) >> 8; + if (type >= 0 && type < DoorType.values().length) { + return DoorType.values()[type]; + } + return DoorType.Standard; + } -// @Override -// @SideOnly(Side.CLIENT) -// public void registerBlockIcons(final IIconRegister register) { -// for (final DoorType type : DoorType.values()) { -// type.iconDoorLower = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".lower"); -// type.iconDoorUpper = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".upper"); -// type.iconDoorLowerFlip = new IconFlipped(type.iconDoorLower, true, false); -// type.iconDoorUpperFlip = new IconFlipped(type.iconDoorUpper, true, false); -// } -// } -// -// @Override -// public int getRenderType() { -// return ExtraTrees.doorRenderId; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4) { -// final int par5 = 2; -// final int i1 = this.getFullMetadata(par1IBlockAccess, par2, par3, par4); -// final int j1 = i1 & 0x3; -// final boolean flag = (i1 & 0x4) != 0x0; -// boolean flag2 = false; -// final boolean flag3 = (i1 & 0x8) != 0x0; -// if (flag) { -// if (j1 == 0 && par5 == 2) { -// flag2 = !flag2; -// } -// else if (j1 == 1 && par5 == 5) { -// flag2 = !flag2; -// } -// else if (j1 == 2 && par5 == 3) { -// flag2 = !flag2; -// } -// else if (j1 == 3 && par5 == 4) { -// flag2 = !flag2; -// } -// } -// else { -// if (j1 == 0 && par5 == 5) { -// flag2 = !flag2; -// } -// else if (j1 == 1 && par5 == 3) { -// flag2 = !flag2; -// } -// else if (j1 == 2 && par5 == 4) { -// flag2 = !flag2; -// } -// else if (j1 == 3 && par5 == 2) { -// flag2 = !flag2; -// } -// if ((i1 & 0x10) != 0x0) { -// flag2 = !flag2; -// } -// } -// if (flag3) { -// final int meta = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3 - 1, par4); -// return WoodManager.getPlankType(meta & 0xFF).getColour(); -// } -// final int meta = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3, par4); -// return WoodManager.getPlankType(meta & 0xFF).getColour(); -// } + /*@Override + public IIcon getIcon(final int side, final int meta) { + return DoorType.Standard.iconDoorLower; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4, final int par5) { + if (par5 != 1 && par5 != 0) { + final int i1 = this.getFullMetadata(par1IBlockAccess, par2, par3, par4); + final int j1 = i1 & 0x3; + final boolean flag = (i1 & 0x4) != 0x0; + boolean flag2 = false; + final boolean flag3 = (i1 & 0x8) != 0x0; + if (flag) { + if (j1 == 0 && par5 == 2) { + flag2 = !flag2; + } + else if (j1 == 1 && par5 == 5) { + flag2 = !flag2; + } + else if (j1 == 2 && par5 == 3) { + flag2 = !flag2; + } + else if (j1 == 3 && par5 == 4) { + flag2 = !flag2; + } + } + else { + if (j1 == 0 && par5 == 5) { + flag2 = !flag2; + } + else if (j1 == 1 && par5 == 3) { + flag2 = !flag2; + } + else if (j1 == 2 && par5 == 4) { + flag2 = !flag2; + } + else if (j1 == 3 && par5 == 2) { + flag2 = !flag2; + } + if ((i1 & 0x10) != 0x0) { + flag2 = !flag2; + } + } + int tileMeta = 0; + if (flag3) { + tileMeta = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3 - 1, par4); + } + else { + tileMeta = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3, par4); + } + return this.getFlippedIcon(flag3, flag2, tileMeta); + } + return DoorType.Standard.iconDoorLower; + }*/ + + /*@Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(final IIconRegister register) { + for (final DoorType type : DoorType.values()) { + type.iconDoorLower = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".lower"); + type.iconDoorUpper = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".upper"); + type.iconDoorLowerFlip = new IconFlipped(type.iconDoorLower, true, false); + type.iconDoorUpperFlip = new IconFlipped(type.iconDoorUpper, true, false); + } + } + + @Override + public int getRenderType() { + return ExtraTrees.doorRenderId; + } + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4) { + final int par5 = 2; + final int i1 = this.getFullMetadata(par1IBlockAccess, par2, par3, par4); + final int j1 = i1 & 0x3; + final boolean flag = (i1 & 0x4) != 0x0; + boolean flag2 = false; + final boolean flag3 = (i1 & 0x8) != 0x0; + if (flag) { + if (j1 == 0 && par5 == 2) { + flag2 = !flag2; + } + else if (j1 == 1 && par5 == 5) { + flag2 = !flag2; + } + else if (j1 == 2 && par5 == 3) { + flag2 = !flag2; + } + else if (j1 == 3 && par5 == 4) { + flag2 = !flag2; + } + } + else { + if (j1 == 0 && par5 == 5) { + flag2 = !flag2; + } + else if (j1 == 1 && par5 == 3) { + flag2 = !flag2; + } + else if (j1 == 2 && par5 == 4) { + flag2 = !flag2; + } + else if (j1 == 3 && par5 == 2) { + flag2 = !flag2; + } + if ((i1 & 0x10) != 0x0) { + flag2 = !flag2; + } + } + if (flag3) { + final int meta = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3 - 1, par4); + return WoodManager.getPlankType(meta & 0xFF).getColour(); + } + final int meta = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3, par4); + return WoodManager.getPlankType(meta & 0xFF).getColour(); + }*/ + + /*public int getFullMetadata(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4) { + final int l = par1IBlockAccess.getBlockMetadata(par2, par3, par4); + final boolean flag = (l & 0x8) != 0x0; + int i1; + int j1; + if (flag) { + i1 = par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4); + j1 = l; + } + else { + i1 = l; + j1 = par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4); + } + final boolean flag2 = (j1 & 0x1) != 0x0; + return (i1 & 0x7) | (flag ? 8 : 0) | (flag2 ? 16 : 0); + }*/ -// public int getFullMetadata(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4) { -// final int l = par1IBlockAccess.getBlockMetadata(par2, par3, par4); -// final boolean flag = (l & 0x8) != 0x0; -// int i1; -// int j1; -// if (flag) { -// i1 = par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4); -// j1 = l; -// } -// else { -// i1 = l; -// j1 = par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4); -// } -// final boolean flag2 = (j1 & 0x1) != 0x0; -// return (i1 & 0x7) | (flag ? 8 : 0) | (flag2 ? 16 : 0); -// } - @SideOnly(Side.CLIENT) @Override public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { @@ -257,7 +257,6 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntit } } - @Override public boolean isWood(IBlockAccess world, BlockPos pos) { return true; @@ -282,5 +281,4 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntit public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return BlockMetadata.getPickBlock(world, pos); } - } diff --git a/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java b/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java index 3ee6aee5..1c2a69cd 100644 --- a/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java +++ b/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java @@ -2,74 +2,74 @@ package binnie.extratrees.block; public class DoorBlockRenderer //implements ISimpleBlockRenderingHandler { -// @Override -// public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) { -// } -// -// @Override -// public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block par1Block, final int modelId, final RenderBlocks renderer) { -// final int c = par1Block.colorMultiplier(renderer.blockAccess, par2, par3, par4); -// final float c2 = (c >> 16 & 0xFF) / 255.0f; -// final float c3 = (c >> 8 & 0xFF) / 255.0f; -// final float c4 = (c & 0xFF) / 255.0f; -// final Tessellator tessellator = Tessellator.instance; -// final int l = renderer.blockAccess.getBlockMetadata(par2, par3, par4); -// if ((l & 0x8) != 0x0) { -// if (renderer.blockAccess.getBlock(par2, par3 - 1, par4) != par1Block) { -// return false; -// } -// } -// else if (renderer.blockAccess.getBlock(par2, par3 + 1, par4) != par1Block) { -// return false; -// } -// boolean flag = false; -// final float f = 0.5f; -// final float f2 = 1.0f; -// final float f3 = 0.8f; -// final float f4 = 0.6f; -// final int i1 = par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4); -// tessellator.setBrightness((renderer.renderMinY > 0.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3 - 1, par4)); -// tessellator.setColorOpaque_F(f * c2, f * c3, f * c4); -// renderer.renderFaceYNeg(par1Block, par2, par3, par4, renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 0)); -// flag = true; -// tessellator.setBrightness((renderer.renderMaxY < 1.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3 + 1, par4)); -// tessellator.setColorOpaque_F(f2 * c2, f2 * c3, f2 * c4); -// renderer.renderFaceYPos(par1Block, par2, par3, par4, renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 1)); -// flag = true; -// tessellator.setBrightness((renderer.renderMinZ > 0.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4 - 1)); -// tessellator.setColorOpaque_F(f3 * c2, f3 * c3, f3 * c4); -// IIcon icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 2); -// renderer.renderFaceZNeg(par1Block, par2, par3, par4, icon); -// flag = true; -// renderer.flipTexture = false; -// tessellator.setBrightness((renderer.renderMaxZ < 1.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4 + 1)); -// tessellator.setColorOpaque_F(f3 * c2, f3 * c3, f3 * c4); -// icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 3); -// renderer.renderFaceZPos(par1Block, par2, par3, par4, icon); -// flag = true; -// renderer.flipTexture = false; -// tessellator.setBrightness((renderer.renderMinX > 0.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2 - 1, par3, par4)); -// tessellator.setColorOpaque_F(f4 * c2, f4 * c3, f4 * c4); -// icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 4); -// renderer.renderFaceXNeg(par1Block, par2, par3, par4, icon); -// flag = true; -// renderer.flipTexture = false; -// tessellator.setBrightness((renderer.renderMaxX < 1.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2 + 1, par3, par4)); -// tessellator.setColorOpaque_F(f4 * c2, f4 * c3, f4 * c4); -// icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 5); -// renderer.renderFaceXPos(par1Block, par2, par3, par4, icon); -// flag = true; -// renderer.flipTexture = false; -// return flag; -// } -// -// @Override -// public boolean shouldRender3DInInventory(final int i) { -// return false; -// } -// -// @Override -// public int getRenderId() { -// return ExtraTrees.doorRenderId; -// } + /*@Override + public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) { + } + + @Override + public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block par1Block, final int modelId, final RenderBlocks renderer) { + final int c = par1Block.colorMultiplier(renderer.blockAccess, par2, par3, par4); + final float c2 = (c >> 16 & 0xFF) / 255.0f; + final float c3 = (c >> 8 & 0xFF) / 255.0f; + final float c4 = (c & 0xFF) / 255.0f; + final Tessellator tessellator = Tessellator.instance; + final int l = renderer.blockAccess.getBlockMetadata(par2, par3, par4); + if ((l & 0x8) != 0x0) { + if (renderer.blockAccess.getBlock(par2, par3 - 1, par4) != par1Block) { + return false; + } + } + else if (renderer.blockAccess.getBlock(par2, par3 + 1, par4) != par1Block) { + return false; + } + boolean flag = false; + final float f = 0.5f; + final float f2 = 1.0f; + final float f3 = 0.8f; + final float f4 = 0.6f; + final int i1 = par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4); + tessellator.setBrightness((renderer.renderMinY > 0.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3 - 1, par4)); + tessellator.setColorOpaque_F(f * c2, f * c3, f * c4); + renderer.renderFaceYNeg(par1Block, par2, par3, par4, renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 0)); + flag = true; + tessellator.setBrightness((renderer.renderMaxY < 1.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3 + 1, par4)); + tessellator.setColorOpaque_F(f2 * c2, f2 * c3, f2 * c4); + renderer.renderFaceYPos(par1Block, par2, par3, par4, renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 1)); + flag = true; + tessellator.setBrightness((renderer.renderMinZ > 0.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4 - 1)); + tessellator.setColorOpaque_F(f3 * c2, f3 * c3, f3 * c4); + IIcon icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 2); + renderer.renderFaceZNeg(par1Block, par2, par3, par4, icon); + flag = true; + renderer.flipTexture = false; + tessellator.setBrightness((renderer.renderMaxZ < 1.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4 + 1)); + tessellator.setColorOpaque_F(f3 * c2, f3 * c3, f3 * c4); + icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 3); + renderer.renderFaceZPos(par1Block, par2, par3, par4, icon); + flag = true; + renderer.flipTexture = false; + tessellator.setBrightness((renderer.renderMinX > 0.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2 - 1, par3, par4)); + tessellator.setColorOpaque_F(f4 * c2, f4 * c3, f4 * c4); + icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 4); + renderer.renderFaceXNeg(par1Block, par2, par3, par4, icon); + flag = true; + renderer.flipTexture = false; + tessellator.setBrightness((renderer.renderMaxX < 1.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2 + 1, par3, par4)); + tessellator.setColorOpaque_F(f4 * c2, f4 * c3, f4 * c4); + icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 5); + renderer.renderFaceXPos(par1Block, par2, par3, par4, icon); + flag = true; + renderer.flipTexture = false; + return flag; + } + + @Override + public boolean shouldRender3DInInventory(final int i) { + return false; + } + + @Override + public int getRenderId() { + return ExtraTrees.doorRenderId; + }*/ } diff --git a/src/main/java/binnie/extratrees/block/DoorType.java b/src/main/java/binnie/extratrees/block/DoorType.java index c6e97c37..c04ee63d 100644 --- a/src/main/java/binnie/extratrees/block/DoorType.java +++ b/src/main/java/binnie/extratrees/block/DoorType.java @@ -9,11 +9,11 @@ public enum DoorType { Full("full"); String id; -// IIcon iconDoorLower; -// IIcon iconDoorUpper; -// IIcon iconDoorLowerFlip; -// IIcon iconDoorUpperFlip; -// IIcon iconItem; + //IIcon iconDoorLower; + //IIcon iconDoorUpper; + //IIcon iconDoorLowerFlip; + //IIcon iconDoorUpperFlip; + //IIcon iconItem; DoorType(final String iconName) { this.id = iconName; diff --git a/src/main/java/binnie/extratrees/block/EnumETLog.java b/src/main/java/binnie/extratrees/block/EnumETLog.java index e1e2d3d4..52375bc3 100644 --- a/src/main/java/binnie/extratrees/block/EnumETLog.java +++ b/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -61,6 +61,13 @@ public enum EnumETLog implements IWoodType { this.plank = plank; } + public static EnumETLog byMetadata(int meta) { + if (meta < 0 || meta >= VALUES.length) { + meta = 0; + } + return VALUES[meta]; + } + @Override public String getName() { return name().toLowerCase(); @@ -147,12 +154,5 @@ public enum EnumETLog implements IWoodType { public int getMetadata() { return ordinal(); } - - public static EnumETLog byMetadata(int meta) { - if (meta < 0 || meta >= VALUES.length) { - meta = 0; - } - return VALUES[meta]; - } } diff --git a/src/main/java/binnie/extratrees/block/EnumShrubLog.java b/src/main/java/binnie/extratrees/block/EnumShrubLog.java index 7d21e9ab..6afacd05 100644 --- a/src/main/java/binnie/extratrees/block/EnumShrubLog.java +++ b/src/main/java/binnie/extratrees/block/EnumShrubLog.java @@ -38,7 +38,7 @@ public enum EnumShrubLog implements IWoodType { } return 0.15F; } - + @Override public String getPlankTexture() { return "blocks/planks_oak"; diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index 62cefd4d..c589f8ba 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -12,7 +12,7 @@ public enum FruitPod { FruitPod() { } - + public String getModelName() { return name().toLowerCase(Locale.ENGLISH); } diff --git a/src/main/java/binnie/extratrees/block/GateItemRenderer.java b/src/main/java/binnie/extratrees/block/GateItemRenderer.java index 2b54c9c7..88b66950 100644 --- a/src/main/java/binnie/extratrees/block/GateItemRenderer.java +++ b/src/main/java/binnie/extratrees/block/GateItemRenderer.java @@ -2,89 +2,89 @@ package binnie.extratrees.block; public class GateItemRenderer //implements IItemRenderer { -// private void renderStairBlock(final RenderBlocks renderBlocks, final ItemStack item, final float f, final float g, final float h) { -// final Tessellator tessellator = Tessellator.instance; -// final Block block = ((ItemBlock) item.getItem()).field_150939_a; -// final IIcon textureIndex = WoodManager.getPlankType(item.getItemDamage()).getIcon(); -// for (int k = 0; k < 3; ++k) { -// float f2 = 0.0625f; -// if (k == 0) { -// renderBlocks.setRenderBounds(0.5f - f2, 0.30000001192092896, 0.0, 0.5f + f2, 1.0, f2 * 2.0f); -// } -// if (k == 1) { -// renderBlocks.setRenderBounds(0.5f - f2, 0.30000001192092896, 1.0f - f2 * 2.0f, 0.5f + f2, 1.0, 1.0); -// } -// f2 = 0.0625f; -// if (k == 2) { -// renderBlocks.setRenderBounds(0.5f - f2, 0.5, 0.0, 0.5f + f2, 1.0f - f2, 1.0); -// } -// GlStateManager.translate(-0.5f, -0.5f, -0.5f); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(0.0f, -1.0f, 0.0f); -// renderBlocks.renderFaceYNeg(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 0, item.getItemDamage())); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(0.0f, 1.0f, 0.0f); -// renderBlocks.renderFaceYPos(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 1, item.getItemDamage())); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(0.0f, 0.0f, -1.0f); -// renderBlocks.renderFaceZNeg(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 2, item.getItemDamage())); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(0.0f, 0.0f, 1.0f); -// renderBlocks.renderFaceZPos(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 3, item.getItemDamage())); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(-1.0f, 0.0f, 0.0f); -// renderBlocks.renderFaceXNeg(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 4, item.getItemDamage())); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(1.0f, 0.0f, 0.0f); -// renderBlocks.renderFaceXPos(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 5, item.getItemDamage())); -// tessellator.draw(); -// GlStateManager.translate(0.5f, 0.5f, 0.5f); -// } -// } + /*private void renderStairBlock(final RenderBlocks renderBlocks, final ItemStack item, final float f, final float g, final float h) { + final Tessellator tessellator = Tessellator.instance; + final Block block = ((ItemBlock) item.getItem()).field_150939_a; + final IIcon textureIndex = WoodManager.getPlankType(item.getItemDamage()).getIcon(); + for (int k = 0; k < 3; ++k) { + float f2 = 0.0625f; + if (k == 0) { + renderBlocks.setRenderBounds(0.5f - f2, 0.30000001192092896, 0.0, 0.5f + f2, 1.0, f2 * 2.0f); + } + if (k == 1) { + renderBlocks.setRenderBounds(0.5f - f2, 0.30000001192092896, 1.0f - f2 * 2.0f, 0.5f + f2, 1.0, 1.0); + } + f2 = 0.0625f; + if (k == 2) { + renderBlocks.setRenderBounds(0.5f - f2, 0.5, 0.0, 0.5f + f2, 1.0f - f2, 1.0); + } + GlStateManager.translate(-0.5f, -0.5f, -0.5f); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0f, -1.0f, 0.0f); + renderBlocks.renderFaceYNeg(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 0, item.getItemDamage())); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0f, 1.0f, 0.0f); + renderBlocks.renderFaceYPos(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 1, item.getItemDamage())); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0f, 0.0f, -1.0f); + renderBlocks.renderFaceZNeg(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 2, item.getItemDamage())); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0f, 0.0f, 1.0f); + renderBlocks.renderFaceZPos(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 3, item.getItemDamage())); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1.0f, 0.0f, 0.0f); + renderBlocks.renderFaceXNeg(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 4, item.getItemDamage())); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0f, 0.0f, 0.0f); + renderBlocks.renderFaceXPos(block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 5, item.getItemDamage())); + tessellator.draw(); + GlStateManager.translate(0.5f, 0.5f, 0.5f); + } + } -// @Override -// public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { -// switch (type) { -// case ENTITY: { -// return true; -// } -// case EQUIPPED: { -// return true; -// } -// case INVENTORY: { -// return true; -// } -// default: { -// return false; -// } -// } -// } + @Override + public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { + switch (type) { + case ENTITY: { + return true; + } + case EQUIPPED: { + return true; + } + case INVENTORY: { + return true; + } + default: { + return false; + } + } + } -// @Override -// public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { -// return true; -// } -// -// @Override -// public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { -// switch (type) { -// case ENTITY: { -// this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); -// break; -// } -// case EQUIPPED: { -// this.renderStairBlock((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); -// break; -// } -// case INVENTORY: { -// this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); -// break; -// } -// } -// } + @Override + public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { + switch (type) { + case ENTITY: { + this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + break; + } + case EQUIPPED: { + this.renderStairBlock((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); + break; + } + case INVENTORY: { + this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + break; + } + } + }*/ } diff --git a/src/main/java/binnie/extratrees/block/IPlankType.java b/src/main/java/binnie/extratrees/block/IPlankType.java index cd813306..1238969d 100644 --- a/src/main/java/binnie/extratrees/block/IPlankType.java +++ b/src/main/java/binnie/extratrees/block/IPlankType.java @@ -13,10 +13,10 @@ public interface IPlankType extends IDesignMaterial { String getDescription(); IWoodType getWoodType(); - + @SideOnly(Side.CLIENT) TextureAtlasSprite getSprite(); - + @SideOnly(Side.CLIENT) void registerSprites(TextureMap map); } diff --git a/src/main/java/binnie/extratrees/block/ItemETDoor.java b/src/main/java/binnie/extratrees/block/ItemETDoor.java index 869a06b3..03f07fd4 100644 --- a/src/main/java/binnie/extratrees/block/ItemETDoor.java +++ b/src/main/java/binnie/extratrees/block/ItemETDoor.java @@ -12,13 +12,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemETDoor extends ItemMetadata { -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// for (final DoorType type : DoorType.values()) { -// type.iconItem = ExtraTrees.proxy.getIcon(register, "door." + type.id); -// } -// } + /*@Override + @SideOnly(Side.CLIENT) + public void registerIcons(final IIconRegister register) { + for (final DoorType type : DoorType.values()) { + type.iconItem = ExtraTrees.proxy.getIcon(register, "door." + type.id); + } + }*/ public ItemETDoor(final Block block) { super(block); @@ -26,82 +26,82 @@ public class ItemETDoor extends ItemMetadata { this.setCreativeTab(CreativeTabs.REDSTONE); } + 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) { + /*byte b0 = 0; + byte b2 = 0; + if (par4 == 0) { + b2 = 1; + } + if (par4 == 1) { + b0 = -1; + } + if (par4 == 2) { + b2 = -1; + } + if (par4 == 3) { + b0 = 1; + } + + final int i1 = (par0World.isBlockNormalCubeDefault(par1 - b0, par2, par3 - b2, false) ? 1 : 0) + (par0World.isBlockNormalCubeDefault(par1 - b0, par2 + 1, par3 - b2, false) ? 1 : 0); + final int j1 = (par0World.isBlockNormalCubeDefault(par1 + b0, par2, par3 + b2, false) ? 1 : 0) + (par0World.isBlockNormalCubeDefault(par1 + b0, par2 + 1, par3 + b2, false) ? 1 : 0); + final boolean flag = par0World.getBlock(par1 - b0, par2, par3 - b2) == par5Block || par0World.getBlock(par1 - b0, par2 + 1, par3 - b2) == par5Block; + final boolean flag2 = par0World.getBlock(par1 + b0, par2, par3 + b2) == par5Block || par0World.getBlock(par1 + b0, par2 + 1, par3 + b2) == par5Block; + boolean flag3 = false; + if (flag && !flag2) { + flag3 = true; + } + else if (j1 > i1) { + flag3 = true; + } + par0World.setBlock(par1, par2, par3, par5Block, par4, 2); + par0World.setBlock(par1, par2 + 1, par3, par5Block, 0x8 | (flag3 ? 1 : 0), 2); + if (par0World.getBlock(par1, par2, par3) == par5Block) { + final TileEntityMetadata tile = TileEntityMetadata.getTile(par0World, par1, par2, par3); + if (tile != null) { + tile.setTileMetadata(TileEntityMetadata.getItemDamage(item), false); + } + par5Block.onBlockPlacedBy(par0World, par1, par2, par3, player, item); + par5Block.onPostBlockPlaced(par0World, par1, par2, par3, par4); + } + par0World.notifyBlocksOfNeighborChange(par1, par2, par3, par5Block); + par0World.notifyBlocksOfNeighborChange(par1, par2 + 1, par3, par5Block);*/ + } + @Override public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { -// if (par7 != 1) { -// return false; -// } -// ++par5; -// final Block block = ExtraTrees.blockDoor; -// if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) || !par2EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack)) { -// return false; -// } -// if (!block.canPlaceBlockAt(par3World, pos)) { -// return false; -// } -// 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.shrink(1); + /*if (par7 != 1) { + return false; + } + ++par5; + final Block block = ExtraTrees.blockDoor; + if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) || !par2EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack)) { + return false; + } + if (!block.canPlaceBlockAt(par3World, pos)) { + return false; + } + 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.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) { -// byte b0 = 0; -// byte b2 = 0; -// if (par4 == 0) { -// b2 = 1; -// } -// if (par4 == 1) { -// b0 = -1; -// } -// if (par4 == 2) { -// b2 = -1; -// } -// if (par4 == 3) { -// b0 = 1; -// } -// -// final int i1 = (par0World.isBlockNormalCubeDefault(par1 - b0, par2, par3 - b2, false) ? 1 : 0) + (par0World.isBlockNormalCubeDefault(par1 - b0, par2 + 1, par3 - b2, false) ? 1 : 0); -// final int j1 = (par0World.isBlockNormalCubeDefault(par1 + b0, par2, par3 + b2, false) ? 1 : 0) + (par0World.isBlockNormalCubeDefault(par1 + b0, par2 + 1, par3 + b2, false) ? 1 : 0); -// final boolean flag = par0World.getBlock(par1 - b0, par2, par3 - b2) == par5Block || par0World.getBlock(par1 - b0, par2 + 1, par3 - b2) == par5Block; -// final boolean flag2 = par0World.getBlock(par1 + b0, par2, par3 + b2) == par5Block || par0World.getBlock(par1 + b0, par2 + 1, par3 + b2) == par5Block; -// boolean flag3 = false; -// if (flag && !flag2) { -// flag3 = true; -// } -// else if (j1 > i1) { -// flag3 = true; -// } -// par0World.setBlock(par1, par2, par3, par5Block, par4, 2); -// par0World.setBlock(par1, par2 + 1, par3, par5Block, 0x8 | (flag3 ? 1 : 0), 2); -// if (par0World.getBlock(par1, par2, par3) == par5Block) { -// final TileEntityMetadata tile = TileEntityMetadata.getTile(par0World, par1, par2, par3); -// if (tile != null) { -// tile.setTileMetadata(TileEntityMetadata.getItemDamage(item), false); -// } -// par5Block.onBlockPlacedBy(par0World, par1, par2, par3, player, item); -// par5Block.onPostBlockPlaced(par0World, par1, par2, par3, par4); -// } -// par0World.notifyBlocksOfNeighborChange(par1, par2, par3, par5Block); -// par0World.notifyBlocksOfNeighborChange(par1, par2 + 1, par3, par5Block); + /*@Override + @SideOnly(Side.CLIENT) + public int getSpriteNumber() { + return 1; } -// @Override -// @SideOnly(Side.CLIENT) -// public int getSpriteNumber() { -// return 1; -// } -// -// @SideOnly(Side.CLIENT) -// @Override -// public IIcon getIconFromDamage(final int par1) { -// final DoorType type = BlockETDoor.getDoorType(par1); -// return type.iconItem; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public int getColorFromItemStack(final ItemStack par1ItemStack, final int par2) { -// return WoodManager.getPlankType((par1ItemStack.isEmpty()) ? 0 : (par1ItemStack.getItemDamage() & 0xFF)).getColour(); -// } + @SideOnly(Side.CLIENT) + @Override + public IIcon getIconFromDamage(final int par1) { + final DoorType type = BlockETDoor.getDoorType(par1); + return type.iconItem; + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(final ItemStack par1ItemStack, final int par2) { + return WoodManager.getPlankType((par1ItemStack.isEmpty()) ? 0 : (par1ItemStack.getItemDamage() & 0xFF)).getColour(); + }*/ } diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index d405cf57..39731c51 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -6,11 +6,26 @@ import binnie.core.Mods; import binnie.core.block.ItemMetadata; import binnie.core.liquid.ILiquidType; import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.decor.*; -import binnie.extratrees.block.wood.*; +import binnie.extratrees.block.decor.BlockHedge; +import binnie.extratrees.block.decor.BlockMultiFence; +import binnie.extratrees.block.decor.FenceType; +import binnie.extratrees.block.decor.MultiFenceRecipeEmbedded; +import binnie.extratrees.block.decor.MultiFenceRecipeSize; +import binnie.extratrees.block.decor.MultiFenceRecipeSolid; +import binnie.extratrees.block.wood.BlockETFence; +import binnie.extratrees.block.wood.BlockETLog; +import binnie.extratrees.block.wood.BlockETPlank; +import binnie.extratrees.block.wood.BlockETSlab; +import binnie.extratrees.block.wood.BlockShrubLog; +import binnie.extratrees.block.wood.ItemBlockETWood; +import binnie.extratrees.block.wood.ItemETSlab; import binnie.extratrees.genetics.ETTreeDefinition; import binnie.extratrees.item.ExtraTreeLiquid; -import forestry.api.arboriculture.*; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IWoodAccess; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.recipes.RecipeManagers; import forestry.arboriculture.WoodAccess; import forestry.arboriculture.blocks.BlockForestryFenceGate; @@ -35,9 +50,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - public class ModuleBlocks implements IInitializable { - // public static int hedgeRenderID; + //public static int hedgeRenderID; public List logs; public List logsFireproof; @@ -62,6 +76,20 @@ public class ModuleBlocks implements IInitializable { //???? public Block blockBranch; + private static void addRecipeAtPosition(int position, IRecipe recipe) { + CraftingManager manager = CraftingManager.getInstance(); + manager.getRecipeList().add(position, recipe); + } + + private static void registerOreDictWildcard(String oreDictName, Block block) { + OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE)); + } + + public static ItemStack getDecorativeLeaves(String speciesUid) { + ItemStack itemStack = ExtraTrees.blocks().speciesToLeavesDecorative.get(speciesUid); + return itemStack.copy(); + } + @Override public void preInit() { PlankType.setup(); @@ -227,7 +255,7 @@ public class ModuleBlocks implements IInitializable { speciesToLeavesDecorative.put(speciesUid, new ItemStack(leaves, 1, meta)); } } - + shrubLog = new BlockShrubLog(); ExtraTrees.proxy.registerBlock(shrubLog, new ItemBlockETWood(shrubLog)); woodAccess.register(EnumShrubLog.INSTANCE, WoodBlockKind.LOG, false, shrubLog.getStateFromMeta(0), new ItemStack(shrubLog, 1, 0)); @@ -236,9 +264,9 @@ public class ModuleBlocks implements IInitializable { @Override public void init() { -// ExtraTrees.doorRenderId = RenderingRegistry.getNextAvailableRenderId(); -// RenderingRegistry.registerBlockHandler(new DoorBlockRenderer()); -// RenderingRegistry.registerBlockHandler(new HedgeRenderer()); + // ExtraTrees.doorRenderId = RenderingRegistry.getNextAvailableRenderId(); + // RenderingRegistry.registerBlockHandler(new DoorBlockRenderer()); + // RenderingRegistry.registerBlockHandler(new HedgeRenderer()); RecipeSorter.register("extratrees:multifence", MultiFenceRecipeSize.class, RecipeSorter.Category.SHAPED, ""); RecipeSorter.register("extratrees:multifence2", MultiFenceRecipeEmbedded.class, RecipeSorter.Category.SHAPED, ""); RecipeSorter.register("extratrees:multifence3", MultiFenceRecipeSolid.class, RecipeSorter.Category.SHAPED, ""); @@ -255,10 +283,11 @@ public class ModuleBlocks implements IInitializable { stairs.setCount(4); RecipeUtil.addPriorityRecipe(stairs.copy(), - "# ", - "## ", - "###", - '#', planks.copy()); + "# ", + "## ", + "###", + '#', planks.copy() + ); slabs.setCount(6); RecipeUtil.addPriorityRecipe(slabs.copy(), "###", '#', planks.copy()); @@ -298,18 +327,4 @@ public class ModuleBlocks implements IInitializable { public void addSqueezer(final IWoodType log, final ILiquidType liquid, final int amount) { this.addSqueezer(log, liquid, amount, 0.5f); } - - private static void addRecipeAtPosition(int position, IRecipe recipe) { - CraftingManager manager = CraftingManager.getInstance(); - manager.getRecipeList().add(position, recipe); - } - - private static void registerOreDictWildcard(String oreDictName, Block block) { - OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE)); - } - - public static ItemStack getDecorativeLeaves(String speciesUid) { - ItemStack itemStack = ExtraTrees.blocks().speciesToLeavesDecorative.get(speciesUid); - return itemStack.copy(); - } } diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 25427b96..744f24a0 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -3,7 +3,11 @@ package binnie.extratrees.block; import binnie.Constants; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; -import forestry.api.arboriculture.*; +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; @@ -69,9 +73,8 @@ public class PlankType { Banana(0); public static final ExtraTreePlanks[] VALUES = values(); - - private EnumETLog woodType; private final int color; + private EnumETLog woodType; @SideOnly(Side.CLIENT) private TextureAtlasSprite sprite; @@ -118,15 +121,15 @@ public class PlankType { Banana.setWoodType(EnumETLog.Banana); } - public void setWoodType(EnumETLog woodType) { - this.woodType = woodType; - } - @Override public EnumETLog getWoodType() { return woodType; } + public void setWoodType(EnumETLog woodType) { + this.woodType = woodType; + } + @Override public String getName() { return ExtraTrees.proxy.localise("block.planks." + this.toString().toLowerCase()); @@ -156,13 +159,13 @@ public class PlankType { public ItemStack getStack() { return getStack(true); } - + @SideOnly(Side.CLIENT) @Override public TextureAtlasSprite getSprite() { return sprite; } - + @SideOnly(Side.CLIENT) @Override public void registerSprites(TextureMap map) { @@ -207,13 +210,13 @@ public class PlankType { public String getPlankTextureName() { return "minecraft:blocks/planks_" + name().toLowerCase(); } - + @SideOnly(Side.CLIENT) @Override public TextureAtlasSprite getSprite() { return sprite; } - + @SideOnly(Side.CLIENT) @Override public void registerSprites(TextureMap map) { @@ -240,15 +243,15 @@ public class PlankType { return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof); } -// @Override -// public IIcon getIcon() { -// if (this.getStack() != null) { -// final int meta = this.getStack().getItemDamage(); -// final Block block = Blocks.planks; -// return block.getIcon(2, meta); -// } -// return null; -// } + /*@Override + public IIcon getIcon() { + if (this.getStack() != null) { + final int meta = this.getStack().getItemDamage(); + final Block block = Blocks.planks; + return block.getIcon(2, meta); + } + return null; + }*/ } public enum ForestryPlanks implements IPlankType, IFenceProvider { @@ -306,13 +309,13 @@ public class PlankType { public String getDescription() { return ExtraTrees.proxy.localise("block.planks.forestry." + this.toString().toLowerCase() + ".desc"); } - + @SideOnly(Side.CLIENT) @Override public TextureAtlasSprite getSprite() { return sprite; } - + @SideOnly(Side.CLIENT) @Override public void registerSprites(TextureMap map) { @@ -339,15 +342,15 @@ public class PlankType { return getStack(true); } -// @Override -// public IIcon getIcon() { -// if (this.getStack() != null) { -// final int meta = this.getStack().getItemDamage(); -// final Block block = ((ItemBlock) this.getStack().getItem()).field_150939_a; -// return block.getIcon(2, meta); -// } -// return null; -// } + /*@Override + public IIcon getIcon() { + if (this.getStack() != null) { + final int meta = this.getStack().getItemDamage(); + final Block block = ((ItemBlock) this.getStack().getItem()).field_150939_a; + return block.getIcon(2, meta); + } + return null; + }*/ @Override public ItemStack getFence() { @@ -410,14 +413,14 @@ public class PlankType { } } -// @Override -// public IIcon getIcon() { -// if (this.getStack() != null) { -// final int meta = this.getStack().getItemDamage(); -// final Block block = ((ItemBlock) this.getStack().getItem()).field_150939_a; -// return block.getIcon(2, meta); -// } -// return null; -// } + @Override + public IIcon getIcon() { + if (this.getStack() != null) { + final int meta = this.getStack().getItemDamage(); + final Block block = ((ItemBlock) this.getStack().getItem()).field_150939_a; + return block.getIcon(2, meta); + } + return null; + } }*/ } diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 8df26f9b..3bcdab53 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -16,10 +16,16 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class WoodManager { public static Map PLANKS; + public static String getDisplayName(IWoodTyped wood, IWoodType woodType) { WoodBlockKind blockKind = wood.getBlockKind(); @@ -133,18 +139,18 @@ public class WoodManager { Collections.addAll(list, PlankType.VanillaPlanks.values()); return list; } - - public static Map getAllPlankStacks(){ - if(PLANKS == null){ + + public static Map getAllPlankStacks() { + if (PLANKS == null) { PLANKS = new HashMap<>(); - for(IPlankType type : getAllPlankTypes()){ + for (IPlankType type : getAllPlankTypes()) { PLANKS.put(type, type.getStack(false)); } } return PLANKS; } - - public static Collection getAllPlankStacks(IPlankType type){ + + public static Collection getAllPlankStacks(IPlankType type) { Map planks = new HashMap<>(getAllPlankStacks()); planks.remove(type); return planks.values(); diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java index ce7fedd5..af0dcd7a 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java @@ -34,6 +34,17 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { this.setRegistryName("hedge"); } + @SideOnly(Side.CLIENT) + public static int getColor(int meta) { + EnumLeafType type = EnumLeafType.values()[meta % 6]; + if (type == EnumLeafType.CONIFERS) { + return ColorizerFoliage.getFoliageColorPine(); + } + final double d0 = 0.5; + final double d2 = 1.0; + return ColorizerFoliage.getFoliageColor(d0, d2); + } + @Override 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()); @@ -108,16 +119,16 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { return false; } - @Override - public boolean isPassable(IBlockAccess worldIn, BlockPos pos) { - return false; - } - /*@Override public int getRenderType() { return ModuleBlocks.hedgeRenderID; }*/ + @Override + public boolean isPassable(IBlockAccess worldIn, BlockPos pos) { + return false; + } + public boolean canConnectFenceTo(IBlockAccess world, BlockPos pos) { IBlockState state = world.getBlockState(pos); Block block = state.getBlock(); @@ -153,10 +164,6 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { return EnumLeafType.values()[meta % 8]; } - private boolean isFull(final int meta) { - return meta / 8 > 0; - } - /*@Override @SideOnly(Side.CLIENT) public IIcon getIcon(final int p_149691_1_, final int meta) { @@ -164,6 +171,10 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { return ForestryAPI.textureManager.getIcon(this.isFull(meta) ? type.plainUID : type.fancyUID); }*/ + private boolean isFull(final int meta) { + return meta / 8 > 0; + } + @Override @SideOnly(Side.CLIENT) public void getSubBlocks(final Item item, final CreativeTabs tab, final NonNullList list) { @@ -179,15 +190,4 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { public int colorMultiplier(IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) { return getColor(getMetaFromState(state)); } - - @SideOnly(Side.CLIENT) - public static int getColor(int meta) { - EnumLeafType type = EnumLeafType.values()[meta % 6]; - if (type == EnumLeafType.CONIFERS) { - return ColorizerFoliage.getFoliageColorPine(); - } - final double d0 = 0.5; - final double d2 = 1.0; - return ColorizerFoliage.getFoliageColor(d0, d2); - } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 7763dcb6..18b2a3af 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -158,7 +158,7 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return BlockMetadata.getPickBlock(world, pos); } - + @Override protected BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[]{NORTH, EAST, WEST, SOUTH}, new IUnlistedProperty[]{UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS}); @@ -176,19 +176,18 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat itemList.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1)); } } - + @SideOnly(Side.CLIENT) @Nullable - public TextureAtlasSprite getSprite(int meta, boolean secondary){ + public TextureAtlasSprite getSprite(int meta, boolean secondary) { FenceDescription desc = getDescription(meta); - if(desc != null){ + if (desc != null) { IPlankType type = secondary ? desc.getSecondaryPlankType() : desc.getPlankType(); return type.getSprite(); } return null; } - @Override public String getDisplayName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); @@ -210,9 +209,10 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat ResourceLocation registryName = getRegistryName(); ModelLoader.setCustomStateMapper(this, new DefaultStateMapper(registryName)); ModelManager.registerCustomBlockModel(new BlockModelEntry( - new ModelResourceLocation(registryName, "normal"), - new ModelResourceLocation(registryName, "inventory"), - new ModelMultiFence(), this)); + new ModelResourceLocation(registryName, "normal"), + new ModelResourceLocation(registryName, "inventory"), + new ModelMultiFence(), this + )); } @SideOnly(Side.CLIENT) @@ -227,6 +227,5 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat public ModelResourceLocation getModelLocation(ItemStack stack) { return new ModelResourceLocation(getRegistryName(), "inventory"); } - } } diff --git a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java b/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java index ec930e89..b1ec2016 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java @@ -2,7 +2,7 @@ package binnie.extratrees.block.decor; public class FenceRenderer //implements ISimpleBlockRenderingHandler { - /*public static int layer; + /*public static int layer; @Override public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) { diff --git a/src/main/java/binnie/extratrees/block/decor/FenceType.java b/src/main/java/binnie/extratrees/block/decor/FenceType.java index 1216d82b..c81bd43b 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceType.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceType.java @@ -8,7 +8,7 @@ import java.util.List; public class FenceType { public static List VALUES; - + public int size; public boolean solid; public boolean embossed; @@ -19,35 +19,6 @@ public class FenceType { this.embossed = embedded; } - public String getPrefix() { - String prefix = ""; - if(size == 1){ - prefix+=ExtraTrees.proxy.localise("multifence.low.type"); - }else if(size == 2){ - prefix+=ExtraTrees.proxy.localise("multifence.full.type"); - } - if(solid){ - if(!prefix.isEmpty()){ - prefix+=" "; - } - prefix+=ExtraTrees.proxy.localise("multifence.solid.type"); - } - if(embossed){ - if(!prefix.isEmpty()){ - prefix+=" "; - } - prefix+=ExtraTrees.proxy.localise("multifence.embedded.type"); - } - if(!prefix.isEmpty()){ - prefix+=" "; - } - return prefix; - } - - public int ordinal() { - return this.size + ((this.solid ? 1 : 0) << 2) + ((this.embossed ? 1 : 0) << 3); - } - public FenceType(final int meta) { this.size = (meta & 0x3); this.solid = ((meta >> 2 & 0x1) > 0); @@ -55,7 +26,7 @@ public class FenceType { } public static Collection values() { - if(VALUES == null){ + if (VALUES == null) { VALUES = new ArrayList<>(); for (int size = 0; size < 3; ++size) { for (final boolean solid : new boolean[]{false, true}) { @@ -68,10 +39,39 @@ public class FenceType { return VALUES; } + public String getPrefix() { + String prefix = ""; + if (size == 1) { + prefix += ExtraTrees.proxy.localise("multifence.low.type"); + } else if (size == 2) { + prefix += ExtraTrees.proxy.localise("multifence.full.type"); + } + if (solid) { + if (!prefix.isEmpty()) { + prefix += " "; + } + prefix += ExtraTrees.proxy.localise("multifence.solid.type"); + } + if (embossed) { + if (!prefix.isEmpty()) { + prefix += " "; + } + prefix += ExtraTrees.proxy.localise("multifence.embedded.type"); + } + if (!prefix.isEmpty()) { + prefix += " "; + } + return prefix; + } + + public int ordinal() { + return this.size + ((this.solid ? 1 : 0) << 2) + ((this.embossed ? 1 : 0) << 3); + } + public boolean isPlain() { return this.size == 0 && !this.embossed && !this.solid; } - + @Override public String toString() { return size + (embossed ? ":embossed" : "") + (solid ? ":solid" : ""); diff --git a/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java b/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java index 0d9836f4..64efd275 100644 --- a/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java +++ b/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java @@ -2,111 +2,111 @@ package binnie.extratrees.block.decor; public class HedgeRenderer //implements ISimpleBlockRenderingHandler { -// @Override -// public void renderInventoryBlock(final Block block, final int metadata, final int modelId, final RenderBlocks renderer) { -// final int color = BlockHedge.getColor(metadata); -// final int r = color >> 16 & 0xFF; -// final int g = color >> 8 & 0xFF; -// final int b = color & 0xFF; -// GL11.glColor3f(r / 255.0f, g / 255.0f, b / 255.0f); -// renderer.setRenderBounds(0.25, 0.0, 0.25, 0.75, 1.0, 0.75); -// final Tessellator tess = Tessellator.instance; -// GlStateManager.translate(-0.5f, -0.5f, -0.5f); -// tess.startDrawingQuads(); -// tess.setNormal(0.0f, -1.0f, 0.0f); -// renderer.renderFaceYNeg(block, 0.0, 0.0, 0.0, block.getIcon(0, metadata)); -// tess.draw(); -// tess.startDrawingQuads(); -// tess.setNormal(0.0f, 1.0f, 0.0f); -// renderer.renderFaceYPos(block, 0.0, 0.0, 0.0, block.getIcon(1, metadata)); -// tess.draw(); -// tess.startDrawingQuads(); -// tess.setNormal(0.0f, 0.0f, -1.0f); -// renderer.renderFaceXPos(block, 0.0, 0.0, 0.0, block.getIcon(2, metadata)); -// tess.draw(); -// tess.startDrawingQuads(); -// tess.setNormal(0.0f, 0.0f, 1.0f); -// renderer.renderFaceXNeg(block, 0.0, 0.0, 0.0, block.getIcon(3, metadata)); -// tess.draw(); -// tess.startDrawingQuads(); -// tess.setNormal(-1.0f, 0.0f, 0.0f); -// renderer.renderFaceZNeg(block, 0.0, 0.0, 0.0, block.getIcon(4, metadata)); -// tess.draw(); -// tess.startDrawingQuads(); -// tess.setNormal(1.0f, 0.0f, 0.0f); -// renderer.renderFaceZPos(block, 0.0, 0.0, 0.0, block.getIcon(5, metadata)); -// tess.draw(); -// GlStateManager.translate(0.5f, 0.5f, 0.5f); -// } -// -// @Override -// public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) { -// final IIcon icon = block.getIcon(0, world.getBlockMetadata(x, y, z)); -// final BlockHedge hedge = ExtraTrees.blockHedge; -// final boolean connectNegX = hedge.canConnectFenceTo(world, x - 1, y, z); -// final boolean connectPosX = hedge.canConnectFenceTo(world, x + 1, y, z); -// final boolean connectNegZ = hedge.canConnectFenceTo(world, x, y, z - 1); -// final boolean connectPosZ = hedge.canConnectFenceTo(world, x, y, z + 1); -// GlStateManager.pushMatrix(); -// renderer.setRenderBounds(0.25, 0.0, 0.25, 0.75, 1.0, 0.75); -// renderer.renderStandardBlock(block, x, y, z); -// renderer.renderFaceYPos(block, x, y, z, icon); -// renderer.renderFaceYNeg(block, x, y, z, icon); -// if (!connectNegX) { -// renderer.renderFaceXNeg(block, x, y, z, icon); -// } -// if (!connectPosX) { -// renderer.renderFaceXPos(block, x, y, z, icon); -// } -// if (!connectNegZ) { -// renderer.renderFaceZNeg(block, x, y, z, icon); -// } -// if (!connectPosZ) { -// renderer.renderFaceZPos(block, x, y, z, icon); -// } -// if (connectNegX) { -// renderer.setRenderBounds(0.0, 0.0, 0.25, 0.25, 1.0, 0.75); -// renderer.renderFaceYPos(block, x, y, z, icon); -// renderer.renderFaceYNeg(block, x, y, z, icon); -// renderer.renderFaceXNeg(block, x, y, z, icon); -// renderer.renderFaceZNeg(block, x, y, z, icon); -// renderer.renderFaceZPos(block, x, y, z, icon); -// } -// if (connectPosX) { -// renderer.setRenderBounds(0.75, 0.0, 0.25, 1.0, 1.0, 0.75); -// renderer.renderFaceYPos(block, x, y, z, icon); -// renderer.renderFaceYNeg(block, x, y, z, icon); -// renderer.renderFaceXPos(block, x, y, z, icon); -// renderer.renderFaceZNeg(block, x, y, z, icon); -// renderer.renderFaceZPos(block, x, y, z, icon); -// } -// if (connectPosZ) { -// renderer.setRenderBounds(0.25, 0.0, 0.75, 0.75, 1.0, 1.0); -// renderer.renderFaceYPos(block, x, y, z, icon); -// renderer.renderFaceYNeg(block, x, y, z, icon); -// renderer.renderFaceZPos(block, x, y, z, icon); -// renderer.renderFaceXNeg(block, x, y, z, icon); -// renderer.renderFaceXPos(block, x, y, z, icon); -// } -// if (connectNegZ) { -// renderer.setRenderBounds(0.25, 0.0, 0.0, 0.75, 1.0, 0.25); -// renderer.renderFaceYPos(block, x, y, z, icon); -// renderer.renderFaceYNeg(block, x, y, z, icon); -// renderer.renderFaceZNeg(block, x, y, z, icon); -// renderer.renderFaceXNeg(block, x, y, z, icon); -// renderer.renderFaceXPos(block, x, y, z, icon); -// } -// GlStateManager.popMatrix(); -// return false; -// } -// -// @Override -// public boolean shouldRender3DInInventory(final int modelId) { -// return true; -// } -// -// @Override -// public int getRenderId() { -// return ModuleBlocks.hedgeRenderID; -// } + /*@Override + public void renderInventoryBlock(final Block block, final int metadata, final int modelId, final RenderBlocks renderer) { + final int color = BlockHedge.getColor(metadata); + final int r = color >> 16 & 0xFF; + final int g = color >> 8 & 0xFF; + final int b = color & 0xFF; + GL11.glColor3f(r / 255.0f, g / 255.0f, b / 255.0f); + renderer.setRenderBounds(0.25, 0.0, 0.25, 0.75, 1.0, 0.75); + final Tessellator tess = Tessellator.instance; + GlStateManager.translate(-0.5f, -0.5f, -0.5f); + tess.startDrawingQuads(); + tess.setNormal(0.0f, -1.0f, 0.0f); + renderer.renderFaceYNeg(block, 0.0, 0.0, 0.0, block.getIcon(0, metadata)); + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(0.0f, 1.0f, 0.0f); + renderer.renderFaceYPos(block, 0.0, 0.0, 0.0, block.getIcon(1, metadata)); + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(0.0f, 0.0f, -1.0f); + renderer.renderFaceXPos(block, 0.0, 0.0, 0.0, block.getIcon(2, metadata)); + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(0.0f, 0.0f, 1.0f); + renderer.renderFaceXNeg(block, 0.0, 0.0, 0.0, block.getIcon(3, metadata)); + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(-1.0f, 0.0f, 0.0f); + renderer.renderFaceZNeg(block, 0.0, 0.0, 0.0, block.getIcon(4, metadata)); + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(1.0f, 0.0f, 0.0f); + renderer.renderFaceZPos(block, 0.0, 0.0, 0.0, block.getIcon(5, metadata)); + tess.draw(); + GlStateManager.translate(0.5f, 0.5f, 0.5f); + } + + @Override + public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) { + final IIcon icon = block.getIcon(0, world.getBlockMetadata(x, y, z)); + final BlockHedge hedge = ExtraTrees.blockHedge; + final boolean connectNegX = hedge.canConnectFenceTo(world, x - 1, y, z); + final boolean connectPosX = hedge.canConnectFenceTo(world, x + 1, y, z); + final boolean connectNegZ = hedge.canConnectFenceTo(world, x, y, z - 1); + final boolean connectPosZ = hedge.canConnectFenceTo(world, x, y, z + 1); + GlStateManager.pushMatrix(); + renderer.setRenderBounds(0.25, 0.0, 0.25, 0.75, 1.0, 0.75); + renderer.renderStandardBlock(block, x, y, z); + renderer.renderFaceYPos(block, x, y, z, icon); + renderer.renderFaceYNeg(block, x, y, z, icon); + if (!connectNegX) { + renderer.renderFaceXNeg(block, x, y, z, icon); + } + if (!connectPosX) { + renderer.renderFaceXPos(block, x, y, z, icon); + } + if (!connectNegZ) { + renderer.renderFaceZNeg(block, x, y, z, icon); + } + if (!connectPosZ) { + renderer.renderFaceZPos(block, x, y, z, icon); + } + if (connectNegX) { + renderer.setRenderBounds(0.0, 0.0, 0.25, 0.25, 1.0, 0.75); + renderer.renderFaceYPos(block, x, y, z, icon); + renderer.renderFaceYNeg(block, x, y, z, icon); + renderer.renderFaceXNeg(block, x, y, z, icon); + renderer.renderFaceZNeg(block, x, y, z, icon); + renderer.renderFaceZPos(block, x, y, z, icon); + } + if (connectPosX) { + renderer.setRenderBounds(0.75, 0.0, 0.25, 1.0, 1.0, 0.75); + renderer.renderFaceYPos(block, x, y, z, icon); + renderer.renderFaceYNeg(block, x, y, z, icon); + renderer.renderFaceXPos(block, x, y, z, icon); + renderer.renderFaceZNeg(block, x, y, z, icon); + renderer.renderFaceZPos(block, x, y, z, icon); + } + if (connectPosZ) { + renderer.setRenderBounds(0.25, 0.0, 0.75, 0.75, 1.0, 1.0); + renderer.renderFaceYPos(block, x, y, z, icon); + renderer.renderFaceYNeg(block, x, y, z, icon); + renderer.renderFaceZPos(block, x, y, z, icon); + renderer.renderFaceXNeg(block, x, y, z, icon); + renderer.renderFaceXPos(block, x, y, z, icon); + } + if (connectNegZ) { + renderer.setRenderBounds(0.25, 0.0, 0.0, 0.75, 1.0, 0.25); + renderer.renderFaceYPos(block, x, y, z, icon); + renderer.renderFaceYNeg(block, x, y, z, icon); + renderer.renderFaceZNeg(block, x, y, z, icon); + renderer.renderFaceXNeg(block, x, y, z, icon); + renderer.renderFaceXPos(block, x, y, z, icon); + } + GlStateManager.popMatrix(); + return false; + } + + @Override + public boolean shouldRender3DInInventory(final int modelId) { + return true; + } + + @Override + public int getRenderId() { + return ModuleBlocks.hedgeRenderID; + }*/ } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 66a8754c..786f9ae0 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -24,7 +24,7 @@ public class MultiFenceRecipeEmbedded implements IRecipe { FenceType typeSecond = WoodManager.getFenceType(c); if (type != null && typeSecond != null && type.equals(typeSecond)) { FenceDescription fenceDescription = WoodManager.getFenceDescription(a); - if(fenceDescription != null){ + if (fenceDescription != null) { IPlankType descPlankType = fenceDescription.getPlankType(); IPlankType plankType = WoodManager.getPlankType(b); if (descPlankType == plankType) { diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java index e118d65d..274f4180 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java @@ -4,43 +4,43 @@ import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import net.minecraft.item.ItemStack; -public class MultiFenceRecipePattern{ +public class MultiFenceRecipePattern { public static MultiFenceRecipePattern[] VALUES; - - static{ - VALUES = new MultiFenceRecipePattern[] { - new MultiFenceRecipePattern(0, 2, "010"+"0 0"+" "), - new MultiFenceRecipePattern(0, 1, "000"+"0 0"+" "), - new MultiFenceRecipePattern(1, 2, "010"+"0 0"+" 1 "), - new MultiFenceRecipePattern(1, 1, "000"+"0 0"+" 0 "), - new MultiFenceRecipePattern(2, 2, " 0 "+"1 1"+"101"), - new MultiFenceRecipePattern(2, 1, " 0 "+"0 0"+"000") + + static { + VALUES = new MultiFenceRecipePattern[]{ + new MultiFenceRecipePattern(0, 2, "010" + "0 0" + " "), + new MultiFenceRecipePattern(0, 1, "000" + "0 0" + " "), + new MultiFenceRecipePattern(1, 2, "010" + "0 0" + " 1 "), + new MultiFenceRecipePattern(1, 1, "000" + "0 0" + " 0 "), + new MultiFenceRecipePattern(2, 2, " 0 " + "1 1" + "101"), + new MultiFenceRecipePattern(2, 1, " 0 " + "0 0" + "000") }; } - + private final String pattern; private final int size; private final int typeCount; - + private MultiFenceRecipePattern(int size, int typeCount, String pattern) { this.size = size; this.typeCount = typeCount; this.pattern = pattern; } - + public String getPattern() { return pattern; } - + public int getTypeCount() { return typeCount; } - - public boolean matches(String recipePattern){ + + public boolean matches(String recipePattern) { return pattern.contains(recipePattern); } - - public ItemStack createFence(IPlankType plank, IPlankType plankSecondary){ + + public ItemStack createFence(IPlankType plank, IPlankType plankSecondary) { return WoodManager.getFence(plank, plankSecondary, new FenceType(size, false, false), 4); } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 2750dd6f..ad46877a 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -15,10 +15,10 @@ import java.util.List; public class MultiFenceRecipeSize implements IRecipe { private ItemStack cached = ItemStack.EMPTY; - + public MultiFenceRecipeSize() { } - + @Override public boolean matches(final InventoryCrafting inv, final World world) { StringBuilder recipePattern = new StringBuilder(); @@ -27,9 +27,9 @@ public class MultiFenceRecipeSize implements IRecipe { ItemStack stack = inv.getStackInSlot(i); boolean isEmpty = stack.isEmpty(); IPlankType type; - if(isEmpty){ + if (isEmpty) { type = null; - }else{ + } else { type = WoodManager.getPlankType(stack); } if (!isEmpty && type == null) { @@ -50,8 +50,8 @@ public class MultiFenceRecipeSize implements IRecipe { if (types.isEmpty()) { return false; } - for(MultiFenceRecipePattern pattern : MultiFenceRecipePattern.VALUES){ - if(pattern.matches(recipePattern.toString())){ + for (MultiFenceRecipePattern pattern : MultiFenceRecipePattern.VALUES) { + if (pattern.matches(recipePattern.toString())) { cached = pattern.createFence(types.get(0), types.get(pattern.getTypeCount() - 1)); return true; } diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETType.java b/src/main/java/binnie/extratrees/block/property/PropertyETType.java index ac0261a4..1e510516 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETType.java @@ -8,6 +8,10 @@ import net.minecraft.block.properties.PropertyEnum; import java.util.Collection; public class PropertyETType extends PropertyEnum { + protected PropertyETType(String name, Class valueClass, Collection allowedValues) { + super(name, valueClass, allowedValues); + } + public static int getBlockCount(int variantsPerBlock) { return (int) Math.ceil((float) ETTreeDefinition.VALUES.length / variantsPerBlock); } @@ -17,10 +21,4 @@ public class PropertyETType extends PropertyEnum { Collection allowedValues = Collections2.filter(Lists.newArrayList(ETTreeDefinition.class.getEnumConstants()), filter); return new PropertyETType(name, ETTreeDefinition.class, allowedValues); } - - protected PropertyETType(String name, Class valueClass, Collection allowedValues) { - super(name, valueClass, allowedValues); - } - - } \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java index 4519dc97..406bf07f 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java @@ -10,6 +10,10 @@ import java.util.Collection; public class PropertyETWoodType extends PropertyWoodType { + protected PropertyETWoodType(String name, Class valueClass, Collection allowedValues) { + super(name, valueClass, allowedValues); + } + public static PropertyETWoodType[] create(String name, int variantsPerBlock) { return create(name, variantsPerBlock, false); } @@ -30,8 +34,4 @@ public class PropertyETWoodType extends PropertyWoodType { } return variants; } - - protected PropertyETWoodType(String name, Class valueClass, Collection allowedValues) { - super(name, valueClass, allowedValues); - } } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java index 28a48d51..b6eb9512 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java @@ -13,6 +13,17 @@ import java.util.ArrayList; import java.util.List; public abstract class BlockETFence extends BlockForestryFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { + private BlockETFence(boolean fireproof, int blockNumber) { + super(fireproof, blockNumber); + String name = "fences."; + if (fireproof) { + name += "fireproof."; + } + name += blockNumber; + setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); + setUnlocalizedName(name); + } + public static List create(boolean fireproof) { List blocks = new ArrayList<>(); @@ -30,17 +41,6 @@ public abstract class BlockETFence extends BlockForestryFence impleme return blocks; } - private BlockETFence(boolean fireproof, int blockNumber) { - super(fireproof, blockNumber); - String name = "fences."; - if (fireproof) { - name += "fireproof."; - } - name += blockNumber; - setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); - setUnlocalizedName(name); - } - @Override public EnumETLog getWoodType(int meta) { int variantCount = getVariant().getAllowedValues().size(); diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java index cdb0f702..97d74a24 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java @@ -11,6 +11,17 @@ import java.util.ArrayList; import java.util.List; public abstract class BlockETLog extends BlockForestryLog { + private BlockETLog(boolean fireproof, int blockNumber) { + super(fireproof, blockNumber); + String name = "logs."; + if (fireproof) { + name += "fireproof."; + } + name += blockNumber; + setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); + setUnlocalizedName(name); + } + public static List create(boolean fireproof) { List blocks = new ArrayList<>(); PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK, true); @@ -27,22 +38,10 @@ public abstract class BlockETLog extends BlockForestryLog { return blocks; } - private BlockETLog(boolean fireproof, int blockNumber) { - super(fireproof, blockNumber); - String name = "logs."; - if (fireproof) { - name += "fireproof."; - } - name += blockNumber; - setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); - setUnlocalizedName(name); - } - @Override public EnumETLog getWoodType(int meta) { int variantCount = getVariant().getAllowedValues().size(); int variantMeta = (meta % variantCount) + getBlockNumber() * VARIANTS_PER_BLOCK; return EnumETLog.byMetadata(variantMeta); } - } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java index cedc6845..33bcde24 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java @@ -12,6 +12,17 @@ import java.util.List; public abstract class BlockETPlank extends BlockForestryPlanks { public static final String BLOCK_NAME = "plank"; + private BlockETPlank(boolean fireproof, int blockNumber) { + super(fireproof, blockNumber); + String name = "planks."; + if (fireproof) { + name += "fireproof."; + } + name += blockNumber; + setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); + setUnlocalizedName(name); + } + public static List create(boolean fireproof) { List blocks = new ArrayList<>(); PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK, false); @@ -28,17 +39,6 @@ public abstract class BlockETPlank extends BlockForestryPlanks { return blocks; } - private BlockETPlank(boolean fireproof, int blockNumber) { - super(fireproof, blockNumber); - String name = "planks."; - if (fireproof) { - name += "fireproof."; - } - name += blockNumber; - setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); - setUnlocalizedName(name); - } - @Override public EnumETLog getWoodType(int meta) { int variantCount = getVariant().getAllowedValues().size(); diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java index e0539968..01e8e3cd 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java @@ -10,6 +10,20 @@ import java.util.ArrayList; import java.util.List; public abstract class BlockETSlab extends BlockForestrySlab { + private BlockETSlab(boolean fireproof, int blockNumber) { + super(fireproof, blockNumber); + String name = "slabs."; + if (fireproof) { + name += "fireproof."; + } + if (isDouble()) { + name += "double."; + } + name += blockNumber; + setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); + setUnlocalizedName(name); + } + public static List create(boolean fireproof, final boolean doubleSlab) { List blocks = new ArrayList<>(); PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK, false); @@ -31,20 +45,6 @@ public abstract class BlockETSlab extends BlockForestrySlab { return blocks; } - private BlockETSlab(boolean fireproof, int blockNumber) { - super(fireproof, blockNumber); - String name = "slabs."; - if (fireproof) { - name += "fireproof."; - } - if (isDouble()) { - name += "double."; - } - name += blockNumber; - setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); - setUnlocalizedName(name); - } - @Override public EnumETLog getWoodType(int meta) { meta &= ~8; // unset the top/bottom slab bit diff --git a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java index cc1e53d1..d6f2b681 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java @@ -44,46 +44,69 @@ public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegi public static final PropertyBool EAST = PropertyBool.create("east"); public static final PropertyBool SOUTH = PropertyBool.create("south"); public static final PropertyBool WEST = PropertyBool.create("west"); - protected static final AxisAlignedBB[] BOUNDING_BOXES = new AxisAlignedBB[] { - new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D), - new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 1.0D), - new AxisAlignedBB(0.0D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D), - new AxisAlignedBB(0.0D, 0.0D, 0.375D, 0.625D, 1.0D, 1.0D), - new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.0D, 0.625D), - new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.0D, 1.0D), - new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.625D, 1.0D, 0.625D), - new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.625D, 1.0D, 1.0D), - new AxisAlignedBB(0.375D, 0.0D, 0.375D, 1.0D, 1.0D, 0.625D), - new AxisAlignedBB(0.375D, 0.0D, 0.375D, 1.0D, 1.0D, 1.0D), - new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.0D, 0.625D), - new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.0D, 1.0D), - new AxisAlignedBB(0.375D, 0.0D, 0.0D, 1.0D, 1.0D, 0.625D), - new AxisAlignedBB(0.375D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), - new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.625D), - new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D) }; public static final AxisAlignedBB PILLAR_AABB = new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1D, 0.625D); public static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(0.375D, 0.0D, 0.625D, 0.625D, 1D, 1.0D); public static final AxisAlignedBB WEST_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.375D, 0.375D, 1D, 0.625D); public static final AxisAlignedBB NORTH_AABB = new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1D, 0.375D); public static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(0.625D, 0.0D, 0.375D, 1.0D, 1D, 0.625D); + protected static final AxisAlignedBB[] BOUNDING_BOXES = new AxisAlignedBB[]{ + new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D), + new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 1.0D), + new AxisAlignedBB(0.0D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D), + new AxisAlignedBB(0.0D, 0.0D, 0.375D, 0.625D, 1.0D, 1.0D), + new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.0D, 0.625D), + new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.0D, 1.0D), + new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.625D, 1.0D, 0.625D), + new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.625D, 1.0D, 1.0D), + new AxisAlignedBB(0.375D, 0.0D, 0.375D, 1.0D, 1.0D, 0.625D), + new AxisAlignedBB(0.375D, 0.0D, 0.375D, 1.0D, 1.0D, 1.0D), + new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.0D, 0.625D), + new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.0D, 1.0D), + new AxisAlignedBB(0.375D, 0.0D, 0.0D, 1.0D, 1.0D, 0.625D), + new AxisAlignedBB(0.375D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), + new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.625D), + new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D) + }; public BlockShrubLog() { super(Material.WOOD); this.setDefaultState(this.blockState.getBaseState() - .withProperty(NORTH, false) - .withProperty(EAST, false) - .withProperty(SOUTH, false) - .withProperty(WEST, false) - .withProperty(FIREPROOF, false)); + .withProperty(NORTH, false) + .withProperty(EAST, false) + .withProperty(SOUTH, false) + .withProperty(WEST, false) + .withProperty(FIREPROOF, false)); setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "shrub_log")); setUnlocalizedName("shrub_log"); setSoundType(SoundType.WOOD); setHardness(EnumShrubLog.INSTANCE.getHardness()); } + private static int getBoundingBoxIdx(IBlockState state) { + int i = 0; + + if (state.getValue(NORTH)) { + i |= 1 << EnumFacing.NORTH.getHorizontalIndex(); + } + + if (state.getValue(EAST)) { + i |= 1 << EnumFacing.EAST.getHorizontalIndex(); + } + + if (state.getValue(SOUTH)) { + i |= 1 << EnumFacing.SOUTH.getHorizontalIndex(); + } + + if (state.getValue(WEST)) { + i |= 1 << EnumFacing.WEST.getHorizontalIndex(); + } + + return i; + } + @Override public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, - List collidingBoxes, @Nullable Entity entityIn, boolean p_185477_7_) { + List collidingBoxes, @Nullable Entity entityIn, boolean p_185477_7_) { if (!p_185477_7_) { state = state.getActualState(worldIn, pos); } @@ -113,28 +136,6 @@ public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegi return BOUNDING_BOXES[getBoundingBoxIdx(state)]; } - private static int getBoundingBoxIdx(IBlockState state) { - int i = 0; - - if (state.getValue(NORTH)) { - i |= 1 << EnumFacing.NORTH.getHorizontalIndex(); - } - - if (state.getValue(EAST)) { - i |= 1 << EnumFacing.EAST.getHorizontalIndex(); - } - - if (state.getValue(SOUTH)) { - i |= 1 << EnumFacing.SOUTH.getHorizontalIndex(); - } - - if (state.getValue(WEST)) { - i |= 1 << EnumFacing.WEST.getHorizontalIndex(); - } - - return i; - } - @Override public boolean isOpaqueCube(IBlockState state) { return false; @@ -171,7 +172,7 @@ public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegi @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, - EnumFacing side) { + EnumFacing side) { return true; } @@ -179,7 +180,7 @@ public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegi public int getMetaFromState(IBlockState state) { return state.getValue(FIREPROOF) ? 1 : 0; } - + @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(FIREPROOF, meta == 1); @@ -188,9 +189,9 @@ public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegi @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { return state.withProperty(NORTH, canFenceConnectTo(worldIn, pos, EnumFacing.NORTH)) - .withProperty(EAST, canFenceConnectTo(worldIn, pos, EnumFacing.EAST)) - .withProperty(SOUTH, canFenceConnectTo(worldIn, pos, EnumFacing.SOUTH)) - .withProperty(WEST, canFenceConnectTo(worldIn, pos, EnumFacing.WEST)); + .withProperty(EAST, canFenceConnectTo(worldIn, pos, EnumFacing.EAST)) + .withProperty(SOUTH, canFenceConnectTo(worldIn, pos, EnumFacing.SOUTH)) + .withProperty(WEST, canFenceConnectTo(worldIn, pos, EnumFacing.WEST)); } private boolean canFenceConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing) { @@ -201,70 +202,70 @@ public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegi @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - Random rand = world instanceof World ? ((World)world).rand : RANDOM; + Random rand = world instanceof World ? ((World) world).rand : RANDOM; List ret = new java.util.ArrayList<>(); float chance = 0.75F; int amount = 2; - while(chance >= rand.nextFloat()){ - chance-=0.25; + while (chance >= rand.nextFloat()) { + chance -= 0.25; amount++; } ret.add(new ItemStack(Items.STICK, amount)); return ret; } - + @Override public boolean isWood(IBlockAccess world, BlockPos pos) { return true; } - - @Override - public boolean canSustainLeaves(IBlockState state, IBlockAccess world, BlockPos pos){ - return true; - } - - @Override - public void breakBlock(World worldIn, BlockPos pos, IBlockState state){ - int i = 4; - int j = 5; - if (worldIn.isAreaLoaded(pos.add(-5, -5, -5), pos.add(5, 5, 5))) { - for (BlockPos blockpos : BlockPos.getAllInBox(pos.add(-4, -4, -4), pos.add(4, 4, 4))) { - IBlockState iblockstate = worldIn.getBlockState(blockpos); + @Override + public boolean canSustainLeaves(IBlockState state, IBlockAccess world, BlockPos pos) { + return true; + } + + @Override + public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { + int i = 4; + int j = 5; + + if (worldIn.isAreaLoaded(pos.add(-5, -5, -5), pos.add(5, 5, 5))) { + for (BlockPos blockpos : BlockPos.getAllInBox(pos.add(-4, -4, -4), pos.add(4, 4, 4))) { + IBlockState iblockstate = worldIn.getBlockState(blockpos); + + if (iblockstate.getBlock().isLeaves(iblockstate, worldIn, blockpos)) { + iblockstate.getBlock().beginLeavesDecay(iblockstate, worldIn, blockpos); + } + } + } + } - if (iblockstate.getBlock().isLeaves(iblockstate, worldIn, blockpos)) { - iblockstate.getBlock().beginLeavesDecay(iblockstate, worldIn, blockpos); - } - } - } - } - @Override public IBlockState withRotation(IBlockState state, Rotation rot) { switch (rot) { - case CLOCKWISE_180: - return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(EAST, state.getValue(WEST)) + case CLOCKWISE_180: + return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(EAST, state.getValue(WEST)) .withProperty(SOUTH, state.getValue(NORTH)).withProperty(WEST, state.getValue(EAST)); - case COUNTERCLOCKWISE_90: - return state.withProperty(NORTH, state.getValue(EAST)).withProperty(EAST, state.getValue(SOUTH)) + case COUNTERCLOCKWISE_90: + return state.withProperty(NORTH, state.getValue(EAST)).withProperty(EAST, state.getValue(SOUTH)) .withProperty(SOUTH, state.getValue(WEST)).withProperty(WEST, state.getValue(NORTH)); - case CLOCKWISE_90: - return state.withProperty(NORTH, state.getValue(WEST)).withProperty(EAST, state.getValue(NORTH)) + case CLOCKWISE_90: + return state.withProperty(NORTH, state.getValue(WEST)).withProperty(EAST, state.getValue(NORTH)) .withProperty(SOUTH, state.getValue(EAST)).withProperty(WEST, state.getValue(SOUTH)); - default: - return state; + default: + return state; } } @Override public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { switch (mirrorIn) { - case LEFT_RIGHT: - return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(SOUTH, state.getValue(NORTH)); - case FRONT_BACK: - return state.withProperty(EAST, state.getValue(WEST)).withProperty(WEST, state.getValue(EAST)); - default: - return super.withMirror(state, mirrorIn); + case LEFT_RIGHT: + return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(SOUTH, state.getValue(NORTH)); + case FRONT_BACK: + return state.withProperty(EAST, state.getValue(WEST)).withProperty(WEST, state.getValue(EAST)); + default: + return super.withMirror(state, mirrorIn); } } @@ -277,13 +278,13 @@ public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegi public WoodBlockKind getBlockKind() { return WoodBlockKind.LOG; } - + @SideOnly(Side.CLIENT) @Override public void registerStateMapper() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(FIREPROOF).build()); } - + @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { @@ -306,5 +307,4 @@ public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegi public Collection getWoodTypes() { return Collections.singletonList(EnumShrubLog.INSTANCE); } - } diff --git a/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java b/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java index fc0fd8a3..131e0206 100644 --- a/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java +++ b/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java @@ -21,5 +21,4 @@ public class ItemBlockETWood extends ItemBlockWood IWoodType woodType = wood.getWoodType(meta); return WoodManager.getDisplayName(wood, woodType); } - } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index 77d47620..1458152f 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -24,6 +24,15 @@ public class BlockCarpentryPanel extends BlockCarpentry { this.setLightOpacity(0); } + public static boolean isValidPanelPlacement(IBlockAccess world, BlockPos pos, @Nullable EnumFacing facing) { + if (facing == null) { + return false; + } + pos = pos.offset(facing); + IBlockState state = world.getBlockState(pos); + return state.isSideSolid(world, pos, facing.getOpposite()); + } + @Override public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList itemList) { } @@ -80,15 +89,6 @@ public class BlockCarpentryPanel extends BlockCarpentry { return ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getTileMetadata(world, pos)); } - public static boolean isValidPanelPlacement(IBlockAccess world, BlockPos pos, @Nullable EnumFacing facing) { - if (facing == null) { - return false; - } - pos = pos.offset(facing); - IBlockState state = world.getBlockState(pos); - return state.isSideSolid(world, pos, facing.getOpposite()); - } - @Override public int getPlacedMeta(ItemStack item, World world, BlockPos pos, EnumFacing clickedBlock) { final DesignBlock block = ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getItemDamage(item)); @@ -128,5 +128,4 @@ public class BlockCarpentryPanel extends BlockCarpentry { world.setBlockToAir(pos); } } - } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index e08467ad..406fa051 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -11,7 +11,11 @@ import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IToolHammer; -import forestry.api.core.*; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.ISpriteRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.ITextureManager; import forestry.core.blocks.IColoredBlock; import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; @@ -27,7 +31,11 @@ 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.*; +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; import net.minecraft.world.World; @@ -44,8 +52,17 @@ import javax.annotation.Nullable; import java.util.List; public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock, IColoredBlock, ISpriteRegister, IItemModelRegister, IStateMapperRegister { - IDesignSystem designSystem; public static final EnumFacing[] RENDER_DIRECTIONS = new EnumFacing[]{EnumFacing.DOWN, EnumFacing.UP, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH}; + IDesignSystem designSystem; + + public BlockDesign(final IDesignSystem system, final Material material) { + super(material); + this.designSystem = system; + } + + public static int getMetadata(final int plank1, final int plank2, final int design) { + return plank1 + (plank2 << 9) + (design << 18); + } @SubscribeEvent public void onClick(final PlayerInteractEvent.RightClickBlock event) { @@ -75,11 +92,6 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } } - public BlockDesign(final IDesignSystem system, final Material material) { - super(material); - this.designSystem = system; - } - public abstract ItemStack getCreativeStack(final IDesign p0); @Override @@ -147,10 +159,6 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo return TileEntityMetadata.getItemStack(this, getMetadata(plank1, plank2, design)); } - public static int getMetadata(final int plank1, final int plank2, final int design) { - return plank1 + (plank2 << 9) + (design << 18); - } - @Override public int getDroppedMeta(IBlockState state, int tileMetadata) { final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), tileMetadata); @@ -169,9 +177,10 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo ResourceLocation registryName = getRegistryName(); ModelLoader.setCustomStateMapper(this, new DefaultStateMapper(registryName)); ModelManager.registerCustomBlockModel(new BlockModelEntry( - new ModelResourceLocation(registryName, "normal"), - new ModelResourceLocation(registryName, "inventory"), - new ModelMutlipass<>(BlockDesign.class), this)); + new ModelResourceLocation(registryName, "normal"), + new ModelResourceLocation(registryName, "inventory"), + new ModelMutlipass<>(BlockDesign.class), this + )); } @SideOnly(Side.CLIENT) @@ -180,15 +189,6 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo manager.registerItemModel(item, new DesignMeshDefinition()); } - private class DesignMeshDefinition implements ItemMeshDefinition { - - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return new ModelResourceLocation(getRegistryName(), "inventory"); - } - - } - @Override protected BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[]{UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS}); @@ -243,4 +243,11 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } } + private class DesignMeshDefinition implements ItemMeshDefinition { + + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return new ModelResourceLocation(getRegistryName(), "inventory"); + } + } } diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index b1c25c14..014403d3 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -1,10 +1,20 @@ package binnie.extratrees.carpentry; -import binnie.extratrees.api.*; +import binnie.extratrees.api.ICarpentryInterface; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignCategory; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.api.ILayout; +import binnie.extratrees.api.IPattern; import net.minecraft.item.ItemStack; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; public class CarpentryInterface implements ICarpentryInterface { static Map woodMap = new LinkedHashMap<>(); @@ -99,5 +109,4 @@ public class CarpentryInterface implements ICarpentryInterface { } return null; } - } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index da4af138..bc305eff 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -1,6 +1,10 @@ package binnie.extratrees.carpentry; -import binnie.extratrees.api.*; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.api.IDesignSystem; +import binnie.extratrees.api.ILayout; +import binnie.extratrees.api.IToolHammer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +17,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; public class DesignBlock { + private static final int[][] ROTATION_MATRIX = { + {0, 1, 4, 5, 3, 2, 6}, + {0, 1, 5, 4, 2, 3, 6}, + {5, 4, 2, 3, 0, 1, 6}, + {4, 5, 2, 3, 1, 0, 6}, + {2, 3, 1, 0, 4, 5, 6}, + {3, 2, 0, 1, 4, 5, 6}, + {0, 1, 2, 3, 4, 5, 6}, + }; IDesign design; IDesignMaterial primaryMaterial; IDesignMaterial secondaryMaterial; @@ -20,23 +33,6 @@ public class DesignBlock { EnumFacing facing; boolean panel; - @Override - public String toString() { - return super.toString() + " { design:" + this.design + " }, { primary:" + this.primaryMaterial + " }, { secondary:" + this.secondaryMaterial + " }, { rotation:" + this.rotation + " }, { facing:" + this.facing + " }"; - } - - public IDesign getDesign() { - return this.design; - } - - public IDesignMaterial getPrimaryMaterial() { - return this.primaryMaterial; - } - - public IDesignMaterial getSecondaryMaterial() { - return this.secondaryMaterial; - } - DesignBlock(final IDesignSystem system, @Nullable final IDesignMaterial primaryWood, @Nullable final IDesignMaterial secondaryWood, @Nullable final IDesign design, final int rotation, @Nullable final EnumFacing dir) { this.panel = false; this.rotation = rotation; @@ -66,6 +62,23 @@ public class DesignBlock { } } + @Override + public String toString() { + return super.toString() + " { design:" + this.design + " }, { primary:" + this.primaryMaterial + " }, { secondary:" + this.secondaryMaterial + " }, { rotation:" + this.rotation + " }, { facing:" + this.facing + " }"; + } + + public IDesign getDesign() { + return this.design; + } + + public IDesignMaterial getPrimaryMaterial() { + return this.primaryMaterial; + } + + public IDesignMaterial getSecondaryMaterial() { + return this.secondaryMaterial; + } + public int getPrimaryColour() { return this.getPrimaryMaterial().getColour(); } @@ -132,16 +145,6 @@ public class DesignBlock { } } - private static final int[][] ROTATION_MATRIX = { - {0, 1, 4, 5, 3, 2, 6}, - {0, 1, 5, 4, 2, 3, 6}, - {5, 4, 2, 3, 0, 1, 6}, - {4, 5, 2, 3, 1, 0, 6}, - {2, 3, 1, 0, 4, 5, 6}, - {3, 2, 0, 1, 4, 5, 6}, - {0, 1, 2, 3, 4, 5, 6}, - }; - public EnumFacing getRotation(EnumFacing facing, EnumFacing axis) { return getNewFacing(ROTATION_MATRIX[axis.ordinal()][facing.ordinal()]); } @@ -342,7 +345,6 @@ public class DesignBlock { break LAYOUTS; } } - } case SOUTH: { switch (facing) { @@ -379,7 +381,6 @@ public class DesignBlock { break LAYOUTS; } } - } } } @@ -407,6 +408,10 @@ public class DesignBlock { return this.facing; } + public void setFacing(final EnumFacing facing) { + this.facing = facing; + } + public int getRotation() { return this.rotation; } @@ -418,7 +423,8 @@ public class DesignBlock { EnumFacing newFacing = this.getFacing(); do { newFacing = getNewFacing(newFacing.ordinal() + 1); - } while (newFacing != this.getFacing() && !BlockCarpentryPanel.isValidPanelPlacement(world, pos, newFacing)); + } + while (newFacing != this.getFacing() && !BlockCarpentryPanel.isValidPanelPlacement(world, pos, newFacing)); if (newFacing != this.getFacing()) { hammerI.onHammerUsed(hammer, player); } @@ -448,10 +454,6 @@ public class DesignBlock { return EnumFacing.DOWN; } - public void setFacing(final EnumFacing facing) { - this.facing = facing; - } - public int getBlockMetadata(final IDesignSystem system) { return ModuleCarpentry.getBlockMetadata(system, this); } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java index d2aa367e..f7a20d79 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java @@ -8,7 +8,7 @@ import java.util.List; public class DesignerManager { public static DesignerManager instance = new DesignerManager(); - + List systems; public DesignerManager() { @@ -26,5 +26,4 @@ public class DesignerManager { public void addDesignSystem(final DesignSystem system) { this.systems.add(system); } - } diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java index 0b7963b5..d1b064f9 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java @@ -111,209 +111,6 @@ public enum EnumDesign implements IDesign { OverlappedBarred("Overlapped Barred"), OverlappedSplitBarred("Overlapped Split Barred"); - String name; - ILayout topPattern; - ILayout bottomPattern; - ILayout northPattern; - ILayout southPattern; - ILayout eastPattern; - ILayout westPattern; - - void setEdgePatterns(final ILayout north, final ILayout east, final ILayout south, final ILayout west) { - this.setNorthPattern(north); - this.setEastPattern(east); - this.setSouthPattern(south); - this.setWestPattern(west); - } - - void setEdgePatterns(final ILayout face) { - this.setEdgePatterns(face, face, face, face); - } - - void setupStriped(final ILayout vert) { - this.setTopPattern(vert); - this.setEdgePatterns(vert.invert(), EnumPattern.Blank.layout(true), vert, EnumPattern.Blank.layout()); - } - - void setChequered(final ILayout cheq) { - this.setAllPatterns(cheq); - this.setNorthPattern(cheq.invert()); - this.setSouthPattern(cheq.invert()); - this.setBottomPattern(cheq.invert()); - } - - void setStripedChequered(final ILayout cheq, final ILayout stripe) { - this.setAllPatterns(cheq); - this.setNorthPattern(stripe.invert()); - this.setSouthPattern(stripe.invert()); - this.setEastPattern(stripe); - this.setWestPattern(stripe); - } - - void setCornered(final ILayout corner, final ILayout edge) { - this.setTopPattern(corner); - this.setNorthPattern(EnumPattern.Blank.layout()); - this.setEastPattern(edge.flipHorizontal()); - this.setSouthPattern(edge); - this.setWestPattern(EnumPattern.Blank.layout()); - } - - void setEdged(final ILayout edge) { - this.setAllPatterns(edge); - this.setWestPattern(EnumPattern.Blank.layout()); - this.setEastPattern(EnumPattern.Blank.layout(true)); - this.northPattern = this.northPattern.flipHorizontal(); - } - - void setBarred(final ILayout bar) { - this.setAllPatterns(bar); - this.setEastPattern(EnumPattern.Blank.layout(true)); - this.setWestPattern(EnumPattern.Blank.layout(true)); - } - - void setDiagonal(final ILayout diagonal, final ILayout edged) { - this.setAllPatterns(edged); - this.setTopPattern(diagonal); - this.northPattern = this.northPattern.flipHorizontal(); - this.southPattern = this.southPattern.flipHorizontal(); - } - - void setSaltire(final ILayout saltire, final ILayout bar) { - this.setTopPattern(saltire); - this.setEdgePatterns(bar.invert()); - } - - void setCross(final ILayout saltire, final ILayout bar) { - this.setTopPattern(saltire); - this.setEdgePatterns(bar); - } - - void setTSection(final ILayout tsection, final ILayout bar) { - this.setTopPattern(tsection); - this.setEdgePatterns(bar); - this.setWestPattern(EnumPattern.Blank.layout(true)); - } - - void setBarredCorner(final ILayout corner, final ILayout bar) { - this.setTSection(corner, bar); - this.setNorthPattern(EnumPattern.Blank.layout(true)); - } - - void setStripedCorner(final ILayout corner, final ILayout striped) { - this.setCornered(corner, striped); - } - - void setLetterPattern(final ILayout letter) { - this.setAllPatterns(EnumPattern.Blank.layout(true)); - this.setTopPattern(letter); - this.setBottomPattern(EnumPattern.Blank.layout(true)); - } - - void setBarredEndPattern(final ILayout end, final ILayout bar) { - this.setAllPatterns(EnumPattern.Blank.layout(true)); - this.setTopPattern(end); - this.setWestPattern(bar); - } - - void setDiagonalCorner(final ILayout diagonal, final ILayout bar, final ILayout edged) { - this.setAllPatterns(EnumPattern.Blank.layout(true)); - this.setTopPattern(diagonal); - this.setWestPattern(bar.invert()); - this.setNorthPattern(edged.flipHorizontal()); - this.setSouthPattern(edged); - } - - void setDiagonalTSection(final ILayout diagonal, final ILayout bar, final ILayout edged) { - this.setAllPatterns(EnumPattern.Blank.layout(true)); - this.setTopPattern(diagonal); - this.setWestPattern(bar.invert()); - this.setNorthPattern(bar.invert()); - this.setEastPattern(edged.flipHorizontal()); - this.setSouthPattern(edged); - } - - EnumDesign(final String name) { - this.topPattern = Layout.get(EnumPattern.Blank, false); - this.bottomPattern = Layout.get(EnumPattern.Blank, false); - this.northPattern = Layout.get(EnumPattern.Blank, false); - this.eastPattern = Layout.get(EnumPattern.Blank, false); - this.southPattern = Layout.get(EnumPattern.Blank, false); - this.westPattern = Layout.get(EnumPattern.Blank, false); - this.name = name; - } - - private void setAllPatterns(final ILayout layout) { - this.setTopPattern(layout); - this.setBottomPattern(layout); - this.setNorthPattern(layout); - this.setEastPattern(layout); - this.setSouthPattern(layout); - this.setWestPattern(layout); - } - - @Override - public String getName() { - return this.name; - } - - @Override - public ILayout getTopPattern() { - return this.topPattern; - } - - public void setTopPattern(final ILayout layout) { - this.setBottomPattern(this.topPattern = layout); - } - - @Override - public ILayout getBottomPattern() { - return this.bottomPattern; - } - - public void setBottomPattern(final ILayout layout) { - this.bottomPattern = layout; - } - - @Override - public ILayout getNorthPattern() { - return this.northPattern; - } - - public void setNorthPattern(final ILayout layout) { - this.northPattern = layout; - } - - @Override - public ILayout getSouthPattern() { - return this.southPattern; - } - - public void setSouthPattern(final ILayout layout) { - this.southPattern = layout; - } - - @Override - public ILayout getEastPattern() { - return this.eastPattern; - } - - public void setEastPattern(final ILayout layout) { - this.eastPattern = layout; - } - - @Override - public ILayout getWestPattern() { - return this.westPattern; - } - - public void setWestPattern(final ILayout layout) { - this.westPattern = layout; - } - - public void setName(final String name) { - this.name = name; - } - static { Category.Design.addDesign(EnumDesign.Blank); Category.Design.addDesign(EnumDesign.Octagon); @@ -476,6 +273,209 @@ public enum EnumDesign implements IDesign { EnumDesign.OverlappedBarred.setTopPattern(EnumPattern.OverlappedBarred.layout()); } + String name; + ILayout topPattern; + ILayout bottomPattern; + ILayout northPattern; + ILayout southPattern; + ILayout eastPattern; + ILayout westPattern; + + EnumDesign(final String name) { + this.topPattern = Layout.get(EnumPattern.Blank, false); + this.bottomPattern = Layout.get(EnumPattern.Blank, false); + this.northPattern = Layout.get(EnumPattern.Blank, false); + this.eastPattern = Layout.get(EnumPattern.Blank, false); + this.southPattern = Layout.get(EnumPattern.Blank, false); + this.westPattern = Layout.get(EnumPattern.Blank, false); + this.name = name; + } + + void setEdgePatterns(final ILayout north, final ILayout east, final ILayout south, final ILayout west) { + this.setNorthPattern(north); + this.setEastPattern(east); + this.setSouthPattern(south); + this.setWestPattern(west); + } + + void setEdgePatterns(final ILayout face) { + this.setEdgePatterns(face, face, face, face); + } + + void setupStriped(final ILayout vert) { + this.setTopPattern(vert); + this.setEdgePatterns(vert.invert(), EnumPattern.Blank.layout(true), vert, EnumPattern.Blank.layout()); + } + + void setChequered(final ILayout cheq) { + this.setAllPatterns(cheq); + this.setNorthPattern(cheq.invert()); + this.setSouthPattern(cheq.invert()); + this.setBottomPattern(cheq.invert()); + } + + void setStripedChequered(final ILayout cheq, final ILayout stripe) { + this.setAllPatterns(cheq); + this.setNorthPattern(stripe.invert()); + this.setSouthPattern(stripe.invert()); + this.setEastPattern(stripe); + this.setWestPattern(stripe); + } + + void setCornered(final ILayout corner, final ILayout edge) { + this.setTopPattern(corner); + this.setNorthPattern(EnumPattern.Blank.layout()); + this.setEastPattern(edge.flipHorizontal()); + this.setSouthPattern(edge); + this.setWestPattern(EnumPattern.Blank.layout()); + } + + void setEdged(final ILayout edge) { + this.setAllPatterns(edge); + this.setWestPattern(EnumPattern.Blank.layout()); + this.setEastPattern(EnumPattern.Blank.layout(true)); + this.northPattern = this.northPattern.flipHorizontal(); + } + + void setBarred(final ILayout bar) { + this.setAllPatterns(bar); + this.setEastPattern(EnumPattern.Blank.layout(true)); + this.setWestPattern(EnumPattern.Blank.layout(true)); + } + + void setDiagonal(final ILayout diagonal, final ILayout edged) { + this.setAllPatterns(edged); + this.setTopPattern(diagonal); + this.northPattern = this.northPattern.flipHorizontal(); + this.southPattern = this.southPattern.flipHorizontal(); + } + + void setSaltire(final ILayout saltire, final ILayout bar) { + this.setTopPattern(saltire); + this.setEdgePatterns(bar.invert()); + } + + void setCross(final ILayout saltire, final ILayout bar) { + this.setTopPattern(saltire); + this.setEdgePatterns(bar); + } + + void setTSection(final ILayout tsection, final ILayout bar) { + this.setTopPattern(tsection); + this.setEdgePatterns(bar); + this.setWestPattern(EnumPattern.Blank.layout(true)); + } + + void setBarredCorner(final ILayout corner, final ILayout bar) { + this.setTSection(corner, bar); + this.setNorthPattern(EnumPattern.Blank.layout(true)); + } + + void setStripedCorner(final ILayout corner, final ILayout striped) { + this.setCornered(corner, striped); + } + + void setLetterPattern(final ILayout letter) { + this.setAllPatterns(EnumPattern.Blank.layout(true)); + this.setTopPattern(letter); + this.setBottomPattern(EnumPattern.Blank.layout(true)); + } + + void setBarredEndPattern(final ILayout end, final ILayout bar) { + this.setAllPatterns(EnumPattern.Blank.layout(true)); + this.setTopPattern(end); + this.setWestPattern(bar); + } + + void setDiagonalCorner(final ILayout diagonal, final ILayout bar, final ILayout edged) { + this.setAllPatterns(EnumPattern.Blank.layout(true)); + this.setTopPattern(diagonal); + this.setWestPattern(bar.invert()); + this.setNorthPattern(edged.flipHorizontal()); + this.setSouthPattern(edged); + } + + void setDiagonalTSection(final ILayout diagonal, final ILayout bar, final ILayout edged) { + this.setAllPatterns(EnumPattern.Blank.layout(true)); + this.setTopPattern(diagonal); + this.setWestPattern(bar.invert()); + this.setNorthPattern(bar.invert()); + this.setEastPattern(edged.flipHorizontal()); + this.setSouthPattern(edged); + } + + private void setAllPatterns(final ILayout layout) { + this.setTopPattern(layout); + this.setBottomPattern(layout); + this.setNorthPattern(layout); + this.setEastPattern(layout); + this.setSouthPattern(layout); + this.setWestPattern(layout); + } + + @Override + public String getName() { + return this.name; + } + + public void setName(final String name) { + this.name = name; + } + + @Override + public ILayout getTopPattern() { + return this.topPattern; + } + + public void setTopPattern(final ILayout layout) { + this.setBottomPattern(this.topPattern = layout); + } + + @Override + public ILayout getBottomPattern() { + return this.bottomPattern; + } + + public void setBottomPattern(final ILayout layout) { + this.bottomPattern = layout; + } + + @Override + public ILayout getNorthPattern() { + return this.northPattern; + } + + public void setNorthPattern(final ILayout layout) { + this.northPattern = layout; + } + + @Override + public ILayout getSouthPattern() { + return this.southPattern; + } + + public void setSouthPattern(final ILayout layout) { + this.southPattern = layout; + } + + @Override + public ILayout getEastPattern() { + return this.eastPattern; + } + + public void setEastPattern(final ILayout layout) { + this.eastPattern = layout; + } + + @Override + public ILayout getWestPattern() { + return this.westPattern; + } + + public void setWestPattern(final ILayout layout) { + this.westPattern = layout; + } + enum Category implements IDesignCategory { Design("Designs & Emblems"), Stripes("Squares & Stripes"), diff --git a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java index f044015d..07856102 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java @@ -223,6 +223,69 @@ public enum EnumPattern implements IPattern { OverlappedBarred, OverlappedBarred2; + static { + setupStripedPattern(EnumPattern.ThinStriped, EnumPattern.ThinStriped2); + setupStripedPattern(EnumPattern.Striped, EnumPattern.Striped2); + setupStripedPattern(EnumPattern.Halved, EnumPattern.Halved2); + setupChequeredPattern(EnumPattern.Chequered); + setupChequeredPattern(EnumPattern.Tiled); + setupCornerPattern(EnumPattern.VeryThinCorner, EnumPattern.VeryThinCorner2, EnumPattern.VeryThinCorner3, EnumPattern.VeryThinCorner4); + setupCornerPattern(EnumPattern.ThinCorner, EnumPattern.ThinCorner2, EnumPattern.ThinCorner3, EnumPattern.ThinCorner4); + setupCornerPattern(EnumPattern.Corner, EnumPattern.Corner2, EnumPattern.Corner3, EnumPattern.Corner4); + setupCornerPattern(EnumPattern.ThickCorner, EnumPattern.ThickCorner2, EnumPattern.ThickCorner3, EnumPattern.ThickCorner4); + setupCornerPattern(EnumPattern.ThinCurvedCorner, EnumPattern.ThinCurvedCorner2, EnumPattern.ThinCurvedCorner3, EnumPattern.ThinCurvedCorner4); + setupCornerPattern(EnumPattern.CurvedCorner, EnumPattern.CurvedCorner2, EnumPattern.CurvedCorner3, EnumPattern.CurvedCorner4); + setupBarredPattern(EnumPattern.BarredEnd, EnumPattern.BarredEnd2, EnumPattern.BarredEnd3, EnumPattern.BarredEnd4); + setupEdgedPattern(EnumPattern.ThinEdged, EnumPattern.ThinEdged2, EnumPattern.ThinEdged3, EnumPattern.ThinEdged4); + setupEdgedPattern(EnumPattern.Edged, EnumPattern.Edged2, EnumPattern.Edged3, EnumPattern.Edged4); + setupBarredPattern(EnumPattern.ThinBarred, EnumPattern.ThinBarred2); + setupBarredPattern(EnumPattern.Barred, EnumPattern.Barred2); + setupBarredPattern(EnumPattern.ThickBarred, EnumPattern.ThickBarred2); + setupDiagonalPattern(EnumPattern.Diagonal, EnumPattern.Diagonal2); + setupDiagonalPattern(EnumPattern.ThickDiagonal, EnumPattern.ThickDiagonal2); + setupTSectionPattern(EnumPattern.ThinTSection, EnumPattern.ThinTSection2, EnumPattern.ThinTSection3, EnumPattern.ThinTSection4); + setupTSectionPattern(EnumPattern.TSection, EnumPattern.TSection2, EnumPattern.TSection3, EnumPattern.TSection4); + setupTSectionPattern(EnumPattern.ThickTSection, EnumPattern.ThickTSection2, EnumPattern.ThickTSection3, EnumPattern.ThickTSection4); + setupTSectionPattern(EnumPattern.ThinCurvedTSection, EnumPattern.ThinCurvedTSection2, EnumPattern.ThinCurvedTSection3, EnumPattern.ThinCurvedTSection4); + setupTSectionPattern(EnumPattern.CurvedTSection, EnumPattern.CurvedTSection2, EnumPattern.CurvedTSection3, EnumPattern.CurvedTSection4); + setupCornerPattern(EnumPattern.ThinBarredCorner, EnumPattern.ThinBarredCorner2, EnumPattern.ThinBarredCorner3, EnumPattern.ThinBarredCorner4); + setupCornerPattern(EnumPattern.BarredCorner, EnumPattern.BarredCorner2, EnumPattern.BarredCorner3, EnumPattern.BarredCorner4); + setupCornerPattern(EnumPattern.ThickBarredCorner, EnumPattern.ThickBarredCorner2, EnumPattern.ThickBarredCorner3, EnumPattern.ThickBarredCorner4); + setupCornerPattern(EnumPattern.ThinCurvedBarredCorner, EnumPattern.ThinCurvedBarredCorner2, EnumPattern.ThinCurvedBarredCorner3, EnumPattern.ThinCurvedBarredCorner4); + setupCornerPattern(EnumPattern.BarredCurvedCorner, EnumPattern.BarredCurvedCorner2, EnumPattern.BarredCurvedCorner3, EnumPattern.BarredCurvedCorner4); + setupCornerPattern(EnumPattern.ThinStripedCorner, EnumPattern.ThinStripedCorner2, EnumPattern.ThinStripedCorner3, EnumPattern.ThinStripedCorner4); + setupCornerPattern(EnumPattern.StripedCorner, EnumPattern.StripedCorner2, EnumPattern.StripedCorner3, EnumPattern.StripedCorner4); + setupCornerPattern(EnumPattern.OrnateStripedCorner, EnumPattern.OrnateStripedCorner2, EnumPattern.OrnateStripedCorner3, EnumPattern.OrnateStripedCorner4); + setupRotation(EnumPattern.LetterA, EnumPattern.LetterA2, EnumPattern.LetterA3, EnumPattern.LetterA4); + setupRotation(EnumPattern.LetterB, EnumPattern.LetterB2, EnumPattern.LetterB3, EnumPattern.LetterB4); + setupRotation(EnumPattern.LetterF, EnumPattern.LetterF2, EnumPattern.LetterF3, EnumPattern.LetterF4); + setupRotation(EnumPattern.LetterS, EnumPattern.LetterS2, EnumPattern.LetterS3, EnumPattern.LetterS4); + setupRotation(EnumPattern.LetterT, EnumPattern.LetterT2, EnumPattern.LetterT3, EnumPattern.LetterT4); + setupEdgedPattern(EnumPattern.DiagonalCorner, EnumPattern.DiagonalCorner2, EnumPattern.DiagonalCorner3, EnumPattern.DiagonalCorner4); + setupCornerPattern(EnumPattern.DiagonalTSection, EnumPattern.DiagonalTSection2, EnumPattern.DiagonalTSection3, EnumPattern.DiagonalTSection4); + setupEdgedPattern(EnumPattern.DiagonalCurvedCorner, EnumPattern.DiagonalCurvedCorner2, EnumPattern.DiagonalCurvedCorner3, EnumPattern.DiagonalCurvedCorner4); + setupCornerPattern(EnumPattern.DiagonalCurvedTSection, EnumPattern.DiagonalCurvedTSection2, EnumPattern.DiagonalCurvedTSection3, EnumPattern.DiagonalCurvedTSection4); + setupBarredPattern(EnumPattern.OrnateBarred, EnumPattern.OrnateBarred2); + setupBarredPattern(EnumPattern.OrnateThinBarred, EnumPattern.OrnateThinBarred2); + setupBarredPattern(EnumPattern.SplitBarred, EnumPattern.SplitBarred2); + setupCornerPattern(EnumPattern.SplitBarredCorner, EnumPattern.SplitBarredCorner2, EnumPattern.SplitBarredCorner3, EnumPattern.SplitBarredCorner4); + setupTSectionPattern(EnumPattern.SplitBarredTSection, EnumPattern.SplitBarredTSection2, EnumPattern.SplitBarredTSection3, EnumPattern.SplitBarredTSection4); + setupBarredPattern(EnumPattern.SplitBarredEnd, EnumPattern.SplitBarredEnd2, EnumPattern.SplitBarredEnd3, EnumPattern.SplitBarredEnd4); + setupRotation(EnumPattern.Creeper, EnumPattern.Creeper2, EnumPattern.Creeper3, EnumPattern.Creeper4); + setupDiagonalPattern(EnumPattern.DiagonalStriped, EnumPattern.DiagonalStriped2); + setupDiagonalPattern(EnumPattern.ThinDiagonalStriped, EnumPattern.ThinDiagonalStriped2); + setupCornerPattern(EnumPattern.Diagonal1Edged, EnumPattern.Diagonal1Edged2, EnumPattern.Diagonal1Edged3, EnumPattern.Diagonal1Edged4); + setupCornerPattern(EnumPattern.ThickDiagonal1Edged, EnumPattern.ThickDiagonal1Edged2, EnumPattern.ThickDiagonal1Edged3, EnumPattern.ThickDiagonal1Edged4); + setupInvert2Rot(EnumPattern.DiagonalHalved, EnumPattern.DiagonalHalved2); + set2Rotation(EnumPattern.Diagonal2Edged, EnumPattern.Diagonal2Edged2); + setupBarredPattern(EnumPattern.ThinBarredEnd, EnumPattern.ThinBarredEnd2, EnumPattern.ThinBarredEnd3, EnumPattern.ThinBarredEnd4); + setupBarredPattern(EnumPattern.ThickBarredEnd, EnumPattern.ThickBarredEnd2, EnumPattern.ThickBarredEnd3, EnumPattern.ThickBarredEnd4); + EnumPattern.OverlappedBarred.setLeftRotation(EnumPattern.OverlappedBarred2, false); + EnumPattern.OverlappedBarred2.setLeftRotation(EnumPattern.OverlappedBarred, false); + EnumPattern.OverlappedSplitBarred.setLeftRotation(EnumPattern.OverlappedSplitBarred2, false); + EnumPattern.OverlappedSplitBarred2.setLeftRotation(EnumPattern.OverlappedSplitBarred, false); + } + ILayout leftRotation; ILayout horizontalFlip; @@ -294,16 +357,16 @@ public enum EnumPattern implements IPattern { setupEdgedPattern(l, t, r, b); } + private static void setupRotation(final EnumPattern t, final EnumPattern r, final EnumPattern b, final EnumPattern l) { + setupEdgedPattern(l, t, r, b); + } + @SideOnly(Side.CLIENT) @Override public TextureAtlasSprite getPrimarySprite(IDesignSystem system) { return system.getPrimarySprite(this); } - private static void setupRotation(final EnumPattern t, final EnumPattern r, final EnumPattern b, final EnumPattern l) { - setupEdgedPattern(l, t, r, b); - } - private void setHorizontalFlip(final EnumPattern pattern, final boolean inverted) { this.horizontalFlip = Layout.get(pattern, inverted); pattern.horizontalFlip = Layout.get(this, inverted); @@ -340,67 +403,4 @@ public enum EnumPattern implements IPattern { public ILayout layout(final boolean invert) { return Layout.get(this, invert); } - - static { - setupStripedPattern(EnumPattern.ThinStriped, EnumPattern.ThinStriped2); - setupStripedPattern(EnumPattern.Striped, EnumPattern.Striped2); - setupStripedPattern(EnumPattern.Halved, EnumPattern.Halved2); - setupChequeredPattern(EnumPattern.Chequered); - setupChequeredPattern(EnumPattern.Tiled); - setupCornerPattern(EnumPattern.VeryThinCorner, EnumPattern.VeryThinCorner2, EnumPattern.VeryThinCorner3, EnumPattern.VeryThinCorner4); - setupCornerPattern(EnumPattern.ThinCorner, EnumPattern.ThinCorner2, EnumPattern.ThinCorner3, EnumPattern.ThinCorner4); - setupCornerPattern(EnumPattern.Corner, EnumPattern.Corner2, EnumPattern.Corner3, EnumPattern.Corner4); - setupCornerPattern(EnumPattern.ThickCorner, EnumPattern.ThickCorner2, EnumPattern.ThickCorner3, EnumPattern.ThickCorner4); - setupCornerPattern(EnumPattern.ThinCurvedCorner, EnumPattern.ThinCurvedCorner2, EnumPattern.ThinCurvedCorner3, EnumPattern.ThinCurvedCorner4); - setupCornerPattern(EnumPattern.CurvedCorner, EnumPattern.CurvedCorner2, EnumPattern.CurvedCorner3, EnumPattern.CurvedCorner4); - setupBarredPattern(EnumPattern.BarredEnd, EnumPattern.BarredEnd2, EnumPattern.BarredEnd3, EnumPattern.BarredEnd4); - setupEdgedPattern(EnumPattern.ThinEdged, EnumPattern.ThinEdged2, EnumPattern.ThinEdged3, EnumPattern.ThinEdged4); - setupEdgedPattern(EnumPattern.Edged, EnumPattern.Edged2, EnumPattern.Edged3, EnumPattern.Edged4); - setupBarredPattern(EnumPattern.ThinBarred, EnumPattern.ThinBarred2); - setupBarredPattern(EnumPattern.Barred, EnumPattern.Barred2); - setupBarredPattern(EnumPattern.ThickBarred, EnumPattern.ThickBarred2); - setupDiagonalPattern(EnumPattern.Diagonal, EnumPattern.Diagonal2); - setupDiagonalPattern(EnumPattern.ThickDiagonal, EnumPattern.ThickDiagonal2); - setupTSectionPattern(EnumPattern.ThinTSection, EnumPattern.ThinTSection2, EnumPattern.ThinTSection3, EnumPattern.ThinTSection4); - setupTSectionPattern(EnumPattern.TSection, EnumPattern.TSection2, EnumPattern.TSection3, EnumPattern.TSection4); - setupTSectionPattern(EnumPattern.ThickTSection, EnumPattern.ThickTSection2, EnumPattern.ThickTSection3, EnumPattern.ThickTSection4); - setupTSectionPattern(EnumPattern.ThinCurvedTSection, EnumPattern.ThinCurvedTSection2, EnumPattern.ThinCurvedTSection3, EnumPattern.ThinCurvedTSection4); - setupTSectionPattern(EnumPattern.CurvedTSection, EnumPattern.CurvedTSection2, EnumPattern.CurvedTSection3, EnumPattern.CurvedTSection4); - setupCornerPattern(EnumPattern.ThinBarredCorner, EnumPattern.ThinBarredCorner2, EnumPattern.ThinBarredCorner3, EnumPattern.ThinBarredCorner4); - setupCornerPattern(EnumPattern.BarredCorner, EnumPattern.BarredCorner2, EnumPattern.BarredCorner3, EnumPattern.BarredCorner4); - setupCornerPattern(EnumPattern.ThickBarredCorner, EnumPattern.ThickBarredCorner2, EnumPattern.ThickBarredCorner3, EnumPattern.ThickBarredCorner4); - setupCornerPattern(EnumPattern.ThinCurvedBarredCorner, EnumPattern.ThinCurvedBarredCorner2, EnumPattern.ThinCurvedBarredCorner3, EnumPattern.ThinCurvedBarredCorner4); - setupCornerPattern(EnumPattern.BarredCurvedCorner, EnumPattern.BarredCurvedCorner2, EnumPattern.BarredCurvedCorner3, EnumPattern.BarredCurvedCorner4); - setupCornerPattern(EnumPattern.ThinStripedCorner, EnumPattern.ThinStripedCorner2, EnumPattern.ThinStripedCorner3, EnumPattern.ThinStripedCorner4); - setupCornerPattern(EnumPattern.StripedCorner, EnumPattern.StripedCorner2, EnumPattern.StripedCorner3, EnumPattern.StripedCorner4); - setupCornerPattern(EnumPattern.OrnateStripedCorner, EnumPattern.OrnateStripedCorner2, EnumPattern.OrnateStripedCorner3, EnumPattern.OrnateStripedCorner4); - setupRotation(EnumPattern.LetterA, EnumPattern.LetterA2, EnumPattern.LetterA3, EnumPattern.LetterA4); - setupRotation(EnumPattern.LetterB, EnumPattern.LetterB2, EnumPattern.LetterB3, EnumPattern.LetterB4); - setupRotation(EnumPattern.LetterF, EnumPattern.LetterF2, EnumPattern.LetterF3, EnumPattern.LetterF4); - setupRotation(EnumPattern.LetterS, EnumPattern.LetterS2, EnumPattern.LetterS3, EnumPattern.LetterS4); - setupRotation(EnumPattern.LetterT, EnumPattern.LetterT2, EnumPattern.LetterT3, EnumPattern.LetterT4); - setupEdgedPattern(EnumPattern.DiagonalCorner, EnumPattern.DiagonalCorner2, EnumPattern.DiagonalCorner3, EnumPattern.DiagonalCorner4); - setupCornerPattern(EnumPattern.DiagonalTSection, EnumPattern.DiagonalTSection2, EnumPattern.DiagonalTSection3, EnumPattern.DiagonalTSection4); - setupEdgedPattern(EnumPattern.DiagonalCurvedCorner, EnumPattern.DiagonalCurvedCorner2, EnumPattern.DiagonalCurvedCorner3, EnumPattern.DiagonalCurvedCorner4); - setupCornerPattern(EnumPattern.DiagonalCurvedTSection, EnumPattern.DiagonalCurvedTSection2, EnumPattern.DiagonalCurvedTSection3, EnumPattern.DiagonalCurvedTSection4); - setupBarredPattern(EnumPattern.OrnateBarred, EnumPattern.OrnateBarred2); - setupBarredPattern(EnumPattern.OrnateThinBarred, EnumPattern.OrnateThinBarred2); - setupBarredPattern(EnumPattern.SplitBarred, EnumPattern.SplitBarred2); - setupCornerPattern(EnumPattern.SplitBarredCorner, EnumPattern.SplitBarredCorner2, EnumPattern.SplitBarredCorner3, EnumPattern.SplitBarredCorner4); - setupTSectionPattern(EnumPattern.SplitBarredTSection, EnumPattern.SplitBarredTSection2, EnumPattern.SplitBarredTSection3, EnumPattern.SplitBarredTSection4); - setupBarredPattern(EnumPattern.SplitBarredEnd, EnumPattern.SplitBarredEnd2, EnumPattern.SplitBarredEnd3, EnumPattern.SplitBarredEnd4); - setupRotation(EnumPattern.Creeper, EnumPattern.Creeper2, EnumPattern.Creeper3, EnumPattern.Creeper4); - setupDiagonalPattern(EnumPattern.DiagonalStriped, EnumPattern.DiagonalStriped2); - setupDiagonalPattern(EnumPattern.ThinDiagonalStriped, EnumPattern.ThinDiagonalStriped2); - setupCornerPattern(EnumPattern.Diagonal1Edged, EnumPattern.Diagonal1Edged2, EnumPattern.Diagonal1Edged3, EnumPattern.Diagonal1Edged4); - setupCornerPattern(EnumPattern.ThickDiagonal1Edged, EnumPattern.ThickDiagonal1Edged2, EnumPattern.ThickDiagonal1Edged3, EnumPattern.ThickDiagonal1Edged4); - setupInvert2Rot(EnumPattern.DiagonalHalved, EnumPattern.DiagonalHalved2); - set2Rotation(EnumPattern.Diagonal2Edged, EnumPattern.Diagonal2Edged2); - setupBarredPattern(EnumPattern.ThinBarredEnd, EnumPattern.ThinBarredEnd2, EnumPattern.ThinBarredEnd3, EnumPattern.ThinBarredEnd4); - setupBarredPattern(EnumPattern.ThickBarredEnd, EnumPattern.ThickBarredEnd2, EnumPattern.ThickBarredEnd3, EnumPattern.ThickBarredEnd4); - EnumPattern.OverlappedBarred.setLeftRotation(EnumPattern.OverlappedBarred2, false); - EnumPattern.OverlappedBarred2.setLeftRotation(EnumPattern.OverlappedBarred, false); - EnumPattern.OverlappedSplitBarred.setLeftRotation(EnumPattern.OverlappedSplitBarred2, false); - EnumPattern.OverlappedSplitBarred2.setLeftRotation(EnumPattern.OverlappedSplitBarred, false); - } } diff --git a/src/main/java/binnie/extratrees/carpentry/GlassType.java b/src/main/java/binnie/extratrees/carpentry/GlassType.java index afcabb6e..55b230fa 100644 --- a/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -13,6 +13,17 @@ import java.util.Map; public class GlassType implements IDesignMaterial { static Map types; + + static { + GlassType.types = new LinkedHashMap<>(); + for (final StandardColor c : StandardColor.values()) { + GlassType.types.put(c.ordinal(), new GlassType(c.ordinal(), c.name, c.colour)); + } + for (final EnumFlowerColor c2 : EnumFlowerColor.values()) { + GlassType.types.put(128 + c2.ordinal(), new GlassType(128 + c2.ordinal(), c2.getColourName(), c2.getColor(false))); + } + } + String name; int colour; int id; @@ -23,29 +34,6 @@ public class GlassType implements IDesignMaterial { this.colour = colour; } - @Override - public ItemStack getStack() { - if (this.id < 128) { - return new ItemStack(Blocks.STAINED_GLASS, 1, this.id); - } - return TileEntityMetadata.getItemStack(Botany.stained, this.id - 128); - } - - @Override - public ItemStack getStack(boolean fireproof) { - return getStack(); - } - - @Override - public String getName() { - return this.name; - } - - @Override - public int getColour() { - return this.colour; - } - public static int getIndex(final IDesignMaterial id) { for (final Map.Entry entry : GlassType.types.entrySet()) { if (entry.getValue() == id) { @@ -69,14 +57,27 @@ public class GlassType implements IDesignMaterial { return null; } - static { - GlassType.types = new LinkedHashMap<>(); - for (final StandardColor c : StandardColor.values()) { - GlassType.types.put(c.ordinal(), new GlassType(c.ordinal(), c.name, c.colour)); - } - for (final EnumFlowerColor c2 : EnumFlowerColor.values()) { - GlassType.types.put(128 + c2.ordinal(), new GlassType(128 + c2.ordinal(), c2.getColourName(), c2.getColor(false))); + @Override + public ItemStack getStack() { + if (this.id < 128) { + return new ItemStack(Blocks.STAINED_GLASS, 1, this.id); } + return TileEntityMetadata.getItemStack(Botany.stained, this.id - 128); + } + + @Override + public ItemStack getStack(boolean fireproof) { + return getStack(); + } + + @Override + public String getName() { + return this.name; + } + + @Override + public int getColour() { + return this.colour; } private enum StandardColor { diff --git a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java b/src/main/java/binnie/extratrees/carpentry/ItemDesign.java index f2cbf03c..3eec7c4b 100644 --- a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/ItemDesign.java @@ -22,5 +22,4 @@ public class ItemDesign extends ItemMetadata implements IColoredItem { } return block.getPrimaryColour(); } - } diff --git a/src/main/java/binnie/extratrees/carpentry/Layout.java b/src/main/java/binnie/extratrees/carpentry/Layout.java index 79758d80..6c85c811 100644 --- a/src/main/java/binnie/extratrees/carpentry/Layout.java +++ b/src/main/java/binnie/extratrees/carpentry/Layout.java @@ -11,6 +11,23 @@ public class Layout implements ILayout { IPattern pattern; boolean inverted; + private Layout(final IPattern pattern, final boolean inverted) { + this.pattern = pattern; + this.inverted = inverted; + } + + private Layout(final IPattern pattern) { + this(pattern, false); + } + + public static ILayout get(final IPattern pattern, final boolean inverted) { + return new Layout(pattern, inverted); + } + + public static ILayout get(final IPattern pattern) { + return new Layout(pattern, false); + } + @Override public IPattern getPattern() { return this.pattern; @@ -21,15 +38,6 @@ public class Layout implements ILayout { return this.inverted; } - private Layout(final IPattern pattern, final boolean inverted) { - this.pattern = pattern; - this.inverted = inverted; - } - - private Layout(final IPattern pattern) { - this(pattern, false); - } - ILayout newLayout(final ILayout newLayout) { return new Layout(newLayout.getPattern(), this.inverted ^ newLayout.isInverted()); } @@ -70,12 +78,4 @@ public class Layout implements ILayout { public ILayout invert() { return new Layout(this.pattern, !this.inverted); } - - public static ILayout get(final IPattern pattern, final boolean inverted) { - return new Layout(pattern, inverted); - } - - public static ILayout get(final IPattern pattern) { - return new Layout(pattern, false); - } } diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index 5f768b99..846cc399 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -13,36 +13,14 @@ import net.minecraftforge.common.MinecraftForge; public class ModuleCarpentry implements IInitializable { + static { + CarpentryManager.carpentryInterface = new CarpentryInterface(); + } + public BlockCarpentry blockCarpentry; public BlockCarpentry blockPanel; public BlockStainedDesign blockStained; - @Override - public void preInit() { - blockCarpentry = new BlockCarpentry("carpentry"); - blockPanel = new BlockCarpentryPanel(); - blockStained = new BlockStainedDesign(); - ExtraTrees.proxy.registerBlock(blockCarpentry, new ItemDesign(blockCarpentry)); - ExtraTrees.proxy.registerBlock(blockPanel, new ItemDesign(blockPanel)); - ExtraTrees.proxy.registerBlock(blockStained, new ItemDesign(blockStained)); - - //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockCarpentry), new MultipassItemRenderer()); - //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStained), new MultipassItemRenderer()); - MinecraftForge.EVENT_BUS.register(blockCarpentry); - //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer()); - } - - @Override - public void init() { - } - - @Override - public void postInit() { - for (final EnumDesign design : EnumDesign.values()) { - CarpentryManager.carpentryInterface.registerDesign(design.ordinal(), design); - } - } - public static ItemStack getItemStack(final BlockDesign block, final IDesignMaterial type1, final IDesignMaterial type2, final IDesign design) { return getItemStack(block, block.getDesignSystem().getMaterialIndex(type1), block.getDesignSystem().getMaterialIndex(type2), CarpentryManager.carpentryInterface.getDesignIndex(design)); } @@ -93,8 +71,30 @@ public class ModuleCarpentry implements IInitializable { return getMetadata(plank1, plank2, design, 0, EnumFacing.UP.ordinal()); } - static { - CarpentryManager.carpentryInterface = new CarpentryInterface(); + @Override + public void preInit() { + blockCarpentry = new BlockCarpentry("carpentry"); + blockPanel = new BlockCarpentryPanel(); + blockStained = new BlockStainedDesign(); + ExtraTrees.proxy.registerBlock(blockCarpentry, new ItemDesign(blockCarpentry)); + ExtraTrees.proxy.registerBlock(blockPanel, new ItemDesign(blockPanel)); + ExtraTrees.proxy.registerBlock(blockStained, new ItemDesign(blockStained)); + + //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockCarpentry), new MultipassItemRenderer()); + //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStained), new MultipassItemRenderer()); + MinecraftForge.EVENT_BUS.register(blockCarpentry); + //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer()); + } + + @Override + public void init() { + } + + @Override + public void postInit() { + for (final EnumDesign design : EnumDesign.values()) { + CarpentryManager.carpentryInterface.registerDesign(design.ordinal(), design); + } } enum Axis { diff --git a/src/main/java/binnie/extratrees/config/ConfigurationMain.java b/src/main/java/binnie/extratrees/config/ConfigurationMain.java index efa3bae5..56c65da3 100644 --- a/src/main/java/binnie/extratrees/config/ConfigurationMain.java +++ b/src/main/java/binnie/extratrees/config/ConfigurationMain.java @@ -9,5 +9,4 @@ public class ConfigurationMain { @ConfigProperty(key = "lemon.citrus.family", comment = {"Uses reflection to convert the Forestry lemon tree to the Citrus family."}) @PropBoolean public static boolean alterLemon = true; - } diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index ad364521..5fdc17c4 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -3,7 +3,14 @@ package binnie.extratrees.core; import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; import binnie.extratrees.kitchen.craftgui.WindowBottleRack; -import binnie.extratrees.machines.craftgui.*; +import binnie.extratrees.machines.craftgui.WindowArboristDatabase; +import binnie.extratrees.machines.craftgui.WindowBrewery; +import binnie.extratrees.machines.craftgui.WindowDistillery; +import binnie.extratrees.machines.craftgui.WindowLepidopteristDatabase; +import binnie.extratrees.machines.craftgui.WindowLumbermill; +import binnie.extratrees.machines.craftgui.WindowPress; +import binnie.extratrees.machines.craftgui.WindowSetSquare; +import binnie.extratrees.machines.craftgui.WindowWoodworker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/extratrees/gen/TreeGenBase.java b/src/main/java/binnie/extratrees/gen/TreeGenBase.java index 624f0465..bbb9d86d 100644 --- a/src/main/java/binnie/extratrees/gen/TreeGenBase.java +++ b/src/main/java/binnie/extratrees/gen/TreeGenBase.java @@ -38,7 +38,6 @@ public class TreeGenBase extends WorldGenerator { return a + this.rand.nextFloat() * (b - a); } - @Override public boolean generate(World worldIn, Random rand, BlockPos position) { this.world = worldIn; diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java index a9f3503f..b9fe80a7 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java @@ -15,19 +15,18 @@ public class WorldGenAlder { public CommonAlder(ITreeGenData tree) { super(tree, 5, 2); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafSpawn = this.height + 1; float bottom = WorldGenUtils.randBetween(rand, 1, 2); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 0.5F, 1, EnumReplaceMode.SOFT); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.75F, 1, EnumReplaceMode.SOFT); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 0.5F, 1, EnumReplaceMode.SOFT); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.75F, 1, EnumReplaceMode.SOFT); while (leafSpawn > bottom) { WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 2.25F, 1, EnumReplaceMode.SOFT); WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 2F, 1, EnumReplaceMode.SOFT); } WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.75F, 1, EnumReplaceMode.SOFT); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenApple.java b/src/main/java/binnie/extratrees/gen/WorldGenApple.java index 239eb823..b7ea8376 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenApple.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenApple.java @@ -14,7 +14,7 @@ public class WorldGenApple { public OrchardApple(ITreeGenData tree) { super(tree, 3, 6); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = this.height; @@ -24,14 +24,13 @@ public class WorldGenApple { } WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } - } public static class SweetCrabapple extends forestry.arboriculture.worldgen.WorldGenTree { public SweetCrabapple(ITreeGenData tree) { super(tree, 4, 4); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = this.height; @@ -43,14 +42,13 @@ public class WorldGenApple { WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } - } public static class FloweringCrabapple extends forestry.arboriculture.worldgen.WorldGenTree { public FloweringCrabapple(ITreeGenData tree) { super(tree, 3, 6); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = this.height; @@ -67,7 +65,7 @@ public class WorldGenApple { public PrairieCrabapple(ITreeGenData tree) { super(tree, 4, 4); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = this.height; diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java index e54c9260..a8110d6e 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java @@ -14,7 +14,7 @@ public class WorldGenAsh { public CommonAsh(ITreeGenData tree) { super(tree, 5, 2); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafSpawn = this.height + 1; @@ -25,6 +25,5 @@ public class WorldGenAsh { } WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 0.25F, 1, WorldGenHelper.EnumReplaceMode.AIR); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java index f7ac7246..db4ca251 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java @@ -13,7 +13,7 @@ public class WorldGenBanana extends forestry.arboriculture.worldgen.WorldGenTree public WorldGenBanana(ITreeGenData tree) { super(tree, 6, 1); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = this.height + 1; @@ -21,5 +21,4 @@ public class WorldGenBanana extends forestry.arboriculture.worldgen.WorldGenTree WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.5F, 1, WorldGenHelper.EnumReplaceMode.AIR); WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1, 1, WorldGenHelper.EnumReplaceMode.AIR); } - } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java index deb17c0d..4620235b 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java @@ -14,7 +14,7 @@ public class WorldGenBeech { public CommonBeech(ITreeGenData tree) { super(tree, 5, 3); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafSpawn = this.height + 1; @@ -27,7 +27,6 @@ public class WorldGenBeech { } WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.5F, 1, WorldGenHelper.EnumReplaceMode.AIR); } - } public static class CopperBeech extends CommonBeech { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java index f3e3a47a..3ab5e9da 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java @@ -14,14 +14,14 @@ public class WorldGenConifer { public WesternHemlock(ITreeGenData tree) { super(tree, 7, 3); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafSpawn = this.height + girth * 4; float bottom = WorldGenUtils.randBetween(rand, 2, 3); final float coneHeight = leafSpawn - bottom; float width = (girth * height / 3); - if(width > 9){ + if (width > 9) { width = 9; } while (leafSpawn > bottom) { @@ -32,7 +32,6 @@ public class WorldGenConifer { WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + width * 0.7F, 1, WorldGenHelper.EnumReplaceMode.AIR); WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + width * 0.4F, 1, WorldGenHelper.EnumReplaceMode.AIR); } - } public static class Cypress extends WorldGenTree { @@ -74,7 +73,6 @@ public class WorldGenConifer { this.height = this.determineHeight(6, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class Yew extends WorldGenTree { @@ -112,7 +110,6 @@ public class WorldGenConifer { this.height = this.determineHeight(5, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class Cedar extends WorldGenTree { @@ -178,7 +175,6 @@ public class WorldGenConifer { this.height = this.determineHeight(6, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class LoblollyPine extends WorldGenTree { @@ -216,7 +212,6 @@ public class WorldGenConifer { this.height = this.determineHeight(6, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class MonkeyPuzzle extends WorldGenTree { @@ -264,6 +259,5 @@ public class WorldGenConifer { this.height = this.determineHeight(9, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenDefault.java b/src/main/java/binnie/extratrees/gen/WorldGenDefault.java index 578c280e..74770fe2 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenDefault.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenDefault.java @@ -35,5 +35,4 @@ public class WorldGenDefault extends WorldGenTree { public BlockType getWood() { return new BlockTypeLog(this.treeGen); } - } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java b/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java index fc8a5fd1..3d5b7891 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java @@ -57,7 +57,6 @@ public class WorldGenEucalyptus { this.height = this.determineHeight(14, 3); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class RoseGum extends WorldGenTree { @@ -106,7 +105,6 @@ public class WorldGenEucalyptus { this.height = this.determineHeight(9, 3); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class RainbowGum extends WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenFir.java b/src/main/java/binnie/extratrees/gen/WorldGenFir.java index e671aee5..11d6336c 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenFir.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenFir.java @@ -52,7 +52,6 @@ public class WorldGenFir { this.height = this.determineHeight(7, 3); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class SilverFir extends WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenHolly.java b/src/main/java/binnie/extratrees/gen/WorldGenHolly.java index a95b6203..3fa4d5a8 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenHolly.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenHolly.java @@ -42,6 +42,5 @@ public class WorldGenHolly { this.height = this.determineHeight(4, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenJungle.java b/src/main/java/binnie/extratrees/gen/WorldGenJungle.java index cef6a33a..bd24c44c 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenJungle.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenJungle.java @@ -34,7 +34,6 @@ public class WorldGenJungle { this.height = this.determineHeight(4, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class Logwood extends WorldGenTree { @@ -72,7 +71,6 @@ public class WorldGenJungle { this.height = this.determineHeight(4, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class Rosewood extends WorldGenTree { @@ -114,7 +112,6 @@ public class WorldGenJungle { this.height = this.determineHeight(6, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class Purpleheart extends WorldGenTree { @@ -154,7 +151,6 @@ public class WorldGenJungle { this.height = this.determineHeight(7, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class OsangeOsange extends WorldGenTree { @@ -192,7 +188,6 @@ public class WorldGenJungle { this.height = this.determineHeight(5, 1); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class OldFustic extends WorldGenTree { @@ -230,7 +225,6 @@ public class WorldGenJungle { this.height = this.determineHeight(5, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class Coffee extends WorldGenTree { @@ -268,7 +262,6 @@ public class WorldGenJungle { this.height = this.determineHeight(3, 1); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class BrazilNut extends WorldGenTree { @@ -310,7 +303,6 @@ public class WorldGenJungle { this.height = this.determineHeight(7, 1); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class Shrub15 extends WorldGenTree { @@ -344,6 +336,5 @@ public class WorldGenJungle { this.height = this.determineHeight(4, 1); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenLazy.java b/src/main/java/binnie/extratrees/gen/WorldGenLazy.java index aa87d37a..285b714a 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenLazy.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenLazy.java @@ -36,6 +36,5 @@ public class WorldGenLazy { this.height = this.determineHeight(4, 1); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenMaple.java b/src/main/java/binnie/extratrees/gen/WorldGenMaple.java index 46f0c256..615a2606 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenMaple.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenMaple.java @@ -53,6 +53,5 @@ public class WorldGenMaple { this.height = this.determineHeight(5, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java index 8d6429a9..d40ac394 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java @@ -14,7 +14,7 @@ public class WorldGenPalm { public Coconut(ITreeGenData tree) { super(tree, 6, 1); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafSpawn = this.height + 1; @@ -22,6 +22,5 @@ public class WorldGenPalm { WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 0.5F, 1, WorldGenHelper.EnumReplaceMode.AIR); WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth - 0.6F, 1, WorldGenHelper.EnumReplaceMode.AIR); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java b/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java index b2f7f4cb..62fd6c1c 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java @@ -42,7 +42,5 @@ public class WorldGenPoplar { this.height = this.determineHeight(5, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPrune.java b/src/main/java/binnie/extratrees/gen/WorldGenPrune.java index 46981114..a12ed348 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPrune.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPrune.java @@ -27,5 +27,4 @@ public class WorldGenPrune extends WorldGenTree { this.height = this.determineHeight(6, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java index 40bce9a3..bf858b8c 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java @@ -18,23 +18,23 @@ import java.util.Random; import java.util.Set; public class WorldGenShrub { - public static class Shrub extends WorldGenArboriculture { + public static class Shrub extends WorldGenArboriculture { private static final int minHeight = 1; private static final int maxHeight = 10; protected int girth; protected int height; - + public Shrub(ITreeGenData tree) { super(tree); } - + @Override public Set generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) { WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0); return Collections.emptySet(); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafSpawn = this.height; @@ -46,7 +46,7 @@ public class WorldGenShrub { i++; } } - + @Override protected void generateExtras(World world, Random rand, BlockPos startPos) { } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java b/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java index f243c603..fd46bf7b 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java @@ -22,7 +22,6 @@ public class WorldGenSorbus { } this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, this.leaf, false); } - } public static class Rowan extends WorldGenTree { @@ -42,7 +41,6 @@ public class WorldGenSorbus { } this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, this.leaf, false); } - } public static class ServiceTree extends WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java b/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java index fe636412..e47b2838 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java @@ -78,7 +78,6 @@ public class WorldGenSpruce { this.height = this.determineHeight(5, 3); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } public static class WhiteSpruce extends WorldGenTree { @@ -147,6 +146,5 @@ public class WorldGenSpruce { this.height = this.determineHeight(6, 2); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree.java b/src/main/java/binnie/extratrees/gen/WorldGenTree.java index 8a5b22d0..bddce4f6 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTree.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTree.java @@ -31,6 +31,18 @@ public class WorldGenTree extends WorldGenerator { BlockType air; float bushiness; + public WorldGenTree(ITreeGenData tree) { + this.minHeight = 3; + this.maxHeight = 80; + this.spawnPods = false; + this.minPodHeight = 3; + this.vine = new BlockType(Blocks.VINE, 0); + this.air = new BlockTypeVoid(); + this.bushiness = 0.0f; + this.spawnPods = tree.allowsFruitBlocks(); + this.treeGen = tree; + } + protected int randBetween(final int a, final int b) { return a + this.rand.nextInt(b - a); } @@ -79,18 +91,6 @@ public class WorldGenTree extends WorldGenerator { return new BlockTypeLog(treeGen); } - public WorldGenTree(ITreeGenData tree) { - this.minHeight = 3; - this.maxHeight = 80; - this.spawnPods = false; - this.minPodHeight = 3; - this.vine = new BlockType(Blocks.VINE, 0); - this.air = new BlockTypeVoid(); - this.bushiness = 0.0f; - this.spawnPods = tree.allowsFruitBlocks(); - this.treeGen = tree; - } - @Override public boolean generate(World worldIn, Random rand, BlockPos position) { return generate(worldIn, rand, position.getX(), position.getY(), position.getZ(), false); diff --git a/src/main/java/binnie/extratrees/gen/WorldGenUtils.java b/src/main/java/binnie/extratrees/gen/WorldGenUtils.java index 99bcb327..c63093dd 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenUtils.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenUtils.java @@ -11,5 +11,4 @@ public class WorldGenUtils { public static float randBetween(Random rand, float a, float b) { return a + rand.nextFloat() * (b - a); } - } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java index 8a8b9a54..18dbea9f 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java @@ -15,7 +15,7 @@ public class WorldGenWalnut { public BlackWalnut(ITreeGenData tree) { super(tree, 9, 6); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = this.height + 1; @@ -28,7 +28,7 @@ public class WorldGenWalnut { WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.2f - girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } } - + public static class Butternut extends WorldGenTree { public Butternut(ITreeGenData tree) { super(tree, 6, 3); diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index 8794314a..de9fc558 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -8,7 +8,12 @@ import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.item.Food; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import forestry.api.arboriculture.*; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IFruitFamily; @@ -27,8 +32,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.lang.reflect.Field; -import java.util.*; - +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Random; public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IFruitProvider { public static final AlleleETFruit Blackthorn = new AlleleETFruit("Blackthorn", 10, 7180062, 14561129, FruitSprite.SMALL); @@ -91,7 +99,8 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF public static final AlleleETFruit Juniper = new AlleleETFruit("Juniper", 8, 10194034, 6316914, FruitSprite.TINY); public static final AlleleETFruit Gooseberry = new AlleleETFruit("Gooseberry", 8, 12164944, 12177232, FruitSprite.TINY); public static final AlleleETFruit GoldenRaspberry = new AlleleETFruit("GoldenRaspberry", 8, 12496955, 15970363, FruitSprite.TINY); - + @Nullable + private static LinkedList list; @Nullable private IFruitFamily family; private boolean isRipening; @@ -105,8 +114,27 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF private FruitSprite sprite; private Map products; - @Nullable - private static LinkedList list; + private AlleleETFruit(String name, int time, int unripe, int colour, FruitSprite sprite) { + super(Constants.EXTRA_TREES_MOD_ID, "fruit", name, true); + this.isRipening = false; + this.diffB = 0; + this.pod = null; + this.ripeningPeriod = 0; + this.products = new HashMap<>(); + this.colour = colour; + this.sprite = sprite; + this.setRipening(time, unripe); + } + + private AlleleETFruit(String name, FruitPod pod) { + super(Constants.EXTRA_TREES_MOD_ID, "fruit", name, true); + this.isRipening = false; + this.diffB = 0; + this.sprite = null; + this.products = new HashMap<>(); + this.pod = pod; + this.ripeningPeriod = 2; + } public static List values() { if (list == null) { @@ -124,8 +152,8 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF return list; } - - public static void preInit(){ + + public static void preInit() { for (final AlleleETFruit fruit : AlleleETFruit.values()) { AlleleManager.alleleRegistry.registerAllele(fruit, EnumTreeChromosome.FRUITS); } @@ -279,28 +307,6 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF } } - private AlleleETFruit(String name, int time, int unripe, int colour, FruitSprite sprite) { - super(Constants.EXTRA_TREES_MOD_ID, "fruit", name, true); - this.isRipening = false; - this.diffB = 0; - this.pod = null; - this.ripeningPeriod = 0; - this.products = new HashMap<>(); - this.colour = colour; - this.sprite = sprite; - this.setRipening(time, unripe); - } - - private AlleleETFruit(String name, FruitPod pod) { - super(Constants.EXTRA_TREES_MOD_ID, "fruit", name, true); - this.isRipening = false; - this.diffB = 0; - this.sprite = null; - this.products = new HashMap<>(); - this.pod = pod; - this.ripeningPeriod = 2; - } - public void setRipening(int time, int unripe) { this.ripeningPeriod = time; this.colourUnripe = unripe; @@ -314,10 +320,6 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF this.products.put(product, chance); } - private void setFamily(IFruitFamily family) { - this.family = family; - } - @Override public IFruitProvider getProvider() { return this; @@ -361,8 +363,8 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Override public boolean trySpawnFruitBlock(ITreeGenome genome, World world, Random rand, BlockPos pos) { return this.pod != null && - world.rand.nextFloat() <= genome.getSappiness() && - TreeManager.treeRoot.setFruitBlock(world, genome, this, genome.getSappiness(), pos); + world.rand.nextFloat() <= genome.getSappiness() && + TreeManager.treeRoot.setFruitBlock(world, genome, this, genome.getSappiness(), pos); } @Override @@ -430,7 +432,6 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF return (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF); } - @Override public String getDescription() { return ExtraTrees.proxy.localise("item.food." + this.getClass().getTypeName().toLowerCase()); @@ -442,6 +443,10 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF return this.family; } + private void setFamily(IFruitFamily family) { + this.family = family; + } + @Override public int getRipeningPeriod() { return this.ripeningPeriod; diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 7ae36fd8..2c8e6d25 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -4,7 +4,14 @@ import binnie.Constants; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; -import forestry.api.lepidopterology.*; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.EnumFlutterType; +import forestry.api.lepidopterology.IAlleleButterflySpecies; +import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; +import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyGenome; +import forestry.api.lepidopterology.IButterflyMutationBuilder; import forestry.core.genetics.alleles.AlleleHelper; import forestry.lepidopterology.genetics.Butterfly; import forestry.lepidopterology.genetics.ButterflyDefinition; @@ -12,7 +19,7 @@ import forestry.lepidopterology.genetics.IButterflyDefinition; import forestry.lepidopterology.genetics.MothDefinition; import net.minecraft.item.ItemStack; -import java.awt.*; +import java.awt.Color; import java.util.Arrays; public enum ButterflySpecies implements IButterflyDefinition { @@ -40,12 +47,12 @@ public enum ButterflySpecies implements IButterflyDefinition { Marbled_White("Marbled White", "Melanargia galathea", 15527148); public static final ButterflySpecies[] VALUES = values(); - + private final IAlleleButterflySpecies species; private final IClassification branch; private IAllele[] template; private IButterflyGenome genome; - + ButterflySpecies(String name, String scientific, int colour) { String branchName = scientific.split(" ")[0].toLowerCase(); String binomial = scientific.split(" ")[1]; @@ -78,6 +85,10 @@ public enum ButterflySpecies implements IButterflyDefinition { } } + public static void preInit() { + + } + private void init() { template = ButterflyManager.butterflyRoot.getDefaultTemplate(); AlleleHelper.getInstance().set(template, EnumButterflyChromosome.SPECIES, species); @@ -151,8 +162,4 @@ public enum ButterflySpecies implements IButterflyDefinition { public IAlleleButterflySpecies getSpecies() { return species; } - - public static void preInit() { - - } } diff --git a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java index 372f7811..d437797a 100644 --- a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java +++ b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java @@ -29,5 +29,4 @@ public class ETLeafProvider implements ILeafProvider { } return ModuleBlocks.getDecorativeLeaves(species.getUID()); } - } diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index f8ac4601..2d2741c1 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -4,13 +4,51 @@ import binnie.Constants; import binnie.core.genetics.ForestryAllele; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.EnumShrubLog; -import binnie.extratrees.gen.*; +import binnie.extratrees.gen.WorldGenAlder; +import binnie.extratrees.gen.WorldGenApple; +import binnie.extratrees.gen.WorldGenAsh; +import binnie.extratrees.gen.WorldGenBanana; +import binnie.extratrees.gen.WorldGenBeech; +import binnie.extratrees.gen.WorldGenConifer; +import binnie.extratrees.gen.WorldGenEucalyptus; +import binnie.extratrees.gen.WorldGenFir; +import binnie.extratrees.gen.WorldGenHolly; +import binnie.extratrees.gen.WorldGenJungle; +import binnie.extratrees.gen.WorldGenLazy; +import binnie.extratrees.gen.WorldGenMaple; +import binnie.extratrees.gen.WorldGenPalm; +import binnie.extratrees.gen.WorldGenPoplar; +import binnie.extratrees.gen.WorldGenShrub; +import binnie.extratrees.gen.WorldGenSorbus; +import binnie.extratrees.gen.WorldGenTree; +import binnie.extratrees.gen.WorldGenTree2; +import binnie.extratrees.gen.WorldGenTree3; +import binnie.extratrees.gen.WorldGenTropical; +import binnie.extratrees.gen.WorldGenWalnut; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; -import forestry.api.arboriculture.*; +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.EnumLeafType; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder; +import forestry.api.arboriculture.ILeafSpriteProvider; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenerator; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.IWoodProvider; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IClassification; import forestry.api.world.ITreeGenData; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.ClimateGrowthProvider; @@ -32,7 +70,7 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import org.apache.commons.lang3.StringUtils; -import java.awt.*; +import java.awt.Color; import java.util.Arrays; import java.util.Locale; @@ -1979,8 +2017,9 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT } }; + private static final String unlocalizedName = "extratrees.species.%s.name"; + private static final String unlocalizedDesc = "extratrees.species.%s.desc"; public static ETTreeDefinition[] VALUES = values(); - private String branchName; private String binomial; private Color leafColor; @@ -1995,8 +2034,6 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT private IAlleleTreeSpecies species; private ITreeGenome genome; private AlleleTemplate template; - private static final String unlocalizedName = "extratrees.species.%s.name"; - private static final String unlocalizedDesc = "extratrees.species.%s.desc"; ETTreeDefinition(String branch, String binomial, EnumLeafType leafType, Color leafColor, Color leafPollinatedColor, EnumSaplingType saplingType, IWoodType woodType, Color woodColor) { this.binomial = binomial; @@ -2009,8 +2046,6 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT this.woodProvider = new WoodProvider(woodType); this.woodColor = woodColor; this.branchName = branch; - - } public static void initTrees() { @@ -2028,6 +2063,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT } } + public static ETTreeDefinition byMetadata(int meta) { + if (meta < 0 || meta >= VALUES.length) { + meta = 0; + } + return VALUES[meta]; + } + public void preInit() { final String scientific = StringUtils.capitalize(branchName); final String uid = "trees." + branchName; @@ -2036,7 +2078,8 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT branch = AlleleManager.alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); } IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(getUID(), String.format(unlocalizedName, getUID()), getAuthority(), String.format(unlocalizedDesc, getUID()), isDominant(), - branch, getBinomial(), Constants.EXTRA_TREES_MOD_ID, leafSpriteProvider, saplingType.getGermlingModelProvider(leafColor, woodColor), woodProvider, this, new ETLeafProvider()); + branch, getBinomial(), Constants.EXTRA_TREES_MOD_ID, leafSpriteProvider, saplingType.getGermlingModelProvider(leafColor, woodColor), woodProvider, this, new ETLeafProvider() + ); setSpeciesProperties(speciesBuilder); species = speciesBuilder.build(); branch.addMemberSpecies(species); @@ -2120,13 +2163,6 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT return ordinal(); } - public static ETTreeDefinition byMetadata(int meta) { - if (meta < 0 || meta >= VALUES.length) { - meta = 0; - } - return VALUES[meta]; - } - @Override public String getName() { return name().toLowerCase(Locale.ENGLISH); @@ -2139,7 +2175,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT IBlockState logBlock = TreeManager.woodAccess.getBlock(woodType, WoodBlockKind.LOG, fireproof); BlockLog.EnumAxis axis = BlockLog.EnumAxis.fromFacingAxis(facing.getAxis()); - if(logBlock.getBlock() instanceof BlockLog){ + if (logBlock.getBlock() instanceof BlockLog) { logBlock = logBlock.withProperty(BlockLog.LOG_AXIS, axis); } return world.setBlockState(pos, logBlock); diff --git a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java index 4a0bec23..2f34022c 100644 --- a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java +++ b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java @@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; public enum EnumSaplingType { Default, diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index 39057b85..15b8365b 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -29,6 +29,24 @@ public class ExtraTreeMutation implements ITreeMutation { private float maxRainfall; private float height; + public ExtraTreeMutation(final IAlleleSpecies allele0, final IAlleleSpecies allele1, final IAlleleSpecies result, final int chance) { + this(allele0, allele1, Binnie.GENETICS.getTreeRoot().getTemplate(result), chance); + } + + public ExtraTreeMutation(final IAllele allele0, final IAllele allele1, final IAllele[] template, final int chance) { + this.isSecret = false; + this.minTemperature = 0.0f; + this.maxTemperature = 2.0f; + this.minRainfall = 0.0f; + this.maxRainfall = 2.0f; + this.height = -1.0f; + this.allele0 = (IAlleleTreeSpecies) allele0; + this.allele1 = (IAlleleTreeSpecies) allele1; + this.template = template; + this.chance = chance; + Binnie.GENETICS.getTreeRoot().registerMutation(this); + } + public static void init() { final IAlleleTreeSpecies lemon = (IAlleleTreeSpecies) getVanilla("Lemon"); new ExtraTreeMutation(getVanilla("Cherry"), lemon, ETTreeDefinition.KeyLime.getSpecies(), 10); @@ -138,24 +156,6 @@ public class ExtraTreeMutation implements ITreeMutation { return (IAlleleSpecies) allele; } - public ExtraTreeMutation(final IAlleleSpecies allele0, final IAlleleSpecies allele1, final IAlleleSpecies result, final int chance) { - this(allele0, allele1, Binnie.GENETICS.getTreeRoot().getTemplate(result), chance); - } - - public ExtraTreeMutation(final IAllele allele0, final IAllele allele1, final IAllele[] template, final int chance) { - this.isSecret = false; - this.minTemperature = 0.0f; - this.maxTemperature = 2.0f; - this.minRainfall = 0.0f; - this.maxRainfall = 2.0f; - this.height = -1.0f; - this.allele0 = (IAlleleTreeSpecies) allele0; - this.allele1 = (IAlleleTreeSpecies) allele1; - this.template = template; - this.chance = chance; - Binnie.GENETICS.getTreeRoot().registerMutation(this); - } - public ExtraTreeMutation setIsSecret() { this.isSecret = true; return this; @@ -259,6 +259,4 @@ public class ExtraTreeMutation implements ITreeMutation { } return 0.0f; } - - } diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 42c56c66..171225cf 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -18,17 +18,23 @@ public class ModuleGenetics implements IInitializable { this.classifications = new ArrayList<>(); } + @SubscribeEvent + public static void onRegisterAllele(AlleleRegisterEvent event) { + if (event.getAlleleClass() == IAlleleFruit.class) { + AlleleETFruit.preInit(); + } + } + @Override public void preInit() { } - @Override public void init() { AlleleETFruit.init(); ETTreeDefinition.initTrees(); ExtraTreeMutation.init(); - if(BinnieCore.isLepidopteryActive()){ + if (BinnieCore.isLepidopteryActive()) { ButterflySpecies.initButterflies(); } } @@ -36,11 +42,4 @@ public class ModuleGenetics implements IInitializable { @Override public void postInit() { } - - @SubscribeEvent - public static void onRegisterAllele(AlleleRegisterEvent event){ - if(event.getAlleleClass() == IAlleleFruit.class){ - AlleleETFruit.preInit(); - } - } } \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/genetics/WoodProvider.java b/src/main/java/binnie/extratrees/genetics/WoodProvider.java index a02c4ed5..b0420fb9 100644 --- a/src/main/java/binnie/extratrees/genetics/WoodProvider.java +++ b/src/main/java/binnie/extratrees/genetics/WoodProvider.java @@ -38,7 +38,6 @@ public class WoodProvider implements IWoodProvider { TextureMap textureMap = FMLClientHandler.instance().getClient().getTextureMapBlocks(); trunk = textureMap.registerSprite(new ResourceLocation(type.getHeartTexture())); bark = textureMap.registerSprite(new ResourceLocation(type.getBarkTexture())); - } @Override diff --git a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java index 5654e9af..511b9343 100644 --- a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java +++ b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java @@ -15,7 +15,12 @@ import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeCategory; import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeMaker; import binnie.extratrees.integration.jei.multifence.MultiFenceRecipeRegistryPlugin; import binnie.extratrees.machines.ExtraTreeMachine; -import mezz.jei.api.*; +import mezz.jei.api.BlankModPlugin; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.ISubtypeRegistry; +import mezz.jei.api.JEIPlugin; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -27,9 +32,9 @@ public class ExtraTreesJeiPlugin extends BlankModPlugin { @Override public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { - subtypeRegistry.registerSubtypeInterpreter(Item.getItemFromBlock(ExtraTrees.blocks().blockMultiFence), (ItemStack itemStack)->{ + subtypeRegistry.registerSubtypeInterpreter(Item.getItemFromBlock(ExtraTrees.blocks().blockMultiFence), (ItemStack itemStack) -> { FenceDescription desc = WoodManager.getFenceDescription(itemStack); - if(desc != null){ + if (desc != null) { FenceType type = WoodManager.getFenceType(itemStack); return type + ":" + desc.getPlankType().getName().toLowerCase() + ":" + desc.getSecondaryPlankType().getName().toLowerCase(); } @@ -44,10 +49,10 @@ public class ExtraTreesJeiPlugin extends BlankModPlugin { ExtraTreesJeiPlugin.drawables = Drawables.getDrawables(guiHelper); registry.addRecipeCategories( - new LumbermillRecipeCategory(), - new FruitPressRecipeCategory(), - new BreweryRecipeCategory(), - new DistilleryRecipeCategory() + new LumbermillRecipeCategory(), + new FruitPressRecipeCategory(), + new BreweryRecipeCategory(), + new DistilleryRecipeCategory() ); registry.addRecipeCategoryCraftingItem(ExtraTreeMachine.Lumbermill.get(1), RecipeUids.LUMBERMILL); @@ -59,7 +64,7 @@ public class ExtraTreesJeiPlugin extends BlankModPlugin { registry.addRecipes(FruitPressRecipeMaker.create(), RecipeUids.FRUIT_PRESS); registry.addRecipes(BreweryRecipeMaker.create(), RecipeUids.BREWING); registry.addRecipes(DistilleryRecipeMaker.create(), RecipeUids.DISTILLING); - + registry.addRecipeRegistryPlugin(new MultiFenceRecipeRegistryPlugin()); } } diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java index d72dff89..4a5a0ba6 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java @@ -3,7 +3,11 @@ package binnie.extratrees.integration.jei.brewery; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; import binnie.extratrees.machines.brewery.BreweryMachine; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java index 121ecb1e..b3f93818 100644 --- a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java @@ -3,7 +3,11 @@ package binnie.extratrees.integration.jei.fruitpress; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; import binnie.extratrees.machines.fruitpress.FruitPressMachine; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java index 95570a9e..b50b1661 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java @@ -1,10 +1,13 @@ package binnie.extratrees.integration.jei.lumbermill; - import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; import binnie.extratrees.machines.lumbermill.LumbermillMachine; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java index 77570bc4..d13911b2 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java @@ -30,9 +30,9 @@ public class LumbermillRecipeWrapper extends BlankRecipeWrapper { ExtraTrees.items(); ExtraTrees.items(); ingredients.setOutputs(ItemStack.class, Arrays.asList( - ExtraTreeItems.Bark.get(1), - outputPlanks, - ExtraTreeItems.Sawdust.get(1) + ExtraTreeItems.Bark.get(1), + outputPlanks, + ExtraTreeItems.Sawdust.get(1) )); } } diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java index abdb9df4..b325bacf 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java @@ -21,46 +21,46 @@ public class MultiFenceRecipeEmbeddedWrapper extends BlankRecipeWrapper implemen private IPlankType plankType; @Nullable private IPlankType plankTypeSecondary; - + public MultiFenceRecipeEmbeddedWrapper(FenceType fenceType) { this.fenceType = fenceType; } - + public MultiFenceRecipeEmbeddedWrapper(IPlankType plankType, FenceType fenceType) { this.plankType = plankType; this.fenceType = fenceType; } - + public MultiFenceRecipeEmbeddedWrapper(FenceDescription fenceDesc) { this.plankType = fenceDesc.getPlankType(); this.plankTypeSecondary = fenceDesc.getSecondaryPlankType(); this.fenceType = fenceDesc.getFenceType(); } - + @Override public void getIngredients(IIngredients ingredients) { List fences = new ArrayList<>(); List planks = new ArrayList<>(); List outputFences = new ArrayList<>(); - if(plankType != null){ - if(plankTypeSecondary == null){ - for(Entry secondary : WoodManager.getAllPlankStacks().entrySet()){ + if (plankType != null) { + if (plankTypeSecondary == null) { + for (Entry secondary : WoodManager.getAllPlankStacks().entrySet()) { IPlankType plankTypeSecondary = secondary.getKey(); - if(plankType != plankTypeSecondary){ + if (plankType != plankTypeSecondary) { planks.add(plankType.getStack(false)); fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, false), 1)); outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, true), 2)); } } - }else{ + } else { planks.add(plankType.getStack(false)); fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, false), 1)); outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, true), 2)); } - }else{ - for(IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()){ - for(IPlankType plankType : WoodManager.getAllPlankTypes()){ - if(plankType != plankTypeSecondary){ + } else { + for (IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()) { + for (IPlankType plankType : WoodManager.getAllPlankTypes()) { + if (plankType != plankTypeSecondary) { planks.add(plankType.getStack(false)); fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, false), 1)); outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, fenceType.solid, true), 2)); @@ -77,7 +77,7 @@ public class MultiFenceRecipeEmbeddedWrapper extends BlankRecipeWrapper implemen ingredients.setOutputLists(ItemStack.class, itemOutputs); ingredients.setInputLists(ItemStack.class, itemInputs); } - + @Override public int getWidth() { return 3; @@ -87,5 +87,4 @@ public class MultiFenceRecipeEmbeddedWrapper extends BlankRecipeWrapper implemen public int getHeight() { return 1; } - } diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java index ee9d24eb..c9b1e61e 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java @@ -5,8 +5,12 @@ import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceDescription; import binnie.extratrees.block.decor.FenceType; import binnie.extratrees.block.decor.MultiFenceRecipePattern; -import mezz.jei.api.recipe.*; +import mezz.jei.api.recipe.IFocus; import mezz.jei.api.recipe.IFocus.Mode; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeRegistryPlugin; +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import mezz.jei.gui.Focus; import net.minecraft.item.ItemStack; @@ -17,13 +21,13 @@ import java.util.List; public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { public List recipes = new ArrayList<>(); - + @Override public List getRecipeCategoryUids(IFocus focus) { focus = Focus.check(focus); V ingredient = focus.getValue(); - - if(!(ingredient instanceof ItemStack)){ + + if (!(ingredient instanceof ItemStack)) { return Collections.emptyList(); } ItemStack itemStack = (ItemStack) ingredient; @@ -32,13 +36,13 @@ public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { case INPUT: desc = WoodManager.getFenceDescription(itemStack); IPlankType plankType = WoodManager.getPlankType(itemStack); - if(plankType != null || desc != null && (!desc.getFenceType().embossed || !desc.getFenceType().embossed)){ + if (plankType != null || desc != null && (!desc.getFenceType().embossed || !desc.getFenceType().embossed)) { return Collections.singletonList(VanillaRecipeCategoryUid.CRAFTING); } return Collections.emptyList(); case OUTPUT: desc = WoodManager.getFenceDescription(itemStack); - if(desc != null){ + if (desc != null) { return Collections.singletonList(VanillaRecipeCategoryUid.CRAFTING); } return Collections.emptyList(); @@ -51,7 +55,7 @@ public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { public List getRecipeWrappers(IRecipeCategory recipeCategory, IFocus focus) { focus = Focus.check(focus); V ingredient = focus.getValue(); - if(!recipeCategory.getUid().equals(VanillaRecipeCategoryUid.CRAFTING) || !(ingredient instanceof ItemStack)){ + if (!recipeCategory.getUid().equals(VanillaRecipeCategoryUid.CRAFTING) || !(ingredient instanceof ItemStack)) { return Collections.emptyList(); } return (List) getRecipes((IFocus) focus); @@ -59,61 +63,60 @@ public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { @Override public List getRecipeWrappers(IRecipeCategory recipeCategory) { - if(!recipeCategory.getUid().equals(VanillaRecipeCategoryUid.CRAFTING)){ + if (!recipeCategory.getUid().equals(VanillaRecipeCategoryUid.CRAFTING)) { return Collections.emptyList(); } - if(recipes.isEmpty()){ - for(MultiFenceRecipePattern pattern : MultiFenceRecipePattern.VALUES){ + if (recipes.isEmpty()) { + for (MultiFenceRecipePattern pattern : MultiFenceRecipePattern.VALUES) { recipes.add(new MultiFenceRecipeSizeWrapper(pattern)); } - for(FenceType fenceType : FenceType.VALUES){ + for (FenceType fenceType : FenceType.VALUES) { recipes.add(new MultiFenceRecipeEmbeddedWrapper(fenceType)); recipes.add(new MultiFenceRecipeSolidWrapper(fenceType)); } } return (List) recipes; } - - private List getRecipes(IFocus focus){ + + private List getRecipes(IFocus focus) { ItemStack ingredient = focus.getValue(); List recipes = new ArrayList<>(); - if(focus.getMode() == Mode.INPUT){ + if (focus.getMode() == Mode.INPUT) { IPlankType plankType = WoodManager.getPlankType(ingredient); - if(plankType != null){ - for(MultiFenceRecipePattern pattern : MultiFenceRecipePattern.VALUES){ + if (plankType != null) { + for (MultiFenceRecipePattern pattern : MultiFenceRecipePattern.VALUES) { recipes.add(new MultiFenceRecipeSizeWrapper(pattern, plankType)); } - for(int size = 0;size < 3;size++){ + for (int size = 0; size < 3; size++) { for (final boolean solid : new boolean[]{false, true}) { recipes.add(new MultiFenceRecipeEmbeddedWrapper(plankType, new FenceType(size, solid, false))); } } - }else{ + } else { FenceDescription desc = WoodManager.getFenceDescription(ingredient); - if(desc != null){ - if(!desc.getFenceType().embossed){ + if (desc != null) { + if (!desc.getFenceType().embossed) { recipes.add(new MultiFenceRecipeEmbeddedWrapper(desc)); } - if(!desc.getFenceType().solid){ + if (!desc.getFenceType().solid) { recipes.add(new MultiFenceRecipeSolidWrapper(desc)); } } } - }else{ + } else { FenceDescription desc = WoodManager.getFenceDescription(ingredient); - if(desc != null){ + if (desc != null) { int size = desc.getFenceType().size; recipes.add(new MultiFenceRecipeSizeWrapper(MultiFenceRecipePattern.VALUES[size * 2], desc.getPlankType(), desc.getSecondaryPlankType())); recipes.add(new MultiFenceRecipeSizeWrapper(MultiFenceRecipePattern.VALUES[size * 2 + 1], desc.getPlankType(), desc.getSecondaryPlankType())); - if(desc.getFenceType().embossed){ + if (desc.getFenceType().embossed) { recipes.add(new MultiFenceRecipeEmbeddedWrapper(desc)); } - if(desc.getFenceType().solid){ + if (desc.getFenceType().solid) { recipes.add(new MultiFenceRecipeSolidWrapper(desc)); } } } return recipes; } - } diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java index ba9fb6b0..b355f4fb 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java @@ -21,16 +21,15 @@ public class MultiFenceRecipeSizeWrapper extends BlankRecipeWrapper { private IPlankType plankTypeSecond; private MultiFenceRecipePattern pattern; private String[] recipePattern; - - + public MultiFenceRecipeSizeWrapper(MultiFenceRecipePattern pattern) { this(pattern, null, null); } - + public MultiFenceRecipeSizeWrapper(MultiFenceRecipePattern pattern, @Nullable IPlankType plankType) { this(pattern, plankType, null); } - + public MultiFenceRecipeSizeWrapper(MultiFenceRecipePattern pattern, @Nullable IPlankType plankType, @Nullable IPlankType plankTypeSecond) { this.pattern = pattern; String recipePattern = pattern.getPattern(); @@ -41,60 +40,60 @@ public class MultiFenceRecipeSizeWrapper extends BlankRecipeWrapper { this.plankType = plankType; this.plankTypeSecond = plankTypeSecond; } - + @Override public void getIngredients(IIngredients ingredients) { int typeCount = pattern.getTypeCount(); List> types = NonNullList.create(); - if(this.plankType != null){ + if (this.plankType != null) { types.add(Collections.singletonList(plankType.getStack(false))); - }else{ + } else { List planks = new ArrayList<>(WoodManager.getAllPlankStacks().values()); Collections.shuffle(planks); types.add(planks); } - if(typeCount > 1){ - if(plankTypeSecond != null){ + if (typeCount > 1) { + if (plankTypeSecond != null) { types.add(Collections.singletonList(plankTypeSecond.getStack(false))); - }else{ + } else { List planks; - if(plankType != null){ + if (plankType != null) { planks = new ArrayList<>(WoodManager.getAllPlankStacks(plankType)); - }else{ + } else { planks = new ArrayList<>(WoodManager.getAllPlankStacks().values()); } Collections.shuffle(planks); types.add(planks); } - }else{ + } else { types.add(types.get(0)); } List> itemInputs = NonNullList.withSize(9, NonNullList.create()); - for(int p = 0;p < 3;p++){ + for (int p = 0; p < 3; p++) { String recipePattern = this.recipePattern[p]; - for(int index = 0;index < 3;index++){ + for (int index = 0; index < 3; index++) { char c = recipePattern.charAt(index); - if(c == '0'){ + if (c == '0') { itemInputs.set(p * 3 + index, types.get(0)); - }else if(c == '1'){ + } else if (c == '1') { itemInputs.set(p * 3 + index, types.get(1)); - }else{ + } else { itemInputs.set(p * 3 + index, NonNullList.withSize(1, ItemStack.EMPTY)); } } } List> itemOutputs = new ArrayList<>(); - int size = typeCount > 1 || plankType == null ? types.get(1).size() : 1; + int size = typeCount > 1 || plankType == null ? types.get(1).size() : 1; List outputs = new ArrayList<>(); itemOutputs.add(outputs); - for(int i = 0;i < size;i++){ + for (int i = 0; i < size; i++) { IPlankType plankType = this.plankType; - if(plankType == null){ + if (plankType == null) { ItemStack item = types.get(0).get(i); plankType = WoodManager.getPlankType(item); } IPlankType plankTypeSecond = this.plankTypeSecond; - if(plankTypeSecond == null){ + if (plankTypeSecond == null) { ItemStack itemSecond = types.get(1).get(i); plankTypeSecond = WoodManager.getPlankType(itemSecond); } @@ -103,5 +102,4 @@ public class MultiFenceRecipeSizeWrapper extends BlankRecipeWrapper { ingredients.setOutputLists(ItemStack.class, itemOutputs); ingredients.setInputLists(ItemStack.class, itemInputs); } - } diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java index ce64e643..9b35ee1c 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java @@ -20,39 +20,40 @@ public class MultiFenceRecipeSolidWrapper extends BlankRecipeWrapper implements private IPlankType plankType; @Nullable private IPlankType plankTypeSecondary; - + public MultiFenceRecipeSolidWrapper(FenceType fenceType) { this.fenceType = fenceType; this.plankType = null; this.plankTypeSecondary = null; } - + public MultiFenceRecipeSolidWrapper(FenceDescription fenceDesc) { this.fenceType = fenceDesc.getFenceType(); this.plankType = fenceDesc.getPlankType(); this.plankTypeSecondary = fenceDesc.getSecondaryPlankType(); } - + @Override public void getIngredients(IIngredients ingredients) { List fences = new ArrayList<>(); List outputFences = new ArrayList<>(); - if(plankType != null){ - if(plankTypeSecondary == null){ - for(IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()){ - if(plankType != plankTypeSecondary){ + if (plankType != null) { + if (plankTypeSecondary == null) { + for (IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()) { + if (plankType != plankTypeSecondary) { fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, false, fenceType.embossed), 1)); outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, true, fenceType.embossed), 2)); } } - }else{ + } else { fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, false, fenceType.embossed), 1)); outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, true, fenceType.embossed), 2)); } - }else{ - for(IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()){ - for(IPlankType plankType : WoodManager.getAllPlankTypes()){ - if(plankType != plankTypeSecondary){; + } else { + for (IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()) { + for (IPlankType plankType : WoodManager.getAllPlankTypes()) { + if (plankType != plankTypeSecondary) { + ; fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, false, fenceType.embossed), 1)); outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, true, fenceType.embossed), 2)); } @@ -78,5 +79,4 @@ public class MultiFenceRecipeSolidWrapper extends BlankRecipeWrapper implements public int getHeight() { return 1; } - } diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 651c040d..1bae864b 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -90,6 +90,49 @@ public enum Food implements IItemMiscProvider { this.hunger = hunger; } + public static void registerOreDictionary() { + Food.CRABAPPLE.ore("Apple").ore("Crabapple"); + Food.ORANGE.ore("Orange"); + Food.KUMQUAT.ore("Kumquat"); + Food.LIME.ore("Lime"); + Food.WILD_CHERRY.ore("Cherry").ore("WildCherry"); + Food.SOUR_CHERRY.ore("Cherry").ore("SourCherry"); + Food.BLACK_CHERRY.ore("Cherry").ore("BlackCherry"); + Food.Blackthorn.ore("Blackthorn"); + Food.CHERRY_PLUM.ore("Plum").ore("CherryPlum"); + Food.ALMOND.ore("Almond"); + Food.APRICOT.ore("Apricot"); + Food.GRAPEFRUIT.ore("Grapefruit"); + Food.PEACH.ore("Peach"); + Food.SATSUMA.ore("Satsuma").ore("Orange"); + Food.BUDDHA_HAND.ore("BuddhaHand").ore("Citron"); + Food.CITRON.ore("Citron"); + Food.FINGER_LIME.ore("Lime").ore("FingerLime"); + Food.KEY_LIME.ore("KeyLime").ore("Lime"); + Food.MANDERIN.ore("Orange").ore("Manderin"); + Food.NECTARINE.ore("Peach").ore("Nectarine"); + Food.POMELO.ore("Pomelo"); + Food.TANGERINE.ore("Tangerine").ore("Orange"); + Food.PEAR.ore("Pear"); + Food.SAND_PEAR.ore("SandPear"); + Food.HAZELNUT.ore("Hazelnut"); + Food.BUTTERNUT.ore("Butternut").ore("Walnut"); + Food.BEECHNUT.ore("Beechnut"); + Food.PECAN.ore("Pecan"); + Food.BANANA.ore("Banana"); + Food.RED_BANANA.ore("RedBanana").ore("Banana"); + Food.PLANTAIN.ore("Plantain"); + Food.BRAZIL_NUT.ore("BrazilNut"); + Food.FIG.ore("Fig"); + Food.ACORN.ore("Acorn"); + Food.ELDERBERRY.ore("Elderberry"); + Food.OLIVE.ore("Olive"); + Food.GINGKO_NUT.ore("GingkoNut"); + Food.COFFEE.ore("Coffee"); + Food.OSANGE_ORANGE.ore("OsangeOrange"); + Food.CLOVE.ore("Clove"); + } + public boolean isEdible() { return this.hunger > 0; } @@ -134,49 +177,6 @@ public enum Food implements IItemMiscProvider { RecipeManagers.squeezerManager.addRecipe(time, this.get(1), Fluids.SEED_OIL.getFluid(amount), Mods.Forestry.stack("mulch"), mulch); } - public static void registerOreDictionary() { - Food.CRABAPPLE.ore("Apple").ore("Crabapple"); - Food.ORANGE.ore("Orange"); - Food.KUMQUAT.ore("Kumquat"); - Food.LIME.ore("Lime"); - Food.WILD_CHERRY.ore("Cherry").ore("WildCherry"); - Food.SOUR_CHERRY.ore("Cherry").ore("SourCherry"); - Food.BLACK_CHERRY.ore("Cherry").ore("BlackCherry"); - Food.Blackthorn.ore("Blackthorn"); - Food.CHERRY_PLUM.ore("Plum").ore("CherryPlum"); - Food.ALMOND.ore("Almond"); - Food.APRICOT.ore("Apricot"); - Food.GRAPEFRUIT.ore("Grapefruit"); - Food.PEACH.ore("Peach"); - Food.SATSUMA.ore("Satsuma").ore("Orange"); - Food.BUDDHA_HAND.ore("BuddhaHand").ore("Citron"); - Food.CITRON.ore("Citron"); - Food.FINGER_LIME.ore("Lime").ore("FingerLime"); - Food.KEY_LIME.ore("KeyLime").ore("Lime"); - Food.MANDERIN.ore("Orange").ore("Manderin"); - Food.NECTARINE.ore("Peach").ore("Nectarine"); - Food.POMELO.ore("Pomelo"); - Food.TANGERINE.ore("Tangerine").ore("Orange"); - Food.PEAR.ore("Pear"); - Food.SAND_PEAR.ore("SandPear"); - Food.HAZELNUT.ore("Hazelnut"); - Food.BUTTERNUT.ore("Butternut").ore("Walnut"); - Food.BEECHNUT.ore("Beechnut"); - Food.PECAN.ore("Pecan"); - Food.BANANA.ore("Banana"); - Food.RED_BANANA.ore("RedBanana").ore("Banana"); - Food.PLANTAIN.ore("Plantain"); - Food.BRAZIL_NUT.ore("BrazilNut"); - Food.FIG.ore("Fig"); - Food.ACORN.ore("Acorn"); - Food.ELDERBERRY.ore("Elderberry"); - Food.OLIVE.ore("Olive"); - Food.GINGKO_NUT.ore("GingkoNut"); - Food.COFFEE.ore("Coffee"); - Food.OSANGE_ORANGE.ore("OsangeOrange"); - Food.CLOVE.ore("Clove"); - } - private Food ore(final String string) { OreDictionary.registerOre("crop" + string, this.get(1)); this.ores.add("crop" + string); diff --git a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java index 3ad88c1a..cd10f651 100644 --- a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java @@ -70,8 +70,8 @@ public class ItemArboristDatabase extends Item implements IItemModelRegister { public String getItemStackDisplayName(ItemStack itemStack) { return ExtraTrees.proxy.localise(isMaster(itemStack) ? "item.database.arborist.master.name" : "item.database.arborist.name"); } - - protected boolean isMaster(ItemStack itemStack){ + + protected boolean isMaster(ItemStack itemStack) { return itemStack.getMetadata() > 0; } } diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index a13b696e..2947f8be 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -32,7 +32,7 @@ public class ItemHammer extends Item implements IToolHammer, IItemModelRegister @Override public String getItemStackDisplayName(ItemStack itemStack) { - return ExtraTrees.proxy.localise(isDurableHammer ? "item.hammer.master.name" : "item.hammer.name"); + return ExtraTrees.proxy.localise(isDurableHammer ? "item.hammer.master.name" : "item.hammer.name"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 3fe69d59..f778cc59 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -70,8 +70,8 @@ public class ItemMothDatabase extends Item implements IItemModelRegister { public String getItemStackDisplayName(ItemStack itemStack) { return ExtraTrees.proxy.localise(isMaster(itemStack) ? "item.database.lepi.master.name" : "item.database.lepi.name"); } - - protected boolean isMaster(ItemStack itemStack){ + + protected boolean isMaster(ItemStack itemStack) { return itemStack.getMetadata() > 0; } } diff --git a/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java b/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java index 5c9cae6e..94741e76 100644 --- a/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java @@ -7,83 +7,82 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MachineRendererKitchen { - static int level = 0; public static MachineRendererKitchen instance = new MachineRendererKitchen(); + static int level = 0; ; BinnieResource texture; public void renderMachine(final Machine machine, final BinnieResource texture, final double x, final double y, final double z, final float var8) { -// if (renderer != null && renderer.blockAccess != null) { -// final Block block = machine.getPackage().getGroup().getBlock(); -// final float i = 0.0625f; -// renderer.setRenderBounds(2.0f * i, 0.0, 2.0f * i, 14.0f * i, 14.0f * i, 14.0f * i); -// renderer.renderStandardBlock(block, (int) x, (int) y, (int) z); -// MachineRendererKitchen.level = 1; -// renderer.setRenderBounds(0.0, 14.0f * i, 0.0, 1.0, 1.0, 1.0); -// renderer.renderStandardBlock(block, (int) x, (int) y, (int) z); -// MachineRendererKitchen.level = 0; -// renderer.setRenderBounds(0.0, 0.0, 0.0, 1.0, 1.0, 1.0); -// if (RenderManager.instance == null || RenderManager.instance.renderEngine == null) { -// return; -// } -// final IIcon icon = Blocks.dirt.getIcon(0, 0); -// final Tessellator tess = Tessellator.instance; -// boolean wasTessellating = true; -// try { -// tess.draw(); -// } catch (Exception e) { -// wasTessellating = false; -// } -// tess.startDrawingQuads(); -// tess.draw(); -// GlStateManager.pushMatrix(); -// GlStateManager.translate(x + 0.5, y + 1.0, z + 0.5); -// RenderManager.instance.renderEngine.bindTexture(TextureMap.locationBlocksTexture); -// final float ux = icon.getMinU(); -// final float uy = icon.getMinV(); -// final float uw = icon.getMaxU(); -// final float uh = icon.getMaxV(); -// final int[] widths = { 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 5, 6, 6, 6, 5, 4 }; -// for (int h = 0; h < 15; ++h) { -// final float h2 = h * i; -// final float h3 = h2 + i; -// final float d1 = widths[h] * i; -// final float d2 = widths[h + 1] * i; -// float ang = 0.707f; -// final float half = 8.0f * i; -// if (h < 13) { -// ang -= 0.05f; -// for (int angle = 0; angle < 360; angle += 90) { -// } -// if (h == 12) { -// } -// ang += 0.05f; -// } -// for (int angle = 0; angle < 360; angle += 90) { -// GlStateManager.pushMatrix(); -// GlStateManager.rotate(angle, 0.0f, 1.0f, 0.0f); -// GlStateManager.translate(-0.5f, 0.0f, 0.0f); -// tess.startDrawingQuads(); -// tess.setColorRGBA(255, 255, 255, 150); -// tess.addVertexWithUV(half - d1 * ang, h2, -d1 * ang, 0.0, 0.0); -// tess.addVertexWithUV(half - d2 * ang, h3, -d2 * ang, 0.0, 0.0); -// tess.addVertexWithUV(half + d2 * ang, h3, -d2 * ang, 0.0, 0.0); -// tess.addVertexWithUV(half + d1 * ang, h2, -d1 * ang, 0.0, 0.0); -// tess.draw(); -// tess.startDrawingQuads(); -// tess.addVertexWithUV(half + d1 * ang, h2, -d1 * ang, 0.0, 0.0); -// tess.addVertexWithUV(half + d2 * ang, h3, -d2 * ang, 0.0, 0.0); -// tess.addVertexWithUV(half - d2 * ang, h3, -d2 * ang, 0.0, 0.0); -// tess.addVertexWithUV(half - d1 * ang, h2, -d1 * ang, 0.0, 0.0); -// tess.draw(); -// GlStateManager.popMatrix(); -// } -// } -// GlStateManager.popMatrix(); -// if (wasTessellating) { -// tess.startDrawingQuads(); -// } -// } + /*if (renderer != null && renderer.blockAccess != null) { + final Block block = machine.getPackage().getGroup().getBlock(); + final float i = 0.0625f; + renderer.setRenderBounds(2.0f * i, 0.0, 2.0f * i, 14.0f * i, 14.0f * i, 14.0f * i); + renderer.renderStandardBlock(block, (int) x, (int) y, (int) z); + MachineRendererKitchen.level = 1; + renderer.setRenderBounds(0.0, 14.0f * i, 0.0, 1.0, 1.0, 1.0); + renderer.renderStandardBlock(block, (int) x, (int) y, (int) z); + MachineRendererKitchen.level = 0; + renderer.setRenderBounds(0.0, 0.0, 0.0, 1.0, 1.0, 1.0); + if (RenderManager.instance == null || RenderManager.instance.renderEngine == null) { + return; + } + final IIcon icon = Blocks.dirt.getIcon(0, 0); + final Tessellator tess = Tessellator.instance; + boolean wasTessellating = true; + try { + tess.draw(); + } catch (Exception e) { + wasTessellating = false; + } + tess.startDrawingQuads(); + tess.draw(); + GlStateManager.pushMatrix(); + GlStateManager.translate(x + 0.5, y + 1.0, z + 0.5); + RenderManager.instance.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + final float ux = icon.getMinU(); + final float uy = icon.getMinV(); + final float uw = icon.getMaxU(); + final float uh = icon.getMaxV(); + final int[] widths = { 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 5, 6, 6, 6, 5, 4 }; + for (int h = 0; h < 15; ++h) { + final float h2 = h * i; + final float h3 = h2 + i; + final float d1 = widths[h] * i; + final float d2 = widths[h + 1] * i; + float ang = 0.707f; + final float half = 8.0f * i; + if (h < 13) { + ang -= 0.05f; + for (int angle = 0; angle < 360; angle += 90) { + } + if (h == 12) { + } + ang += 0.05f; + } + for (int angle = 0; angle < 360; angle += 90) { + GlStateManager.pushMatrix(); + GlStateManager.rotate(angle, 0.0f, 1.0f, 0.0f); + GlStateManager.translate(-0.5f, 0.0f, 0.0f); + tess.startDrawingQuads(); + tess.setColorRGBA(255, 255, 255, 150); + tess.addVertexWithUV(half - d1 * ang, h2, -d1 * ang, 0.0, 0.0); + tess.addVertexWithUV(half - d2 * ang, h3, -d2 * ang, 0.0, 0.0); + tess.addVertexWithUV(half + d2 * ang, h3, -d2 * ang, 0.0, 0.0); + tess.addVertexWithUV(half + d1 * ang, h2, -d1 * ang, 0.0, 0.0); + tess.draw(); + tess.startDrawingQuads(); + tess.addVertexWithUV(half + d1 * ang, h2, -d1 * ang, 0.0, 0.0); + tess.addVertexWithUV(half + d2 * ang, h3, -d2 * ang, 0.0, 0.0); + tess.addVertexWithUV(half - d2 * ang, h3, -d2 * ang, 0.0, 0.0); + tess.addVertexWithUV(half - d1 * ang, h2, -d1 * ang, 0.0, 0.0); + tess.draw(); + GlStateManager.popMatrix(); + } + } + GlStateManager.popMatrix(); + if (wasTessellating) { + tess.startDrawingQuads(); + } + }*/ } - } diff --git a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java index dd7acf9a..f4dc2609 100644 --- a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java @@ -11,10 +11,10 @@ public class ModuleKitchen implements IInitializable { @Override public void preInit() { // TODO implement kitchen -// final MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "kitchen", "kitchen", KitchenMachine.values()); -// machineGroup.setCreativeTab(Tabs.tabArboriculture); -// machineGroup.customRenderer = false; -// blockKitchen = machineGroup.getBlock(); + /*final MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "kitchen", "kitchen", KitchenMachine.values()); + machineGroup.setCreativeTab(Tabs.tabArboriculture); + machineGroup.customRenderer = false; + blockKitchen = machineGroup.getBlock();*/ } @Override diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java index 3f2daa3c..747e20b4 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java @@ -24,11 +24,6 @@ public class ControlFluidDisplay extends Control implements ITooltip { private FluidStack fluidStack; private boolean hastooltip; - public void setTooltip() { - this.hastooltip = true; - this.addAttribute(Attribute.MouseOver); - } - public ControlFluidDisplay(final IWidget parent, final int x, final int y) { this(parent, x, y, 16); } @@ -47,6 +42,11 @@ public class ControlFluidDisplay extends Control implements ITooltip { this.hastooltip = false; } + public void setTooltip() { + this.hastooltip = true; + this.addAttribute(Attribute.MouseOver); + } + @Override @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index 4a4a4b60..bd1e9983 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -1,6 +1,10 @@ package binnie.extratrees.kitchen.craftgui; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Area; diff --git a/src/main/java/binnie/extratrees/machines/DesignerType.java b/src/main/java/binnie/extratrees/machines/DesignerType.java index 46fd2272..8e3e3773 100644 --- a/src/main/java/binnie/extratrees/machines/DesignerType.java +++ b/src/main/java/binnie/extratrees/machines/DesignerType.java @@ -17,7 +17,8 @@ import net.minecraft.item.ItemStack; public enum DesignerType { Woodworker("woodworker", ExtraTreeTexture.Carpenter), Panelworker("panelworker", ExtraTreeTexture.Paneler), - GlassWorker("glassworker", ExtraTreeTexture.Paneler), // TODO why is this the Paneler texture? + GlassWorker("glassworker", ExtraTreeTexture.Paneler), + // TODO why is this the Paneler texture? Tileworker("tileworker", ExtraTreeTexture.Tileworker); public String name; diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index defd050e..a8ca1b61 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -1,7 +1,11 @@ package binnie.extratrees.machines; import binnie.core.BinnieCore; -import binnie.core.machines.*; +import binnie.core.machines.IMachineType; +import binnie.core.machines.Machine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.MachinePackage; +import binnie.core.machines.TileEntityMachine; import binnie.core.machines.component.IInteraction; import binnie.core.resource.IBinnieTexture; import binnie.extratrees.ExtraTrees; @@ -64,7 +68,6 @@ public enum ExtraTreeMachine implements IMachineType { public void onRightClick(World p0, EntityPlayer p1, BlockPos pos) { ExtraTrees.proxy.openGui(this.id, p1, pos); } - } public abstract static class PackageExtraTreeMachine extends MachinePackage { diff --git a/src/main/java/binnie/extratrees/machines/Infuser.java b/src/main/java/binnie/extratrees/machines/Infuser.java index 28b90945..bde786f6 100644 --- a/src/main/java/binnie/extratrees/machines/Infuser.java +++ b/src/main/java/binnie/extratrees/machines/Infuser.java @@ -3,7 +3,11 @@ package binnie.extratrees.machines; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.*; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.MachineSide; +import binnie.core.machines.inventory.TankSlot; +import binnie.core.machines.inventory.TankValidator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java index 26fd0c39..28ff3f53 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java @@ -34,5 +34,4 @@ public class MachineRendererForestry { throw Throwables.propagate(ex); } } - } diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java index 3e6eaf52..f9a91397 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java @@ -29,5 +29,4 @@ public class MachineRendererNursery { //this.casinoMachine.renderAll(); GlStateManager.popMatrix(); } - } diff --git a/src/main/java/binnie/extratrees/machines/Nursery.java b/src/main/java/binnie/extratrees/machines/Nursery.java index 8b276853..d36f1807 100644 --- a/src/main/java/binnie/extratrees/machines/Nursery.java +++ b/src/main/java/binnie/extratrees/machines/Nursery.java @@ -24,8 +24,8 @@ public class Nursery { return new TileEntityNursery(this); } -// @Override -// public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { -// } + /*@Override + public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { + }*/ } } diff --git a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java index 5eb985e5..45930c7f 100644 --- a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java +++ b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java @@ -35,7 +35,6 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu return this.world; } - @Override public EnumTemperature getTemperature() { return EnumTemperature.NORMAL; @@ -57,12 +56,6 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu return nursery != null ? nursery.getCaterpillar() : null; } - @Override - @Nullable - public IIndividual getNanny() { - return null; - } - @Override public void setCaterpillar(@Nullable final IButterfly butterfly) { IButterflyNursery nursery = this.getNursery(); @@ -71,6 +64,12 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu } } + @Override + @Nullable + public IIndividual getNanny() { + return null; + } + @Override public boolean canNurse(final IButterfly butterfly) { return this.getCaterpillar() == null; @@ -89,6 +88,9 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu return null; } + public void setErrorState(final int state) { + } + public boolean setErrorCondition(final boolean condition, final IErrorState errorState) { return false; } @@ -101,9 +103,6 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu return 0; } - public void setErrorState(final int state) { - } - public int getErrorOrdinal() { return 0; } diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java index 40647de4..11c13acf 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java @@ -25,9 +25,9 @@ public class BreweryCrafting implements INbtWritable { FluidStack inputFluid = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("fluid")); ItemStack ingredient = new ItemStack(nbt.getCompoundTag("ingr")); ItemStack[] inputGrains = new ItemStack[]{ - new ItemStack(nbt.getCompoundTag("in1")), - new ItemStack(nbt.getCompoundTag("in2")), - new ItemStack(nbt.getCompoundTag("in3")) + new ItemStack(nbt.getCompoundTag("in1")), + new ItemStack(nbt.getCompoundTag("in2")), + new ItemStack(nbt.getCompoundTag("in3")) }; ItemStack yeast = new ItemStack(nbt.getCompoundTag("yeast")); return new BreweryCrafting(inputFluid, ingredient, inputGrains, yeast); diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java index e4f12c01..8222f6cc 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java @@ -3,7 +3,11 @@ package binnie.extratrees.machines.brewery; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.*; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.MachineSide; +import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java index c1f74a11..e3a28687 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java @@ -26,6 +26,11 @@ public class ControlBreweryProgress extends ControlProgressBase { static Texture Brewery = new StandardTexture(0, 69, 34, 39, ExtraTreeTexture.Gui); static Texture BreweryOverlay = new StandardTexture(34, 69, 34, 39, ExtraTreeTexture.Gui); + protected ControlBreweryProgress(final IWidget parent, final int x, final int y) { + super(parent, x, y, 34, 39); + this.addAttribute(Attribute.MouseOver); + } + @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { @@ -67,10 +72,4 @@ public class ControlBreweryProgress extends ControlProgressBase { @Override public void onRenderForeground(int guiWidth, int guiHeight) { } - - protected ControlBreweryProgress(final IWidget parent, final int x, final int y) { - super(parent, x, y, 34, 39); - this.addAttribute(Attribute.MouseOver); - } - } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java index db47b575..a6f8218f 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java @@ -26,6 +26,28 @@ public class ControlDistilleryProgress extends ControlProgressBase { public static final Texture LIQUID_FLOW = new StandardTexture(101, 0, 38, 66, ExtraTreeTexture.Gui); public static final Texture OUTPUT = new StandardTexture(68, 66, 17, 7, ExtraTreeTexture.Gui); + protected ControlDistilleryProgress(final IWidget parent, final int x, final int y) { + super(parent, x, y, 58, 66); + this.addSelfEventHandler(new EventMouse.Down.Handler() { + @Override + public void onEvent(final EventMouse.Down event) { + int distillationLevel = -1; + if (new Area(45, 8, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { + distillationLevel = 0; + } else if (new Area(45, 23, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { + distillationLevel = 1; + } else if (new Area(45, 38, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { + distillationLevel = 2; + } + if (distillationLevel >= 0) { + final NBTTagCompound nbt = new NBTTagCompound(); + nbt.setByte("i", (byte) distillationLevel); + Window.get(ControlDistilleryProgress.this.getWidget()).sendClientAction("still-level", nbt); + } + } + }); + } + @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { @@ -54,27 +76,4 @@ public class ControlDistilleryProgress extends ControlProgressBase { CraftGUI.render.texture(DISTILLERY_OVERLAY, Point.ZERO); } } - - protected ControlDistilleryProgress(final IWidget parent, final int x, final int y) { - super(parent, x, y, 58, 66); - this.addSelfEventHandler(new EventMouse.Down.Handler() { - @Override - public void onEvent(final EventMouse.Down event) { - int distillationLevel = -1; - if (new Area(45, 8, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { - distillationLevel = 0; - } else if (new Area(45, 23, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { - distillationLevel = 1; - } else if (new Area(45, 38, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { - distillationLevel = 2; - } - if (distillationLevel >= 0) { - final NBTTagCompound nbt = new NBTTagCompound(); - nbt.setByte("i", (byte) distillationLevel); - Window.get(ControlDistilleryProgress.this.getWidget()).sendClientAction("still-level", nbt); - } - } - }); - } - } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java index bbe3a7c5..b3c582e7 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java @@ -27,6 +27,23 @@ public class ControlFruitPressProgress extends ControlProgressBase { private static final Texture PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.Gui); private static final Texture PressSlot = new StandardTexture(9, 52, 34, 17, ExtraTreeTexture.Gui); + protected ControlFruitPressProgress(final IWidget parent, final int x, final int y) { + super(parent, x, y, 37, 69); + this.addAttribute(Attribute.MouseOver); + this.addSelfEventHandler(new EventMouse.Down.Handler() { + @Override + public void onEvent(final EventMouse.Down event) { + if (event.getY() - event.getOrigin().getAbsolutePosition().y() > 52 + Math.round(16 * progress)) { + final NBTTagCompound action = new NBTTagCompound(); + Window.get(ControlFruitPressProgress.this.getWidget()).sendClientAction("clear-fruit", action); + } else { + final NBTTagCompound action = new NBTTagCompound(); + Window.get(ControlFruitPressProgress.this.getWidget()).sendClientAction("fruitpress-click", action); + } + } + }); + } + @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { @@ -52,22 +69,4 @@ public class ControlFruitPressProgress extends ControlProgressBase { GlStateManager.enableBlend(); CraftGUI.render.texture(ControlFruitPressProgress.PressTexture, new Point(0, Math.round(16 * this.progress))); } - - protected ControlFruitPressProgress(final IWidget parent, final int x, final int y) { - super(parent, x, y, 37, 69); - this.addAttribute(Attribute.MouseOver); - this.addSelfEventHandler(new EventMouse.Down.Handler() { - @Override - public void onEvent(final EventMouse.Down event) { - if (event.getY() - event.getOrigin().getAbsolutePosition().y() > 52 + Math.round(16 * progress)) { - final NBTTagCompound action = new NBTTagCompound(); - Window.get(ControlFruitPressProgress.this.getWidget()).sendClientAction("clear-fruit", action); - } else { - final NBTTagCompound action = new NBTTagCompound(); - Window.get(ControlFruitPressProgress.this.getWidget()).sendClientAction("fruitpress-click", action); - } - } - }); - } - } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java index ac288e39..42b958fb 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java @@ -22,10 +22,17 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; public class ControlLumbermillProgress extends ControlProgressBase { - float oldProgress; - float animation; static Texture Saw = new StandardTexture(0, 0, 6, 32, ExtraTreeTexture.Gui); static Texture Saw2 = new StandardTexture(2, 0, 4, 32, ExtraTreeTexture.Gui); + float oldProgress; + float animation; + + protected ControlLumbermillProgress(final IWidget parent, final int x, final int y) { + super(parent, x, y, 66, 18); + this.oldProgress = 0; + this.animation = 0; + new Panel(this, 0, 0, 66, 18, MinecraftGUI.PanelType.Black); + } @Override public void onUpdateClient() { @@ -82,12 +89,4 @@ public class ControlLumbermillProgress extends ControlProgressBase { GL11.glDisable(GL11.GL_SCISSOR_TEST); CraftGUI.render.texture(ControlLumbermillProgress.Saw2, new Point(sawX + 2, -8 + Math.round(6 * (float) Math.sin(this.animation)))); } - - protected ControlLumbermillProgress(final IWidget parent, final int x, final int y) { - super(parent, x, y, 66, 18); - this.oldProgress = 0; - this.animation = 0; - new Panel(this, 0, 0, 66, 18, MinecraftGUI.PanelType.Black); - } - } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index dd15eae0..b28e141d 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -2,7 +2,11 @@ package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.BinnieCore; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; @@ -23,7 +27,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; public class ControlTileSelect extends Control implements IControlValue, IControlScrollable { IDesign value; @@ -41,6 +49,10 @@ public class ControlTileSelect extends Control implements IControlValue return 0.0f; } + @Override + public void setPercentageIndex(final float index) { + } + @Override public float getPercentageShown() { return 0.0f; @@ -51,6 +63,11 @@ public class ControlTileSelect extends Control implements IControlValue return this.value; } + @Override + public void setValue(final IDesign value) { + this.value = value; + } + @Override public void movePercentage(final float percentage) { } @@ -101,15 +118,6 @@ public class ControlTileSelect extends Control implements IControlValue this.setSize(new Point(this.getSize().x(), height)); } - @Override - public void setPercentageIndex(final float index) { - } - - @Override - public void setValue(final IDesign value) { - this.value = value; - } - @Override public float getMovementRange() { return 0.0f; @@ -148,6 +156,11 @@ public class ControlTileSelect extends Control implements IControlValue return this.value; } + @Override + public void setValue(final IDesign value) { + this.value = value; + } + @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { @@ -167,10 +180,5 @@ public class ControlTileSelect extends Control implements IControlValue } } } - - @Override - public void setValue(final IDesign value) { - this.value = value; - } } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index 9a3c7e5c..9f2cc432 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -14,7 +14,12 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; import binnie.extratrees.ExtraTrees; -import forestry.api.arboriculture.*; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ILeafSpriteProvider; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.client.Minecraft; @@ -35,6 +40,13 @@ public class PageSpeciesTreeGenome extends PageSpecies { super(parent, tab); } + public static String tolerated(final boolean t) { + if (t) { + return BinnieCore.getBinnieProxy().localise("gui.tolerated"); + } + return BinnieCore.getBinnieProxy().localise("gui.nottolerated"); + } + @Override public void onValueChanged(final IAlleleSpecies species) { this.deleteAllChildren(); @@ -77,11 +89,11 @@ public class PageSpeciesTreeGenome extends PageSpecies { ex.printStackTrace(); } if (leaf != null) { - new ControlText(contents, new Area(0, y, w2, th2), ExtraTrees.proxy.localise("gui.database.leaves") + " : ", TextJustification.MiddleRight); - new ControlBlockIconDisplay(contents, w2, y, leaf).setColour(leafColour); - if (fruit != null && !treeSpecies.getUID().equals("forestry.treeOak")) { - new ControlBlockIconDisplay(contents, w2, y, fruit).setColour(fruitColour); - } + new ControlText(contents, new Area(0, y, w2, th2), ExtraTrees.proxy.localise("gui.database.leaves") + " : ", TextJustification.MiddleRight); + new ControlBlockIconDisplay(contents, w2, y, leaf).setColour(leafColour); + if (fruit != null && !treeSpecies.getUID().equals("forestry.treeOak")) { + new ControlBlockIconDisplay(contents, w2, y, fruit).setColour(fruitColour); + } y += th2; } Map products = fruitProvider.getProducts(); @@ -125,11 +137,4 @@ public class PageSpeciesTreeGenome extends PageSpecies { contents.setSize(new Point(contents.size().x(), y)); scrollable.setScrollableContent(contents); } - - public static String tolerated(final boolean t) { - if (t) { - return BinnieCore.getBinnieProxy().localise("gui.tolerated"); - } - return BinnieCore.getBinnieProxy().localise("gui.nottolerated"); - } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index 433eddcd..5a3f4247 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -4,7 +4,17 @@ import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.database.*; +import binnie.core.craftgui.database.ControlItemStackOption; +import binnie.core.craftgui.database.DatabaseTab; +import binnie.core.craftgui.database.IDatabaseMode; +import binnie.core.craftgui.database.PageBranchOverview; +import binnie.core.craftgui.database.PageBranchSpecies; +import binnie.core.craftgui.database.PageBreeder; +import binnie.core.craftgui.database.PageSpeciesClassification; +import binnie.core.craftgui.database.PageSpeciesMutations; +import binnie.core.craftgui.database.PageSpeciesOverview; +import binnie.core.craftgui.database.PageSpeciesResultant; +import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java index e04867c0..66405f6a 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java @@ -3,7 +3,12 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.brewery.BreweryMachine; @@ -18,6 +23,14 @@ public class WindowBrewery extends Window { super(228, 218, player, inventory, side); } + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } + return new WindowBrewery(player, inventory, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -42,12 +55,4 @@ public class WindowBrewery extends Window { new ControlPlayerInventory(this); new ControlErrorState(this, 133, 79); } - - @Nullable - public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { - if (inventory == null) { - return null; - } - return new WindowBrewery(player, inventory, side); - } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java index db6bf1df..9e35af10 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java @@ -21,6 +21,14 @@ public class WindowDistillery extends Window { super(224, 192, player, inventory, side); } + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } + return new WindowDistillery(player, inventory, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -45,12 +53,4 @@ public class WindowDistillery extends Window { new ControlPlayerInventory(this); new ControlErrorState(this, x + 21, 62); } - - @Nullable - public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { - if (inventory == null) { - return null; - } - return new WindowDistillery(player, inventory, side); - } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java index 00355708..35ff502b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java @@ -2,7 +2,15 @@ package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.core.craftgui.database.*; +import binnie.core.craftgui.database.DatabaseTab; +import binnie.core.craftgui.database.PageBranchOverview; +import binnie.core.craftgui.database.PageBranchSpecies; +import binnie.core.craftgui.database.PageBreeder; +import binnie.core.craftgui.database.PageSpeciesClassification; +import binnie.core.craftgui.database.PageSpeciesMutations; +import binnie.core.craftgui.database.PageSpeciesOverview; +import binnie.core.craftgui.database.PageSpeciesResultant; +import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.minecraft.Window; import binnie.extratrees.ExtraTrees; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java index 856c6864..3014be96 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java @@ -3,7 +3,11 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.LumbermillMachine; @@ -18,6 +22,14 @@ public class WindowLumbermill extends Window { super(220, 192, player, inventory, side); } + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } + return new WindowLumbermill(player, inventory, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -41,12 +53,4 @@ public class WindowLumbermill extends Window { new ControlPlayerInventory(this); new ControlErrorState(this, 95, 73); } - - @Nullable - public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { - if (inventory == null) { - return null; - } - return new WindowLumbermill(player, inventory, side); - } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java index 841c441b..64959843 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java @@ -4,7 +4,11 @@ import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.InventoryType; import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.core.machines.power.ErrorState; import binnie.extratrees.ExtraTrees; @@ -23,6 +27,14 @@ public class WindowPress extends Window { super(194, 192, player, inventory, side); } + @Nullable + public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { + if (inventory == null) { + return null; + } + return new WindowPress(player, inventory, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -45,14 +57,6 @@ public class WindowPress extends Window { ((Window) this.getTopParent()).getContainer().getOrCreateSlot(InventoryType.Machine, FruitPressMachine.SLOT_CURRENT); } - @Nullable - public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { - if (inventory == null) { - return null; - } - return new WindowPress(player, inventory, side); - } - @Override public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { super.receiveGuiNBTOnServer(player, name, nbt); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java index e1aa918e..ceb0f317 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java @@ -15,6 +15,10 @@ public class WindowSetSquare extends Window { super(150, 150, player, inventory, side); } + public static Window create(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) { + return new WindowSetSquare(player, null, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -29,8 +33,4 @@ public class WindowSetSquare extends Window { @Override public void initialiseClient() { } - - public static Window create(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) { - return new WindowSetSquare(player, null, side); - } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java index 6e18aeb9..fa6d4fc2 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java @@ -31,25 +31,6 @@ public class WindowWoodworker extends Window { ControlTextEdit textEdit; ControlTileSelect tileSelect; - @Override - @SideOnly(Side.CLIENT) - public void initialiseClient() { - this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); - new ControlText(this, new Area(190, 36, 114, 10), BinnieCore.getBinnieProxy().localise("gui.design"), TextJustification.TopCenter).setColour(4473924); - new Panel(this, 188, 48, 118, 126, MinecraftGUI.PanelType.Gray); - this.textEdit = new ControlTextEdit(this, 188, 178, 118, 12); - final ControlScrollableContent scroll = new ControlScrollableContent(this, 190, 50, 114, 122, 12); - scroll.setScrollableContent(this.tileSelect = new ControlTileSelect(scroll, 0, 0)); - new ControlPlayerInventory(this).setPosition(new Point(14, 96)); - new ControlErrorState(this, 76, 65); - if (this.getInventory() != null) { - final ControlSlot slotWood1 = new ControlSlot.Builder(this, 22, 34).assign(Designer.design1Slot); - final ControlSlot slotWood2 = new ControlSlot.Builder(this, 62, 34).assign(Designer.design2Slot); - final ControlSlot slotBeeswax = new ControlSlot.Builder(this, 42, 64).assign(Designer.beeswaxSlot); - final ControlRecipeSlot slotFinished = new ControlRecipeSlot(this, 112, 34); - } - } - public WindowWoodworker(final EntityPlayer player, final IInventory inventory, final Side side) { super(320, 216, player, inventory, side); this.addEventHandler(new EventTextEdit.Handler() { @@ -68,6 +49,25 @@ public class WindowWoodworker extends Window { return new WindowWoodworker(player, inventory, side); } + @Override + @SideOnly(Side.CLIENT) + public void initialiseClient() { + this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); + new ControlText(this, new Area(190, 36, 114, 10), BinnieCore.getBinnieProxy().localise("gui.design"), TextJustification.TopCenter).setColour(4473924); + new Panel(this, 188, 48, 118, 126, MinecraftGUI.PanelType.Gray); + this.textEdit = new ControlTextEdit(this, 188, 178, 118, 12); + final ControlScrollableContent scroll = new ControlScrollableContent(this, 190, 50, 114, 122, 12); + scroll.setScrollableContent(this.tileSelect = new ControlTileSelect(scroll, 0, 0)); + new ControlPlayerInventory(this).setPosition(new Point(14, 96)); + new ControlErrorState(this, 76, 65); + if (this.getInventory() != null) { + final ControlSlot slotWood1 = new ControlSlot.Builder(this, 22, 34).assign(Designer.design1Slot); + final ControlSlot slotWood2 = new ControlSlot.Builder(this, 62, 34).assign(Designer.design2Slot); + final ControlSlot slotBeeswax = new ControlSlot.Builder(this, 42, 64).assign(Designer.beeswaxSlot); + final ControlRecipeSlot slotFinished = new ControlRecipeSlot(this, 112, 34); + } + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java index 3bab2ee7..708301c4 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java @@ -5,7 +5,12 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class DistilleryRecipes { private static final List>> recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java index b118018d..ef854eb7 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.Map; public class FruitPressRecipes { - // Map> + //Map> private static Multimap> pressRecipes = ArrayListMultimap.create(); public static boolean isInput(final ItemStack itemstack) { diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java index b6d15259..25d9fc49 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java @@ -3,7 +3,11 @@ package binnie.extratrees.machines.lumbermill; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.*; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.TankSlot; +import binnie.core.machines.inventory.TankValidator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java index 6bc6af02..cf83da63 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.List; public class LumbermillRecipes { - // Map> + //Map> private static Multimap> recipes = ArrayListMultimap.create(); public static ItemStack getPlankProduct(final ItemStack logStack) { diff --git a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java index ffe62e96..ae2b6778 100644 --- a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java @@ -84,7 +84,7 @@ public class ModelETDecorativeLeaves extends ModelBlockCached> chromosomeMap; static List speciesList; + public Map> chromosomeMap; + BreedingSystem breedingSystem; public GeneticEngineeringSystem(final BreedingSystem system) { this.chromosomeMap = new HashMap<>(); diff --git a/src/main/java/binnie/genetics/genetics/SequencerItem.java b/src/main/java/binnie/genetics/genetics/SequencerItem.java index 10d54fc8..8fc0cb62 100644 --- a/src/main/java/binnie/genetics/genetics/SequencerItem.java +++ b/src/main/java/binnie/genetics/genetics/SequencerItem.java @@ -12,14 +12,20 @@ public class SequencerItem extends GeneItem { public int sequenced; public boolean analysed; + public SequencerItem(final IGene gene) { + super(gene); + this.sequenced = 0; + this.analysed = false; + } + @Nullable public static SequencerItem create(final ItemStack itemStack) { NBTTagCompound nbt = itemStack.getTagCompound(); if (nbt != null && - nbt.hasKey("gene", Constants.NBT.TAG_COMPOUND) && - nbt.hasKey("seq", Constants.NBT.TAG_BYTE) && - nbt.hasKey("ana") - ) { + nbt.hasKey("gene", Constants.NBT.TAG_COMPOUND) && + nbt.hasKey("seq", Constants.NBT.TAG_BYTE) && + nbt.hasKey("ana") + ) { NBTTagCompound geneNbt = nbt.getCompoundTag("gene"); Gene gene = Gene.create(geneNbt); SequencerItem sequencerItem = new SequencerItem(gene); @@ -30,12 +36,6 @@ public class SequencerItem extends GeneItem { return null; } - public SequencerItem(final IGene gene) { - super(gene); - this.sequenced = 0; - this.analysed = false; - } - @Override public NBTTagCompound writeToNBT(final NBTTagCompound nbt2) { NBTTagCompound nbt = super.writeToNBT(nbt2); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index 21e013ec..3e9ef545 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -11,7 +11,11 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.genetics.BreedingSystem; import binnie.genetics.Genetics; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index 0e1dcef8..326c4b55 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -226,7 +226,7 @@ public class AnalystPageMutations extends ControlAnalystPage { } @SideOnly(Side.CLIENT) - private void drawSprite(BinnieSprite sprite){ + private void drawSprite(BinnieSprite sprite) { RenderUtil.drawSprite(new Point(14, 0), sprite.getSprite()); } diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index 2862c5ff..0299b930 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -1,7 +1,11 @@ package binnie.genetics.gui; import binnie.Binnie; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index 931e22b7..d5c0ff53 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -1,6 +1,7 @@ package binnie.genetics.gui; import binnie.Binnie; +import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -11,7 +12,6 @@ import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.core.ExtraBeeTexture; import forestry.api.genetics.IChromosomeType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java index b021a676..9351acd8 100644 --- a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java +++ b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java @@ -29,6 +29,5 @@ public class ControlGenesisOption extends ControlOption { RenderUtil.drawText(new Area(0, 0, 70, 22), TextJustification.MiddleCenter, this.getChromosomeName(), this.getColour()); RenderUtil.drawText(new Area(75, 0, 80, 22), TextJustification.MiddleCenter, this.getAlleleName(), this.getColour()); RenderUtil.drawSolidRect(new Area(70, 2, 1, 16), -16777216 + this.getColour()); - } } diff --git a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java index 2dfeb694..eed1932e 100644 --- a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java @@ -18,9 +18,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.EnumSet; public abstract class ControlToleranceBar> extends Control implements ITooltip { - private Class enumClass; EnumSet tolerated; EnumSet fullSet; + private Class enumClass; public ControlToleranceBar(final IWidget parent, final int x, final int y, final int width, final int height, final Class clss) { super(parent, x, y, width, height); diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index bd37e7cf..aea10835 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -3,7 +3,11 @@ package binnie.genetics.gui; import binnie.Binnie; import binnie.botany.api.IFlower; import binnie.core.AbstractMod; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.Widget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.scroll.ControlScrollBar; @@ -69,16 +73,12 @@ public class WindowAnalyst extends Window { boolean isDatabase; boolean isMaster; boolean lockedSearch; - private Control analystNone; - private ControlSlide slideUpInv; @Nullable IIndividual current; @Nullable BreedingSystem currentSystem; - - public static GeneticsGUI.WindowFactory create(final boolean database, final boolean master) { - return (player, inventory, side) -> new WindowAnalyst(player, inventory, side, database, master); - } + private Control analystNone; + private ControlSlide slideUpInv; public WindowAnalyst(final EntityPlayer player, @Nullable final IInventory inventory, final Side side, final boolean database, final boolean master) { super(312, 230, player, inventory, side); @@ -96,6 +96,10 @@ public class WindowAnalyst extends Window { this.lockedSearch = this.isDatabase; } + public static GeneticsGUI.WindowFactory create(final boolean database, final boolean master) { + return (player, inventory, side) -> new WindowAnalyst(player, inventory, side, database, master); + } + @Override protected AbstractMod getMod() { return Genetics.instance; @@ -280,37 +284,6 @@ public class WindowAnalyst extends Window { this.setSystem(Binnie.GENETICS.beeBreedingSystem); } - @SideOnly(Side.CLIENT) - public void setIndividual(final IIndividual ind) { - if (!this.isDatabase) { - if (ind == null) { - this.analystNone.show(); - this.slideUpInv.hide(); - } else { - this.analystNone.hide(); - this.slideUpInv.show(); - } - } - if (ind == this.current || (ind != null && this.current != null && ind.isGeneticEqual(this.current))) { - return; - } - final boolean systemChange = (this.current = ind) != null && ind.getGenome().getSpeciesRoot() != this.getSystem().getSpeciesRoot(); - if (systemChange) { - this.currentSystem = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); - } - this.updatePages(systemChange); - } - - @SideOnly(Side.CLIENT) - public void setSystem(final BreedingSystem system) { - if (system == this.currentSystem) { - return; - } - this.currentSystem = system; - this.current = null; - this.updatePages(true); - } - @SideOnly(Side.CLIENT) public void updatePages(final boolean systemChange) { int oldLeft = -1; @@ -361,59 +334,59 @@ public class WindowAnalyst extends Window { } this.tabBar.deleteAllChildren(); if (this.analystPages.size() > 0) { - final int width = this.tabBar.width() / this.analystPages.size(); - int x = 0; - for (final ControlAnalystPage page : this.analystPages) { - new ControlTooltip(this.tabBar, x, 0, width, this.tabBar.height()) { - ControlAnalystPage value; + final int width = this.tabBar.width() / this.analystPages.size(); + int x = 0; + for (final ControlAnalystPage page : this.analystPages) { + new ControlTooltip(this.tabBar, x, 0, width, this.tabBar.height()) { + ControlAnalystPage value; - @Override - public void getTooltip(final Tooltip tooltip) { - tooltip.add(this.value.getTitle()); - } + @Override + public void getTooltip(final Tooltip tooltip) { + tooltip.add(this.value.getTitle()); + } - @Override - protected void initialise() { - super.initialise(); - this.addAttribute(Attribute.MouseOver); - this.value = page; - this.addSelfEventHandler(new EventMouse.Down.Handler() { - @Override - public void onEvent(final EventMouse.Down event) { - final int currentIndex = WindowAnalyst.this.analystPages.indexOf(WindowAnalyst.this.rightPage.getContent()); - int clickedIndex = WindowAnalyst.this.analystPages.indexOf(value); - if (WindowAnalyst.this.isDatabase) { - if (clickedIndex != 0 && clickedIndex != currentIndex) { - WindowAnalyst.this.setPage(WindowAnalyst.this.rightPage, value); + @Override + protected void initialise() { + super.initialise(); + this.addAttribute(Attribute.MouseOver); + this.value = page; + this.addSelfEventHandler(new EventMouse.Down.Handler() { + @Override + public void onEvent(final EventMouse.Down event) { + final int currentIndex = WindowAnalyst.this.analystPages.indexOf(WindowAnalyst.this.rightPage.getContent()); + int clickedIndex = WindowAnalyst.this.analystPages.indexOf(value); + if (WindowAnalyst.this.isDatabase) { + if (clickedIndex != 0 && clickedIndex != currentIndex) { + WindowAnalyst.this.setPage(WindowAnalyst.this.rightPage, value); + } + } else { + if (clickedIndex < 0) { + clickedIndex = 0; + } + if (clickedIndex < currentIndex) { + ++clickedIndex; + } + WindowAnalyst.this.setPage(WindowAnalyst.this.rightPage, null); + WindowAnalyst.this.setPage(WindowAnalyst.this.leftPage, null); + WindowAnalyst.this.setPage(WindowAnalyst.this.rightPage, WindowAnalyst.this.analystPages.get(clickedIndex)); + WindowAnalyst.this.setPage(WindowAnalyst.this.leftPage, WindowAnalyst.this.analystPages.get(clickedIndex - 1)); } - } else { - if (clickedIndex < 0) { - clickedIndex = 0; - } - if (clickedIndex < currentIndex) { - ++clickedIndex; - } - WindowAnalyst.this.setPage(WindowAnalyst.this.rightPage, null); - WindowAnalyst.this.setPage(WindowAnalyst.this.leftPage, null); - WindowAnalyst.this.setPage(WindowAnalyst.this.rightPage, WindowAnalyst.this.analystPages.get(clickedIndex)); - WindowAnalyst.this.setPage(WindowAnalyst.this.leftPage, WindowAnalyst.this.analystPages.get(clickedIndex - 1)); } - } - }); - } + }); + } - @Override - @SideOnly(Side.CLIENT) - public void onRenderBackground(int guiWidth, int guiHeight) { - final boolean active = this.value == WindowAnalyst.this.leftPage.getContent() || this.value == WindowAnalyst.this.rightPage.getContent(); - RenderUtil.setColour((active ? -16777216 : 1140850688) + this.value.getColour()); - CraftGUI.render.texture(CraftGUITexture.TabSolid, this.getArea().inset(1)); - RenderUtil.setColour(this.value.getColour()); - CraftGUI.render.texture(CraftGUITexture.TabOutline, this.getArea().inset(1)); - super.onRenderBackground(guiWidth, guiHeight); - } - }; - x += width; + @Override + @SideOnly(Side.CLIENT) + public void onRenderBackground(int guiWidth, int guiHeight) { + final boolean active = this.value == WindowAnalyst.this.leftPage.getContent() || this.value == WindowAnalyst.this.rightPage.getContent(); + RenderUtil.setColour((active ? -16777216 : 1140850688) + this.value.getColour()); + CraftGUI.render.texture(CraftGUITexture.TabSolid, this.getArea().inset(1)); + RenderUtil.setColour(this.value.getColour()); + CraftGUI.render.texture(CraftGUITexture.TabOutline, this.getArea().inset(1)); + super.onRenderBackground(guiWidth, guiHeight); + } + }; + x += width; } this.setPage(this.leftPage, this.analystPages.get((oldLeft >= 0) ? oldLeft : 0)); if (this.analystPages.size() > 1) { @@ -504,7 +477,38 @@ public class WindowAnalyst extends Window { return this.current; } + @SideOnly(Side.CLIENT) + public void setIndividual(final IIndividual ind) { + if (!this.isDatabase) { + if (ind == null) { + this.analystNone.show(); + this.slideUpInv.hide(); + } else { + this.analystNone.hide(); + this.slideUpInv.show(); + } + } + if (ind == this.current || (ind != null && this.current != null && ind.isGeneticEqual(this.current))) { + return; + } + final boolean systemChange = (this.current = ind) != null && ind.getGenome().getSpeciesRoot() != this.getSystem().getSpeciesRoot(); + if (systemChange) { + this.currentSystem = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); + } + this.updatePages(systemChange); + } + public BreedingSystem getSystem() { return this.currentSystem; } + + @SideOnly(Side.CLIENT) + public void setSystem(final BreedingSystem system) { + if (system == this.currentSystem) { + return; + } + this.currentSystem = system; + this.current = null; + this.updatePages(true); + } } diff --git a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java index 33e2dd76..525d7bdc 100644 --- a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java @@ -139,8 +139,8 @@ public class AnalystPageProducts extends AnalystPageProduce { @Nullable public static ItemStack getContainer(final FluidStack fluidStack) { ItemStack[] containers = { - new ItemStack(Items.GLASS_BOTTLE), - new ItemStack(Items.BUCKET) + new ItemStack(Items.GLASS_BOTTLE), + new ItemStack(Items.BUCKET) }; for (ItemStack container : containers) { diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java b/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java index 41748b9d..0d0d4e0a 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java @@ -1,7 +1,11 @@ package binnie.genetics.gui.bee.database; import binnie.Binnie; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; @@ -49,7 +53,7 @@ public class ControlBiomes extends Control implements ITooltip { if (Biome.getBiome(i) != null) { //TODO FIND COLOR //CraftGUI.Render.colour(Biome.getBiome(i).color); - + } CraftGUI.render.texture(CraftGUITexture.Button, new Area(x, y, 16, 16)); } diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java b/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java index 5f3403b4..d38781e1 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java @@ -1,7 +1,11 @@ package binnie.genetics.gui.bee.database; import binnie.Binnie; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.renderer.RenderUtil; diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java index 16c5bac1..b74fb880 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java @@ -14,14 +14,9 @@ import java.util.List; import java.util.Map; public class ControlProductsBox extends ControlListBox { + IAlleleBeeSpecies species; private int index; private Type type; - IAlleleBeeSpecies species; - - @Override - public IWidget createOption(final Product value, final int y) { - return new ControlProductsItem(getContent(), value, y); - } public ControlProductsBox(final IWidget parent, final int x, final int y, final int width, final int height, final Type type) { super(parent, x, y, width, height, 12); @@ -29,6 +24,11 @@ public class ControlProductsBox extends ControlListBox= 99) { return "Maximum"; @@ -169,4 +134,39 @@ public class PageSpeciesGenome extends PageSpecies { } return "Not Tolerated"; } + + @Override + public void onValueChanged(final IAlleleSpecies species) { + final IAllele[] template = Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID()); + if (template != null) { + final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(template); + final IBee bee = Binnie.GENETICS.getBeeRoot().getBee(genome); + this.pageSpeciesGenome_SpeedText.setValue(rateSpeed(genome.getSpeed())); + this.pageSpeciesGenome_LifespanText.setValue(rateLifespan(genome.getLifespan())); + this.pageSpeciesGenome_FertilityText.setValue(genome.getFertility() + " children"); + this.pageSpeciesGenome_FloweringText.setValue(rateFlowering(genome.getFlowering())); + final Vec3i area = genome.getTerritory(); + this.pageSpeciesGenome_TerritoryText.setValue(area.getX() + "x" + area.getY() + "x" + area.getZ()); + String behavior = "Daytime"; + if (genome.getPrimary().isNocturnal()) { + behavior = "Nighttime"; + } + if (genome.getNeverSleeps()) { + behavior = "All Day"; + } + this.pageSpeciesGenome_NocturnalText.setValue(behavior); + if (genome.getCaveDwelling()) { + this.pageSpeciesGenome_CaveDwellingText.setValue("Not Needed"); + } else { + this.pageSpeciesGenome_CaveDwellingText.setValue("Required"); + } + this.pageSpeciesGenome_TolerantFlyerText.setValue(tolerated(genome.getToleratesRain())); + if (genome.getFlowerProvider() != null) { + this.pageSpeciesGenome_FlowerText.setValue(genome.getFlowerProvider().getDescription()); + } else { + this.pageSpeciesGenome_FlowerText.setValue("None"); + } + this.pageSpeciesGenome_EffectText.setValue(genome.getEffect().getName()); + } + } } diff --git a/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java b/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java index 89c298e2..0bbef5ce 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java @@ -2,7 +2,15 @@ package binnie.genetics.gui.bee.database; import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.core.craftgui.database.*; +import binnie.core.craftgui.database.DatabaseTab; +import binnie.core.craftgui.database.PageBranchOverview; +import binnie.core.craftgui.database.PageBranchSpecies; +import binnie.core.craftgui.database.PageBreeder; +import binnie.core.craftgui.database.PageSpeciesClassification; +import binnie.core.craftgui.database.PageSpeciesMutations; +import binnie.core.craftgui.database.PageSpeciesOverview; +import binnie.core.craftgui.database.PageSpeciesResultant; +import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.minecraft.Window; import binnie.genetics.Genetics; import net.minecraft.entity.player.EntityPlayer; @@ -10,6 +18,14 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class WindowApiaristDatabase extends WindowAbstractDatabase { + public WindowApiaristDatabase(final EntityPlayer player, final Side side, final boolean nei) { + super(player, side, nei, Binnie.GENETICS.beeBreedingSystem, 110); + } + + public static Window create(final EntityPlayer player, final Side side, final boolean nei) { + return new WindowApiaristDatabase(player, side, nei); + } + @Override @SideOnly(Side.CLIENT) protected void addTabs() { @@ -25,14 +41,6 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase { new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(Genetics.instance, "breeder", 0)); } - public WindowApiaristDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, Binnie.GENETICS.beeBreedingSystem, 110); - } - - public static Window create(final EntityPlayer player, final Side side, final boolean nei) { - return new WindowApiaristDatabase(player, side, nei); - } - @Override public AbstractMod getMod() { return Genetics.instance; diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java index b1b6891f..273d64fe 100644 --- a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java @@ -44,40 +44,40 @@ public class AnalystPageSoil extends ControlAnalystPage { y += 16; new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.recommended"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; - EnumMoisture recomMoisture = EnumMoisture.Normal; - final boolean canTolNormal = Tolerance.canTolerate(moisture, EnumMoisture.Normal, moistureTol); - final boolean canTolDamp = Tolerance.canTolerate(moisture, EnumMoisture.Damp, moistureTol); - final boolean canTolDry = Tolerance.canTolerate(moisture, EnumMoisture.Dry, moistureTol); + EnumMoisture recomMoisture = EnumMoisture.NORMAL; + final boolean canTolNormal = Tolerance.canTolerate(moisture, EnumMoisture.NORMAL, moistureTol); + final boolean canTolDamp = Tolerance.canTolerate(moisture, EnumMoisture.DAMP, moistureTol); + final boolean canTolDry = Tolerance.canTolerate(moisture, EnumMoisture.DRY, moistureTol); if (canTolNormal) { if (canTolDamp && !canTolDry) { - recomMoisture = EnumMoisture.Damp; + recomMoisture = EnumMoisture.DAMP; } else if (canTolDry && !canTolDamp) { - recomMoisture = EnumMoisture.Dry; + recomMoisture = EnumMoisture.DRY; } } else { if (canTolDamp) { - recomMoisture = EnumMoisture.Damp; + recomMoisture = EnumMoisture.DAMP; } if (canTolDry) { - recomMoisture = EnumMoisture.Dry; + recomMoisture = EnumMoisture.DRY; } } - EnumAcidity recomPH = EnumAcidity.Neutral; - final boolean canTolNeutral = Tolerance.canTolerate(pH, EnumAcidity.Neutral, pHTol); - final boolean canTolAcid = Tolerance.canTolerate(pH, EnumAcidity.Acid, pHTol); - final boolean canTolAlkaline = Tolerance.canTolerate(pH, EnumAcidity.Alkaline, pHTol); + EnumAcidity recomPH = EnumAcidity.NEUTRAL; + final boolean canTolNeutral = Tolerance.canTolerate(pH, EnumAcidity.NEUTRAL, pHTol); + final boolean canTolAcid = Tolerance.canTolerate(pH, EnumAcidity.ACID, pHTol); + final boolean canTolAlkaline = Tolerance.canTolerate(pH, EnumAcidity.ALKALINE, pHTol); if (canTolNeutral) { if (canTolAcid && !canTolAlkaline) { - recomPH = EnumAcidity.Acid; + recomPH = EnumAcidity.ACID; } else if (canTolAlkaline && !canTolAcid) { - recomPH = EnumAcidity.Alkaline; + recomPH = EnumAcidity.ALKALINE; } } else { if (canTolAcid) { - recomPH = EnumAcidity.Acid; + recomPH = EnumAcidity.ACID; } if (canTolAlkaline) { - recomPH = EnumAcidity.Alkaline; + recomPH = EnumAcidity.ALKALINE; } } final ItemStack stack = new ItemStack(Botany.soil, 1, BlockSoil.getMeta(recomPH, recomMoisture)); @@ -88,8 +88,8 @@ public class AnalystPageSoil extends ControlAnalystPage { new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.other"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; final List stacks = new ArrayList<>(); - for (final EnumAcidity a : EnumSet.range(EnumAcidity.Acid, EnumAcidity.Alkaline)) { - for (final EnumMoisture b : EnumSet.range(EnumMoisture.Dry, EnumMoisture.Damp)) { + for (final EnumAcidity a : EnumSet.range(EnumAcidity.ACID, EnumAcidity.ALKALINE)) { + for (final EnumMoisture b : EnumSet.range(EnumMoisture.DRY, EnumMoisture.DAMP)) { if (Tolerance.canTolerate(pH, a, pHTol) && Tolerance.canTolerate(moisture, b, moistureTol) && (a != recomPH || b != recomMoisture)) { stacks.add(new ItemStack(Botany.soil, 1, BlockSoil.getMeta(a, b))); } diff --git a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java index 17440def..83977955 100644 --- a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java @@ -1,6 +1,10 @@ package binnie.genetics.gui.punnett; -import binnie.core.craftgui.*; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.renderer.RenderUtil; diff --git a/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java b/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java index 50e15afe..af108819 100644 --- a/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java +++ b/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java @@ -72,5 +72,4 @@ public class ControlPunnett extends Control { new ControlText(this, new Area(0, ControlPunnett.boxHeight, ControlPunnett.boxWidth, ControlPunnett.boxHeight), primary2.getName(), TextJustification.TopCenter).setColour(11184810); new ControlText(this, new Area(0, ControlPunnett.boxHeight * 2, ControlPunnett.boxWidth, ControlPunnett.boxHeight), primary2.getName(), TextJustification.TopCenter).setColour(11184810); } - } diff --git a/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java b/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java index 88935542..ecd9732f 100644 --- a/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java +++ b/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java @@ -23,15 +23,6 @@ import javax.annotation.Nullable; public class WindowPunnettSquare extends Window { - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowPunnettSquare(player, inventory, side); - } - - public WindowPunnettSquare(final EntityPlayer player, final IInventory inventory, final Side side) { - super(245, 205, player, inventory, side); - this.root = null; - } - private static final IBinnieTexture texture = new GuiTexture(); ControlSlot bee1; ControlSlot bee2; @@ -39,6 +30,15 @@ public class WindowPunnettSquare extends Window { @Nullable ISpeciesRoot root; + public WindowPunnettSquare(final EntityPlayer player, final IInventory inventory, final Side side) { + super(245, 205, player, inventory, side); + this.root = null; + } + + public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + return new WindowPunnettSquare(player, inventory, side); + } + @Override public AbstractMod getMod() { return Genetics.instance; @@ -78,7 +78,5 @@ public class WindowPunnettSquare extends Window { } return resource; } - } - } diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java index 8a821bed..fd1d5b60 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java @@ -67,9 +67,9 @@ public class AnalystPageClimate extends ControlAnalystPage { final List biomes = new ArrayList<>(); for (final Biome biome : Biome.EXPLORATION_BIOMES_LIST) { //TODO check if (biome != null && - biome != Biomes.FROZEN_OCEAN && - Tolerance.canTolerate(temp, EnumTemperature.getFromBiome(biome), tempTol) && - Tolerance.canTolerate(humid, EnumHumidity.getFromValue(biome.getRainfall()), humidTol)) { + 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)) { diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index 14f2608e..176ba851 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -27,7 +27,12 @@ import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.LaboratoryMachine; import binnie.genetics.machine.incubator.Incubator; import forestry.api.genetics.ISpeciesRoot; -import mezz.jei.api.*; +import mezz.jei.api.BlankModPlugin; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.ISubtypeRegistry; +import mezz.jei.api.JEIPlugin; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -58,15 +63,15 @@ public class GeneticsJeiPlugin extends BlankModPlugin { GeneticsJeiPlugin.drawables = Drawables.getDrawables(guiHelper); registry.addRecipeCategories( - new IncubatorRecipeCategory(), - new LarvaeIncubatorRecipeCategory(), - new IsolatorRecipeCategory(), - new PolymeriserRecipeCategory(), - new SequencerRecipeCategory(), - new InoculatorRecipeCategory(), - new SplicerRecipeCategory(), - new GenepoolRecipeCategory(), - new DatabaseRecipeCategory() + new IncubatorRecipeCategory(), + new LarvaeIncubatorRecipeCategory(), + new IsolatorRecipeCategory(), + new PolymeriserRecipeCategory(), + new SequencerRecipeCategory(), + new InoculatorRecipeCategory(), + new SplicerRecipeCategory(), + new GenepoolRecipeCategory(), + new DatabaseRecipeCategory() ); registry.addRecipeCategoryCraftingItem(LaboratoryMachine.Incubator.get(1), RecipeUids.INCUBATOR, RecipeUids.INCUBATOR_LARVAE); 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 09ac5e98..b6ce3e0d 100644 --- a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -42,8 +42,8 @@ public class DatabaseRecipeWrapper extends BlankRecipeWrapper { @Override public void getIngredients(IIngredients ingredients) { ingredients.setInputs(ItemStack.class, Arrays.asList( - input, - new ItemStack(Genetics.items().database) + input, + new ItemStack(Genetics.items().database) )); ingredients.setOutputLists(ItemStack.class, Collections.singletonList(outputs)); diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java index 9e37484d..e0b52f5b 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java @@ -3,7 +3,11 @@ package binnie.genetics.integration.jei.genepool; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.genepool.Genepool; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java index 2f226c6e..2583c642 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java @@ -1,6 +1,10 @@ package binnie.genetics.integration.jei.genepool; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java index 93fdf69b..0342678b 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java @@ -12,7 +12,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java index 519d39cd..f6283aef 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java @@ -3,7 +3,11 @@ package binnie.genetics.integration.jei.incubator; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.incubator.Incubator; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java index a7f5a974..8f10873f 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; public class IncubatorRecipeWrapper extends BlankRecipeWrapper { private final IIncubatorRecipe recipe; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java index 372c7a40..2b0416b2 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java @@ -35,5 +35,4 @@ public class LarvaeIncubatorRecipeMaker { return recipes; } - } diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java index 4ae73206..9c24351f 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java @@ -10,7 +10,11 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IFocus; diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java index a8a16d03..67a1c22c 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java @@ -6,7 +6,11 @@ import binnie.core.genetics.Gene; import binnie.genetics.genetics.Engineering; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; -import forestry.api.genetics.*; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java index 1a2c4a7d..ec084b3a 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java @@ -15,7 +15,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.time.DurationFormatUtils; import javax.annotation.Nullable; -import java.awt.*; +import java.awt.Color; import java.text.NumberFormat; import java.util.Arrays; import java.util.Map; @@ -42,8 +42,8 @@ public class InoculatorRecipeWrapper extends BlankRecipeWrapper { @Override public void getIngredients(IIngredients ingredients) { ingredients.setInputs(ItemStack.class, Arrays.asList( - inputSerum, - wildcardTarget + inputSerum, + wildcardTarget )); ingredients.setOutput(ItemStack.class, wildcardTarget); @@ -107,5 +107,4 @@ public class InoculatorRecipeWrapper extends BlankRecipeWrapper { public ItemStack getWildcardTarget() { return wildcardTarget; } - } diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java index 872b45ad..df66fd94 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java @@ -3,14 +3,18 @@ package binnie.genetics.integration.jei.isolator; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.isolator.Isolator; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; public class IsolatorRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java index 8527ffec..b670e044 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java @@ -2,7 +2,12 @@ package binnie.genetics.integration.jei.isolator; import binnie.core.genetics.Gene; import binnie.genetics.item.ItemSequence; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java index bc1427c5..06727276 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java @@ -11,7 +11,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java index 9de4aecf..ce2c2b96 100644 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java @@ -3,7 +3,11 @@ package binnie.genetics.integration.jei.polymeriser; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.polymeriser.Polymeriser; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java index e30a926e..b53b0d50 100644 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java @@ -15,9 +15,9 @@ public class PolymeriserRecipeMaker { List recipes = new ArrayList<>(); List inputs = Arrays.asList( - new ItemStack(Genetics.items().itemSequencer, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Genetics.items().itemSerum, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Genetics.items().itemSerumArray, 1, OreDictionary.WILDCARD_VALUE) + new ItemStack(Genetics.items().itemSequencer, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(Genetics.items().itemSerum, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(Genetics.items().itemSerumArray, 1, OreDictionary.WILDCARD_VALUE) ); IStackHelper stackHelper = GeneticsJeiPlugin.jeiHelpers.getStackHelper(); diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java index 7b7421d5..ae49ee8d 100644 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java @@ -31,8 +31,8 @@ public class PolymeriserRecipeWrapper extends BlankRecipeWrapper { int dnaAmount = (int) (PolymeriserLogic.getDNAPerProcess(input) * processCount); int bacteriaAmount = (int) (PolymeriserLogic.getBacteriaPerProcess(input) * processCount); ingredients.setInputs(FluidStack.class, Arrays.asList( - GeneticLiquid.RawDNA.get(dnaAmount), - GeneticLiquid.BacteriaPoly.get(bacteriaAmount) + GeneticLiquid.RawDNA.get(dnaAmount), + GeneticLiquid.BacteriaPoly.get(bacteriaAmount) )); ItemStack output = input.copy(); diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java index 39019e54..91dfa0ef 100644 --- a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java @@ -34,9 +34,9 @@ public class SequencerRecipeWrapper extends BlankRecipeWrapper { @Override public void getIngredients(IIngredients ingredients) { ingredients.setInputs(ItemStack.class, Arrays.asList( - input, - GeneticsItems.FluorescentDye.get(1), - new ItemStack(Genetics.items().database) + input, + GeneticsItems.FluorescentDye.get(1), + new ItemStack(Genetics.items().database) )); ingredients.setOutput(ItemStack.class, GeneticsItems.EmptySequencer.get(1)); diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index 99c2ca97..40bb139b 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -16,7 +16,7 @@ public enum GeneticLiquid implements IFluidType { String name; String ident; - // IIcon icon; + //IIcon icon; int colour; float transparency; diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index 4ce52877..549760e1 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -11,11 +11,11 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; public class ItemAnalyst extends ItemCore { -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = Genetics.proxy.getIcon(register, "analyst"); -// } + /*@Override + @SideOnly(Side.CLIENT) + public void registerIcons(final IIconRegister register) { + this.itemIcon = Genetics.proxy.getIcon(register, "analyst"); + }*/ public ItemAnalyst() { super("analyst"); diff --git a/src/main/java/binnie/genetics/item/ItemBeeDictionary.java b/src/main/java/binnie/genetics/item/ItemBeeDictionary.java index b3b9196a..ed830142 100644 --- a/src/main/java/binnie/genetics/item/ItemBeeDictionary.java +++ b/src/main/java/binnie/genetics/item/ItemBeeDictionary.java @@ -1,6 +1,5 @@ package binnie.genetics.item; -import binnie.botany.Botany; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; import forestry.api.core.IItemModelRegister; @@ -75,5 +74,4 @@ public class ItemBeeDictionary extends Item implements IItemModelRegister { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); ModelLoader.setCustomModelResourceLocation(this, 1, new ModelResourceLocation(getRegistryName().toString() + "_master", "inventory")); } - } diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index d2330721..7f5eb28d 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -50,7 +50,7 @@ public class ItemDatabase extends ItemCore { } Genetics.proxy.openGui(id, player, player.getPosition()); - + return new ActionResult(EnumActionResult.PASS, itemStack); } @@ -58,8 +58,8 @@ public class ItemDatabase extends ItemCore { public String getItemStackDisplayName(ItemStack itemStack) { return Genetics.proxy.localise(isMaster(itemStack) ? "item.database.master.name" : "item.database.name"); } - - protected boolean isMaster(ItemStack itemStack){ + + protected boolean isMaster(ItemStack itemStack) { return itemStack.getItemDamage() > 0; } } diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index 4e5e8e46..62571357 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -42,7 +42,7 @@ public abstract class ItemGene extends ItemCore implements IColoredItem { gene.getInfo(list); } } - + public int getCharges(final ItemStack stack) { return stack.getMaxDamage() - stack.getItemDamage(); } @@ -53,10 +53,10 @@ public abstract class ItemGene extends ItemCore implements IColoredItem { @SideOnly(Side.CLIENT) @Override public abstract void getSubItems(Item item, final CreativeTabs tab, final NonNullList subItems); - + @Nullable public abstract IGeneItem getGeneItem(ItemStack itemStack); - + @SideOnly(Side.CLIENT) @Override public int getColorFromItemstack(ItemStack stack, int tintIndex) { @@ -66,7 +66,7 @@ public abstract class ItemGene extends ItemCore implements IColoredItem { } return 16777215; } - + @Override public boolean getShareTag() { return true; diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index bb69e46e..ed997f81 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -11,11 +11,11 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; public class ItemMasterRegistry extends ItemCore { -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = Genetics.proxy.getIcon(register, "masterRegistry"); -// } + /*@Override + @SideOnly(Side.CLIENT) + public void registerIcons(final IIconRegister register) { + this.itemIcon = Genetics.proxy.getIcon(register, "masterRegistry"); + }*/ public ItemMasterRegistry() { super("master_registry"); diff --git a/src/main/java/binnie/genetics/item/ItemPunnettSquare.java b/src/main/java/binnie/genetics/item/ItemPunnettSquare.java index a5fe3843..9f32184a 100644 --- a/src/main/java/binnie/genetics/item/ItemPunnettSquare.java +++ b/src/main/java/binnie/genetics/item/ItemPunnettSquare.java @@ -32,5 +32,4 @@ public class ItemPunnettSquare extends Item { ItemStack itemStack = playerIn.getHeldItem(handIn); return new ActionResult<>(EnumActionResult.PASS, itemStack); } - } diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index 24797f01..7aa65f16 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -11,11 +11,11 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; public class ItemRegistry extends ItemCore { -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = Genetics.proxy.getIcon(register, "registry"); -// } + /*@Override + @SideOnly(Side.CLIENT) + public void registerIcons(final IIconRegister register) { + this.itemIcon = Genetics.proxy.getIcon(register, "registry"); + }*/ public ItemRegistry() { super("registry"); diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index ad2b0462..4d007f6f 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -33,6 +33,18 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar this.setCreativeTab(CreativeTabGenetics.instance); } + public static ItemStack create(final IGene gene) { + return create(gene, false); + } + + public static ItemStack create(final IGene gene, final boolean sequenced) { + final ItemStack item = new ItemStack(Genetics.items().itemSequencer); + item.setItemDamage(sequenced ? 0 : item.getMaxDamage()); + final SequencerItem seq = new SequencerItem(gene); + seq.writeToItem(item); + return item; + } + @Override public String getItemStackDisplayName(ItemStack itemstack) { GeneItem gene = GeneItem.create(itemstack); @@ -93,18 +105,6 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar return 1.0f; } - public static ItemStack create(final IGene gene) { - return create(gene, false); - } - - public static ItemStack create(final IGene gene, final boolean sequenced) { - final ItemStack item = new ItemStack(Genetics.items().itemSequencer); - item.setItemDamage(sequenced ? 0 : item.getMaxDamage()); - final SequencerItem seq = new SequencerItem(gene); - seq.writeToItem(item); - return item; - } - @Override public int getCharges(final ItemStack itemStack) { return itemStack.getMaxDamage() - itemStack.getItemDamage(); diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 587ca6c2..331096c4 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -30,6 +30,14 @@ public class ItemSerum extends ItemGene implements IItemSerum { this.setMaxDamage(16); } + public static ItemStack create(final IGene gene) { + final ItemStack item = new ItemStack(Genetics.items().itemSerum); + item.setItemDamage(item.getMaxDamage()); + final GeneItem seq = new GeneItem(gene); + seq.writeToItem(item); + return item; + } + @Override public int getCharges(ItemStack itemStack) { return itemStack.getMaxDamage() - itemStack.getItemDamage(); @@ -104,12 +112,4 @@ public class ItemSerum extends ItemGene implements IItemSerum { geneI.writeToItem(stack); return stack; } - - public static ItemStack create(final IGene gene) { - final ItemStack item = new ItemStack(Genetics.items().itemSerum); - item.setItemDamage(item.getMaxDamage()); - final GeneItem seq = new GeneItem(gene); - seq.writeToItem(item); - return item; - } } diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 0b9c603d..93b43d18 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -9,7 +9,12 @@ import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.GeneArrayItem; import binnie.genetics.genetics.IGeneItem; import com.google.common.base.Preconditions; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosome; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -25,6 +30,14 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { this.setMaxDamage(16); } + public static ItemStack create(final IGene gene) { + final ItemStack item = new ItemStack(Genetics.items().itemSerumArray); + item.setItemDamage(item.getMaxDamage()); + final GeneArrayItem seq = new GeneArrayItem(gene); + seq.writeToItem(item); + return item; + } + @Override public int getCharges(final ItemStack itemStack) { return itemStack.getMaxDamage() - itemStack.getItemDamage(); @@ -114,12 +127,4 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { geneItem.writeToItem(stack); return stack; } - - public static ItemStack create(final IGene gene) { - final ItemStack item = new ItemStack(Genetics.items().itemSerumArray); - item.setItemDamage(item.getMaxDamage()); - final GeneArrayItem seq = new GeneArrayItem(gene); - seq.writeToItem(item); - return item; - } } diff --git a/src/main/java/binnie/genetics/item/ModuleItems.java b/src/main/java/binnie/genetics/item/ModuleItems.java index b5d3ed36..e42b71f6 100644 --- a/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/src/main/java/binnie/genetics/item/ModuleItems.java @@ -40,9 +40,6 @@ public class ModuleItems implements IInitializable { public static BinnieSprite iconArrow0; public static BinnieSprite iconAdd1; public static BinnieSprite iconArrow1; - - @Nullable - private Item itemGenetics; public ItemSerum itemSerum; public ItemSequence itemSequencer; public ItemDatabase database; @@ -50,14 +47,16 @@ public class ModuleItems implements IInitializable { public Item registry; public Item masterRegistry; public ItemSerumArray itemSerumArray = null; - + @Nullable + private Item itemGenetics; + @Override public void preInit() { itemSerum = new ItemSerum(); Genetics.proxy.registerItem(itemSerum); itemSerumArray = new ItemSerumArray(); Genetics.proxy.registerItem(itemSerumArray); - + database = new ItemDatabase(); Genetics.proxy.registerItem(database); analyst = new ItemAnalyst(); @@ -73,7 +72,7 @@ public class ModuleItems implements IInitializable { Binnie.LIQUID.createLiquids(GeneticLiquid.values()); } - + public Item getItemGenetics() { Preconditions.checkState(itemGenetics != null); return itemGenetics; @@ -101,72 +100,84 @@ public class ModuleItems implements IInitializable { @Override public void postInit() { GameRegistry.addShapelessRecipe(GeneticsItems.DNADye.get(8), - Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5)); + Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5) + ); GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.LaboratoryCasing.get(itemGenetics, 1), - "iii", - "iYi", - "iii", - 'i', "ingotIron", 'Y', Mods.Forestry.item("sturdy_machine"))); + "iii", + "iYi", + "iii", + 'i', "ingotIron", 'Y', Mods.Forestry.item("sturdy_machine") + )); GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.DNADye.get(itemGenetics, 2), "dyePurple", "dyeMagenta", "dyePink")); GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.FluorescentDye.get(itemGenetics, 2), "dyeOrange", "dyeYellow", "dustGlowstone")); GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.GrowthMedium.get(itemGenetics, 2), new ItemStack(Items.DYE, 1, 15), Items.SUGAR)); GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySequencer.get(itemGenetics, 1), - " p ", - "iGi", - " p ", - 'i', "ingotGold", 'G', Blocks.GLASS_PANE, 'p', Items.PAPER)); + " p ", + "iGi", + " p ", + 'i', "ingotGold", 'G', Blocks.GLASS_PANE, 'p', Items.PAPER + )); GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1), - " g ", - " G ", - "GGG", - 'g', "ingotGold", 'G', Blocks.GLASS_PANE)); + " g ", + " G ", + "GGG", + 'g', "ingotGold", 'G', Blocks.GLASS_PANE + )); GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EMPTY_GENOME.get(itemGenetics, 1), - "sss", - "sss", - "sss", - 's', GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1))); + "sss", + "sss", + "sss", + 's', GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1) + )); GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.CYLINDER.get(8), - " g ", - "g g", - " ", - 'g', Blocks.GLASS_PANE)); + " g ", + "g g", + " ", + 'g', Blocks.GLASS_PANE + )); GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), - "l g", - " c ", - "g l", - 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone")); + "l g", + " c ", + "g l", + 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone" + )); GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), - "g l", - " c ", - "l g", - 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone")); + "g l", + " c ", + "l g", + 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone" + )); GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCasing.get(itemGenetics, 1), - "ccc", - "cdc", - "ccc", - 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', GeneticsItems.LaboratoryCasing.get(itemGenetics, 1))); + "ccc", + "cdc", + "ccc", + 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', GeneticsItems.LaboratoryCasing.get(itemGenetics, 1) + )); GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCPU.get(itemGenetics, 1), - "ccc", - "cdc", - "ccc", - 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', Items.DIAMOND)); + "ccc", + "cdc", + "ccc", + 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', Items.DIAMOND + )); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, - new ItemStack(database), - "X#X", - "YEY", - "RDR", - '#', Blocks.GLASS_PANE, 'X', Items.DIAMOND, 'Y', Items.DIAMOND, 'R', Items.REDSTONE, 'D', Items.ENDER_EYE, 'E', Blocks.OBSIDIAN); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, + new ItemStack(database), + "X#X", + "YEY", + "RDR", + '#', Blocks.GLASS_PANE, 'X', Items.DIAMOND, 'Y', Items.DIAMOND, 'R', Items.REDSTONE, 'D', Items.ENDER_EYE, 'E', Blocks.OBSIDIAN + ); GameRegistry.addSmelting(itemSequencer, GeneticsItems.EmptySequencer.get(itemGenetics, 1), 0.0f); GameRegistry.addSmelting(itemSerum, GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1), 0.0f); GameRegistry.addSmelting(itemSerumArray, GeneticsItems.EMPTY_GENOME.get(itemGenetics, 1), 0.0f); GameRegistry.addShapedRecipe(new ItemStack(analyst), - " c ", - "cac", - " d ", - 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'a', Mods.Forestry.item("portable_alyzer"), 'd', new ItemStack(Items.DIAMOND)); + " c ", + "cac", + " d ", + 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'a', Mods.Forestry.item("portable_alyzer"), 'd', new ItemStack(Items.DIAMOND) + ); Item[] databases = {ExtraBeesIntegration.dictionary, ExtraTrees.items().itemDictionary, ExtraTrees.items().itemDictionaryLepi, Botany.database}; if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { @@ -175,10 +186,11 @@ public class ModuleItems implements IInitializable { for (Item databaseC : databases) { for (Item databaseD : databases) { if (databaseA != databaseB && databaseA != databaseC && databaseA != databaseD && databaseB != databaseC && databaseB != databaseD && databaseC != databaseD) { - GameRegistry.addShapedRecipe(new ItemStack(registry), - " b ", - "fct", - " l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', databaseA, 't', databaseB, 'f', databaseC, 'l', databaseD); + GameRegistry.addShapedRecipe(new ItemStack(registry), + " b ", + "fct", + " l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', databaseA, 't', databaseB, 'f', databaseC, 'l', databaseD + ); } } } diff --git a/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java b/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java index 7b3216c5..835b473a 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java +++ b/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java @@ -21,5 +21,4 @@ public class ComponentGeneticGUI extends MachineComponent implements IInteractio public void onRightClick(World p0, EntityPlayer player, BlockPos pos) { Genetics.proxy.openGui(this.id, player, pos); } - } diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index f4180b66..1b052388 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -1,6 +1,10 @@ package binnie.genetics.machine; -import binnie.core.machines.*; +import binnie.core.machines.IMachine; +import binnie.core.machines.IMachineType; +import binnie.core.machines.Machine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.MachinePackage; import binnie.core.machines.component.IInteraction; import binnie.core.machines.network.INetwork; import binnie.genetics.Genetics; @@ -54,10 +58,10 @@ public enum LaboratoryMachine implements IMachineType { new ComponentGUIHolder(machine); } -// @Override -// public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { -// MachineRendererLab.instance.renderMachine(machine, this.colour, this.renderTexture, x, y, z, var8); -// } + /*@Override + public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { + MachineRendererLab.instance.renderMachine(machine, this.colour, this.renderTexture, x, y, z, var8); + }*/ } public static class ComponentGUIHolder extends MachineComponent implements INetwork.TilePacketSync, IInteraction.RightClick { @@ -121,54 +125,54 @@ public enum LaboratoryMachine implements IMachineType { public void onRightClick(World p0, EntityPlayer p1, BlockPos pos) { } -// @Override -// public void onRightClick(final World world, final EntityPlayer player, final int x, final int y, final int z) { -// if (BinnieCore.proxy.isSimulating(world) && player.getHeldItem() != null) { -// if (!this.stack.isEmpty() && player.getHeldItem().getItem() instanceof IToolWrench) { -// final float f = 0.7f; -// final double d0 = world.rand.nextFloat() * f + (1.0f - f) * 0.5; -// final double d2 = world.rand.nextFloat() * f + (1.0f - f) * 0.5; -// 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.spawnEntity(entityitem); -// this.stack = null; -// ((IToolWrench) player.getHeldItem().getItem()).wrenchUsed(player, x, y, z); -// this.getUtil().refreshBlock(); -// return; -// } -// final List validSelections = new ArrayList(); -// if (BinnieCore.isBotanyActive()) { -// validSelections.add(Botany.database); -// } -// if (BinnieCore.isExtraBeesActive()) { -// validSelections.add(ExtraBees.dictionary); -// } -// if (BinnieCore.isExtraTreesActive()) { -// validSelections.add(ExtraTrees.itemDictionary); -// } -// if (BinnieCore.isLepidopteryActive()) { -// validSelections.add(ExtraTrees.itemDictionaryLepi); -// } -// validSelections.add(Genetics.database); -// validSelections.add(Genetics.analyst); -// validSelections.add(Genetics.registry); -// validSelections.add(Genetics.masterRegistry); -// validSelections.add(BinnieCore.genesis); -// if (this.stack.isEmpty() && validSelections.contains(player.getHeldItem().getItem())) { -// this.stack = player.getHeldItem().copy(); -// final ItemStack heldItem = player.getHeldItem(); -// heldItem.shrink(1); -// world.markBlockForUpdate(x, y, z); -// return; -// } -// if (!this.stack.isEmpty() && player.getHeldItem().getItem() instanceof IToolWrench) { -// this.stack.getItem().onItemRightClick(this.stack, world, player); -// } -// } -// if (!this.stack.isEmpty()) { -// this.stack.getItem().onItemRightClick(this.stack, world, player); -// } -// } + /*@Override + public void onRightClick(final World world, final EntityPlayer player, final int x, final int y, final int z) { + if (BinnieCore.proxy.isSimulating(world) && player.getHeldItem() != null) { + if (!this.stack.isEmpty() && player.getHeldItem().getItem() instanceof IToolWrench) { + final float f = 0.7f; + final double d0 = world.rand.nextFloat() * f + (1.0f - f) * 0.5; + final double d2 = world.rand.nextFloat() * f + (1.0f - f) * 0.5; + 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.spawnEntity(entityitem); + this.stack = null; + ((IToolWrench) player.getHeldItem().getItem()).wrenchUsed(player, x, y, z); + this.getUtil().refreshBlock(); + return; + } + final List validSelections = new ArrayList(); + if (BinnieCore.isBotanyActive()) { + validSelections.add(Botany.database); + } + if (BinnieCore.isExtraBeesActive()) { + validSelections.add(ExtraBees.dictionary); + } + if (BinnieCore.isExtraTreesActive()) { + validSelections.add(ExtraTrees.itemDictionary); + } + if (BinnieCore.isLepidopteryActive()) { + validSelections.add(ExtraTrees.itemDictionaryLepi); + } + validSelections.add(Genetics.database); + validSelections.add(Genetics.analyst); + validSelections.add(Genetics.registry); + validSelections.add(Genetics.masterRegistry); + validSelections.add(BinnieCore.genesis); + if (this.stack.isEmpty() && validSelections.contains(player.getHeldItem().getItem())) { + this.stack = player.getHeldItem().copy(); + final ItemStack heldItem = player.getHeldItem(); + heldItem.shrink(1); + world.markBlockForUpdate(x, y, z); + return; + } + if (!this.stack.isEmpty() && player.getHeldItem().getItem() instanceof IToolWrench) { + this.stack.getItem().onItemRightClick(this.stack, world, player); + } + } + if (!this.stack.isEmpty()) { + this.stack.getItem().onItemRightClick(this.stack, world, player); + } + }*/ } } diff --git a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java index 986a59bc..f46720b0 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java @@ -34,5 +34,4 @@ public class MachineRendererGenetics { } GlStateManager.popMatrix(); } - } diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index 7f55a547..7c83175b 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -91,5 +91,4 @@ public class MachineRendererLab { } GlStateManager.popMatrix(); } - } diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 952220fd..019c2849 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -23,7 +23,7 @@ public class ModuleMachine implements IInitializable { public static ValidatorSprite spriteDye; public static ValidatorSprite spriteBacteria; public static ValidatorSprite spriteNugget; - + public static MachineGroup packageGenetic; public static MachineGroup packageAdvGenetic; public static MachineGroup packageLabMachine; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index 9c377567..236ae324 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -17,7 +17,11 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; public class Acclimatiser { public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3}; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java index 71997aeb..5ca69c5d 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java @@ -3,7 +3,12 @@ package binnie.genetics.machine.acclimatiser; import binnie.core.genetics.Gene; import binnie.core.genetics.Tolerance; import binnie.genetics.machine.inoculator.Inoculator; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; import java.util.Random; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index f5916615..88447993 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -1,11 +1,15 @@ package binnie.genetics.machine.acclimatiser; import binnie.core.AbstractMod; +import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; @@ -52,5 +56,4 @@ public class WindowAcclimatiser extends WindowMachine { protected String getBackgroundTextureName() { return "acclimatiser"; } - } diff --git a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java index 618c6ad1..1295e82a 100644 --- a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java @@ -3,7 +3,11 @@ package binnie.genetics.machine.analyser; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.*; +import binnie.core.machines.inventory.ComponentChargedSlots; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentInventoryTransfer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index 424d73d7..b12988d8 100644 --- a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -1,14 +1,21 @@ package binnie.genetics.machine.analyser; import binnie.core.AbstractMod; +import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlProgress; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.craftgui.window.Panel; -import binnie.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -66,5 +73,4 @@ public class WindowAnalyser extends WindowMachine { protected String getBackgroundTextureName() { return "analyser"; } - } diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java index f48d707d..3b2ed539 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -76,13 +76,13 @@ public class ControlGeneScroll extends Control implements IControlValue implements IInventory { - private static class SpeciesList { - public List drones; - public List queens; - public List princesses; - public List bees; - - SpeciesList() { - this.drones = new ArrayList<>(); - this.queens = new ArrayList<>(); - this.princesses = new ArrayList<>(); - this.bees = new ArrayList<>(); - } - - public void add(final ItemStack stack) { - this.bees.add(stack); - } - } - public ComponentApiaristIndexerInventory(final Machine machine) { super(machine); } @@ -138,7 +120,6 @@ public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory } - @Override public boolean isEmpty() { return this.sortedInventory.isEmpty(); @@ -184,4 +165,22 @@ public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory Species, Type; } + + private static class SpeciesList { + public List drones; + public List queens; + public List princesses; + public List bees; + + SpeciesList() { + this.drones = new ArrayList<>(); + this.queens = new ArrayList<>(); + this.princesses = new ArrayList<>(); + this.bees = new ArrayList<>(); + } + + public void add(final ItemStack stack) { + this.bees.add(stack); + } + } } diff --git a/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java b/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java index c5687778..7209145f 100644 --- a/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java +++ b/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java @@ -13,10 +13,10 @@ import javax.annotation.Nullable; import java.util.List; public abstract class ComponentIndexerInventory extends ComponentInventory implements IInventory { - int indexerSize; public int guiRefreshCounter; - List indexerInventory; public List sortedInventory; + int indexerSize; + List indexerInventory; @Nullable T sortingMode; boolean needsSorting; @@ -74,15 +74,15 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im this.markDirty(); } -// @Override -// public ItemStack getStackInSlotOnClosing(final int var1) { -// return null; -// } -// -// @Override -// public String getInventoryName() { -// return ""; -// } + /*@Override + public ItemStack getStackInSlotOnClosing(final int var1) { + return null; + } + + @Override + public String getInventoryName() { + return ""; + }*/ @Override public int getInventoryStackLimit() { @@ -94,24 +94,24 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im return true; } -// @Override -// public void openInventory() { -// } -// -// @Override -// public void closeInventory() { -// } - - public void setMode(final T mode) { - this.sortingMode = mode; - this.needsSorting = true; + /*@Override + public void openInventory() { } + @Override + public void closeInventory() { + }*/ + @Nullable public T getMode() { return this.sortingMode; } + public void setMode(final T mode) { + this.sortingMode = mode; + this.needsSorting = true; + } + @Override public NBTTagCompound writeToNBT(final NBTTagCompound nbttagcompound2) { NBTTagCompound nbttagcompound = super.writeToNBT(nbttagcompound2); @@ -139,5 +139,4 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } public abstract void Sort(); - } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java index be75afa0..84cc4374 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java @@ -23,6 +23,12 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { public static final int PROCESS_BASE_LENGTH = 12000; public static final int PROCESS_BASE_ENERGY = 600000; public static final int BACTERIA_PER_PROCESS = 15; + private float bacteriaDrain; + + public InoculatorLogic(final Machine machine) { + super(machine); + this.bacteriaDrain = 0.0f; + } public static int getProcessLength(ItemStack itemStack) { return PROCESS_BASE_LENGTH * getNumberOfGenes(itemStack); @@ -39,11 +45,24 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { return Engineering.getGenes(serum).length; } - private float bacteriaDrain; - - public InoculatorLogic(final Machine machine) { - super(machine); - this.bacteriaDrain = 0.0f; + public static ItemStack applySerum(ItemStack target, ItemStack serum) { + ItemStack applied = target.copy(); + final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(applied); + if (!ind.isAnalyzed()) { + ind.analyze(); + final NBTTagCompound nbttagcompound = new NBTTagCompound(); + ind.writeToNBT(nbttagcompound); + applied.setTagCompound(nbttagcompound); + } + final IGene[] genes = ((IItemSerum) serum.getItem()).getGenes(serum); + for (final IGene gene : genes) { + Inoculator.setGene(gene, applied, 0); + Inoculator.setGene(gene, applied, 1); + } + if (applied.getItemDamage() == OreDictionary.WILDCARD_VALUE) { + applied.setItemDamage(0); + } + return applied; } @Override @@ -131,26 +150,6 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { util.damageItem(serum, Inoculator.SLOT_SERUM_VIAL, 1); } - public static ItemStack applySerum(ItemStack target, ItemStack serum) { - ItemStack applied = target.copy(); - final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(applied); - if (!ind.isAnalyzed()) { - ind.analyze(); - final NBTTagCompound nbttagcompound = new NBTTagCompound(); - ind.writeToNBT(nbttagcompound); - applied.setTagCompound(nbttagcompound); - } - final IGene[] genes = ((IItemSerum) serum.getItem()).getGenes(serum); - for (final IGene gene : genes) { - Inoculator.setGene(gene, applied, 0); - Inoculator.setGene(gene, applied, 1); - } - if (applied.getItemDamage() == OreDictionary.WILDCARD_VALUE) { - applied.setItemDamage(0); - } - return applied; - } - @Override protected void onTickTask() { this.bacteriaDrain += BACTERIA_PER_PROCESS / (float) this.getProcessLength(); diff --git a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java index f7b71aea..605df4f0 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java @@ -5,7 +5,12 @@ import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.*; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentInventoryTransfer; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.Validator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.api.IItemSerum; import binnie.genetics.core.GeneticsGUI; diff --git a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java index 13f3a5e6..d2595a2a 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java @@ -5,7 +5,14 @@ import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlMachineProgress; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; @@ -32,11 +39,11 @@ public class WindowInoculator extends WindowMachine { final int y = 32; new ControlLiquidTank(this, x, y + 18 + 16).setTankID(0); CraftGUIUtil.horizontalGrid(x, y, - new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_RESERVE), - new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), - new ControlSlot.Builder(this, 0, 0).assign(0), - new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), - new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_EXPENDED) + new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_RESERVE), + new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), + new ControlSlot.Builder(this, 0, 0).assign(0), + new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), + new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_EXPENDED) ); x += 18; new ControlMachineProgress(this, x, y + 24, WindowInoculator.ProgressBase, WindowInoculator.Progress, Position.LEFT); @@ -44,9 +51,9 @@ public class WindowInoculator extends WindowMachine { new ControlErrorState(this, 161, 118); x += 142; CraftGUIUtil.verticalGrid(x, y, TextJustification.MIDDLE_LEFTt, 8, - new ControlSlotArray.Builder(this, x, y, 4, 1).create(Inoculator.SLOT_RESERVE), - new ControlSlot.Builder(this, x, y + 18 + 8).assign(9), - new ControlSlotArray.Builder(this, x, y + 18 + 8 + 18 + 8, 4, 1).create(Inoculator.SLOT_FINISHED) + new ControlSlotArray.Builder(this, x, y, 4, 1).create(Inoculator.SLOT_RESERVE), + new ControlSlot.Builder(this, x, y + 18 + 8).assign(9), + new ControlSlotArray.Builder(this, x, y + 18 + 8 + 18 + 8, 4, 1).create(Inoculator.SLOT_FINISHED) ); new ControlIconDisplay(this, x + 18, y + 18 + 2, GUIIcon.ARROW_UP_LEFT.getIcon().getResourceLocation()); new ControlIconDisplay(this, x + 18, y + 18 + 18, GUIIcon.ARROW_LEFT_DOWN.getIcon().getResourceLocation()); @@ -67,5 +74,4 @@ public class WindowInoculator extends WindowMachine { protected String getBackgroundTextureName() { return "inoculator"; } - } diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java index 0b4edb39..a1cf6d66 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java @@ -9,7 +9,12 @@ import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.Genetics; import binnie.genetics.item.ItemSequence; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; import java.util.Random; diff --git a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java index d13e98b3..e2c54ea3 100644 --- a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java @@ -3,7 +3,13 @@ package binnie.genetics.machine.isolator; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.*; +import binnie.core.machines.inventory.ComponentChargedSlots; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentInventoryTransfer; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.TankValidator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index 26afe173..15fe3335 100644 --- a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -1,12 +1,20 @@ package binnie.genetics.machine.isolator; import binnie.core.AbstractMod; +import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlProgress; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; @@ -66,5 +74,4 @@ public class WindowIsolator extends WindowMachine { protected String getBackgroundTextureName() { return "isolator"; } - } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java index 0a02555d..95383aaa 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -3,7 +3,13 @@ package binnie.genetics.machine.polymeriser; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.*; +import binnie.core.machines.inventory.ComponentChargedSlots; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentInventoryTransfer; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.Validator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java index f85cd2fd..7913fb9b 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java @@ -8,5 +8,4 @@ public class Polymeriser { public static final int SLOT_GOLD = 1; public static final int[] SLOT_SERUM_RESERVE = new int[]{2, 3, 4, 5}; public static final int[] SLOT_SERUM_FINISHED = new int[]{6, 7, 8, 9}; - } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java index a917f3db..312cdcb2 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java @@ -20,6 +20,21 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces this.bacteriaDrain = 0.0f; } + public static float getDNAPerProcess(ItemStack serum) { + return getNumberOfGenes(serum) * 50; + } + + public static float getBacteriaPerProcess(ItemStack serum) { + return 0.2f * getDNAPerProcess(serum); + } + + private static int getNumberOfGenes(ItemStack serum) { + if (serum.isEmpty()) { + return 1; + } + return Engineering.getGenes(serum).length; + } + private float getCatalyst() { return (this.getUtil().getSlotCharge(Polymeriser.SLOT_GOLD) > 0.0f) ? 0.2f : 1.0f; } @@ -36,14 +51,6 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces return (int) (super.getProcessEnergy() * getNumberOfGenes(serum) * this.getCatalyst()); } - public static float getDNAPerProcess(ItemStack serum) { - return getNumberOfGenes(serum) * 50; - } - - public static float getBacteriaPerProcess(ItemStack serum) { - return 0.2f * getDNAPerProcess(serum); - } - @Override public void onTickTask() { super.onTickTask(); @@ -62,13 +69,6 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces } } - private static int getNumberOfGenes(ItemStack serum) { - if (serum.isEmpty()) { - return 1; - } - return Engineering.getGenes(serum).length; - } - @Override public String getTooltip() { final ItemStack serum = this.getUtil().getStack(Polymeriser.SLOT_SERUM); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java index e3da18a7..c7d4498c 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java @@ -3,7 +3,15 @@ package binnie.genetics.machine.polymeriser; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlMachineProgress; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; @@ -59,5 +67,4 @@ public class WindowPolymeriser extends WindowMachine { protected String getBackgroundTextureName() { return "polymeriser"; } - } diff --git a/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java b/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java index b37f9aef..2066913e 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java +++ b/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java @@ -16,9 +16,9 @@ import net.minecraft.item.ItemStack; import java.util.Random; public class ControlSequencerProgress extends ControlProgressBase { - ControlText textControl; static final String[] CODES = {"A", "T", "G", "C"}; static final String[] COLORS = {"a", "d", "b", "c"}; + ControlText textControl; public ControlSequencerProgress(final IWidget parent, final int x, final int y) { super(parent, x, y, 100, 52); diff --git a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index e6d2259e..ea6715e7 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -4,7 +4,11 @@ import binnie.Binnie; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.*; +import binnie.core.machines.inventory.ComponentChargedSlots; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentInventoryTransfer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java index cd309d49..4a263176 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java @@ -79,9 +79,11 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl @SideOnly(Side.CLIENT) private static class SequencerParticle extends Particle { private static final BinnieSprite[] SPRITES; - static{ - SPRITES = new BinnieSprite[] { Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, Sequencer.fxSeqT}; + + static { + SPRITES = new BinnieSprite[]{Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, Sequencer.fxSeqT}; } + double axisX; double axisZ; double angle; diff --git a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index 87e38c60..57cc6486 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -1,16 +1,22 @@ package binnie.genetics.machine.sequencer; import binnie.core.AbstractMod; +import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; @@ -45,11 +51,11 @@ public class WindowSequencer extends WindowMachine { int x = 16; int y = 32; CraftGUIUtil.horizontalGrid(x, y, TextJustification.MiddleCenter, 2, - new ControlSlotArray.Builder(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE), - new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), - new ControlSequencerProgress(this, 0, 0), - new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), - new ControlSlot.Builder(this, 0, 0).assign(6) + new ControlSlotArray.Builder(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE), + new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), + new ControlSequencerProgress(this, 0, 0), + new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), + new ControlSlot.Builder(this, 0, 0).assign(6) ); final ControlSlot slotTarget = new ControlSlot.Builder(this, x + 96, y + 16).assign(5); x = 34; @@ -80,5 +86,4 @@ public class WindowSequencer extends WindowMachine { protected String getBackgroundTextureName() { return "sequencer"; } - } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java index bef68b82..b47872ba 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java @@ -20,6 +20,12 @@ import javax.annotation.Nullable; public class SplicerLogic extends ComponentProcess implements IProcess { public static int PROCESS_ENERGY = 12000000; public static int PROCESS_LENGTH = 1200; + private int nOfGenes; + + public SplicerLogic(final Machine machine) { + super(machine); + this.nOfGenes = 0; + } public static int getProcessLength(int numberOfGenes) { float n = numberOfGenes; @@ -39,11 +45,22 @@ public class SplicerLogic extends ComponentProcess implements IProcess { return (int) (PROCESS_ENERGY * n); } - private int nOfGenes; - - public SplicerLogic(final Machine machine) { - super(machine); - this.nOfGenes = 0; + public static int getGenesToUse(ItemStack serum, ItemStack target) { + if (serum.isEmpty() || target.isEmpty()) { + return 1; + } + final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(target); + final IGene[] genes = ((IItemSerum) serum.getItem()).getGenes(serum); + if (ind.getGenome().getSpeciesRoot() != ((IItemSerum) serum.getItem()).getSpeciesRoot(serum)) { + return 1; + } + int i = 0; + for (final IGene gene : genes) { + if (ind.getGenome().getActiveAllele(gene.getChromosome()) != gene.getAllele() || ind.getGenome().getInactiveAllele(gene.getChromosome()) != gene.getAllele()) { + ++i; + } + } + return (i < 1) ? 1 : i; } @Override @@ -66,24 +83,6 @@ public class SplicerLogic extends ComponentProcess implements IProcess { this.nOfGenes = getGenesToUse(serum, target); } - public static int getGenesToUse(ItemStack serum, ItemStack target) { - if (serum.isEmpty() || target.isEmpty()) { - return 1; - } - final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(target); - final IGene[] genes = ((IItemSerum) serum.getItem()).getGenes(serum); - if (ind.getGenome().getSpeciesRoot() != ((IItemSerum) serum.getItem()).getSpeciesRoot(serum)) { - return 1; - } - int i = 0; - for (final IGene gene : genes) { - if (ind.getGenome().getActiveAllele(gene.getChromosome()) != gene.getAllele() || ind.getGenome().getInactiveAllele(gene.getChromosome()) != gene.getAllele()) { - ++i; - } - } - return (i < 1) ? 1 : i; - } - private int getFullNumberOfGenes() { final ItemStack serum = this.getUtil().getStack(0); if (serum.isEmpty()) { diff --git a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java index 5fc0ddaa..147c825b 100644 --- a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java @@ -5,7 +5,12 @@ import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.*; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; @@ -32,9 +37,9 @@ public class WindowSplicer extends WindowMachine { int x = 16; new ControlSplicerProgress(this, 84, 32, this.width() - 172, 102); CraftGUIUtil.horizontalGrid(x, 62, - new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Splicer.SLOT_SERUM_RESERVE), - new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), - new ControlSlot.Builder(this, 0, 0).assign(0) + new ControlSlotArray.Builder(this, 0, 0, 2, 1).create(Splicer.SLOT_SERUM_RESERVE), + new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_RIGHT.getIcon().getResourceLocation()), + new ControlSlot.Builder(this, 0, 0).assign(0) ); new ControlSlotArray.Builder(this, x + 12, 84, 2, 1).create(Splicer.SLOT_SERUM_EXPENDED); new ControlIconDisplay(this, x + 12 + 36 + 4, 86, GUIIcon.ARROW_UP_LEFT.getIcon().getResourceLocation()); @@ -42,11 +47,11 @@ public class WindowSplicer extends WindowMachine { new ControlErrorState(this, 218, 86); x += 142; CraftGUIUtil.verticalGrid((this.width() - 72) / 2, 32, TextJustification.MiddleCenter, 4, - new ControlSlotArray.Builder(this, 0, 0, 4, 1).create(Inoculator.SLOT_RESERVE), - new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_DOWN.getIcon().getResourceLocation()), - new ControlSlot.Builder(this, 0, 0).assign(9), - new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_DOWN.getIcon().getResourceLocation()), - new ControlSlotArray.Builder(this, 0, 0, 4, 1).create(Inoculator.SLOT_FINISHED) + new ControlSlotArray.Builder(this, 0, 0, 4, 1).create(Inoculator.SLOT_RESERVE), + new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_DOWN.getIcon().getResourceLocation()), + new ControlSlot.Builder(this, 0, 0).assign(9), + new ControlIconDisplay(this, 0, 0, GUIIcon.ARROW_DOWN.getIcon().getResourceLocation()), + new ControlSlotArray.Builder(this, 0, 0, 4, 1).create(Inoculator.SLOT_FINISHED) ); new ControlPlayerInventory(this); } @@ -65,5 +70,4 @@ public class WindowSplicer extends WindowMachine { protected String getBackgroundTextureName() { return "inoculator"; } - }