From 8eea336fdbc4b7f84b0ec06249c64d071c37e8d6 Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sun, 14 Jan 2018 20:15:45 +0000 Subject: [PATCH 1/9] Removing overworked bees mechanic, cap production modifier at 16x (#1946) --- .../api/apiculture/IBeekeepingMode.java | 11 ++++++++--- .../java/forestry/apiculture/genetics/Bee.java | 5 ----- .../apiculture/genetics/BeekeepingMode.java | 18 ++++-------------- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/main/java/forestry/api/apiculture/IBeekeepingMode.java b/src/main/java/forestry/api/apiculture/IBeekeepingMode.java index 3bb76f776..3a7036df7 100644 --- a/src/main/java/forestry/api/apiculture/IBeekeepingMode.java +++ b/src/main/java/forestry/api/apiculture/IBeekeepingMode.java @@ -37,10 +37,15 @@ public interface IBeekeepingMode { */ boolean isFatigued(IBee queen, IBeeHousing housing); - /** - * @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect. + /** + * @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect. + * @deprecated bees max out at 16x productivity instead of being overworked. + * TODO remove this method in 1.13 */ - boolean isOverworked(IBee queen, IBeeHousing housing); + @Deprecated + default boolean isOverworked(IBee queen, IBeeHousing housing) { + return false; + } /** * @return true if the genetic structure of the queen is breaking down during spawning of the offspring (with chance). will trigger a negative effect. diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index e16313a0c..61ff64b9c 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -476,11 +476,6 @@ public class Bee extends IndividualLiving implements IBee { IAlleleBeeSpecies primary = genome.getPrimary(); IAlleleBeeSpecies secondary = genome.getSecondary(); - // All work and no play makes queen a dull girl. - if (mode.isOverworked(this, housing)) { - setIsNatural(false); - } - IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); IBeeModifier beeModeModifier = mode.getBeeModifier(); diff --git a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java index e3d89d97e..64a5b5aa0 100755 --- a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java +++ b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java @@ -93,20 +93,6 @@ public class BeekeepingMode implements IBeekeepingMode { rand.nextFloat() < 0.02f * beeModifier.getGeneticDecay(queen.getGenome(), 1f); } - @Override - public boolean isOverworked(IBee queen, IBeeHousing housing) { - IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); - - float productionModifier = beeModifier.getProductionModifier(queen.getGenome(), 1f); - if (productionModifier > 16) { - if (housing.getWorldObj().rand.nextFloat() * 100 < 0.01 * (productionModifier * productionModifier - 100)) { - return true; - } - } - - return false; - } - @Override public boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing) { IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); @@ -159,6 +145,10 @@ public class BeekeepingMode implements IBeekeepingMode { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { + if(this.speedModifier>16.0f) + { + return 16.0f; + } return this.speedModifier; } } From 40445462f1e4dad3c435245e4dc09e1e8d078c2b Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sun, 14 Jan 2018 20:16:36 +0000 Subject: [PATCH 2/9] Add more Dimension Config Blacklists for world generation (#1942) --- .../arboriculture/worldgen/TreeDecorator.java | 3 +++ src/main/java/forestry/core/config/Config.java | 13 +++++++++++-- .../java/forestry/core/worldgen/WorldGenerator.java | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java b/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java index afd21c5fe..ac9c94834 100644 --- a/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java +++ b/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java @@ -40,6 +40,7 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.arboriculture.commands.TreeGenHelper; +import forestry.core.config.Config; import forestry.core.utils.BlockUtil; public class TreeDecorator { @@ -54,6 +55,8 @@ public class TreeDecorator { } public static void decorateTrees(World world, Random rand, int worldX, int worldZ) { + if(Config.blacklistedTreeDims.contains(world.provider.getDimension())) + return; if (biomeCache.isEmpty()) { generateBiomeCache(world, rand); } diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index 970418c5a..85e0db4b3 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -79,11 +79,13 @@ public class Config { public static boolean generateApatiteOre = true; public static boolean generateCopperOre = true; public static boolean generateTinOre = true; + public static Set blacklistedOreDims = new HashSet(); private static float generateBeehivesAmount = 1.0f; public static boolean generateBeehivesDebug = false; public static boolean logHivePlacement = false; public static boolean enableVillagers = true; public static boolean generateTrees = true; + public static Set blacklistedTreeDims = new HashSet(); // Retrogen public static boolean doRetrogen = false; @@ -219,11 +221,18 @@ public class Config { generateApatiteOre = configCommon.getBooleanLocalized("world.generate.ore", "apatite", generateApatiteOre); generateCopperOre = configCommon.getBooleanLocalized("world.generate.ore", "copper", generateCopperOre); generateTinOre = configCommon.getBooleanLocalized("world.generate.ore", "tin", generateTinOre); - + for(int dimId : configCommon.get("world.generate.ore", "dimBlacklist", new int[0]).getIntList()){ + blacklistedOreDims.add(dimId); + } + enableVillagers = configCommon.getBooleanLocalized("world.generate", "villagers", enableVillagers); generateTrees = configCommon.getBooleanLocalized("world.generate", "trees", generateTrees); - + for(int dimId : configCommon.get("world.generate.trees", "dimBlacklist", new int[0]).getIntList()){ + blacklistedTreeDims.add(dimId); + } + + craftingBronzeEnabled = configCommon.getBooleanLocalized("crafting", "bronze", craftingBronzeEnabled); craftingStampsEnabled = configCommon.getBooleanLocalized("crafting.stamps", "enabled", true); diff --git a/src/main/java/forestry/core/worldgen/WorldGenerator.java b/src/main/java/forestry/core/worldgen/WorldGenerator.java index 3abe425de..5a2280454 100755 --- a/src/main/java/forestry/core/worldgen/WorldGenerator.java +++ b/src/main/java/forestry/core/worldgen/WorldGenerator.java @@ -68,6 +68,8 @@ public class WorldGenerator implements IWorldGenerator { } private void generateWorld(Random random, int chunkX, int chunkZ, World world) { + if(Config.blacklistedOreDims.contains(world.provider.getDimension())) + return; if (apatiteGenerator == null || copperGenerator == null || tinGenerator == null) { BlockResourceOre resourcesBlock = ModuleCore.getBlocks().resources; From 8b0d54f3ec6cd2d5ddb632a59be73445e9ce658d Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 9 Jan 2018 02:20:50 +0100 Subject: [PATCH 3/9] Add sorting block (Genetic Filter) --- lang | 2 +- .../api/arboriculture/ITreeGenome.java | 5 +- .../forestry/api/genetics/AlleleManager.java | 5 + .../api/genetics/IBreedingTracker.java | 13 +- .../forestry/api/genetics/IFilterData.java | 27 ++ .../forestry/api/genetics/IFilterLogic.java | 17 + .../api/genetics/IFilterRegistry.java | 36 ++ .../forestry/api/genetics/IFilterRule.java | 25 ++ .../apiculture/ApicultureFilterLogic.java | 86 +++++ .../apiculture/ApicultureFilterRule.java | 84 +++++ .../forestry/apiculture/ModuleApiculture.java | 6 + .../ArboricultureFilterRule.java | 78 ++++ .../arboriculture/ModuleArboriculture.java | 5 + .../genetics/TreeAlyzerPlugin.java | 18 +- .../arboriculture/genetics/TreeGenome.java | 6 + .../core/genetics/BreedingTracker.java | 5 + .../java/forestry/core/gui/GuiIdRegistry.java | 16 +- .../forestry/core/gui/widgets/Widget.java | 9 +- .../inventory/AdjacentInventoryCache.java | 7 +- .../forestry/core/items/ItemRegistryCore.java | 1 + .../forestry/core/network/PacketIdServer.java | 4 + .../core/render/TextureManagerForestry.java | 20 +- .../java/forestry/core/utils/OreDictUtil.java | 2 + .../forestry/database/DatabaseHelper.java | 4 +- .../forestry/database/gui/GuiDatabase.java | 3 +- .../greenhouse/blocks/BlockClimatiser.java | 1 - .../LepidopterologyFilterLogic.java | 74 ++++ .../LepidopterologyFilterRule.java | 90 +++++ .../ModuleLepidopterology.java | 12 +- .../forestry/modules/ForestryModuleUids.java | 1 + .../java/forestry/sorting/AlleleFilter.java | 22 ++ .../forestry/sorting/DefaultFilterRule.java | 98 +++++ .../forestry/sorting/DummyFilterRegistry.java | 41 +++ .../java/forestry/sorting/FilterData.java | 53 +++ .../java/forestry/sorting/FilterRegistry.java | 50 +++ .../java/forestry/sorting/ModuleSorting.java | 103 ++++++ .../sorting/blocks/BlockGeneticFilter.java | 116 ++++++ .../sorting/blocks/BlockRegistrySorting.java | 14 + .../forestry/sorting/blocks/package-info.java | 10 + .../sorting/gui/ContainerGeneticFilter.java | 51 +++ .../sorting/gui/GuiGeneticFilter.java | 160 ++++++++ .../sorting/gui/ISelectableProvider.java | 15 + .../sorting/gui/SlotFilterFacing.java | 36 ++ .../sorting/gui/SlotGeneticFilter.java | 21 ++ .../forestry/sorting/gui/package-info.java | 10 + .../sorting/gui/widgets/RuleWidget.java | 107 ++++++ .../sorting/gui/widgets/SelectionLogic.java | 148 ++++++++ .../sorting/gui/widgets/SelectionWidget.java | 91 +++++ .../sorting/gui/widgets/SpeciesWidget.java | 151 ++++++++ .../sorting/gui/widgets/package-info.java | 10 + .../sorting/inventory/InventoryFilter.java | 18 + .../sorting/inventory/ItemHandlerFilter.java | 53 +++ .../sorting/inventory/package-info.java | 10 + .../network/PacketRegistrySorting.java | 23 ++ .../sorting/network/package-info.java | 10 + .../packets/PacketFilterChangeGenome.java | 75 ++++ .../packets/PacketFilterChangeRule.java | 55 +++ .../sorting/network/packets/package-info.java | 10 + .../java/forestry/sorting/package-info.java | 10 + .../sorting/tiles/TileGeneticFilter.java | 346 ++++++++++++++++++ .../forestry/sorting/tiles/package-info.java | 10 + .../forestry/blockstates/genetic_filter.json | 23 ++ .../models/block/filter/filter_center.json | 20 + .../models/block/filter/filter_down.json | 6 + .../models/block/filter/filter_east.json | 6 + .../models/block/filter/filter_north.json | 6 + .../models/block/filter/filter_side.json | 41 +++ .../models/block/filter/filter_south.json | 6 + .../models/block/filter/filter_up.json | 6 + .../models/block/filter/filter_west.json | 6 + .../forestry/models/item/e_particle.png | Bin 0 -> 159 bytes .../forestry/models/item/genetic_filter.json | 121 ++++++ .../textures/blocks/genetic_filter.png | Bin 0 -> 634 bytes .../blocks/genetic_filter_particle.png | Bin 0 -> 209 bytes .../textures/gui/analyzer/butterfly.png | Bin 0 -> 754 bytes .../textures/gui/analyzer/caterpillar.png | Bin 0 -> 366 bytes .../forestry/textures/gui/analyzer/cocoon.png | Bin 0 -> 372 bytes .../textures/gui/analyzer/flutter.png | Bin 0 -> 677 bytes .../forestry/textures/gui/analyzer/pollen.png | Bin 0 -> 415 bytes .../textures/gui/analyzer/sapling.png | Bin 0 -> 553 bytes .../forestry/textures/gui/analyzer/serum.png | Bin 0 -> 420 bytes .../forestry/textures/gui/analyzer/tree.png | Bin 0 -> 460 bytes .../assets/forestry/textures/gui/filter.png | Bin 0 -> 692 bytes .../textures/gui/filter_selection.png | Bin 0 -> 736 bytes .../forestry/textures/gui/slots/bee.png | Bin 0 -> 208 bytes 85 files changed, 2795 insertions(+), 35 deletions(-) create mode 100644 src/main/java/forestry/api/genetics/IFilterData.java create mode 100644 src/main/java/forestry/api/genetics/IFilterLogic.java create mode 100644 src/main/java/forestry/api/genetics/IFilterRegistry.java create mode 100644 src/main/java/forestry/api/genetics/IFilterRule.java create mode 100644 src/main/java/forestry/apiculture/ApicultureFilterLogic.java create mode 100644 src/main/java/forestry/apiculture/ApicultureFilterRule.java create mode 100644 src/main/java/forestry/arboriculture/ArboricultureFilterRule.java create mode 100644 src/main/java/forestry/lepidopterology/LepidopterologyFilterLogic.java create mode 100644 src/main/java/forestry/lepidopterology/LepidopterologyFilterRule.java create mode 100644 src/main/java/forestry/sorting/AlleleFilter.java create mode 100644 src/main/java/forestry/sorting/DefaultFilterRule.java create mode 100644 src/main/java/forestry/sorting/DummyFilterRegistry.java create mode 100644 src/main/java/forestry/sorting/FilterData.java create mode 100644 src/main/java/forestry/sorting/FilterRegistry.java create mode 100644 src/main/java/forestry/sorting/ModuleSorting.java create mode 100644 src/main/java/forestry/sorting/blocks/BlockGeneticFilter.java create mode 100644 src/main/java/forestry/sorting/blocks/BlockRegistrySorting.java create mode 100644 src/main/java/forestry/sorting/blocks/package-info.java create mode 100644 src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java create mode 100644 src/main/java/forestry/sorting/gui/GuiGeneticFilter.java create mode 100644 src/main/java/forestry/sorting/gui/ISelectableProvider.java create mode 100644 src/main/java/forestry/sorting/gui/SlotFilterFacing.java create mode 100644 src/main/java/forestry/sorting/gui/SlotGeneticFilter.java create mode 100644 src/main/java/forestry/sorting/gui/package-info.java create mode 100644 src/main/java/forestry/sorting/gui/widgets/RuleWidget.java create mode 100644 src/main/java/forestry/sorting/gui/widgets/SelectionLogic.java create mode 100644 src/main/java/forestry/sorting/gui/widgets/SelectionWidget.java create mode 100644 src/main/java/forestry/sorting/gui/widgets/SpeciesWidget.java create mode 100644 src/main/java/forestry/sorting/gui/widgets/package-info.java create mode 100644 src/main/java/forestry/sorting/inventory/InventoryFilter.java create mode 100644 src/main/java/forestry/sorting/inventory/ItemHandlerFilter.java create mode 100644 src/main/java/forestry/sorting/inventory/package-info.java create mode 100644 src/main/java/forestry/sorting/network/PacketRegistrySorting.java create mode 100644 src/main/java/forestry/sorting/network/package-info.java create mode 100644 src/main/java/forestry/sorting/network/packets/PacketFilterChangeGenome.java create mode 100644 src/main/java/forestry/sorting/network/packets/PacketFilterChangeRule.java create mode 100644 src/main/java/forestry/sorting/network/packets/package-info.java create mode 100644 src/main/java/forestry/sorting/package-info.java create mode 100644 src/main/java/forestry/sorting/tiles/TileGeneticFilter.java create mode 100644 src/main/java/forestry/sorting/tiles/package-info.java create mode 100644 src/main/resources/assets/forestry/blockstates/genetic_filter.json create mode 100644 src/main/resources/assets/forestry/models/block/filter/filter_center.json create mode 100644 src/main/resources/assets/forestry/models/block/filter/filter_down.json create mode 100644 src/main/resources/assets/forestry/models/block/filter/filter_east.json create mode 100644 src/main/resources/assets/forestry/models/block/filter/filter_north.json create mode 100644 src/main/resources/assets/forestry/models/block/filter/filter_side.json create mode 100644 src/main/resources/assets/forestry/models/block/filter/filter_south.json create mode 100644 src/main/resources/assets/forestry/models/block/filter/filter_up.json create mode 100644 src/main/resources/assets/forestry/models/block/filter/filter_west.json create mode 100644 src/main/resources/assets/forestry/models/item/e_particle.png create mode 100644 src/main/resources/assets/forestry/models/item/genetic_filter.json create mode 100644 src/main/resources/assets/forestry/textures/blocks/genetic_filter.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/genetic_filter_particle.png create mode 100644 src/main/resources/assets/forestry/textures/gui/analyzer/butterfly.png create mode 100644 src/main/resources/assets/forestry/textures/gui/analyzer/caterpillar.png create mode 100644 src/main/resources/assets/forestry/textures/gui/analyzer/cocoon.png create mode 100644 src/main/resources/assets/forestry/textures/gui/analyzer/flutter.png create mode 100644 src/main/resources/assets/forestry/textures/gui/analyzer/pollen.png create mode 100644 src/main/resources/assets/forestry/textures/gui/analyzer/sapling.png create mode 100644 src/main/resources/assets/forestry/textures/gui/analyzer/serum.png create mode 100644 src/main/resources/assets/forestry/textures/gui/analyzer/tree.png create mode 100644 src/main/resources/assets/forestry/textures/gui/filter.png create mode 100644 src/main/resources/assets/forestry/textures/gui/filter_selection.png create mode 100644 src/main/resources/assets/forestry/textures/gui/slots/bee.png diff --git a/lang b/lang index f26fbe9da..cf9f2c21f 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit f26fbe9da8874b36881c9b1fe69f0e29ec768603 +Subproject commit cf9f2c21f53e6ad4ce180bdccf258ff7e717ce94 diff --git a/src/main/java/forestry/api/arboriculture/ITreeGenome.java b/src/main/java/forestry/api/arboriculture/ITreeGenome.java index a2b5f8612..6adf9bf35 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeGenome.java +++ b/src/main/java/forestry/api/arboriculture/ITreeGenome.java @@ -5,9 +5,10 @@ ******************************************************************************/ package forestry.api.arboriculture; -import forestry.api.genetics.IGenome; import net.minecraft.item.ItemStack; +import forestry.api.genetics.IGenome; + public interface ITreeGenome extends IGenome { @Override @@ -37,6 +38,8 @@ public interface ITreeGenome extends IGenome { int getGirth(); + boolean getFireproof(); + IAlleleLeafEffect getEffect(); /** diff --git a/src/main/java/forestry/api/genetics/AlleleManager.java b/src/main/java/forestry/api/genetics/AlleleManager.java index f6d141bec..9cd03ab4b 100644 --- a/src/main/java/forestry/api/genetics/AlleleManager.java +++ b/src/main/java/forestry/api/genetics/AlleleManager.java @@ -23,4 +23,9 @@ public class AlleleManager { * Creates Forestry alleles. */ public static IAlleleFactory alleleFactory; + + /** + * @since 5.8 + */ + public static IFilterRegistry filterRegistry; } diff --git a/src/main/java/forestry/api/genetics/IBreedingTracker.java b/src/main/java/forestry/api/genetics/IBreedingTracker.java index 969307431..4fe138b29 100644 --- a/src/main/java/forestry/api/genetics/IBreedingTracker.java +++ b/src/main/java/forestry/api/genetics/IBreedingTracker.java @@ -5,10 +5,14 @@ ******************************************************************************/ package forestry.api.genetics; -import forestry.api.apiculture.IBeekeepingMode; +import java.util.Collection; +import java.util.Collections; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import forestry.api.apiculture.IBeekeepingMode; + /** * Keeps track of who bred, discovered, and researched which species in a world. * @@ -67,6 +71,13 @@ public interface IBreedingTracker { */ boolean isDiscovered(IAlleleSpecies species); + /** + * @return A collection that contains the {@link IAllele#getUID()}s of all discovered species. + */ + default Collection getDiscoveredSpecies(){ + return Collections.emptyList(); + } + /** * Register a successfully researched mutation. * Mutations are normally researched in the Escritoire. diff --git a/src/main/java/forestry/api/genetics/IFilterData.java b/src/main/java/forestry/api/genetics/IFilterData.java new file mode 100644 index 000000000..4a23d18da --- /dev/null +++ b/src/main/java/forestry/api/genetics/IFilterData.java @@ -0,0 +1,27 @@ +package forestry.api.genetics; + +public interface IFilterData { + + /** + * If the root is present, returns the root, + * otherwise throws {@code NoSuchElementException}. + */ + ISpeciesRoot getRoot(); + + /** + * If the individual is present, returns the individual, + * otherwise throws {@code NoSuchElementException}. + */ + IIndividual getIndividual(); + + /** + * If the type is present, returns the type, + * otherwise throws {@code NoSuchElementException}. + */ + ISpeciesType getType(); + + /** + * @return True if this data contains a root, individual and type. + */ + boolean isPresent(); +} diff --git a/src/main/java/forestry/api/genetics/IFilterLogic.java b/src/main/java/forestry/api/genetics/IFilterLogic.java new file mode 100644 index 000000000..7a089ff42 --- /dev/null +++ b/src/main/java/forestry/api/genetics/IFilterLogic.java @@ -0,0 +1,17 @@ +package forestry.api.genetics; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; + +public interface IFilterLogic { + boolean isValid(ItemStack itemStack, IFilterData data); + + /** + * If a root with this uid is registered, the filter will only get stack with individuals from this root. + */ + @Nullable + default String getRootUID() { + return null; + } +} diff --git a/src/main/java/forestry/api/genetics/IFilterRegistry.java b/src/main/java/forestry/api/genetics/IFilterRegistry.java new file mode 100644 index 000000000..8d27d7583 --- /dev/null +++ b/src/main/java/forestry/api/genetics/IFilterRegistry.java @@ -0,0 +1,36 @@ +package forestry.api.genetics; + +import javax.annotation.Nullable; +import java.util.Collection; + +/** + * @since 5.8 + */ +public interface IFilterRegistry { + /** + * Registers a filter rule. + */ + void registerFilter(IFilterRule rule); + + Collection getRules(); + + IFilterRule getDefaultRule(); + + @Nullable + IFilterRule getRule(String uid); + + @Nullable + IFilterRule getRule(int id); + + int getId(IFilterRule rule); + + default IFilterRule getRuleOrDefault(String uid){ + IFilterRule rule = getRule(uid); + return rule != null ? rule : getDefaultRule(); + } + + default IFilterRule getRuleOrDefault(int id){ + IFilterRule rule = getRule(id); + return rule != null ? rule : getDefaultRule(); + } +} diff --git a/src/main/java/forestry/api/genetics/IFilterRule.java b/src/main/java/forestry/api/genetics/IFilterRule.java new file mode 100644 index 000000000..c429db331 --- /dev/null +++ b/src/main/java/forestry/api/genetics/IFilterRule.java @@ -0,0 +1,25 @@ +package forestry.api.genetics; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +/** + * @since 5.8 + */ +public interface IFilterRule extends IFilterLogic { + void addLogic(IFilterLogic logic); + + /** + * @return A unique identifier for the rule. + */ + String getUID(); + + @SideOnly(Side.CLIENT) + TextureAtlasSprite getSprite(); + + @SideOnly(Side.CLIENT) + ResourceLocation getTextureMap(); +} diff --git a/src/main/java/forestry/apiculture/ApicultureFilterLogic.java b/src/main/java/forestry/apiculture/ApicultureFilterLogic.java new file mode 100644 index 000000000..ba3c81398 --- /dev/null +++ b/src/main/java/forestry/apiculture/ApicultureFilterLogic.java @@ -0,0 +1,86 @@ +package forestry.apiculture; + +import net.minecraft.item.ItemStack; + +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IBee; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IIndividual; +import forestry.sorting.DefaultFilterRule; + +public enum ApicultureFilterLogic implements IFilterLogic { + PURE_BREED(DefaultFilterRule.PURE_BREED){ + @Override + protected boolean isValid(IBee bee) { + return bee.isPureBred(EnumBeeChromosome.SPECIES); + } + }, + NOCTURNAL(DefaultFilterRule.NOCTURNAL){ + @Override + protected boolean isValid(IBee bee) { + return bee.getGenome().getNeverSleeps(); + } + }, + PURE_NOCTURNAL(DefaultFilterRule.PURE_NOCTURNAL){ + @Override + protected boolean isValid(IBee bee) { + return bee.getGenome().getNeverSleeps() && bee.isPureBred(EnumBeeChromosome.NEVER_SLEEPS); + } + }, + FLYER(DefaultFilterRule.FLYER){ + @Override + protected boolean isValid(IBee bee) { + return bee.getGenome().getToleratesRain(); + } + }, + PURE_FLYER((DefaultFilterRule.PURE_FLYER)){ + @Override + protected boolean isValid(IBee bee) { + return bee.getGenome().getToleratesRain() && bee.isPureBred(EnumBeeChromosome.TOLERATES_RAIN); + } + }, + CAVE(DefaultFilterRule.CAVE){ + @Override + protected boolean isValid(IBee bee) { + return bee.getGenome().getCaveDwelling(); + } + }, + PURE_CAVE(DefaultFilterRule.PURE_CAVE){ + @Override + protected boolean isValid(IBee bee) { + return bee.getGenome().getCaveDwelling() && bee.isPureBred(EnumBeeChromosome.CAVE_DWELLING); + } + }; + + ApicultureFilterLogic(IFilterRule rule) { + rule.addLogic(this); + } + + public static void init() { + } + + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + if(!data.isPresent()){ + return false; + } + IIndividual individual = data.getIndividual(); + if(!(individual instanceof IBee)){ + return false; + } + return isValid((IBee)individual); + } + + protected boolean isValid(IBee bee){ + return false; + } + + @Override + public String getRootUID() { + return BeeManager.beeRoot.getUID(); + } + +} diff --git a/src/main/java/forestry/apiculture/ApicultureFilterRule.java b/src/main/java/forestry/apiculture/ApicultureFilterRule.java new file mode 100644 index 000000000..ed1afa79f --- /dev/null +++ b/src/main/java/forestry/apiculture/ApicultureFilterRule.java @@ -0,0 +1,84 @@ +package forestry.apiculture; + +import java.util.Locale; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRule; +import forestry.core.render.TextureManagerForestry; + +public enum ApicultureFilterRule implements IFilterRule { + BEE{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent(); + } + }, + DRONE{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumBeeType.DRONE; + } + }, + PRINCESS{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumBeeType.PRINCESS; + } + }, + QUEEN{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumBeeType.QUEEN; + } + }; + + private final String uid; + + ApicultureFilterRule() { + this.uid = "forestry.apiculture." + name().toLowerCase(Locale.ENGLISH); + } + + public static void init() { + for (ApicultureFilterRule rule : values()) { + AlleleManager.filterRegistry.registerFilter(rule); + } + } + + @Override + public void addLogic(IFilterLogic logic) { + throw new IllegalStateException(); + } + + @SideOnly(Side.CLIENT) + @Override + public TextureAtlasSprite getSprite() { + return TextureManagerForestry.getInstance().getDefault("analyzer/" + name().toLowerCase(Locale.ENGLISH)); + } + + @SideOnly(Side.CLIENT) + @Override + public ResourceLocation getTextureMap() { + return TextureManagerForestry.LOCATION_FORESTRY_TEXTURE; + } + + @Override + public String getRootUID() { + return BeeManager.beeRoot.getUID(); + } + + @Override + public String getUID() { + return uid; + } +} diff --git a/src/main/java/forestry/apiculture/ModuleApiculture.java b/src/main/java/forestry/apiculture/ModuleApiculture.java index 61638091d..41e6564a6 100644 --- a/src/main/java/forestry/apiculture/ModuleApiculture.java +++ b/src/main/java/forestry/apiculture/ModuleApiculture.java @@ -133,6 +133,7 @@ import forestry.food.ModuleFood; import forestry.food.items.ItemRegistryFood; import forestry.modules.BlankForestryModule; import forestry.modules.ForestryModuleUids; +import forestry.modules.ModuleManager; @ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.apiculture.description", lootTable = "apiculture") public class ModuleApiculture extends BlankForestryModule { @@ -231,6 +232,11 @@ public class ModuleApiculture extends BlankForestryModule { // Commands ModuleCore.rootCommand.addChildCommand(new CommandBee()); + + if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.SORTING)){ + ApicultureFilterRule.init(); + ApicultureFilterLogic.init(); + } } // TODO: Buildcraft for 1.9 diff --git a/src/main/java/forestry/arboriculture/ArboricultureFilterRule.java b/src/main/java/forestry/arboriculture/ArboricultureFilterRule.java new file mode 100644 index 000000000..018f5f145 --- /dev/null +++ b/src/main/java/forestry/arboriculture/ArboricultureFilterRule.java @@ -0,0 +1,78 @@ +package forestry.arboriculture; + +import java.util.Locale; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRule; +import forestry.core.render.TextureManagerForestry; + +public enum ArboricultureFilterRule implements IFilterRule { + TREE{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent(); + } + }, + SAPLING{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumGermlingType.SAPLING; + } + }, + POLLEN{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumGermlingType.POLLEN; + } + }; + + private final String uid; + + ArboricultureFilterRule() { + this.uid = "forestry.arboriculture." + name().toLowerCase(Locale.ENGLISH); + } + + public static void init() { + for (ArboricultureFilterRule rule : values()) { + AlleleManager.filterRegistry.registerFilter(rule); + } + } + + @Override + public void addLogic(IFilterLogic logic) { + throw new IllegalStateException(); + } + + @SideOnly(Side.CLIENT) + @Override + public TextureAtlasSprite getSprite() { + return TextureManagerForestry.getInstance().getDefault("analyzer/" + name().toLowerCase(Locale.ENGLISH)); + } + + @SideOnly(Side.CLIENT) + @Override + public ResourceLocation getTextureMap() { + return TextureManagerForestry.LOCATION_FORESTRY_TEXTURE; + } + + @Override + public String getRootUID() { + return TreeManager.treeRoot.getUID(); + } + + @Override + public String getUID() { + return uid; + } +} diff --git a/src/main/java/forestry/arboriculture/ModuleArboriculture.java b/src/main/java/forestry/arboriculture/ModuleArboriculture.java index c41962d17..015fb1508 100644 --- a/src/main/java/forestry/arboriculture/ModuleArboriculture.java +++ b/src/main/java/forestry/arboriculture/ModuleArboriculture.java @@ -110,6 +110,7 @@ import forestry.core.utils.ItemStackUtil; import forestry.core.utils.VillagerTradeLists; import forestry.modules.BlankForestryModule; import forestry.modules.ForestryModuleUids; +import forestry.modules.ModuleManager; @ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.arboriculture.description", lootTable = "arboriculture") public class ModuleArboriculture extends BlankForestryModule { @@ -213,6 +214,10 @@ public class ModuleArboriculture extends BlankForestryModule { // Commands ModuleCore.rootCommand.addChildCommand(new CommandTree()); + + if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.SORTING)){ + ArboricultureFilterRule.init(); + } } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java b/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java index 726454492..f1dfc6f80 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java @@ -39,10 +39,12 @@ import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.ModuleArboriculture; import forestry.arboriculture.genetics.alleles.AlleleFruits; import forestry.core.config.Config; +import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.gui.GuiAlyzer; import forestry.core.gui.TextLayoutHelper; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.gui.widgets.WidgetManager; +import forestry.core.utils.StringUtil; import forestry.core.utils.Translator; public class TreeAlyzerPlugin implements IAlyzerPlugin { @@ -129,7 +131,7 @@ public class TreeAlyzerPlugin implements IAlyzerPlugin { TextLayoutHelper textLayout = guiAlyzer.getTextLayout(); - textLayout.startPage(); + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); int speciesDominance0 = guiAlyzer.getColorCoding(tree.getGenome().getPrimary().isDominant()); int speciesDominance1 = guiAlyzer.getColorCoding(tree.getGenome().getSecondary().isDominant()); @@ -140,14 +142,14 @@ public class TreeAlyzerPlugin implements IAlyzerPlugin { textLayout.newLine(); textLayout.newLine(); - IAlleleTreeSpecies activeSpecies = (IAlleleTreeSpecies) tree.getGenome().getActiveAllele(EnumTreeChromosome.SPECIES); - IAlleleTreeSpecies inActiveSpecies = (IAlleleTreeSpecies) tree.getGenome().getInactiveAllele(EnumTreeChromosome.SPECIES); + String yes = Translator.translateToLocal("for.yes"); + String no = Translator.translateToLocal("for.no"); + + String fireproofActive = StringUtil.readableBoolean(tree.getGenome().getFireproof(), yes, no); + String fireproofInactive = StringUtil.readableBoolean(((AlleleBoolean) tree.getGenome().getInactiveAllele(EnumTreeChromosome.FIREPROOF)).getValue(), yes, no); + + guiAlyzer.drawRow(Translator.translateToLocal("for.gui.fireproof"), fireproofActive, fireproofInactive, tree, EnumTreeChromosome.FIREPROOF); - int activeCarbonization = activeSpecies.getWoodProvider().getCarbonization(); - int inactiveCarbonization = inActiveSpecies.getWoodProvider().getCarbonization(); - textLayout.drawLine(Translator.translateToLocal("for.gui.carbonization"), GuiAlyzer.COLUMN_0); - guiAlyzer.drawLine(Integer.toString(activeCarbonization), GuiAlyzer.COLUMN_1, tree, EnumTreeChromosome.SPECIES, false); - guiAlyzer.drawLine(Integer.toString(inactiveCarbonization), GuiAlyzer.COLUMN_2, tree, EnumTreeChromosome.SPECIES, true); textLayout.newLine(); textLayout.drawLine(Translator.translateToLocal("for.gui.native"), GuiAlyzer.COLUMN_0); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index 306b3a0d3..7abd16b34 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -25,6 +25,7 @@ import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleBoolean; import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleSpecies; @@ -102,6 +103,11 @@ public class TreeGenome extends Genome implements ITreeGenome { return ((IAlleleInteger) getActiveAllele(EnumTreeChromosome.GIRTH)).getValue(); } + @Override + public boolean getFireproof() { + return ((IAlleleBoolean) getActiveAllele(EnumTreeChromosome.FIREPROOF)).getValue(); + } + @Override public IAlleleLeafEffect getEffect() { return (IAlleleLeafEffect) getActiveAllele(EnumTreeChromosome.EFFECT); diff --git a/src/main/java/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java index b20bdba0a..3d0ec4f50 100755 --- a/src/main/java/forestry/core/genetics/BreedingTracker.java +++ b/src/main/java/forestry/core/genetics/BreedingTracker.java @@ -235,6 +235,11 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin return discoveredSpecies.contains(species.getUID()); } + @Override + public Set getDiscoveredSpecies() { + return discoveredSpecies; + } + @Override public int getSpeciesBred() { return discoveredSpecies.size(); diff --git a/src/main/java/forestry/core/gui/GuiIdRegistry.java b/src/main/java/forestry/core/gui/GuiIdRegistry.java index ff87193c6..56d7e6872 100644 --- a/src/main/java/forestry/core/gui/GuiIdRegistry.java +++ b/src/main/java/forestry/core/gui/GuiIdRegistry.java @@ -54,6 +54,7 @@ import forestry.mail.items.ItemLetter; import forestry.mail.tiles.TileMailbox; import forestry.mail.tiles.TileStampCollector; import forestry.mail.tiles.TileTrader; +import forestry.sorting.tiles.TileGeneticFilter; import forestry.storage.items.ItemBackpack; import forestry.storage.items.ItemBackpackNaturalist; import forestry.worktable.tiles.TileWorktable; @@ -65,20 +66,25 @@ public class GuiIdRegistry { static { registerGuiHandlers(GuiType.Tile, Arrays.asList( + //Apiculture Module TileAlveary.class, TileAlvearyHygroregulator.class, TileAlvearySieve.class, TileApiary.class, TileBeeHouse.class, + //Core Module TileAnalyzer.class, TileEscritoire.class, TileNaturalistChest.class, - TileRaintank.class, + + //Worktable Module TileWorktable.class, + //Database Module TileDatabase.class, + //Factory Module TileBottler.class, TileCarpenter.class, TileCentrifuge.class, @@ -87,18 +93,26 @@ public class GuiIdRegistry { TileMoistener.class, TileSqueezer.class, TileStill.class, + TileRaintank.class, + //Farm Module TileFarm.class, + //Sorting Module + TileGeneticFilter.class, + + //Greenhouse Module TileGreenhouse.class, TileClimatiser.class, TileHygroregulator.class, + //Power Module TileEngineBiogas.class, TileEngineElectric.class, TileEnginePeat.class, TileEuGenerator.class, + //Mail Module TileMailbox.class, TileStampCollector.class, TileTrader.class diff --git a/src/main/java/forestry/core/gui/widgets/Widget.java b/src/main/java/forestry/core/gui/widgets/Widget.java index 0251e8f3f..2eb6b9677 100755 --- a/src/main/java/forestry/core/gui/widgets/Widget.java +++ b/src/main/java/forestry/core/gui/widgets/Widget.java @@ -11,7 +11,6 @@ package forestry.core.gui.widgets; import javax.annotation.Nullable; -import java.awt.Rectangle; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -44,8 +43,12 @@ public abstract class Widget implements IToolTipProvider { return height; } - public Rectangle getRectangle(int startX, int startY){ - return new Rectangle(startX + xPos, startY + yPos, width, height); + public int getX() { + return xPos; + } + + public int getY() { + return yPos; } public abstract void draw(int startX, int startY); diff --git a/src/main/java/forestry/core/inventory/AdjacentInventoryCache.java b/src/main/java/forestry/core/inventory/AdjacentInventoryCache.java index 16d64d7e6..8a6902957 100644 --- a/src/main/java/forestry/core/inventory/AdjacentInventoryCache.java +++ b/src/main/java/forestry/core/inventory/AdjacentInventoryCache.java @@ -17,12 +17,14 @@ import java.util.Comparator; import java.util.LinkedList; import java.util.List; -import forestry.core.tiles.AdjacentTileCache; -import forestry.core.tiles.TileUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; + import net.minecraftforge.items.IItemHandler; +import forestry.core.tiles.AdjacentTileCache; +import forestry.core.tiles.TileUtil; + /** * @author CovertJaguar */ @@ -56,6 +58,7 @@ public final class AdjacentInventoryCache implements AdjacentTileCache.ICacheLis cache.addListener(this); } + @Nullable public IItemHandler getAdjacentInventory(EnumFacing side) { checkChanged(); return sides[side.ordinal()]; diff --git a/src/main/java/forestry/core/items/ItemRegistryCore.java b/src/main/java/forestry/core/items/ItemRegistryCore.java index e854ac51c..cfc4381f5 100644 --- a/src/main/java/forestry/core/items/ItemRegistryCore.java +++ b/src/main/java/forestry/core/items/ItemRegistryCore.java @@ -197,6 +197,7 @@ public class ItemRegistryCore extends ItemRegistry { for (ItemFruit.EnumFruit def : ItemFruit.EnumFruit.values()) { ItemStack fruit = new ItemStack(fruits, 1, def.ordinal()); OreDictionary.registerOre(def.getOreDict(), fruit); + OreDictionary.registerOre(OreDictUtil.FRUIT_FORESTRY, fruit); } } diff --git a/src/main/java/forestry/core/network/PacketIdServer.java b/src/main/java/forestry/core/network/PacketIdServer.java index 262934a8c..fa604b8e4 100644 --- a/src/main/java/forestry/core/network/PacketIdServer.java +++ b/src/main/java/forestry/core/network/PacketIdServer.java @@ -28,6 +28,10 @@ public enum PacketIdServer implements IPacketId { //Database INSERT_ITEM, EXTRACT_ITEM, + + // Sorting + FILTER_CHANGE_RULE, + FILTER_CHANGE_GENOME, // Greenhouse CAMOUFLAGE_SELECTION, diff --git a/src/main/java/forestry/core/render/TextureManagerForestry.java b/src/main/java/forestry/core/render/TextureManagerForestry.java index 7e286616a..8fec08b5f 100644 --- a/src/main/java/forestry/core/render/TextureManagerForestry.java +++ b/src/main/java/forestry/core/render/TextureManagerForestry.java @@ -53,16 +53,18 @@ public class TextureManagerForestry implements ITextureManager { } public static void initDefaultSprites() { - String[] defaultIconNames = new String[]{"habitats/desert", "habitats/end", "habitats/forest", "habitats/hills", "habitats/jungle", "habitats/mushroom", - "habitats/nether", "habitats/ocean", "habitats/plains", "habitats/snow", "habitats/swamp", "habitats/taiga", - "misc/access.shared", "misc/energy", "misc/hint", - "analyzer/anything", "analyzer/bee", "analyzer/cave", "analyzer/closed", "analyzer/drone", "analyzer/flyer", - "analyzer/item", "analyzer/nocturnal", "analyzer/princess", "analyzer/pure_breed", "analyzer/pure_cave", - "analyzer/pure_flyer", "analyzer/pure_nocturnal", "analyzer/queen", + String[] defaultIconNames = new String[]{"habitats/desert", "habitats/end", "habitats/forest", "habitats/hills", "habitats/jungle", + "habitats/mushroom", "habitats/nether", "habitats/ocean", "habitats/plains", "habitats/snow", "habitats/swamp", "habitats/taiga", + "misc/access.shared", "misc/energy", "misc/hint", + "analyzer/anything", "analyzer/bee", "analyzer/cave", "analyzer/closed", "analyzer/drone", "analyzer/flyer", "analyzer/item", + "analyzer/nocturnal", "analyzer/princess", "analyzer/pure_breed", "analyzer/pure_cave", "analyzer/pure_flyer", + "analyzer/pure_nocturnal", "analyzer/queen", "analyzer/tree", "analyzer/sapling", "analyzer/pollen", "analyzer/flutter", + "analyzer/butterfly", "analyzer/serum", "analyzer/caterpillar", "analyzer/cocoon", "errors/errored", "errors/unknown", - "slots/blocked", "slots/blocked_2", "slots/liquid", "slots/container", "slots/locked", "slots/cocoon", - "mail/carrier.player", "mail/carrier.trader", - "modifiers/rain"}; + "slots/blocked", "slots/blocked_2", "slots/liquid", "slots/container", "slots/locked", "slots/cocoon", "slots/bee", + "mail/carrier.player", "mail/carrier.trader", + "modifiers/rain" + }; for (String identifier : defaultIconNames) { ResourceLocation resourceLocation = getForestryGuiLocation(identifier); INSTANCE.registerGuiSprite(resourceLocation); diff --git a/src/main/java/forestry/core/utils/OreDictUtil.java b/src/main/java/forestry/core/utils/OreDictUtil.java index 4ab885cf3..bda0e0b6d 100644 --- a/src/main/java/forestry/core/utils/OreDictUtil.java +++ b/src/main/java/forestry/core/utils/OreDictUtil.java @@ -58,6 +58,8 @@ public class OreDictUtil { public static final String CROP_CARROT = "cropCarrot"; public static final String SUGARCANE = "sugarcane"; + public static final String FRUIT_FORESTRY = "fruitForestry"; + public static final String PANE_GLASS = "paneGlass"; public static final String SAND = "sand"; public static final String DUST_REDSTONE = "dustRedstone"; diff --git a/src/main/java/forestry/database/DatabaseHelper.java b/src/main/java/forestry/database/DatabaseHelper.java index 1daef2b36..a317e61be 100644 --- a/src/main/java/forestry/database/DatabaseHelper.java +++ b/src/main/java/forestry/database/DatabaseHelper.java @@ -1,7 +1,6 @@ package forestry.database; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.LinkedList; import java.util.List; @@ -44,7 +43,6 @@ public class DatabaseHelper { public static void update(String searchText, List items, ArrayList sorted){ sorted.clear(); - sorted.ensureCapacity(items.size()); Pattern pattern; @@ -84,7 +82,7 @@ public class DatabaseHelper { }*/ } - Collections.sort(sorted, SORT_BY_NAME); + sorted.sort(SORT_BY_NAME); } //TODO: Add more filter options diff --git a/src/main/java/forestry/database/gui/GuiDatabase.java b/src/main/java/forestry/database/gui/GuiDatabase.java index f17d3b56f..1d624f049 100644 --- a/src/main/java/forestry/database/gui/GuiDatabase.java +++ b/src/main/java/forestry/database/gui/GuiDatabase.java @@ -13,8 +13,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; -import org.lwjgl.input.Keyboard; - import forestry.core.config.Constants; import forestry.core.gui.Drawable; import forestry.core.gui.GuiForestry; @@ -36,6 +34,7 @@ import forestry.database.gui.widgets.WidgetDatabaseSelectedItem; import forestry.database.gui.widgets.WidgetDatabaseSlot; import forestry.database.gui.widgets.WidgetDatabaseTabs; import forestry.database.tiles.TileDatabase; +import org.lwjgl.input.Keyboard; public class GuiDatabase extends GuiForestry implements ISlotChangeWatcher, IScrollable { diff --git a/src/main/java/forestry/greenhouse/blocks/BlockClimatiser.java b/src/main/java/forestry/greenhouse/blocks/BlockClimatiser.java index 146139a52..90052844c 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockClimatiser.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockClimatiser.java @@ -132,7 +132,6 @@ public class BlockClimatiser extends Block implements IBlockWithMeta, ISpriteReg if (tile != null) { if (TileUtil.isUsableByPlayer(player, tile)) { - ItemStack heldItem = player.getHeldItem(hand); if (!player.isSneaking()) { if (FluidUtil.interactWithFluidHandler(player, hand, world, pos, facing)) { return true; diff --git a/src/main/java/forestry/lepidopterology/LepidopterologyFilterLogic.java b/src/main/java/forestry/lepidopterology/LepidopterologyFilterLogic.java new file mode 100644 index 000000000..61dfea656 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/LepidopterologyFilterLogic.java @@ -0,0 +1,74 @@ +package forestry.lepidopterology; + +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IIndividual; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.IButterfly; +import forestry.sorting.DefaultFilterRule; + +public enum LepidopterologyFilterLogic implements IFilterLogic { + PURE_BREED(DefaultFilterRule.PURE_BREED){ + @Override + protected boolean isValid(IButterfly butterfly) { + return butterfly.isPureBred(EnumButterflyChromosome.SPECIES); + } + }, + NOCTURNAL(DefaultFilterRule.NOCTURNAL){ + @Override + protected boolean isValid(IButterfly butterfly) { + return butterfly.getGenome().getNocturnal(); + } + }, + PURE_NOCTURNAL(DefaultFilterRule.PURE_NOCTURNAL){ + @Override + protected boolean isValid(IButterfly butterfly) { + return butterfly.getGenome().getNocturnal() && butterfly.isPureBred(EnumButterflyChromosome.NOCTURNAL); + } + }, + FLYER(DefaultFilterRule.FLYER){ + @Override + protected boolean isValid(IButterfly butterfly) { + return butterfly.getGenome().getTolerantFlyer(); + } + }, + PURE_FLYER(DefaultFilterRule.PURE_FLYER){ + @Override + protected boolean isValid(IButterfly butterfly) { + return butterfly.getGenome().getTolerantFlyer() && butterfly.isPureBred(EnumButterflyChromosome.TOLERANT_FLYER); + } + }; + + LepidopterologyFilterLogic(IFilterRule rule) { + rule.addLogic(this); + } + + public static void init() { + } + + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + if(!data.isPresent()){ + return false; + } + IIndividual individual = data.getIndividual(); + if(!(individual instanceof IButterfly)){ + return false; + } + return isValid((IButterfly) individual); + } + + protected boolean isValid(IButterfly butterfly){ + return false; + } + + @Override + public String getRootUID() { + return ButterflyManager.butterflyRoot.getUID(); + } + +} diff --git a/src/main/java/forestry/lepidopterology/LepidopterologyFilterRule.java b/src/main/java/forestry/lepidopterology/LepidopterologyFilterRule.java new file mode 100644 index 000000000..8c972f838 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/LepidopterologyFilterRule.java @@ -0,0 +1,90 @@ +package forestry.lepidopterology; + +import java.util.Locale; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRule; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumFlutterType; +import forestry.core.render.TextureManagerForestry; + +public enum LepidopterologyFilterRule implements IFilterRule { + FLUTTER{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent(); + } + }, + BUTTERFLY{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumFlutterType.BUTTERFLY; + } + }, + SERUM{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumFlutterType.SERUM; + } + }, + CATERPILLAR{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumFlutterType.CATERPILLAR; + } + }, + COCOON{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumFlutterType.COCOON; + } + }; + + private final String uid; + + LepidopterologyFilterRule() { + this.uid = "forestry.lepidopterology." + name().toLowerCase(Locale.ENGLISH); + } + + public static void init() { + for (LepidopterologyFilterRule rule : values()) { + AlleleManager.filterRegistry.registerFilter(rule); + } + } + + @Override + public void addLogic(IFilterLogic logic) { + throw new IllegalStateException(); + } + + @SideOnly(Side.CLIENT) + @Override + public TextureAtlasSprite getSprite() { + return TextureManagerForestry.getInstance().getDefault("analyzer/" + name().toLowerCase(Locale.ENGLISH)); + } + + @SideOnly(Side.CLIENT) + @Override + public ResourceLocation getTextureMap() { + return TextureManagerForestry.LOCATION_FORESTRY_TEXTURE; + } + + @Override + public String getRootUID() { + return ButterflyManager.butterflyRoot.getUID(); + } + + @Override + public String getUID() { + return uid; + } +} diff --git a/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java b/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java index 5c1234ad5..20e8e929d 100644 --- a/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java @@ -79,6 +79,7 @@ import forestry.lepidopterology.tiles.TileCocoon; import forestry.lepidopterology.worldgen.CocoonDecorator; import forestry.modules.BlankForestryModule; import forestry.modules.ForestryModuleUids; +import forestry.modules.ModuleManager; @ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.LEPIDOPTEROLOGY, name = "Lepidopterology", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.lepidopterology.description") public class ModuleLepidopterology extends BlankForestryModule { @@ -137,10 +138,13 @@ public class ModuleLepidopterology extends BlankForestryModule { ButterflyDefinition.preInit(); MothDefinition.preInit(); MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent<>(ButterflyManager.butterflyRoot, IAlleleButterflySpecies.class)); - - - GameRegistry.registerTileEntity(TileCocoon.class, "forestry.Cocoon"); + proxy.preInitializeRendering(); + + if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.SORTING)){ + LepidopterologyFilterLogic.init(); + LepidopterologyFilterRule.init(); + } } @Override @@ -155,6 +159,8 @@ public class ModuleLepidopterology extends BlankForestryModule { public void doInit() { BlockRegistryLepidopterology blocks = getBlocks(); + GameRegistry.registerTileEntity(TileCocoon.class, "forestry.Cocoon"); + ModuleCore.rootCommand.addChildCommand(new CommandButterfly()); ResourceLocation butterflyResourceLocation = new ResourceLocation(Constants.MOD_ID, "butterflyGE"); diff --git a/src/main/java/forestry/modules/ForestryModuleUids.java b/src/main/java/forestry/modules/ForestryModuleUids.java index fe4f8c8c9..c9060f8b2 100644 --- a/src/main/java/forestry/modules/ForestryModuleUids.java +++ b/src/main/java/forestry/modules/ForestryModuleUids.java @@ -18,6 +18,7 @@ public class ForestryModuleUids { public static final String CRATE = "crates"; public static final String BACKPACKS = "backpacks"; public static final String DATABASE = "database"; + public static final String SORTING = "sorting"; //Mod Plugins public static final String BIOMES_O_PLENTY = "biomes.o.plenty"; diff --git a/src/main/java/forestry/sorting/AlleleFilter.java b/src/main/java/forestry/sorting/AlleleFilter.java new file mode 100644 index 000000000..5034fad0e --- /dev/null +++ b/src/main/java/forestry/sorting/AlleleFilter.java @@ -0,0 +1,22 @@ +package forestry.sorting; + +import javax.annotation.Nullable; + +import forestry.api.genetics.IAllele; + +public class AlleleFilter { + @Nullable + public IAllele activeAllele; + + @Nullable + public IAllele inactiveAllele; + + public boolean isValid(String activeUID, String inactiveUID) { + return (this.activeAllele == null || activeUID.equals(this.activeAllele.getUID())) + && (this.inactiveAllele == null || inactiveUID.equals(this.inactiveAllele.getUID())); + } + + public boolean isEmpty() { + return activeAllele == null && inactiveAllele == null; + } +} diff --git a/src/main/java/forestry/sorting/DefaultFilterRule.java b/src/main/java/forestry/sorting/DefaultFilterRule.java new file mode 100644 index 000000000..beebe290f --- /dev/null +++ b/src/main/java/forestry/sorting/DefaultFilterRule.java @@ -0,0 +1,98 @@ +package forestry.sorting; + +import java.util.HashSet; +import java.util.Locale; +import java.util.Set; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRule; +import forestry.core.render.TextureManagerForestry; + +public enum DefaultFilterRule implements IFilterRule { + CLOSED { + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return false; + } + }, + ANYTHING { + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return true; + } + }, + ITEM { + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return !data.isPresent(); + } + }, + PURE_BREED, + NOCTURNAL, + PURE_NOCTURNAL, + FLYER, + PURE_FLYER, + CAVE, + PURE_CAVE, + /*FIREPROOF, + PURE_FIREPROOF*/; + + private final String uid; + private final Set logic; + + DefaultFilterRule() { + this.uid = "forestry.default." + name().toLowerCase(Locale.ENGLISH); + this.logic = new HashSet<>(); + } + + public static void init() { + for (DefaultFilterRule rule : values()) { + AlleleManager.filterRegistry.registerFilter(rule); + } + } + + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + for (IFilterLogic logic : logic) { + if (logic.isValid(itemStack, data)) { + return true; + } + } + return false; + } + + @Override + public void addLogic(IFilterLogic logic) { + if (logic == this) { + throw new IllegalArgumentException(); + } + this.logic.add(logic); + } + + @SideOnly(Side.CLIENT) + @Override + public TextureAtlasSprite getSprite() { + return TextureManagerForestry.getInstance().getDefault("analyzer/" + name().toLowerCase(Locale.ENGLISH)); + } + + @SideOnly(Side.CLIENT) + @Override + public ResourceLocation getTextureMap() { + return TextureManagerForestry.LOCATION_FORESTRY_TEXTURE; + } + + @Override + public String getUID() { + return uid; + } + +} diff --git a/src/main/java/forestry/sorting/DummyFilterRegistry.java b/src/main/java/forestry/sorting/DummyFilterRegistry.java new file mode 100644 index 000000000..e310f6c04 --- /dev/null +++ b/src/main/java/forestry/sorting/DummyFilterRegistry.java @@ -0,0 +1,41 @@ +package forestry.sorting; + +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.Collections; + +import forestry.api.genetics.IFilterRegistry; +import forestry.api.genetics.IFilterRule; + +public class DummyFilterRegistry implements IFilterRegistry { + @Override + public void registerFilter(IFilterRule rule) { + } + + @Override + public Collection getRules() { + return Collections.emptySet(); + } + + @Override + public IFilterRule getDefaultRule() { + return DefaultFilterRule.CLOSED; + } + + @Nullable + @Override + public IFilterRule getRule(String uid) { + return null; + } + + @Nullable + @Override + public IFilterRule getRule(int id) { + return null; + } + + @Override + public int getId(IFilterRule rule) { + return 0; + } +} diff --git a/src/main/java/forestry/sorting/FilterData.java b/src/main/java/forestry/sorting/FilterData.java new file mode 100644 index 000000000..648469ce8 --- /dev/null +++ b/src/main/java/forestry/sorting/FilterData.java @@ -0,0 +1,53 @@ +package forestry.sorting; + +import javax.annotation.Nullable; +import java.util.NoSuchElementException; + +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; + +public class FilterData implements IFilterData { + @Nullable + private ISpeciesRoot root; + @Nullable + private IIndividual individual; + @Nullable + private ISpeciesType type; + + public FilterData(@Nullable ISpeciesRoot root, @Nullable IIndividual individual, @Nullable ISpeciesType type) { + this.root = root; + this.individual = individual; + this.type = type; + } + + @Override + public ISpeciesRoot getRoot() { + if (root == null) { + throw new NoSuchElementException("No root present"); + } + return root; + } + + @Override + public IIndividual getIndividual() { + if (individual == null) { + throw new NoSuchElementException("No individual present"); + } + return individual; + } + + @Override + public ISpeciesType getType() { + if (type == null) { + throw new NoSuchElementException("No type present"); + } + return type; + } + + @Override + public boolean isPresent() { + return root != null && individual != null && type != null; + } +} diff --git a/src/main/java/forestry/sorting/FilterRegistry.java b/src/main/java/forestry/sorting/FilterRegistry.java new file mode 100644 index 000000000..c1c9a087d --- /dev/null +++ b/src/main/java/forestry/sorting/FilterRegistry.java @@ -0,0 +1,50 @@ +package forestry.sorting; + +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; + +import forestry.api.genetics.IFilterRegistry; +import forestry.api.genetics.IFilterRule; + +public class FilterRegistry implements IFilterRegistry { + private final HashMap filterByName = new LinkedHashMap<>(); + private final HashMap filterIDByName = new LinkedHashMap<>(); + private final HashMap filterByID = new LinkedHashMap<>(); + private int ids; + + @Override + public void registerFilter(IFilterRule rule) { + filterByName.put(rule.getUID(), rule); + filterIDByName.put(rule.getUID(), ids++); + filterByID.put(ids - 1, rule); + } + + @Override + public Collection getRules() { + return filterByName.values(); + } + + @Override + public IFilterRule getDefaultRule() { + return DefaultFilterRule.ITEM; + } + + @Nullable + @Override + public IFilterRule getRule(String uid) { + return filterByName.get(uid); + } + + @Override + public int getId(IFilterRule rule) { + return filterIDByName.get(rule.getUID()); + } + + @Nullable + @Override + public IFilterRule getRule(int id) { + return filterByID.get(id); + } +} diff --git a/src/main/java/forestry/sorting/ModuleSorting.java b/src/main/java/forestry/sorting/ModuleSorting.java new file mode 100644 index 000000000..3f59484a2 --- /dev/null +++ b/src/main/java/forestry/sorting/ModuleSorting.java @@ -0,0 +1,103 @@ +package forestry.sorting; + +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.common.registry.GameRegistry; + +import forestry.api.genetics.AlleleManager; +import forestry.api.modules.ForestryModule; +import forestry.apiculture.ModuleApiculture; +import forestry.core.ModuleCore; +import forestry.core.config.Constants; +import forestry.core.network.IPacketRegistry; +import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.OreDictUtil; +import forestry.lepidopterology.ModuleLepidopterology; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModuleUids; +import forestry.modules.ModuleManager; +import forestry.sorting.blocks.BlockRegistrySorting; +import forestry.sorting.network.PacketRegistrySorting; +import forestry.sorting.tiles.TileGeneticFilter; + +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.SORTING, name = "Sorting", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.module.sorting.description") +public class ModuleSorting extends BlankForestryModule { + @Nullable + private static BlockRegistrySorting blocks; + + public static BlockRegistrySorting getBlocks() { + Preconditions.checkState(blocks != null); + return blocks; + } + + @Override + public IPacketRegistry getPacketRegistry() { + return new PacketRegistrySorting(); + } + + @Override + public void setupAPI() { + AlleleManager.filterRegistry = new FilterRegistry(); + } + + @Override + public void disabledSetupAPI() { + AlleleManager.filterRegistry = new DummyFilterRegistry(); + } + + @Override + public void registerItemsAndBlocks() { + blocks = new BlockRegistrySorting(); + } + + @Override + public void preInit() { + DefaultFilterRule.init(); + } + + @Override + public void registerRecipes() { + if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.APICULTURE)) { + RecipeUtil.addRecipe("genetic_filter_api", new ItemStack(getBlocks().filter, 2), + "WDW", + "PGP", + "BDB", + 'D', OreDictUtil.GEM_DIAMOND, + 'W', OreDictUtil.PLANK_WOOD, + 'G', OreDictUtil.BLOCK_GLASS, + 'B', ModuleCore.getItems().gearBronze, + 'P', ModuleApiculture.getItems().propolis); + } + if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE)) { + RecipeUtil.addRecipe("genetic_filter_arb", new ItemStack(getBlocks().filter, 2), + "WDW", + "FGF", + "BDB", + 'D', OreDictUtil.GEM_DIAMOND, + 'W', OreDictUtil.PLANK_WOOD, + 'G', OreDictUtil.BLOCK_GLASS, + 'B', ModuleCore.getItems().gearBronze, + 'F', OreDictUtil.FRUIT_FORESTRY); + } + if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY)) { + RecipeUtil.addRecipe("genetic_filter_lep", new ItemStack(getBlocks().filter, 2), + "WDW", + "FGF", + "BDB", + 'D', OreDictUtil.GEM_DIAMOND, + 'W', OreDictUtil.PLANK_WOOD, + 'G', OreDictUtil.BLOCK_GLASS, + 'B', ModuleCore.getItems().gearBronze, + 'F', ModuleLepidopterology.getItems().caterpillarGE); + } + } + + @Override + public void doInit() { + GameRegistry.registerTileEntity(TileGeneticFilter.class, "forestry.GeneticFilter"); + } +} diff --git a/src/main/java/forestry/sorting/blocks/BlockGeneticFilter.java b/src/main/java/forestry/sorting/blocks/BlockGeneticFilter.java new file mode 100644 index 000000000..35df1193d --- /dev/null +++ b/src/main/java/forestry/sorting/blocks/BlockGeneticFilter.java @@ -0,0 +1,116 @@ +package forestry.sorting.blocks; + +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.CreativeTabForestry; +import forestry.core.blocks.BlockForestry; +import forestry.core.gui.GuiHandler; +import forestry.core.tiles.TileUtil; +import forestry.sorting.tiles.TileGeneticFilter; + +public class BlockGeneticFilter extends BlockForestry implements IItemModelRegister { + public static final PropertyBool NORTH = PropertyBool.create("north"); + public static final PropertyBool EAST = PropertyBool.create("east"); + public static final PropertyBool SOUTH = PropertyBool.create("south"); + public static final PropertyBool WEST = PropertyBool.create("west"); + public static final PropertyBool UP = PropertyBool.create("up"); + public static final PropertyBool DOWN = PropertyBool.create("down"); + + private static final AxisAlignedBB BOX_CENTER = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); + private static final AxisAlignedBB BOX_DOWN = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.25, 0.75); + private static final AxisAlignedBB BOX_UP = new AxisAlignedBB(0.25, 0.75, 0.25, 0.75, 1, 0.75); + private static final AxisAlignedBB BOX_NORTH = new AxisAlignedBB(0.25, 0.25, 0, 0.75, 0.75, 0.25); + private static final AxisAlignedBB BOX_SOUTH = new AxisAlignedBB(0.25, 0.25, 0.75, 0.75, 0.75, 1); + private static final AxisAlignedBB BOX_WEST = new AxisAlignedBB(0, 0.25, 0.25, 0.25, 0.75, 0.75); + private static final AxisAlignedBB BOX_EAST = new AxisAlignedBB(0.75, 0.25, 0.25, 1, 0.75, 0.75); + private static final AxisAlignedBB[] BOX_FACES = {BOX_DOWN, BOX_UP, BOX_NORTH, BOX_SOUTH, BOX_WEST, BOX_EAST}; + + public BlockGeneticFilter() { + super(Material.WOOD); + setCreativeTab(CreativeTabForestry.tabForestry); + this.setDefaultState(this.blockState.getBaseState() + .withProperty(NORTH, false) + .withProperty(EAST, false) + .withProperty(SOUTH, false) + .withProperty(WEST, false) + .withProperty(UP, false) + .withProperty(DOWN, false)); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + TileGeneticFilter geneticFilter = TileUtil.getTile(worldIn, pos, TileGeneticFilter.class); + if (geneticFilter == null) { + return getDefaultState(); + } + return state.withProperty(NORTH, geneticFilter.isConnected(EnumFacing.NORTH)) + .withProperty(EAST, geneticFilter.isConnected(EnumFacing.EAST)) + .withProperty(SOUTH, geneticFilter.isConnected(EnumFacing.SOUTH)) + .withProperty(WEST, geneticFilter.isConnected(EnumFacing.WEST)) + .withProperty(UP, geneticFilter.isConnected(EnumFacing.UP)) + .withProperty(DOWN, geneticFilter.isConnected(EnumFacing.DOWN)); + } + + @Override + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + TileGeneticFilter tile = TileUtil.getTile(worldIn, pos, TileGeneticFilter.class); + if (tile != null) { + if (TileUtil.isUsableByPlayer(playerIn, tile)) { + if (!worldIn.isRemote) { + GuiHandler.openGui(playerIn, tile); + } + return true; + } + } + return false; + } + + @Override + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0); + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, NORTH, EAST, SOUTH, WEST, UP, DOWN); + } + + @Override + public TileEntity createNewTileEntity(World worldIn, int meta) { + return new TileGeneticFilter(); + } + + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } + + @Override + public boolean isFullBlock(IBlockState state) { + return false; + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } +} diff --git a/src/main/java/forestry/sorting/blocks/BlockRegistrySorting.java b/src/main/java/forestry/sorting/blocks/BlockRegistrySorting.java new file mode 100644 index 000000000..b0eefd14c --- /dev/null +++ b/src/main/java/forestry/sorting/blocks/BlockRegistrySorting.java @@ -0,0 +1,14 @@ +package forestry.sorting.blocks; + +import forestry.core.blocks.BlockRegistry; +import forestry.core.items.ItemBlockForestry; + +public class BlockRegistrySorting extends BlockRegistry { + + public final BlockGeneticFilter filter; + + public BlockRegistrySorting() { + filter = new BlockGeneticFilter(); + registerBlock(filter, new ItemBlockForestry<>(filter), "genetic_filter"); + } +} diff --git a/src/main/java/forestry/sorting/blocks/package-info.java b/src/main/java/forestry/sorting/blocks/package-info.java new file mode 100644 index 000000000..02486a0b8 --- /dev/null +++ b/src/main/java/forestry/sorting/blocks/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.sorting.blocks; + +import javax.annotation.ParametersAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java b/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java new file mode 100644 index 000000000..9847746c6 --- /dev/null +++ b/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java @@ -0,0 +1,51 @@ +package forestry.sorting.gui; + +import net.minecraft.entity.player.InventoryPlayer; + +import forestry.core.gui.ContainerTile; +import forestry.core.network.packets.PacketGuiUpdate; +import forestry.sorting.tiles.TileGeneticFilter; + +public class ContainerGeneticFilter extends ContainerTile { + private boolean guiNeedsUpdate = true; + + public ContainerGeneticFilter(TileGeneticFilter tileForestry, InventoryPlayer playerInventory) { + super(tileForestry); + addInventory(playerInventory, 26, 140); + } + + protected void addInventory(InventoryPlayer playerInventory, int xInv, int yInv) { + // Player inventory + for (int row = 0; row < 3; row++) { + for (int column = 0; column < 9; column++) { + addSlotToContainer(new SlotGeneticFilter(playerInventory, column + row * 9 + 9, xInv + column * 18, yInv + row * 18)); + } + } + // Player hotbar + for (int column = 0; column < 9; column++) { + addSlotToContainer(new SlotGeneticFilter(playerInventory, column, xInv + column * 18, yInv + 58)); + } + + for (int x = 0; x < 6; x++) { + addSlotToContainer(new SlotFilterFacing(tile, x, 8, 18 + x * 18)); + } + } + + public void setGuiNeedsUpdate(boolean guiNeedsUpdate) { + this.guiNeedsUpdate = guiNeedsUpdate; + } + + @Override + public void detectAndSendChanges() { + super.detectAndSendChanges(); + if (guiNeedsUpdate) { + PacketGuiUpdate packet = new PacketGuiUpdate(tile); + sendPacketToListeners(packet); + guiNeedsUpdate = false; + } + } + + public boolean hasSameTile(ContainerGeneticFilter openContainer) { + return tile == openContainer.tile; + } +} diff --git a/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java b/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java new file mode 100644 index 000000000..2c6b64414 --- /dev/null +++ b/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java @@ -0,0 +1,160 @@ +package forestry.sorting.gui; + +import javax.annotation.Nullable; +import java.io.IOException; + +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; + +import forestry.core.config.Constants; +import forestry.core.gui.Drawable; +import forestry.core.gui.GuiForestryTitled; +import forestry.core.gui.widgets.Widget; +import forestry.core.gui.widgets.WidgetScrollBar; +import forestry.sorting.gui.widgets.RuleWidget; +import forestry.sorting.gui.widgets.SelectionWidget; +import forestry.sorting.gui.widgets.SpeciesWidget; +import forestry.sorting.tiles.TileGeneticFilter; + +public class GuiGeneticFilter extends GuiForestryTitled { + + private final TileGeneticFilter tile; + private final WidgetScrollBar scrollBar; + public final SelectionWidget selection; + @Nullable + private GuiTextField searchField; + + public GuiGeneticFilter(TileGeneticFilter tile, InventoryPlayer inventory) { + super(Constants.TEXTURE_PATH_GUI + "/filter.png", new ContainerGeneticFilter(tile, inventory), tile); + ySize = 222; + xSize = 212; + this.tile = tile; + + for (int i = 0; i < 6; i++) { + EnumFacing facing = EnumFacing.getFront(i); + widgetManager.add(new RuleWidget(widgetManager, 8 + 36, 18 + i * 18, facing, this)); + } + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 3; j++) { + for (int k = 0; k < 2; k++) { + widgetManager.add(new SpeciesWidget(widgetManager, 44 + 36 + j * 45 + k * 18, 18 + i * 18, EnumFacing.getFront(i), j, k == 0, this)); + } + } + } + + this.scrollBar = new WidgetScrollBar(widgetManager, 157 + 36, 150, 12, 64, new Drawable(new ResourceLocation(Constants.TEXTURE_PATH_GUI + "/container/creative_inventory/tabs.png"), 232, 0, 12, 15)); + widgetManager.add(this.selection = new SelectionWidget(widgetManager, 0, 134, scrollBar, this)); + widgetManager.add(scrollBar); + scrollBar.setVisible(false); + } + + public void onModuleClick(ISelectableProvider provider) { + if (selection.isSame(provider)) { + deselectFilter(); + } else { + selectFilter(provider); + } + } + + private void selectFilter(ISelectableProvider provider) { + selection.setProvider(provider); + if (searchField != null) { + searchField.setEnabled(true); + searchField.setVisible(true); + } + selection.filterEntries(searchField != null ? searchField.getText() : ""); + for (Slot slot : inventorySlots.inventorySlots) { + if (slot instanceof SlotGeneticFilter) { + SlotGeneticFilter filter = (SlotGeneticFilter) slot; + filter.setEnabled(false); + } + } + } + + private void deselectFilter() { + this.selection.setProvider(null); + if (searchField != null) { + searchField.setEnabled(false); + searchField.setVisible(false); + } + scrollBar.setVisible(false); + for (Slot slot : inventorySlots.inventorySlots) { + if (slot instanceof SlotGeneticFilter) { + SlotGeneticFilter filter = (SlotGeneticFilter) slot; + filter.setEnabled(true); + } + } + } + + @Override + public void initGui() { + super.initGui(); + + String oldString = searchField != null ? searchField.getText() : ""; + + this.searchField = new GuiTextField(0, this.fontRenderer, this.guiLeft + selection.getX() + 89 + 36, selection.getY() + this.guiTop + 4, 80, this.fontRenderer.FONT_HEIGHT); + this.searchField.setMaxStringLength(50); + this.searchField.setEnableBackgroundDrawing(false); + this.searchField.setTextColor(16777215); + this.searchField.setText(oldString); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); + + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.disableLighting(); + if (searchField != null) { + this.searchField.drawTextBox(); + } + } + + @Override + protected void keyTyped(char typedChar, int keyCode) throws IOException { + if (searchField != null && this.searchField.textboxKeyTyped(typedChar, keyCode)) { + scrollBar.setValue(0); + selection.filterEntries(searchField.getText()); + } else { + super.keyTyped(typedChar, keyCode); + } + } + + @Nullable + @Override + protected Slot getSlotAtPosition(int mouseX, int mouseY) { + Slot slot = super.getSlotAtPosition(mouseX, mouseY); + if (slot instanceof SlotGeneticFilter && selection.getLogic() != null) { + return null; + } + return slot; + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + super.mouseClicked(mouseX, mouseY, mouseButton); + + if (searchField != null) { + searchField.mouseClicked(mouseX, mouseY, mouseButton); + } + Widget widget = widgetManager.getAtPosition(mouseX - guiLeft, mouseY - guiTop); + if (widget == null) { + deselectFilter(); + } + } + + @Override + protected void addLedgers() { + addHintLedger("filter"); + } + + + public TileGeneticFilter getTile() { + return tile; + } +} diff --git a/src/main/java/forestry/sorting/gui/ISelectableProvider.java b/src/main/java/forestry/sorting/gui/ISelectableProvider.java new file mode 100644 index 000000000..00f72dbc4 --- /dev/null +++ b/src/main/java/forestry/sorting/gui/ISelectableProvider.java @@ -0,0 +1,15 @@ +package forestry.sorting.gui; + +import java.util.Collection; + +import forestry.core.gui.GuiForestry; + +public interface ISelectableProvider { + Collection getEntries(); + + void onSelect(S selectable); + + void draw(GuiForestry gui, S selectable, int x, int y); + + String getName(S selectable); +} diff --git a/src/main/java/forestry/sorting/gui/SlotFilterFacing.java b/src/main/java/forestry/sorting/gui/SlotFilterFacing.java new file mode 100644 index 000000000..0c252c6f6 --- /dev/null +++ b/src/main/java/forestry/sorting/gui/SlotFilterFacing.java @@ -0,0 +1,36 @@ +package forestry.sorting.gui; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.render.TextureManagerForestry; + +public class SlotFilterFacing extends Slot { + + public SlotFilterFacing(IInventory inventoryIn, int index, int xPosition, int yPosition) { + super(inventoryIn, index, xPosition, yPosition); + } + + @Override + public boolean isItemValid(ItemStack stack) { + return false; + } + + @SideOnly(Side.CLIENT) + @Override + public ResourceLocation getBackgroundLocation() { + return TextureManagerForestry.getInstance().getGuiTextureMap(); + } + + @SideOnly(Side.CLIENT) + @Override + public TextureAtlasSprite getBackgroundSprite() { + return TextureManagerForestry.getInstance().getDefault("slots/bee"); + } +} diff --git a/src/main/java/forestry/sorting/gui/SlotGeneticFilter.java b/src/main/java/forestry/sorting/gui/SlotGeneticFilter.java new file mode 100644 index 000000000..af57d099d --- /dev/null +++ b/src/main/java/forestry/sorting/gui/SlotGeneticFilter.java @@ -0,0 +1,21 @@ +package forestry.sorting.gui; + +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; + +public class SlotGeneticFilter extends Slot { + private boolean enabled = true; + + public SlotGeneticFilter(IInventory inventoryIn, int index, int xPosition, int yPosition) { + super(inventoryIn, index, xPosition, yPosition); + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + @Override + public boolean isEnabled() { + return enabled; + } +} diff --git a/src/main/java/forestry/sorting/gui/package-info.java b/src/main/java/forestry/sorting/gui/package-info.java new file mode 100644 index 000000000..30d142f7d --- /dev/null +++ b/src/main/java/forestry/sorting/gui/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.sorting.gui; + +import javax.annotation.ParametersAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java b/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java new file mode 100644 index 000000000..1b5597c7e --- /dev/null +++ b/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java @@ -0,0 +1,107 @@ +package forestry.sorting.gui.widgets; + +import com.google.common.collect.ImmutableSet; + +import java.util.Collection; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.EnumFacing; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IFilterRule; +import forestry.core.gui.GuiForestry; +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.gui.widgets.Widget; +import forestry.core.gui.widgets.WidgetManager; +import forestry.core.utils.NetworkUtil; +import forestry.core.utils.SoundUtil; +import forestry.core.utils.Translator; +import forestry.sorting.gui.GuiGeneticFilter; +import forestry.sorting.gui.ISelectableProvider; +import forestry.sorting.network.packets.PacketFilterChangeRule; +import forestry.sorting.tiles.TileGeneticFilter; + +public class RuleWidget extends Widget implements ISelectableProvider { + private static final ImmutableSet ENTRIES = createEntries(); + + private final EnumFacing facing; + private final GuiGeneticFilter gui; + + public RuleWidget(WidgetManager manager, int xPos, int yPos, EnumFacing facing, GuiGeneticFilter gui) { + super(manager, xPos, yPos); + this.facing = facing; + this.gui = gui; + } + + @Override + public void draw(int startX, int startY) { + int x = xPos + startX; + int y = yPos + startY; + IFilterRule rule = gui.getTile().getRule(facing); + draw(manager.gui, rule, x, y); + TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); + if (this.gui.selection.isSame(this)) { + textureManager.bindTexture(SelectionWidget.TEXTURE); + gui.drawTexturedModalRect(x - 1, y - 1, 212, 0, 18, 18); + } + } + + @Override + public Collection getEntries() { + return ENTRIES; + } + + @Override + public void draw(GuiForestry gui, IFilterRule selectable, int x, int y) { + TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); + textureManager.bindTexture(selectable.getTextureMap()); + + TextureAtlasSprite sprite = selectable.getSprite(); + gui.drawTexturedModalRect(x, y, sprite, 16, 16); + } + + @Override + public String getName(IFilterRule selectable) { + return Translator.translateToLocal("for.gui.filter." + selectable.getUID()); + } + + @Override + public void onSelect(IFilterRule selectable) { + TileGeneticFilter filter = gui.getTile(); + if (filter.setRule(facing, selectable)) { + NetworkUtil.sendToServer(new PacketFilterChangeRule(filter, facing, selectable)); + } + if (gui.selection.isSame(this)) { + gui.onModuleClick(this); + } + SoundUtil.playButtonClick(); + } + + @Override + public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { + if (mouseButton == 1) { + onSelect(AlleleManager.filterRegistry.getDefaultRule()); + } else { + SoundUtil.playButtonClick(); + gui.onModuleClick(this); + } + } + + @Override + public ToolTip getToolTip(int mouseX, int mouseY) { + IFilterRule rule = gui.getTile().getRule(facing); + ToolTip tooltip = new ToolTip(); + tooltip.add(getName(rule)); + return tooltip; + } + + private static ImmutableSet createEntries() { + ImmutableSet.Builder entries = ImmutableSet.builder(); + for (IFilterRule rule : AlleleManager.filterRegistry.getRules()) { + entries.add(rule); + } + return entries.build(); + } +} diff --git a/src/main/java/forestry/sorting/gui/widgets/SelectionLogic.java b/src/main/java/forestry/sorting/gui/widgets/SelectionLogic.java new file mode 100644 index 000000000..13fb818c8 --- /dev/null +++ b/src/main/java/forestry/sorting/gui/widgets/SelectionLogic.java @@ -0,0 +1,148 @@ +package forestry.sorting.gui.widgets; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Set; +import java.util.regex.Pattern; + +import forestry.core.gui.GuiForestry; +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.gui.widgets.IScrollable; +import forestry.sorting.gui.ISelectableProvider; + +public class SelectionLogic implements IScrollable { + private static final int SELECTABLE_PER_ROW = 11; + + private final ISelectableProvider provider; + private final Comparator comparator; + private final SelectionWidget widget; + private final Collection entries; + private ArrayList sorted = new ArrayList<>(); + private Set visible = new HashSet<>(); + + public SelectionLogic(SelectionWidget widget, ISelectableProvider provider) { + this.widget = widget; + this.provider = provider; + this.entries = provider.getEntries(); + this.comparator = (S f, S s) -> provider.getName(f).compareToIgnoreCase(provider.getName(s)); + + } + + public boolean isSame(ISelectableProvider provider) { + return this.provider == provider; + } + + @Override + public void onScroll(int value) { + visible.clear(); + int startIndex = value * SELECTABLE_PER_ROW; + Y: + for (int y = 0; y < 4; y++) { + for (int x = 0; x < SELECTABLE_PER_ROW; x++) { + int index = startIndex + y * SELECTABLE_PER_ROW + x; + if (index >= sorted.size()) { + break Y; + } + visible.add(new SelectableWidget(sorted.get(index), widget.getX() + 12 + x * 16, widget.getY() + 16 + y * 16)); + } + } + } + + public Set getVisible() { + return visible; + } + + public void filterEntries(String searchText) { + sorted.clear(); + sorted.ensureCapacity(entries.size()); + + Pattern pattern; + try { + pattern = Pattern.compile(searchText.toLowerCase(), Pattern.CASE_INSENSITIVE); + } catch (Throwable ignore) { + try { + pattern = Pattern.compile(Pattern.quote(searchText.toLowerCase()), Pattern.CASE_INSENSITIVE); + } catch (Throwable e) { + return; + } + } + + for (S entry : entries) { + String name = provider.getName(entry); + if (pattern.matcher(name.toLowerCase()).find()) { + sorted.add(entry); + } + } + sorted.sort(comparator); + + int elements = sorted.size() / SELECTABLE_PER_ROW - 4; + if (elements > 0) { + widget.scrollBar.setParameters(this, 0, elements, 1); + } else { + onScroll(0); + } + widget.scrollBar.setVisible(elements > 0); + + } + + @Override + public boolean isFocused(int mouseX, int mouseY) { + return widget.isMouseOver(mouseX, mouseY); + } + + public void draw() { + for (SelectableWidget selectable : visible) { + selectable.draw(widget.gui); + } + } + + @Nullable + public ToolTip getToolTip(int mouseX, int mouseY) { + for (SelectableWidget selectable : visible) { + if (selectable.isMouseOver(mouseX, mouseY)) { + return selectable.getToolTip(); + } + } + return null; + } + + public void select(int mouseX, int mouseY) { + mouseX -= widget.gui.getGuiLeft(); + mouseY -= widget.gui.getGuiTop(); + for (SelectableWidget selectable : visible) { + if (selectable.isMouseOver(mouseX, mouseY)) { + provider.onSelect(selectable.selectable); + break; + } + } + } + + private class SelectableWidget { + private final S selectable; + private final int xPos; + private final int yPos; + + public SelectableWidget(S entry, int xPos, int yPos) { + this.selectable = entry; + this.xPos = xPos; + this.yPos = yPos; + } + + public void draw(GuiForestry gui) { + provider.draw(gui, selectable, xPos, yPos); + } + + public boolean isMouseOver(int mouseX, int mouseY) { + return mouseX >= xPos && mouseX <= xPos + 16 && mouseY >= yPos && mouseY <= yPos + 16; + } + + public ToolTip getToolTip() { + ToolTip toolTip = new ToolTip(); + toolTip.add(provider.getName(selectable)); + return toolTip; + } + } +} diff --git a/src/main/java/forestry/sorting/gui/widgets/SelectionWidget.java b/src/main/java/forestry/sorting/gui/widgets/SelectionWidget.java new file mode 100644 index 000000000..a2fcea3b1 --- /dev/null +++ b/src/main/java/forestry/sorting/gui/widgets/SelectionWidget.java @@ -0,0 +1,91 @@ +package forestry.sorting.gui.widgets; + +import javax.annotation.Nullable; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import forestry.core.config.Constants; +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.gui.widgets.Widget; +import forestry.core.gui.widgets.WidgetManager; +import forestry.core.gui.widgets.WidgetScrollBar; +import forestry.core.utils.Translator; +import forestry.sorting.gui.GuiGeneticFilter; +import forestry.sorting.gui.ISelectableProvider; + +public class SelectionWidget extends Widget { + public static final ResourceLocation TEXTURE = new ResourceLocation(Constants.MOD_ID, Constants.TEXTURE_PATH_GUI + "/filter_selection.png"); + final WidgetScrollBar scrollBar; + @Nullable + private SelectionLogic logic; + final GuiGeneticFilter gui; + + public SelectionWidget(WidgetManager manager, int xPos, int yPos, WidgetScrollBar scrollBar, GuiGeneticFilter gui) { + super(manager, xPos, yPos); + this.width = 212; + this.height = 88; + this.scrollBar = scrollBar; + this.gui = gui; + } + + public void setProvider(@Nullable ISelectableProvider provider) { + if (provider == null) { + logic = null; + } else { + this.logic = new SelectionLogic<>(this, provider); + } + } + + public boolean isSame(ISelectableProvider provider) { + return logic != null && logic.isSame(provider); + } + + @Nullable + public SelectionLogic getLogic() { + return logic; + } + + @Override + public void draw(int startX, int startY) { + if (logic == null) { + return; + } + TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); + textureManager.bindTexture(TEXTURE); + manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, 0, 0, width, height); + logic.draw(); + + manager.minecraft.fontRenderer.drawString(Translator.translateToLocal("for.gui.filter.seletion"), startX + xPos + 12, startY + yPos + 4, manager.gui.getFontColor().get("gui.title")); + } + + @Override + public boolean isMouseOver(int mouseX, int mouseY) { + return logic != null && super.isMouseOver(mouseX, mouseY); + } + + @Nullable + @Override + public ToolTip getToolTip(int mouseX, int mouseY) { + if (logic == null) { + return null; + } + return logic.getToolTip(mouseX, mouseY); + } + + @Override + public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { + if (logic == null) { + return; + } + logic.select(mouseX, mouseY); + } + + public void filterEntries(String filter) { + if (logic == null) { + return; + } + logic.filterEntries(filter); + } +} diff --git a/src/main/java/forestry/sorting/gui/widgets/SpeciesWidget.java b/src/main/java/forestry/sorting/gui/widgets/SpeciesWidget.java new file mode 100644 index 000000000..a20f900b4 --- /dev/null +++ b/src/main/java/forestry/sorting/gui/widgets/SpeciesWidget.java @@ -0,0 +1,151 @@ +package forestry.sorting.gui.widgets; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; + +import javax.annotation.Nullable; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiUtil; +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.gui.widgets.Widget; +import forestry.core.gui.widgets.WidgetManager; +import forestry.core.utils.NetworkUtil; +import forestry.core.utils.SoundUtil; +import forestry.sorting.AlleleFilter; +import forestry.sorting.gui.GuiGeneticFilter; +import forestry.sorting.gui.ISelectableProvider; +import forestry.sorting.network.packets.PacketFilterChangeGenome; +import forestry.sorting.tiles.TileGeneticFilter; + +public class SpeciesWidget extends Widget implements ISelectableProvider { + private final static ImmutableMap ITEMS = createEntries(); + private final ImmutableSet entries; + + private final EnumFacing facing; + private final int index; + private final boolean active; + private final GuiGeneticFilter gui; + + public SpeciesWidget(WidgetManager manager, int xPos, int yPos, EnumFacing facing, int index, boolean active, GuiGeneticFilter gui) { + super(manager, xPos, yPos); + this.facing = facing; + this.index = index; + this.active = active; + this.gui = gui; + ImmutableSet.Builder entries = ImmutableSet.builder(); + for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { + IBreedingTracker tracker = root.getBreedingTracker(manager.minecraft.world, manager.minecraft.player.getGameProfile()); + for (String uid : tracker.getDiscoveredSpecies()) { + IAllele allele = AlleleManager.alleleRegistry.getAllele(uid); + if (allele instanceof IAlleleSpecies) { + IAlleleSpecies species = (IAlleleSpecies) allele; + entries.add(species); + } + } + } + this.entries = entries.build(); + } + + @Override + public void draw(int startX, int startY) { + int x = xPos + startX; + int y = yPos + startY; + AlleleFilter filter = gui.getTile().getGenomeFilter(facing, index); + if (filter != null) { + IAlleleSpecies allele = (IAlleleSpecies) (active ? filter.activeAllele : filter.inactiveAllele); + GuiUtil.drawItemStack(manager.gui, ITEMS.getOrDefault(allele, ItemStack.EMPTY), x, y); + } + TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); + if (this.gui.selection.isSame(this)) { + textureManager.bindTexture(SelectionWidget.TEXTURE); + gui.drawTexturedModalRect(x - 1, y - 1, 212, 0, 18, 18); + } + } + + @Override + public ImmutableSet getEntries() { + return entries; + } + + @Override + public void onSelect(@Nullable IAlleleSpecies selectable) { + TileGeneticFilter filter = gui.getTile(); + if (filter.setGenomeFilter(facing, index, active, selectable)) { + NetworkUtil.sendToServer(new PacketFilterChangeGenome(filter.getPos(), facing, (short) index, active, selectable)); + } + if (gui.selection.isSame(this)) { + gui.onModuleClick(this); + } + SoundUtil.playButtonClick(); + } + + @Override + public void draw(GuiForestry gui, IAlleleSpecies selectable, int x, int y) { + GuiUtil.drawItemStack(gui, ITEMS.getOrDefault(selectable, ItemStack.EMPTY), x, y); + } + + @Override + public String getName(IAlleleSpecies selectable) { + return selectable.getAlleleName(); + } + + @Nullable + @Override + public ToolTip getToolTip(int mouseX, int mouseY) { + AlleleFilter filter = gui.getTile().getGenomeFilter(facing, index); + if (filter == null) { + return null; + } + IAlleleSpecies allele = (IAlleleSpecies) (active ? filter.activeAllele : filter.inactiveAllele); + if (allele == null) { + return null; + } + ToolTip tooltip = new ToolTip(); + tooltip.add(getName(allele)); + return tooltip; + } + + @Override + public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { + ItemStack stack = gui.mc.player.inventory.getItemStack(); + if (!stack.isEmpty()) { + IIndividual individual = AlleleManager.alleleRegistry.getIndividual(stack); + if (individual != null) { + IGenome genome = individual.getGenome(); + onSelect(mouseButton == 0 ? genome.getPrimary() : genome.getSecondary()); + return; + } + } + if (mouseButton == 1) { + onSelect(null); + } else { + SoundUtil.playButtonClick(); + gui.onModuleClick(this); + } + } + + private static ImmutableMap createEntries() { + ImmutableMap.Builder entries = ImmutableMap.builder(); + for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { + for (IIndividual individual : root.getIndividualTemplates()) { + IAlleleSpecies species = individual.getGenome().getPrimary(); + ItemStack itemStack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species)), root.getIconType()); + entries.put(species, itemStack); + } + } + return entries.build(); + } +} diff --git a/src/main/java/forestry/sorting/gui/widgets/package-info.java b/src/main/java/forestry/sorting/gui/widgets/package-info.java new file mode 100644 index 000000000..0c7829915 --- /dev/null +++ b/src/main/java/forestry/sorting/gui/widgets/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.sorting.gui.widgets; + +import javax.annotation.ParametersAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/sorting/inventory/InventoryFilter.java b/src/main/java/forestry/sorting/inventory/InventoryFilter.java new file mode 100644 index 000000000..256632db5 --- /dev/null +++ b/src/main/java/forestry/sorting/inventory/InventoryFilter.java @@ -0,0 +1,18 @@ +package forestry.sorting.inventory; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; + +import forestry.core.inventory.InventoryAdapterTile; +import forestry.sorting.tiles.TileGeneticFilter; + +public class InventoryFilter extends InventoryAdapterTile { + public InventoryFilter(TileGeneticFilter tile) { + super(tile, 6, "Items"); + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack stack, EnumFacing side) { + return false; + } +} diff --git a/src/main/java/forestry/sorting/inventory/ItemHandlerFilter.java b/src/main/java/forestry/sorting/inventory/ItemHandlerFilter.java new file mode 100644 index 000000000..a34378579 --- /dev/null +++ b/src/main/java/forestry/sorting/inventory/ItemHandlerFilter.java @@ -0,0 +1,53 @@ +package forestry.sorting.inventory; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.InvWrapper; + +import forestry.sorting.tiles.TileGeneticFilter; + +public class ItemHandlerFilter implements IItemHandler { + private final TileGeneticFilter filter; + private final IItemHandler itemHandler; + private final EnumFacing facing; + + public ItemHandlerFilter(TileGeneticFilter filter, EnumFacing facing) { + this.filter = filter; + this.facing = facing; + this.itemHandler = new InvWrapper(filter); + } + + @Override + public int getSlots() { + return 1; + } + + @Override + public ItemStack getStackInSlot(int slot) { + return ItemStack.EMPTY; + } + + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + ItemStack remaining = stack; + for (EnumFacing facing : filter.getValidDirections(stack, facing)) { + remaining = itemHandler.insertItem(facing.getIndex(), stack, simulate); + if (remaining.isEmpty()) { + return ItemStack.EMPTY; + } + } + return remaining; + } + + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate) { + return ItemStack.EMPTY; + } + + @Override + public int getSlotLimit(int slot) { + return 64; + } +} diff --git a/src/main/java/forestry/sorting/inventory/package-info.java b/src/main/java/forestry/sorting/inventory/package-info.java new file mode 100644 index 000000000..7506d7cd2 --- /dev/null +++ b/src/main/java/forestry/sorting/inventory/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.sorting.inventory; + +import javax.annotation.ParametersAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/sorting/network/PacketRegistrySorting.java b/src/main/java/forestry/sorting/network/PacketRegistrySorting.java new file mode 100644 index 000000000..db4d7e0bc --- /dev/null +++ b/src/main/java/forestry/sorting/network/PacketRegistrySorting.java @@ -0,0 +1,23 @@ +package forestry.sorting.network; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.network.IPacketRegistry; +import forestry.core.network.PacketIdServer; +import forestry.sorting.network.packets.PacketFilterChangeGenome; +import forestry.sorting.network.packets.PacketFilterChangeRule; + +public class PacketRegistrySorting implements IPacketRegistry { + @Override + public void registerPacketsServer() { + PacketIdServer.FILTER_CHANGE_RULE.setPacketHandler(new PacketFilterChangeRule.Handler()); + PacketIdServer.FILTER_CHANGE_GENOME.setPacketHandler(new PacketFilterChangeGenome.Handler()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerPacketsClient() { + + } +} diff --git a/src/main/java/forestry/sorting/network/package-info.java b/src/main/java/forestry/sorting/network/package-info.java new file mode 100644 index 000000000..930a8b1b4 --- /dev/null +++ b/src/main/java/forestry/sorting/network/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.sorting.network; + +import javax.annotation.ParametersAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/sorting/network/packets/PacketFilterChangeGenome.java b/src/main/java/forestry/sorting/network/packets/PacketFilterChangeGenome.java new file mode 100644 index 000000000..bddb43b7b --- /dev/null +++ b/src/main/java/forestry/sorting/network/packets/PacketFilterChangeGenome.java @@ -0,0 +1,75 @@ +package forestry.sorting.network.packets; + +import javax.annotation.Nullable; +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketHandlerServer; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketBufferForestry; +import forestry.core.network.PacketIdServer; +import forestry.core.tiles.TileUtil; +import forestry.sorting.tiles.TileGeneticFilter; + +public class PacketFilterChangeGenome extends ForestryPacket implements IForestryPacketServer { + private final BlockPos pos; + private final EnumFacing facing; + private final short index; + private final boolean active; + @Nullable + private final IAllele allele; + + public PacketFilterChangeGenome(BlockPos pos, EnumFacing facing, short index, boolean active, @Nullable IAllele allele) { + this.pos = pos; + this.facing = facing; + this.index = index; + this.active = active; + this.allele = allele; + } + + @Override + protected void writeData(PacketBufferForestry data) throws IOException { + data.writeBlockPos(pos); + data.writeShort(facing.getIndex()); + data.writeShort(index); + data.writeBoolean(active); + if (allele != null) { + data.writeBoolean(true); + data.writeString(allele.getUID()); + } else { + data.writeBoolean(false); + } + } + + @Override + public PacketIdServer getPacketId() { + return PacketIdServer.FILTER_CHANGE_GENOME; + } + + public static class Handler implements IForestryPacketHandlerServer { + @Override + public void onPacketData(PacketBufferForestry data, EntityPlayerMP player) throws IOException { + BlockPos pos = data.readBlockPos(); + EnumFacing facing = EnumFacing.getFront(data.readShort()); + short index = data.readShort(); + boolean active = data.readBoolean(); + IAllele allele; + if (data.readBoolean()) { + allele = AlleleManager.alleleRegistry.getAllele(data.readString()); + } else { + allele = null; + } + TileUtil.actOnTile(player.world, pos, TileGeneticFilter.class, tile -> { + if (tile.setGenomeFilter(facing, index, active, allele)) { + tile.sendToPlayers(player.getServerWorld(), player); + } + }); + } + } +} diff --git a/src/main/java/forestry/sorting/network/packets/PacketFilterChangeRule.java b/src/main/java/forestry/sorting/network/packets/PacketFilterChangeRule.java new file mode 100644 index 000000000..212d6f567 --- /dev/null +++ b/src/main/java/forestry/sorting/network/packets/PacketFilterChangeRule.java @@ -0,0 +1,55 @@ +package forestry.sorting.network.packets; + +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IFilterRule; +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketHandlerServer; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketBufferForestry; +import forestry.core.network.PacketIdServer; +import forestry.core.tiles.TileUtil; +import forestry.sorting.tiles.TileGeneticFilter; + +public class PacketFilterChangeRule extends ForestryPacket implements IForestryPacketServer { + private final BlockPos pos; + private final EnumFacing facing; + private final IFilterRule rule; + + public PacketFilterChangeRule(TileGeneticFilter filter, EnumFacing facing, IFilterRule rule) { + this.pos = filter.getPos(); + this.facing = facing; + this.rule = rule; + } + + @Override + protected void writeData(PacketBufferForestry data) throws IOException { + data.writeBlockPos(pos); + data.writeShort(facing.getIndex()); + data.writeShort(AlleleManager.filterRegistry.getId(rule)); + } + + @Override + public PacketIdServer getPacketId() { + return PacketIdServer.FILTER_CHANGE_RULE; + } + + public static class Handler implements IForestryPacketHandlerServer { + @Override + public void onPacketData(PacketBufferForestry data, EntityPlayerMP player) throws IOException { + BlockPos pos = data.readBlockPos(); + EnumFacing facing = EnumFacing.getFront(data.readShort()); + IFilterRule rule = AlleleManager.filterRegistry.getRuleOrDefault(data.readShort()); + TileUtil.actOnTile(player.world, pos, TileGeneticFilter.class, tile -> { + if (tile.setRule(facing, rule)) { + tile.sendToPlayers(player.getServerWorld(), player); + } + }); + } + } +} diff --git a/src/main/java/forestry/sorting/network/packets/package-info.java b/src/main/java/forestry/sorting/network/packets/package-info.java new file mode 100644 index 000000000..35d068358 --- /dev/null +++ b/src/main/java/forestry/sorting/network/packets/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.sorting.network.packets; + +import javax.annotation.ParametersAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/sorting/package-info.java b/src/main/java/forestry/sorting/package-info.java new file mode 100644 index 000000000..7ab3e2ee7 --- /dev/null +++ b/src/main/java/forestry/sorting/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.sorting; + +import javax.annotation.ParametersAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/sorting/tiles/TileGeneticFilter.java b/src/main/java/forestry/sorting/tiles/TileGeneticFilter.java new file mode 100644 index 000000000..39f3fa91c --- /dev/null +++ b/src/main/java/forestry/sorting/tiles/TileGeneticFilter.java @@ -0,0 +1,346 @@ +package forestry.sorting.tiles; + +import javax.annotation.Nullable; +import java.io.IOException; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.WorldServer; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; +import forestry.core.inventory.AdjacentInventoryCache; +import forestry.core.network.IStreamableGui; +import forestry.core.network.PacketBufferForestry; +import forestry.core.tiles.TileForestry; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.sorting.AlleleFilter; +import forestry.sorting.DefaultFilterRule; +import forestry.sorting.FilterData; +import forestry.sorting.gui.ContainerGeneticFilter; +import forestry.sorting.gui.GuiGeneticFilter; +import forestry.sorting.inventory.InventoryFilter; +import forestry.sorting.inventory.ItemHandlerFilter; + +public class TileGeneticFilter extends TileForestry implements IStreamableGui { + private static final int TRANSFER_DELAY = 5; + + private IFilterRule[] filterRules = new IFilterRule[6]; + private AlleleFilter[][] genomeFilter = new AlleleFilter[6][3]; + private final AdjacentInventoryCache inventoryCache; + + public TileGeneticFilter() { + for (int i = 0; i < filterRules.length; i++) { + filterRules[i] = AlleleManager.filterRegistry.getDefaultRule(); + } + this.inventoryCache = new AdjacentInventoryCache(this, getTileCache()); + setInternalInventory(new InventoryFilter(this)); + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound data) { + super.writeToNBT(data); + + for (int i = 0; i < filterRules.length; i++) { + data.setString("TypeFilter" + i, filterRules[i].getUID()); + } + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 3; j++) { + AlleleFilter filter = genomeFilter[i][j]; + if (filter == null) { + continue; + } + if (filter.activeAllele != null) { + data.setString("GenomeFilterS" + i + "-" + j + "-" + 0, filter.activeAllele.getUID()); + } + if (filter.inactiveAllele != null) { + data.setString("GenomeFilterS" + i + "-" + j + "-" + 1, filter.inactiveAllele.getUID()); + } + } + } + return data; + } + + @Override + public void readFromNBT(NBTTagCompound data) { + super.readFromNBT(data); + for (int i = 0; i < filterRules.length; i++) { + filterRules[i] = AlleleManager.filterRegistry.getRuleOrDefault(data.getString("TypeFilter" + i)); + } + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 3; j++) { + AlleleFilter filter = new AlleleFilter(); + if (data.hasKey("GenomeFilterS" + i + "-" + j + "-" + 0)) { + filter.activeAllele = AlleleManager.alleleRegistry.getAllele(data.getString("GenomeFilterS" + i + "-" + j + "-" + 0)); + } + if (data.hasKey("GenomeFilterS" + i + "-" + j + "-" + 1)) { + filter.inactiveAllele = AlleleManager.alleleRegistry.getAllele(data.getString("GenomeFilterS" + i + "-" + j + "-" + 1)); + } + genomeFilter[i][j] = filter; + } + } + } + + @Override + public void writeGuiData(PacketBufferForestry data) { + for (int i = 0; i < filterRules.length; i++) { + data.writeShort(AlleleManager.filterRegistry.getId(filterRules[i])); + } + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 3; j++) { + AlleleFilter filter = genomeFilter[i][j]; + if (filter == null) { + data.writeBoolean(false); + data.writeBoolean(false); + continue; + } + if (filter.activeAllele != null) { + data.writeBoolean(true); + data.writeString(filter.activeAllele.getUID()); + } else { + data.writeBoolean(false); + } + if (filter.inactiveAllele != null) { + data.writeBoolean(true); + data.writeString(filter.inactiveAllele.getUID()); + } else { + data.writeBoolean(false); + } + } + } + } + + @SideOnly(Side.CLIENT) + @Override + public void readGuiData(PacketBufferForestry data) throws IOException { + for (int i = 0; i < filterRules.length; i++) { + filterRules[i] = AlleleManager.filterRegistry.getRule(data.readShort()); + } + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 3; j++) { + AlleleFilter filter = new AlleleFilter(); + if (data.readBoolean()) { + filter.activeAllele = AlleleManager.alleleRegistry.getAllele(data.readString()); + } + if (data.readBoolean()) { + filter.inactiveAllele = AlleleManager.alleleRegistry.getAllele(data.readString()); + } + genomeFilter[i][j] = filter; + } + } + } + + public void sendToPlayers(WorldServer server, EntityPlayer entityPlayer) { + for (EntityPlayer player : server.playerEntities) { + if (player != entityPlayer && player.openContainer instanceof ContainerGeneticFilter) { + if (((ContainerGeneticFilter) entityPlayer.openContainer).hasSameTile((ContainerGeneticFilter) player.openContainer)) { + ((ContainerGeneticFilter) player.openContainer).setGuiNeedsUpdate(true); + } + } + } + } + + @Override + protected void updateServerSide() { + if (updateOnInterval(TRANSFER_DELAY)) { + for (EnumFacing facing : EnumFacing.VALUES) { + ItemStack stack = getStackInSlot(facing.getIndex()); + if (stack.isEmpty()) { + continue; + } + ItemStack transferredStack = transferItem(stack, facing); + int remaining = stack.getCount() - transferredStack.getCount(); + if (remaining > 0) { + stack = stack.copy(); + stack.setCount(remaining); + ItemStackUtil.dropItemStackAsEntity(stack.copy(), world, pos.getX(), pos.getY() + 0.5F, pos.getZ()); + } + setInventorySlotContents(facing.getIndex(), ItemStack.EMPTY); + } + } + } + + public boolean isConnected(EnumFacing facing) { + if (inventoryCache.getAdjacentInventory(facing) != null) { + return true; + } + TileEntity tileEntity = world.getTileEntity(pos.offset(facing)); + return TileUtil.getInventoryFromTile(tileEntity, facing.getOpposite()) != null; + } + + private ItemStack transferItem(ItemStack itemStack, EnumFacing facing) { + IItemHandler itemHandler = inventoryCache.getAdjacentInventory(facing); + if (itemHandler == null) { + return ItemStack.EMPTY; + } + ItemStack transferredStack = ItemHandlerHelper.insertItemStacked(itemHandler, itemStack.copy(), true); + if (transferredStack.getCount() == itemStack.getCount()) { + return ItemStack.EMPTY; + } + transferredStack = ItemHandlerHelper.insertItemStacked(itemHandler, itemStack.copy(), false); + if (transferredStack.isEmpty()) { + return itemStack; + } + ItemStack copy = itemStack.copy(); + copy.setCount(itemStack.getCount() - transferredStack.getCount()); + return copy; + } + + public Collection getValidDirections(ItemStack itemStack, EnumFacing from) { + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(itemStack); + IIndividual individual = null; + ISpeciesType type = null; + if (root != null) { + individual = root.getMember(itemStack); + type = root.getType(itemStack); + } + IFilterData filterData = new FilterData(root, individual, type); + List validFacings = new LinkedList<>(); + for (EnumFacing facing : EnumFacing.VALUES) { + if (facing == from) { + continue; + } + if (isValidFacing(facing, itemStack, filterData)) { + validFacings.add(facing); + } + } + return validFacings; + } + + private boolean isValidFacing(EnumFacing facing, ItemStack itemStack, IFilterData filterData) { + if (inventoryCache.getAdjacentInventory(facing) == null) { + return false; + } + IFilterRule rule = getRule(facing); + if (rule == DefaultFilterRule.CLOSED) { + return false; + } + if (rule == DefaultFilterRule.ITEM && !filterData.isPresent()) { + return true; + } + String requiredRoot = rule.getRootUID(); + if (requiredRoot != null && (!filterData.isPresent() || !filterData.getRoot().getUID().equals(requiredRoot))) { + return false; + } + if (rule == DefaultFilterRule.ANYTHING || rule.isValid(itemStack, filterData)) { + if (filterData.isPresent()) { + IIndividual ind = filterData.getIndividual(); + IGenome genome = ind.getGenome(); + IAllele active = genome.getPrimary(); + IAllele inactive = genome.getSecondary(); + if (!isValidGenome(facing, active.getUID(), inactive.getUID())) { + return false; + } + } + return true; + } + return false; + } + + private boolean isValidGenome(EnumFacing orientation, String activeUID, String inactiveUID) { + AlleleFilter[] directionFilters = genomeFilter[orientation.ordinal()]; + + if (directionFilters == null) { + return true; + } + + boolean foundFilter = false; + for (int i = 0; i < 3; i++) { + AlleleFilter filter = directionFilters[i]; + if (filter != null && !filter.isEmpty()) { + foundFilter = true; + if (!filter.isEmpty() && filter.isValid(activeUID, inactiveUID)) { + return true; + } + } + } + return !foundFilter; + } + + public IFilterRule getRule(EnumFacing facing) { + return filterRules[facing.ordinal()]; + } + + public boolean setRule(EnumFacing facing, IFilterRule rule) { + if (filterRules[facing.ordinal()] != rule) { + filterRules[facing.ordinal()] = rule; + return true; + } + return false; + } + + @Nullable + public AlleleFilter getGenomeFilter(EnumFacing facing, int index) { + return genomeFilter[facing.ordinal()][index]; + } + + public boolean setGenomeFilter(EnumFacing facing, int index, boolean active, @Nullable IAllele allele) { + AlleleFilter filter = genomeFilter[facing.ordinal()][index]; + if (filter == null) { + filter = genomeFilter[facing.ordinal()][index] = new AlleleFilter(); + } + boolean set; + if (active) { + set = filter.activeAllele != allele; + filter.activeAllele = allele; + } else { + set = filter.inactiveAllele != allele; + filter.inactiveAllele = allele; + } + return set; + } + + @SideOnly(Side.CLIENT) + @Nullable + @Override + public GuiContainer getGui(EntityPlayer player, int data) { + return new GuiGeneticFilter(this, player.inventory); + } + + @Nullable + @Override + public Container getContainer(EntityPlayer player, int data) { + return new ContainerGeneticFilter(this, player.inventory); + } + + @Nullable + @Override + public T getCapability(Capability capability, @Nullable EnumFacing facing) { + if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && facing != null) { + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(new ItemHandlerFilter(this, facing)); + } + return super.getCapability(capability, facing); + } + + @Override + public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); + } +} diff --git a/src/main/java/forestry/sorting/tiles/package-info.java b/src/main/java/forestry/sorting/tiles/package-info.java new file mode 100644 index 000000000..13c877649 --- /dev/null +++ b/src/main/java/forestry/sorting/tiles/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.sorting.tiles; + +import javax.annotation.ParametersAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/resources/assets/forestry/blockstates/genetic_filter.json b/src/main/resources/assets/forestry/blockstates/genetic_filter.json new file mode 100644 index 000000000..bb2146a69 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/genetic_filter.json @@ -0,0 +1,23 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:filter/filter_center" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:filter/filter_north" } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:filter/filter_east", "y": 90 } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:filter/filter_south", "y": 180 } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:filter/filter_west", "y": 270 } + }, + { "when": { "up": "true" }, + "apply": { "model": "forestry:filter/filter_up", "x": -90 } + }, + { "when": { "down": "true" }, + "apply": { "model": "forestry:filter/filter_down", "x": 90 } + } + ] +} diff --git a/src/main/resources/assets/forestry/models/block/filter/filter_center.json b/src/main/resources/assets/forestry/models/block/filter/filter_center.json new file mode 100644 index 000000000..49b062717 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/filter/filter_center.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "forestry:blocks/genetic_filter_particle", + "texture": "forestry:blocks/genetic_filter" + }, + "elements": [ + { + "from": [ 5, 5, 5 ], + "to": [ 11, 11, 11 ], + "faces": { + "down": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#texture", "rotation": 270 }, + "north": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#texture", "rotation": 270 }, + "south": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#texture", "rotation": 270 }, + "west": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#texture", "rotation": 270 }, + "east": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#texture", "rotation": 270 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/filter/filter_down.json b/src/main/resources/assets/forestry/models/block/filter/filter_down.json new file mode 100644 index 000000000..3c3e4bb5f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/filter/filter_down.json @@ -0,0 +1,6 @@ +{ + "parent": "forestry:block/filter/filter_side", + "textures": { + "wool": "blocks/wool_colored_black" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/filter/filter_east.json b/src/main/resources/assets/forestry/models/block/filter/filter_east.json new file mode 100644 index 000000000..9ad0fbd8d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/filter/filter_east.json @@ -0,0 +1,6 @@ +{ + "parent": "forestry:block/filter/filter_side", + "textures": { + "wool": "blocks/wool_colored_yellow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/filter/filter_north.json b/src/main/resources/assets/forestry/models/block/filter/filter_north.json new file mode 100644 index 000000000..3cc0e8eb0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/filter/filter_north.json @@ -0,0 +1,6 @@ +{ + "parent": "forestry:block/filter/filter_side", + "textures": { + "wool": "blocks/wool_colored_red" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/filter/filter_side.json b/src/main/resources/assets/forestry/models/block/filter/filter_side.json new file mode 100644 index 000000000..5689ce894 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/filter/filter_side.json @@ -0,0 +1,41 @@ +{ + "textures": { + "filter": "forestry:blocks/genetic_filter" + }, + "elements": [ + { + "from": [ 4, 4, 0 ], + "to": [ 12, 12, 1 ], + "faces": { + "down": { "uv": [ 2, 5.5, 6, 6 ], "texture": "#filter" }, + "up": { "uv": [ 2, 2, 6, 2.5 ], "texture": "#filter" }, + "north": { "uv": [ 2, 2, 6, 6 ], "texture": "#filter" }, + "south": { "uv": [ 2, 2, 6, 6 ], "texture": "#filter" }, + "west": { "uv": [ 2, 2, 2.5, 6 ], "texture": "#filter" }, + "east": { "uv": [ 5.5, 2, 6, 6 ], "texture": "#filter" } + } + }, + { + "from": [ 5, 5, 2 ], + "to": [ 11, 11, 5 ], + "faces": { + "down": { "uv": [ 2.5, 13, 4, 15.5 ], "texture": "#filter", "rotation": 90 }, + "up": { "uv": [ 4, 15.5, 2.5, 13 ], "texture": "#filter", "rotation": 90 }, + "west": { "uv": [ 2.5, 13, 4, 15.5 ], "texture": "#filter" }, + "east": { "uv": [ 2.5, 13, 4, 15.5 ], "texture": "#filter" } + } + }, + { + "from": [ 4.5, 4.5, 1 ], + "to": [ 11.5, 11.5, 2 ], + "faces": { + "down": { "uv": [ 5, 12, 11, 13 ], "texture": "#wool" }, + "up": { "uv": [ 5, 3, 11, 4 ], "texture": "#wool" }, + "north": { "uv": [ 5, 5, 11, 11 ], "texture": "#wool" }, + "south": { "uv": [ 5, 5, 11, 11 ], "texture": "#wool" }, + "west": { "uv": [ 3, 5, 4, 11 ], "texture": "#wool" }, + "east": { "uv": [ 12, 5, 13, 11 ], "texture": "#wool" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/filter/filter_south.json b/src/main/resources/assets/forestry/models/block/filter/filter_south.json new file mode 100644 index 000000000..32d1159af --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/filter/filter_south.json @@ -0,0 +1,6 @@ +{ + "parent": "forestry:block/filter/filter_side", + "textures": { + "wool": "blocks/wool_colored_blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/filter/filter_up.json b/src/main/resources/assets/forestry/models/block/filter/filter_up.json new file mode 100644 index 000000000..b92cae26b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/filter/filter_up.json @@ -0,0 +1,6 @@ +{ + "parent": "forestry:block/filter/filter_side", + "textures": { + "wool": "blocks/wool_colored_white" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/filter/filter_west.json b/src/main/resources/assets/forestry/models/block/filter/filter_west.json new file mode 100644 index 000000000..ec2a2dbee --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/filter/filter_west.json @@ -0,0 +1,6 @@ +{ + "parent": "forestry:block/filter/filter_side", + "textures": { + "wool": "blocks/wool_colored_green" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/e_particle.png b/src/main/resources/assets/forestry/models/item/e_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..e557878f9b0081df0e6c571ed915f4780bf1a2fc GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|X`U{QAsV7vCj@daC~~-LPd)$i z?$?xTj^-IIp9ACFK7V={aJAiXe!J@v0mIGT4Z3dBCY+nlAN}mLRowa~J3GYg{eRVX zXUUaN&3PXSznt{pUt?*oMTj?KX|GSjMcIr5t;EiVqsx9UI;{|T9DHPlG0;W^Pgg&e IbxsLQ03WwL?f?J) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/models/item/genetic_filter.json b/src/main/resources/assets/forestry/models/item/genetic_filter.json new file mode 100644 index 000000000..409add3e8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/genetic_filter.json @@ -0,0 +1,121 @@ +{ + "textures": { + "filter": "forestry:blocks/genetic_filter", + "wool": "blocks/wool_colored_red", + "wool_blue": "blocks/wool_colored_blue" + }, + "elements": [ + { + "from": [ 4, 4, 0 ], + "to": [ 12, 12, 1 ], + "faces": { + "down": { "uv": [ 2, 5.5, 6, 6 ], "texture": "#filter" }, + "up": { "uv": [ 2, 2, 6, 2.5 ], "texture": "#filter" }, + "north": { "uv": [ 2, 2, 6, 6 ], "texture": "#filter" }, + "south": { "uv": [ 2, 2, 6, 6 ], "texture": "#filter" }, + "west": { "uv": [ 2, 2, 2.5, 6 ], "texture": "#filter" }, + "east": { "uv": [ 5.5, 2, 6, 6 ], "texture": "#filter" } + } + }, + { + "from": [ 5, 5, 2 ], + "to": [ 11, 11, 5 ], + "faces": { + "down": { "uv": [ 2.5, 13, 4, 15.5 ], "texture": "#filter", "rotation": 90 }, + "up": { "uv": [ 4, 15.5, 2.5, 13 ], "texture": "#filter", "rotation": 90 }, + "west": { "uv": [ 2.5, 13, 4, 15.5 ], "texture": "#filter" }, + "east": { "uv": [ 2.5, 13, 4, 15.5 ], "texture": "#filter" } + } + }, + { + "from": [ 4.5, 4.5, 1 ], + "to": [ 11.5, 11.5, 2 ], + "faces": { + "down": { "uv": [ 5, 12, 11, 13 ], "texture": "#wool" }, + "up": { "uv": [ 5, 3, 11, 4 ], "texture": "#wool" }, + "north": { "uv": [ 5, 5, 11, 11 ], "texture": "#wool" }, + "south": { "uv": [ 5, 5, 11, 11 ], "texture": "#wool" }, + "west": { "uv": [ 3, 5, 4, 11 ], "texture": "#wool" }, + "east": { "uv": [ 12, 5, 13, 11 ], "texture": "#wool" } + } + }, + { + "from": [ 5, 5, 11 ], + "to": [ 11, 11, 14 ], + "faces": { + "down": { "uv": [ 2.5, 13, 4, 15.5 ], "texture": "#filter", "rotation": 90 }, + "up": { "uv": [ 4, 15.5, 2.5, 13 ], "texture": "#filter", "rotation": 90 }, + "west": { "uv": [ 2.5, 13, 4, 15.5 ], "texture": "#filter" }, + "east": { "uv": [ 2.5, 13, 4, 15.5 ], "texture": "#filter" } + } + }, + { + "from": [ 4.5, 4.5, 14 ], + "to": [ 11.5, 11.5, 15 ], + "faces": { + "down": { "uv": [ 5, 12, 11, 13 ], "texture": "#wool_blue" }, + "up": { "uv": [ 5, 3, 11, 4 ], "texture": "#wool_blue" }, + "north": { "uv": [ 5, 5, 11, 11 ], "texture": "#wool_blue" }, + "south": { "uv": [ 5, 5, 11, 11 ], "texture": "#wool_blue" }, + "west": { "uv": [ 3, 5, 4, 11 ], "texture": "#wool_blue" }, + "east": { "uv": [ 12, 5, 13, 11 ], "texture": "#wool_blue" } + } + }, + { + "from": [ 4, 4, 15 ], + "to": [ 12, 12, 16 ], + "faces": { + "down": { "uv": [ 2, 5.5, 6, 6 ], "texture": "#filter" }, + "up": { "uv": [ 2, 2, 6, 2.5 ], "texture": "#filter" }, + "north": { "uv": [ 2, 2, 6, 6 ], "texture": "#filter" }, + "south": { "uv": [ 2, 2, 6, 6 ], "texture": "#filter" }, + "west": { "uv": [ 2, 2, 2.5, 6 ], "texture": "#filter" }, + "east": { "uv": [ 5.5, 2, 6, 6 ], "texture": "#filter" } + } + }, + { + "from": [ 5, 5, 5 ], + "to": [ 11, 11, 11 ], + "faces": { + "down": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#filter" }, + "up": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#filter" }, + "north": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#filter" }, + "south": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#filter" }, + "west": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#filter" }, + "east": { "uv": [ 10.5, 13, 13, 15.5 ], "texture": "#filter" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "thirdperson_lefthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 45, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "gui": { + "rotation": [ 30, 135, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + }, + "ground": { + "translation": [ 0, 3, 0 ], + "scale": [ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, -90, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/blocks/genetic_filter.png b/src/main/resources/assets/forestry/textures/blocks/genetic_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..2b07b0cffc50228651579920e27a2cf7d83f4fc6 GIT binary patch literal 634 zcmV-=0)_pFP)3*3z3T-c1pyL5sn~)vRGc7}Kvd)mZ~!7fm)w8@q@Y0D0*L|& z6lv3?p@OW|_S&&$hQe#df7Yv!NP(37D*Mg8H{bVWyzhf8ZaYLfus_{1lfVbS7=zLV z*O36s7cpn&7vd%fxb1-N4~fFKSX^zKDh)s|_N|JRBI*MA$ae_1jwD?@=c|qDYc`k! zekB4R1@7G$+jYQb-PkD06$96))@)F(QResMb_fV58_IvBef!+%iW5@Z$N@)SXaiEWZ7iS^vfEPxnkP_E6do#YwM|a@PevyxLt`^x*Bx zT3Ij}a`bYSd6aSdx&L=-El!eMPeI>v8}HVwm69aQ@m#TSh^_6wyVF07DQH?#an)k# zzAuUs0M5=Ys;T<^lj-DH5fB2Du6aOXXxT$1fzR>l2ZYOs_6*(&cNtzeuKakaPJ1(Te_gpT+Dyq3oW)QOWMbyQuS+2~7*M%l*U{l*Vr;%GNlyzd%xq?N>YyxFx8as6o z9x!m8nQ@Upym7VTi(MBP+4gb>&Mn>@Ki~3iH8aC>Ua#=-p15y7dl)=j{an^LB{Ts5 DrAR+4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/analyzer/butterfly.png b/src/main/resources/assets/forestry/textures/gui/analyzer/butterfly.png new file mode 100644 index 0000000000000000000000000000000000000000..46bc2295232f03ad77337e5e66c802b56bb87ad0 GIT binary patch literal 754 zcmVDB5gY2)8APhhikCePFNe+W{pl==?b@m4)veV?If-~% z%(NR^La4magV_SRq{6dQhNUe*YF8NeO0n@sOZnrG#yt&9Ygyi2gV15s<`7Cv^6isN z+C_PQ0iX%ZD6lNF0GI&_AwUTMW&k4?MEMfm*KubQdH`}#;^mY8&;T6AdF&&uCcjEX z2UEBig{BFl=OCqrWtmL=$nxPul5B=AIi+q1#2A2PZHfu`pyjx)WUr+c0+4lb1T3Ah zNEAC%h|pkWN>Wf@BUB(&8n#Zm_trlMwm!vh?{Dw{48u5ISmhC26viwFFmU?=@81kz zPRtN!XrsQVh{9rzY&z4Bn(#V-mrn2c*$Du??@J{Wp%RmUJMS3ixqHp|IWAHo^Ua56 zE|GZS5h~Mg92eJh)t}s4fe_j+DItC{!SMAvmvW;QI%kzGPbDsh-V|3uC|Pw(XbTS`795)MMcbYXN4LgK0xa0wFY-z%xA)BvHM?SY kV$H5tp0|2uzW#sl8?%=CQ+tG#FaQ7m07*qoM6N<$g6Wn~Gynhq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/analyzer/caterpillar.png b/src/main/resources/assets/forestry/textures/gui/analyzer/caterpillar.png new file mode 100644 index 0000000000000000000000000000000000000000..1423dcb33202df2a032fb8fbab24fbea2526aa4f GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPdBZs)M$`^lgW1!G)PZ!4!i_>=}Z}ehz6lnV&`EgRX zM_GRUdz~7YY(ekSU+fw=qK-NVd5Q)~PvqFwH&2}Z;GsiKt~dU^?ep$ZU2>*`+4z6W zA7kbmzc*#pm(IQCR)5`L;JxkVmdU~lY1$nt%078NYIkwxl;=La_xYsj=iFSyHh%8u z4EphDUcHKtprwZPOe^j7)T0`we6ugb&MTbqsvy&MhShD8xFu1GSQrXsr*HcI=~U#y zA1`fpDLp(~y_A9H+15F)=E+=tUpT9MT4i#!#WuB`HJs|Zj;Bsq;TV4HMBvwBoxU#} za~L1a4r#93`>RXcEVt`?$$aOMf*R-El;9t7B2}C0R{tur>mdK II;Vst0L34cnE(I) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/analyzer/cocoon.png b/src/main/resources/assets/forestry/textures/gui/analyzer/cocoon.png new file mode 100644 index 0000000000000000000000000000000000000000..ca511d92b6f7917a08afa3423513b6615282037e GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPdBZs)WHP;qrO9lo;Mo$;V5R22v2@+cl+;f>MI8%+= zVn)V4^(AebvmboPT-(C~1o`$g2_Udyt**j7(YbSvf<-Sc+xEx4Cgt({Rjc;=2Pv!D z=NG|yQ0vCMxDWrYpa1`VzJ2Y<6Q_=S`TuUOde7}`@`qMUW1YQV;X=vgz0J&z_uKE6 zD9gWn^2F)ViHWzrIrF$k7ks>=+IGAAoxz@pUy~l5e;?1YJfB$>$yzZT*Q7a##C}a#+xptZ13ORT&DaLvrHBq+0)>E&K=|zoPH_nhi?hMBHTR`wYUEe&a06*73R~ssM;! zLAhHE`ZE23;xdI`j#AiE9e%i+^FaiFnlpVc7GQ3{TY{Fg(S)c3;9Hr6rkJeVF31nd zG*y@Wao_8gB81l2WCVP8)BpeyfFxwRUN@2=aJxLqhN`l?)YqO(gUE^?W!spx^$Vcu z$tVtYX1-b^;&WVn9H-@Z9Lv8>V7b$et#4q)mj z6qiiK6dn2ckWBl`mTX zv`wcO1ZSxL@+x}!a?4|l07XXz(r=tw8C~x455@la|Dl61{vZ7WqhZF;g=F}>00000 LNkvXXu0mjfDMK?e literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/analyzer/pollen.png b/src/main/resources/assets/forestry/textures/gui/analyzer/pollen.png new file mode 100644 index 0000000000000000000000000000000000000000..ea469c25729827280950d53f133ce965d4d7f92a GIT binary patch literal 415 zcmV;Q0bu@#P)0sn;-)ZZY)MWlP;D2Nri z)PTdqShVEpIF!`6VwW)t2QPcQ#-Q!*-LL4yHE|=JEhj1-Pl~bJ+6}UZk zrAz|5?(zQhGHYvj&dm|MJp@RiL2hAHh2IV*Xw`J!rPYU`G62HL&OCaZh>c^xUaJof zP5*;ZL(tucByGJwNd)fRe8PVWKnmcPl3YttsUfnT;98Oaz<&w>0y(B6ZKFV(Ox9#> zp==3qjwCH^=25%QS>6X2A272FQ}EW|X#Z*SsT#k!Up4-Tz5vt3ajyLRdj9|b002ov JPDHLkV1j3}u}c5| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/analyzer/sapling.png b/src/main/resources/assets/forestry/textures/gui/analyzer/sapling.png new file mode 100644 index 0000000000000000000000000000000000000000..b58d7c9a9cffaa0570176fe214bf2ba4f6961a47 GIT binary patch literal 553 zcmV+^0@nSBP)(<=9_QcdEc3V|7kl1+memt79}l8 z+&S2m@knDimMkss@o2z!q*KM}ZCm!6hYFxos;2T)7UlMz80mE~9xYcNNl-nQlLyBvM*6tkG8a%+ue!Dk-$ zCIHv3u2Lvmrr%gex=K;F@#vZ~YGsLi%dwcd982nLTa4_Y1pbWUb>IWZ zK5W<(PI_JnQM+1oL301{kA;b2S6-aaDplz>R`_ziFgGpjYNeL#{@(7UMALKn-f1$z r3vVH7-+%ZC+M@TR1%fcT@IwCrLYdy{z7gK`00000NkvXXu0mjfK}Yc( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/analyzer/serum.png b/src/main/resources/assets/forestry/textures/gui/analyzer/serum.png new file mode 100644 index 0000000000000000000000000000000000000000..acafc20232f9e7f318083c2e3c76d388d1048b5d GIT binary patch literal 420 zcmV;V0bBlwP)3O^8A@q!=@1a4 zn~Nr0R8X`j)->lPf@y3w-*(62y?e)le~a7Zf&82=_BSMtCq*Lt(>;x&h{xA=PTCK- zTq|!GMUl9!tI1K5YN&15l(nGD~UkWs2sa-GfeI|NBn;xsM% zbgsZ)Fu;g_Wg&nh35d)tU_`*S8Lhcs3@JiY34)QDh`1TB{lz;84p2mkN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/analyzer/tree.png b/src/main/resources/assets/forestry/textures/gui/analyzer/tree.png new file mode 100644 index 0000000000000000000000000000000000000000..a917f9a921d25b5f4cd43352590c044f78d96c48 GIT binary patch literal 460 zcmV;-0WFmg)ci0a-~z zK~y-)y;Ctu!%z_ZUJwzB8fZXNP)D7Lp-T}-en4C*n7MgcD2!l6}(9YWGm8_oW4{ucnboEuiJhLpYO=w{@~MW)dSg zra_KrkjRA!+shF9Yc?KmCYA;OCDTB;-cK;h?e2|iAJm8E?v$I&p z(Qx#MR=bCX?QbQxHtT?1-rmP-s`se?gLpXeLVo~&jp%hk0000+M}fze5fp$37M@ z&pNT}UB^6zy^Lx(u?5UeS)}wH96Avut~1*sX&1AW$Idws=~|Z``U;!~nDl>p!^<<> ze`egYxzeV<@pp+F$4cG5DLRbjY#BH0;_%p$Qliah1hf|j9^7cy68mIjY+v%Rh*uHK zMIU=PB-+!@YbD>^XOR|^ymGM~+ffItJcwcjhE?1Vdi&S#f9{hk&P?E4^631lGMCT) zn(wWsj6Z5PS<3sHpvTdEsN#lKOfNdp_FC@^+&r%Q+v zuUf3;D|*}~OXsG$f@nMwL=I@p0_9oT)_rmFjn?X$c_m^~zk}93HmGEXxP$u^iG8nn zqj*APj8|?#mqao;?Maf?(4bY{7+_iOsviEyEdHpNSD|w+1m{t7LKai#JO(q5Eu7+UdniKLL%B53ET%bY>R!UY% zFt)5zopr0Ht>Dr~m)} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/filter_selection.png b/src/main/resources/assets/forestry/textures/gui/filter_selection.png new file mode 100644 index 0000000000000000000000000000000000000000..8f7aa460c71f097fc3a7ac95a7cd4ee3300a101e GIT binary patch literal 736 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD*&i`-h?-b&xJRvEU|`Diba4!+xb^mSU|y4f%z=mX z;^&Vv?{(8py2M<-%y-E4NyOdN%4w23+Y|P`Kg+^%?NjiDWgQu7w{~AiwXQ{Lb}2M=)?OC@?fY7y|z|Z%j>;SadB*AugvU<@G|VSSexG6xb57_`8pa>@?l?lrKdCR zW@mW5k9|Vi&c74?a52aVGYBv^fC7$%Y7CYG0#H}OolgwogVA(d>FGg0FJ7sT-h2L~ zFXIWz82rwJ=e_i}1 z@{+5-TUJ+ Date: Tue, 9 Jan 2018 03:05:35 +0100 Subject: [PATCH 4/9] Remove unused texture --- .../assets/forestry/models/item/e_particle.png | Bin 159 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/forestry/models/item/e_particle.png diff --git a/src/main/resources/assets/forestry/models/item/e_particle.png b/src/main/resources/assets/forestry/models/item/e_particle.png deleted file mode 100644 index e557878f9b0081df0e6c571ed915f4780bf1a2fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|X`U{QAsV7vCj@daC~~-LPd)$i z?$?xTj^-IIp9ACFK7V={aJAiXe!J@v0mIGT4Z3dBCY+nlAN}mLRowa~J3GYg{eRVX zXUUaN&3PXSznt{pUt?*oMTj?KX|GSjMcIr5t;EiVqsx9UI;{|T9DHPlG0;W^Pgg&e IbxsLQ03WwL?f?J) From 85f413f857fe9935c6aff8c0426f9436f0fc5703 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 9 Jan 2018 13:54:47 +0100 Subject: [PATCH 5/9] Improve Filter collision box --- .../sorting/blocks/BlockGeneticFilter.java | 80 +++++++++++++++++-- 1 file changed, 73 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/sorting/blocks/BlockGeneticFilter.java b/src/main/java/forestry/sorting/blocks/BlockGeneticFilter.java index 35df1193d..2868a6e50 100644 --- a/src/main/java/forestry/sorting/blocks/BlockGeneticFilter.java +++ b/src/main/java/forestry/sorting/blocks/BlockGeneticFilter.java @@ -1,9 +1,14 @@ package forestry.sorting.blocks; +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; @@ -11,9 +16,14 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; @@ -30,13 +40,13 @@ public class BlockGeneticFilter extends BlockForestry implements IItemModelRegis public static final PropertyBool UP = PropertyBool.create("up"); public static final PropertyBool DOWN = PropertyBool.create("down"); - private static final AxisAlignedBB BOX_CENTER = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); - private static final AxisAlignedBB BOX_DOWN = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.25, 0.75); - private static final AxisAlignedBB BOX_UP = new AxisAlignedBB(0.25, 0.75, 0.25, 0.75, 1, 0.75); - private static final AxisAlignedBB BOX_NORTH = new AxisAlignedBB(0.25, 0.25, 0, 0.75, 0.75, 0.25); - private static final AxisAlignedBB BOX_SOUTH = new AxisAlignedBB(0.25, 0.25, 0.75, 0.75, 0.75, 1); - private static final AxisAlignedBB BOX_WEST = new AxisAlignedBB(0, 0.25, 0.25, 0.25, 0.75, 0.75); - private static final AxisAlignedBB BOX_EAST = new AxisAlignedBB(0.75, 0.25, 0.25, 1, 0.75, 0.75); + private static final AxisAlignedBB BOX_CENTER = new AxisAlignedBB(0.3125, 0.3125, 0.3125, 0.6875, 0.6875, 0.6875); + private static final AxisAlignedBB BOX_DOWN = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.3125, 0.75); + private static final AxisAlignedBB BOX_UP = new AxisAlignedBB(0.25, 0.6875, 0.25, 0.75, 1, 0.75); + private static final AxisAlignedBB BOX_NORTH = new AxisAlignedBB(0.25, 0.25, 0, 0.75, 0.75, 0.3125); + private static final AxisAlignedBB BOX_SOUTH = new AxisAlignedBB(0.25, 0.25, 0.6875, 0.75, 0.75, 1); + private static final AxisAlignedBB BOX_WEST = new AxisAlignedBB(0, 0.25, 0.25, 0.3125, 0.75, 0.75); + private static final AxisAlignedBB BOX_EAST = new AxisAlignedBB(0.6875, 0.25, 0.25, 1, 0.75, 0.75); private static final AxisAlignedBB[] BOX_FACES = {BOX_DOWN, BOX_UP, BOX_NORTH, BOX_SOUTH, BOX_WEST, BOX_EAST}; public BlockGeneticFilter() { @@ -49,6 +59,9 @@ public class BlockGeneticFilter extends BlockForestry implements IItemModelRegis .withProperty(WEST, false) .withProperty(UP, false) .withProperty(DOWN, false)); + setLightOpacity(0); + setHardness(0.25f); + setResistance(3.0f); } @Override @@ -79,6 +92,59 @@ public class BlockGeneticFilter extends BlockForestry implements IItemModelRegis return false; } + @Nullable + @Override + public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + RayTraceResult result = rayTrace(pos, start, end, BOX_CENTER); + if(result != null){ + result.subHit = 0; + return result; + } + TileGeneticFilter geneticFilter = TileUtil.getTile(worldIn, pos, TileGeneticFilter.class); + if(geneticFilter != null) { + for (EnumFacing facing : EnumFacing.VALUES) { + if(geneticFilter.isConnected(facing)) { + result = rayTrace(pos, start, end, BOX_FACES[facing.ordinal()]); + if (result != null) { + result.subHit = 1 + facing.ordinal(); + return result; + } + } + } + } + return null; + } + + @Override + public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean isActualState) { + addCollisionBoxToList(pos, entityBox, collidingBoxes, BOX_CENTER); + TileGeneticFilter geneticFilter = TileUtil.getTile(worldIn, pos, TileGeneticFilter.class); + if(geneticFilter != null) { + for (EnumFacing facing : EnumFacing.VALUES) { + if(geneticFilter.isConnected(facing)){ + addCollisionBoxToList(pos, entityBox, collidingBoxes, BOX_FACES[facing.ordinal()]); + } + } + } + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) { + RayTraceResult trace = Minecraft.getMinecraft().objectMouseOver; + if (trace == null || trace.subHit < 0 || !pos.equals(trace.getBlockPos())) { + return FULL_BLOCK_AABB.offset(pos); + } + AxisAlignedBB aabb = FULL_BLOCK_AABB; + int sub = trace.subHit; + if(sub == 0){ + aabb = BOX_CENTER; + }else if(sub < 1 + 6){ + aabb = BOX_FACES[sub - 1]; + } + return aabb.offset(pos); + } + @Override public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, 0); From ed0b884bcedd1b805adb11ce2c8de422aaa4e45d Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 9 Jan 2018 14:17:54 +0100 Subject: [PATCH 6/9] Change default filter rule --- src/main/java/forestry/sorting/FilterRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/sorting/FilterRegistry.java b/src/main/java/forestry/sorting/FilterRegistry.java index c1c9a087d..ed18aef2c 100644 --- a/src/main/java/forestry/sorting/FilterRegistry.java +++ b/src/main/java/forestry/sorting/FilterRegistry.java @@ -28,7 +28,7 @@ public class FilterRegistry implements IFilterRegistry { @Override public IFilterRule getDefaultRule() { - return DefaultFilterRule.ITEM; + return DefaultFilterRule.CLOSED; } @Nullable From 1278c09064509d84a84ae27972581c45489f2d14 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 9 Jan 2018 19:45:46 +0100 Subject: [PATCH 7/9] Move the filter logic to a separate interface --- .../api/genetics/GeneticCapabilities.java | 17 ++ .../forestry/api/genetics/IFilterLogic.java | 53 +++- .../api/genetics/IFilterRegistry.java | 24 +- .../forestry/api/genetics/IFilterRule.java | 26 +- .../api/genetics/IFilterRuleType.java | 27 ++ .../apiculture/ApicultureFilterLogic.java | 86 ------ .../apiculture/ApicultureFilterRule.java | 98 ++++--- .../apiculture/ApicultureFilterRuleType.java | 88 ++++++ .../forestry/apiculture/ModuleApiculture.java | 2 +- ....java => ArboricultureFilterRuleType.java} | 16 +- .../arboriculture/ModuleArboriculture.java | 2 +- .../java/forestry/core/tiles/TileUtil.java | 11 + .../LepidopterologyFilterLogic.java | 74 ----- .../LepidopterologyFilterRule.java | 86 +++--- .../LepidopterologyFilterRuleType.java | 94 ++++++ .../ModuleLepidopterology.java | 2 +- ...erRule.java => DefaultFilterRuleType.java} | 31 +- .../forestry/sorting/DummyFilterRegistry.java | 23 +- .../forestry/sorting/FakeFilterLogic.java | 99 +++++++ .../java/forestry/sorting/FilterLogic.java | 275 ++++++++++++++++++ .../java/forestry/sorting/FilterRegistry.java | 27 +- .../java/forestry/sorting/ModuleSorting.java | 10 +- .../sorting/gui/widgets/RuleWidget.java | 34 ++- .../sorting/gui/widgets/SpeciesWidget.java | 8 +- .../packets/PacketFilterChangeGenome.java | 12 +- .../packets/PacketFilterChangeRule.java | 22 +- .../sorting/tiles/TileGeneticFilter.java | 177 ++--------- 27 files changed, 899 insertions(+), 525 deletions(-) create mode 100644 src/main/java/forestry/api/genetics/GeneticCapabilities.java create mode 100644 src/main/java/forestry/api/genetics/IFilterRuleType.java delete mode 100644 src/main/java/forestry/apiculture/ApicultureFilterLogic.java create mode 100644 src/main/java/forestry/apiculture/ApicultureFilterRuleType.java rename src/main/java/forestry/arboriculture/{ArboricultureFilterRule.java => ArboricultureFilterRuleType.java} (84%) delete mode 100644 src/main/java/forestry/lepidopterology/LepidopterologyFilterLogic.java create mode 100644 src/main/java/forestry/lepidopterology/LepidopterologyFilterRuleType.java rename src/main/java/forestry/sorting/{DefaultFilterRule.java => DefaultFilterRuleType.java} (76%) create mode 100644 src/main/java/forestry/sorting/FakeFilterLogic.java create mode 100644 src/main/java/forestry/sorting/FilterLogic.java diff --git a/src/main/java/forestry/api/genetics/GeneticCapabilities.java b/src/main/java/forestry/api/genetics/GeneticCapabilities.java new file mode 100644 index 000000000..f4e47bb3a --- /dev/null +++ b/src/main/java/forestry/api/genetics/GeneticCapabilities.java @@ -0,0 +1,17 @@ +/******************************************************************************* + * Copyright 2011-2014 SirSengir + * + * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. + ******************************************************************************/ +package forestry.api.genetics; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; + +public class GeneticCapabilities { + /** + * Capability for {@link IFilterLogic}. + */ + @CapabilityInject(IFilterLogic.class) + public static Capability FILTER_LOGIC; +} diff --git a/src/main/java/forestry/api/genetics/IFilterLogic.java b/src/main/java/forestry/api/genetics/IFilterLogic.java index 7a089ff42..f76506595 100644 --- a/src/main/java/forestry/api/genetics/IFilterLogic.java +++ b/src/main/java/forestry/api/genetics/IFilterLogic.java @@ -1,17 +1,56 @@ package forestry.api.genetics; import javax.annotation.Nullable; +import java.io.IOException; +import java.util.Collection; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.WorldServer; -public interface IFilterLogic { - boolean isValid(ItemStack itemStack, IFilterData data); +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; + +public interface IFilterLogic extends INbtWritable, INbtReadable { + void writeGuiData(PacketBuffer data); + + @SideOnly(Side.CLIENT) + void readGuiData(PacketBuffer data) throws IOException; + + Collection getValidDirections(ItemStack itemStack, EnumFacing from); + + boolean isValid(ItemStack itemStack, EnumFacing facing); + + boolean isValid(EnumFacing facing, ItemStack itemStack, IFilterData filterData); + + boolean isValidAllelePair(EnumFacing orientation, String activeUID, String inactiveUID); + + IFilterRuleType getRule(EnumFacing facing); + + boolean setRule(EnumFacing facing, IFilterRuleType rule); - /** - * If a root with this uid is registered, the filter will only get stack with individuals from this root. - */ @Nullable - default String getRootUID() { - return null; + IAllele getGenomeFilter(EnumFacing facing, int index, boolean active); + + boolean setGenomeFilter(EnumFacing facing, int index, boolean active, @Nullable IAllele allele); + + void sendToServer(EnumFacing facing, int index, boolean active, @Nullable IAllele allele); + + void sendToServer(EnumFacing facing, IFilterRuleType rule); + + INetworkHandler getNetworkHandler(); + + interface INetworkHandler{ + /** + * Sends the data of the logic to the client of all players that have the gui currently open. + * + * @param player The player that changed the filter. + */ + void sendToPlayers(IFilterLogic logic, WorldServer server, EntityPlayer player); } } diff --git a/src/main/java/forestry/api/genetics/IFilterRegistry.java b/src/main/java/forestry/api/genetics/IFilterRegistry.java index 8d27d7583..59ef4dd72 100644 --- a/src/main/java/forestry/api/genetics/IFilterRegistry.java +++ b/src/main/java/forestry/api/genetics/IFilterRegistry.java @@ -3,6 +3,8 @@ package forestry.api.genetics; import javax.annotation.Nullable; import java.util.Collection; +import forestry.api.core.ILocatable; + /** * @since 5.8 */ @@ -10,27 +12,29 @@ public interface IFilterRegistry { /** * Registers a filter rule. */ - void registerFilter(IFilterRule rule); + void registerFilter(IFilterRuleType rule); - Collection getRules(); + Collection getRules(); - IFilterRule getDefaultRule(); + IFilterRuleType getDefaultRule(); @Nullable - IFilterRule getRule(String uid); + IFilterRuleType getRule(String uid); @Nullable - IFilterRule getRule(int id); + IFilterRuleType getRule(int id); - int getId(IFilterRule rule); + int getId(IFilterRuleType rule); - default IFilterRule getRuleOrDefault(String uid){ - IFilterRule rule = getRule(uid); + IFilterLogic createLogic(ILocatable locatable, IFilterLogic.INetworkHandler networkHandler); + + default IFilterRuleType getRuleOrDefault(String uid){ + IFilterRuleType rule = getRule(uid); return rule != null ? rule : getDefaultRule(); } - default IFilterRule getRuleOrDefault(int id){ - IFilterRule rule = getRule(id); + default IFilterRuleType getRuleOrDefault(int id){ + IFilterRuleType rule = getRule(id); return rule != null ? rule : getDefaultRule(); } } diff --git a/src/main/java/forestry/api/genetics/IFilterRule.java b/src/main/java/forestry/api/genetics/IFilterRule.java index c429db331..5183734a7 100644 --- a/src/main/java/forestry/api/genetics/IFilterRule.java +++ b/src/main/java/forestry/api/genetics/IFilterRule.java @@ -1,25 +1,17 @@ package forestry.api.genetics; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import javax.annotation.Nullable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraft.item.ItemStack; -/** - * @since 5.8 - */ -public interface IFilterRule extends IFilterLogic { - void addLogic(IFilterLogic logic); +public interface IFilterRule { + boolean isValid(ItemStack itemStack, IFilterData data); /** - * @return A unique identifier for the rule. + * If a root with this uid is registered, the filter will only get stack with individuals from this root. */ - String getUID(); - - @SideOnly(Side.CLIENT) - TextureAtlasSprite getSprite(); - - @SideOnly(Side.CLIENT) - ResourceLocation getTextureMap(); + @Nullable + default String getRootUID() { + return null; + } } diff --git a/src/main/java/forestry/api/genetics/IFilterRuleType.java b/src/main/java/forestry/api/genetics/IFilterRuleType.java new file mode 100644 index 000000000..33f7f09b7 --- /dev/null +++ b/src/main/java/forestry/api/genetics/IFilterRuleType.java @@ -0,0 +1,27 @@ +package forestry.api.genetics; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public interface IFilterRuleType extends IFilterRule { + void addLogic(IFilterRule logic); + + /** + * @return True if a other logic can be added to this type. + */ + boolean isContainer(); + + /** + * @return A unique identifier for the rule. + */ + String getUID(); + + @SideOnly(Side.CLIENT) + TextureAtlasSprite getSprite(); + + @SideOnly(Side.CLIENT) + ResourceLocation getTextureMap(); +} diff --git a/src/main/java/forestry/apiculture/ApicultureFilterLogic.java b/src/main/java/forestry/apiculture/ApicultureFilterLogic.java deleted file mode 100644 index ba3c81398..000000000 --- a/src/main/java/forestry/apiculture/ApicultureFilterLogic.java +++ /dev/null @@ -1,86 +0,0 @@ -package forestry.apiculture; - -import net.minecraft.item.ItemStack; - -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.IBee; -import forestry.api.genetics.IFilterData; -import forestry.api.genetics.IFilterLogic; -import forestry.api.genetics.IFilterRule; -import forestry.api.genetics.IIndividual; -import forestry.sorting.DefaultFilterRule; - -public enum ApicultureFilterLogic implements IFilterLogic { - PURE_BREED(DefaultFilterRule.PURE_BREED){ - @Override - protected boolean isValid(IBee bee) { - return bee.isPureBred(EnumBeeChromosome.SPECIES); - } - }, - NOCTURNAL(DefaultFilterRule.NOCTURNAL){ - @Override - protected boolean isValid(IBee bee) { - return bee.getGenome().getNeverSleeps(); - } - }, - PURE_NOCTURNAL(DefaultFilterRule.PURE_NOCTURNAL){ - @Override - protected boolean isValid(IBee bee) { - return bee.getGenome().getNeverSleeps() && bee.isPureBred(EnumBeeChromosome.NEVER_SLEEPS); - } - }, - FLYER(DefaultFilterRule.FLYER){ - @Override - protected boolean isValid(IBee bee) { - return bee.getGenome().getToleratesRain(); - } - }, - PURE_FLYER((DefaultFilterRule.PURE_FLYER)){ - @Override - protected boolean isValid(IBee bee) { - return bee.getGenome().getToleratesRain() && bee.isPureBred(EnumBeeChromosome.TOLERATES_RAIN); - } - }, - CAVE(DefaultFilterRule.CAVE){ - @Override - protected boolean isValid(IBee bee) { - return bee.getGenome().getCaveDwelling(); - } - }, - PURE_CAVE(DefaultFilterRule.PURE_CAVE){ - @Override - protected boolean isValid(IBee bee) { - return bee.getGenome().getCaveDwelling() && bee.isPureBred(EnumBeeChromosome.CAVE_DWELLING); - } - }; - - ApicultureFilterLogic(IFilterRule rule) { - rule.addLogic(this); - } - - public static void init() { - } - - @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - if(!data.isPresent()){ - return false; - } - IIndividual individual = data.getIndividual(); - if(!(individual instanceof IBee)){ - return false; - } - return isValid((IBee)individual); - } - - protected boolean isValid(IBee bee){ - return false; - } - - @Override - public String getRootUID() { - return BeeManager.beeRoot.getUID(); - } - -} diff --git a/src/main/java/forestry/apiculture/ApicultureFilterRule.java b/src/main/java/forestry/apiculture/ApicultureFilterRule.java index ed1afa79f..44054ed50 100644 --- a/src/main/java/forestry/apiculture/ApicultureFilterRule.java +++ b/src/main/java/forestry/apiculture/ApicultureFilterRule.java @@ -1,75 +1,81 @@ package forestry.apiculture; -import java.util.Locale; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.genetics.AlleleManager; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IBee; import forestry.api.genetics.IFilterData; -import forestry.api.genetics.IFilterLogic; import forestry.api.genetics.IFilterRule; -import forestry.core.render.TextureManagerForestry; +import forestry.api.genetics.IFilterRuleType; +import forestry.api.genetics.IIndividual; +import forestry.sorting.DefaultFilterRuleType; public enum ApicultureFilterRule implements IFilterRule { - BEE{ + PURE_BREED(DefaultFilterRuleType.PURE_BREED){ @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - return data.isPresent(); + protected boolean isValid(IBee bee) { + return bee.isPureBred(EnumBeeChromosome.SPECIES); } }, - DRONE{ + NOCTURNAL(DefaultFilterRuleType.NOCTURNAL){ @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - return data.isPresent() && data.getType() == EnumBeeType.DRONE; + protected boolean isValid(IBee bee) { + return bee.getGenome().getNeverSleeps(); } }, - PRINCESS{ + PURE_NOCTURNAL(DefaultFilterRuleType.PURE_NOCTURNAL){ @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - return data.isPresent() && data.getType() == EnumBeeType.PRINCESS; + protected boolean isValid(IBee bee) { + return bee.getGenome().getNeverSleeps() && bee.isPureBred(EnumBeeChromosome.NEVER_SLEEPS); } }, - QUEEN{ + FLYER(DefaultFilterRuleType.FLYER){ @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - return data.isPresent() && data.getType() == EnumBeeType.QUEEN; + protected boolean isValid(IBee bee) { + return bee.getGenome().getToleratesRain(); + } + }, + PURE_FLYER((DefaultFilterRuleType.PURE_FLYER)){ + @Override + protected boolean isValid(IBee bee) { + return bee.getGenome().getToleratesRain() && bee.isPureBred(EnumBeeChromosome.TOLERATES_RAIN); + } + }, + CAVE(DefaultFilterRuleType.CAVE){ + @Override + protected boolean isValid(IBee bee) { + return bee.getGenome().getCaveDwelling(); + } + }, + PURE_CAVE(DefaultFilterRuleType.PURE_CAVE){ + @Override + protected boolean isValid(IBee bee) { + return bee.getGenome().getCaveDwelling() && bee.isPureBred(EnumBeeChromosome.CAVE_DWELLING); } }; - private final String uid; - - ApicultureFilterRule() { - this.uid = "forestry.apiculture." + name().toLowerCase(Locale.ENGLISH); + ApicultureFilterRule(IFilterRuleType rule) { + rule.addLogic(this); } public static void init() { - for (ApicultureFilterRule rule : values()) { - AlleleManager.filterRegistry.registerFilter(rule); + } + + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + if(!data.isPresent()){ + return false; } + IIndividual individual = data.getIndividual(); + if(!(individual instanceof IBee)){ + return false; + } + return isValid((IBee)individual); } - @Override - public void addLogic(IFilterLogic logic) { - throw new IllegalStateException(); - } - - @SideOnly(Side.CLIENT) - @Override - public TextureAtlasSprite getSprite() { - return TextureManagerForestry.getInstance().getDefault("analyzer/" + name().toLowerCase(Locale.ENGLISH)); - } - - @SideOnly(Side.CLIENT) - @Override - public ResourceLocation getTextureMap() { - return TextureManagerForestry.LOCATION_FORESTRY_TEXTURE; + protected boolean isValid(IBee bee){ + return false; } @Override @@ -77,8 +83,4 @@ public enum ApicultureFilterRule implements IFilterRule { return BeeManager.beeRoot.getUID(); } - @Override - public String getUID() { - return uid; - } } diff --git a/src/main/java/forestry/apiculture/ApicultureFilterRuleType.java b/src/main/java/forestry/apiculture/ApicultureFilterRuleType.java new file mode 100644 index 000000000..ce526dd7c --- /dev/null +++ b/src/main/java/forestry/apiculture/ApicultureFilterRuleType.java @@ -0,0 +1,88 @@ +package forestry.apiculture; + +import java.util.Locale; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IFilterRuleType; +import forestry.core.render.TextureManagerForestry; + +public enum ApicultureFilterRuleType implements IFilterRuleType { + BEE{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent(); + } + }, + DRONE{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumBeeType.DRONE; + } + }, + PRINCESS{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumBeeType.PRINCESS; + } + }, + QUEEN{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumBeeType.QUEEN; + } + }; + + private final String uid; + + ApicultureFilterRuleType() { + this.uid = "forestry.apiculture." + name().toLowerCase(Locale.ENGLISH); + } + + public static void init() { + for (ApicultureFilterRuleType rule : values()) { + AlleleManager.filterRegistry.registerFilter(rule); + } + } + + @Override + public void addLogic(IFilterRule logic) { + } + + @Override + public boolean isContainer() { + return false; + } + + @SideOnly(Side.CLIENT) + @Override + public TextureAtlasSprite getSprite() { + return TextureManagerForestry.getInstance().getDefault("analyzer/" + name().toLowerCase(Locale.ENGLISH)); + } + + @SideOnly(Side.CLIENT) + @Override + public ResourceLocation getTextureMap() { + return TextureManagerForestry.LOCATION_FORESTRY_TEXTURE; + } + + @Override + public String getRootUID() { + return BeeManager.beeRoot.getUID(); + } + + @Override + public String getUID() { + return uid; + } +} diff --git a/src/main/java/forestry/apiculture/ModuleApiculture.java b/src/main/java/forestry/apiculture/ModuleApiculture.java index 41e6564a6..c194e8012 100644 --- a/src/main/java/forestry/apiculture/ModuleApiculture.java +++ b/src/main/java/forestry/apiculture/ModuleApiculture.java @@ -234,8 +234,8 @@ public class ModuleApiculture extends BlankForestryModule { ModuleCore.rootCommand.addChildCommand(new CommandBee()); if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.SORTING)){ + ApicultureFilterRuleType.init(); ApicultureFilterRule.init(); - ApicultureFilterLogic.init(); } } diff --git a/src/main/java/forestry/arboriculture/ArboricultureFilterRule.java b/src/main/java/forestry/arboriculture/ArboricultureFilterRuleType.java similarity index 84% rename from src/main/java/forestry/arboriculture/ArboricultureFilterRule.java rename to src/main/java/forestry/arboriculture/ArboricultureFilterRuleType.java index 018f5f145..fd46c3d67 100644 --- a/src/main/java/forestry/arboriculture/ArboricultureFilterRule.java +++ b/src/main/java/forestry/arboriculture/ArboricultureFilterRuleType.java @@ -13,11 +13,11 @@ import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IFilterData; -import forestry.api.genetics.IFilterLogic; import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IFilterRuleType; import forestry.core.render.TextureManagerForestry; -public enum ArboricultureFilterRule implements IFilterRule { +public enum ArboricultureFilterRuleType implements IFilterRuleType { TREE{ @Override public boolean isValid(ItemStack itemStack, IFilterData data) { @@ -39,19 +39,23 @@ public enum ArboricultureFilterRule implements IFilterRule { private final String uid; - ArboricultureFilterRule() { + ArboricultureFilterRuleType() { this.uid = "forestry.arboriculture." + name().toLowerCase(Locale.ENGLISH); } public static void init() { - for (ArboricultureFilterRule rule : values()) { + for (ArboricultureFilterRuleType rule : values()) { AlleleManager.filterRegistry.registerFilter(rule); } } @Override - public void addLogic(IFilterLogic logic) { - throw new IllegalStateException(); + public void addLogic(IFilterRule logic) { + } + + @Override + public boolean isContainer() { + return false; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/arboriculture/ModuleArboriculture.java b/src/main/java/forestry/arboriculture/ModuleArboriculture.java index 015fb1508..be03537a6 100644 --- a/src/main/java/forestry/arboriculture/ModuleArboriculture.java +++ b/src/main/java/forestry/arboriculture/ModuleArboriculture.java @@ -216,7 +216,7 @@ public class ModuleArboriculture extends BlankForestryModule { ModuleCore.rootCommand.addChildCommand(new CommandTree()); if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.SORTING)){ - ArboricultureFilterRule.init(); + ArboricultureFilterRuleType.init(); } } diff --git a/src/main/java/forestry/core/tiles/TileUtil.java b/src/main/java/forestry/core/tiles/TileUtil.java index 83dce238d..dbee3dfbf 100644 --- a/src/main/java/forestry/core/tiles/TileUtil.java +++ b/src/main/java/forestry/core/tiles/TileUtil.java @@ -24,6 +24,8 @@ import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; + +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; @@ -121,4 +123,13 @@ public abstract class TileUtil { return null; } + + @Nullable + public static T getInterface(World world, BlockPos pos, Capability capability, @Nullable EnumFacing facing){ + TileEntity tileEntity = world.getTileEntity(pos); + if(tileEntity == null || !tileEntity.hasCapability(capability, facing)){ + return null; + } + return tileEntity.getCapability(capability, facing); + } } diff --git a/src/main/java/forestry/lepidopterology/LepidopterologyFilterLogic.java b/src/main/java/forestry/lepidopterology/LepidopterologyFilterLogic.java deleted file mode 100644 index 61dfea656..000000000 --- a/src/main/java/forestry/lepidopterology/LepidopterologyFilterLogic.java +++ /dev/null @@ -1,74 +0,0 @@ -package forestry.lepidopterology; - -import net.minecraft.item.ItemStack; - -import forestry.api.genetics.IFilterData; -import forestry.api.genetics.IFilterLogic; -import forestry.api.genetics.IFilterRule; -import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.EnumButterflyChromosome; -import forestry.api.lepidopterology.IButterfly; -import forestry.sorting.DefaultFilterRule; - -public enum LepidopterologyFilterLogic implements IFilterLogic { - PURE_BREED(DefaultFilterRule.PURE_BREED){ - @Override - protected boolean isValid(IButterfly butterfly) { - return butterfly.isPureBred(EnumButterflyChromosome.SPECIES); - } - }, - NOCTURNAL(DefaultFilterRule.NOCTURNAL){ - @Override - protected boolean isValid(IButterfly butterfly) { - return butterfly.getGenome().getNocturnal(); - } - }, - PURE_NOCTURNAL(DefaultFilterRule.PURE_NOCTURNAL){ - @Override - protected boolean isValid(IButterfly butterfly) { - return butterfly.getGenome().getNocturnal() && butterfly.isPureBred(EnumButterflyChromosome.NOCTURNAL); - } - }, - FLYER(DefaultFilterRule.FLYER){ - @Override - protected boolean isValid(IButterfly butterfly) { - return butterfly.getGenome().getTolerantFlyer(); - } - }, - PURE_FLYER(DefaultFilterRule.PURE_FLYER){ - @Override - protected boolean isValid(IButterfly butterfly) { - return butterfly.getGenome().getTolerantFlyer() && butterfly.isPureBred(EnumButterflyChromosome.TOLERANT_FLYER); - } - }; - - LepidopterologyFilterLogic(IFilterRule rule) { - rule.addLogic(this); - } - - public static void init() { - } - - @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - if(!data.isPresent()){ - return false; - } - IIndividual individual = data.getIndividual(); - if(!(individual instanceof IButterfly)){ - return false; - } - return isValid((IButterfly) individual); - } - - protected boolean isValid(IButterfly butterfly){ - return false; - } - - @Override - public String getRootUID() { - return ButterflyManager.butterflyRoot.getUID(); - } - -} diff --git a/src/main/java/forestry/lepidopterology/LepidopterologyFilterRule.java b/src/main/java/forestry/lepidopterology/LepidopterologyFilterRule.java index 8c972f838..5605934bf 100644 --- a/src/main/java/forestry/lepidopterology/LepidopterologyFilterRule.java +++ b/src/main/java/forestry/lepidopterology/LepidopterologyFilterRule.java @@ -1,81 +1,69 @@ package forestry.lepidopterology; -import java.util.Locale; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IFilterData; -import forestry.api.genetics.IFilterLogic; import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IFilterRuleType; +import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.EnumFlutterType; -import forestry.core.render.TextureManagerForestry; +import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.IButterfly; +import forestry.sorting.DefaultFilterRuleType; public enum LepidopterologyFilterRule implements IFilterRule { - FLUTTER{ + PURE_BREED(DefaultFilterRuleType.PURE_BREED){ @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - return data.isPresent(); + protected boolean isValid(IButterfly butterfly) { + return butterfly.isPureBred(EnumButterflyChromosome.SPECIES); } }, - BUTTERFLY{ + NOCTURNAL(DefaultFilterRuleType.NOCTURNAL){ @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - return data.isPresent() && data.getType() == EnumFlutterType.BUTTERFLY; + protected boolean isValid(IButterfly butterfly) { + return butterfly.getGenome().getNocturnal(); } }, - SERUM{ + PURE_NOCTURNAL(DefaultFilterRuleType.PURE_NOCTURNAL){ @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - return data.isPresent() && data.getType() == EnumFlutterType.SERUM; + protected boolean isValid(IButterfly butterfly) { + return butterfly.getGenome().getNocturnal() && butterfly.isPureBred(EnumButterflyChromosome.NOCTURNAL); } }, - CATERPILLAR{ + FLYER(DefaultFilterRuleType.FLYER){ @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - return data.isPresent() && data.getType() == EnumFlutterType.CATERPILLAR; + protected boolean isValid(IButterfly butterfly) { + return butterfly.getGenome().getTolerantFlyer(); } }, - COCOON{ + PURE_FLYER(DefaultFilterRuleType.PURE_FLYER){ @Override - public boolean isValid(ItemStack itemStack, IFilterData data) { - return data.isPresent() && data.getType() == EnumFlutterType.COCOON; + protected boolean isValid(IButterfly butterfly) { + return butterfly.getGenome().getTolerantFlyer() && butterfly.isPureBred(EnumButterflyChromosome.TOLERANT_FLYER); } }; - private final String uid; - - LepidopterologyFilterRule() { - this.uid = "forestry.lepidopterology." + name().toLowerCase(Locale.ENGLISH); + LepidopterologyFilterRule(IFilterRuleType rule) { + rule.addLogic(this); } public static void init() { - for (LepidopterologyFilterRule rule : values()) { - AlleleManager.filterRegistry.registerFilter(rule); + } + + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + if(!data.isPresent()){ + return false; } + IIndividual individual = data.getIndividual(); + if(!(individual instanceof IButterfly)){ + return false; + } + return isValid((IButterfly) individual); } - @Override - public void addLogic(IFilterLogic logic) { - throw new IllegalStateException(); - } - - @SideOnly(Side.CLIENT) - @Override - public TextureAtlasSprite getSprite() { - return TextureManagerForestry.getInstance().getDefault("analyzer/" + name().toLowerCase(Locale.ENGLISH)); - } - - @SideOnly(Side.CLIENT) - @Override - public ResourceLocation getTextureMap() { - return TextureManagerForestry.LOCATION_FORESTRY_TEXTURE; + protected boolean isValid(IButterfly butterfly){ + return false; } @Override @@ -83,8 +71,4 @@ public enum LepidopterologyFilterRule implements IFilterRule { return ButterflyManager.butterflyRoot.getUID(); } - @Override - public String getUID() { - return uid; - } } diff --git a/src/main/java/forestry/lepidopterology/LepidopterologyFilterRuleType.java b/src/main/java/forestry/lepidopterology/LepidopterologyFilterRuleType.java new file mode 100644 index 000000000..cd18908e7 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/LepidopterologyFilterRuleType.java @@ -0,0 +1,94 @@ +package forestry.lepidopterology; + +import java.util.Locale; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IFilterRuleType; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumFlutterType; +import forestry.core.render.TextureManagerForestry; + +public enum LepidopterologyFilterRuleType implements IFilterRuleType { + FLUTTER{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent(); + } + }, + BUTTERFLY{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumFlutterType.BUTTERFLY; + } + }, + SERUM{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumFlutterType.SERUM; + } + }, + CATERPILLAR{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumFlutterType.CATERPILLAR; + } + }, + COCOON{ + @Override + public boolean isValid(ItemStack itemStack, IFilterData data) { + return data.isPresent() && data.getType() == EnumFlutterType.COCOON; + } + }; + + private final String uid; + + LepidopterologyFilterRuleType() { + this.uid = "forestry.lepidopterology." + name().toLowerCase(Locale.ENGLISH); + } + + public static void init() { + for (LepidopterologyFilterRuleType rule : values()) { + AlleleManager.filterRegistry.registerFilter(rule); + } + } + + @Override + public void addLogic(IFilterRule logic) { + } + + @Override + public boolean isContainer() { + return false; + } + + @SideOnly(Side.CLIENT) + @Override + public TextureAtlasSprite getSprite() { + return TextureManagerForestry.getInstance().getDefault("analyzer/" + name().toLowerCase(Locale.ENGLISH)); + } + + @SideOnly(Side.CLIENT) + @Override + public ResourceLocation getTextureMap() { + return TextureManagerForestry.LOCATION_FORESTRY_TEXTURE; + } + + @Override + public String getRootUID() { + return ButterflyManager.butterflyRoot.getUID(); + } + + @Override + public String getUID() { + return uid; + } +} diff --git a/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java b/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java index 20e8e929d..b894e4969 100644 --- a/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java @@ -142,8 +142,8 @@ public class ModuleLepidopterology extends BlankForestryModule { proxy.preInitializeRendering(); if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.SORTING)){ - LepidopterologyFilterLogic.init(); LepidopterologyFilterRule.init(); + LepidopterologyFilterRuleType.init(); } } diff --git a/src/main/java/forestry/sorting/DefaultFilterRule.java b/src/main/java/forestry/sorting/DefaultFilterRuleType.java similarity index 76% rename from src/main/java/forestry/sorting/DefaultFilterRule.java rename to src/main/java/forestry/sorting/DefaultFilterRuleType.java index beebe290f..25b2a9f79 100644 --- a/src/main/java/forestry/sorting/DefaultFilterRule.java +++ b/src/main/java/forestry/sorting/DefaultFilterRuleType.java @@ -13,24 +13,24 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IFilterData; -import forestry.api.genetics.IFilterLogic; import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IFilterRuleType; import forestry.core.render.TextureManagerForestry; -public enum DefaultFilterRule implements IFilterRule { - CLOSED { +public enum DefaultFilterRuleType implements IFilterRuleType { + CLOSED(false) { @Override public boolean isValid(ItemStack itemStack, IFilterData data) { return false; } }, - ANYTHING { + ANYTHING(false) { @Override public boolean isValid(ItemStack itemStack, IFilterData data) { return true; } }, - ITEM { + ITEM(false) { @Override public boolean isValid(ItemStack itemStack, IFilterData data) { return !data.isPresent(); @@ -47,22 +47,28 @@ public enum DefaultFilterRule implements IFilterRule { PURE_FIREPROOF*/; private final String uid; - private final Set logic; + private final Set logic; + private final boolean isContainer; - DefaultFilterRule() { + DefaultFilterRuleType() { + this(true); + } + + DefaultFilterRuleType(boolean isContainer) { this.uid = "forestry.default." + name().toLowerCase(Locale.ENGLISH); this.logic = new HashSet<>(); + this.isContainer = isContainer; } public static void init() { - for (DefaultFilterRule rule : values()) { + for (DefaultFilterRuleType rule : values()) { AlleleManager.filterRegistry.registerFilter(rule); } } @Override public boolean isValid(ItemStack itemStack, IFilterData data) { - for (IFilterLogic logic : logic) { + for (IFilterRule logic : logic) { if (logic.isValid(itemStack, data)) { return true; } @@ -71,13 +77,18 @@ public enum DefaultFilterRule implements IFilterRule { } @Override - public void addLogic(IFilterLogic logic) { + public void addLogic(IFilterRule logic) { if (logic == this) { throw new IllegalArgumentException(); } this.logic.add(logic); } + @Override + public boolean isContainer() { + return isContainer; + } + @SideOnly(Side.CLIENT) @Override public TextureAtlasSprite getSprite() { diff --git a/src/main/java/forestry/sorting/DummyFilterRegistry.java b/src/main/java/forestry/sorting/DummyFilterRegistry.java index e310f6c04..a7aefa1f7 100644 --- a/src/main/java/forestry/sorting/DummyFilterRegistry.java +++ b/src/main/java/forestry/sorting/DummyFilterRegistry.java @@ -4,38 +4,45 @@ import javax.annotation.Nullable; import java.util.Collection; import java.util.Collections; +import forestry.api.core.ILocatable; +import forestry.api.genetics.IFilterLogic; import forestry.api.genetics.IFilterRegistry; -import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IFilterRuleType; public class DummyFilterRegistry implements IFilterRegistry { @Override - public void registerFilter(IFilterRule rule) { + public void registerFilter(IFilterRuleType rule) { } @Override - public Collection getRules() { + public Collection getRules() { return Collections.emptySet(); } @Override - public IFilterRule getDefaultRule() { - return DefaultFilterRule.CLOSED; + public IFilterRuleType getDefaultRule() { + return DefaultFilterRuleType.CLOSED; } @Nullable @Override - public IFilterRule getRule(String uid) { + public IFilterRuleType getRule(String uid) { return null; } @Nullable @Override - public IFilterRule getRule(int id) { + public IFilterRuleType getRule(int id) { return null; } @Override - public int getId(IFilterRule rule) { + public IFilterLogic createLogic(ILocatable locatable, IFilterLogic.INetworkHandler networkHandler) { + return FakeFilterLogic.INSTANCE; + } + + @Override + public int getId(IFilterRuleType rule) { return 0; } } diff --git a/src/main/java/forestry/sorting/FakeFilterLogic.java b/src/main/java/forestry/sorting/FakeFilterLogic.java new file mode 100644 index 000000000..b2a9d191d --- /dev/null +++ b/src/main/java/forestry/sorting/FakeFilterLogic.java @@ -0,0 +1,99 @@ +package forestry.sorting; + +import javax.annotation.Nullable; +import java.io.IOException; +import java.util.Collection; +import java.util.Collections; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.EnumFacing; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRuleType; + +public final class FakeFilterLogic implements IFilterLogic { + public static final FakeFilterLogic INSTANCE = new FakeFilterLogic(); + + private FakeFilterLogic() { + } + + @Override + public void writeGuiData(PacketBuffer data) { + + } + + @Override + public void readGuiData(PacketBuffer data) throws IOException { + + } + + @Override + public Collection getValidDirections(ItemStack itemStack, EnumFacing from) { + return Collections.emptySet(); + } + + @Override + public boolean isValid(ItemStack itemStack, EnumFacing facing) { + return false; + } + + @Override + public boolean isValid(EnumFacing facing, ItemStack itemStack, IFilterData filterData) { + return false; + } + + @Override + public boolean isValidAllelePair(EnumFacing orientation, String activeUID, String inactiveUID) { + return false; + } + + @Override + public IFilterRuleType getRule(EnumFacing facing) { + return DefaultFilterRuleType.CLOSED; + } + + @Override + public boolean setRule(EnumFacing facing, IFilterRuleType rule) { + return false; + } + + @Nullable + @Override + public IAllele getGenomeFilter(EnumFacing facing, int index, boolean active) { + return null; + } + + @Override + public boolean setGenomeFilter(EnumFacing facing, int index, boolean active, @Nullable IAllele allele) { + return false; + } + + @Override + public void sendToServer(EnumFacing facing, int index, boolean active, @Nullable IAllele allele) { + + } + + @Override + public INetworkHandler getNetworkHandler() { + return (l, s, p)->{ }; + } + + @Override + public void sendToServer(EnumFacing facing, IFilterRuleType rule) { + + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + return nbt; + } +} diff --git a/src/main/java/forestry/sorting/FilterLogic.java b/src/main/java/forestry/sorting/FilterLogic.java new file mode 100644 index 000000000..0ada601a2 --- /dev/null +++ b/src/main/java/forestry/sorting/FilterLogic.java @@ -0,0 +1,275 @@ +package forestry.sorting; + +import javax.annotation.Nullable; +import java.io.IOException; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.ILocatable; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IFilterData; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRuleType; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; +import forestry.core.utils.NetworkUtil; +import forestry.sorting.network.packets.PacketFilterChangeGenome; +import forestry.sorting.network.packets.PacketFilterChangeRule; + +public class FilterLogic implements IFilterLogic { + private final ILocatable locatable; + private final INetworkHandler networkHandler; + private IFilterRuleType[] filterRules = new IFilterRuleType[6]; + private AlleleFilter[][] genomeFilter = new AlleleFilter[6][3]; + + public FilterLogic(ILocatable locatable, INetworkHandler networkHandler) { + this.locatable = locatable; + this.networkHandler = networkHandler; + for (int i = 0; i < filterRules.length; i++) { + filterRules[i] = AlleleManager.filterRegistry.getDefaultRule(); + } + } + + @Override + public INetworkHandler getNetworkHandler() { + return networkHandler; + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound data) { + for (int i = 0; i < filterRules.length; i++) { + data.setString("TypeFilter" + i, filterRules[i].getUID()); + } + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 3; j++) { + AlleleFilter filter = genomeFilter[i][j]; + if (filter == null) { + continue; + } + if (filter.activeAllele != null) { + data.setString("GenomeFilterS" + i + "-" + j + "-" + 0, filter.activeAllele.getUID()); + } + if (filter.inactiveAllele != null) { + data.setString("GenomeFilterS" + i + "-" + j + "-" + 1, filter.inactiveAllele.getUID()); + } + } + } + return data; + } + + @Override + public void readFromNBT(NBTTagCompound data) { + for (int i = 0; i < filterRules.length; i++) { + filterRules[i] = AlleleManager.filterRegistry.getRuleOrDefault(data.getString("TypeFilter" + i)); + } + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 3; j++) { + AlleleFilter filter = new AlleleFilter(); + if (data.hasKey("GenomeFilterS" + i + "-" + j + "-" + 0)) { + filter.activeAllele = AlleleManager.alleleRegistry.getAllele(data.getString("GenomeFilterS" + i + "-" + j + "-" + 0)); + } + if (data.hasKey("GenomeFilterS" + i + "-" + j + "-" + 1)) { + filter.inactiveAllele = AlleleManager.alleleRegistry.getAllele(data.getString("GenomeFilterS" + i + "-" + j + "-" + 1)); + } + genomeFilter[i][j] = filter; + } + } + } + + @Override + public void writeGuiData(PacketBuffer data) { + for (int i = 0; i < filterRules.length; i++) { + data.writeShort(AlleleManager.filterRegistry.getId(filterRules[i])); + } + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 3; j++) { + AlleleFilter filter = genomeFilter[i][j]; + if (filter == null) { + data.writeBoolean(false); + data.writeBoolean(false); + continue; + } + if (filter.activeAllele != null) { + data.writeBoolean(true); + data.writeString(filter.activeAllele.getUID()); + } else { + data.writeBoolean(false); + } + if (filter.inactiveAllele != null) { + data.writeBoolean(true); + data.writeString(filter.inactiveAllele.getUID()); + } else { + data.writeBoolean(false); + } + } + } + } + + @SideOnly(Side.CLIENT) + @Override + public void readGuiData(PacketBuffer data) throws IOException { + for (int i = 0; i < filterRules.length; i++) { + filterRules[i] = AlleleManager.filterRegistry.getRule(data.readShort()); + } + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 3; j++) { + AlleleFilter filter = new AlleleFilter(); + if (data.readBoolean()) { + filter.activeAllele = AlleleManager.alleleRegistry.getAllele(data.readString(1024)); + } + if (data.readBoolean()) { + filter.inactiveAllele = AlleleManager.alleleRegistry.getAllele(data.readString(1024)); + } + genomeFilter[i][j] = filter; + } + } + } + + public Collection getValidDirections(ItemStack itemStack, EnumFacing from) { + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(itemStack); + IIndividual individual = null; + ISpeciesType type = null; + if (root != null) { + individual = root.getMember(itemStack); + type = root.getType(itemStack); + } + IFilterData filterData = new FilterData(root, individual, type); + List validFacings = new LinkedList<>(); + for (EnumFacing facing : EnumFacing.VALUES) { + if (facing == from) { + continue; + } + if (isValid(facing, itemStack, filterData)) { + validFacings.add(facing); + } + } + return validFacings; + } + + @Override + public boolean isValid(ItemStack itemStack, EnumFacing facing) { + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(itemStack); + IIndividual individual = null; + ISpeciesType type = null; + if (root != null) { + individual = root.getMember(itemStack); + type = root.getType(itemStack); + } + return isValid(facing, itemStack, new FilterData(root, individual, type)); + } + + public boolean isValid(EnumFacing facing, ItemStack itemStack, IFilterData filterData) { + IFilterRuleType rule = getRule(facing); + if (rule == DefaultFilterRuleType.CLOSED) { + return false; + } + if (rule == DefaultFilterRuleType.ITEM && !filterData.isPresent()) { + return true; + } + String requiredRoot = rule.getRootUID(); + if (requiredRoot != null && (!filterData.isPresent() || !filterData.getRoot().getUID().equals(requiredRoot))) { + return false; + } + if (rule == DefaultFilterRuleType.ANYTHING || rule.isValid(itemStack, filterData)) { + if (filterData.isPresent()) { + IIndividual ind = filterData.getIndividual(); + IGenome genome = ind.getGenome(); + IAllele active = genome.getPrimary(); + IAllele inactive = genome.getSecondary(); + if (!isValidAllelePair(facing, active.getUID(), inactive.getUID())) { + return false; + } + } + return true; + } + return false; + } + + public boolean isValidAllelePair(EnumFacing orientation, String activeUID, String inactiveUID) { + AlleleFilter[] directionFilters = genomeFilter[orientation.ordinal()]; + + if (directionFilters == null) { + return true; + } + + boolean foundFilter = false; + for (int i = 0; i < 3; i++) { + AlleleFilter filter = directionFilters[i]; + if (filter != null && !filter.isEmpty()) { + foundFilter = true; + if (!filter.isEmpty() && filter.isValid(activeUID, inactiveUID)) { + return true; + } + } + } + return !foundFilter; + } + + public IFilterRuleType getRule(EnumFacing facing) { + return filterRules[facing.ordinal()]; + } + + public boolean setRule(EnumFacing facing, IFilterRuleType rule) { + if (filterRules[facing.ordinal()] != rule) { + filterRules[facing.ordinal()] = rule; + return true; + } + return false; + } + + @Nullable + public AlleleFilter getGenomeFilter(EnumFacing facing, int index) { + return genomeFilter[facing.ordinal()][index]; + } + + @Nullable + public IAllele getGenomeFilter(EnumFacing facing, int index, boolean active){ + AlleleFilter filter = getGenomeFilter(facing, index); + if(filter == null){ + return null; + } + return active ? filter.activeAllele : filter.inactiveAllele; + } + + public boolean setGenomeFilter(EnumFacing facing, int index, boolean active, @Nullable IAllele allele) { + AlleleFilter filter = genomeFilter[facing.ordinal()][index]; + if (filter == null) { + filter = genomeFilter[facing.ordinal()][index] = new AlleleFilter(); + } + boolean set; + if (active) { + set = filter.activeAllele != allele; + filter.activeAllele = allele; + } else { + set = filter.inactiveAllele != allele; + filter.inactiveAllele = allele; + } + return set; + } + + @Override + public void sendToServer(EnumFacing facing, int index, boolean active, @Nullable IAllele allele) { + NetworkUtil.sendToServer(new PacketFilterChangeGenome(locatable.getCoordinates(), facing, (short) index, active, allele)); + } + + @Override + public void sendToServer(EnumFacing facing, IFilterRuleType rule) { + NetworkUtil.sendToServer(new PacketFilterChangeRule(locatable.getCoordinates(), facing, rule)); + } +} diff --git a/src/main/java/forestry/sorting/FilterRegistry.java b/src/main/java/forestry/sorting/FilterRegistry.java index ed18aef2c..fb005524b 100644 --- a/src/main/java/forestry/sorting/FilterRegistry.java +++ b/src/main/java/forestry/sorting/FilterRegistry.java @@ -5,46 +5,53 @@ import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; +import forestry.api.core.ILocatable; +import forestry.api.genetics.IFilterLogic; import forestry.api.genetics.IFilterRegistry; -import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IFilterRuleType; public class FilterRegistry implements IFilterRegistry { - private final HashMap filterByName = new LinkedHashMap<>(); + private final HashMap filterByName = new LinkedHashMap<>(); private final HashMap filterIDByName = new LinkedHashMap<>(); - private final HashMap filterByID = new LinkedHashMap<>(); + private final HashMap filterByID = new LinkedHashMap<>(); private int ids; @Override - public void registerFilter(IFilterRule rule) { + public void registerFilter(IFilterRuleType rule) { filterByName.put(rule.getUID(), rule); filterIDByName.put(rule.getUID(), ids++); filterByID.put(ids - 1, rule); } @Override - public Collection getRules() { + public Collection getRules() { return filterByName.values(); } @Override - public IFilterRule getDefaultRule() { - return DefaultFilterRule.CLOSED; + public IFilterRuleType getDefaultRule() { + return DefaultFilterRuleType.CLOSED; } @Nullable @Override - public IFilterRule getRule(String uid) { + public IFilterRuleType getRule(String uid) { return filterByName.get(uid); } @Override - public int getId(IFilterRule rule) { + public int getId(IFilterRuleType rule) { return filterIDByName.get(rule.getUID()); } + @Override + public IFilterLogic createLogic(ILocatable locatable, IFilterLogic.INetworkHandler networkHandler) { + return new FilterLogic(locatable, networkHandler); + } + @Nullable @Override - public IFilterRule getRule(int id) { + public IFilterRuleType getRule(int id) { return filterByID.get(id); } } diff --git a/src/main/java/forestry/sorting/ModuleSorting.java b/src/main/java/forestry/sorting/ModuleSorting.java index 3f59484a2..0eeeb5d1f 100644 --- a/src/main/java/forestry/sorting/ModuleSorting.java +++ b/src/main/java/forestry/sorting/ModuleSorting.java @@ -6,12 +6,16 @@ import javax.annotation.Nullable; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.capabilities.CapabilityManager; + import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IFilterLogic; import forestry.api.modules.ForestryModule; import forestry.apiculture.ModuleApiculture; import forestry.core.ModuleCore; +import forestry.core.capabilities.NullStorage; import forestry.core.config.Constants; import forestry.core.network.IPacketRegistry; import forestry.core.recipes.RecipeUtil; @@ -42,11 +46,15 @@ public class ModuleSorting extends BlankForestryModule { @Override public void setupAPI() { AlleleManager.filterRegistry = new FilterRegistry(); + + CapabilityManager.INSTANCE.register(IFilterLogic.class, new NullStorage<>(), ()->FakeFilterLogic.INSTANCE); } @Override public void disabledSetupAPI() { AlleleManager.filterRegistry = new DummyFilterRegistry(); + + CapabilityManager.INSTANCE.register(IFilterLogic.class, new NullStorage<>(), ()->FakeFilterLogic.INSTANCE); } @Override @@ -56,7 +64,7 @@ public class ModuleSorting extends BlankForestryModule { @Override public void preInit() { - DefaultFilterRule.init(); + DefaultFilterRuleType.init(); } @Override diff --git a/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java b/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java index 1b5597c7e..86d5c3184 100644 --- a/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java +++ b/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java @@ -10,21 +10,20 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.EnumFacing; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRuleType; import forestry.core.gui.GuiForestry; import forestry.core.gui.tooltips.ToolTip; import forestry.core.gui.widgets.Widget; import forestry.core.gui.widgets.WidgetManager; -import forestry.core.utils.NetworkUtil; import forestry.core.utils.SoundUtil; import forestry.core.utils.Translator; import forestry.sorting.gui.GuiGeneticFilter; import forestry.sorting.gui.ISelectableProvider; -import forestry.sorting.network.packets.PacketFilterChangeRule; import forestry.sorting.tiles.TileGeneticFilter; -public class RuleWidget extends Widget implements ISelectableProvider { - private static final ImmutableSet ENTRIES = createEntries(); +public class RuleWidget extends Widget implements ISelectableProvider { + private static final ImmutableSet ENTRIES = createEntries(); private final EnumFacing facing; private final GuiGeneticFilter gui; @@ -39,7 +38,8 @@ public class RuleWidget extends Widget implements ISelectableProvider getEntries() { + public Collection getEntries() { return ENTRIES; } @Override - public void draw(GuiForestry gui, IFilterRule selectable, int x, int y) { + public void draw(GuiForestry gui, IFilterRuleType selectable, int x, int y) { TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); textureManager.bindTexture(selectable.getTextureMap()); @@ -63,15 +63,16 @@ public class RuleWidget extends Widget implements ISelectableProvider createEntries() { - ImmutableSet.Builder entries = ImmutableSet.builder(); - for (IFilterRule rule : AlleleManager.filterRegistry.getRules()) { + private static ImmutableSet createEntries() { + ImmutableSet.Builder entries = ImmutableSet.builder(); + for (IFilterRuleType rule : AlleleManager.filterRegistry.getRules()) { entries.add(rule); } return entries.build(); diff --git a/src/main/java/forestry/sorting/gui/widgets/SpeciesWidget.java b/src/main/java/forestry/sorting/gui/widgets/SpeciesWidget.java index a20f900b4..666fdf1bf 100644 --- a/src/main/java/forestry/sorting/gui/widgets/SpeciesWidget.java +++ b/src/main/java/forestry/sorting/gui/widgets/SpeciesWidget.java @@ -14,6 +14,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IFilterLogic; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; @@ -22,12 +23,10 @@ import forestry.core.gui.GuiUtil; import forestry.core.gui.tooltips.ToolTip; import forestry.core.gui.widgets.Widget; import forestry.core.gui.widgets.WidgetManager; -import forestry.core.utils.NetworkUtil; import forestry.core.utils.SoundUtil; import forestry.sorting.AlleleFilter; import forestry.sorting.gui.GuiGeneticFilter; import forestry.sorting.gui.ISelectableProvider; -import forestry.sorting.network.packets.PacketFilterChangeGenome; import forestry.sorting.tiles.TileGeneticFilter; public class SpeciesWidget extends Widget implements ISelectableProvider { @@ -83,8 +82,9 @@ public class SpeciesWidget extends Widget implements ISelectableProvider { - if (tile.setGenomeFilter(facing, index, active, allele)) { - tile.sendToPlayers(player.getServerWorld(), player); + IFilterLogic logic = TileUtil.getInterface(player.world, pos, GeneticCapabilities.FILTER_LOGIC, null); + if(logic != null) { + if (logic.setGenomeFilter(facing, index, active, allele)) { + logic.getNetworkHandler().sendToPlayers(logic, player.getServerWorld(), player); } - }); + } } } } diff --git a/src/main/java/forestry/sorting/network/packets/PacketFilterChangeRule.java b/src/main/java/forestry/sorting/network/packets/PacketFilterChangeRule.java index 212d6f567..30946b1bd 100644 --- a/src/main/java/forestry/sorting/network/packets/PacketFilterChangeRule.java +++ b/src/main/java/forestry/sorting/network/packets/PacketFilterChangeRule.java @@ -7,22 +7,23 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IFilterRule; +import forestry.api.genetics.GeneticCapabilities; +import forestry.api.genetics.IFilterLogic; +import forestry.api.genetics.IFilterRuleType; import forestry.core.network.ForestryPacket; import forestry.core.network.IForestryPacketHandlerServer; import forestry.core.network.IForestryPacketServer; import forestry.core.network.PacketBufferForestry; import forestry.core.network.PacketIdServer; import forestry.core.tiles.TileUtil; -import forestry.sorting.tiles.TileGeneticFilter; public class PacketFilterChangeRule extends ForestryPacket implements IForestryPacketServer { private final BlockPos pos; private final EnumFacing facing; - private final IFilterRule rule; + private final IFilterRuleType rule; - public PacketFilterChangeRule(TileGeneticFilter filter, EnumFacing facing, IFilterRule rule) { - this.pos = filter.getPos(); + public PacketFilterChangeRule(BlockPos pos, EnumFacing facing, IFilterRuleType rule) { + this.pos = pos; this.facing = facing; this.rule = rule; } @@ -44,12 +45,13 @@ public class PacketFilterChangeRule extends ForestryPacket implements IForestryP public void onPacketData(PacketBufferForestry data, EntityPlayerMP player) throws IOException { BlockPos pos = data.readBlockPos(); EnumFacing facing = EnumFacing.getFront(data.readShort()); - IFilterRule rule = AlleleManager.filterRegistry.getRuleOrDefault(data.readShort()); - TileUtil.actOnTile(player.world, pos, TileGeneticFilter.class, tile -> { - if (tile.setRule(facing, rule)) { - tile.sendToPlayers(player.getServerWorld(), player); + IFilterRuleType rule = AlleleManager.filterRegistry.getRuleOrDefault(data.readShort()); + IFilterLogic logic = TileUtil.getInterface(player.world, pos, GeneticCapabilities.FILTER_LOGIC, null); + if(logic != null) { + if (logic.setRule(facing, rule)) { + logic.getNetworkHandler().sendToPlayers(logic, player.getServerWorld(), player); } - }); + } } } } diff --git a/src/main/java/forestry/sorting/tiles/TileGeneticFilter.java b/src/main/java/forestry/sorting/tiles/TileGeneticFilter.java index 39f3fa91c..da57ec907 100644 --- a/src/main/java/forestry/sorting/tiles/TileGeneticFilter.java +++ b/src/main/java/forestry/sorting/tiles/TileGeneticFilter.java @@ -24,10 +24,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; +import forestry.api.genetics.GeneticCapabilities; import forestry.api.genetics.IFilterData; -import forestry.api.genetics.IFilterRule; -import forestry.api.genetics.IGenome; +import forestry.api.genetics.IFilterLogic; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; @@ -38,8 +37,8 @@ import forestry.core.tiles.TileForestry; import forestry.core.tiles.TileUtil; import forestry.core.utils.ItemStackUtil; import forestry.sorting.AlleleFilter; -import forestry.sorting.DefaultFilterRule; import forestry.sorting.FilterData; +import forestry.sorting.FilterLogic; import forestry.sorting.gui.ContainerGeneticFilter; import forestry.sorting.gui.GuiGeneticFilter; import forestry.sorting.inventory.InventoryFilter; @@ -48,15 +47,12 @@ import forestry.sorting.inventory.ItemHandlerFilter; public class TileGeneticFilter extends TileForestry implements IStreamableGui { private static final int TRANSFER_DELAY = 5; - private IFilterRule[] filterRules = new IFilterRule[6]; - private AlleleFilter[][] genomeFilter = new AlleleFilter[6][3]; + private final FilterLogic logic; private final AdjacentInventoryCache inventoryCache; public TileGeneticFilter() { - for (int i = 0; i < filterRules.length; i++) { - filterRules[i] = AlleleManager.filterRegistry.getDefaultRule(); - } this.inventoryCache = new AdjacentInventoryCache(this, getTileCache()); + this.logic = new FilterLogic(this, (logic1, server, player) -> sendToPlayers(server, player)); setInternalInventory(new InventoryFilter(this)); } @@ -64,100 +60,30 @@ public class TileGeneticFilter extends TileForestry implements IStreamableGui { public NBTTagCompound writeToNBT(NBTTagCompound data) { super.writeToNBT(data); - for (int i = 0; i < filterRules.length; i++) { - data.setString("TypeFilter" + i, filterRules[i].getUID()); - } + data.setTag("Logic", logic.writeToNBT(new NBTTagCompound())); - for (int i = 0; i < 6; i++) { - for (int j = 0; j < 3; j++) { - AlleleFilter filter = genomeFilter[i][j]; - if (filter == null) { - continue; - } - if (filter.activeAllele != null) { - data.setString("GenomeFilterS" + i + "-" + j + "-" + 0, filter.activeAllele.getUID()); - } - if (filter.inactiveAllele != null) { - data.setString("GenomeFilterS" + i + "-" + j + "-" + 1, filter.inactiveAllele.getUID()); - } - } - } return data; } @Override public void readFromNBT(NBTTagCompound data) { super.readFromNBT(data); - for (int i = 0; i < filterRules.length; i++) { - filterRules[i] = AlleleManager.filterRegistry.getRuleOrDefault(data.getString("TypeFilter" + i)); - } - for (int i = 0; i < 6; i++) { - for (int j = 0; j < 3; j++) { - AlleleFilter filter = new AlleleFilter(); - if (data.hasKey("GenomeFilterS" + i + "-" + j + "-" + 0)) { - filter.activeAllele = AlleleManager.alleleRegistry.getAllele(data.getString("GenomeFilterS" + i + "-" + j + "-" + 0)); - } - if (data.hasKey("GenomeFilterS" + i + "-" + j + "-" + 1)) { - filter.inactiveAllele = AlleleManager.alleleRegistry.getAllele(data.getString("GenomeFilterS" + i + "-" + j + "-" + 1)); - } - genomeFilter[i][j] = filter; - } - } + logic.readFromNBT(data.getCompoundTag("Logic")); } @Override public void writeGuiData(PacketBufferForestry data) { - for (int i = 0; i < filterRules.length; i++) { - data.writeShort(AlleleManager.filterRegistry.getId(filterRules[i])); - } - - for (int i = 0; i < 6; i++) { - for (int j = 0; j < 3; j++) { - AlleleFilter filter = genomeFilter[i][j]; - if (filter == null) { - data.writeBoolean(false); - data.writeBoolean(false); - continue; - } - if (filter.activeAllele != null) { - data.writeBoolean(true); - data.writeString(filter.activeAllele.getUID()); - } else { - data.writeBoolean(false); - } - if (filter.inactiveAllele != null) { - data.writeBoolean(true); - data.writeString(filter.inactiveAllele.getUID()); - } else { - data.writeBoolean(false); - } - } - } + logic.writeGuiData(data); } @SideOnly(Side.CLIENT) @Override public void readGuiData(PacketBufferForestry data) throws IOException { - for (int i = 0; i < filterRules.length; i++) { - filterRules[i] = AlleleManager.filterRegistry.getRule(data.readShort()); - } - - for (int i = 0; i < 6; i++) { - for (int j = 0; j < 3; j++) { - AlleleFilter filter = new AlleleFilter(); - if (data.readBoolean()) { - filter.activeAllele = AlleleManager.alleleRegistry.getAllele(data.readString()); - } - if (data.readBoolean()) { - filter.inactiveAllele = AlleleManager.alleleRegistry.getAllele(data.readString()); - } - genomeFilter[i][j] = filter; - } - } + logic.readGuiData(data); } - public void sendToPlayers(WorldServer server, EntityPlayer entityPlayer) { + private void sendToPlayers(WorldServer server, EntityPlayer entityPlayer) { for (EntityPlayer player : server.playerEntities) { if (player != entityPlayer && player.openContainer instanceof ContainerGeneticFilter) { if (((ContainerGeneticFilter) entityPlayer.openContainer).hasSameTile((ContainerGeneticFilter) player.openContainer)) { @@ -235,86 +161,16 @@ public class TileGeneticFilter extends TileForestry implements IStreamableGui { } private boolean isValidFacing(EnumFacing facing, ItemStack itemStack, IFilterData filterData) { - if (inventoryCache.getAdjacentInventory(facing) == null) { - return false; - } - IFilterRule rule = getRule(facing); - if (rule == DefaultFilterRule.CLOSED) { - return false; - } - if (rule == DefaultFilterRule.ITEM && !filterData.isPresent()) { - return true; - } - String requiredRoot = rule.getRootUID(); - if (requiredRoot != null && (!filterData.isPresent() || !filterData.getRoot().getUID().equals(requiredRoot))) { - return false; - } - if (rule == DefaultFilterRule.ANYTHING || rule.isValid(itemStack, filterData)) { - if (filterData.isPresent()) { - IIndividual ind = filterData.getIndividual(); - IGenome genome = ind.getGenome(); - IAllele active = genome.getPrimary(); - IAllele inactive = genome.getSecondary(); - if (!isValidGenome(facing, active.getUID(), inactive.getUID())) { - return false; - } - } - return true; - } - return false; + return inventoryCache.getAdjacentInventory(facing) != null && logic.isValid(facing, itemStack, filterData); } - private boolean isValidGenome(EnumFacing orientation, String activeUID, String inactiveUID) { - AlleleFilter[] directionFilters = genomeFilter[orientation.ordinal()]; - - if (directionFilters == null) { - return true; - } - - boolean foundFilter = false; - for (int i = 0; i < 3; i++) { - AlleleFilter filter = directionFilters[i]; - if (filter != null && !filter.isEmpty()) { - foundFilter = true; - if (!filter.isEmpty() && filter.isValid(activeUID, inactiveUID)) { - return true; - } - } - } - return !foundFilter; - } - - public IFilterRule getRule(EnumFacing facing) { - return filterRules[facing.ordinal()]; - } - - public boolean setRule(EnumFacing facing, IFilterRule rule) { - if (filterRules[facing.ordinal()] != rule) { - filterRules[facing.ordinal()] = rule; - return true; - } - return false; + public IFilterLogic getLogic() { + return logic; } @Nullable public AlleleFilter getGenomeFilter(EnumFacing facing, int index) { - return genomeFilter[facing.ordinal()][index]; - } - - public boolean setGenomeFilter(EnumFacing facing, int index, boolean active, @Nullable IAllele allele) { - AlleleFilter filter = genomeFilter[facing.ordinal()][index]; - if (filter == null) { - filter = genomeFilter[facing.ordinal()][index] = new AlleleFilter(); - } - boolean set; - if (active) { - set = filter.activeAllele != allele; - filter.activeAllele = allele; - } else { - set = filter.inactiveAllele != allele; - filter.inactiveAllele = allele; - } - return set; + return logic.getGenomeFilter(facing, index); } @SideOnly(Side.CLIENT) @@ -336,11 +192,14 @@ public class TileGeneticFilter extends TileForestry implements IStreamableGui { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && facing != null) { return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(new ItemHandlerFilter(this, facing)); } + if(capability == GeneticCapabilities.FILTER_LOGIC){ + return GeneticCapabilities.FILTER_LOGIC.cast(logic); + } return super.getCapability(capability, facing); } @Override public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { - return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); + return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || capability == GeneticCapabilities.FILTER_LOGIC || super.hasCapability(capability, facing); } } From 8ab94e67416ee778ebed41f8cb3f6e8268992d19 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 14 Jan 2018 19:39:19 +0100 Subject: [PATCH 8/9] Improve genetic filter implementation --- lang | 2 +- .../forestry/core/network/PacketIdClient.java | 3 ++ .../sorting/gui/ContainerGeneticFilter.java | 23 +++++--- .../sorting/gui/GuiGeneticFilter.java | 14 +++-- .../sorting/gui/widgets/RuleWidget.java | 8 ++- .../sorting/gui/widgets/SpeciesWidget.java | 18 +++---- .../network/PacketRegistrySorting.java | 4 +- .../packets/PacketGuiFilterUpdate.java | 53 +++++++++++++++++++ .../sorting/tiles/IFilterContainer.java | 20 +++++++ .../sorting/tiles/TileGeneticFilter.java | 15 ++++-- 10 files changed, 123 insertions(+), 37 deletions(-) create mode 100644 src/main/java/forestry/sorting/network/packets/PacketGuiFilterUpdate.java create mode 100644 src/main/java/forestry/sorting/tiles/IFilterContainer.java diff --git a/lang b/lang index cf9f2c21f..7b6f08376 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit cf9f2c21f53e6ad4ce180bdccf258ff7e717ce94 +Subproject commit 7b6f08376464eaade21f3a438981e519e046fa57 diff --git a/src/main/java/forestry/core/network/PacketIdClient.java b/src/main/java/forestry/core/network/PacketIdClient.java index 4c6aff15c..4160ffd6e 100644 --- a/src/main/java/forestry/core/network/PacketIdClient.java +++ b/src/main/java/forestry/core/network/PacketIdClient.java @@ -68,6 +68,9 @@ public enum PacketIdClient implements IPacketId { UPDATE_CLIMATE, CAMOUFLAGE_SELECTION, + // Sorting + GUI_UPDATE_FILTER, + // JEI RECIPE_TRANSFER_UPDATE; diff --git a/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java b/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java index 9847746c6..623454d0e 100644 --- a/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java +++ b/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java @@ -1,16 +1,20 @@ package forestry.sorting.gui; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; import forestry.core.gui.ContainerTile; -import forestry.core.network.packets.PacketGuiUpdate; -import forestry.sorting.tiles.TileGeneticFilter; +import forestry.sorting.network.packets.PacketGuiFilterUpdate; +import forestry.sorting.tiles.IFilterContainer; -public class ContainerGeneticFilter extends ContainerTile { +public class ContainerGeneticFilter extends ContainerTile { + private final IFilterContainer container; private boolean guiNeedsUpdate = true; - public ContainerGeneticFilter(TileGeneticFilter tileForestry, InventoryPlayer playerInventory) { - super(tileForestry); + public ContainerGeneticFilter(IFilterContainer container, InventoryPlayer playerInventory) { + super(container.getTileEntity()); + this.container = container; addInventory(playerInventory, 26, 140); } @@ -26,8 +30,11 @@ public class ContainerGeneticFilter extends ContainerTile { addSlotToContainer(new SlotGeneticFilter(playerInventory, column, xInv + column * 18, yInv + 58)); } - for (int x = 0; x < 6; x++) { - addSlotToContainer(new SlotFilterFacing(tile, x, 8, 18 + x * 18)); + IInventory buffer = container.getBuffer(); + if(buffer != null) { + for (int x = 0; x < 6; x++) { + addSlotToContainer(new SlotFilterFacing(buffer, x, 8, 18 + x * 18)); + } } } @@ -39,7 +46,7 @@ public class ContainerGeneticFilter extends ContainerTile { public void detectAndSendChanges() { super.detectAndSendChanges(); if (guiNeedsUpdate) { - PacketGuiUpdate packet = new PacketGuiUpdate(tile); + PacketGuiFilterUpdate packet = new PacketGuiFilterUpdate(container); sendPacketToListeners(packet); guiNeedsUpdate = false; } diff --git a/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java b/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java index 2c6b64414..fdf1b648f 100644 --- a/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java +++ b/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java @@ -10,6 +10,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import forestry.api.genetics.IFilterLogic; import forestry.core.config.Constants; import forestry.core.gui.Drawable; import forestry.core.gui.GuiForestryTitled; @@ -18,17 +19,17 @@ import forestry.core.gui.widgets.WidgetScrollBar; import forestry.sorting.gui.widgets.RuleWidget; import forestry.sorting.gui.widgets.SelectionWidget; import forestry.sorting.gui.widgets.SpeciesWidget; -import forestry.sorting.tiles.TileGeneticFilter; +import forestry.sorting.tiles.IFilterContainer; public class GuiGeneticFilter extends GuiForestryTitled { - private final TileGeneticFilter tile; + private final IFilterContainer tile; private final WidgetScrollBar scrollBar; public final SelectionWidget selection; @Nullable private GuiTextField searchField; - public GuiGeneticFilter(TileGeneticFilter tile, InventoryPlayer inventory) { + public GuiGeneticFilter(IFilterContainer tile, InventoryPlayer inventory) { super(Constants.TEXTURE_PATH_GUI + "/filter.png", new ContainerGeneticFilter(tile, inventory), tile); ySize = 222; xSize = 212; @@ -153,8 +154,11 @@ public class GuiGeneticFilter extends GuiForestryTitled addHintLedger("filter"); } - - public TileGeneticFilter getTile() { + public IFilterContainer getContainer() { return tile; } + + public IFilterLogic getLogic(){ + return tile.getLogic(); + } } diff --git a/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java b/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java index 86d5c3184..2f302f3aa 100644 --- a/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java +++ b/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java @@ -20,7 +20,6 @@ import forestry.core.utils.SoundUtil; import forestry.core.utils.Translator; import forestry.sorting.gui.GuiGeneticFilter; import forestry.sorting.gui.ISelectableProvider; -import forestry.sorting.tiles.TileGeneticFilter; public class RuleWidget extends Widget implements ISelectableProvider { private static final ImmutableSet ENTRIES = createEntries(); @@ -38,7 +37,7 @@ public class RuleWidget extends Widget implements ISelectableProvider { private final static ImmutableMap ITEMS = createEntries(); @@ -62,9 +60,9 @@ public class SpeciesWidget extends Widget implements ISelectableProvider Date: Mon, 15 Jan 2018 19:12:54 +0100 Subject: [PATCH 9/9] Update Lang --- lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang b/lang index 7b6f08376..017b0be91 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 7b6f08376464eaade21f3a438981e519e046fa57 +Subproject commit 017b0be91381d0f9dbfc1b386702e5f758bc0051