Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2

This commit is contained in:
Nedelosk committed 2016-10-25 18:14:30 +02:00
commit f993d0571d
40 files changed
+239 -271

No files matched your search

+14 -13
View File
@@ -52,7 +52,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = Constants.BOTANY_MOD_ID, name = "Binnie's Botany", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class Botany extends AbstractMod {
public static final float AGE_CHANCE = 0.2f;
@Mod.Instance(Constants.BOTANY_MOD_ID)
public static Botany instance;
@SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
@@ -86,19 +86,16 @@ public class Botany extends AbstractMod {
public static BlockStained stained;
public static BlockCeramicBrick ceramicBrick;
public static final float AGE_CHANCE = 0.2f;
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
this.addModule(new ModuleCore());
this.addModule(new ModuleGenetics());
this.addModule(new ModuleGardening());
this.preInit();
proxy.registerModels();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
proxy.registerItemAndBlockColors();
}
@Mod.EventHandler
@@ -106,8 +103,11 @@ public class Botany extends AbstractMod {
this.postInit();
}
public Botany() {
Botany.instance = this;
@Override
protected void registerModules() {
this.addModule(new ModuleCore());
this.addModule(new ModuleGenetics());
this.addModule(new ModuleGardening());
}
@Override
@@ -145,6 +145,11 @@ public class Botany extends AbstractMod {
return PacketHandler.class;
}
@Override
public boolean isActive() {
return BinnieCore.isBotanyActive();
}
@SubscribeEvent
public void onShearFlower(final PlayerInteractEvent.RightClickBlock event) {
if (event.getEntityPlayer() != null && event.getEntityPlayer().getHeldItemMainhand() != null && event.getEntityPlayer().getHeldItemMainhand().getItem() == Items.SHEARS) {
@@ -271,11 +276,6 @@ public class Botany extends AbstractMod {
}
}
@Override
public boolean isActive() {
return BinnieCore.isBotanyActive();
}
@Mod.EventHandler
public void onIMC(final FMLInterModComms.IMCEvent event) {
for (final FMLInterModComms.IMCMessage message : event.getMessages()) {
@@ -305,4 +305,5 @@ public class Botany extends AbstractMod {
super(Botany.instance);
}
}
}
@@ -1,11 +1,11 @@
package binnie.botany.api;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
import java.util.Locale;
public enum EnumSoilType implements IStringSerializable {
SOIL(TextFormatting.DARK_GRAY),
LOAM(TextFormatting.GOLD),
@@ -11,6 +11,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleFlowerSpecies> {
IFlowerType getType();
EnumAcidity getPH();
@@ -20,8 +21,8 @@ public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty<IA
@SideOnly(Side.CLIENT)
int getFlowerColour(EnumFlowerStage type, int renderPass);
@SideOnly(Side.CLIENT)
@Nonnull
@SideOnly(Side.CLIENT)
ModelResourceLocation getFlowerModel(EnumFlowerStage type, boolean flowered, int section);
@SideOnly(Side.CLIENT)
@@ -1,10 +1,10 @@
package binnie.botany.api;
import javax.annotation.Nonnull;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
import javax.annotation.Nonnull;
public interface IFlowerFactory {
@Nonnull
@@ -3,9 +3,9 @@ package binnie.botany.ceramic;
import binnie.Constants;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.ceramic.BlockCeramicBrick.BlockType;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.botany.items.BotanyItems;
import binnie.botany.ceramic.BlockCeramicBrick.BlockType;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.IMultipassBlock;
@@ -1,8 +1,5 @@
package binnie.botany.ceramic;
import java.util.HashMap;
import java.util.Map;
import binnie.botany.Botany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.botany.items.BotanyItems;
@@ -18,6 +15,9 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import java.util.HashMap;
import java.util.Map;
public class CeramicDesignSystem implements IDesignSystem {
public static CeramicDesignSystem instance = new CeramicDesignSystem();
Map<Integer, TextureAtlasSprite> primary;
@@ -10,8 +10,6 @@ import binnie.botany.api.IFlower;
import binnie.botany.api.IFlowerType;
import binnie.botany.core.BotanyCore;
import binnie.botany.genetics.Flower;
import binnie.botany.genetics.FlowerDefinition;
import binnie.botany.genetics.FlowerGenome;
import binnie.core.BinnieCore;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
@@ -163,9 +161,6 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
return null;
}
IAlleleFlowerSpecies flowerSpecies = flower.getGenome().getPrimary();
if (flowerSpecies == null) {
flowerSpecies = FlowerDefinition.Dandelion.getSpecies();
}
IFlowerType flowerType = flowerSpecies.getType();
return flowerSpecies.getFlowerModel(type, flower.hasFlowered(), flowerType.getSections() - 1);
}
@@ -16,11 +16,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
@@ -1,14 +1,6 @@
package binnie.botany.genetics;
import javax.annotation.Nonnull;
import binnie.botany.api.EnumAcidity;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.EnumMoisture;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IAlleleFlowerSpeciesBuilder;
import binnie.botany.api.IFlowerType;
import binnie.botany.api.*;
import binnie.botany.core.BotanyCore;
import forestry.api.core.IModelManager;
import forestry.api.genetics.AlleleManager;
@@ -18,6 +10,8 @@ import forestry.core.genetics.alleles.AlleleSpecies;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import javax.annotation.Nonnull;
public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerSpecies, IAlleleFlowerSpeciesBuilder {
@Nonnull
@@ -11,11 +11,10 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
import javax.annotation.Nonnull;
public class Flower extends Individual implements IFlower {
public IFlowerGenome genome;
public IFlowerGenome mate;
@@ -1046,7 +1046,6 @@ public enum FlowerDefinition implements IFlowerDefinition {
IFlower flower = getIndividual();
return BotanyCore.getFlowerRoot().getMemberStack(flower, flowerStage);
}
public static void preInitFlowers(){
MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(FlowerManager.flowerRoot));
@@ -1,10 +1,6 @@
package binnie.botany.genetics;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IAlleleFlowerSpeciesBuilder;
import binnie.botany.api.IFlowerFactory;
import binnie.botany.api.IFlowerMutationBuilder;
import binnie.botany.api.IFlowerType;
import binnie.botany.api.*;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
@@ -1,10 +1,6 @@
package binnie.botany.genetics;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IFlowerGenome;
import binnie.botany.api.IFlowerMutation;
import binnie.botany.api.IFlowerMutationBuilder;
import binnie.botany.api.IFlowerRoot;
import binnie.botany.api.*;
import binnie.botany.core.BotanyCore;
import forestry.api.core.ForestryAPI;
import forestry.api.genetics.IAllele;
@@ -3,7 +3,6 @@ package binnie.botany.genetics;
import binnie.botany.Botany;
import binnie.botany.api.*;
import com.mojang.authlib.GameProfile;
import forestry.api.genetics.*;
import forestry.core.genetics.SpeciesRoot;
import net.minecraft.item.Item;