From b356c65a73a1c39d3df2b01e5bc013114d8556ec Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Thu, 27 Oct 2016 01:09:37 +0200 Subject: [PATCH 1/4] Register Fluid Textures --- .../botany/network/MessageFlowerUpdate.java | 56 ------------------- .../java/binnie/botany/network/PacketID.java | 38 ++++++------- src/main/java/binnie/core/BinnieCore.java | 2 + .../java/binnie/core/item/ModuleItems.java | 51 +++++++++-------- .../java/binnie/core/liquid/IFluidType.java | 6 +- .../binnie/core/liquid/ManagerLiquid.java | 27 +++++---- .../java/binnie/core/proxy/BinnieProxy.java | 7 +++ .../binnie/core/proxy/BinnieProxyClient.java | 36 +++++++++++- .../extrabees/liquids/ExtraBeeLiquid.java | 5 +- .../binnie/extratrees/alcohol/Alcohol.java | 5 +- .../java/binnie/extratrees/alcohol/Juice.java | 5 +- .../binnie/extratrees/alcohol/Liqueur.java | 5 +- .../binnie/extratrees/alcohol/MiscFluid.java | 10 ---- .../binnie/extratrees/alcohol/Spirit.java | 17 ++---- .../extratrees/item/ExtraTreeLiquid.java | 5 +- .../genetics/machine/ModuleMachine.java | 1 + .../resources/assets/botany/lang/en_US.lang | 4 ++ 17 files changed, 129 insertions(+), 151 deletions(-) delete mode 100644 src/main/java/binnie/botany/network/MessageFlowerUpdate.java diff --git a/src/main/java/binnie/botany/network/MessageFlowerUpdate.java b/src/main/java/binnie/botany/network/MessageFlowerUpdate.java deleted file mode 100644 index 91572b1c..00000000 --- a/src/main/java/binnie/botany/network/MessageFlowerUpdate.java +++ /dev/null @@ -1,56 +0,0 @@ -package binnie.botany.network; - -import binnie.botany.flower.TileEntityFlower; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.botany.genetics.EnumFlowerType; -import binnie.core.network.packet.MessageBinnie; -import binnie.core.network.packet.MessageCoordinates; -import io.netty.buffer.ByteBuf; - -import java.io.IOException; - -//TODO Remove this after test the PacketFlowerUpdate -public class MessageFlowerUpdate extends MessageCoordinates { - public TileEntityFlower.RenderInfo render; - - public MessageFlowerUpdate(final int posX, final int posY, final int posZ, final TileEntityFlower.RenderInfo render) { - super(PacketID.FlowerUpdate.ordinal(), posX, posY, posZ); - this.render = render; - } - - @Override - public MessageBinnie GetMessage() { - return super.GetMessage(); - } - - public MessageFlowerUpdate(final MessageBinnie message) { - super(message); - } - - @Override - public void writeData(final ByteBuf data) throws IOException { - super.writeData(data); - data.writeByte(this.render.primary.getID()); - data.writeByte(this.render.secondary.getID()); - data.writeByte(this.render.stem.getID()); - data.writeByte(this.render.type.ordinal()); - data.writeByte(this.render.age); - data.writeByte(this.render.section); - data.writeBoolean(this.render.wilted); - data.writeBoolean(this.render.flowered); - } - - @Override - public void readData(final ByteBuf data) throws IOException { - super.readData(data); - this.render = new TileEntityFlower.RenderInfo(); - this.render.primary = EnumFlowerColor.values()[data.readByte()]; - this.render.secondary = EnumFlowerColor.values()[data.readByte()]; - this.render.stem = EnumFlowerColor.values()[data.readByte()]; - this.render.type = EnumFlowerType.values()[data.readByte()]; - this.render.age = data.readByte(); - this.render.section = data.readByte(); - this.render.wilted = data.readBoolean(); - this.render.flowered = data.readBoolean(); - } -} diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index ef141cdd..7b3ffc26 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -1,5 +1,6 @@ package binnie.botany.network; +import binnie.Binnie; import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.flower.TileEntityFlower; import binnie.botany.genetics.EnumFlowerColor; @@ -16,24 +17,23 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; public enum PacketID implements IPacketID { - Encylopedia, - FlowerUpdate; + FIELDKIT; @Override - public void onMessage(final MessageBinnie message, final MessageContext context) { - if (this == PacketID.Encylopedia && context.side == Side.CLIENT) { - final MessageNBT packet = new MessageNBT(message); - final NBTTagCompound data = packet.getTagCompound(); - final EntityPlayer player = BinnieCore.proxy.getPlayer(); + public void onMessage(MessageBinnie message, MessageContext context) { + if (this == PacketID.FIELDKIT && context.side == Side.CLIENT) { + MessageNBT packet = new MessageNBT(message); + NBTTagCompound data = packet.getTagCompound(); + EntityPlayer player = BinnieCore.proxy.getPlayer(); String info = ""; if (data.hasNoTags()) { - info += "Flower has not been discovered by you. Breed this flower yourself to discover."; + info += Binnie.Language.localise("botany.flowers.species.not.discover"); } else { - final IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species")); - final IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2")); - final float age = data.getFloat("Age"); - final EnumFlowerColor color1 = EnumFlowerColor.get(data.getShort("Colour")); - final EnumFlowerColor color2 = EnumFlowerColor.get(data.getShort("Colour2")); + IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species")); + IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2")); + float age = data.getFloat("Age"); + EnumFlowerColor color1 = EnumFlowerColor.get(data.getShort("Colour")); + EnumFlowerColor color2 = EnumFlowerColor.get(data.getShort("Colour2")); if (primary == null || secondary == null) { return; } @@ -55,22 +55,16 @@ public enum PacketID implements IPacketID { if (primary == secondary) { info = info + " " + primary.getName(); } else { - info = info + " " + primary.getName() + "-" + secondary.getName() + " Hybrid"; + info = info + " " + primary.getName() + "-" + secondary.getName() + " " + Binnie.Language.localise("botany.flowers.species.hybrid"); } if (age == 0.0f) { - info += " Germling"; + info += " " + Binnie.Language.localise("botany.flowers.species.germling"); } if (data.getBoolean("Wilting")) { - info += ". Shame it is Wilting!"; + info += ". " + Binnie.Language.localise("botany.flowers.species.wilting"); } } player.addChatMessage(new TextComponentString(info)); - } else if (this == PacketID.FlowerUpdate) { - final MessageFlowerUpdate packet2 = new MessageFlowerUpdate(message); - final TileEntity tile = packet2.getTileEntity(BinnieCore.proxy.getWorld()); - if (tile instanceof TileEntityFlower) { - ((TileEntityFlower) tile).setRender(packet2.render); - } } } } diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 9eb337de..96094610 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -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); diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index bcbc4020..0daeb1aa 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -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()); + } + } } - } + } } } } diff --git a/src/main/java/binnie/core/liquid/IFluidType.java b/src/main/java/binnie/core/liquid/IFluidType.java index 8e85887c..4cad6c2d 100644 --- a/src/main/java/binnie/core/liquid/IFluidType.java +++ b/src/main/java/binnie/core/liquid/IFluidType.java @@ -1,12 +1,10 @@ package binnie.core.liquid; +import forestry.api.core.ISpriteRegister; 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(); diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 24b59d80..8365b364 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -1,8 +1,14 @@ package binnie.core.liquid; +import binnie.core.BinnieCore; 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 +46,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 +64,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()); + } + } } diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index e9e46375..eb489254 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -1,11 +1,16 @@ package binnie.core.proxy; import binnie.core.AbstractMod; +import binnie.core.liquid.IFluidType; import binnie.core.network.BinnieCorePacketID; import binnie.core.network.INetworkedEntity; import binnie.core.network.packet.MessageUpdate; import binnie.core.resource.BinnieResource; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -14,6 +19,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 00126427..9434462b 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,12 +1,19 @@ package binnie.core.proxy; import binnie.Constants; +import binnie.core.liquid.IFluidType; import binnie.core.models.ModelManager; import binnie.core.resource.BinnieResource; import binnie.craftgui.resource.minecraft.CraftGUIResourceManager; +import forestry.core.fluids.Fluids; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.BlockStateMapper; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.texture.SimpleTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -14,10 +21,12 @@ import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.IResourceManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -71,7 +80,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); @@ -198,4 +206,30 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy ((IReloadableResourceManager) manager).registerReloadListener(new CraftGUIResourceManager()); } } + + private static class FluidStateMapper extends StateMapperBase { + private final ModelResourceLocation fluidLocation; + + public FluidStateMapper(ModelResourceLocation fluidLocation) { + this.fluidLocation = fluidLocation; + } + + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState iBlockState) { + return fluidLocation; + } + } + + private static class FluidItemMeshDefinition implements ItemMeshDefinition { + private final ModelResourceLocation fluidLocation; + + public FluidItemMeshDefinition(ModelResourceLocation fluidLocation) { + this.fluidLocation = fluidLocation; + } + + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return fluidLocation; + } + } } diff --git a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java index 213d22fd..80e20447 100644 --- a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java +++ b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java @@ -1,6 +1,7 @@ package binnie.extrabees.liquids; import binnie.Binnie; +import binnie.Constants; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.ILiquidType; import binnie.extrabees.ExtraBees; @@ -23,12 +24,12 @@ public enum ExtraBeeLiquid implements ILiquidType { @Override public ResourceLocation getFlowing() { - return new ResourceLocation("liquids/" + this.getIdentifier()); + return new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "liquids/" + this.getIdentifier()); } @Override public ResourceLocation getStill() { - return new ResourceLocation("liquids/" + this.getIdentifier()); + return new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "liquids/" + this.getIdentifier()); } // @Override // public IIcon getIcon() { diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/src/main/java/binnie/extratrees/alcohol/Alcohol.java index 67b59739..eb152d49 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -1,6 +1,7 @@ package binnie.extratrees.alcohol; import binnie.Binnie; +import binnie.Constants; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.IFluidType; import binnie.extratrees.ExtraTrees; @@ -84,12 +85,12 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { //TODO TEXTURE @Override public ResourceLocation getFlowing() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); } @Override public ResourceLocation getStill() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); } diff --git a/src/main/java/binnie/extratrees/alcohol/Juice.java b/src/main/java/binnie/extratrees/alcohol/Juice.java index 3e185215..def93471 100644 --- a/src/main/java/binnie/extratrees/alcohol/Juice.java +++ b/src/main/java/binnie/extratrees/alcohol/Juice.java @@ -1,6 +1,7 @@ package binnie.extratrees.alcohol; import binnie.Binnie; +import binnie.Constants; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.IFluidType; import net.minecraft.util.ResourceLocation; @@ -74,12 +75,12 @@ public enum Juice implements IFluidType, ICocktailLiquid { @Override public ResourceLocation getFlowing() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); } @Override public ResourceLocation getStill() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/Liqueur.java b/src/main/java/binnie/extratrees/alcohol/Liqueur.java index cc3c9d02..3b00e5c4 100644 --- a/src/main/java/binnie/extratrees/alcohol/Liqueur.java +++ b/src/main/java/binnie/extratrees/alcohol/Liqueur.java @@ -1,6 +1,7 @@ package binnie.extratrees.alcohol; import binnie.Binnie; +import binnie.Constants; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.IFluidType; import net.minecraft.util.ResourceLocation; @@ -74,12 +75,12 @@ public enum Liqueur implements IFluidType, ICocktailLiquid { @Override public ResourceLocation getFlowing() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); } @Override public ResourceLocation getStill() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java index 5e2db7e8..134fdc29 100644 --- a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java +++ b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java @@ -44,16 +44,6 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid { return container == FluidContainer.Glass; } -// @Override -// public IIcon getIcon() { -// return this.icon; -// } -// -// @Override -// public void registerIcon(final IIconRegister register) { -// this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); -// } - @Override public ResourceLocation getFlowing() { return new ResourceLocation("liquids/liquid"); diff --git a/src/main/java/binnie/extratrees/alcohol/Spirit.java b/src/main/java/binnie/extratrees/alcohol/Spirit.java index e9246df0..62ffc9ec 100644 --- a/src/main/java/binnie/extratrees/alcohol/Spirit.java +++ b/src/main/java/binnie/extratrees/alcohol/Spirit.java @@ -1,8 +1,11 @@ package binnie.extratrees.alcohol; import binnie.Binnie; +import binnie.Constants; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.IFluidType; +import forestry.api.core.ITextureManager; +import forestry.core.render.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; @@ -65,24 +68,14 @@ public enum Spirit implements IFluidType, ICocktailLiquid { return container == FluidContainer.Glass; } -// @Override -// public IIcon getIcon() { -// return this.icon; -// } -// -// @Override -// public void registerIcon(final IIconRegister register) { -// this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); -// } - @Override public ResourceLocation getFlowing() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); } @Override public ResourceLocation getStill() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java index 562118b9..bf79efab 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java @@ -1,6 +1,7 @@ package binnie.extratrees.item; import binnie.Binnie; +import binnie.Constants; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.ILiquidType; import net.minecraft.util.ResourceLocation; @@ -36,12 +37,12 @@ public enum ExtraTreeLiquid implements ILiquidType { @Override public ResourceLocation getStill() { - return new ResourceLocation("liquids/" + this.getIdentifier()); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/" + this.getIdentifier()); } @Override public ResourceLocation getFlowing() { - return new ResourceLocation("liquids/" + this.getIdentifier()); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/" + this.getIdentifier()); } @Override diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 32f30956..7dc5f045 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -11,6 +11,7 @@ import binnie.genetics.item.GeneticsItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index d2c413ed..de04c4ef 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -183,6 +183,10 @@ botany.gui.database.tab.breeder=Breeder botany.gui.database.tab.colour.resultant=Resultant Mixes botany.gui.database.tab.colour.further=Further Mixes +botany.flowers.species.not.discover=Flower has not been discovered by you. Breed this flower yourself to discover. +botany.flowers.species.hybrid=Hybrid +botany.flowers.species.germling=Germling +botany.flowers.species.wilting=Shame it is Wilting! botany.flowers.species.Dandelion=Dandelion botany.flowers.species.Poppy=Poppy botany.flowers.species.Orchid=Orchid From 1982cbc6157246ce4cf1956d479e9a583844ce9c Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Thu, 27 Oct 2016 01:12:43 +0200 Subject: [PATCH 2/4] Clean Up --- src/main/java/binnie/botany/network/PacketID.java | 2 -- src/main/java/binnie/core/liquid/IFluidType.java | 1 - src/main/java/binnie/core/liquid/ManagerLiquid.java | 1 - src/main/java/binnie/core/proxy/BinnieProxy.java | 7 ------- src/main/java/binnie/core/proxy/BinnieProxyClient.java | 5 ----- src/main/java/binnie/extratrees/alcohol/Spirit.java | 2 -- src/main/java/binnie/genetics/machine/ModuleMachine.java | 1 - 7 files changed, 19 deletions(-) diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index 7b3ffc26..85225cb1 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -2,7 +2,6 @@ package binnie.botany.network; import binnie.Binnie; import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.flower.TileEntityFlower; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.BinnieCore; import binnie.core.network.IPacketID; @@ -11,7 +10,6 @@ import binnie.core.network.packet.MessageNBT; import forestry.api.genetics.AlleleManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/liquid/IFluidType.java b/src/main/java/binnie/core/liquid/IFluidType.java index 4cad6c2d..0ed7307c 100644 --- a/src/main/java/binnie/core/liquid/IFluidType.java +++ b/src/main/java/binnie/core/liquid/IFluidType.java @@ -1,6 +1,5 @@ package binnie.core.liquid; -import forestry.api.core.ISpriteRegister; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 8365b364..facdb8fd 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -1,6 +1,5 @@ package binnie.core.liquid; -import binnie.core.BinnieCore; import binnie.core.ManagerBase; import forestry.core.render.TextureManager; import net.minecraftforge.client.event.TextureStitchEvent; diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index eb489254..e9e46375 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -1,16 +1,11 @@ package binnie.core.proxy; import binnie.core.AbstractMod; -import binnie.core.liquid.IFluidType; import binnie.core.network.BinnieCorePacketID; import binnie.core.network.INetworkedEntity; import binnie.core.network.packet.MessageUpdate; import binnie.core.resource.BinnieResource; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.ModelBakery; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,8 +14,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 9434462b..f168d6ac 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,18 +1,14 @@ package binnie.core.proxy; import binnie.Constants; -import binnie.core.liquid.IFluidType; import binnie.core.models.ModelManager; import binnie.core.resource.BinnieResource; import binnie.craftgui.resource.minecraft.CraftGUIResourceManager; -import forestry.core.fluids.Fluids; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.BlockStateMapper; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.texture.SimpleTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -26,7 +22,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/binnie/extratrees/alcohol/Spirit.java b/src/main/java/binnie/extratrees/alcohol/Spirit.java index 62ffc9ec..8d1ccaa4 100644 --- a/src/main/java/binnie/extratrees/alcohol/Spirit.java +++ b/src/main/java/binnie/extratrees/alcohol/Spirit.java @@ -4,8 +4,6 @@ import binnie.Binnie; import binnie.Constants; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.IFluidType; -import forestry.api.core.ITextureManager; -import forestry.core.render.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 7dc5f045..32f30956 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -11,7 +11,6 @@ import binnie.genetics.item.GeneticsItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; From 5b4d490e94bda3b969f3d88261ff2e480f44f637 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Thu, 27 Oct 2016 01:13:55 +0200 Subject: [PATCH 3/4] Remove unused classes --- .../binnie/core/proxy/BinnieProxyClient.java | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index f168d6ac..7b7a5708 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -5,11 +5,8 @@ import binnie.core.models.ModelManager; import binnie.core.resource.BinnieResource; import binnie.craftgui.resource.minecraft.CraftGUIResourceManager; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.texture.SimpleTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -17,7 +14,6 @@ import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.IResourceManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -201,30 +197,4 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy ((IReloadableResourceManager) manager).registerReloadListener(new CraftGUIResourceManager()); } } - - private static class FluidStateMapper extends StateMapperBase { - private final ModelResourceLocation fluidLocation; - - public FluidStateMapper(ModelResourceLocation fluidLocation) { - this.fluidLocation = fluidLocation; - } - - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState iBlockState) { - return fluidLocation; - } - } - - private static class FluidItemMeshDefinition implements ItemMeshDefinition { - private final ModelResourceLocation fluidLocation; - - public FluidItemMeshDefinition(ModelResourceLocation fluidLocation) { - this.fluidLocation = fluidLocation; - } - - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return fluidLocation; - } - } } From ccb718b84db52b5e8a61edb685753c94d8780217 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Thu, 27 Oct 2016 01:34:14 +0200 Subject: [PATCH 4/4] Fix Flower Mutation Registration --- src/main/java/binnie/botany/genetics/FlowerFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/binnie/botany/genetics/FlowerFactory.java b/src/main/java/binnie/botany/genetics/FlowerFactory.java index fed46572..79dfc593 100644 --- a/src/main/java/binnie/botany/genetics/FlowerFactory.java +++ b/src/main/java/binnie/botany/genetics/FlowerFactory.java @@ -13,7 +13,9 @@ public class FlowerFactory implements IFlowerFactory { @Override public IFlowerMutationBuilder createMutation(IAlleleFlowerSpecies parentFlower0, IAlleleFlowerSpecies parentFlower1, IAllele[] result, int chance) { - return new FlowerMutation(parentFlower0, parentFlower1, result, chance); + FlowerMutation mutation = new FlowerMutation(parentFlower0, parentFlower1, result, chance); + FlowerManager.flowerRoot.registerMutation(mutation); + return mutation; } }