From 12f82e3cb7ef301cc6c4bb77c8a106f83cf0dbd4 Mon Sep 17 00:00:00 2001 From: Alex Spinks Date: Tue, 14 Jul 2015 04:02:09 +0100 Subject: [PATCH] POH. TAY. TOES. --- .../fox/spiteful/avaritia/ClientProxy.java | 3 + .../avaritia/compat/CompatClient.java | 17 ++ .../spiteful/avaritia/compat/Tsundere.java | 9 ++ .../compat/tsundere/BlockInfinitato.java | 109 +++++++++++++ .../compat/tsundere/ModelInfinitato.java | 24 +++ .../compat/tsundere/RenderInfinitato.java | 44 ++++++ .../compat/tsundere/RenderTileInfinitato.java | 145 ++++++++++++++++++ .../compat/tsundere/TileInfinitato.java | 41 +++++ .../avaritia/items/ItemSingularity.java | 4 +- .../avaritia/tile/TileEntityNeutron.java | 37 ++--- .../spiteful/avaritia/tile/TileLudicrous.java | 39 +++++ .../resources/assets/avaritia/lang/en_US.lang | 1 + .../avaritia/textures/blocks/infinitato.png | Bin 0 -> 7892 bytes .../avaritia/textures/items/halo128.png | Bin 0 -> 6784 bytes 14 files changed, 445 insertions(+), 28 deletions(-) create mode 100644 src/main/java/fox/spiteful/avaritia/compat/CompatClient.java create mode 100644 src/main/java/fox/spiteful/avaritia/compat/tsundere/BlockInfinitato.java create mode 100644 src/main/java/fox/spiteful/avaritia/compat/tsundere/ModelInfinitato.java create mode 100644 src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderInfinitato.java create mode 100644 src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderTileInfinitato.java create mode 100644 src/main/java/fox/spiteful/avaritia/compat/tsundere/TileInfinitato.java create mode 100644 src/main/java/fox/spiteful/avaritia/tile/TileLudicrous.java create mode 100644 src/main/resources/assets/avaritia/textures/blocks/infinitato.png create mode 100644 src/main/resources/assets/avaritia/textures/items/halo128.png diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index c14484c..99fcf46 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -1,5 +1,6 @@ package fox.spiteful.avaritia; +import fox.spiteful.avaritia.compat.CompatClient; import fox.spiteful.avaritia.items.LudicrousItems; import fox.spiteful.avaritia.render.FancyHaloRenderer; import net.minecraftforge.client.MinecraftForgeClient; @@ -12,5 +13,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(LudicrousItems.resource, shiny); MinecraftForgeClient.registerItemRenderer(LudicrousItems.singularity, shiny); + + CompatClient.comprettify(); } } diff --git a/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java b/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java new file mode 100644 index 0000000..af2f64d --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java @@ -0,0 +1,17 @@ +package fox.spiteful.avaritia.compat; + +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import fox.spiteful.avaritia.compat.tsundere.RenderInfinitato; +import fox.spiteful.avaritia.compat.tsundere.RenderTileInfinitato; +import fox.spiteful.avaritia.compat.tsundere.TileInfinitato; + +public class CompatClient { + + public static void comprettify() { + if (Compat.botan) { + RenderingRegistry.registerBlockHandler(new RenderInfinitato(RenderingRegistry.getNextAvailableRenderId())); + ClientRegistry.bindTileEntitySpecialRenderer(TileInfinitato.class, new RenderTileInfinitato()); + } + } +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/Tsundere.java b/src/main/java/fox/spiteful/avaritia/compat/Tsundere.java index 3f25c8a..157aaf6 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/Tsundere.java +++ b/src/main/java/fox/spiteful/avaritia/compat/Tsundere.java @@ -2,9 +2,12 @@ package fox.spiteful.avaritia.compat; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.blocks.LudicrousBlocks; +import fox.spiteful.avaritia.compat.tsundere.BlockInfinitato; +import fox.spiteful.avaritia.compat.tsundere.TileInfinitato; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import fox.spiteful.avaritia.crafting.Grinder; import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -12,6 +15,8 @@ import vazkii.botania.api.BotaniaAPI; public class Tsundere { + public static Block infinitato; + public static void baka() throws Compat.ItemNotFoundException { Item resource = Compat.getItem("Botania", "manaResource"); ItemStack gaia = new ItemStack(resource, 1, 14); @@ -51,6 +56,10 @@ public class Tsundere { 'N', new ItemStack(LudicrousItems.resource, 1, 4), 'n', new ItemStack(LudicrousItems.resource, 1, 3), }); + + infinitato = new BlockInfinitato(); + GameRegistry.registerBlock(infinitato, "infinitato"); + GameRegistry.registerTileEntity(TileInfinitato.class, "Avaritia_Infinitato"); } private static ItemStack getFlower(String type) throws Compat.ItemNotFoundException { diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/BlockInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/tsundere/BlockInfinitato.java new file mode 100644 index 0000000..af1cc54 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/tsundere/BlockInfinitato.java @@ -0,0 +1,109 @@ +package fox.spiteful.avaritia.compat.tsundere; + +import net.minecraft.block.BlockContainer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import java.util.ArrayList; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; + +public class BlockInfinitato extends BlockContainer implements ILexiconable { + public static LexiconEntry lexiconEntry; + + public BlockInfinitato() { + super(Material.cloth); + setHardness(0.25F); + setBlockName("infinitato"); + float f = 1F / 16F * 4F; + setBlockBounds(f, 0, f, 1F - f, f*3, 1F - f); + } + + @Override + public void registerBlockIcons(IIconRegister par1IconRegister) { + // NO-OP + } + + @Override + public IIcon getIcon(int side, int meta) { + return Blocks.hardened_clay.getIcon(0, 11); + } + + @Override + public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { + TileEntity tile = par1World.getTileEntity(par2, par3, par4); + if(tile instanceof TileInfinitato) { + ((TileInfinitato) tile).jump(); + par1World.spawnParticle("heart", par2 + minX + Math.random() * (maxX - minX), par3 + maxY, par4 + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); + par1World.spawnParticle("heart", par2 + minX + Math.random() * (maxX - minX), par3 + maxY, par4 + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); + par1World.spawnParticle("heart", par2 + minX + Math.random() * (maxX - minX), par3 + maxY, par4 + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); + } + return true; + } + + @Override + public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) { + int l1 = MathHelper.floor_double(par5EntityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + + par1World.setBlockMetadataWithNotify(par2, par3, par4, l1, 2); + if (par6ItemStack.hasDisplayName()) + ((TileInfinitato) par1World.getTileEntity(par2, par3, par4)).name = par6ItemStack.getDisplayName(); + } + + @Override + public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { + if(!par6EntityPlayer.capabilities.isCreativeMode) + dropBlockAsItem(par1World, par2, par3, par4, par5, 0); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + ArrayList list = new ArrayList(); + TileEntity tile = world.getTileEntity(x, y, z); + + if(tile != null) { + ItemStack stack = new ItemStack(this); + String name = ((TileInfinitato) tile).name; + if(!name.isEmpty()) + stack.setStackDisplayName(name); + list.add(stack); + } + + return list; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public int getRenderType() { + return RenderInfinitato.renderID; + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileInfinitato(); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return lexiconEntry; + } +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/ModelInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/tsundere/ModelInfinitato.java new file mode 100644 index 0000000..1bcc734 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/tsundere/ModelInfinitato.java @@ -0,0 +1,24 @@ +package fox.spiteful.avaritia.compat.tsundere; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; + +public class ModelInfinitato extends ModelBase { + + ModelRenderer potato; + + public ModelInfinitato() { + textureWidth = 64; + textureHeight = 32; + + potato = new ModelRenderer(this, 0, 0); + potato.addBox(0F, 0F, 0F, 8, 12, 8); + potato.setRotationPoint(-4F, 12F, -4F); + potato.setTextureSize(64, 32); + } + + public void render() { + potato.render(1F / 16F); + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderInfinitato.java new file mode 100644 index 0000000..588d0d6 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderInfinitato.java @@ -0,0 +1,44 @@ +package fox.spiteful.avaritia.compat.tsundere; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + +public class RenderInfinitato implements ISimpleBlockRenderingHandler { + public static int renderID; + + public RenderInfinitato(int id) { + renderID = id; + } + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + GL11.glPushMatrix(); + GL11.glTranslatef(-0.5F, -0.35F, 0.5F); + GL11.glRotated(90, 0, 1, 0); + RenderTileInfinitato.drawHalo = false; + TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileInfinitato(), 0.0D, 0.0D, 0.0D, 0.0F); + RenderTileInfinitato.drawHalo = true; + GL11.glPopMatrix(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + return false; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return renderID; + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderTileInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderTileInfinitato.java new file mode 100644 index 0000000..6fa5248 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderTileInfinitato.java @@ -0,0 +1,145 @@ +package fox.spiteful.avaritia.compat.tsundere; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; + +public class RenderTileInfinitato extends TileEntitySpecialRenderer { + + public static boolean drawHalo = true; + private static final ResourceLocation texture = new ResourceLocation("avaritia","textures/blocks/infinitato.png"); + public static final ResourceLocation halo = new ResourceLocation("avaritia", "textures/items/halo128.png"); + private static final ModelInfinitato model = new ModelInfinitato(); + + @Override + public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8) { + TileInfinitato potato = (TileInfinitato) var1; + Tessellator tessellator = Tessellator.instance; + GL11.glPushMatrix(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glColor4f(1F, 1F, 1F, 1F); + GL11.glTranslated(d0, d1, d2); + + Minecraft mc = Minecraft.getMinecraft(); + + + GL11.glTranslatef(0.5F, 1.5F, 0.5F); + GL11.glScalef(1F, -1F, -1F); + int meta = potato.getWorldObj() == null ? 3 : potato.getBlockMetadata(); + float rotY = meta * 90F - 180F; + GL11.glRotatef(rotY, 0F, 1F, 0F); + + float jump = potato.jumpTicks*0.5f; + if(jump > 0) + jump += var8*0.5f; + + float up = (float) -Math.abs(Math.sin(jump / 10 * Math.PI)) * 0.2F; + float rotZ = (float) Math.sin(jump / 10 * Math.PI) * 2; + + if (drawHalo){ + mc.renderEngine.bindTexture(halo); + GL11.glPushMatrix(); + + double xdiff = potato.xCoord + 0.5 - mc.thePlayer.posX; + double ydiff = potato.yCoord + 0.4 - (mc.thePlayer.posY + mc.thePlayer.eyeHeight); + double zdiff = potato.zCoord + 0.5 - mc.thePlayer.posZ; + + double len = Math.sqrt(xdiff*xdiff + ydiff*ydiff + zdiff*zdiff); + + xdiff /= len; + ydiff /= len; + zdiff /= len; + + GL11.glTranslated(xdiff, ydiff, -zdiff); + + GL11.glRotatef(-rotZ, 0F, 0F, 1F); + GL11.glRotatef(-rotY, 0F, 1F, 0F); + GL11.glScalef(1F, -1F, -1F); + + GL11.glTranslatef(0F, -1.15F, 0F); + GL11.glRotatef(-RenderManager.instance.playerViewY, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(RenderManager.instance.playerViewX, 1.0F, 0.0F, 0.0F); + + //GL11.glTranslatef(0F, 0F, -1F); + float f = 1.6F; + float f1 = 0.016666668F * f; + GL11.glScalef(f1, f1, f1); + GL11.glDisable(GL11.GL_LIGHTING); + //GL11.glTranslatef(0.0F, 0F / f1, 0.0F); + GL11.glDepthMask(false); + //GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_ALPHA_TEST); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + tessellator.startDrawingQuads(); + int i=60; + tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 1.0F); + tessellator.addVertexWithUV(-i, -i, 0.0D, 0,0); + tessellator.addVertexWithUV(-i, i, 0.0D, 1,0); + tessellator.addVertexWithUV(i, i, 0.0D, 1,1); + tessellator.addVertexWithUV(i, -i, 0.0D, 0,1); + tessellator.draw(); + GL11.glDepthMask(true); + //GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glColor4f(1F, 1F, 1F, 1F); + //GL11.glScalef(1F / -f1, 1F / -f1, 1F / f1); + + GL11.glPopMatrix(); + } + + GL11.glTranslatef(0F, up, 0F); + GL11.glRotatef(rotZ, 0F, 0F, 1F); + + mc.renderEngine.bindTexture(texture); + model.render(); + + GL11.glRotatef(-rotZ, 0F, 0F, 1F); + GL11.glRotatef(-rotY, 0F, 1F, 0F); + GL11.glColor3f(1F, 1F, 1F); + GL11.glScalef(1F, -1F, -1F); + + if(!potato.name.isEmpty()) { + GL11.glPushMatrix(); + GL11.glTranslatef(0F, -0.6F, 0F); + GL11.glRotatef(-RenderManager.instance.playerViewY, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(RenderManager.instance.playerViewX, 1.0F, 0.0F, 0.0F); + float f = 1.6F; + float f1 = 0.016666668F * f; + GL11.glScalef(-f1, -f1, f1); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glTranslatef(0.0F, 0F / f1, 0.0F); + GL11.glDepthMask(false); + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glDisable(GL11.GL_TEXTURE_2D); + tessellator.startDrawingQuads(); + int i = mc.fontRenderer.getStringWidth(potato.name) / 2; + tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); + tessellator.addVertex(-i - 1, -1.0D, 0.0D); + tessellator.addVertex(-i - 1, 8.0D, 0.0D); + tessellator.addVertex(i + 1, 8.0D, 0.0D); + tessellator.addVertex(i + 1, -1.0D, 0.0D); + tessellator.draw(); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDepthMask(true); + mc.fontRenderer.drawString(potato.name, -mc.fontRenderer.getStringWidth(potato.name) / 2, 0, 0xFFFFFF); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_BLEND); + GL11.glColor4f(1F, 1F, 1F, 1F); + GL11.glScalef(1F / -f1, 1F / -f1, 1F / f1); + GL11.glPopMatrix(); + } + + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/TileInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/tsundere/TileInfinitato.java new file mode 100644 index 0000000..ef3cf95 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/tsundere/TileInfinitato.java @@ -0,0 +1,41 @@ +package fox.spiteful.avaritia.compat.tsundere; + +import fox.spiteful.avaritia.tile.TileLudicrous; +import net.minecraft.nbt.NBTTagCompound; + + +public class TileInfinitato extends TileLudicrous { + + private static final String TAG_NAME = "name"; + + public int jumpTicks = 0; + public String name = ""; + + public void jump() { + if(jumpTicks == 0) + jumpTicks = 40; + } + + @Override + public void updateEntity() { + /*if(worldObj.rand.nextInt(100) == 0) + jump();*/ + + if(jumpTicks > 0) { + jumpTicks--; + if (jumpTicks == 20 || jumpTicks == 0) { + this.worldObj.createExplosion(null, this.xCoord+0.5, this.yCoord, this.zCoord+0.5, 0.0f, true); + } + } + } + + @Override + public void writeCustomNBT(NBTTagCompound cmp) { + cmp.setString(TAG_NAME, name); + } + + @Override + public void readCustomNBT(NBTTagCompound cmp) { + name = cmp.getString(TAG_NAME); + } +} \ No newline at end of file diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java index 48ad4ed..ab98b73 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java @@ -16,9 +16,9 @@ public class ItemSingularity extends Item { public static final String[] types = new String[]{"iron", "gold", "lapis", "redstone", "quartz", "copper", "tin", "lead", "silver"}; - public static final int[] colors = new int[]{0xBFBFBF, 0xE8EF23, 0x5a82e2, 0xDF0000, 0xE6E6A3, 0xE47200, + public static final int[] colors = new int[]{0xBFBFBF, 0xE8EF23, 0x5a82e2, 0xDF0000, 0xeeebe6, 0xE47200, 0xA5C7DE, 0x444072, 0xF9F9F9}; - public static final int[] colors2 = new int[]{0x7F7F7F, 0xdba213, 0x224baf, 0xB20000, 0xBDBDBD, 0x89511A, + public static final int[] colors2 = new int[]{0x7F7F7F, 0xdba213, 0x224baf, 0x900000, 0x94867d, 0x89511A, 0x9BA9B2, 0x3E3D4E, 0xD5D5D5}; public static IIcon background; public static IIcon foreground; diff --git a/src/main/java/fox/spiteful/avaritia/tile/TileEntityNeutron.java b/src/main/java/fox/spiteful/avaritia/tile/TileEntityNeutron.java index d10f33f..01f6fc3 100644 --- a/src/main/java/fox/spiteful/avaritia/tile/TileEntityNeutron.java +++ b/src/main/java/fox/spiteful/avaritia/tile/TileEntityNeutron.java @@ -5,17 +5,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -public class TileEntityNeutron extends TileEntity implements IInventory { +public class TileEntityNeutron extends TileLudicrous implements IInventory { private ItemStack neutrons; private int facing = 2; private int progress; + @Override public void updateEntity(){ if(++progress >= 10665){ //if(++progress >= 300){ @@ -35,18 +32,17 @@ public class TileEntityNeutron extends TileEntity implements IInventory { facing = dir; } - public void readFromNBT(NBTTagCompound tags) + @Override + public void readCustomNBT(NBTTagCompound tag) { - super.readFromNBT(tags); - this.neutrons = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("Neutrons")); - this.progress = tags.getInteger("Progress"); - this.facing = tags.getShort("Facing"); - + this.neutrons = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("Neutrons")); + this.progress = tag.getInteger("Progress"); + this.facing = tag.getShort("Facing"); } - public void writeToNBT(NBTTagCompound tag) + @Override + public void writeCustomNBT(NBTTagCompound tag) { - super.writeToNBT(tag); tag.setInteger("Progress", this.progress); tag.setShort("Facing", (short) this.facing); if(neutrons != null) { @@ -56,19 +52,6 @@ public class TileEntityNeutron extends TileEntity implements IInventory { } } - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - readFromNBT(pkt.func_148857_g()); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - - @Override - public Packet getDescriptionPacket() { - NBTTagCompound nbttagcompound = new NBTTagCompound(); - this.writeToNBT(nbttagcompound); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, nbttagcompound); - } - @Override public int getSizeInventory() { @@ -137,6 +120,7 @@ public class TileEntityNeutron extends TileEntity implements IInventory { /** * Returns the name of the inventory */ + @Override public String getInventoryName() { return "container.neutron"; @@ -145,6 +129,7 @@ public class TileEntityNeutron extends TileEntity implements IInventory { /** * Returns if the inventory is named */ + @Override public boolean hasCustomInventoryName() { return false; diff --git a/src/main/java/fox/spiteful/avaritia/tile/TileLudicrous.java b/src/main/java/fox/spiteful/avaritia/tile/TileLudicrous.java new file mode 100644 index 0000000..16d1611 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/tile/TileLudicrous.java @@ -0,0 +1,39 @@ +package fox.spiteful.avaritia.tile; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; + +public class TileLudicrous extends TileEntity { + + @Override + public void writeToNBT(NBTTagCompound tag) { + super.writeToNBT(tag); + writeCustomNBT(tag); + } + + @Override + public void readFromNBT(NBTTagCompound tag) { + super.readFromNBT(tag); + readCustomNBT(tag); + } + + public void writeCustomNBT(NBTTagCompound tag) {} + public void readCustomNBT(NBTTagCompound tag) {} + + @Override + public Packet getDescriptionPacket() { + NBTTagCompound tag = new NBTTagCompound(); + writeCustomNBT(tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, -999, tag); + } + + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { + super.onDataPacket(net, packet); + readCustomNBT(packet.func_148857_g()); + } + +} diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index 9265019..063e749 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -27,6 +27,7 @@ tile.block_infinity.name=Infinity Block tile.block_gaia.name=Gaia Block tile.dire_crafting.name=Dire Crafting Table tile.neutron_collector.name=Neutron Collector +tile.infinitato.name=Infinitato # # Misc container.neutron_collector=Neutron Collector diff --git a/src/main/resources/assets/avaritia/textures/blocks/infinitato.png b/src/main/resources/assets/avaritia/textures/blocks/infinitato.png new file mode 100644 index 0000000000000000000000000000000000000000..eb7d4b52f8f7d18e7fd2868105550fe7eb458663 GIT binary patch literal 7892 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 U8~E|Rw;@1PQB$E>&Mf5r0FYABVE_OC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/avaritia/textures/items/halo128.png b/src/main/resources/assets/avaritia/textures/items/halo128.png new file mode 100644 index 0000000000000000000000000000000000000000..425940d60bb7bfadf70966513dcde7a9dee97661 GIT binary patch literal 6784 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 literal 0 HcmV?d00001