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

This commit is contained in:
marcin212 committed 2016-10-27 05:21:18 +02:00
commit 09fa488cff
16 files changed
+85 -154

No files matched your search

@@ -30,6 +30,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod;
@@ -61,6 +62,7 @@ public final class BinnieCore extends AbstractMod {
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
MinecraftForge.EVENT_BUS.register(Binnie.Liquid);
Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
for (final FluidContainer container : FluidContainer.values()) {
final Item item = new ItemFluidContainer(container);
+27 -24
View File
@@ -37,36 +37,39 @@ public class ModuleItems implements IInitializable {
}
@SubscribeEvent
public void onUseFieldKit(final PlayerInteractEvent.RightClickBlock event) {
public void onUseFieldKit(PlayerInteractEvent.RightClickBlock event) {
if (!BinnieCore.isBotanyActive()) {
return;
}
BlockPos pos = event.getPos();
World world = event.getWorld();
EntityPlayer player = event.getEntityPlayer();
if (player != null) {
ItemStack heldItem = player.getHeldItemMainhand();
if(heldItem != null && heldItem.getItem() == BinnieCore.fieldKit && player.isSneaking()){
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileEntityFlower) {
TileEntityFlower tileFlower = (TileEntityFlower) tile;
IFlower flower = tileFlower.getFlower();
if (flower != null && flower.getGenome() != null) {
IFlowerGenome flowerGenome = flower.getGenome();
NBTTagCompound info = new NBTTagCompound();
info.setString("Species", flowerGenome.getPrimary().getUID());
info.setString("Species2", flowerGenome.getSecondary().getUID());
info.setFloat("Age", flower.getAge() / flowerGenome.getLifespan());
info.setShort("Colour", (short) flowerGenome.getPrimaryColor().getID());
info.setShort("Colour2", (short) flowerGenome.getSecondaryColor().getID());
info.setBoolean("Wilting", flower.isWilted());
info.setBoolean("Flowered", flower.hasFlowered());
Botany.proxy.sendToPlayer(new MessageNBT(PacketID.Encylopedia.ordinal(), info), player);
heldItem.damageItem(1, event.getEntityPlayer());
}
if(!world.isRemote){
EntityPlayer player = event.getEntityPlayer();
if (player != null) {
ItemStack heldItem = player.getHeldItemMainhand();
if(heldItem != null && heldItem.getItem() == BinnieCore.fieldKit && player.isSneaking()){
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileEntityFlower) {
TileEntityFlower tileFlower = (TileEntityFlower) tile;
IFlower flower = tileFlower.getFlower();
if (flower != null && flower.getGenome() != null) {
IFlowerGenome flowerGenome = flower.getGenome();
NBTTagCompound info = new NBTTagCompound();
info.setString("Species", flowerGenome.getPrimary().getUID());
info.setString("Species2", flowerGenome.getSecondary().getUID());
info.setFloat("Age", flower.getAge() / flowerGenome.getLifespan());
info.setShort("Colour", (short) flowerGenome.getPrimaryColor().getID());
info.setShort("Colour2", (short) flowerGenome.getSecondaryColor().getID());
info.setBoolean("Wilting", flower.isWilted());
info.setBoolean("Flowered", flower.hasFlowered());
//TODO: Find out why minecraft post 2 messages
Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FIELDKIT.ordinal(), info), player);
heldItem.damageItem(1, event.getEntityPlayer());
}
}
}
}
}
}
}
}
@@ -3,10 +3,7 @@ package binnie.core.liquid;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
public interface IFluidType {
// IIcon getIcon();
//
// void registerIcon(final IIconRegister p0);
public interface IFluidType{
ResourceLocation getFlowing();
@@ -1,8 +1,13 @@
package binnie.core.liquid;
import binnie.core.ManagerBase;
import forestry.core.render.TextureManager;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.Collection;
import java.util.LinkedHashMap;
@@ -40,18 +45,6 @@ public class ManagerLiquid extends ManagerBase {
return FluidRegistry.getFluidStack(name.toLowerCase(), amount);
}
// @SideOnly(Side.CLIENT)
// public void reloadIcons(final IIconRegister register) {
// for (final IFluidType type : this.fluids.values()) {
// final Fluid fluid = this.getLiquidStack(type.getIdentifier(), 1).getFluid();
// type.registerIcon(register);
// if (fluid == null) {
// throw new RuntimeException("[Binnie] Liquid not registered properly - " + type.getIdentifier());
// }
// fluid.setIcons(type.getIcon());
// }
// }
@Override
public void init() {
}
@@ -70,4 +63,13 @@ public class ManagerLiquid extends ManagerBase {
public IFluidType getFluidType(final String liquid) {
return this.fluids.get(liquid.toLowerCase());
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void registerSprites(TextureStitchEvent event){
for (IFluidType fluid : this.fluids.values()) {
TextureManager.registerSprite(fluid.getFlowing());
TextureManager.registerSprite(fluid.getStill());
}
}
}
@@ -71,7 +71,6 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy
ModelLoader.setCustomModelResourceLocation(item, meta, modelResourceLocation);
}
@Override
public void bindTexture(final BinnieResource texture) {
GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);