Change the plugin system to a module system and slit up modules

-Moved the woodpile from the arboriculture module to the charcoal module
-Moved the backpacks from the storage module to the backpacks module
-Moved the crates from the storage module to the creates module
-Added the database module with a new storage for individuals
-Added a gui element system to improve the alyzer api
-Added a species plugin interface to handle the database gui
-Added some alyzer methods to the species plugin to move the alyzer
integration later to it
This commit is contained in:
Nedelosk committed 2017-11-02 16:03:33 +01:00
1 parent ee272de168
commit 88fd031fb4
277 files changed
+7361 -1930

No files matched your search

+1 -1
View File
@@ -10,5 +10,5 @@ jei_mcversion=1.12.2
ic2_version=2.8.24-ex112
version_major=5
version_minor=6
version_minor=7
version_patch=0
+17 -11
View File
@@ -34,6 +34,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.api.core.ForestryAPI;
import forestry.api.core.ForestryEvent;
import forestry.core.EventHandlerCore;
import forestry.core.advancements.AdvancementManager;
import forestry.core.climate.ClimateStates;
import forestry.core.config.Config;
import forestry.core.config.Constants;
@@ -45,9 +46,11 @@ import forestry.core.multiblock.MultiblockEventHandler;
import forestry.core.network.PacketHandler;
import forestry.core.proxy.Proxies;
import forestry.core.worldgen.WorldGenerator;
import forestry.plugins.PluginManager;
import forestry.plugins.compat.PluginIC2;
import forestry.plugins.compat.PluginNatura;
import forestry.modules.ForestryModules;
import forestry.modules.ModuleManager;
import forestry.plugins.ForestryCompatPlugins;
import forestry.plugins.PluginIC2;
import forestry.plugins.PluginNatura;
/**
* Forestry Minecraft Mod
@@ -81,6 +84,8 @@ public class Forestry {
EnumErrorCode.init();
FluidRegistry.enableUniversalBucket();
MinecraftForge.EVENT_BUS.register(this);
ModuleManager moduleManager = ModuleManager.getInstance();
moduleManager.registerContainers(new ForestryModules(), new ForestryCompatPlugins());
}
@Nullable
@@ -107,19 +112,19 @@ public class Forestry {
MinecraftForge.EVENT_BUS.post(new ForestryEvent.PreInit(this, event));
PluginManager.runSetup(event);
ModuleManager.runSetup(event);
String gameMode = Config.gameMode;
Preconditions.checkState(gameMode != null);
ForestryAPI.activeMode = new GameMode(gameMode);
PluginManager.runPreInit(event.getSide());
ModuleManager.runPreInit(event.getSide());
}
@SubscribeEvent
public void registerModels(ModelRegistryEvent event) {
PluginManager.runRegisterBackpacksAndCrates();
ModuleManager.runRegisterBackpacksAndCrates();
Proxies.render.registerModels();
}
@@ -128,14 +133,15 @@ public class Forestry {
// Register gui handler
NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
PluginManager.runInit();
ModuleManager.runInit();
Proxies.render.registerItemAndBlockColors();
AdvancementManager.registerTriggers();
}
@EventHandler
public void postInit(FMLPostInitializationEvent event) {
PluginManager.runPostInit();
ModuleManager.runPostInit();
// Register world generator
WorldGenerator worldGenerator = new WorldGenerator();
@@ -145,12 +151,12 @@ public class Forestry {
Proxies.common.registerTickHandlers(worldGenerator);
// Handle IMC messages.
PluginManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
ModuleManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
}
@EventHandler
public void serverStarting(FMLServerStartingEvent event) {
PluginManager.serverStarting(event.getServer());
ModuleManager.serverStarting(event.getServer());
}
@Nullable
@@ -160,6 +166,6 @@ public class Forestry {
@EventHandler
public void processIMCMessages(IMCEvent event) {
PluginManager.processIMCMessages(event.getMessages());
ModuleManager.processIMCMessages(event.getMessages());
}
}
@@ -19,6 +19,4 @@ public interface IAlleleFruit extends IAlleleProperty<IAlleleFruit> {
@Nullable
String getModelName();
String getModID();
}
@@ -7,15 +7,18 @@ package forestry.api.arboriculture;
import java.util.Collection;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IModelManager;
import forestry.api.genetics.IAlleleProperty;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IFruitFamily;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleTreeSpecies> {
@@ -36,11 +39,6 @@ public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty<IAll
* @return Tree generator for this species.
*/
ITreeGenerator getGenerator();
/**
* @return The modid from the mod of the species.
*/
String getModID();
/**
* @return Float between 0 and 1 representing the rarity of the species, will affect spawn rate. If it's 0, it will not spawn.
@@ -14,7 +14,10 @@ public interface ICharcoalPileWall {
int getCharcoalAmount();
boolean matches(IBlockState state);
@Deprecated
NonNullList<ItemStack> getDisplyItems();
NonNullList<ItemStack> getDisplayItems();
}
@@ -5,13 +5,15 @@
******************************************************************************/
package forestry.api.arboriculture;
import forestry.api.core.ITextureManager;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.ITextureManager;
public interface IWoodProvider {
@SideOnly(Side.CLIENT)
void registerSprites(Item item, ITextureManager manager);
@@ -29,11 +31,15 @@ public interface IWoodProvider {
/**
* The amount of charcoal dropped from a charcoal pile of this wood.
* @deprecated Will be removed in 1.13
*/
@Deprecated
int getCarbonization();
/**
* The chance that a pile has to drop a extra charcoal
* @deprecated Will be removed in 1.13
*/
@Deprecated
float getCharcoalChance(int numberOfCharcoal);
}
@@ -5,10 +5,11 @@
******************************************************************************/
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@API(apiVersion = "4.2.1", owner = "ForestryAPI|core", provides = "ForestryAPI|arboriculture")
@API(apiVersion = "4.3.0", owner = "ForestryAPI|core", provides = "ForestryAPI|arboriculture")
package forestry.api.arboriculture;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraftforge.fml.common.API;
import mcp.MethodsReturnNonnullByDefault;
@@ -7,14 +7,17 @@ package forestry.api.core;
import java.util.Set;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.climate.IClimateStates;
import forestry.greenhouse.api.climate.IClimateFactory;
import forestry.api.climate.IClimateManager;
import forestry.api.climate.IClimateStates;
import forestry.api.farming.IFarmRegistry;
import forestry.api.farming.IFarmable;
import forestry.api.farming.ISimpleFarmLogic;
import forestry.greenhouse.api.climate.IClimateFactory;
/**
* Forestry's API is divided into several subcategories to make it easier to understand.
@@ -58,10 +61,13 @@ public class ForestryAPI {
*/
public static IClimateFactory climateFactory;
/**
*
*/
public static IClimateStates states;
/**
* A registry for register fertilizers, {@link IFarmabeles}s and {@link ISimpleFarmLogic}s
* A registry for register fertilizers, {@link IFarmable}s and {@link ISimpleFarmLogic}s
*/
public static IFarmRegistry farmRegistry;
@@ -76,10 +82,20 @@ public class ForestryAPI {
public static IForestryConstants forestryConstants;
/**
* The currently enabled Forestry plugins.
* The currently enabled Forestry modules.
* Can be used to check if certain features are available, for example:
* ForestryAPI.enabledPlugins.contains("APICULTURE")
* ForestryAPI.enabledModules.contains(new ResourceLocation("forestry", "apiculture"))
*/
public static Set<ResourceLocation> enabledModules;
/**
* The currently enabled Forestry modules.
* Can be used to check if certain features are available, for example:
* ForestryAPI.enabledPlugins.contains("forestry.apiculture")
*
* @deprecated Use {@link #enabledModules}
*/
@Deprecated
public static Set<String> enabledPlugins;
/**
@@ -0,0 +1,8 @@
package forestry.api.core;
/**
* The alignment of the text in a text gui element.
*/
public enum GuiElementAlignment {
LEFT, CENTER, RIGHT;
}
@@ -0,0 +1,38 @@
package forestry.api.core;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public interface IGuiElement {
int getX();
int getY();
int getWidth();
int getHeight();
void setXOffset(int xOffset);
void setYOffset(int yOffset);
@Nullable
IGuiElement getParent();
void setParent(@Nullable IGuiElement parent);
void draw(int startX, int startY);
@SideOnly(Side.CLIENT)
default List<String> getToolTip(int mouseX, int mouseY){
return Collections.emptyList();
}
@SideOnly(Side.CLIENT)
boolean isMouseOver(int mouseX, int mouseY);
}
@@ -0,0 +1,49 @@
package forestry.api.core;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IAlleleTolerance;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IMutation;
/**
* A helper interface to create gui elements.
*/
@SideOnly(Side.CLIENT)
public interface IGuiElementFactory {
IGuiElementHelper createHelper(IGuiElementLayout element);
/* GENETIC*/
/**
* @param dominant True if you want the dominant color and false if you want the recessive color.
*
* @return The color code that forestry uses to show if a allele is dominant (true) or recessive (false).
*/
int getColorCoding(boolean dominant);
/**
* @return Null if the mutation is secret and undiscovered. {@link IMutation#isSecret()}
*/
IGuiElement createMutation(int x, int y, int width, int height, IMutation mutation, IAllele species, IBreedingTracker breedingTracker);
/**
* @return Null if the mutation is secret and undiscovered. {@link IMutation#isSecret()}
*/
IGuiElement createMutationResultant(int x, int y, int width, int height, IMutation mutation, IBreedingTracker breedingTracker);
IGuiElement createFertilityInfo(IAlleleInteger fertilityAllele, int x, int texOffset);
IGuiElement createToleranceInfo(IAlleleTolerance toleranceAllele, IAlleleSpecies species, String text);
/* LAYOUTS */
IGuiElementLayout createHorizontal(int xPos, int yPos, int height);
IGuiElementLayout createVertical(int xPos, int yPos, int width);
IGuiElementLayout createPanel(int xPos, int yPos, int width, int height);
}
@@ -0,0 +1,93 @@
package forestry.api.core;
import java.util.function.Function;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IGuiElementLayoutHelper.LayoutFactory;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IAlleleTolerance;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
/**
* A helper interface to add gui elements.
*/
@SideOnly(Side.CLIENT)
public interface IGuiElementHelper {
/**
* Adds a {@link IGuiElement} to the parent of this.
*/
void add(IGuiElement element);
/**
* Centers a element to the center of the x axis of the parent element.
*
* @return the element
*/
IGuiElement centerElement(IGuiElement element);
/**
* Creates and adds an item gui element.
*/
void addItem(int x, ItemStack itemStack);
IGuiElementLayoutHelper layoutHelper(LayoutFactory layoutFactory, int width, int height);
/**
* Adds the chromosomeName and the name of the active/not active allele, of the chromosome, with {@link #addText}.
*/
void addAllele(String chromosomeName, IIndividual individual, IChromosomeType chromosome, boolean active);
/**
* Adds the chromosomeName and the result of toString with {@link #addText}.
*/
<A extends IAllele> void addAllele(String chromosomeName, Function<A, String> toString, IIndividual individual, IChromosomeType chromosome, boolean active);
void addFertilityInfo(IAlleleInteger fertilityAllele, int x, int texOffset);
void addToleranceInfo(IAlleleTolerance toleranceAllele, IAlleleSpecies species, String text);
void addMutation(int x, int y, int width, int height, IMutation mutation, IAllele species, IBreedingTracker breedingTracker);
void addMutationResultant(int x, int y, int width, int height, IMutation mutation, IBreedingTracker breedingTracker);
/**
* Adds a text element with the default color,the align {@link GuiElementAlignment#LEFT} and the height 12.
*/
void addText(String text);
/**
* Adds a text element with the align {@link GuiElementAlignment#LEFT} and the height 12.
*/
void addText(String text, int color);
/**
* Adds a text element with the default color and the height 12.
*/
void addText(String text, GuiElementAlignment align);
/**
* Adds a text element with the height 12.
*/
void addText(String text,GuiElementAlignment align, int color);
/**
* Adds a text element.
*/
void addText(int x, int height, String text, GuiElementAlignment align, int color);
/**
* @return The element to which all elements are added.
*/
IGuiElement getParent();
IGuiElementFactory factory();
}
@@ -0,0 +1,62 @@
package forestry.api.core;
import java.util.Collection;
import java.util.List;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public interface IGuiElementLayout extends IGuiElement {
/**
* Adds a element to this layout.
*/
IGuiElementLayout addElement(IGuiElement element);
/**
* Removes a element from this layout.
*/
IGuiElementLayout removeElement(IGuiElement element);
default IGuiElementLayout addElements(IGuiElement... elements){
for(IGuiElement element : elements){
addElement(element);
}
return this;
}
default IGuiElementLayout removeElements(IGuiElement... elements){
for(IGuiElement element : elements){
removeElement(element);
}
return this;
}
default IGuiElementLayout addElements(Collection<IGuiElement> elements){
elements.forEach(element -> addElement(element));
return this;
}
default IGuiElementLayout removeElements(Collection<IGuiElement> elements){
elements.forEach(element -> removeElement(element));
return this;
}
List<IGuiElement> getElements();
IGuiElementLayout setDistance(int distance);
void addTooltip(String line);
/**
* @return The tooltip that is displayed if the mouse is over this element and no element of this layout is under it.
*/
List<String> getTooltip();
/**
* @return The distance between the different elements of this layout.
*/
int getDistance();
int getSize();
}
@@ -0,0 +1,36 @@
package forestry.api.core;
import java.util.Collection;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public interface IGuiElementLayoutHelper {
/**
* @return Only false if the helper has no space to add this element.
*/
boolean add(IGuiElement element);
/**
* Removes all layouts and resets all variables of this helper.
*/
void clear();
/**
* Adds the layouts to the parent of the {@link IGuiElementHelper}. And calls {@link #clear()}
*/
void finish();
/**
* @return All layouts that were created with the help of this helper since the last {@link #clear()} or {@link #finish()}.
*/
Collection<IGuiElementLayout> layouts();
interface LayoutFactory {
/**
* A factory method to create new layouts if the last layout is full.
*/
IGuiElementLayout createLayout(int xOffset, int yOffset);
}
}
@@ -5,7 +5,7 @@
******************************************************************************/
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@API(apiVersion = "5.2.0", owner = "Forestry", provides = "ForestryAPI|core")
@API(apiVersion = "5.3.0", owner = "Forestry", provides = "ForestryAPI|core")
package forestry.api.core;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -0,0 +1,15 @@
package forestry.api.genetics;
/**
* Every instance of this enum represents a tab in the database.
*/
public enum EnumDatabaseTab {
//Used to display information about the active species of the individual.
ACTIVE_SPECIES,
//Used to display information about the inactive species of the individual.
INACTIVE_SPECIES,
//Used to display information about the products of the active species of the individual.
PRODUCTS,
//Used to display information about the mutations of the active species of the individual.
MUTATIONS;
}
@@ -0,0 +1,37 @@
package forestry.api.genetics;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IGuiElementHelper;
/**
* A tab of the database screen that shows some information about a {@link IIndividual}.
*/
@SideOnly(Side.CLIENT)
public interface IDatabaseTab<I extends IIndividual> {
/**
* Creates the gui elements that are displayed if this tab is selected in the database.
*
* @param individual The individual that is currently in the database selected.
* @param elementHelper A helper to create the gui elements.
*/
void createElements(IGuiElementHelper elementHelper, I individual, ItemStack itemStack);
/**
* @return The slot of this tab.
*/
EnumDatabaseTab getTab();
/**
* Can be used to give the tab a custom tooltip.
*/
@Nullable
default String getTooltip(I individual){
return null;
}
}
@@ -14,17 +14,38 @@ import forestry.api.core.INbtWritable;
*/
public interface IGenome extends INbtWritable {
/**
* @return The active species of this genome.
*/
IAlleleSpecies getPrimary();
/**
* @return The inactive species of this genome.
*/
IAlleleSpecies getSecondary();
/**
* @return A array with all chromosomes of this genome.
*/
IChromosome[] getChromosomes();
/**
* @return The active allele of this chromosome type.
*/
IAllele getActiveAllele(IChromosomeType chromosomeType);
/**
* @return The inactive allele of this chromosome type.
*/
IAllele getInactiveAllele(IChromosomeType chromosomeType);
/**
* @return true if the given other IGenome has the amount of chromosomes and their alleles are identical.
*/
boolean isGeneticEqual(IGenome other);
/**
* @return The root of this species and describes the class of species of this genome.
*/
ISpeciesRoot getSpeciesRoot();
}
@@ -12,6 +12,9 @@ import net.minecraft.util.math.BlockPos;
*/
public interface IHousing {
/**
* The coordinates of the housing.
*/
BlockPos getCoordinates();
}
@@ -16,10 +16,19 @@ import forestry.api.core.INbtWritable;
*/
public interface IIndividual extends INbtWritable {
/**
* @return The uid of the active species of this individual.
*/
String getIdent();
/**
* @return The display name of the active species of this individual.
*/
String getDisplayName();
/**
* Adds some information about the individual to the list.
*/
void addTooltip(List<String> list);
/**
@@ -29,12 +38,24 @@ public interface IIndividual extends INbtWritable {
*/
boolean analyze();
/**
* @return true if the IIndividual has been analyzed previously.
*/
boolean isAnalyzed();
/**
* @return true if the active species of this individual has a effect.
*/
boolean hasEffect();
/**
* @return true if the active species of this individual is secret.
*/
boolean isSecret();
/**
* @return The genetic data of this individual.
*/
IGenome getGenome();
/**
@@ -49,6 +70,9 @@ public interface IIndividual extends INbtWritable {
*/
IIndividual copy();
/**
* @return true if this individual has the same active and inactive species.
*/
boolean isPureBred(IChromosomeType chromosomeType);
}
@@ -0,0 +1,102 @@
package forestry.api.genetics;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Map;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IGuiElementHelper;
/**
* An ISpeciesPlugin provides methods that are used in the alyzer and database to display information about an
* individual.
*/
@SideOnly(Side.CLIENT)
public interface ISpeciesPlugin<I extends IIndividual> {
/**
* A map that contains a {@link ItemStack} for every possible {@link IAlleleSpecies}.
* This item stack represents the species in the database and alyzer gui.
*
* The key of the map is the uid of the species.
*/
Map<String, ItemStack> getIndividualStacks();
/* ALYZER */
/**
* Creates the first page of the alyzer.
*
* @param gui A instance of the alyzer gui.
* @param elementHelper A helper to create the gui elements.
* @param individual The individual that is currently in the alyzer slot.
*/
default void createFirstPage(GuiScreen gui, IGuiElementHelper elementHelper, I individual){
}
/**
* Creates the second page of the alyzer.
*
* @param gui A instance of the alyzer gui.
* @param elementHelper A helper to create the gui elements.
* @param individual The individual that is currently in the alyzer slot.
*/
default void createSecondPage(GuiScreen gui, IGuiElementHelper elementHelper, I individual){
}
/**
* Creates the third page of the alyzer. This page is usually used to display the products of the individual.
*
* @param gui A instance of the alyzer gui.
* @param elementHelper A helper to create the gui elements.
* @param individual The individual that is currently in the alyzer slot.
*/
default void createThirdPage(GuiScreen gui, IGuiElementHelper elementHelper, I individual){
}
/**
* The hints that will be shown in the alyzer gui.
*/
List<String> getHints();
/* DATABASE */
/**
* Provides a instance of a {@link IDatabaseTab} that is used to display information about the species of a individual in the
* database.
*
* @param active True if this tab is used to display the active species of the individual.
*
* @return null if this plugin does not support the database.
*/
default IDatabaseTab<I> getSpeciesTab(boolean active){
return null;
}
/**
* Can be used to provide a custom products tab for the database.
* If this is Null forestry uses the default mutation tab to display the products.
*/
@Nullable
default IDatabaseTab<I> getProductsTab(){
return null;
}
/**
* Can be used to provide a custom mutation tab for the database.
* If this is Null forestry uses the default mutation tab to display the mutations.
*/
@Nullable
default IDatabaseTab<I> getMutationTab(){
return null;
}
/**
* A item stack that represents the database tab in the database gui.
*/
ItemStack getTabDatabaseIconItem(EnumDatabaseTab tab);
}
@@ -11,12 +11,15 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import com.mojang.authlib.GameProfile;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import com.mojang.authlib.GameProfile;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
/**
* Describes a class of species (i.e. bees, trees, butterflies), provides helper functions and access to common functionality.
*/
@@ -72,6 +75,9 @@ public interface ISpeciesRoot {
@Nullable
<O extends Object, I extends IIndividual> IIndividualTranslator<I, O> getTranslator(Object translatorKey);
@Nullable
<O extends Object, I extends IIndividual> I translateMember(O objectToTranslator);
@Nullable
ISpeciesType getType(ItemStack itemStack);
@@ -160,6 +166,12 @@ public interface ISpeciesRoot {
*/
List<? extends IMutation> getCombinations(IAllele other);
/**
* @param other Allele to match mutations against.
* @return All registered mutations the give allele is resolute of.
*/
List<? extends IMutation> getResultantMutations(IAllele other);
/**
* @return all possible mutations that result from breeding two species
* @since Forestry 3.7
@@ -197,4 +209,19 @@ public interface ISpeciesRoot {
* Plugin to add information for the handheld genetic analyzer.
*/
IAlyzerPlugin getAlyzerPlugin();
/**
* A array with the size of 4. With the database tabs of this {@link IIndividual}.
*/
//IDatabaseTab[] getDatabaseTabs();
/**
* Plugin to add information for the handheld genetic analyzer and the database.
* @since 5.7
*/
@Nullable
@SideOnly(Side.CLIENT)
default ISpeciesPlugin getSpeciesPlugin(){
return null;
}
}
@@ -5,10 +5,11 @@
******************************************************************************/
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@API(apiVersion = "4.7.1", owner = "ForestryAPI|core", provides = "ForestryAPI|genetics")
@API(apiVersion = "5.7.0", owner = "ForestryAPI|core", provides = "ForestryAPI|genetics")
package forestry.api.genetics;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraftforge.fml.common.API;
import mcp.MethodsReturnNonnullByDefault;
@@ -8,16 +8,19 @@ package forestry.api.lepidopterology;
import java.util.Map;
import java.util.Set;
import forestry.api.genetics.IAlleleSpecies;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAlleleSpecies;
public interface IAlleleButterflySpecies extends IAlleleSpecies {
/**
* @return the IBeeRoot
* @return the IButterflyRoot
*/
@Override
IButterflyRoot getRoot();
@@ -59,15 +62,16 @@ public interface IAlleleButterflySpecies extends IAlleleSpecies {
*/
boolean isNocturnal();
/**
* @return The loot that drops if you kill a butterfly.
*/
Map<ItemStack, Float> getButterflyLoot();
/**
* @return The loot that drops if you destroy a leaf that contains a caterpillar.
*/
Map<ItemStack, Float> getCaterpillarLoot();
@SideOnly(Side.CLIENT)
void registerSprites();
/**
* @return The modid from the mod of the species.
*/
String getModID();
}
@@ -276,13 +276,13 @@ public class BeekeepingLogic implements IBeekeepingLogic {
// Work cycles are throttled, rather than occurring every game tick.
queenWorkCycleThrottle++;
if (queenWorkCycleThrottle >= PluginApiculture.ticksPerBeeWorkCycle) {
if (queenWorkCycleThrottle >= ModuleApiculture.ticksPerBeeWorkCycle) {
queenWorkCycleThrottle = 0;
doProduction(queen, housing, beeListener);
World world = housing.getWorldObj();
List<IBlockState> flowers = hasFlowersCache.getFlowers(world);
if (flowers.size() < PluginApiculture.maxFlowersSpawnedPerHive) {
if (flowers.size() < ModuleApiculture.maxFlowersSpawnedPerHive) {
BlockPos blockPos = queen.plantFlowerRandom(housing, flowers);
if (blockPos != null) {
hasFlowersCache.addFlowerPos(blockPos);
@@ -380,7 +380,7 @@ public class BeekeepingLogic implements IBeekeepingLogic {
NBTTagCompound nbttagcompound = new NBTTagCompound();
princess.writeToNBT(nbttagcompound);
queenStack = new ItemStack(PluginApiculture.getItems().beeQueenGE);
queenStack = new ItemStack(ModuleApiculture.getItems().beeQueenGE);
queenStack.setTagCompound(nbttagcompound);
beeInventory.setQueen(queenStack);
@@ -410,7 +410,7 @@ public class BeekeepingLogic implements IBeekeepingLogic {
} else {
Log.warning("Tried to spawn offspring off an unmated queen. Devolving her to a princess.");
ItemStack convert = new ItemStack(PluginApiculture.getItems().beePrincessGE);
ItemStack convert = new ItemStack(ModuleApiculture.getItems().beePrincessGE);
NBTTagCompound nbttagcompound = new NBTTagCompound();
queen.writeToNBT(nbttagcompound);
convert.setTagCompound(nbttagcompound);
@@ -433,7 +433,7 @@ public class BeekeepingLogic implements IBeekeepingLogic {
IApiaristTracker breedingTracker = BeeManager.beeRoot.getBreedingTracker(world, beeHousing.getOwner());
// Princess
boolean secondPrincess = world.rand.nextInt(10000) < PluginApiculture.getSecondPrincessChance() * 100;
boolean secondPrincess = world.rand.nextInt(10000) < ModuleApiculture.getSecondPrincessChance() * 100;
int count = secondPrincess ? 2 : 1;
while (count > 0) {
count--;
@@ -21,6 +21,7 @@ import java.util.Objects;
import java.util.Random;
import java.util.Set;
import net.minecraft.advancements.critereon.ItemPredicate;
import net.minecraft.block.BlockFlower;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -28,6 +29,7 @@ import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.init.PotionTypes;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionUtils;
import net.minecraft.util.NonNullList;
@@ -41,6 +43,7 @@ import net.minecraft.world.storage.loot.LootTableList;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.brewing.BrewingRecipeRegistry;
import net.minecraftforge.common.capabilities.CapabilityManager;
@@ -110,8 +113,8 @@ import forestry.apiculture.worldgen.HiveDescription;
import forestry.apiculture.worldgen.HiveGenHelper;
import forestry.apiculture.worldgen.HiveRegistry;
import forestry.core.ISaveEventHandler;
import forestry.core.PluginCore;
import forestry.core.PluginFluids;
import forestry.core.ModuleCore;
import forestry.core.ModuleFluids;
import forestry.core.capabilities.NullStorage;
import forestry.core.config.Config;
import forestry.core.config.Constants;
@@ -128,14 +131,14 @@ import forestry.core.utils.IMCUtil;
import forestry.core.utils.Log;
import forestry.core.utils.OreDictUtil;
import forestry.core.utils.VillagerTradeLists;
import forestry.food.PluginFood;
import forestry.food.ModuleFood;
import forestry.food.items.ItemRegistryFood;
import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
import forestry.modules.BlankForestryModule;
import forestry.modules.ForestryModule;
import forestry.modules.ForestryModuleUids;
@ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description", lootTable = "apiculture")
public class PluginApiculture extends BlankForestryPlugin {
@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 {
private static final String CONFIG_CATEGORY = "apiculture";
private static float secondPrincessChance = 0;
@@ -150,6 +153,7 @@ public class PluginApiculture extends BlankForestryPlugin {
private static HiveRegistry hiveRegistry;
public static String beekeepingMode = "NORMAL";
//TODO: Add to config
public static final int ticksPerBeeWorkCycle = 550;
public static int maxFlowersSpawnedPerHive = 20;
@Nullable
@@ -178,7 +182,6 @@ public class PluginApiculture extends BlankForestryPlugin {
@Override
public void setupAPI() {
super.setupAPI();
HiveManager.hiveRegistry = hiveRegistry = new HiveRegistry();
HiveManager.genHelper = new HiveGenHelper();
@@ -216,7 +219,6 @@ public class PluginApiculture extends BlankForestryPlugin {
@Override
public void preInit() {
super.preInit();
BeeDefinition.preInit();
@@ -228,7 +230,7 @@ public class PluginApiculture extends BlankForestryPlugin {
}
// Commands
PluginCore.rootCommand.addChildCommand(new CommandBee());
ModuleCore.rootCommand.addChildCommand(new CommandBee());
}
// TODO: Buildcraft for 1.9
@@ -355,7 +357,6 @@ public class PluginApiculture extends BlankForestryPlugin {
@Override
public void postInit() {
super.postInit();
registerDungeonLoot();
}
@@ -404,7 +405,7 @@ public class PluginApiculture extends BlankForestryPlugin {
@Override
public void registerCrates() {
ItemRegistryCore coreItems = PluginCore.getItems();
ItemRegistryCore coreItems = ModuleCore.getItems();
ItemRegistryApiculture items = getItems();
ICrateRegistry crateRegistry = StorageManager.crateRegistry;
@@ -434,8 +435,8 @@ public class PluginApiculture extends BlankForestryPlugin {
@Override
public void registerRecipes() {
ItemRegistryCore coreItems = PluginCore.getItems();
ItemRegistryFluids fluidItems = PluginFluids.getItems();
ItemRegistryCore coreItems = ModuleCore.getItems();
ItemRegistryFluids fluidItems = ModuleFluids.getItems();
ItemRegistryApiculture items = getItems();
BlockRegistryApiculture blocks = getBlocks();
@@ -504,15 +505,15 @@ public class PluginApiculture extends BlankForestryPlugin {
for(int blockMeta = 0;blockMeta < EnumHoneyComb.VALUES.length - blockCount * 16;blockMeta++){
int itemMeta = blockMeta + blockCount * 16;
RecipeUtil.addRecipe("comb." + itemMeta, new ItemStack(block, 1, blockMeta),
"###",
"###",
"###",
"###",
"###", '#', items.beeComb.get(EnumHoneyComb.get(itemMeta), 1));
}
}
// FOOD STUFF
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FOOD)) {
ItemRegistryFood foodItems = PluginFood.getItems();
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FOOD))) {
ItemRegistryFood foodItems = ModuleFood.getItems();
RecipeUtil.addRecipe("honeyed_slice", new ItemStack(foodItems.honeyedSlice, 4),
"###", "#X#", "###",
'#', items.honeyDrop,
@@ -623,7 +624,7 @@ public class PluginApiculture extends BlankForestryPlugin {
'I', OreDictUtil.INGOT_IRON,
'W', coreItems.craftingMaterial.getWovenSilk());
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) {
// / SQUEEZER
FluidStack honeyDropFluid = Fluids.FOR_HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP);
RecipeManagers.squeezerManager.addRecipe(10, items.honeyDrop.getItemStack(), honeyDropFluid, items.propolis.getItemStack(), 5);
@@ -852,7 +853,6 @@ public class PluginApiculture extends BlankForestryPlugin {
@Override
public void addLootPoolNames(Set<String> lootPoolNames) {
super.addLootPoolNames(lootPoolNames);
lootPoolNames.add("forestry_apiculture_items");
lootPoolNames.add("forestry_apiculture_bees");
}
@@ -943,7 +943,7 @@ public class PluginApiculture extends BlankForestryPlugin {
return true;
}
return super.processIMCMessage(message);
return false;
}
@SubscribeEvent
@@ -43,7 +43,7 @@ import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import forestry.apiculture.MaterialBeehive;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.tiles.TileHive;
import forestry.core.blocks.IBlockWithMeta;
import forestry.core.tiles.TileUtil;
@@ -154,7 +154,7 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister,
if (hiveName == null || hiveName.equals(HiveType.SWARM.getHiveUid())) {
return Collections.emptyList();
}
return PluginApiculture.getHiveRegistry().getDrops(hiveName);
return ModuleApiculture.getHiveRegistry().getDrops(hiveName);
}
@Nullable
@@ -32,7 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.tiles.TileCandle;
import forestry.core.config.Constants;
@@ -61,7 +61,7 @@ public class BlockStump extends BlockTorch implements IItemModelRegister {
if (BlockCandle.lightingItems.contains(heldItem.getItem())) {
IBlockState blockState = worldIn.getBlockState(pos);
Block block = blockState.getBlock();
IBlockState activatedState = PluginApiculture.getBlocks().candle.getStateFromMeta(block.getMetaFromState(blockState));
IBlockState activatedState = ModuleApiculture.getBlocks().candle.getStateFromMeta(block.getMetaFromState(blockState));
worldIn.setBlockState(pos, activatedState, Constants.FLAG_BLOCK_SYNC);
TileCandle tc = new TileCandle();
tc.setColour(16777215); // default to white
@@ -3,7 +3,7 @@ package forestry.apiculture.compat;
import com.google.common.base.Preconditions;
import forestry.api.apiculture.BeeManager;
import forestry.api.genetics.IAlleleSpecies;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.items.ItemRegistryApiculture;
import forestry.core.genetics.Genome;
import forestry.core.utils.JeiUtil;
@@ -16,7 +16,7 @@ import mezz.jei.api.JEIPlugin;
public class ApicultureJeiPlugin implements IModPlugin {
@Override
public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) {
ItemRegistryApiculture items = PluginApiculture.getItems();
ItemRegistryApiculture items = ModuleApiculture.getItems();
Preconditions.checkNotNull(items);
ISubtypeRegistry.ISubtypeInterpreter beeSubtypeInterpreter = itemStack -> {
@@ -31,7 +31,7 @@ public class ApicultureJeiPlugin implements IModPlugin {
@Override
public void register(IModRegistry registry) {
ItemRegistryApiculture items = PluginApiculture.getItems();
ItemRegistryApiculture items = ModuleApiculture.getItems();
Preconditions.checkNotNull(items);
JeiUtil.addDescription(registry, "frames",
@@ -15,19 +15,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import forestry.api.apiculture.IBeeHousingInventory;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IHiveFrame;
import forestry.apiculture.ApiaryBeeListener;
import forestry.apiculture.ApiaryBeeModifier;
import forestry.apiculture.IApiary;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.gui.ContainerMinecartBeehouse;
import forestry.apiculture.gui.GuiBeeHousing;
import forestry.apiculture.inventory.IApiaryInventory;
import forestry.apiculture.inventory.InventoryApiary;
import forestry.core.inventory.IInventoryAdapter;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
@@ -35,9 +22,24 @@ import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Tuple;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.apiculture.IBeeHousingInventory;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IHiveFrame;
import forestry.apiculture.ApiaryBeeListener;
import forestry.apiculture.ApiaryBeeModifier;
import forestry.apiculture.IApiary;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.gui.ContainerMinecartBeehouse;
import forestry.apiculture.gui.GuiBeeHousing;
import forestry.apiculture.inventory.IApiaryInventory;
import forestry.apiculture.inventory.InventoryApiary;
import forestry.core.inventory.IInventoryAdapter;
public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implements IApiary {
private static final IBeeModifier beeModifier = new ApiaryBeeModifier();
@@ -76,12 +78,12 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement
@Override
public IBlockState getDisplayTile() {
return PluginApiculture.getBlocks().apiary.getDefaultState();
return ModuleApiculture.getBlocks().apiary.getDefaultState();
}
@Override
public ItemStack getCartItem() {
return PluginApiculture.getItems().minecartBeehouse.getApiaryMinecart();
return ModuleApiculture.getItems().minecartBeehouse.getApiaryMinecart();
}
@Override
@@ -18,7 +18,7 @@ import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import forestry.apiculture.BeehouseBeeModifier;
import forestry.apiculture.InventoryBeeHousing;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.gui.ContainerMinecartBeehouse;
import forestry.apiculture.gui.GuiBeeHousing;
import forestry.core.inventory.IInventoryAdapter;
@@ -54,12 +54,12 @@ public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase {
@Override
public IBlockState getDisplayTile() {
return PluginApiculture.getBlocks().beeHouse.getDefaultState();
return ModuleApiculture.getBlocks().beeHouse.getDefaultState();
}
@Override
public ItemStack getCartItem() {
return PluginApiculture.getItems().minecartBeehouse.getBeeHouseMinecart();
return ModuleApiculture.getItems().minecartBeehouse.getBeeHouseMinecart();
}
/* IBeeHousing */
@@ -17,14 +17,14 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
public class ParticleBeeExplore extends Particle {
private final Vec3d origin;
public ParticleBeeExplore(World world, Vec3d origin, BlockPos destination, int color) {
super(world, origin.x, origin.y, origin.z, 0.0D, 0.0D, 0.0D);
setParticleTexture(PluginApiculture.getBeeSprite());
setParticleTexture(ModuleApiculture.getBeeSprite());
this.origin = origin;
this.motionX = (destination.getX() + 0.5 - this.posX) * 0.015;
@@ -17,7 +17,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
public class ParticleBeeRoundTrip extends Particle {
private final Vec3d origin;
@@ -25,7 +25,7 @@ public class ParticleBeeRoundTrip extends Particle {
public ParticleBeeRoundTrip(World world, Vec3d origin, BlockPos destination, int color) {
super(world, origin.x, origin.y, origin.z, 0.0D, 0.0D, 0.0D);
setParticleTexture(PluginApiculture.getBeeSprite());
setParticleTexture(ModuleApiculture.getBeeSprite());
this.origin = origin;
this.destination = destination;
@@ -16,7 +16,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
public class ParticleBeeTargetEntity extends Particle {
private final Vec3d origin;
@@ -24,7 +24,7 @@ public class ParticleBeeTargetEntity extends Particle {
public ParticleBeeTargetEntity(World world, Vec3d origin, Entity entity, int color) {
super(world, origin.x, origin.y, origin.z, 0.0D, 0.0D, 0.0D);
setParticleTexture(PluginApiculture.getBeeSprite());
setParticleTexture(ModuleApiculture.getBeeSprite());
this.origin = origin;
this.entity = entity;
@@ -19,7 +19,7 @@ import forestry.api.apiculture.IApiaristTracker;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.ISpeciesRoot;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.core.genetics.BreedingTracker;
public class ApiaristTracker extends BreedingTracker implements IApiaristTracker {
@@ -28,7 +28,7 @@ public class ApiaristTracker extends BreedingTracker implements IApiaristTracker
* Required for creation from map storage
*/
public ApiaristTracker(String s) {
super(s, PluginApiculture.beekeepingMode);
super(s, ModuleApiculture.beekeepingMode);
}
private int queensTotal = 0;
@@ -4,6 +4,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
@@ -13,7 +20,7 @@ import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IAlleleTolerance;
import forestry.api.genetics.IAlyzerPlugin;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.core.config.Config;
import forestry.core.genetics.alleles.AlleleBoolean;
import forestry.core.gui.GuiAlyzer;
@@ -22,11 +29,6 @@ import forestry.core.gui.widgets.ItemStackWidget;
import forestry.core.gui.widgets.WidgetManager;
import forestry.core.utils.StringUtil;
import forestry.core.utils.Translator;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BeeAlyzerPlugin implements IAlyzerPlugin {
public static final BeeAlyzerPlugin INSTANCE = new BeeAlyzerPlugin();
@@ -35,7 +37,7 @@ public class BeeAlyzerPlugin implements IAlyzerPlugin {
private BeeAlyzerPlugin() {
NonNullList<ItemStack> beeList = NonNullList.create();
PluginApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false);
ModuleApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false);
for (ItemStack beeStack : beeList) {
IAlleleBeeSpecies species = BeeGenome.getSpecies(beeStack);
iconStacks.put(species.getUID(), beeStack);
@@ -0,0 +1,120 @@
package forestry.apiculture.genetics;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IBee;
import forestry.api.core.GuiElementAlignment;
import forestry.api.core.IGuiElementHelper;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.EnumDatabaseTab;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IAlleleTolerance;
import forestry.api.genetics.IDatabaseTab;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.core.genetics.alleles.AlleleBoolean;
import forestry.core.render.ColourProperties;
import forestry.core.utils.StringUtil;
import forestry.core.utils.Translator;
@SideOnly(Side.CLIENT)
public class BeeDatabaseTab implements IDatabaseTab<IBee> {
private final EnumDatabaseTab tab;
BeeDatabaseTab(EnumDatabaseTab tab) {
this.tab = tab;
}
@Override
public void createElements(IGuiElementHelper elementHelper, IBee bee, ItemStack itemStack) {
EnumBeeType type = BeeManager.beeRoot.getType(itemStack);
if (type == null) {
return;
}
IAlleleSpecies primarySpecies = bee.getGenome().getPrimary();
boolean active = tab == EnumDatabaseTab.ACTIVE_SPECIES;
elementHelper.addText(Translator.translateToLocal("for.gui.database.tab." + tab.name().toLowerCase() + ".name"), GuiElementAlignment.CENTER, 0xcfb53b);
elementHelper.addAllele(Translator.translateToLocal("for.gui.species"), bee, EnumBeeChromosome.SPECIES, active);
IAlleleTolerance tempTolerance = (IAlleleTolerance) (active ? bee.getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE) : bee.getGenome().getInactiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE));
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.climate"), GuiElementAlignment.CENTER);
elementHelper.addToleranceInfo(tempTolerance, primarySpecies, AlleleManager.climateHelper.toDisplay(primarySpecies.getTemperature()));
IAlleleTolerance humidTolerance = (IAlleleTolerance) (active ? bee.getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE) : bee.getGenome().getInactiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE));
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.humidity"), GuiElementAlignment.CENTER);
elementHelper.addToleranceInfo(humidTolerance, primarySpecies, AlleleManager.climateHelper.toDisplay(primarySpecies.getHumidity()));
elementHelper.addAllele(Translator.translateToLocal("for.gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN, active);
elementHelper.addAllele(Translator.translateToLocal("for.gui.speed"), bee, EnumBeeChromosome.SPEED, active);
elementHelper.addAllele(Translator.translateToLocal("for.gui.pollination"), bee, EnumBeeChromosome.FLOWERING, active);
elementHelper.addAllele(Translator.translateToLocal("for.gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER, active);
IAlleleInteger primaryFertility = (IAlleleInteger) (active ? bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY) : bee.getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY));
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.fertility"), GuiElementAlignment.CENTER);
elementHelper.addFertilityInfo(primaryFertility, 0, 0);
elementHelper.addAllele(Translator.translateToLocal("for.gui.area"), bee, EnumBeeChromosome.TERRITORY, active);
elementHelper.addAllele(Translator.translateToLocal("for.gui.effect"), bee, EnumBeeChromosome.EFFECT, active);
String yes = Translator.translateToLocal("for.yes");
String no = Translator.translateToLocal("for.no");
String diurnal, nocturnal;
if(active) {
if (bee.getGenome().getNeverSleeps()) {
nocturnal = diurnal = yes;
} else {
nocturnal = bee.getGenome().getPrimary().isNocturnal() ? yes : no;
diurnal = !bee.getGenome().getPrimary().isNocturnal() ? yes : no;
}
}else {
if (((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumButterflyChromosome.NOCTURNAL)).getValue()) {
nocturnal = diurnal = yes;
} else {
nocturnal = bee.getGenome().getSecondary().isNocturnal() ? yes : no;
diurnal = !bee.getGenome().getSecondary().isNocturnal() ? yes : no;
}
}
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.diurnal"), GuiElementAlignment.CENTER);
elementHelper.addText(diurnal, GuiElementAlignment.CENTER, elementHelper.factory().getColorCoding(false));
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.nocturnal"), GuiElementAlignment.CENTER);
elementHelper.addText(nocturnal, GuiElementAlignment.CENTER, elementHelper.factory().getColorCoding(false));
String flyer = StringUtil.readableBoolean(active ? bee.getGenome().getToleratesRain() : ((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERATES_RAIN)).getValue(), yes, no);
elementHelper.addAllele(Translator.translateToLocal("for.gui.flyer"), (a) -> flyer, bee, EnumButterflyChromosome.TOLERANT_FLYER, active);
String cave = StringUtil.readableBoolean(active ? bee.getGenome().getCaveDwelling() : ((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(), yes, no);
elementHelper.addAllele(Translator.translateToLocal("for.gui.fireresist"), (a) -> cave, bee, EnumButterflyChromosome.FIRE_RESIST, active);
String displayText;
if (type == EnumBeeType.PRINCESS || type == EnumBeeType.QUEEN) {
String displayTextKey = "for.bees.stock.pristine";
if (!bee.isNatural()) {
displayTextKey = "for.bees.stock.ignoble";
}
displayText = Translator.translateToLocal(displayTextKey);
elementHelper.addText(displayText, GuiElementAlignment.CENTER, ColourProperties.INSTANCE.get("gui.beealyzer.binomial"));
}
}
@Override
public EnumDatabaseTab getTab() {
return tab;
}
}
@@ -36,11 +36,11 @@ import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
import forestry.api.genetics.IAllele;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.genetics.alleles.AlleleEffects;
import forestry.apiculture.items.EnumHoneyComb;
import forestry.apiculture.items.EnumPollenCluster;
import forestry.core.PluginCore;
import forestry.core.ModuleCore;
import forestry.core.config.Constants;
import forestry.core.genetics.alleles.AlleleHelper;
import forestry.core.genetics.alleles.EnumAllele;
@@ -50,7 +50,7 @@ public enum BeeDefinition implements IBeeDefinition {
FOREST(BeeBranchDefinition.HONEY, "nigrocincta", true, new Color(0x19d0ec), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f);
}
@Override
@@ -67,7 +67,7 @@ public enum BeeDefinition implements IBeeDefinition {
MEADOWS(BeeBranchDefinition.HONEY, "florea", true, new Color(0xef131e), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f);
}
@Override
@@ -83,7 +83,7 @@ public enum BeeDefinition implements IBeeDefinition {
COMMON(BeeBranchDefinition.HONEY, "cerana", true, new Color(0xb2b2b2), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.35f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.35f);
}
@Override
@@ -105,7 +105,7 @@ public enum BeeDefinition implements IBeeDefinition {
CULTIVATED(BeeBranchDefinition.HONEY, "mellifera", true, new Color(0x5734ec), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f);
}
@Override
@@ -126,7 +126,7 @@ public enum BeeDefinition implements IBeeDefinition {
NOBLE(BeeBranchDefinition.NOBLE, "nobilis", false, new Color(0xec9a19), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f);
}
@Override
@@ -144,7 +144,7 @@ public enum BeeDefinition implements IBeeDefinition {
MAJESTIC(BeeBranchDefinition.NOBLE, "regalis", true, new Color(0x7f0000), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.30f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.30f);
}
@Override
@@ -162,8 +162,8 @@ public enum BeeDefinition implements IBeeDefinition {
IMPERIAL(BeeBranchDefinition.NOBLE, "imperatorius", false, new Color(0xa3e02f), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f)
.addProduct(PluginApiculture.getItems().royalJelly.getItemStack(), 0.15f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f)
.addProduct(ModuleApiculture.getItems().royalJelly.getItemStack(), 0.15f)
.setHasEffect();
}
@@ -184,7 +184,7 @@ public enum BeeDefinition implements IBeeDefinition {
DILIGENT(BeeBranchDefinition.INDUSTRIOUS, "sedulus", false, new Color(0xc219ec), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f);
}
@Override
@@ -202,7 +202,7 @@ public enum BeeDefinition implements IBeeDefinition {
UNWEARY(BeeBranchDefinition.INDUSTRIOUS, "assiduus", true, new Color(0x19ec5a), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.30f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.30f);
}
@Override
@@ -219,8 +219,8 @@ public enum BeeDefinition implements IBeeDefinition {
INDUSTRIOUS(BeeBranchDefinition.INDUSTRIOUS, "industria", false, new Color(0xffffff), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f)
.addProduct(PluginApiculture.getItems().pollenCluster.get(EnumPollenCluster.NORMAL, 1), 0.15f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f)
.addProduct(ModuleApiculture.getItems().pollenCluster.get(EnumPollenCluster.NORMAL, 1), 0.15f)
.setHasEffect();
}
@@ -241,7 +241,7 @@ public enum BeeDefinition implements IBeeDefinition {
STEADFAST(BeeBranchDefinition.HEROIC, "legio", false, new Color(0x4d2b15), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.20f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.20f)
.setHasEffect();
}
@@ -261,7 +261,7 @@ public enum BeeDefinition implements IBeeDefinition {
VALIANT(BeeBranchDefinition.HEROIC, "centurio", true, new Color(0x626bdd), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.30f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.30f)
.addSpecialty(new ItemStack(Items.SUGAR), 0.15f);
}
@@ -281,7 +281,7 @@ public enum BeeDefinition implements IBeeDefinition {
HEROIC(BeeBranchDefinition.HEROIC, "kraphti", false, new Color(0xb3d5e4), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.40f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.40f)
.setHasEffect();
}
@@ -305,7 +305,7 @@ public enum BeeDefinition implements IBeeDefinition {
SINISTER(BeeBranchDefinition.INFERNAL, "caecus", false, new Color(0xb3d5e4), new Color(0x9a2323)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f)
.setTemperature(EnumTemperature.HELLISH)
.setHumidity(EnumHumidity.ARID);
}
@@ -328,8 +328,8 @@ public enum BeeDefinition implements IBeeDefinition {
FIENDISH(BeeBranchDefinition.INFERNAL, "diabolus", true, new Color(0xd7bee5), new Color(0x9a2323)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f)
.addProduct(PluginCore.getItems().ash.getItemStack(), 0.15f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f)
.addProduct(ModuleCore.getItems().ash.getItemStack(), 0.15f)
.setTemperature(EnumTemperature.HELLISH)
.setHumidity(EnumHumidity.ARID);
}
@@ -352,7 +352,7 @@ public enum BeeDefinition implements IBeeDefinition {
DEMONIC(BeeBranchDefinition.INFERNAL, "draco", false, new Color(0xf4e400), new Color(0x9a2323)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f)
.addProduct(new ItemStack(Items.GLOWSTONE_DUST), 0.15f)
.setHasEffect()
.setTemperature(EnumTemperature.HELLISH)
@@ -377,7 +377,7 @@ public enum BeeDefinition implements IBeeDefinition {
MODEST(BeeBranchDefinition.AUSTERE, "modicus", false, new Color(0xc5be86), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f)
.setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID);
}
@@ -396,7 +396,7 @@ public enum BeeDefinition implements IBeeDefinition {
FRUGAL(BeeBranchDefinition.AUSTERE, "permodestus", true, new Color(0xe8dcb1), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.30f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.30f)
.setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID);
}
@@ -420,8 +420,8 @@ public enum BeeDefinition implements IBeeDefinition {
AUSTERE(BeeBranchDefinition.AUSTERE, "correpere", false, new Color(0xfffac2), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f)
.addSpecialty(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.POWDERY, 1), 0.50f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f)
.addSpecialty(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.POWDERY, 1), 0.50f)
.setHasEffect()
.setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID);
@@ -447,7 +447,7 @@ public enum BeeDefinition implements IBeeDefinition {
TROPICAL(BeeBranchDefinition.TROPICAL, "mendelia", false, new Color(0x378020), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f)
.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -466,7 +466,7 @@ public enum BeeDefinition implements IBeeDefinition {
EXOTIC(BeeBranchDefinition.TROPICAL, "darwini", true, new Color(0x304903), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f)
.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -485,7 +485,7 @@ public enum BeeDefinition implements IBeeDefinition {
EDENIC(BeeBranchDefinition.TROPICAL, "humboldti", false, new Color(0x393d0d), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f)
.setHasEffect()
.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
@@ -509,7 +509,7 @@ public enum BeeDefinition implements IBeeDefinition {
ENDED(BeeBranchDefinition.END, "notchi", false, new Color(0xe079fa), new Color(0xd9de9e)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.30f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.30f)
.setTemperature(EnumTemperature.COLD);
}
@@ -526,7 +526,7 @@ public enum BeeDefinition implements IBeeDefinition {
SPECTRAL(BeeBranchDefinition.END, "idolum", true, new Color(0xa98bed), new Color(0xd9de9e)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.50f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.50f)
.setTemperature(EnumTemperature.COLD);
}
@@ -543,7 +543,7 @@ public enum BeeDefinition implements IBeeDefinition {
PHANTASMAL(BeeBranchDefinition.END, "lemur", false, new Color(0xcc00fa), new Color(0xd9de9e)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.40f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.40f)
.setHasEffect()
.setTemperature(EnumTemperature.COLD);
}
@@ -565,7 +565,7 @@ public enum BeeDefinition implements IBeeDefinition {
WINTRY(BeeBranchDefinition.FROZEN, "brumalis", false, new Color(0xa0ffc8), new Color(0xdaf5f3)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f)
.setTemperature(EnumTemperature.ICY);
}
@@ -584,8 +584,8 @@ public enum BeeDefinition implements IBeeDefinition {
ICY(BeeBranchDefinition.FROZEN, "coagulis", true, new Color(0xa0ffff), new Color(0xdaf5f3)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f)
.addProduct(PluginCore.getItems().craftingMaterial.getIceShard(1), 0.20f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f)
.addProduct(ModuleCore.getItems().craftingMaterial.getIceShard(1), 0.20f)
.setTemperature(EnumTemperature.ICY);
}
@@ -604,8 +604,8 @@ public enum BeeDefinition implements IBeeDefinition {
GLACIAL(BeeBranchDefinition.FROZEN, "glacialis", false, new Color(0xefffff), new Color(0xdaf5f3)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f)
.addProduct(PluginCore.getItems().craftingMaterial.getIceShard(1), 0.40f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f)
.addProduct(ModuleCore.getItems().craftingMaterial.getIceShard(1), 0.40f)
.setTemperature(EnumTemperature.ICY)
.setHasEffect();
}
@@ -627,7 +627,7 @@ public enum BeeDefinition implements IBeeDefinition {
VINDICTIVE(BeeBranchDefinition.VENGEFUL, "ultio", false, new Color(0xeafff3), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.25f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.25f)
.setIsNotCounted();
}
@@ -645,7 +645,7 @@ public enum BeeDefinition implements IBeeDefinition {
VENGEFUL(BeeBranchDefinition.VENGEFUL, "punire", false, new Color(0xc2de00), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f)
.setIsNotCounted();
}
@@ -664,7 +664,7 @@ public enum BeeDefinition implements IBeeDefinition {
AVENGING(BeeBranchDefinition.VENGEFUL, "hostimentum", false, new Color(0xddff00), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f)
.setHasEffect()
.setIsNotCounted();
}
@@ -686,7 +686,7 @@ public enum BeeDefinition implements IBeeDefinition {
LEPORINE(BeeBranchDefinition.FESTIVE, "lepus", false, new Color(0xfeff8f), new Color(0x3cd757)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f)
.addProduct(new ItemStack(Items.EGG), 0.10f)
.setHasEffect()
.setIsNotCounted();
@@ -713,8 +713,8 @@ public enum BeeDefinition implements IBeeDefinition {
MERRY(BeeBranchDefinition.FESTIVE, "feliciter", false, new Color(0xffffff), new Color(0xd40000)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f)
.addProduct(PluginCore.getItems().craftingMaterial.getIceShard(1), 0.20f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f)
.addProduct(ModuleCore.getItems().craftingMaterial.getIceShard(1), 0.20f)
.setTemperature(EnumTemperature.ICY)
.setHasEffect()
.setIsNotCounted();
@@ -742,8 +742,8 @@ public enum BeeDefinition implements IBeeDefinition {
TIPSY(BeeBranchDefinition.FESTIVE, "ebrius", false, new Color(0xffffff), new Color(0xc219ec)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f)
.addProduct(PluginCore.getItems().craftingMaterial.getIceShard(1), 0.20f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f)
.addProduct(ModuleCore.getItems().craftingMaterial.getIceShard(1), 0.20f)
.setTemperature(EnumTemperature.ICY)
.setHasEffect()
.setIsNotCounted();
@@ -772,7 +772,7 @@ public enum BeeDefinition implements IBeeDefinition {
TRICKY(BeeBranchDefinition.FESTIVE, "libita", false, new Color(0x49413B), new Color(0xFF6A00)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f)
.addProduct(new ItemStack(Items.COOKIE), 0.15f)
.addSpecialty(new ItemStack(Items.SKULL, 1, 0), 0.02f)
.addSpecialty(new ItemStack(Items.SKULL, 1, 2), 0.02f)
@@ -807,7 +807,7 @@ public enum BeeDefinition implements IBeeDefinition {
RURAL(BeeBranchDefinition.AGRARIAN, "rustico", false, new Color(0xfeff8f), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.20f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.20f);
}
@Override
@@ -824,7 +824,7 @@ public enum BeeDefinition implements IBeeDefinition {
FARMERLY(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xD39728), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.27f);
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.27f);
}
@Override
@@ -842,7 +842,7 @@ public enum BeeDefinition implements IBeeDefinition {
AGRARIAN(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xFFCA75), new Color(0xFFE047)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.35f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.35f)
.setHasEffect();
}
@@ -865,7 +865,7 @@ public enum BeeDefinition implements IBeeDefinition {
MARSHY(BeeBranchDefinition.BOGGY, "adorasti", true, new Color(0x546626), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.30f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.30f)
.setHumidity(EnumHumidity.DAMP);
}
@@ -882,7 +882,7 @@ public enum BeeDefinition implements IBeeDefinition {
MIRY(BeeBranchDefinition.BOGGY, "humidium", true, new Color(0x92AF42), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.36f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.36f)
.setHumidity(EnumHumidity.DAMP);
}
@@ -903,8 +903,8 @@ public enum BeeDefinition implements IBeeDefinition {
BOGGY(BeeBranchDefinition.BOGGY, "paluster", true, new Color(0x698948), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.39f)
.addSpecialty(PluginCore.getItems().peat.getItemStack(), 0.08f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.39f)
.addSpecialty(ModuleCore.getItems().peat.getItemStack(), 0.08f)
.setHumidity(EnumHumidity.DAMP);
}
@@ -928,8 +928,8 @@ public enum BeeDefinition implements IBeeDefinition {
MONASTIC(BeeBranchDefinition.MONASTIC, "monachus", false, new Color(0x42371c), new Color(0xfff7b6)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.30f)
.addSpecialty(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.10f)
beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.30f)
.addSpecialty(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.10f)
.setJubilanceProvider(new JubilanceProviderHermit());
}
@@ -946,7 +946,7 @@ public enum BeeDefinition implements IBeeDefinition {
SECLUDED(BeeBranchDefinition.MONASTIC, "contractus", true, new Color(0x7b6634), new Color(0xfff7b6)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addSpecialty(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f)
beeSpecies.addSpecialty(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f)
.setJubilanceProvider(new JubilanceProviderHermit());
}
@@ -963,7 +963,7 @@ public enum BeeDefinition implements IBeeDefinition {
HERMITIC(BeeBranchDefinition.MONASTIC, "anachoreta", false, new Color(0xffd46c), new Color(0xfff7b6)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addSpecialty(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f)
beeSpecies.addSpecialty(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f)
.setJubilanceProvider(new JubilanceProviderHermit())
.setHasEffect();
}
@@ -0,0 +1,71 @@
package forestry.apiculture.genetics;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IBee;
import forestry.api.genetics.EnumDatabaseTab;
import forestry.api.genetics.IDatabaseTab;
import forestry.api.genetics.ISpeciesPlugin;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.items.EnumHoneyComb;
import forestry.core.config.Config;
//TODO: Add support for the alyzer
@SideOnly(Side.CLIENT)
public class BeePlugin implements ISpeciesPlugin<IBee> {
public static final BeePlugin INSTANCE = new BeePlugin();
private static final BeeDatabaseTab ACTIVE = new BeeDatabaseTab(EnumDatabaseTab.ACTIVE_SPECIES);
private static final BeeDatabaseTab INACTIVE = new BeeDatabaseTab(EnumDatabaseTab.INACTIVE_SPECIES);
protected final Map<String, ItemStack> iconStacks = new HashMap<>();
private BeePlugin() {
NonNullList<ItemStack> beeList = NonNullList.create();
ModuleApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false);
for (ItemStack beeStack : beeList) {
IAlleleBeeSpecies species = BeeGenome.getSpecies(beeStack);
iconStacks.put(species.getUID(), beeStack);
}
}
@Override
public Map<String, ItemStack> getIndividualStacks() {
return iconStacks;
}
@Override
public List<String> getHints() {
return Config.hints.get("beealyzer");
}
@Override
public IDatabaseTab getSpeciesTab(boolean active) {
if(active){
return ACTIVE;
}
return INACTIVE;
}
@Override
public ItemStack getTabDatabaseIconItem(EnumDatabaseTab tab) {
switch (tab){
case ACTIVE_SPECIES:
return BeeDefinition.MEADOWS.getMemberStack(EnumBeeType.QUEEN);
case PRODUCTS:
return ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1);
case MUTATIONS:
return ModuleApiculture.getItems().frameImpregnated.getItemStack();
}
return BeeDefinition.MEADOWS.getMemberStack(EnumBeeType.DRONE);
}
}
@@ -10,6 +10,8 @@
******************************************************************************/
package forestry.apiculture.genetics;
import com.google.common.base.Preconditions;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
@@ -17,8 +19,17 @@ import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
import com.google.common.base.Preconditions;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import com.mojang.authlib.GameProfile;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
@@ -40,18 +51,14 @@ import forestry.api.genetics.IChromosome;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesPlugin;
import forestry.api.genetics.ISpeciesType;
import forestry.apiculture.BeeHousingListener;
import forestry.apiculture.BeeHousingModifier;
import forestry.apiculture.BeekeepingLogic;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.items.ItemRegistryApiculture;
import forestry.core.genetics.SpeciesRoot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.FMLCommonHandler;
public class BeeRoot extends SpeciesRoot implements IBeeRoot {
@@ -113,7 +120,7 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot {
public ItemStack getMemberStack(IIndividual individual, ISpeciesType type) {
Preconditions.checkArgument(individual instanceof IBee, "individual is not a bee");
Preconditions.checkArgument(type instanceof EnumBeeType, "type is not an EnumBeeType");
ItemRegistryApiculture apicultureItems = PluginApiculture.getItems();
ItemRegistryApiculture apicultureItems = ModuleApiculture.getItems();
IBee bee = (IBee) individual;
Item beeItem;
@@ -149,7 +156,7 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot {
@Override
public EnumBeeType getType(ItemStack stack) {
Item item = stack.getItem();
ItemRegistryApiculture apicultureItems = PluginApiculture.getItems();
ItemRegistryApiculture apicultureItems = ModuleApiculture.getItems();
if (apicultureItems.beeDroneGE == item) {
return EnumBeeType.DRONE;
@@ -343,6 +350,7 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot {
tracker.setWorld(world);
return tracker;
}
@Override
@@ -374,4 +382,10 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot {
public IAlyzerPlugin getAlyzerPlugin() {
return BeeAlyzerPlugin.INSTANCE;
}
@Override
@SideOnly(Side.CLIENT)
public ISpeciesPlugin getSpeciesPlugin() {
return BeePlugin.INSTANCE;
}
}
@@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.genetics.BeeGenome;
import forestry.apiculture.inventory.ItemInventoryImprinter;
import forestry.core.config.Constants;
@@ -45,7 +45,7 @@ public class GuiImprinter extends GuiForestry<ContainerImprinter> {
this.ySize = 185;
NonNullList<ItemStack> beeList = NonNullList.create();
PluginApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false);
ModuleApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false);
for (ItemStack beeStack : beeList) {
IAlleleBeeSpecies species = BeeGenome.getSpecies(beeStack);
if (species != null) {
@@ -10,13 +10,14 @@
******************************************************************************/
package forestry.apiculture.inventory;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import forestry.apiculture.multiblock.TileAlvearySieve;
import forestry.core.PluginCore;
import forestry.core.ModuleCore;
import forestry.core.inventory.InventoryAdapterTile;
import forestry.core.inventory.watchers.ISlotPickupWatcher;
import forestry.core.utils.ItemStackUtil;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
public class InventoryAlvearySieve extends InventoryAdapterTile<TileAlvearySieve> implements ISlotPickupWatcher {
public static final int SLOT_POLLEN_1 = 0;
@@ -29,7 +30,7 @@ public class InventoryAlvearySieve extends InventoryAdapterTile<TileAlvearySieve
@Override
public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
return ItemStackUtil.isIdenticalItem(PluginCore.getItems().craftingMaterial.getWovenSilk(), itemStack);
return ItemStackUtil.isIdenticalItem(ModuleCore.getItems().craftingMaterial.getWovenSilk(), itemStack);
}
public boolean canStorePollen() {
@@ -10,23 +10,25 @@
******************************************************************************/
package forestry.apiculture.inventory;
import com.google.common.collect.ImmutableSet;
import java.util.Set;
import com.google.common.collect.ImmutableSet;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.IBee;
import forestry.api.core.IErrorSource;
import forestry.api.core.IErrorState;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.items.HabitatLocatorLogic;
import forestry.apiculture.items.ItemHabitatLocator;
import forestry.core.errors.EnumErrorCode;
import forestry.core.inventory.ItemInventory;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.biome.Biome;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.IBee;
import forestry.api.core.IErrorSource;
import forestry.api.core.IErrorState;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.items.HabitatLocatorLogic;
import forestry.apiculture.items.ItemHabitatLocator;
import forestry.core.errors.EnumErrorCode;
import forestry.core.inventory.ItemInventory;
public class ItemInventoryHabitatLocator extends ItemInventory implements IErrorSource {
private static final short SLOT_ENERGY = 2;
@@ -47,7 +49,7 @@ public class ItemInventoryHabitatLocator extends ItemInventory implements IError
}
Item item = itemstack.getItem();
return PluginApiculture.getItems().honeyDrop == item || PluginApiculture.getItems().honeydew == item;
return ModuleApiculture.getItems().honeyDrop == item || ModuleApiculture.getItems().honeydew == item;
}
@Override
@@ -30,7 +30,7 @@ import forestry.api.arboriculture.ArboricultureCapabilities;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.core.config.Constants;
public class ItemArmorApiarist extends ItemArmor implements IItemModelRegister {
@@ -43,7 +43,7 @@ public class ItemArmorApiarist extends ItemArmor implements IItemModelRegister {
@Override
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) {
if (stack != null && stack.getItem() == PluginApiculture.getItems().apiaristLegs) {
if (stack != null && stack.getItem() == ModuleApiculture.getItems().apiaristLegs) {
return Constants.MOD_ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_SECONDARY;
} else {
return Constants.MOD_ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_PRIMARY;
@@ -27,7 +27,7 @@ import net.minecraftforge.event.terraingen.TerrainGen;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.core.config.Config;
import forestry.core.config.Constants;
import forestry.core.utils.Log;
@@ -45,7 +45,7 @@ public abstract class HiveDecorator {
}
public static void decorateHives(World world, Random rand, int chunkX, int chunkZ) {
List<Hive> hives = PluginApiculture.getHiveRegistry().getHives();
List<Hive> hives = ModuleApiculture.getHiveRegistry().getHives();
if (Config.generateBeehivesDebug) {
decorateHivesDebug(world, rand, chunkX, chunkZ, hives);
@@ -25,7 +25,7 @@ import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.EnumTolerance;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.genetics.BeeDefinition;
import forestry.core.config.Constants;
import net.minecraft.block.Block;
@@ -104,7 +104,7 @@ public enum HiveDescription implements IHiveDescription {
private final IHiveGen hiveGen;
HiveDescription(IHiveRegistry.HiveType hiveType, float genChance, BeeDefinition beeTemplate, IHiveGen hiveGen) {
this.blockState = PluginApiculture.getBlocks().beehives.getStateForType(hiveType);
this.blockState = ModuleApiculture.getBlocks().beehives.getStateForType(hiveType);
this.genChance = genChance;
this.beeGenome = beeTemplate.getGenome();
this.hiveGen = hiveGen;
@@ -19,7 +19,7 @@ import forestry.api.apiculture.hives.IHiveGen;
import forestry.api.apiculture.hives.IHiveRegistry;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.tiles.TileHive;
import forestry.core.tiles.TileUtil;
import net.minecraft.block.state.IBlockState;
@@ -44,7 +44,7 @@ public class HiveDescriptionSwarmer implements IHiveDescription {
@Override
public IBlockState getBlockState() {
return PluginApiculture.getBlocks().beehives.getStateForType(IHiveRegistry.HiveType.SWARM);
return ModuleApiculture.getBlocks().beehives.getStateForType(IHiveRegistry.HiveType.SWARM);
}
@Override
@@ -26,6 +26,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
@@ -54,16 +55,16 @@ import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.ForestryAPI;
import forestry.api.genetics.AlleleManager;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.flowers.Flower;
import forestry.apiculture.flowers.FlowerRegistry;
import forestry.apiculture.tiles.TileBeeHouse;
import forestry.arboriculture.PluginArboriculture;
import forestry.core.PluginCore;
import forestry.arboriculture.ModuleArboriculture;
import forestry.core.ModuleCore;
import forestry.core.blocks.BlockBase;
import forestry.core.config.Constants;
import forestry.core.tiles.TileUtil;
import forestry.plugins.ForestryPluginUids;
import forestry.modules.ForestryModuleUids;
public class VillageApiaristHouse extends StructureVillagePieces.House1 {
@@ -195,7 +196,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
// Escritoire
if (random.nextInt(2) == 0) {
IBlockState escritoireBlock = PluginCore.getBlocks().escritoire.getDefaultState().withProperty(BlockBase.FACING, EnumFacing.EAST);
IBlockState escritoireBlock = ModuleCore.getBlocks().escritoire.getDefaultState().withProperty(BlockBase.FACING, EnumFacing.EAST);
setBlockState(world, escritoireBlock, 1, 1, 3, structBoundingBox);
}
@@ -312,11 +313,11 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
}
IBlockState blockState = world.getBlockState(posNew);
if (PluginApiculture.getBlocks().beeHouse == blockState.getBlock() || !world.isBlockLoaded(posNew.down())) {
if (ModuleApiculture.getBlocks().beeHouse == blockState.getBlock() || !world.isBlockLoaded(posNew.down())) {
return;
}
IBlockState beeHouseDefaultState = PluginApiculture.getBlocks().beeHouse.getDefaultState();
IBlockState beeHouseDefaultState = ModuleApiculture.getBlocks().beeHouse.getDefaultState();
world.setBlockState(posNew, beeHouseDefaultState, Constants.FLAG_BLOCK_SYNC);
TileBeeHouse beeHouse = TileUtil.getTile(world, posNew, TileBeeHouse.class);
@@ -381,9 +382,9 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
ForgeRegistry<VillagerRegistry.VillagerProfession> registry = (ForgeRegistry<VillagerRegistry.VillagerProfession>) ForgeRegistries.VILLAGER_PROFESSIONS;
if (villagerCount <= 0) {
return registry.getID(PluginApiculture.villagerApiarist);
} else if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) {
return registry.getID(PluginArboriculture.villagerArborist);
return registry.getID(ModuleApiculture.villagerApiarist);
} else if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) {
return registry.getID(ModuleArboriculture.villagerArborist);
} else {
return currentVillagerProfession;
}
@@ -407,7 +408,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
IWoodType woodType;
boolean fireproof;
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) {
woodType = EnumForestryWoodType.getRandom(random);
fireproof = random.nextInt(4) == 0;
} else {
@@ -74,7 +74,6 @@ import forestry.arboriculture.blocks.BlockDefaultLeaves;
import forestry.arboriculture.blocks.BlockForestryLeaves;
import forestry.arboriculture.blocks.BlockRegistryArboriculture;
import forestry.arboriculture.capabilities.ArmorNaturalist;
import forestry.arboriculture.charcoal.CharcoalPileWall;
import forestry.arboriculture.commands.CommandTree;
import forestry.arboriculture.genetics.TreeBranchDefinition;
import forestry.arboriculture.genetics.TreeDefinition;
@@ -95,7 +94,7 @@ import forestry.arboriculture.tiles.TileFruitPod;
import forestry.arboriculture.tiles.TileLeaves;
import forestry.arboriculture.tiles.TileSapling;
import forestry.arboriculture.worldgen.TreeDecorator;
import forestry.core.PluginCore;
import forestry.core.ModuleCore;
import forestry.core.capabilities.NullStorage;
import forestry.core.config.Config;
import forestry.core.config.Constants;
@@ -107,14 +106,13 @@ import forestry.core.recipes.RecipeUtil;
import forestry.core.render.TextureManagerForestry;
import forestry.core.utils.IMCUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.OreDictUtil;
import forestry.core.utils.VillagerTradeLists;
import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
import forestry.modules.BlankForestryModule;
import forestry.modules.ForestryModule;
import forestry.modules.ForestryModuleUids;
@ForestryPlugin(pluginID = ForestryPluginUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description", lootTable = "arboriculture")
public class PluginArboriculture extends BlankForestryPlugin {
@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 {
@SuppressWarnings("NullableProblems")
@SidedProxy(clientSide = "forestry.arboriculture.proxy.ProxyArboricultureClient", serverSide = "forestry.arboriculture.proxy.ProxyArboriculture")
@@ -178,8 +176,6 @@ public class PluginArboriculture extends BlankForestryPlugin {
@Override
public void preInit() {
super.preInit();
MinecraftForge.EVENT_BUS.register(this);
if (Config.generateTrees) {
@@ -216,19 +212,16 @@ public class PluginArboriculture extends BlankForestryPlugin {
proxy.initializeModels();
// Commands
PluginCore.rootCommand.addChildCommand(new CommandTree());
ModuleCore.rootCommand.addChildCommand(new CommandTree());
}
@Override
public void addLootPoolNames(Set<String> lootPoolNames) {
super.addLootPoolNames(lootPoolNames);
lootPoolNames.add("forestry_arboriculture_items");
}
@Override
public void doInit() {
super.doInit();
// Create alleles
registerAlleles();
TreeDefinition.initTrees();
@@ -268,18 +261,6 @@ public class PluginArboriculture extends BlankForestryPlugin {
}
}
@Override
public void postInit() {
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.CLAY, 3));
TreeManager.pileWalls.add(new CharcoalPileWall(PluginArboriculture.getBlocks().loam, 4));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.END_STONE, 6));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.END_BRICKS, 6));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.DIRT, 2));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.GRAVEL, 1));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.NETHERRACK, 3));
TreeManager.pileWalls.add(new CharcoalPileWall(PluginCore.getBlocks().ashBrick, 5));
}
@Override
public void registerCrates() {
ICrateRegistry crateRegistry = StorageManager.crateRegistry;
@@ -294,7 +275,7 @@ public class PluginArboriculture extends BlankForestryPlugin {
@Override
public void registerRecipes() {
ItemRegistryCore coreItems = PluginCore.getItems();
ItemRegistryCore coreItems = ModuleCore.getItems();
BlockRegistryArboriculture blocks = getBlocks();
ItemRegistryArboriculture items = getItems();
@@ -405,7 +386,7 @@ public class PluginArboriculture extends BlankForestryPlugin {
'#', fireproofPlanks.copy());
// Fabricator recipes
if (ForestryAPI.enabledPlugins.containsAll(Arrays.asList(ForestryPluginUids.FACTORY, ForestryPluginUids.APICULTURE))) {
if (ForestryAPI.enabledModules.containsAll(Arrays.asList(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY), new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE)))) {
logs.setCount(1);
fireproofLogs.setCount(1);
RecipeManagers.fabricatorManager.addRecipe(ItemStack.EMPTY, Fluids.GLASS.getFluid(500), fireproofLogs.copy(), new Object[]{
@@ -426,7 +407,7 @@ public class PluginArboriculture extends BlankForestryPlugin {
}
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) {
// SQUEEZER RECIPES
int seedOilMultiplier = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed");
@@ -459,22 +440,6 @@ public class PluginArboriculture extends BlankForestryPlugin {
'#', "blockGlass",
'X', "treeSapling",
'Y', "chestWood");
//Wood Pile
RecipeUtil.addShapelessRecipe("wood_pile", new ItemStack(blocks.woodPile), OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD);
RecipeUtil.addShapelessRecipe("wood_pile_decorative", new ItemStack(blocks.woodPile), blocks.woodPileDecorative);
RecipeUtil.addShapelessRecipe("decorative_wood_pile", new ItemStack(blocks.woodPileDecorative), blocks.woodPile);
//Charcoal
RecipeUtil.addRecipe("charcoal_block", blocks.charcoal,
"###",
"###",
"###",
'#', new ItemStack(Items.COAL, 1, 1));
RecipeUtil.addShapelessRecipe("charcoal", new ItemStack(Items.COAL, 9, 1), blocks.charcoal);
//Dirt Pile Block
RecipeUtil.addShapelessRecipe("loam", new ItemStack(blocks.loam, 4), Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL);
}
private static void registerAlleles() {
@@ -571,7 +536,7 @@ public class PluginArboriculture extends BlankForestryPlugin {
}
return true;
}
return super.processIMCMessage(message);
return false;
}
@Override
@@ -0,0 +1,71 @@
package forestry.arboriculture;
import com.google.common.base.Preconditions;
import javax.annotation.Nullable;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.TreeManager;
import forestry.arboriculture.blocks.BlockRegistryCharcoal;
import forestry.arboriculture.charcoal.CharcoalPileWall;
import forestry.core.ModuleCore;
import forestry.core.config.Constants;
import forestry.core.items.ItemRegistryCore;
import forestry.core.recipes.RecipeUtil;
import forestry.core.utils.OreDictUtil;
import forestry.modules.BlankForestryModule;
import forestry.modules.ForestryModule;
import forestry.modules.ForestryModuleUids;
@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.CHARCOAL, name = "Charcoal", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.module.charcoal.description")
public class ModuleCharcoal extends BlankForestryModule {
@Nullable
private static BlockRegistryCharcoal blocks;
public static BlockRegistryCharcoal getBlocks() {
Preconditions.checkState(blocks != null);
return blocks;
}
@Override
public void registerItemsAndBlocks() {
blocks = new BlockRegistryCharcoal();
}
@Override
public void postInit() {
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.CLAY, 3));
TreeManager.pileWalls.add(new CharcoalPileWall(getBlocks().loam, 4));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.END_STONE, 6));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.END_BRICKS, 6));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.DIRT, 2));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.GRAVEL, 1));
TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.NETHERRACK, 3));
TreeManager.pileWalls.add(new CharcoalPileWall(ModuleCore.getBlocks().ashBrick, 5));
}
@Override
public void registerRecipes() {
BlockRegistryCharcoal blocks = getBlocks();
ItemRegistryCore coreItems = ModuleCore.getItems();
//Wood Pile
RecipeUtil.addShapelessRecipe("wood_pile", new ItemStack(blocks.woodPile), OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD);
RecipeUtil.addShapelessRecipe("wood_pile_decorative", new ItemStack(blocks.woodPile), blocks.woodPileDecorative);
RecipeUtil.addShapelessRecipe("decorative_wood_pile", new ItemStack(blocks.woodPileDecorative), blocks.woodPile);
//Charcoal
RecipeUtil.addRecipe("charcoal_block", blocks.charcoal,
"###",
"###",
"###",
'#', new ItemStack(Items.COAL, 1, 1));
RecipeUtil.addShapelessRecipe("charcoal", new ItemStack(Items.COAL, 9, 1), blocks.charcoal);
//Dirt Pile Block
RecipeUtil.addShapelessRecipe("loam", new ItemStack(blocks.loam, 4), Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL);
}
}
@@ -10,6 +10,8 @@
******************************************************************************/
package forestry.arboriculture;
import com.google.common.base.Preconditions;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
@@ -18,7 +20,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.google.common.base.Preconditions;
import net.minecraft.block.Block;
import net.minecraft.block.BlockNewLog;
import net.minecraft.block.BlockOldLog;
import net.minecraft.block.BlockPlanks;
import net.minecraft.block.BlockWoodSlab;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.EnumVanillaWoodType;
import forestry.api.arboriculture.IWoodAccess;
import forestry.api.arboriculture.IWoodType;
@@ -31,15 +42,6 @@ import forestry.arboriculture.blocks.BlockForestryPlanks;
import forestry.arboriculture.blocks.BlockForestrySlab;
import forestry.arboriculture.blocks.BlockForestryStairs;
import forestry.arboriculture.blocks.PropertyWoodType;
import net.minecraft.block.Block;
import net.minecraft.block.BlockNewLog;
import net.minecraft.block.BlockOldLog;
import net.minecraft.block.BlockPlanks;
import net.minecraft.block.BlockWoodSlab;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
public class WoodAccess implements IWoodAccess {
@Nullable
@@ -179,7 +181,7 @@ public class WoodAccess implements IWoodAccess {
IWoodType woodType = woodTyped.getWoodType(meta);
ItemStack itemStack = new ItemStack(woodTyped, 1, meta);
if (!(woodType instanceof EnumVanillaWoodType)) {
PluginArboriculture.proxy.registerWoodModel(woodTyped, true);
ModuleArboriculture.proxy.registerWoodModel(woodTyped, true);
}
register(woodType, woodBlockKind, fireproof, blockState, itemStack);
}
@@ -194,7 +196,7 @@ public class WoodAccess implements IWoodAccess {
IWoodType woodType = woodTyped.getWoodType(0);
ItemStack itemStack = new ItemStack(woodTyped);
if (!(woodType instanceof EnumVanillaWoodType)) {
PluginArboriculture.proxy.registerWoodModel(woodTyped, false);
ModuleArboriculture.proxy.registerWoodModel(woodTyped, false);
}
register(woodType, woodBlockKind, fireproof, blockState, itemStack);
}
@@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.core.PluginCore;
import forestry.core.ModuleCore;
public class BlockAsh extends Block implements IStateMapperRegister, IItemModelRegister {
@@ -73,7 +73,7 @@ public class BlockAsh extends Block implements IStateMapperRegister, IItemModelR
Random rand = world instanceof World ? ((World)world).rand : new Random();
int amount = state.getValue(AMOUNT) + 9 + rand.nextInt(1 + fortune);
drops.add(new ItemStack(Items.COAL, amount, 1));
drops.add(new ItemStack(PluginCore.getItems().ash, 1 + rand.nextInt(amount / 4)));
drops.add(new ItemStack(ModuleCore.getItems().ash, 1 + rand.nextInt(amount / 4)));
return drops;
}
@@ -50,7 +50,7 @@ import forestry.api.core.IToolScoop;
import forestry.api.lepidopterology.ButterflyManager;
import forestry.api.lepidopterology.EnumFlutterType;
import forestry.api.lepidopterology.IButterfly;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleArboriculture;
import forestry.arboriculture.tiles.TileLeaves;
import forestry.core.blocks.properties.UnlistedBlockAccess;
import forestry.core.blocks.properties.UnlistedBlockPos;
@@ -215,6 +215,6 @@ public class BlockForestryLeaves extends BlockAbstractLeaves implements ITileEnt
}
}
}
return PluginArboriculture.proxy.getFoliageColorBasic();
return ModuleArboriculture.proxy.getFoliageColorBasic();
}
}
@@ -18,7 +18,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
@@ -70,12 +69,6 @@ public class BlockRegistryArboriculture extends BlockRegistry {
public final List<BlockDecorativeLeaves> leavesDecorative;
private final Map<String, ItemStack> speciesToLeavesDecorative;
public final Map<String, BlockFruitPod> podsMap;
public final BlockCharcoal charcoal;
public final BlockWoodPile woodPile;
public final BlockDecorativeWoodPile woodPileDecorative;
public final BlockAsh ash;
public final Block loam;
public final BlockArboriculture treeChest;
@@ -273,39 +266,6 @@ public class BlockRegistryArboriculture extends BlockRegistry {
speciesToLeavesDecorative.put(speciesUid, new ItemStack(leaves, 1, meta));
}
}
charcoal = new BlockCharcoal();
ItemBlockForestry itemBlockCharcoal = new ItemBlockForestry<BlockCharcoal>(charcoal) {
@Override
public int getItemBurnTime(ItemStack itemStack) {
return 16000;
}
};
registerBlock(charcoal, itemBlockCharcoal, "charcoal");
woodPile = new BlockWoodPile();
ItemBlockForestry itemBlockWoodPile = new ItemBlockForestry<BlockWoodPile>(woodPile) {
@Override
public int getItemBurnTime(ItemStack itemStack) {
return 1200;
}
};
registerBlock(woodPile, itemBlockWoodPile, "wood_pile");
woodPileDecorative = new BlockDecorativeWoodPile();
ItemBlockForestry itemBlockWoodPileDecorative = new ItemBlockForestry(woodPileDecorative) {
@Override
public int getItemBurnTime(ItemStack itemStack) {
return 1200;
}
};
registerBlock(woodPileDecorative, itemBlockWoodPileDecorative, "wood_pile_decorative");
ash = new BlockAsh();
registerBlock(ash, new ItemBlockForestry(ash), "ash_block");
loam = new BlockLoam();
registerBlock(loam, new ItemBlockForestry<>(loam), "loam");
// Pods
AlleleFruits.registerAlleles();
@@ -0,0 +1,50 @@
package forestry.arboriculture.blocks;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import forestry.core.blocks.BlockRegistry;
import forestry.core.items.ItemBlockForestry;
public class BlockRegistryCharcoal extends BlockRegistry {
public final BlockCharcoal charcoal;
public final BlockWoodPile woodPile;
public final BlockDecorativeWoodPile woodPileDecorative;
public final BlockAsh ash;
public final Block loam;
public BlockRegistryCharcoal() {
charcoal = new BlockCharcoal();
ItemBlockForestry itemBlockCharcoal = new ItemBlockForestry<BlockCharcoal>(charcoal) {
@Override
public int getItemBurnTime(ItemStack itemStack) {
return 16000;
}
};
registerBlock(charcoal, itemBlockCharcoal, "charcoal");
woodPile = new BlockWoodPile();
ItemBlockForestry itemBlockWoodPile = new ItemBlockForestry<BlockWoodPile>(woodPile) {
@Override
public int getItemBurnTime(ItemStack itemStack) {
return 1200;
}
};
registerBlock(woodPile, itemBlockWoodPile, "wood_pile");
woodPileDecorative = new BlockDecorativeWoodPile();
ItemBlockForestry itemBlockWoodPileDecorative = new ItemBlockForestry(woodPileDecorative) {
@Override
public int getItemBurnTime(ItemStack itemStack) {
return 1200;
}
};
registerBlock(woodPileDecorative, itemBlockWoodPileDecorative, "wood_pile_decorative");
ash = new BlockAsh();
registerBlock(ash, new ItemBlockForestry(ash), "ash_block");
loam = new BlockLoam();
registerBlock(loam, new ItemBlockForestry<>(loam), "loam");
}
}
@@ -31,7 +31,7 @@ import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.api.core.Tabs;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleCharcoal;
public class BlockWoodPile extends Block implements IItemModelRegister, IStateMapperRegister {
@@ -135,7 +135,7 @@ public class BlockWoodPile extends Block implements IItemModelRegister, IStateMa
if(state.getValue(AGE) < 7){
world.setBlockState(pos, state.withProperty(AGE, state.getValue(AGE) + 1), 2);
}else{
IBlockState ashState = PluginArboriculture.getBlocks().ash.getDefaultState();
IBlockState ashState = ModuleCharcoal.getBlocks().ash.getDefaultState();
world.setBlockState(pos, ashState.withProperty(BlockAsh.AMOUNT, Math.round(getCharcoalAmount(world, pos))), 2);
}
}
@@ -207,7 +207,7 @@ public class BlockWoodPile extends Block implements IItemModelRegister, IStateMa
IBlockState state = world.getBlockState(testPos);
if(state.getBlock() == Blocks.AIR){
break;
}else if(state.getBlock() == this || state.getBlock() == PluginArboriculture.getBlocks().charcoal){
}else if(state.getBlock() == this || state.getBlock() == ModuleCharcoal.getBlocks().charcoal){
if(i == 15){
return getCharcoalFaceAmount(world, testPos, facing);
}
@@ -10,13 +10,14 @@
******************************************************************************/
package forestry.arboriculture.charcoal;
import forestry.api.arboriculture.ICharcoalPileWall;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import forestry.api.arboriculture.ICharcoalPileWall;
public class CharcoalPileWall implements ICharcoalPileWall {
private final IBlockState blockState;
@@ -46,7 +47,7 @@ public class CharcoalPileWall implements ICharcoalPileWall {
}
@Override
public NonNullList<ItemStack> getDisplyItems() {
public NonNullList<ItemStack> getDisplayItems() {
if(block == Blocks.AIR){
return NonNullList.withSize(1, new ItemStack(blockState.getBlock(), 1, blockState.getBlock().getMetaFromState(blockState)));
}else if(blockState == Blocks.AIR.getDefaultState()){
@@ -54,5 +55,10 @@ public class CharcoalPileWall implements ICharcoalPileWall {
}
return NonNullList.create();
}
@Override
public NonNullList<ItemStack> getDisplyItems() {
return getDisplayItems();
}
}
@@ -1,14 +1,16 @@
package forestry.arboriculture.charcoal.jei;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.TreeManager;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleCharcoal;
import forestry.arboriculture.charcoal.CharcoalPileWall;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IModPlugin;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
import mezz.jei.api.recipe.IRecipeCategoryRegistration;
import net.minecraft.item.ItemStack;
@JEIPlugin
public class CharcoalJeiPlugin implements IModPlugin {
@@ -25,7 +27,7 @@ public class CharcoalJeiPlugin implements IModPlugin {
public void register(IModRegistry registry) {
registry.handleRecipes(CharcoalPileWall.class, CharcoalPileWallWrapper::new, RECIPE_UID);
registry.addRecipes(TreeManager.pileWalls, RECIPE_UID);
registry.addRecipeCatalyst(new ItemStack(PluginArboriculture.getBlocks().woodPile), RECIPE_UID);
registry.addRecipeCatalyst(new ItemStack(ModuleCharcoal.getBlocks().woodPile), RECIPE_UID);
}
}
@@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleCharcoal;
import forestry.core.config.Constants;
import forestry.core.recipes.jei.ForestryRecipeCategory;
import forestry.core.recipes.jei.ForestryTooltipCallback;
@@ -63,7 +63,7 @@ public class CharcoalPileWallCategory extends ForestryRecipeCategory<CharcoalPil
itemStackGroup.init(3, false, 104, 16);
itemStackGroup.set(0, ingredients.getInputs(ItemStack.class).get(0));
itemStackGroup.set(1, new ItemStack(PluginArboriculture.getBlocks().woodPile));
itemStackGroup.set(1, new ItemStack(ModuleCharcoal.getBlocks().woodPile));
itemStackGroup.set(2, ingredients.getOutputs(ItemStack.class).get(0));
itemStackGroup.set(3, ingredients.getOutputs(ItemStack.class).get(1));
@@ -5,15 +5,8 @@ import com.google.common.collect.ImmutableList;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.ICharcoalPileWall;
import forestry.core.PluginCore;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeWrapper;
import forestry.api.arboriculture.ICharcoalPileWall;
import forestry.core.ModuleCore;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeWrapper;
@@ -28,10 +21,10 @@ public class CharcoalPileWallWrapper implements IRecipeWrapper {
@Override
public void getIngredients(IIngredients ingredients) {
ingredients.setInputs(ItemStack.class, pileWall.getDisplyItems());
ingredients.setInputs(ItemStack.class, pileWall.getDisplayItems());
int amount = 9 + pileWall.getCharcoalAmount();
ItemStack charcoal = new ItemStack(Items.COAL, amount, 1);
ItemStack ash = new ItemStack(PluginCore.getItems().ash, amount / 4);
ItemStack ash = new ItemStack(ModuleCore.getItems().ash, amount / 4);
ImmutableList<ItemStack> outputs = ImmutableList.of(
charcoal,
ash
@@ -1,7 +1,8 @@
package forestry.arboriculture.compat;
import com.google.common.base.Preconditions;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleArboriculture;
import forestry.arboriculture.items.ItemRegistryArboriculture;
import forestry.core.utils.JeiUtil;
import mezz.jei.api.IModPlugin;
@@ -12,7 +13,7 @@ import mezz.jei.api.JEIPlugin;
public class ArboricultureJeiPlugin implements IModPlugin {
@Override
public void register(IModRegistry registry) {
ItemRegistryArboriculture items = PluginArboriculture.getItems();
ItemRegistryArboriculture items = ModuleArboriculture.getItems();
Preconditions.checkNotNull(items);
JeiUtil.addDescription(registry,
@@ -16,7 +16,7 @@ import forestry.api.arboriculture.IArboristTracker;
import forestry.api.arboriculture.TreeManager;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IIndividual;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleArboriculture;
import forestry.core.genetics.BreedingTracker;
public class ArboristTracker extends BreedingTracker implements IArboristTracker {
@@ -25,7 +25,7 @@ public class ArboristTracker extends BreedingTracker implements IArboristTracker
* Required for creation from map storage
*/
public ArboristTracker(String s) {
super(s, PluginArboriculture.treekeepingMode);
super(s, ModuleArboriculture.treekeepingMode);
}
@Override
@@ -1,11 +1,12 @@
package forestry.arboriculture.genetics;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ILeafProvider;
import forestry.api.genetics.IAllele;
import forestry.arboriculture.PluginArboriculture;
import net.minecraft.item.ItemStack;
import forestry.arboriculture.ModuleArboriculture;
public class LeafProvider implements ILeafProvider {
@@ -25,7 +26,7 @@ public class LeafProvider implements ILeafProvider {
if(allele == null){
allele = TreeDefinition.Oak.getTemplate()[EnumTreeChromosome.SPECIES.ordinal()];
}
return PluginArboriculture.getBlocks().getDecorativeLeaves(allele.getUID());
return ModuleArboriculture.getBlocks().getDecorativeLeaves(allele.getUID());
}
}
@@ -16,6 +16,15 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.EnumFruitFamily;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.EnumTreeChromosome;
@@ -27,7 +36,7 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IAlyzerPlugin;
import forestry.api.genetics.IFruitFamily;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleArboriculture;
import forestry.arboriculture.genetics.alleles.AlleleFruits;
import forestry.core.config.Config;
import forestry.core.gui.GuiAlyzer;
@@ -35,13 +44,6 @@ import forestry.core.gui.TextLayoutHelper;
import forestry.core.gui.widgets.ItemStackWidget;
import forestry.core.gui.widgets.WidgetManager;
import forestry.core.utils.Translator;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class TreeAlyzerPlugin implements IAlyzerPlugin {
public static final TreeAlyzerPlugin INSTANCE = new TreeAlyzerPlugin();
@@ -50,7 +52,7 @@ public class TreeAlyzerPlugin implements IAlyzerPlugin {
private TreeAlyzerPlugin() {
NonNullList<ItemStack> treeList = NonNullList.create();
PluginArboriculture.getItems().sapling.addCreativeItems(treeList, false);
ModuleArboriculture.getItems().sapling.addCreativeItems(treeList, false);
for (ItemStack treeStack : treeList) {
IAlleleTreeSpecies species = TreeGenome.getSpecies(treeStack);
iconStacks.put(species.getUID(), treeStack);
@@ -0,0 +1,92 @@
package forestry.arboriculture.genetics;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.EnumFruitFamily;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleFruit;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ITree;
import forestry.api.core.GuiElementAlignment;
import forestry.api.core.IGuiElementHelper;
import forestry.api.genetics.EnumDatabaseTab;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IDatabaseTab;
import forestry.api.genetics.IFruitFamily;
import forestry.arboriculture.genetics.alleles.AlleleFruits;
import forestry.core.utils.Translator;
@SideOnly(Side.CLIENT)
public class TreeDatabaseTab implements IDatabaseTab<ITree> {
private final EnumDatabaseTab tab;
TreeDatabaseTab(EnumDatabaseTab tab) {
this.tab = tab;
}
@Override
public void createElements(IGuiElementHelper elementHelper, ITree tree, ItemStack itemStack) {
IAlleleTreeSpecies primarySpecies = tree.getGenome().getPrimary();
boolean active = tab == EnumDatabaseTab.ACTIVE_SPECIES;
IAlleleTreeSpecies species = active ? primarySpecies : tree.getGenome().getSecondary();
int speciesColor = elementHelper.factory().getColorCoding(species.isDominant());
elementHelper.addText(Translator.translateToLocal("for.gui.database.tab." + tab.name().toLowerCase() + ".name"), GuiElementAlignment.CENTER, 0xcfb53b);
elementHelper.addAllele(Translator.translateToLocal("for.gui.species"), tree, EnumTreeChromosome.SPECIES, active);
elementHelper.addAllele(Translator.translateToLocal("for.gui.saplings"), tree, EnumTreeChromosome.FERTILITY, active);
elementHelper.addAllele(Translator.translateToLocal("for.gui.maturity"), tree, EnumTreeChromosome.MATURATION, active);
elementHelper.addAllele(Translator.translateToLocal("for.gui.height"), tree, EnumTreeChromosome.HEIGHT, active);
IAlleleInteger girth = (IAlleleInteger) (active ? tree.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH) : tree.getGenome().getInactiveAllele(EnumTreeChromosome.GIRTH));
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.girth"), GuiElementAlignment.CENTER);
elementHelper.addText(String.format("%sx%s", girth.getValue(), girth.getValue()), GuiElementAlignment.CENTER, elementHelper.factory().getColorCoding(girth.isDominant()));
elementHelper.addAllele(Translator.translateToLocal("for.gui.yield"), tree, EnumTreeChromosome.YIELD, active);
elementHelper.addAllele(Translator.translateToLocal("for.gui.sappiness"), tree, EnumTreeChromosome.SAPPINESS, active);
elementHelper.addAllele(Translator.translateToLocal("for.gui.effect"), tree, EnumTreeChromosome.EFFECT, active);
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.native"), GuiElementAlignment.CENTER);
elementHelper.addText(Translator.translateToLocal("for.gui." + tree.getGenome().getPrimary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), GuiElementAlignment.CENTER, speciesColor);
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.supports"), GuiElementAlignment.CENTER);
List<IFruitFamily> families = new ArrayList<>(tree.getGenome().getPrimary().getSuitableFruit());
for (IFruitFamily fruitFamily : families) {
elementHelper.addText(fruitFamily.getName(), GuiElementAlignment.CENTER, speciesColor);
}
IAlleleFruit fruit = (IAlleleFruit) (active ? tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS) : tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS));
int colorCoding = elementHelper.factory().getColorCoding(tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS).isDominant());
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.fruits"), GuiElementAlignment.CENTER);
String strike = "";
if (!species.getSuitableFruit().contains(fruit.getProvider().getFamily()) && fruit != AlleleFruits.fruitNone) {
strike = TextFormatting.STRIKETHROUGH.toString();
}
elementHelper.addText(strike + fruit.getProvider().getDescription(), GuiElementAlignment.CENTER, colorCoding);
IFruitFamily family = fruit.getProvider().getFamily();
if (family != null && !family.getUID().equals(EnumFruitFamily.NONE.getUID())) {
elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.family"), GuiElementAlignment.CENTER);
elementHelper.addText(family.getName(), GuiElementAlignment.CENTER, colorCoding);
}
}
@Override
public EnumDatabaseTab getTab() {
return tab;
}
}
@@ -51,7 +51,7 @@ import forestry.api.core.EnumTemperature;
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
import forestry.api.genetics.IAllele;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleArboriculture;
import forestry.arboriculture.genetics.alleles.AlleleFruits;
import forestry.arboriculture.models.ModelProviderFactory;
import forestry.arboriculture.tiles.TileLeaves;
@@ -1000,10 +1000,10 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe
public boolean setLeaves(ITreeGenome genome, World world, @Nullable GameProfile owner, BlockPos pos) {
if (owner == null && genome.matchesTemplateGenome()) {
String speciesUid = genome.getPrimary().getUID();
IBlockState defaultLeaves = PluginArboriculture.getBlocks().getDefaultLeaves(speciesUid);
IBlockState defaultLeaves = ModuleArboriculture.getBlocks().getDefaultLeaves(speciesUid);
return world.setBlockState(pos, defaultLeaves);
} else {
IBlockState leaves = PluginArboriculture.getBlocks().leaves.getDefaultState();
IBlockState leaves = ModuleArboriculture.getBlocks().leaves.getDefaultState();
boolean placed = world.setBlockState(pos, leaves);
if (!placed) {
return false;
@@ -0,0 +1,71 @@
package forestry.arboriculture.genetics;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ITree;
import forestry.api.genetics.EnumDatabaseTab;
import forestry.api.genetics.IDatabaseTab;
import forestry.api.genetics.ISpeciesPlugin;
import forestry.arboriculture.ModuleArboriculture;
import forestry.core.config.Config;
import forestry.core.items.ItemFruit;
//TODO: Add support for the alyzer
@SideOnly(Side.CLIENT)
public class TreePlugin implements ISpeciesPlugin<ITree> {
public static final TreePlugin INSTANCE = new TreePlugin();
private static final TreeDatabaseTab ACTIVE = new TreeDatabaseTab(EnumDatabaseTab.ACTIVE_SPECIES);
private static final TreeDatabaseTab INACTIVE = new TreeDatabaseTab(EnumDatabaseTab.INACTIVE_SPECIES);
protected final Map<String, ItemStack> iconStacks = new HashMap<>();
private TreePlugin() {
NonNullList<ItemStack> treeList = NonNullList.create();
ModuleArboriculture.getItems().sapling.addCreativeItems(treeList, false);
for (ItemStack treeStack : treeList) {
IAlleleTreeSpecies species = TreeGenome.getSpecies(treeStack);
iconStacks.put(species.getUID(), treeStack);
}
}
@Override
public Map<String, ItemStack> getIndividualStacks() {
return iconStacks;
}
@Override
public List<String> getHints() {
return Config.hints.get("treealyzer");
}
@Override
public IDatabaseTab getSpeciesTab(boolean active) {
if(active){
return ACTIVE;
}
return INACTIVE;
}
@Override
public ItemStack getTabDatabaseIconItem(EnumDatabaseTab tab) {
switch (tab){
case ACTIVE_SPECIES:
return TreeDefinition.Cherry.getMemberStack(EnumGermlingType.SAPLING);
case PRODUCTS:
return ItemFruit.EnumFruit.CHERRY.getStack();
case MUTATIONS:
return ModuleArboriculture.getItems().grafter.getItemStack();
}
return TreeDefinition.Cherry.getMemberStack(EnumGermlingType.POLLEN);
}
}
@@ -10,6 +10,8 @@
******************************************************************************/
package forestry.arboriculture.genetics;
import com.google.common.base.Preconditions;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
@@ -21,8 +23,25 @@ import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import com.google.common.base.Preconditions;
import net.minecraft.block.Block;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import com.mojang.authlib.GameProfile;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleFruit;
@@ -45,8 +64,9 @@ import forestry.api.genetics.IFruitFamily;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.IPollinatable;
import forestry.api.genetics.ISpeciesPlugin;
import forestry.api.genetics.ISpeciesType;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleArboriculture;
import forestry.arboriculture.blocks.BlockFruitPod;
import forestry.arboriculture.blocks.BlockRegistryArboriculture;
import forestry.arboriculture.blocks.BlockSapling;
@@ -57,20 +77,7 @@ import forestry.core.genetics.SpeciesRoot;
import forestry.core.network.packets.PacketFXSignal;
import forestry.core.tiles.TileUtil;
import forestry.core.utils.BlockUtil;
import forestry.core.utils.GeneticsUtil;
import forestry.core.utils.NetworkUtil;
import net.minecraft.block.Block;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.oredict.OreDictionary;
public class TreeRoot extends SpeciesRoot implements ITreeRoot {
public static final String UID = "rootTrees";
@@ -134,7 +141,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot {
if (stack.isEmpty()) {
return null;
}
ItemRegistryArboriculture items = PluginArboriculture.getItems();
ItemRegistryArboriculture items = ModuleArboriculture.getItems();
Item item = stack.getItem();
if (items.sapling == item) {
@@ -180,7 +187,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot {
public ItemStack getMemberStack(IIndividual tree, ISpeciesType type) {
Preconditions.checkArgument(tree instanceof ITree, "individual is not a tree");
Preconditions.checkArgument(type instanceof EnumGermlingType, "type is not an EnumGermlingType");
ItemRegistryArboriculture items = PluginArboriculture.getItems();
ItemRegistryArboriculture items = ModuleArboriculture.getItems();
Item germlingItem;
switch ((EnumGermlingType) type) {
@@ -206,7 +213,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot {
@Override
public boolean plantSapling(World world, ITree tree, GameProfile owner, BlockPos pos) {
BlockRegistryArboriculture blocks = PluginArboriculture.getBlocks();
BlockRegistryArboriculture blocks = ModuleArboriculture.getBlocks();
IBlockState state = blocks.saplingGE.getDefaultState().withProperty(BlockSapling.TREE, tree.getGenome().getPrimary());
boolean placed = world.setBlockState(pos, state);
@@ -237,7 +244,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot {
@Override
public boolean setFruitBlock(World world, ITreeGenome genome, IAlleleFruit allele, float sappiness, BlockPos pos) {
BlockRegistryArboriculture blocks = PluginArboriculture.getBlocks();
BlockRegistryArboriculture blocks = ModuleArboriculture.getBlocks();
EnumFacing facing = BlockUtil.getValidPodFacing(world, pos);
if (facing != null) {
@@ -426,6 +433,12 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot {
return TreeAlyzerPlugin.INSTANCE;
}
@Override
@SideOnly(Side.CLIENT)
public ISpeciesPlugin getSpeciesPlugin() {
return TreePlugin.INSTANCE;
}
@Override
public ICheckPollinatable createPollinatable(IIndividual individual) {
Preconditions.checkArgument(individual instanceof ITree, "individual must be a tree");
@@ -10,12 +10,6 @@
******************************************************************************/
package forestry.arboriculture.items;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.blocks.BlockAbstractLeaves;
import forestry.arboriculture.tiles.TileLeaves;
import forestry.core.items.IColoredItem;
import forestry.core.items.ItemBlockForestry;
import forestry.core.utils.Translator;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
@@ -23,9 +17,17 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.arboriculture.ModuleArboriculture;
import forestry.arboriculture.blocks.BlockAbstractLeaves;
import forestry.arboriculture.tiles.TileLeaves;
import forestry.core.items.IColoredItem;
import forestry.core.items.ItemBlockForestry;
import forestry.core.utils.Translator;
public class ItemBlockLeaves extends ItemBlockForestry<BlockAbstractLeaves> implements IColoredItem {
public ItemBlockLeaves(BlockAbstractLeaves block) {
@@ -62,7 +64,7 @@ public class ItemBlockLeaves extends ItemBlockForestry<BlockAbstractLeaves> impl
@SideOnly(Side.CLIENT)
public int getColorFromItemstack(ItemStack itemStack, int renderPass) {
if (itemStack.getTagCompound() == null) {
return PluginArboriculture.proxy.getFoliageColorBasic();
return ModuleArboriculture.proxy.getFoliageColorBasic();
}
TileLeaves tileLeaves = new TileLeaves();
@@ -42,7 +42,7 @@ import forestry.api.arboriculture.IWoodStateMapper;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.arboriculture.IWoodTyped;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleArboriculture;
import forestry.arboriculture.blocks.BlockArbSlab;
import forestry.arboriculture.blocks.BlockDecorativeLeaves;
import forestry.arboriculture.blocks.BlockDefaultLeaves;
@@ -69,11 +69,11 @@ public class ProxyArboricultureClient extends ProxyArboriculture {
ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:leaves");
ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:leaves", "inventory");
BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation,
new ModelLeaves(), PluginArboriculture.getBlocks().leaves);
new ModelLeaves(), ModuleArboriculture.getBlocks().leaves);
ModelManager.getInstance().registerCustomBlockModel(blockModelIndex);
}
for (BlockDecorativeLeaves leaves : PluginArboriculture.getBlocks().leavesDecorative) {
for (BlockDecorativeLeaves leaves : ModuleArboriculture.getBlocks().leavesDecorative) {
String resourceName = "forestry:leaves.decorative." + leaves.getBlockNumber();
ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName);
ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory");
@@ -82,7 +82,7 @@ public class ProxyArboricultureClient extends ProxyArboriculture {
ModelManager.getInstance().registerCustomBlockModel(blockModelIndex);
}
for (BlockDefaultLeaves leaves : PluginArboriculture.getBlocks().leavesDefault) {
for (BlockDefaultLeaves leaves : ModuleArboriculture.getBlocks().leavesDefault) {
String resourceName = "forestry:leaves.default." + leaves.getBlockNumber();
ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName);
ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory");
@@ -92,10 +92,10 @@ public class ProxyArboricultureClient extends ProxyArboriculture {
}
ModelLoaderRegistry.registerLoader(WoodModelLoader.INSTANCE);
for (BlockArbSlab slab : PluginArboriculture.getBlocks().slabsDouble) {
for (BlockArbSlab slab : ModuleArboriculture.getBlocks().slabsDouble) {
registerWoodModel(slab, true);
}
for (BlockArbSlab slab : PluginArboriculture.getBlocks().slabsDoubleFireproof) {
for (BlockArbSlab slab : ModuleArboriculture.getBlocks().slabsDoubleFireproof) {
registerWoodModel(slab, true);
}
}
@@ -14,6 +14,21 @@ import javax.annotation.Nullable;
import java.io.IOException;
import java.util.Random;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.EnumFruitFamily;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleFruit;
@@ -38,7 +53,7 @@ import forestry.api.lepidopterology.ButterflyManager;
import forestry.api.lepidopterology.IButterfly;
import forestry.api.lepidopterology.IButterflyGenome;
import forestry.api.lepidopterology.IButterflyNursery;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.ModuleArboriculture;
import forestry.arboriculture.genetics.TreeDefinition;
import forestry.arboriculture.genetics.alleles.AlleleFruits;
import forestry.arboriculture.network.IRipeningPacketReceiver;
@@ -49,18 +64,6 @@ import forestry.core.utils.ClimateUtil;
import forestry.core.utils.ColourUtil;
import forestry.core.utils.GeneticsUtil;
import forestry.core.utils.NetworkUtil;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery, IRipeningPacketReceiver {
@@ -139,7 +142,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
if (!checkedForConversionToDefaultLeaves) {
if (shouldConvertToDefaultLeaves()) {
IBlockState defaultLeaves = PluginArboriculture.getBlocks().getDefaultLeaves(primary.getUID());
IBlockState defaultLeaves = ModuleArboriculture.getBlocks().getDefaultLeaves(primary.getUID());
worldIn.setBlockState(getPos(), defaultLeaves);
return;
}
@@ -32,24 +32,24 @@ import forestry.arboriculture.genetics.TreeDefinition;
import forestry.core.config.Constants;
import forestry.lepidopterology.genetics.Butterfly;
import forestry.lepidopterology.genetics.ButterflyDefinition;
import forestry.plugins.ForestryPluginUids;
import forestry.modules.ForestryModuleUids;
public class CreativeTabForestry extends CreativeTabs {
static {
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) {
Tabs.tabAgriculture = new CreativeTabForestry(1, "agriculture");
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) {
Tabs.tabApiculture = new CreativeTabForestry(2, "apiculture");
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) {
Tabs.tabArboriculture = new CreativeTabForestry(3, "arboriculture");
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY))) {
Tabs.tabLepidopterology = new CreativeTabForestry(4, "lepidopterology");
}
}
@@ -81,7 +81,7 @@ public class CreativeTabForestry extends CreativeTabs {
break;
}
if (iconItem == null) {
iconItem = PluginCore.getItems().wrench;
iconItem = ModuleCore.getItems().wrench;
}
return new ItemStack(iconItem);
}
@@ -40,7 +40,7 @@ import forestry.core.errors.ErrorStateRegistry;
import forestry.core.models.ModelBlockCached;
import forestry.core.models.ModelBlockCustomCached;
import forestry.core.render.TextureManagerForestry;
import forestry.plugins.PluginManager;
import forestry.modules.ModuleManager;
public class EventHandlerCore {
@@ -54,7 +54,7 @@ public class EventHandlerCore {
return;
}
for (IPickupHandler handler : PluginManager.pickupHandlers) {
for (IPickupHandler handler : ModuleManager.pickupHandlers) {
if (handler.onItemPickup(event.getEntityPlayer(), event.getItem())) {
event.setResult(Result.ALLOW);
return;
@@ -87,21 +87,21 @@ public class EventHandlerCore {
public void handleWorldLoad(WorldEvent.Load event) {
World world = event.getWorld();
for (ISaveEventHandler handler : PluginManager.saveEventHandlers) {
for (ISaveEventHandler handler : ModuleManager.saveEventHandlers) {
handler.onWorldLoad(world);
}
}
@SubscribeEvent
public void handleWorldSave(WorldEvent.Save event) {
for (ISaveEventHandler handler : PluginManager.saveEventHandlers) {
for (ISaveEventHandler handler : ModuleManager.saveEventHandlers) {
handler.onWorldSave(event.getWorld());
}
}
@SubscribeEvent
public void handleWorldUnload(WorldEvent.Unload event) {
for (ISaveEventHandler handler : PluginManager.saveEventHandlers) {
for (ISaveEventHandler handler : ModuleManager.saveEventHandlers) {
handler.onWorldUnload(event.getWorld());
}
}
@@ -122,9 +122,9 @@ public class EventHandlerCore {
return;
}
Set<String> lootPoolNames = PluginManager.getLootPoolNames();
Set<String> lootPoolNames = ModuleManager.getLootPoolNames();
for (String lootTableFile : PluginManager.getLootTableFiles()) {
for (String lootTableFile : ModuleManager.getLootTableFiles()) {
ResourceLocation resourceLocation = new ResourceLocation(Constants.MOD_ID, event.getName().getResourcePath() + "/" + lootTableFile);
URL url = EventHandlerCore.class.getResource("/assets/" + resourceLocation.getResourceDomain() + "/loot_tables/" + resourceLocation.getResourcePath() + ".json");
if (url != null) {
@@ -22,6 +22,7 @@ import net.minecraft.command.ICommand;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.storage.loot.functions.LootFunctionManager;
import net.minecraftforge.client.event.ModelBakeEvent;
@@ -49,7 +50,7 @@ import forestry.core.circuits.CircuitRegistry;
import forestry.core.circuits.SolderManager;
import forestry.core.climate.ClimateFactory;
import forestry.core.climate.ClimateManager;
import forestry.core.commands.CommandPlugins;
import forestry.core.commands.CommandModules;
import forestry.core.commands.RootCommand;
import forestry.core.config.Config;
import forestry.core.config.Constants;
@@ -73,12 +74,12 @@ import forestry.core.utils.ClimateUtil;
import forestry.core.utils.ForestryModEnvWarningCallable;
import forestry.core.utils.OreDictUtil;
import forestry.core.utils.World2ObjectMap;
import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
import forestry.modules.BlankForestryModule;
import forestry.modules.ForestryModule;
import forestry.modules.ForestryModuleUids;
@ForestryPlugin(pluginID = ForestryPluginUids.CORE, name = "Core", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.core.description")
public class PluginCore extends BlankForestryPlugin {
@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.CORE, name = "Core", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.core.description", coreModule = true)
public class ModuleCore extends BlankForestryModule {
public static final RootCommand rootCommand = new RootCommand();
@Nullable
public static ItemRegistryCore items;
@@ -101,7 +102,7 @@ public class PluginCore extends BlankForestryPlugin {
}
@Override
public Set<String> getDependencyUids() {
public Set<ResourceLocation> getDependencyUids() {
return Collections.emptySet();
}
@@ -132,19 +133,17 @@ public class PluginCore extends BlankForestryPlugin {
@Override
public void preInit() {
super.preInit();
GameProfileDataSerializer.register();
MinecraftForge.EVENT_BUS.register(this);
MinecraftForge.EVENT_BUS.register(World2ObjectMap.class);
rootCommand.addChildCommand(new CommandPlugins());
rootCommand.addChildCommand(new CommandModules());
}
@Override
public void doInit() {
super.doInit();
AlleleHelper alleleHelper = AlleleHelper.getInstance();
BlockRegistryCore blocks = getBlocks();
@@ -241,7 +240,7 @@ public class PluginCore extends BlankForestryPlugin {
public void registerRecipes() {
BlockRegistryCore blocks = getBlocks();
ItemRegistryCore items = getItems();
ItemRegistryFluids fluidItems = PluginFluids.getItems();
ItemRegistryFluids fluidItems = ModuleFluids.getItems();
/* SMELTING RECIPES */
RecipeUtil.addSmelting(blocks.resources.get(EnumResourceType.APATITE, 1), items.apatite, 0.5f);
@@ -291,7 +290,7 @@ public class PluginCore extends BlankForestryPlugin {
// / WEB
RecipeUtil.addRecipe("silk_wisp_to_web", new ItemStack(Blocks.WEB, 4), "# #", " # ", "# #", '#', items.craftingMaterial.getSilkWisp());
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) {
// / CARPENTER
// Portable ANALYZER
RecipeManagers.carpenterManager.addRecipe(100, new FluidStack(FluidRegistry.WATER, 2000), ItemStack.EMPTY, items.portableAlyzer.getItemStack(),
@@ -432,7 +431,7 @@ public class PluginCore extends BlankForestryPlugin {
RecipeUtil.addShapelessRecipe("block_to_bronze", ingotBronze, OreDictUtil.BLOCK_BRONZE);
}
if(!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)){
if(!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))){
RecipeUtil.addSmelting(new ItemStack(items.ash, 2), new ItemStack(Items.COAL, 1, 1), 0.15F);
}
@@ -450,7 +449,7 @@ public class PluginCore extends BlankForestryPlugin {
'#', Items.BRICK);
// alternate recipes
if (!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) {
if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) {
RecipeManagers.centrifugeManager.addRecipe(5, new ItemStack(Items.STRING), ImmutableMap.of(
items.craftingMaterial.getSilkWisp(), 0.15f
));
@@ -39,12 +39,12 @@ import forestry.core.items.ItemRegistryFluids;
import forestry.core.proxy.Proxies;
import forestry.core.recipes.RecipeUtil;
import forestry.core.utils.Log;
import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
import forestry.modules.BlankForestryModule;
import forestry.modules.ForestryModule;
import forestry.modules.ForestryModuleUids;
@ForestryPlugin(pluginID = ForestryPluginUids.FLUIDS, name = "Fluids", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.fluids.description")
public class PluginFluids extends BlankForestryPlugin {
@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.FLUIDS, name = "Fluids", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.module.fluids.description")
public class ModuleFluids extends BlankForestryModule {
@Nullable
private static ItemRegistryFluids items;
@@ -117,7 +117,7 @@ public class PluginFluids extends BlankForestryPlugin {
@Override
public void doInit() {
if (RecipeManagers.squeezerManager != null) {
ItemRegistryCore itemRegistryCore = PluginCore.getItems();
ItemRegistryCore itemRegistryCore = ModuleCore.getItems();
RecipeManagers.squeezerManager.addContainerRecipe(10, getItems().canEmpty.getItemStack(), itemRegistryCore.ingotTin.copy(), 0.05f);
RecipeManagers.squeezerManager.addContainerRecipe(10, getItems().waxCapsuleEmpty.getItemStack(), itemRegistryCore.beeswax.getItemStack(), 0.10f);
RecipeManagers.squeezerManager.addContainerRecipe(10, getItems().refractoryEmpty.getItemStack(), itemRegistryCore.refractoryWax.getItemStack(), 0.10f);
@@ -16,18 +16,17 @@ import java.util.Iterator;
import java.util.List;
import java.util.Random;
import it.unimi.dsi.fastutil.ints.IntArraySet;
import it.unimi.dsi.fastutil.ints.IntSet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.ChunkProviderServer;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraftforge.event.world.ChunkDataEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent;
@@ -36,7 +35,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.core.config.Config;
import forestry.core.config.Constants;
import forestry.core.worldgen.WorldGenerator;
import forestry.plugins.PluginManager;
import forestry.modules.ModuleManager;
import it.unimi.dsi.fastutil.ints.IntArraySet;
import it.unimi.dsi.fastutil.ints.IntSet;
public class TickHandlerCoreServer {
@@ -57,7 +59,7 @@ public class TickHandlerCoreServer {
if (Config.enableBackpackResupply) {
for (Object obj : event.world.playerEntities) {
EntityPlayer player = (EntityPlayer) obj;
for (IResupplyHandler handler : PluginManager.resupplyHandlers) {
for (IResupplyHandler handler : ModuleManager.resupplyHandlers) {
handler.resupply(player);
}
}
@@ -0,0 +1,34 @@
package forestry.core.advancements;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import net.minecraft.advancements.CriteriaTriggers;
import net.minecraft.advancements.ICriterionInstance;
import net.minecraft.advancements.ICriterionTrigger;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import forestry.core.utils.Log;
public class AdvancementManager {
private static Method criterionRegister;
public static void registerTriggers() {
registerAdvancementTrigger(SpeciesDiscoveredTrigger.INSTANCE);
}
private static <T extends ICriterionInstance> ICriterionTrigger<T> registerAdvancementTrigger(ICriterionTrigger<T> trigger) {
if(criterionRegister == null) {
criterionRegister = ReflectionHelper.findMethod(CriteriaTriggers.class, "register", "func_192118_a", ICriterionTrigger.class);
criterionRegister.setAccessible(true);
}
try {
trigger = (ICriterionTrigger<T>) criterionRegister.invoke(null, trigger);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException error) {
Log.error("Failed to register a trigger " + trigger.getId() + " .", error);
}
return trigger;
}
}
@@ -0,0 +1,141 @@
package forestry.core.advancements;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.google.gson.JsonSyntaxException;
import java.util.List;
import java.util.Map;
import java.util.Set;
import net.minecraft.advancements.ICriterionTrigger;
import net.minecraft.advancements.PlayerAdvancements;
import net.minecraft.advancements.critereon.AbstractCriterionInstance;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.JsonUtils;
import net.minecraft.util.ResourceLocation;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.core.config.Constants;
public class SpeciesDiscoveredTrigger implements ICriterionTrigger<SpeciesDiscoveredTrigger.Instance> {
private static final ResourceLocation ID = new ResourceLocation(Constants.MOD_ID, "species_discovered");
public static final SpeciesDiscoveredTrigger INSTANCE = new SpeciesDiscoveredTrigger();
private final Map<PlayerAdvancements, Listeners> listeners = Maps.newHashMap();
@Override
public ResourceLocation getId() {
return ID;
}
public void addListener(PlayerAdvancements advancements, ICriterionTrigger.Listener<Instance> listener) {
Listeners listeners = this.listeners.get(advancements);
if (listeners == null) {
listeners = new Listeners(advancements);
this.listeners.put(advancements, listeners);
}
listeners.add(listener);
}
public void removeListener(PlayerAdvancements advancements, ICriterionTrigger.Listener<Instance> listener) {
Listeners listeners = this.listeners.get(advancements);
if (listeners != null) {
listeners.remove(listener);
if (listeners.isEmpty()) {
this.listeners.remove(advancements);
}
}
}
public void removeAllListeners(PlayerAdvancements advancements) {
this.listeners.remove(advancements);
}
public Instance deserializeInstance(JsonObject json, JsonDeserializationContext context) {
String uid = JsonUtils.getString(json, "uid");
IAllele allele = AlleleManager.alleleRegistry.getAllele(uid);
if (allele == null) {
throw new JsonSyntaxException("Unknown allele '" + uid + "'");
}
else
{
return new Instance(allele);
}
}
public void trigger(EntityPlayerMP player, IAllele allele) {
Listeners listeners = this.listeners.get(player.getAdvancements());
if (listeners != null) {
listeners.trigger(allele);
}
}
public static class Instance extends AbstractCriterionInstance {
private final IAllele allele;
public Instance(IAllele allele)
{
super(ID);
this.allele = allele;
}
public boolean test(IAllele allele)
{
return this.allele == allele;
}
}
private static class Listeners {
private final PlayerAdvancements playerAdvancements;
private final Set<Listener<Instance>> listeners = Sets.newHashSet();
public Listeners(PlayerAdvancements playerAdvancementsIn) {
this.playerAdvancements = playerAdvancementsIn;
}
public boolean isEmpty() {
return this.listeners.isEmpty();
}
public void add(ICriterionTrigger.Listener<Instance> listener) {
this.listeners.add(listener);
}
public void remove(ICriterionTrigger.Listener<Instance> listener) {
this.listeners.remove(listener);
}
public void trigger(IAllele allele) {
List<Listener<Instance>> list = null;
for (ICriterionTrigger.Listener<Instance> listener : this.listeners) {
Instance instance = listener.getCriterionInstance();
if (instance.test(allele)) {
if (list == null) {
list = Lists.newArrayList();
}
list.add(listener);
}
}
if (list != null) {
for (ICriterionTrigger.Listener<Instance> listener : list) {
listener.grantCriterion(this.playerAdvancements);
}
}
}
}
}
@@ -1,4 +1,4 @@
package forestry.core.blocks.properties;
package forestry.core.blocks;
import net.minecraft.block.BlockStairs;
import net.minecraft.block.state.IBlockState;
@@ -38,7 +38,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.core.CreativeTabForestry;
import forestry.core.PluginCore;
import forestry.core.ModuleCore;
import forestry.core.config.Constants;
/**
@@ -109,7 +109,7 @@ public class BlockBogEarth extends Block implements IItemModelRegister, IBlockWi
SoilType type = SoilType.fromMaturity(maturity);
if (type == SoilType.PEAT) {
drops.add(PluginCore.getItems().peat.getItemStack(2));
drops.add(ModuleCore.getItems().peat.getItemStack(2));
drops.add(new ItemStack(Blocks.DIRT));
} else {
drops.add(new ItemStack(this, 1, SoilType.BOG_EARTH.ordinal()));
@@ -17,17 +17,18 @@ import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import forestry.core.proxy.Proxies;
import forestry.core.utils.Log;
import forestry.core.utils.MigrationHelper;
import forestry.plugins.PluginManager;
import forestry.modules.ModuleManager;
public abstract class BlockRegistry {
protected <T extends Block> void registerBlock(T block, @Nullable ItemBlock itemBlock, String name) {
if (PluginManager.getStage() != PluginManager.Stage.REGISTER) {
if (ModuleManager.getStage() != ModuleManager.Stage.REGISTER) {
throw new RuntimeException("Tried to register Block outside of REGISTER");
}
@@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import forestry.core.blocks.properties.BlockAshStairs;
import forestry.core.items.ItemBlockForestry;
import forestry.core.utils.OreDictUtil;
@@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.core.CreativeTabForestry;
import forestry.core.PluginCore;
import forestry.core.ModuleCore;
public class BlockResourceOre extends Block implements IItemModelRegister, IBlockWithMeta {
public static final PropertyEnum<EnumResourceType> ORE_RESOURCES = PropertyEnum.create("resource", EnumResourceType.class, input -> input != null && input.hasOre());
@@ -79,7 +79,7 @@ public class BlockResourceOre extends Block implements IItemModelRegister, IBloc
int amount = (2 + RANDOM.nextInt(5)) * (fortuneModifier + 1);
if (amount > 0) {
drops.add(PluginCore.getItems().apatite.getItemStack(amount));
drops.add(ModuleCore.getItems().apatite.getItemStack(amount));
}
break;
}
@@ -24,7 +24,7 @@ import forestry.api.circuits.ICircuitBoard;
import forestry.api.circuits.ICircuitLayout;
import forestry.api.circuits.ICircuitLibrary;
import forestry.api.circuits.ICircuitRegistry;
import forestry.core.PluginCore;
import forestry.core.ModuleCore;
public class CircuitRegistry implements ICircuitRegistry {
@@ -103,7 +103,7 @@ public class CircuitRegistry implements ICircuitRegistry {
@Override
public boolean isChipset(ItemStack itemstack) {
return itemstack.getItem() == PluginCore.getItems().circuitboards;
return itemstack.getItem() == ModuleCore.getItems().circuitboards;
}
@Override
@@ -30,7 +30,7 @@ import forestry.api.circuits.ICircuit;
import forestry.api.circuits.ICircuitBoard;
import forestry.api.circuits.ICircuitLayout;
import forestry.api.core.IModelManager;
import forestry.core.PluginCore;
import forestry.core.ModuleCore;
import forestry.core.items.IColoredItem;
import forestry.core.items.ItemForestry;
@@ -95,7 +95,7 @@ public class ItemCircuitBoard extends ItemForestry implements IColoredItem {
}
public static ItemStack createCircuitboard(EnumCircuitBoardType type, @Nullable ICircuitLayout layout, ICircuit[] circuits) {
ItemStack chipset = PluginCore.getItems().circuitboards.get(type);
ItemStack chipset = ModuleCore.getItems().circuitboards.get(type);
NBTTagCompound nbttagcompound = new NBTTagCompound();
new CircuitBoard(type, layout, circuits).writeToNBT(nbttagcompound);
chipset.setTagCompound(nbttagcompound);
@@ -10,52 +10,57 @@
******************************************************************************/
package forestry.core.commands;
import forestry.core.utils.Translator;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.IForestryPlugin;
import forestry.plugins.PluginManager;
import javax.annotation.Nullable;
import java.util.List;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import forestry.core.utils.Translator;
import forestry.modules.ForestryModule;
import forestry.modules.IForestryModule;
import forestry.modules.ModuleManager;
/**
* @author CovertJaguar <http://www.railcraft.info/>
*/
public class CommandPlugins extends SubCommand {
public class CommandModules extends SubCommand {
public CommandPlugins() {
super("plugins");
addAlias("plug");
public CommandModules() {
super("module");
addAlias("mod");
addChildCommand(new CommandPluginsInfo());
}
@Override
public void executeSubCommand(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
if (args.length == 0) {
listPluginsForSender(sender);
listModulesForSender(sender);
} else {
CommandHelpers.throwWrongUsage(sender, this);
}
}
private static void listPluginsForSender(ICommandSender sender) {
private static void listModulesForSender(ICommandSender sender) {
StringBuilder pluginList = new StringBuilder();
for (IForestryPlugin plugin : PluginManager.getLoadedPlugins()) {
for (IForestryModule module : ModuleManager.getLoadedModules()) {
if (pluginList.length() > 0) {
pluginList.append(", ");
}
pluginList.append(makeListEntry(plugin));
pluginList.append(makeListEntry(module));
}
CommandHelpers.sendChatMessage(sender, pluginList.toString());
}
private static String makeListEntry(IForestryPlugin plugin) {
String entry = plugin.isAvailable() ? TextFormatting.GREEN.toString() : TextFormatting.RED.toString();
private static String makeListEntry(IForestryModule module) {
String entry = module.isAvailable() ? TextFormatting.GREEN.toString() : TextFormatting.RED.toString();
ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class);
ForestryModule info = module.getClass().getAnnotation(ForestryModule.class);
if (info != null) {
entry += info.pluginID();
entry += info.moduleID();
if (!info.version().isEmpty()) {
entry += " (" + info.version() + ")";
}
@@ -76,35 +81,47 @@ public class CommandPlugins extends SubCommand {
@Override
public void executeSubCommand(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
if (args.length == 1) {
listPluginInfoForSender(sender, args[0]);
listModuleInfoForSender(sender, args[0]);
} else {
CommandHelpers.throwWrongUsage(sender, this);
}
}
private static void listPluginInfoForSender(ICommandSender sender, String pluginUid) throws CommandException {
IForestryPlugin found = null;
for (IForestryPlugin plugin : PluginManager.getLoadedPlugins()) {
ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class);
@Override
public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
List<String> tabCompletions = super.getTabCompletions(server, sender, args, targetPos);
for (IForestryModule module : ModuleManager.getLoadedModules()) {
ForestryModule info = module.getClass().getAnnotation(ForestryModule.class);
if (info != null) {
tabCompletions.add(info.moduleID());
}
}
return tabCompletions;
}
private static void listModuleInfoForSender(ICommandSender sender, String pluginUid) throws CommandException {
IForestryModule found = null;
for (IForestryModule module : ModuleManager.getLoadedModules()) {
ForestryModule info = module.getClass().getAnnotation(ForestryModule.class);
if (info == null) {
continue;
}
if (info.pluginID().equalsIgnoreCase(pluginUid) || info.name().equalsIgnoreCase(pluginUid)) {
found = plugin;
if (info.moduleID().equalsIgnoreCase(pluginUid) || info.name().equalsIgnoreCase(pluginUid)) {
found = module;
break;
}
}
if (found == null) {
throw new CommandException(Translator.translateToLocalFormatted("for.chat.plugins.error", pluginUid));
throw new CommandException(Translator.translateToLocalFormatted("for.chat.modules.error", pluginUid));
}
TextFormatting formatting = found.isAvailable() ? TextFormatting.GREEN : TextFormatting.RED;
ForestryPlugin info = found.getClass().getAnnotation(ForestryPlugin.class);
ForestryModule info = found.getClass().getAnnotation(ForestryModule.class);
if (info != null) {
CommandHelpers.sendChatMessage(sender, formatting + "Plugin: " + info.name());
CommandHelpers.sendChatMessage(sender, formatting + "Module: " + info.name());
if (!info.version().isEmpty()) {
CommandHelpers.sendChatMessage(sender, TextFormatting.BLUE + "Version: " + info.version());
}
@@ -35,6 +35,7 @@ import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import forestry.core.advancements.SpeciesDiscoveredTrigger;
import forestry.core.network.packets.PacketGenomeTrackerSync;
import forestry.core.utils.NetworkUtil;
@@ -125,6 +126,10 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin
writeToNBT(nbtTagCompound, discoveredSpecies, discoveredMutations, researchedMutations);
PacketGenomeTrackerSync packet = new PacketGenomeTrackerSync(nbtTagCompound);
NetworkUtil.sendToPlayer(packet, player);
for(String species : discoveredSpecies) {
SpeciesDiscoveredTrigger.INSTANCE.trigger(( EntityPlayerMP)player, AlleleManager.alleleRegistry.getAllele(species));
}
}
}
}
@@ -38,6 +38,17 @@ public class Chromosome implements IChromosome {
return new Chromosome(primary, secondary);
}
public static Chromosome create(@Nullable String primarySpeciesUid, @Nullable String secondarySpeciesUid, IChromosomeType chromosomeType, String primaryUID, String secondaryUID) {
IAllele primary = AlleleManager.alleleRegistry.getAllele(primaryUID);
IAllele secondary = AlleleManager.alleleRegistry.getAllele(secondaryUID);
primary = validateAllele(primarySpeciesUid, chromosomeType, primary);
secondary = validateAllele(secondarySpeciesUid, chromosomeType, secondary);
return new Chromosome(primary, secondary);
}
private static IAllele validateAllele(@Nullable String speciesUid, IChromosomeType chromosomeType, @Nullable IAllele allele) {
if (!chromosomeType.getAlleleClass().isInstance(allele)) {
ISpeciesRoot speciesRoot = chromosomeType.getSpeciesRoot();
@@ -112,16 +123,16 @@ public class Chromosome implements IChromosome {
IAllele choice1;
if (rand.nextBoolean()) {
choice1 = parent1.getPrimaryAllele();
choice1 = parent1.getActiveAllele();
} else {
choice1 = parent1.getSecondaryAllele();
choice1 = parent1.getInactiveAllele();
}
IAllele choice2;
if (rand.nextBoolean()) {
choice2 = parent2.getPrimaryAllele();
choice2 = parent2.getActiveAllele();
} else {
choice2 = parent2.getSecondaryAllele();
choice2 = parent2.getInactiveAllele();
}
if (rand.nextBoolean()) {
@@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import com.google.common.base.Objects;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IChromosome;
@@ -163,30 +162,54 @@ public abstract class Genome implements IGenome {
private static IChromosome[] getChromosomes(NBTTagCompound genomeNBT, ISpeciesRoot speciesRoot) {
//Handle old nbt format
if(genomeNBT.hasKey("Chromosomes")) {
NBTTagList chromosomesNBT = genomeNBT.getTagList("Chromosomes", 10);
IChromosome[] chromosomes = new IChromosome[speciesRoot.getDefaultTemplate().length];
NBTTagList chromosomesNBT = genomeNBT.getTagList("Chromosomes", 10);
IChromosome[] chromosomes = new IChromosome[speciesRoot.getDefaultTemplate().length];
String primarySpeciesUid = null;
String secondarySpeciesUid = null;
String primarySpeciesUid = null;
String secondarySpeciesUid = null;
for (int i = 0; i < chromosomesNBT.tagCount(); i++) {
NBTTagCompound chromosomeNBT = chromosomesNBT.getCompoundTagAt(i);
byte chromosomeOrdinal = chromosomeNBT.getByte(SLOT_TAG);
for (int i = 0; i < chromosomesNBT.tagCount(); i++) {
NBTTagCompound chromosomeNBT = chromosomesNBT.getCompoundTagAt(i);
byte chromosomeOrdinal = chromosomeNBT.getByte(SLOT_TAG);
if (chromosomeOrdinal >= 0 && chromosomeOrdinal < chromosomes.length) {
IChromosomeType chromosomeType = speciesRoot.getKaryotype()[chromosomeOrdinal];
Chromosome chromosome = Chromosome.create(primarySpeciesUid, secondarySpeciesUid, chromosomeType, chromosomeNBT);
chromosomes[chromosomeOrdinal] = chromosome;
if (chromosomeOrdinal >= 0 && chromosomeOrdinal < chromosomes.length) {
IChromosomeType chromosomeType = speciesRoot.getKaryotype()[chromosomeOrdinal];
Chromosome chromosome = Chromosome.create(primarySpeciesUid, secondarySpeciesUid, chromosomeType, chromosomeNBT);
chromosomes[chromosomeOrdinal] = chromosome;
if (chromosomeOrdinal == speciesRoot.getSpeciesChromosomeType().ordinal()) {
primarySpeciesUid = chromosome.getPrimaryAllele().getUID();
secondarySpeciesUid = chromosome.getSecondaryAllele().getUID();
}
}
}
return chromosomes;
}else{
NBTTagCompound activeTag = genomeNBT.getCompoundTag("Active");
NBTTagCompound inactiveTag = genomeNBT.getCompoundTag("Inactive");
IChromosomeType[] karyotype = speciesRoot.getKaryotype();
IChromosome[] chromosomes = new IChromosome[karyotype.length];
if (chromosomeOrdinal == speciesRoot.getSpeciesChromosomeType().ordinal()) {
String primarySpeciesUid = null;
String secondarySpeciesUid = null;
for(int index = 0;index < chromosomes.length;index++){
IChromosomeType chromosomeType = karyotype[index];
String typeName = chromosomeType.getName();
String activeAllele = activeTag.getString(typeName);
String inactiveAllele = inactiveTag.getString(typeName);
Chromosome chromosome = Chromosome.create(primarySpeciesUid, secondarySpeciesUid, chromosomeType, activeAllele, inactiveAllele);
chromosomes[index] = chromosome;
if (index == speciesRoot.getSpeciesChromosomeType().ordinal()) {
primarySpeciesUid = chromosome.getPrimaryAllele().getUID();
secondarySpeciesUid = chromosome.getSecondaryAllele().getUID();
}
}
return chromosomes;
}
return chromosomes;
}
protected static IAllele getActiveAllele(ItemStack itemStack, IChromosomeType chromosomeType, ISpeciesRoot speciesRoot) {
@@ -196,7 +219,6 @@ public abstract class Genome implements IGenome {
@Override
public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) {
NBTTagList nbttaglist = new NBTTagList();
for (int i = 0; i < chromosomes.length; i++) {
if (chromosomes[i] != null) {
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import forestry.api.genetics.IAllele;
@@ -107,6 +108,25 @@ public abstract class SpeciesRoot implements ISpeciesRoot {
return (IIndividualTranslator<I, O>) translators.get(translatorKey);
}
@Nullable
@Override
public <O, I extends IIndividual> I translateMember(O objectToTranslator) {
Object translatorKey = null;
if(objectToTranslator instanceof ItemStack){
translatorKey = ((ItemStack) objectToTranslator).getItem();
}else if(objectToTranslator instanceof IBlockState){
translatorKey = ((IBlockState) objectToTranslator).getBlock();
}
if(translatorKey == null){
return null;
}
IIndividualTranslator<I, O> translator = getTranslator(translatorKey);
if(translator == null){
return null;
}
return translator.getIndividualFromObject(objectToTranslator);
}
/* MUTATIONS */
@Override
public List<IMutation> getCombinations(IAllele other) {
@@ -120,6 +140,24 @@ public abstract class SpeciesRoot implements ISpeciesRoot {
return combinations;
}
@Override
public List<? extends IMutation> getResultantMutations(IAllele other) {
List<IMutation> mutations = new ArrayList<>();
int speciesIndex = getSpeciesChromosomeType().ordinal();
for (IMutation mutation : getMutations(false)) {
IAllele[] template = mutation.getTemplate();
if(template == null || template.length <= speciesIndex){
continue;
}
IAllele speciesAllele = template[speciesIndex];
if (speciesAllele == other) {
mutations.add(mutation);
}
}
return mutations;
}
@Override
public List<IMutation> getCombinations(IAlleleSpecies parentSpecies0, IAlleleSpecies parentSpecies1, boolean shuffle) {
List<IMutation> combinations = new ArrayList<>();
@@ -17,6 +17,9 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.Vec3i;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.core.ForestryAPI;
@@ -30,8 +33,7 @@ import forestry.api.genetics.IChromosomeType;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.apiculture.flowers.FlowerProvider;
import forestry.core.config.Constants;
import forestry.plugins.ForestryPluginUids;
import net.minecraft.util.math.Vec3i;
import forestry.modules.ForestryModuleUids;
public class AlleleHelper implements IAlleleHelper {
@@ -49,13 +51,13 @@ public class AlleleHelper implements IAlleleHelper {
}
public void init() {
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) {
createAlleles(EnumAllele.Fertility.class, EnumBeeChromosome.FERTILITY);
createAlleles(EnumAllele.Flowering.class, EnumBeeChromosome.FLOWERING);
createAlleles(EnumAllele.Territory.class, EnumBeeChromosome.TERRITORY);
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE) || ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE)) || ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY))) {
createAlleles(EnumAllele.Speed.class,
EnumBeeChromosome.SPEED,
EnumButterflyChromosome.SPEED
@@ -76,7 +78,7 @@ public class AlleleHelper implements IAlleleHelper {
);
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) {
createAlleles(EnumAllele.Height.class, EnumTreeChromosome.HEIGHT);
createAlleles(EnumAllele.Saplings.class, EnumTreeChromosome.FERTILITY);
createAlleles(EnumAllele.Yield.class, EnumTreeChromosome.YIELD);
@@ -85,7 +87,7 @@ public class AlleleHelper implements IAlleleHelper {
createAlleles(EnumAllele.Sappiness.class, EnumTreeChromosome.SAPPINESS);
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) {
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY))) {
createAlleles(EnumAllele.Size.class, EnumButterflyChromosome.SIZE);
}
@@ -10,6 +10,8 @@
******************************************************************************/
package forestry.core.genetics.alleles;
import com.google.common.collect.HashMultimap;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
@@ -19,8 +21,10 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.HashMultimap;
import net.minecraft.item.ItemStack;
import com.mojang.authlib.GameProfile;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleHandler;
import forestry.api.genetics.IAlleleRegistry;
@@ -32,10 +36,9 @@ import forestry.api.genetics.IFruitFamily;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import forestry.core.PluginCore;
import forestry.core.ModuleCore;
import forestry.core.genetics.Classification;
import forestry.core.genetics.ItemResearchNote.EnumNoteType;
import net.minecraft.item.ItemStack;
public class AlleleRegistry implements IAlleleRegistry {
@@ -291,11 +294,11 @@ public class AlleleRegistry implements IAlleleRegistry {
/* RESEARCH */
@Override
public ItemStack getSpeciesNoteStack(GameProfile researcher, IAlleleSpecies species) {
return EnumNoteType.createSpeciesNoteStack(PluginCore.getItems().researchNote, researcher, species);
return EnumNoteType.createSpeciesNoteStack(ModuleCore.getItems().researchNote, researcher, species);
}
@Override
public ItemStack getMutationNoteStack(GameProfile researcher, IMutation mutation) {
return EnumNoteType.createMutationNoteStack(PluginCore.getItems().researchNote, researcher, mutation);
return EnumNoteType.createMutationNoteStack(ModuleCore.getItems().researchNote, researcher, mutation);
}
}
@@ -15,7 +15,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import com.mojang.authlib.GameProfile;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.ForestryAPI;
@@ -26,16 +33,13 @@ import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IClassification;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.ModuleApiculture;
import forestry.apiculture.items.ItemRegistryApiculture;
import forestry.core.config.Constants;
import forestry.core.utils.GeneticsUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Translator;
import forestry.plugins.ForestryPluginUids;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import forestry.modules.ForestryModuleUids;
public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuilder, IAlleleSpecies {
private final String binomial;
@@ -78,8 +82,8 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuil
return 0f;
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) {
ItemRegistryApiculture beeItems = PluginApiculture.getItems();
if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) {
ItemRegistryApiculture beeItems = ModuleApiculture.getItems();
Item item = itemstack.getItem();
if (beeItems.honeyDrop == item) {
return 0.5f;
@@ -17,6 +17,7 @@ import net.minecraft.inventory.IContainerListener;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -0,0 +1,56 @@
package forestry.core.gui;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class Drawable {
public final int u;
public final int v;
public final int width;
public final int height;
public final ResourceLocation textureLocation;
public int textureWidth = 256;
public int textureHeight = 256;
public Drawable(ResourceLocation textureLocation, int u, int v, int width, int height) {
this.textureLocation = textureLocation;
this.u = u;
this.v = v;
this.width = width;
this.height = height;
}
public Drawable(ResourceLocation textureLocation, int u, int v, int width, int height, int textureWidth, int textureHeight) {
this.u = u;
this.v = v;
this.width = width;
this.height = height;
this.textureLocation = textureLocation;
this.textureWidth = textureWidth;
this.textureHeight = textureHeight;
}
public Drawable setTextureSize(int textureWidth, int textureHeight) {
this.textureWidth = textureWidth;
this.textureHeight = textureHeight;
return this;
}
public void draw(int xOffset, int yOffset) {
TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
textureManager.bindTexture(textureLocation);
// Enable correct lighting.
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
Gui.drawModalRectWithCustomSizedTexture(xOffset, yOffset, u, v, width, height, textureWidth, textureHeight);
}
}
@@ -214,11 +214,9 @@ public abstract class GuiForestry<C extends Container> extends GuiContainer {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) {
bindTexture(textureFile);
drawBackground();
int x = (width - xSize) / 2;
int y = (height - ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
widgetManager.updateWidgets(mouseX - guiLeft, mouseY - guiTop);
RenderHelper.enableGUIStandardItemLighting();
GlStateManager.disableLighting();
@@ -234,6 +232,14 @@ public abstract class GuiForestry<C extends Container> extends GuiContainer {
bindTexture(textureFile);
}
protected void drawBackground(){
bindTexture(textureFile);
int x = (width - xSize) / 2;
int y = (height - ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
}
protected void drawWidgets() {
ledgerManager.drawLedgers();
widgetManager.drawWidgets();
@@ -275,4 +281,8 @@ public abstract class GuiForestry<C extends Container> extends GuiContainer {
public List<Rectangle> getExtraGuiAreas() {
return ledgerManager.getLedgerAreas();
}
public TextLayoutHelper getTextLayout() {
return textLayout;
}
}
@@ -28,6 +28,7 @@ import forestry.apiculture.tiles.TileBeeHouse;
import forestry.core.items.ItemAlyzer;
import forestry.core.items.ItemSolderingIron;
import forestry.core.tiles.TileAnalyzer;
import forestry.database.tiles.TileDatabase;
import forestry.core.tiles.TileEscritoire;
import forestry.core.tiles.TileNaturalistChest;
import forestry.energy.tiles.TileEngineBiogas;
@@ -76,6 +77,8 @@ public class GuiIdRegistry {
TileRaintank.class,
TileWorktable.class,
TileDatabase.class,
TileBottler.class,
TileCarpenter.class,
TileCentrifuge.class,
@@ -88,7 +91,7 @@ public class GuiIdRegistry {
TileFarm.class,
TileGreenhouse.class,
TileClimatiser.class,
TileClimatiser.class,
TileHygroregulator.class,
TileEngineBiogas.class,
+5 -1
View File
@@ -30,12 +30,16 @@ import forestry.core.gui.tooltips.ToolTip;
@SideOnly(Side.CLIENT)
public class GuiUtil {
public static void drawItemStack(GuiForestry gui, ItemStack stack, int xPos, int yPos) {
drawItemStack(gui.getFontRenderer(), stack, xPos, yPos);
}
public static void drawItemStack(FontRenderer fontRenderer, ItemStack stack, int xPos, int yPos) {
FontRenderer font = null;
if (!stack.isEmpty()) {
font = stack.getItem().getFontRenderer(stack);
}
if (font == null) {
font = gui.getFontRenderer();
font = fontRenderer;
}
RenderItem itemRender = Minecraft.getMinecraft().getRenderItem();
@@ -10,11 +10,13 @@
******************************************************************************/
package forestry.core.gui;
import forestry.core.render.ColourProperties;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.core.render.ColourProperties;
@SideOnly(Side.CLIENT)
public class TextLayoutHelper {
private static final int LINE_HEIGHT = 12;
@@ -37,8 +39,11 @@ public class TextLayoutHelper {
GlStateManager.pushMatrix();
}
public void startPage(int column0, int column1, int column2) {
public void startPage(int column0, int column1) {
startPage(column0, column1, 0);
}
public void startPage(int column0, int column1, int column2) {
this.column0 = column0;
this.column1 = column1;
this.column2 = column2;
@@ -85,11 +90,19 @@ public class TextLayoutHelper {
}
public void drawCenteredLine(String text, int x, int width, int color) {
guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x + getCenteredOffset(text, width), guiForestry.getGuiTop() + line, color);
drawCenteredLine(text, x, 0, width, color);
}
public void drawCenteredLine(String text, int x, int y, int width, int color) {
guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x + getCenteredOffset(text, width), guiForestry.getGuiTop() + y + line, color);
}
public void drawLine(String text, int x, int color) {
guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x, guiForestry.getGuiTop() + line, color);
drawLine(text, x, 0, color);
}
public void drawLine(String text, int x, int y, int color) {
guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x, guiForestry.getGuiTop() + y + line, color);
}
public void drawSplitLine(String text, int x, int maxWidth, int color) {
@@ -19,6 +19,11 @@ public enum StandardButtonTextureSets implements IButtonTextureSet {
SMALL_BUTTON(0, 80, 15, 200),
LOCKED_BUTTON(224, 0, 16, 16),
UNLOCKED_BUTTON(240, 0, 16, 16),
SMALL_BLANK_BUTTON(208, 48, 16, 16),
ARROW_DOWN_BUTTON(224, 48, 16, 16),
ARROW_UP_BUTTON(240, 48, 16, 16),
DOWN_BUTTON(224, 96, 10, 16),
UP_BUTTON(240, 96, 10, 16),
LEFT_BUTTON(204, 0, 16, 10),
RIGHT_BUTTON(214, 0, 16, 10),
LEFT_BUTTON_SMALL(238, 220, 12, 9),
Loaded 100 of 277 files, more files were not shown because too many files have changed in this diff. Show more