Some todos

This commit is contained in:
Nedelosk committed 2017-04-12 15:46:47 +02:00
1 parent fd0783afee
commit d3b2c99c60
13 files changed
+116 -109

No files matched your search

@@ -1,5 +1,6 @@
package binnie.botany.ceramic;
import binnie.Binnie;
import binnie.botany.CreativeTabBotany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.BinnieCore;
@@ -139,8 +140,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored
@Override
public String getDisplayName(final ItemStack par1ItemStack) {
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
//TODO:localise
return EnumFlowerColor.get(meta).getColourName() + " Pigmented Glass";
return EnumFlowerColor.get(meta).getColourName() + " " + Binnie.LANGUAGE.localise("tile.botany.pigmented.glass.name");
}
@Override
@@ -2,12 +2,15 @@ package binnie.botany.flower;
import binnie.botany.Botany;
import binnie.botany.api.IFlower;
import binnie.botany.api.IFlowerGenome;
import binnie.botany.api.IFlowerType;
import binnie.botany.core.BotanyCore;
import binnie.botany.gardening.Gardening;
import binnie.botany.genetics.EnumFlowerType;
import binnie.botany.genetics.FlowerDefinition;
import binnie.botany.network.PacketID;
import binnie.core.BinnieCore;
import binnie.core.network.packet.MessageNBT;
import binnie.core.util.TileUtil;
import com.mojang.authlib.GameProfile;
import forestry.api.core.IStateMapperRegister;
@@ -24,9 +27,12 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
@@ -67,6 +73,35 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState
public void registerStateMapper() {
ModelLoader.setCustomStateMapper(this, new StateMapperFlower());
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
ItemStack heldItem = player.getHeldItemMainhand();
if (!heldItem.isEmpty() && heldItem.getItem() == BinnieCore.getFieldKit() && player.isSneaking()) {
if (world.isRemote) {
return true;
}
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileEntityFlower) {
TileEntityFlower tileFlower = (TileEntityFlower) tile;
IFlower flower = tileFlower.getFlower();
if (flower != 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.FIELDKIT.ordinal(), info), player);
heldItem.damageItem(1, player);
}
}
return true;
}
return false;
}
@Override
@Nullable
@@ -25,7 +25,6 @@ public enum PacketID implements IPacketID {
}
}
//TODO: localise
public void onUseFieldKit(NBTTagCompound data){
EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer();
String info = "";
@@ -40,15 +39,15 @@ public enum PacketID implements IPacketID {
if (primary == null || secondary == null) {
return;
}
info += "A";
info += Binnie.LANGUAGE.localise("botany.flowers.fielkit.a");
if (age == 0.0f) {
info += "";
} else if (age < 0.25f) {
info += " Young";
info += " " + Binnie.LANGUAGE.localise("botany.flowers.fielkit.young");
} else if (age < 0.75f) {
info += " Mature";
info += " " + Binnie.LANGUAGE.localise("botany.flowers.fielkit.mature");
} else {
info += " Old";
info += " " + Binnie.LANGUAGE.localise("botany.flowers.fielkit.old");
}
if (color1 == color2) {
info = info + " " + color1.getName();
@@ -6,8 +6,10 @@ import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.craftgui.renderer.RenderUtil;
import binnie.core.genetics.BreedingSystem;
import com.mojang.authlib.GameProfile;
@@ -15,6 +17,7 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.ISpeciesRoot;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import javax.annotation.Nullable;
@@ -66,29 +69,28 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme
@Override
public void onRenderForeground(int guiWidth, int guiHeight) {
//TODO RENDERING
// IIcon icon = null;
// if (this.species == null) {
// return;
// }
// final BreedingSystem system = Binnie.Genetics.getSystem(this.species.getRoot());
// switch (this.discovered) {
// case Show: {
// super.onRenderForeground();
// return;
// }
// case Discovered: {
// icon = system.getDiscoveredIcon();
// break;
// }
// case Undiscovered: {
// icon = system.getUndiscoveredIcon();
// break;
// }
// }
// if (icon != null) {
// CraftGUI.Render.iconItem(IPoint.ZERO, icon);
// }
TextureAtlasSprite icon = null;
if (this.species == null) {
return;
}
BreedingSystem system = Binnie.GENETICS.getSystem(this.species.getRoot());
switch (this.discovered) {
case Show: {
super.onRenderForeground(guiWidth, guiHeight);
return;
}
case Discovered: {
icon = system.getDiscoveredIcon();
break;
}
case Undiscovered: {
icon = system.getUndiscoveredIcon();
break;
}
}
if (icon != null) {
RenderUtil.drawGuiSprite(Point.ZERO, icon);
}
}
@Override
@@ -17,11 +17,14 @@ import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import forestry.api.genetics.ISpeciesType;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -318,13 +321,15 @@ public abstract class BreedingSystem implements IItemStackRepresentitive {
return discoveredSpecies;
}
// public IIcon getUndiscoveredIcon() {
// return this.iconUndiscovered.getIcon();
// }
//
// public IIcon getDiscoveredIcon() {
// return this.iconDiscovered.getIcon();
// }
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getUndiscoveredIcon() {
return this.iconUndiscovered.getSprite();
}
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getDiscoveredIcon() {
return this.iconDiscovered.getSprite();
}
public abstract float getChance(final IMutation p0, final EntityPlayer p1, final IAlleleSpecies p2, final IAlleleSpecies p3);
@@ -36,7 +36,6 @@ public class VirtualMothHousing extends VirtualHousing implements IButterflyNurs
@Override
public World getWorldObj() {
// TODO Auto-generated method stub
return null;
return getWorld();
}
}
@@ -37,41 +37,4 @@ public class ModuleItems implements IInitializable {
public void postInit() {
GameRegistry.addRecipe(new ItemStack(BinnieCore.getFieldKit(), 1, 63), "g ", " is", " pi", 'g', Blocks.GLASS_PANE, 'i', Items.IRON_INGOT, 'p', Items.PAPER, 's', new ItemStack(Items.DYE, 1));
}
@SubscribeEvent
public void onUseFieldKit(PlayerInteractEvent.RightClickBlock event) {
if (!BinnieCore.isBotanyActive()) {
return;
}
BlockPos pos = event.getPos();
World world = event.getWorld();
if (!world.isRemote) {
EntityPlayer player = event.getEntityPlayer();
if (player != null) {
ItemStack heldItem = player.getHeldItemMainhand();
if (!heldItem.isEmpty() && heldItem.getItem() == BinnieCore.getFieldKit() && player.isSneaking()) {
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileEntityFlower) {
TileEntityFlower tileFlower = (TileEntityFlower) tile;
IFlower flower = tileFlower.getFlower();
if (flower != 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());
}
}
}
}
}
}
}
@@ -53,6 +53,7 @@ public class ControlBiomes extends Control implements ITooltip {
if (Biome.getBiome(i) != null) {
//TODO FIND COLOR
//CraftGUI.Render.colour(Biome.getBiome(i).color);
}
CraftGUI.render.texture(CraftGUITexture.Button, new Area(x, y, 16, 16));
}
@@ -1,12 +1,16 @@
package binnie.extratrees.block;
import java.util.List;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
import forestry.api.core.Tabs;
import forestry.arboriculture.blocks.BlockArbDoor;
import net.minecraft.block.BlockDoor;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@@ -21,8 +25,10 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockETDoor extends BlockDoor implements IBlockMetadata {
public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntityProvider {
// private IIcon getFlippedIcon(final boolean upper, final boolean flip, final int tileMeta) {
// final DoorType type = getDoorType(tileMeta);
// return upper ? (flip ? type.iconDoorUpperFlip : type.iconDoorUpper) : (flip ? type.iconDoorLowerFlip : type.iconDoorLower);
@@ -181,35 +187,31 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
// final boolean flag2 = (j1 & 0x1) != 0x0;
// return (i1 & 0x7) | (flag ? 8 : 0) | (flag2 ? 16 : 0);
// }
@SideOnly(Side.CLIENT)
@Override
public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) {
int meta = getMetaFromState(state);
if (player.capabilities.isCreativeMode && (meta & 0x8) != 0x0 && world.getBlockState(pos.down()).getBlock() == this) {
world.setBlockToAir(pos.down());
}
}
// @Override
// @SideOnly(Side.CLIENT)
// public void onBlockHarvested(final World par1World, final int par2, final int par3, final int par4, final int par5, final EntityPlayer par6EntityPlayer) {
// if (par6EntityPlayer.capabilities.isCreativeMode && (par5 & 0x8) != 0x0 && par1World.getBlock(par2, par3 - 1, par4) == this) {
// par1World.setBlockToAir(par2, par3 - 1, par4);
// }
// }
//
// @Override
// public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) {
// return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta);
// }
@Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
return BlockMetadata.getBlockDroppedAsList(this, world, pos);
}
// @Override
// public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) {
// return BlockMetadata.breakBlock(this, player, world, x, y, z);
// }
@Override
public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
return BlockMetadata.breakBlock(this, player, world, pos);
}
@Override
public TileEntity createNewTileEntity(final World var1, final int k) {
return new TileEntityMetadata();
}
// @Override
// public boolean hasTileEntity(final int meta) {
// return true;
// }
@Override
public boolean eventReceived(IBlockState state, World world, BlockPos pos, int id, int param) {
TileEntity tileentity = world.getTileEntity(pos);
@@ -277,12 +279,6 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
return 5;
}
// @Override
// public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) {
// super.breakBlock(par1World, par2, par3, par4, par5, par6);
// par1World.removeTileEntity(par2, par3, par4);
// }
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
return BlockMetadata.getPickBlock(world, pos);
@@ -380,7 +380,6 @@ public class PlankType {
@Override
public String getPlankTextureName() {
//TODO implement
return "";
}
@@ -115,7 +115,6 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu
@Override
public World getWorldObj() {
// TODO Auto-generated method stub
return null;
return world;
}
}
@@ -4,6 +4,7 @@ import binnie.core.BinnieCore;
import binnie.core.machines.IMachine;
import binnie.core.machines.MachineComponent;
import binnie.core.machines.component.IRender;
import binnie.core.resource.BinnieSprite;
import net.minecraft.client.particle.Particle;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -77,6 +78,10 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl
@SideOnly(Side.CLIENT)
private static class SequencerParticle extends Particle {
private static final BinnieSprite[] SPRITES;
static{
SPRITES = new BinnieSprite[] { Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, Sequencer.fxSeqT};
}
double axisX;
double axisZ;
double angle;
@@ -93,8 +98,7 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl
this.particleGravity = 0.0f;
this.canCollide = true;
this.particleScale = 2.0f;
//TODO: Add sprites
//this.setParticleIcon((new BinnieIcon[] { Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, Sequencer.fxSeqT })[this.rand.nextInt(4)].getIcon());
setParticleTexture(SPRITES[this.rand.nextInt(4)].getSprite());
}
@Override