diff --git a/capes.txt b/capes.txt new file mode 100644 index 00000000..d6e3b738 --- /dev/null +++ b/capes.txt @@ -0,0 +1,4 @@ +mDiyo:https://dl.dropboxusercontent.com/u/48633261/cape.png +fuj1n:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png +alexbegt:https://dl.dropboxusercontent.com/u/48633261/cape.png +Vexatos:https://dl.dropboxusercontent.com/u/57704711/Dokumente/Speziell/Minecraft/Public/TCape.png \ No newline at end of file diff --git a/tconstruct/TConstruct.java b/tconstruct/TConstruct.java index 3ba412d9..69d90be3 100644 --- a/tconstruct/TConstruct.java +++ b/tconstruct/TConstruct.java @@ -1,6 +1,8 @@ package tconstruct; import net.minecraftforge.common.MinecraftForge; + +import tconstruct.client.event.EventCloakRender; import tconstruct.client.tabs.InventoryTabArmorExtended; import tconstruct.client.tabs.InventoryTabKnapsack; import tconstruct.client.tabs.InventoryTabVanilla; @@ -35,6 +37,7 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; +import cpw.mods.fml.relauncher.Side; /** TConstruct, the tool mod. * Craft your tools with style, then modify until the original is gone! @@ -120,6 +123,10 @@ public class TConstruct @EventHandler public void init (FMLInitializationEvent event) { + if(event.getSide() == Side.CLIENT){ + MinecraftForge.EVENT_BUS.register(new EventCloakRender()); + } + content.intermodCommunication(); GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0)); } diff --git a/tconstruct/blocks/EquipBlock.java b/tconstruct/blocks/EquipBlock.java index 1955226b..4aaf4af7 100644 --- a/tconstruct/blocks/EquipBlock.java +++ b/tconstruct/blocks/EquipBlock.java @@ -1,6 +1,8 @@ package tconstruct.blocks; -import java.util.Random; +import java.util.*; + +import cpw.mods.fml.relauncher.*; import tconstruct.TConstruct; import tconstruct.blocks.logic.FrypanLogic; @@ -10,13 +12,12 @@ import tconstruct.library.blocks.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.*; +import net.minecraft.world.*; public class EquipBlock extends InventoryBlock { @@ -88,7 +89,30 @@ public class EquipBlock extends InventoryBlock world.spawnParticle("flame", f, f1, f2 + f4, 0.0D, 0.0D, 0.0D); } } - + + public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { + super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); + int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + + int newMeta = 0; + + switch(i3){ + case 3: + newMeta = 0; + break; + case 0: + newMeta = 3; + break; + case 1: + newMeta = 1; + break; + case 2: + newMeta = 2; + break; + } + par1World.setBlockMetadataWithNotify(par2, par3, par4, newMeta, 2); + } + public int getLightValue (IBlockAccess world, int x, int y, int z) { return !isActive(world, x, y, z) ? 0 : 9; diff --git a/tconstruct/blocks/TConstructBlock.java b/tconstruct/blocks/TConstructBlock.java index d4c55924..a4a29597 100644 --- a/tconstruct/blocks/TConstructBlock.java +++ b/tconstruct/blocks/TConstructBlock.java @@ -49,7 +49,7 @@ public class TConstructBlock extends Block @SideOnly(Side.CLIENT) public Icon getIcon (int side, int meta) { - return icons[meta]; + return meta < icons.length ? icons[meta] : icons[0]; } @Override diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java index 7ff2549f..a570b6fe 100644 --- a/tconstruct/client/TProxyClient.java +++ b/tconstruct/client/TProxyClient.java @@ -1,50 +1,166 @@ package tconstruct.client; import java.io.InputStream; -import java.util.*; -import javax.xml.parsers.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiInventory; +import net.minecraft.client.model.ModelSlime; +import net.minecraft.client.particle.EntityAuraFX; +import net.minecraft.client.particle.EntityBreakingFX; +import net.minecraft.client.particle.EntityBubbleFX; +import net.minecraft.client.particle.EntityCloudFX; +import net.minecraft.client.particle.EntityCritFX; +import net.minecraft.client.particle.EntityDropParticleFX; +import net.minecraft.client.particle.EntityEnchantmentTableParticleFX; +import net.minecraft.client.particle.EntityExplodeFX; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.EntityFireworkSparkFX; +import net.minecraft.client.particle.EntityFlameFX; +import net.minecraft.client.particle.EntityFootStepFX; +import net.minecraft.client.particle.EntityHeartFX; +import net.minecraft.client.particle.EntityHugeExplodeFX; +import net.minecraft.client.particle.EntityLargeExplodeFX; +import net.minecraft.client.particle.EntityLavaFX; +import net.minecraft.client.particle.EntityNoteFX; +import net.minecraft.client.particle.EntityPortalFX; +import net.minecraft.client.particle.EntityReddustFX; +import net.minecraft.client.particle.EntitySmokeFX; +import net.minecraft.client.particle.EntitySnowShovelFX; +import net.minecraft.client.particle.EntitySpellParticleFX; +import net.minecraft.client.particle.EntitySplashFX; +import net.minecraft.client.particle.EntitySuspendFX; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; + import org.lwjgl.opengl.GL11; import org.w3c.dom.Document; -import com.google.common.collect.Lists; -import cpw.mods.fml.client.registry.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.relauncher.Side; + import tconstruct.TConstruct; -import tconstruct.blocks.logic.*; -import tconstruct.client.block.*; -import tconstruct.client.entity.*; -import tconstruct.client.entity.projectile.*; -import tconstruct.client.gui.*; -import tconstruct.client.pages.*; -import tconstruct.client.tabs.*; -import tconstruct.common.*; -import tconstruct.entity.*; -import tconstruct.entity.projectile.*; +import tconstruct.blocks.logic.CastingBasinLogic; +import tconstruct.blocks.logic.CastingTableLogic; +import tconstruct.blocks.logic.CraftingStationLogic; +import tconstruct.blocks.logic.DrawbridgeLogic; +import tconstruct.blocks.logic.DryingRackLogic; +import tconstruct.blocks.logic.FrypanLogic; +import tconstruct.blocks.logic.GlowstoneAggregator; +import tconstruct.blocks.logic.PartBuilderLogic; +import tconstruct.blocks.logic.PatternChestLogic; +import tconstruct.blocks.logic.SmelteryLogic; +import tconstruct.blocks.logic.StencilTableLogic; +import tconstruct.blocks.logic.ToolForgeLogic; +import tconstruct.blocks.logic.ToolStationLogic; +import tconstruct.client.block.BarricadeRender; +import tconstruct.client.block.CastingBasinSpecialRender; +import tconstruct.client.block.CastingTableSpecialRenderer; +import tconstruct.client.block.CrystalBlockRender; +import tconstruct.client.block.DryingRackRender; +import tconstruct.client.block.DryingRackSpecialRender; +import tconstruct.client.block.FrypanRender; +import tconstruct.client.block.MachineRender; +import tconstruct.client.block.OreberryRender; +import tconstruct.client.block.PaneConnectedRender; +import tconstruct.client.block.PaneRender; +import tconstruct.client.block.PunjiRender; +import tconstruct.client.block.SearedRender; +import tconstruct.client.block.SmallFontRenderer; +import tconstruct.client.block.SmelteryRender; +import tconstruct.client.block.TableForgeRender; +import tconstruct.client.block.TableRender; +import tconstruct.client.block.TankRender; +import tconstruct.client.entity.CartRender; +import tconstruct.client.entity.CloneHeadModel; +import tconstruct.client.entity.CrystalGuardianRender; +import tconstruct.client.entity.CrystalRender; +import tconstruct.client.entity.FancyItemRender; +import tconstruct.client.entity.MiniGardyRender; +import tconstruct.client.entity.SlimeCloneRender; +import tconstruct.client.entity.SlimeRender; +import tconstruct.client.entity.projectile.ArrowRender; +import tconstruct.client.entity.projectile.DaggerRender; +import tconstruct.client.entity.projectile.LaunchedItemRender; +import tconstruct.client.gui.ArmorExtendedGui; +import tconstruct.client.gui.CraftingStationGui; +import tconstruct.client.gui.DrawbridgeGui; +import tconstruct.client.gui.FrypanGui; +import tconstruct.client.gui.GlowstoneAggregatorGui; +import tconstruct.client.gui.GuiManual; +import tconstruct.client.gui.KnapsackGui; +import tconstruct.client.gui.MiniGardyGui; +import tconstruct.client.gui.PartCrafterGui; +import tconstruct.client.gui.PatternChestGui; +import tconstruct.client.gui.SmelteryGui; +import tconstruct.client.gui.StencilTableGui; +import tconstruct.client.gui.ToolForgeGui; +import tconstruct.client.gui.ToolStationGui; +import tconstruct.client.pages.BlankPage; +import tconstruct.client.pages.BlockCastPage; +import tconstruct.client.pages.BookPage; +import tconstruct.client.pages.ContentsTablePage; +import tconstruct.client.pages.CraftingPage; +import tconstruct.client.pages.FurnacePage; +import tconstruct.client.pages.MaterialPage; +import tconstruct.client.pages.ModifierPage; +import tconstruct.client.pages.PicturePage; +import tconstruct.client.pages.SectionPage; +import tconstruct.client.pages.SidebarPage; +import tconstruct.client.pages.TextPage; +import tconstruct.client.pages.TitlePage; +import tconstruct.client.pages.ToolPage; +import tconstruct.client.tabs.InventoryTabArmorExtended; +import tconstruct.client.tabs.InventoryTabKnapsack; +import tconstruct.client.tabs.InventoryTabVanilla; +import tconstruct.client.tabs.TabRegistry; +import tconstruct.common.TContent; +import tconstruct.common.TProxyCommon; +import tconstruct.entity.Automaton; +import tconstruct.entity.BlueSlime; +import tconstruct.entity.CartEntity; +import tconstruct.entity.Crystal; +import tconstruct.entity.FancyEntityItem; +import tconstruct.entity.MiniGardy; +import tconstruct.entity.SlimeClone; +import tconstruct.entity.projectile.ArrowEntity; +import tconstruct.entity.projectile.DaggerEntity; +import tconstruct.entity.projectile.LaunchedPotion; import tconstruct.landmine.client.gui.GuiLandmine; import tconstruct.landmine.client.render.RenderLandmine; import tconstruct.landmine.inventory.ContainerLandmine; import tconstruct.landmine.tileentity.TileEntityLandmine; import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.*; +import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.client.ToolGuiElement; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; -import tconstruct.util.player.*; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.*; -import net.minecraft.client.model.ModelSlime; -import net.minecraft.client.particle.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.settings.*; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.util.*; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; +import tconstruct.util.player.ArmorExtended; +import tconstruct.util.player.KnapsackInventory; + +import com.google.common.collect.Lists; + +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.TickRegistry; +import cpw.mods.fml.common.registry.VillagerRegistry; +import cpw.mods.fml.relauncher.Side; public class TProxyClient extends TProxyCommon { diff --git a/tconstruct/client/block/FrypanRender.java b/tconstruct/client/block/FrypanRender.java index b5dd49bb..ffafa11b 100644 --- a/tconstruct/client/block/FrypanRender.java +++ b/tconstruct/client/block/FrypanRender.java @@ -29,11 +29,31 @@ public class FrypanRender implements ISimpleBlockRenderingHandler renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.125F, 0.125F, 0.0F, 0.875F, 0.25F, 0.125F); renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); - renderer.renderStandardBlock(block, x, y, z); +// renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); +// renderer.renderStandardBlock(block, x, y, z); + renderHandle(world, x, y, z, block, renderer); return true; } + public void renderHandle(IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer){ + switch(world.getBlockMetadata(x, y, z)){ + case 0: + renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); + break; + case 1: + renderer.setRenderBounds(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F); + break; + case 2: + renderer.setRenderBounds(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F); + break; + case 3: + renderer.setRenderBounds(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F); + break; + } + + renderer.renderStandardBlock(block, x, y, z); + } + @Override public boolean shouldRender3DInInventory () { diff --git a/tconstruct/client/event/EventCloakRender.java b/tconstruct/client/event/EventCloakRender.java new file mode 100644 index 00000000..869b4cf4 --- /dev/null +++ b/tconstruct/client/event/EventCloakRender.java @@ -0,0 +1,97 @@ +package tconstruct.client.event; + +import java.awt.image.BufferedImage; +import java.io.*; +import java.net.*; +import java.util.HashMap; + +import javax.swing.ImageIcon; + +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.event.ForgeSubscribe; + +public class EventCloakRender { + + private final String serverLocation = "https://raw.github.com/mDiyo/TinkersConstruct/16working/capes.txt"; + private final int timeout = 1000; + + private HashMap cloaks = new HashMap(); + + public EventCloakRender(){ + buildCloakURLDatabase(); + } + + @ForgeSubscribe + public void onPreRenderSpecials(RenderPlayerEvent.Specials.Pre event){ + if(event.entityPlayer instanceof AbstractClientPlayer){ + AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer)event.entityPlayer; + + if (abstractClientPlayer.func_110310_o().field_110560_d == null) { + String cloakURL = cloaks.get(event.entityPlayer.username); + + if(cloakURL == null){ + return; + } + + abstractClientPlayer.func_110310_o().field_110559_g = false; + new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); + event.renderCape = true; + } + } + } + + public void buildCloakURLDatabase(){ + URL url; + try { + url = new URL(serverLocation); + URLConnection con = url.openConnection(); + con.setConnectTimeout(timeout); + con.setReadTimeout(timeout); + InputStream io = con.getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(io)); + + String str; + int linetracker = 1; + while((str = br.readLine()) != null){ + if(str.contains(":")){ + String nick = str.substring(0, str.indexOf(":")); + String link = str.substring(str.indexOf(":") + 1); + cloaks.put(nick, link); + }else{ + System.err.println("[TinkersConstruct] [skins.txt] Syntax error on line " + linetracker + ": " + str); + } + linetracker++; + } + + br.close(); + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + private class CloakThread implements Runnable{ + + AbstractClientPlayer abstractClientPlayer; + String cloakURL; + + public CloakThread(AbstractClientPlayer player, String cloak){ + abstractClientPlayer = player; + cloakURL = cloak; + } + + @Override + public void run() { + try { + BufferedImage bo = new BufferedImage(64, 32, BufferedImage.TYPE_INT_RGB); + bo.getGraphics().drawImage(new ImageIcon(new URL(cloakURL)).getImage(), 0, 0, null); + abstractClientPlayer.func_110310_o().field_110560_d = bo; + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + } + +} diff --git a/tconstruct/client/tabs/TabRegistry.java b/tconstruct/client/tabs/TabRegistry.java index 810c858d..0eeb6964 100644 --- a/tconstruct/client/tabs/TabRegistry.java +++ b/tconstruct/client/tabs/TabRegistry.java @@ -26,47 +26,14 @@ public class TabRegistry public static void addTabsToInventory(GuiContainer gui) { if (gui.getClass() == GuiInventory.class) - { - try - { - Field guiLeft = GuiContainer.class.getDeclaredField("field_74198_m"); - guiLeft.setAccessible(true); - int cornerX = (Integer) guiLeft.get(gui); - Field ySize = GuiContainer.class.getDeclaredField("field_74195_c"); - ySize.setAccessible(true); - int cornerY = (gui.height - (Integer) ySize.get(gui)) / 2; - Field buttonList = GuiScreen.class.getDeclaredField("field_73887_h"); - buttonList.setAccessible(true); - ArrayList listOfButtons = (ArrayList) buttonList.get(gui); - listOfButtons.clear(); + { + //Values are public at runtime. + int cornerX = gui.guiLeft; + int cornerY = gui.ySize / 2; + gui.buttonList.clear(); - updateTabValues(cornerX, cornerY, InventoryTabVanilla.class); - addTabsToList(listOfButtons); - } - catch (Exception e) - { - try - { - Field guiLeft = GuiContainer.class.getDeclaredField("guiLeft"); - guiLeft.setAccessible(true); - int cornerX = (Integer) guiLeft.get(gui); - Field ySize = GuiContainer.class.getDeclaredField("ySize"); - ySize.setAccessible(true); - int cornerY = (gui.height - (Integer) ySize.get(gui)) / 2; - Field buttonList = GuiScreen.class.getDeclaredField("buttonList"); - buttonList.setAccessible(true); - ArrayList listOfButtons = (ArrayList) buttonList.get(gui); - listOfButtons.clear(); - - - updateTabValues(cornerX, cornerY, InventoryTabVanilla.class); - addTabsToList(listOfButtons); - } - catch (Exception ex) - { - ex.printStackTrace(); - } - } + updateTabValues(cornerX, cornerY, InventoryTabVanilla.class); + addTabsToList(gui.buttonList); } } diff --git a/tconstruct/common/TProxyCommon.java b/tconstruct/common/TProxyCommon.java index dcc75afc..76ad6913 100644 --- a/tconstruct/common/TProxyCommon.java +++ b/tconstruct/common/TProxyCommon.java @@ -116,7 +116,7 @@ public class TProxyCommon implements IGuiHandler { String langDir = "/assets/tinker/lang/"; - String[] langFiles = { "en_US.xml" }; + String[] langFiles = { "en_US.xml", "de_DE.xml", "ru_RU.xml", "zh_CN.xml" }; for (String langFile : langFiles) { diff --git a/tconstruct/items/blocks/WoolSlab2Item.java b/tconstruct/items/blocks/WoolSlab2Item.java index 97b44c76..3b2ad988 100644 --- a/tconstruct/items/blocks/WoolSlab2Item.java +++ b/tconstruct/items/blocks/WoolSlab2Item.java @@ -1,17 +1,10 @@ package tconstruct.items.blocks; -import java.util.List; - -import mods.natura.common.NContent; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemDye; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class WoolSlab2Item extends ItemBlock { diff --git a/tconstruct/items/tools/FryingPan.java b/tconstruct/items/tools/FryingPan.java index d17f5f1c..3548d6b5 100644 --- a/tconstruct/items/tools/FryingPan.java +++ b/tconstruct/items/tools/FryingPan.java @@ -128,6 +128,7 @@ public class FryingPan extends Weapon else { world.setBlock(x, y, z, TContent.heldItemBlock.blockID, 0, 3); + TContent.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack); world.playSoundEffect(x, y, z, "tinker:frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F); EquipLogic logic = (EquipLogic) world.getBlockTileEntity(x, y, z);