From 9dc02480c474e4690486ec3bccec17fe2ac964af Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sat, 26 Jan 2013 01:52:26 -0800 Subject: [PATCH] Fixes, pullcart start --- resources/tinkertextures/armory.png | Bin 0 -> 47623 bytes resources/tinkertextures/entity/wagon.png | Bin 0 -> 2564 bytes .../tinkertextures/mob/armorstandtexture.png | Bin 0 -> 3084 bytes tinker/armory/Armory.java | 78 + tinker/armory/ArmoryGuiHandler.java | 46 + tinker/armory/ArmoryProxyCommon.java | 15 + tinker/armory/PHArmory.java | 88 + tinker/armory/client/ArmorStandContainer.java | 83 + tinker/armory/client/ArmorStandGui.java | 40 + .../armory/client/ArmorStandModelStatue.java | 96 ++ tinker/armory/client/ArmoryProxyClient.java | 28 + .../armory/client/RenderArmorStandEntity.java | 512 ++++++ tinker/armory/client/RenderPedestal.java | 5 + tinker/armory/client/RenderToolrack.java | 125 ++ tinker/armory/client/SlotArmorCopy.java | 58 + .../armory/client/ToolrackSpecialRender.java | 179 ++ tinker/armory/content/ArmorStandBlock.java | 5 + tinker/armory/content/ArmorStandEntity.java | 157 ++ tinker/armory/content/ArmorStandItem.java | 83 + tinker/armory/content/EntityEquipment.java | 97 ++ tinker/armory/content/Toolrack.java | 192 +++ tinker/armory/content/ToolrackItem.java | 29 + tinker/armory/content/ToolrackLogic.java | 201 +++ tinker/common/IFacingLogic.java | 3 - tinker/common/IMechanicalLogic.java | 6 + tinker/tconstruct/EnumMaterial.java | 4 +- tinker/tconstruct/PHConstruct.java | 6 +- tinker/tconstruct/TConstruct.java | 2 +- tinker/tconstruct/TConstructContent.java | 10 +- tinker/tconstruct/blocks/Axle.java | 89 + tinker/tconstruct/client/AxleRender.java | 72 + tinker/tconstruct/client/RenderWagon.java | 135 ++ tinker/tconstruct/client/TProxyClient.java | 6 +- .../client/gui/PatternShaperContainer.java | 49 +- .../client/gui/PatternShaperGui.java | 5 +- .../client/gui/ToolStationContainer.java | 149 +- .../tconstruct/client/gui/ToolStationGui.java | 2 +- tinker/tconstruct/crafting/ToolBuilder.java | 2 +- tinker/tconstruct/entity/EntityWagon.java | 1492 +++++++++++++++++ tinker/tconstruct/logic/FrypanLogic.java | 4 +- tinker/tconstruct/logic/PartCrafterLogic.java | 4 +- .../tconstruct/logic/PatternShaperLogic.java | 17 +- tinker/tconstruct/modifiers/ModBlaze.java | 2 +- tinker/tconstruct/modifiers/ModBoolean.java | 2 +- tinker/tconstruct/modifiers/ToolMod.java | 6 +- tinker/tconstruct/tools/Broadsword.java | 2 +- tinker/tconstruct/tools/DualHarvestTool.java | 2 +- tinker/tconstruct/tools/HarvestTool.java | 2 +- tinker/tconstruct/tools/ToolCore.java | 18 +- 49 files changed, 4094 insertions(+), 114 deletions(-) create mode 100644 resources/tinkertextures/armory.png create mode 100644 resources/tinkertextures/entity/wagon.png create mode 100644 resources/tinkertextures/mob/armorstandtexture.png create mode 100644 tinker/armory/Armory.java create mode 100644 tinker/armory/ArmoryGuiHandler.java create mode 100644 tinker/armory/ArmoryProxyCommon.java create mode 100644 tinker/armory/PHArmory.java create mode 100644 tinker/armory/client/ArmorStandContainer.java create mode 100644 tinker/armory/client/ArmorStandGui.java create mode 100644 tinker/armory/client/ArmorStandModelStatue.java create mode 100644 tinker/armory/client/ArmoryProxyClient.java create mode 100644 tinker/armory/client/RenderArmorStandEntity.java create mode 100644 tinker/armory/client/RenderPedestal.java create mode 100644 tinker/armory/client/RenderToolrack.java create mode 100644 tinker/armory/client/SlotArmorCopy.java create mode 100644 tinker/armory/client/ToolrackSpecialRender.java create mode 100644 tinker/armory/content/ArmorStandBlock.java create mode 100644 tinker/armory/content/ArmorStandEntity.java create mode 100644 tinker/armory/content/ArmorStandItem.java create mode 100644 tinker/armory/content/EntityEquipment.java create mode 100644 tinker/armory/content/Toolrack.java create mode 100644 tinker/armory/content/ToolrackItem.java create mode 100644 tinker/armory/content/ToolrackLogic.java create mode 100644 tinker/common/IMechanicalLogic.java create mode 100644 tinker/tconstruct/blocks/Axle.java create mode 100644 tinker/tconstruct/client/AxleRender.java create mode 100644 tinker/tconstruct/client/RenderWagon.java create mode 100644 tinker/tconstruct/entity/EntityWagon.java diff --git a/resources/tinkertextures/armory.png b/resources/tinkertextures/armory.png new file mode 100644 index 0000000000000000000000000000000000000000..06316b1ee8df534592e2fd7e04137baaf7abb988 GIT binary patch literal 47623 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 cLJVGd000McNliru-2oa2EI58r)1?3a36V)e zK~!ko?U`$A99I>`e>;zzeP!dd-FqBmJk0K~ z(IzVDkw$xG=FYwMobx~bbMD;?kvuZl>GYMLItzWe(H?myJaPygQL?2D6d^fB0dKpnC<7<~eK4|aVR_Pm!*-cjL+=NI_g z$9s9JN@mRObdFBJ(u%x%aS03qHkV;rAB3S0(DEQ}>la|f)vq5RWuOcPZ--wUgNB)YP-D+=7t3ra+svOhg|*{G{8j+K#vX^B zqRrVCC)u=XhsZvFSax%KOoRE!)5`6VHxp6>{#}q5EBf^7et7;DK}o#v(YJ`W8$JM;-(_k8Ne(=MT_4`3kgG z@qhLJoPG|<{qW0g$q>JN3jX>-^0ooR3L6XJ(pmsLMYwT5kghI@OXeEz?qM0?&K**G zpbU-;@9a03sloJ|`dxJcgh0*)0uQ_v^Dmu&_k9Zf`IMOd_D{fV_o%(^AZ+M^tOIV7 zb5B15FZ_h%@mJW^2L%(Ft_)go!1JZ(v1z5yQ|CpneyFf}xfhtGQdhP|V=XxO`XJ3OtD3ej%^*Wu- zbBluRkqP+DGb_|v0f+W&;I5ru8e;M-JDqbPJ26>6C#2(gdGUIZo@f6-FvGTMr7C+Nn378$TKa0rz>M<;b9{Wia3M^EK*!gZrXx>VSs|#o2(we_vwg3Ax9t&6%}(hG zl2Epe|0{K{QRvmct-5I0j$Q<9xZF$(6B{G`ZPkih%CKzter3GdCGHZ zL>YM98~{>2)*)VBzMNzeCn-5C+f*K=yjhTTn=-^gRUHkZn-ew<>%F%s5{glgCP%kH zbs;(wiDNqLsaWEa=e3e{9K)s^&FdvGZ5R-wjAEEjJFB#|ZI9*{7>+_`3Ff9@%MPuv zI(}u!1gw))=r2cc?UWK&+c_!el;pWM-aS_+iSvJBUW>DHLWL2o)dRH#A{@g2XG4|j9*Y4%+`oJ)BZ5@HvPQb;}@Q$5{cW1^F3T8A{+fCBsVzs*x ztS+K7W7_hv?I_QiS-3Qnc;9wpfXZM3rTVnq2OeZhS=`LBr3Wr7rQq6_lQ+FqqG;^N zHD+JZ9I^5-#J#9qNPp)x_}{8v}L)tA`Bx%25(NnB4|r- z!xC$UKC2#_nT=T5$|`J38!{Pr*xI1BVI>~LPvXDRNh-S6lgl+-v83w(I|ubyg>gC? zwB7DBSa0b>cr89Vfh=TY1sk^+m8mwA2NFJrNpJQ{_o8|S!F0&k$$ty@Z5g6GAP=nN z@{YV@Sb~1K2yzO#3cZox)|J6gE&o672K!6VVWzhVE6Yh5ym&gb8S%yL89-ZgyO)x@`(G~Sa+$qz6c83*I#8^Ew10yy^-euYZ6yu zZCA!{ics1lxO=Nfd{`@BZ0000M2yV4F>b2h_`FC$`r)vZXVT66{bZy0$yJ zXM9|KVZ6PDtKB(2+I*c+FJUN)lX7S8qfaiOGR~esYbmcUGqg(kZ?iHth!lz<$%GyH zSTMSKzqbQYsAF+*?o-Y1moKIjLnh6mJ!@;aBlEiQvZ_}6y(mbLc^j3eG}uy?hDj~s z=|g2hex3E2SMW_Q#{4HPig^^M>DVR&jzW;NIud6}_Q|)aejj?UGz3Gn+`}9LY56iu#_90EGyIa0MG88Fwo2Z3nG4P_|9mrM3hNgS zqVE`It{&59zJ|F;+YW1g`SNZ#ri?-f3N3p4xAVQT6@1Rlo};=Tq=G8TT=OT%K6oO6 z=-ZHjNzL}zA28Y*q(_?60}wydx|}$v*H;e*9CuG3NQkzb4c<(--OmN;qI{p<)koX0 z=VtuJm2YXa|N1cdkuRE)RE_~Us`B>=4|fTO%2kCRmd-@$v4R1$dd)M=&V4Ir)@;av zZ?3A8d)Io*+hBMv3TSI>ZLP>f8!q5qP;x-BjJJU0p}*S>C^)>rHbE6el3 zq5wmF1;S>@mdgoOkpKRN&n${onBPopj%|{F@`eV)|+QwPKXT z&8HM=WZ(xK9F1dv5X9O_lMp1&@xQUWTD$9F=h5zozilu3NFj<(6;n1%f zm)bRkpZPIA@2Ou*)K)X=i?kB>Q!w+#{e}WgsvNVopUG^gqrMn>78$Q<34O%E_b zd>KY1I9TJ_23Op(spS|T<0_UqxMG$6H$%2pFKXFPc0a$C!iio);^U{XMW@yka5=D? zhAoe{SY|07=cB~~gHMRgcNYolpN5j{mm~*#rLA&dYRsbroa`$9pD_xBg@t~)h2O)d zZ`_bLpdt^v3{lY}S5^6>W-5Qh5G=KPOHKWKJ)u3}$~t49eiJt((>`c1udH$E#@N#a z&F+yAxm?w*-dD zjxaM<^F$?L6ly49y(rgO8Kd9agcHTW9jl++PF992oM7qn2<%QIDFn@aIHYPtOz04S z7=5%q(}hQ3j7EwL!jaH#w(*YB!$W*Zhx(7dDcxOTPHqPgY8>)X6*|^NuAlUVCwj&^ zXn@L))Olz%CFxvU;Z5Z(ra&vS0 zy*7GNyV%Zt>n?#7yX_D*eyvfWvG>mULYK}!<$vvK_dca)fW6arN8#OEsp!7lQwk7K zu~YVPw32IgLnHBUY4qMY-rz~{>r)O$+{OPqf6V4}>DYb@%@CJ820>`LDV`ie2tV}p z)=-HNt<-1Ag#yLx@=E6vD}OV;E+U>F*Nb7M)?LQ5(9H&mdQ3-4wAWM3b5AL$dY|SS?CPS zNm|`nVX9<$r_;UlG6hDPOkrJsIJNsJ-<5t2%&1(Yw=50$k?g7koSlW3emZh6qDSS5 zNZPMo35xMEk>}n$cjxOkuodE%RBJKuz~$1j$TP`KV$2onBO3?y$vXEIqN){FPXf@0 z!~rlfzpL9+pEq0|yZvuLK+}i6e(g!q>bMwACA=C9eC2vHdi9eF@C}7RbkeZYkQC5r z`^g_dps(`SLjk(ME7Jq6>`?7@zvgP5AL|jtREjhCBTAZIZS{+ry0r@v{ZhL>S9G2N z{+)QkX0vhq^y@HZ=er2ys^o|VIS3*^xr{aIas9eD({Kge`t_I%%iIwOYKmp9U@*F3 z$S)qDjEt9cjqpslPibsC`IHi+oUm^`Y}15SbaeU0;w-f;&8|8@5k@9oZV}-Yh7Cs{ zf!iyF;yqF2JDh8c?*nvkWA-d$qGxAQ;BeC(0vm_o9<(H|hj^>z4_|7Y(~;XV+?1i0 znKRRZ(VuP2oDE5hrDY{aDx|_IShL)T?j&HiZ&7wc=$O7ZH*);Laj20=GQDPjo zQIqy7NQ|XP_M!}#35%P`1^}V$SOt5-B|#h3+XNBG7gTE6>T0Ox7ZL(4ERg4;uAgSe z8Xg`-+&jV!6_Pyt?8c;KWMSas^6wbLop6Fnk=x&~m1srl+glUsvcbbq=v`6>~;HdIcp^X|SEPCivIjGrY!4c)HNCK4Q?9zkN^)gLiQW@%IFpzsIe7D*Kjq=`X zijok&qW;46W>=|)g@*$%+FxnPlzxee+GtR{0nSi|vZ{dxx|#yh&#GJ`3t2yV@5R#b zL$l?WXFt=40w-mjX~_27uh`y0*o za1VV_TI+E0rIP6pC5Pvx@MKS5D6&s+%40|CS$CIXjN|UDAy!X9H)#fi@};D${(anr z=SlrnFH7=40HUeB$P#h#;Q3dW)E6x+DdiZfeAY~XNyAs#L{Rd;fGtP_0XJ`|!1!~H zf|__VCZRNT!++qi%Vd5GQ#;cev^+zv3wqW$aaq^dbra2bm)AD3f!=>&!fe{{xz9 B-faK? literal 0 HcmV?d00001 diff --git a/tinker/armory/Armory.java b/tinker/armory/Armory.java new file mode 100644 index 00000000..dabab4ee --- /dev/null +++ b/tinker/armory/Armory.java @@ -0,0 +1,78 @@ +package tinker.armory; + +import tinker.armory.content.ArmorStandItem; +import tinker.armory.content.Toolrack; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.Init; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.Mod.PreInit; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.NetworkMod; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; + +/** + * Tinkering with the Armory + * Every good castle has a place to put its tools + * Armor stands are entites! + * @author: mDiyo + */ + +@Mod(modid = "Armory", name = "Tinker's Armory", version = "1.4.7_A3") +@NetworkMod(clientSideRequired = true, serverSideRequired = false) +public class Armory +{ + /* Proxies for sides, used for client-only processing */ + @SidedProxy(clientSide = "tinker.armory.client.ArmoryProxyClient", serverSide = "tinker.armory.ArmoryProxyCommon") + public static ArmoryProxyCommon proxy; + + /* Instance of this mod, used for grabbing prototype fields */ + @Instance("Armory") + public static Armory instance; + + @PreInit + public void preInit(FMLPreInitializationEvent evt) + { + PHArmory.initProps(); + stoneRack = new Toolrack(PHArmory.rackBlock, Material.rock); + GameRegistry.registerBlock(stoneRack, tinker.armory.content.ToolrackItem.class, "ToolRack"); + GameRegistry.registerTileEntity(tinker.armory.content.ToolrackLogic.class, "InfiToolrack"); + /*armorStand = new ArmorStand(1501, Material.rock); + GameRegistry.registerBlock(armorStand, mDiyo.inficraft.armory.ArmorStandItem.class); + GameRegistry.registerTileEntity(mDiyo.inficraft.armory.ArmorStandLogic.class, "InfiArmorStand");*/ + + armorStandItem = new ArmorStandItem(PHArmory.armorItem).setItemName("armorstand"); + LanguageRegistry.instance().addName(armorStandItem, "Armor Stand"); + + EntityRegistry.registerModEntity(tinker.armory.content.ArmorStandEntity.class, "Armor Stand", 0, this, 32, 5, true); + NetworkRegistry.instance().registerGuiHandler(instance, new ArmoryGuiHandler()); + + GameRegistry.addRecipe(new ItemStack(Armory.instance.armorStandItem, 1, 0), " c ", "csc", " b ", 's', Item.stick, 'c', Block.cobblestone, 'b', Block.stoneSingleSlab); + } + + @Init + public void init(FMLInitializationEvent evt) + { + proxy.registerRenderer(); + proxy.addNames(); + proxy.addRecipes(); + } + + /* Prototype fields, used elsewhere */ + public static Block stoneRack; + public static Block woodRack; + public static Block armorStand; + public static Block pedestal; + + public static Item armorStandItem; + + public static String texture = "/tinkertextures/armory.png"; +} diff --git a/tinker/armory/ArmoryGuiHandler.java b/tinker/armory/ArmoryGuiHandler.java new file mode 100644 index 00000000..f4c1992b --- /dev/null +++ b/tinker/armory/ArmoryGuiHandler.java @@ -0,0 +1,46 @@ +package tinker.armory; + +import java.util.List; + +import tinker.armory.client.ArmorStandGui; +import tinker.armory.content.EntityEquipment; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; + +public class ArmoryGuiHandler implements IGuiHandler +{ + + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) + { + List list = world.getLoadedEntityList(); + for (Entity entity : list) + { + if (ID == entity.entityId) + { + return ((EntityEquipment)entity).getContainer(player); + } + } + System.out.println("Returning a null server entity"); + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) + { + List list = world.getLoadedEntityList(); + for (Entity entity : list) + { + if (ID == entity.entityId) + { + return new ArmorStandGui(player, (EntityEquipment)entity); + } + } + System.out.println("Returning a null client entity"); + return null; + } +} diff --git a/tinker/armory/ArmoryProxyCommon.java b/tinker/armory/ArmoryProxyCommon.java new file mode 100644 index 00000000..c6feb373 --- /dev/null +++ b/tinker/armory/ArmoryProxyCommon.java @@ -0,0 +1,15 @@ +package tinker.armory; + +import java.io.File; + +public class ArmoryProxyCommon +{ + public void registerRenderer() {} + public void addNames() {} + public void addRecipes() {} + + public File getMinecraftDir() + { + return new File("."); + } +} diff --git a/tinker/armory/PHArmory.java b/tinker/armory/PHArmory.java new file mode 100644 index 00000000..a704a724 --- /dev/null +++ b/tinker/armory/PHArmory.java @@ -0,0 +1,88 @@ +package tinker.armory; + +import java.io.File; +import java.io.IOException; + +import net.minecraftforge.common.Configuration; + +public class PHArmory +{ + + public static void initProps() + { + /* Here we will set up the config file for the mod + * First: Create a folder inside the config folder + * Second: Create the actual config file + * Note: Configs are a pain, but absolutely necessary for every mod. + */ + + File file = new File(Armory.proxy.getMinecraftDir() + "/config/InfiCraft"); + file.mkdir(); + File newFile = new File(Armory.proxy.getMinecraftDir() + "/config/InfiCraft/Armory.txt"); + + /* Some basic debugging will go a long way */ + try + { + newFile.createNewFile(); + System.out.println("Successfully read configuration file for mod_FloraBerries"); + } + catch (IOException e) + { + System.out.println("Could not read configuration file for mod_FloraBerries. Reason:"); + System.out.println(e); + } + + /* [Forge] Configuration class, used as config method */ + Configuration config = new Configuration(newFile); + + /* Load the configuration file */ + config.load(); + + /* Define the mod's IDs. + * Avoid values below 4096 for items and in the 250-450 and 2216-2226 range for blocks + */ + + armorBlock = config.getBlock("Armor Stand", 3257).getInt(3257); + rackBlock = config.getBlock("Tool Rack", 3257).getInt(3257); + armorItem = config.getItem("Armor Stand Item", 4570).getInt(4570); + /*berryBlockID = config.getBlock("Berry_Bush", 3257).getInt(3257); + berryItemID = config.getItem("Berry_Food", 12402).getInt(12402); + + raspSpawnDensity = config.get("general", "Raspberry_Spawn_Density", 14).getInt(14); + raspSpawnHeight = config.get("general", "Raspberry_Spawn_Height", 64).getInt(64); + raspSpawnRange = config.get("general", "Raspberry_Spawn_Range", 128).getInt(128); + blueSpawnDensity = config.get("general", "Blueberry_Spawn_Density", 12).getInt(12); + blueSpawnHeight = config.get("general", "Blueberry_Spawn_Height", 64).getInt(64); + blueSpawnRange = config.get("general", "Blueberry_Spawn_Range", 128).getInt(128); + blackSpawnDensity = config.get("general", "Blackberry_Spawn_Density", 10).getInt(10); + blackSpawnHeight = config.get("general", "Blackberry_Spawn_Height", 64).getInt(64); + blackSpawnRange = config.get("general", "Blackberry_Spawn_Range", 128).getInt(128); + geoSpawnDensity = config.get("general", "Geoberry_Spawn_Density", 14).getInt(14); + geoSpawnHeight = config.get("general", "Geoberry_Spawn_Height", 64).getInt(64); + geoSpawnRange = config.get("general", "Geoberry_Spawn_Range", 128).getInt(128);*/ + + /* Save the configuration file */ + config.save(); + } + + /* Prototype fields, used elsewhere */ + public static int armorBlock; + public static int armorItem; + public static int rackBlock; + /*public static int raspSpawnDensity; + public static int raspSpawnHeight; + public static int raspSpawnRange; + public static int blueSpawnDensity; + public static int blueSpawnHeight; + public static int blueSpawnRange; + public static int blackSpawnDensity; + public static int blackSpawnHeight; + public static int blackSpawnRange; + public static int geoSpawnDensity; + public static int geoSpawnHeight; + public static int geoSpawnRange; + + public static int berryItemID; + public static int berryBlockID;*/ + +} diff --git a/tinker/armory/client/ArmorStandContainer.java b/tinker/armory/client/ArmorStandContainer.java new file mode 100644 index 00000000..47cc8314 --- /dev/null +++ b/tinker/armory/client/ArmorStandContainer.java @@ -0,0 +1,83 @@ +package tinker.armory.client; + +import tinker.armory.content.EntityEquipment; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ArmorStandContainer extends Container +{ + EntityEquipment stand; + InventoryPlayer player; + + public ArmorStandContainer(InventoryPlayer inventoryplayer, EntityEquipment equipment) + { + stand = equipment; + player = inventoryplayer; + this.addSlotToContainer(new Slot(equipment, 0, 62, 26)); + + for (int slot = 0; slot < 4; ++slot) + { + this.addSlotToContainer(new SlotArmorCopy(this, equipment, slot + 1, 80, 8 + (3-slot) * 18, 3-slot)); + } + + // Slot: inventory, slot index, xDisplay, yDisplay + + int var3; + + for (var3 = 0; var3 < 3; ++var3) + { + for (int var4 = 0; var4 < 9; ++var4) + { + this.addSlotToContainer(new Slot(player, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18)); + } + } + + for (var3 = 0; var3 < 9; ++var3) + { + this.addSlotToContainer(new Slot(player, var3, 8 + var3 * 18, 142)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer player) + { + return true; + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer entityplayer, int slot) + { + ItemStack var3 = null; + Slot var4 = (Slot) this.inventorySlots.get(slot); + + if (var4 != null && var4.getHasStack()) + { + ItemStack var5 = var4.getStack(); + var3 = var5.copy(); + + if (slot < 5) + { + if (!this.mergeItemStack(var5, 5, this.inventorySlots.size(), true)) + { + return null; + } + } else if (!this.mergeItemStack(var5, 0, 5, false)) + { + return null; + } + + if (var5.stackSize == 0) + { + var4.putStack((ItemStack) null); + } else + { + var4.onSlotChanged(); + } + } + + return var3; + } +} diff --git a/tinker/armory/client/ArmorStandGui.java b/tinker/armory/client/ArmorStandGui.java new file mode 100644 index 00000000..9f6ed52f --- /dev/null +++ b/tinker/armory/client/ArmorStandGui.java @@ -0,0 +1,40 @@ +package tinker.armory.client; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; + +import org.lwjgl.opengl.GL11; + +import tinker.armory.content.EntityEquipment; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ArmorStandGui extends GuiContainer +{ + public ArmorStandGui(EntityPlayer player, EntityEquipment equipment) + { + super(equipment.getContainer(player)); + this.allowUserInput = true; + } + + /** + * Draw the foreground layer for the GuiContainer (everything in front of the items) + */ + protected void drawGuiContainerForegroundLayer(int par1, int par2) + { + this.fontRenderer.drawString("Armor Stand", 8, 8, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) + { + int var4 = this.mc.renderEngine.getTexture("/infitextures/gui/armorstand.png"); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.renderEngine.bindTexture(var4); + int var5 = this.guiLeft; + int var6 = this.guiTop; + this.drawTexturedModalRect(var5, var6, 0, 0, this.xSize, this.ySize); + } +} diff --git a/tinker/armory/client/ArmorStandModelStatue.java b/tinker/armory/client/ArmorStandModelStatue.java new file mode 100644 index 00000000..a628c363 --- /dev/null +++ b/tinker/armory/client/ArmorStandModelStatue.java @@ -0,0 +1,96 @@ +/* + * Armor stand model by Fudgy_Fetus + */ +package tinker.armory.client; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ArmorStandModelStatue extends ModelBase +{ + ModelRenderer head; + ModelRenderer body; + ModelRenderer rightarm; + ModelRenderer leftarm; + ModelRenderer bottompedestal; + ModelRenderer toppedestal; + ModelRenderer standstick; + + public ArmorStandModelStatue() + { + textureWidth = 128; + textureHeight = 64; + + head = new ModelRenderer(this, 0, 0); + head.addBox(-4F, -8F, -4F, 8, 8, 8); + head.setRotationPoint(0F, 0F, 0F); + head.setTextureSize(128, 64); + head.mirror = true; + setRotation(head, 0F, 0F, 0F); + body = new ModelRenderer(this, 16, 16); + body.addBox(-4F, 0F, -2F, 8, 12, 4); + body.setRotationPoint(0F, 0F, 0F); + body.setTextureSize(128, 64); + body.mirror = true; + setRotation(body, 0F, 0F, 0F); + rightarm = new ModelRenderer(this, 40, 16); + rightarm.addBox(-3F, -2F, -2F, 4, 7, 4); + rightarm.setRotationPoint(-5F, 2F, 0F); + rightarm.setTextureSize(128, 64); + rightarm.mirror = true; + setRotation(rightarm, 0F, 0F, 0F); + leftarm = new ModelRenderer(this, 40, 16); + leftarm.addBox(-1F, -2F, -2F, 4, 7, 4); + leftarm.setRotationPoint(5F, 2F, 0F); + leftarm.setTextureSize(128, 64); + leftarm.mirror = true; + setRotation(leftarm, 0F, 0F, 0F); + bottompedestal = new ModelRenderer(this, 56, 15); + bottompedestal.addBox(0F, 0F, 0F, 16, 2, 16); + bottompedestal.setRotationPoint(-8F, 26F, -8F); + bottompedestal.setTextureSize(128, 64); + bottompedestal.mirror = true; + setRotation(bottompedestal, 0F, 0F, 0F); + toppedestal = new ModelRenderer(this, 60, 0); + toppedestal.addBox(0F, 0F, 0F, 14, 1, 14); + toppedestal.setRotationPoint(-7F, 25F, -7F); + toppedestal.setTextureSize(128, 64); + toppedestal.mirror = true; + setRotation(toppedestal, 0F, 0F, 0F); + standstick = new ModelRenderer(this, 0, 16); + standstick.addBox(0F, 0F, 0F, 2, 13, 2); + standstick.setRotationPoint(-1F, 12F, -1F); + standstick.setTextureSize(128, 64); + standstick.mirror = true; + setRotation(standstick, 0F, 0F, 0F); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float rotation) + { + super.render(entity, f, f1, f2, f3, f4, rotation); + setRotationAngles(f, f1, f2, f3, f4, rotation, entity); + head.render(rotation); + body.render(rotation); + rightarm.render(rotation); + leftarm.render(rotation); + bottompedestal.render(rotation); + toppedestal.render(rotation); + standstick.render(rotation); + } + + void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity par7Entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, par7Entity); + } + +} diff --git a/tinker/armory/client/ArmoryProxyClient.java b/tinker/armory/client/ArmoryProxyClient.java new file mode 100644 index 00000000..969aaa86 --- /dev/null +++ b/tinker/armory/client/ArmoryProxyClient.java @@ -0,0 +1,28 @@ +package tinker.armory.client; + +import java.io.File; + +import tinker.armory.ArmoryProxyCommon; +import tinker.armory.content.ArmorStandEntity; +import tinker.armory.content.ToolrackLogic; + +import net.minecraft.client.Minecraft; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class ArmoryProxyClient extends ArmoryProxyCommon +{ + @Override + public void registerRenderer() + { + RenderingRegistry.registerBlockHandler(new RenderToolrack()); + ClientRegistry.bindTileEntitySpecialRenderer(ToolrackLogic.class, new ToolrackSpecialRender()); + RenderingRegistry.registerEntityRenderingHandler(tinker.armory.content.ArmorStandEntity.class, new RenderArmorStandEntity(new ArmorStandModelStatue(), 0)); + } + + @Override + public File getMinecraftDir() + { + return Minecraft.getMinecraftDir(); + } +} diff --git a/tinker/armory/client/RenderArmorStandEntity.java b/tinker/armory/client/RenderArmorStandEntity.java new file mode 100644 index 00000000..3e95bf12 --- /dev/null +++ b/tinker/armory/client/RenderArmorStandEntity.java @@ -0,0 +1,512 @@ +package tinker.armory.client; + +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; +import net.minecraft.block.Block; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.item.EnumArmorMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.MinecraftForgeClient; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderArmorStandEntity extends RenderLiving +{ + protected ModelBase mainModel; + protected float sizeIncrease; + protected ModelBiped armorChestplate; + protected ModelBiped armorBody; + + /** List of armor texture filenames. */ + public static String[] bipedArmorFilenamePrefix = new String[] {"cloth", "chain", "iron", "diamond", "gold"}; + + public RenderArmorStandEntity(ModelBase model, float par2) + { + this(model, par2, 1.0F); + } + + public RenderArmorStandEntity(ModelBase model, float par2, float par3) + { + super(model, par2); + this.mainModel = model; + this.sizeIncrease = par3; + this.func_82421_b(); + } + + protected void func_82421_b() + { + this.armorChestplate = new ModelBiped(1.0F); + this.armorBody = new ModelBiped(0.5F); + } + + /** + * Queries whether should render the specified pass or not. + */ + protected int shouldRenderPass(EntityLiving par1EntityLiving, int par2, float par3) + { + ItemStack stack = par1EntityLiving.getCurrentArmor(3 - par2); + + if (stack != null) + { + Item item = stack.getItem(); + + if (item instanceof ItemArmor) + { + ItemArmor itemarmor = (ItemArmor)item; + this.loadTexture(ForgeHooksClient.getArmorTexture(stack, "/armor/" + bipedArmorFilenamePrefix[itemarmor.renderIndex%4] + "_" + (par2 == 2 ? 2 : 1) + ".png")); + ModelBiped biped = par2 == 2 ? this.armorBody : this.armorChestplate; + biped.bipedHead.showModel = par2 == 0; + biped.bipedHeadwear.showModel = par2 == 0; + biped.bipedBody.showModel = par2 == 1 || par2 == 2; + biped.bipedRightArm.showModel = par2 == 1; + biped.bipedLeftArm.showModel = par2 == 1; + biped.bipedRightLeg.showModel = par2 == 2 || par2 == 3; + biped.bipedLeftLeg.showModel = par2 == 2 || par2 == 3; + this.setRenderPassModel(biped); + + if (biped != null) + { + biped.onGround = this.mainModel.onGround; + } + + if (biped != null) + { + biped.isRiding = this.mainModel.isRiding; + } + + if (biped != null) + { + biped.isChild = this.mainModel.isChild; + } + + float var8 = 1.0F; + + if (itemarmor.getArmorMaterial() == EnumArmorMaterial.CLOTH) + { + int var9 = itemarmor.getColor(stack); + float var10 = (float)(var9 >> 16 & 255) / 255.0F; + float var11 = (float)(var9 >> 8 & 255) / 255.0F; + float var12 = (float)(var9 & 255) / 255.0F; + GL11.glColor3f(var8 * var10, var8 * var11, var8 * var12); + + if (stack.isItemEnchanted()) + { + return 31; + } + + return 16; + } + + GL11.glColor3f(var8, var8, var8); + + if (stack.isItemEnchanted()) + { + return 15; + } + + return 1; + } + } + + return -1; + } + + protected void func_82408_c(EntityLiving par1EntityLiving, int par2, float par3) + { + ItemStack var4 = par1EntityLiving.getCurrentArmor(3 - par2); + + if (var4 != null) + { + Item var5 = var4.getItem(); + + if (var5 instanceof ItemArmor) + { + ItemArmor var6 = (ItemArmor)var5; + this.loadTexture("/armor/" + bipedArmorFilenamePrefix[var6.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + "_b.png"); + float var7 = 1.0F; + GL11.glColor3f(var7, var7, var7); + } + } + } + + public void doRenderLiving(EntityLiving par1EntityLiving, double posX, double posY, double posZ, float par8, float par9) + { + float var10 = 1.0F; + GL11.glColor3f(var10, var10, var10); + ItemStack var11 = par1EntityLiving.getHeldItem(); + this.func_82420_a(par1EntityLiving, var11); + double var12 = posY - (double)par1EntityLiving.yOffset+0.25; + + //Insert super here + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_CULL_FACE); + this.mainModel.onGround = this.renderSwingProgress(par1EntityLiving, par9); + + if (this.renderPassModel != null) + { + this.renderPassModel.onGround = this.mainModel.onGround; + } + + this.mainModel.isRiding = par1EntityLiving.isRiding(); + + if (this.renderPassModel != null) + { + this.renderPassModel.isRiding = this.mainModel.isRiding; + } + + this.mainModel.isChild = par1EntityLiving.isChild(); + + if (this.renderPassModel != null) + { + this.renderPassModel.isChild = this.mainModel.isChild; + } + + try + { + //float rotate1 = this.interRotation(par1EntityLiving.prevRenderYawOffset, par1EntityLiving.renderYawOffset, par9); + float rotate2 = this.interRotation(par1EntityLiving.prevRotationYawHead, par1EntityLiving.rotationYawHead, par9); + float rotate1 = rotate2; + //float rotate2 = rotate1; + float rotate3 = par1EntityLiving.prevRotationPitch + (par1EntityLiving.rotationPitch - par1EntityLiving.prevRotationPitch) * par9; + this.renderLivingAt(par1EntityLiving, posX, posY, posZ); + //float rotationExisted = this.handleRotationFloat(par1EntityLiving, par9); // Makes the armor breathe + float rotationExisted = 0; + this.rotateCorpse(par1EntityLiving, rotationExisted, rotate1, par9); + float var14 = 0.0625F; + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glScalef(-1.0F, -1.0F, 1.0F); + this.preRenderCallback(par1EntityLiving, par9); + GL11.glTranslatef(0.0F, -24.0F * var14 - 0.0078125F - 0.25F, 0.0F); + float var15 = par1EntityLiving.prevLegYaw + (par1EntityLiving.legYaw - par1EntityLiving.prevLegYaw) * par9; + float var16 = par1EntityLiving.legSwing - par1EntityLiving.legYaw * (1.0F - par9); + + if (par1EntityLiving.isChild()) + { + var16 *= 3.0F; + } + + if (var15 > 1.0F) + { + var15 = 1.0F; + } + + GL11.glEnable(GL11.GL_ALPHA_TEST); + this.mainModel.setLivingAnimations(par1EntityLiving, var16, var15, par9); + this.renderModel(par1EntityLiving, var16, var15, rotationExisted, rotate2 - rotate1, rotate3, var14); + float var19; + int var18; + float var20; + float var22; + + for (int armorIter = 0; armorIter < 4; ++armorIter) //Armor + { + var18 = this.shouldRenderPass(par1EntityLiving, armorIter, par9); + + if (var18 > 0) + { + this.renderPassModel.setLivingAnimations(par1EntityLiving, var16, var15, par9); + this.renderPassModel.render(par1EntityLiving, 0, 0, rotationExisted, rotate2 - rotate1, rotate3, var14); + + if ((var18 & 240) == 16) + { + this.func_82408_c(par1EntityLiving, armorIter, par9); + this.renderPassModel.render(par1EntityLiving, var16, var15, rotationExisted, rotate2 - rotate1, rotate3, var14); + } + + if ((var18 & 15) == 15) + { + var19 = (float)par1EntityLiving.ticksExisted + par9; + this.loadTexture("%blur%/misc/glint.png"); + GL11.glEnable(GL11.GL_BLEND); + var20 = 0.5F; + GL11.glColor4f(var20, var20, var20, 1.0F); + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDepthMask(false); + + for (int var21 = 0; var21 < 2; ++var21) + { + GL11.glDisable(GL11.GL_LIGHTING); + var22 = 0.76F; + GL11.glColor4f(0.5F * var22, 0.25F * var22, 0.8F * var22, 1.0F); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glLoadIdentity(); + float var23 = var19 * (0.001F + (float)var21 * 0.003F) * 20.0F; + float var24 = 0.33333334F; + GL11.glScalef(var24, var24, var24); + GL11.glRotatef(30.0F - (float)var21 * 60.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.0F, var23, 0.0F); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + this.renderPassModel.render(par1EntityLiving, var16, var15, rotationExisted, rotate2 - rotate1, rotate3, var14); + } + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glDepthMask(true); + GL11.glLoadIdentity(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } + + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + } + } + + GL11.glDepthMask(true); + this.renderEquippedItems(par1EntityLiving, par9); + float var26 = par1EntityLiving.getBrightness(par9); + var18 = this.getColorMultiplier(par1EntityLiving, var26, par9); + OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GL11.glDisable(GL11.GL_TEXTURE_2D); + OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + + if ((var18 >> 24 & 255) > 0 || par1EntityLiving.hurtTime > 0 || par1EntityLiving.deathTime > 0) + { + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDepthFunc(GL11.GL_EQUAL); + + if (par1EntityLiving.hurtTime > 0 || par1EntityLiving.deathTime > 0) + { + GL11.glColor4f(var26, 0.0F, 0.0F, 0.4F); + this.mainModel.render(par1EntityLiving, var16, var15, rotationExisted, rotate2 - rotate1, rotate3, var14); + + for (int var27 = 0; var27 < 4; ++var27) + { + if (this.inheritRenderPass(par1EntityLiving, var27, par9) >= 0) + { + GL11.glColor4f(var26, 0.0F, 0.0F, 0.4F); + this.renderPassModel.render(par1EntityLiving, var16, var15, rotationExisted, rotate2 - rotate1, rotate3, var14); + } + } + } + + if ((var18 >> 24 & 255) > 0) + { + var19 = (float)(var18 >> 16 & 255) / 255.0F; + var20 = (float)(var18 >> 8 & 255) / 255.0F; + float var29 = (float)(var18 & 255) / 255.0F; + var22 = (float)(var18 >> 24 & 255) / 255.0F; + GL11.glColor4f(var19, var20, var29, var22); + this.mainModel.render(par1EntityLiving, var16, var15, rotationExisted, rotate2 - rotate1, rotate3, var14); + + for (int var28 = 0; var28 < 4; ++var28) + { + if (this.inheritRenderPass(par1EntityLiving, var28, par9) >= 0) + { + GL11.glColor4f(var19, var20, var29, var22); + this.renderPassModel.render(par1EntityLiving, var16, var15, rotationExisted, rotate2 - rotate1, rotate3, var14); + } + } + } + + GL11.glDepthFunc(GL11.GL_LEQUAL); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_TEXTURE_2D); + } + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + } + catch (Exception var25) + { + var25.printStackTrace(); + } + + OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GL11.glEnable(GL11.GL_TEXTURE_2D); + OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glPopMatrix(); + this.passSpecialRender(par1EntityLiving, posX, posY, posZ); + } + + public float interRotation(float par1, float par2, float par3) + { + float var4; + + for (var4 = par2 - par1; var4 < -180.0F; var4 += 360.0F) + { + ; + } + + while (var4 >= 180.0F) + { + var4 -= 360.0F; + } + + return par1 + par3 * var4; + } + + @Override + protected float renderSwingProgress(EntityLiving par1EntityLiving, float par2) + { + return 0; + } + + protected void func_82420_a(EntityLiving par1EntityLiving, ItemStack par2ItemStack) + { + this.armorChestplate.heldItemRight = this.armorBody.heldItemRight = par2ItemStack != null ? 1 : 0; + } + + protected void renderEquippedItems(EntityLiving par1EntityLiving, float par2) + { + float var3 = 1.0F; + GL11.glColor3f(var3, var3, var3); + super.renderEquippedItems(par1EntityLiving, par2); + ItemStack var4 = par1EntityLiving.getHeldItem(); + ItemStack var5 = par1EntityLiving.getCurrentArmor(3); + float var6; + + if (var5 != null) + { + GL11.glPushMatrix(); + //this.mainModel.head.postRender(0.0625F); + + IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(var5, EQUIPPED); + boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(EQUIPPED, var5, BLOCK_3D)); + + if (var5.getItem() instanceof ItemBlock) + { + if (is3D || RenderBlocks.renderItemIn3d(Block.blocksList[var5.itemID].getRenderType())) + { + var6 = 0.625F; + GL11.glTranslatef(0.0F, -0.25F, 0.0F); + GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + GL11.glScalef(var6, -var6, -var6); + } + + this.renderManager.itemRenderer.renderItem(par1EntityLiving, var5, 0); + } + else if (var5.getItem().itemID == Item.skull.itemID) + { + var6 = 1.0625F; + GL11.glScalef(var6, -var6, -var6); + String var7 = ""; + + if (var5.hasTagCompound() && var5.getTagCompound().hasKey("SkullOwner")) + { + var7 = var5.getTagCompound().getString("SkullOwner"); + } + + TileEntitySkullRenderer.skullRenderer.func_82393_a(-0.5F, 0.0F, -0.5F, 1, 180.0F, var5.getItemDamage(), var7); + } + + GL11.glPopMatrix(); + } + + if (var4 != null) + { + GL11.glPushMatrix(); + + if (this.mainModel.isChild) + { + var6 = 0.5F; + GL11.glTranslatef(0.0F, 0.625F, 0.0F); + GL11.glRotatef(-20.0F, -1.0F, 0.0F, 0.0F); + GL11.glScalef(var6, var6, var6); + } + + //this.mainModel.bipedRightArm.postRender(0.0625F); + GL11.glTranslatef(-0.0625F, 0.4375F, 0.0625F); + + IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(var4, EQUIPPED); + boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(EQUIPPED, var4, BLOCK_3D)); + + if (var4.getItem() instanceof ItemBlock && (is3D || RenderBlocks.renderItemIn3d(Block.blocksList[var4.itemID].getRenderType()))) + { + var6 = 0.5F; + GL11.glTranslatef(-0.4325F, 0.1875F, -0.3125F); + var6 *= 0.75F; + GL11.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + GL11.glScalef(-var6, -var6, var6); + } + else if (var4.itemID == Item.bow.itemID) + { + var6 = 0.625F; + GL11.glTranslatef(-0.5F, 0.125F, 0.3125F); + GL11.glRotatef(-20.0F, 0.0F, 1.0F, 0.0F); + GL11.glScalef(var6, -var6, var6); + GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + } + else if (Item.itemsList[var4.itemID].isFull3D()) + { + var6 = 0.625F; + + if (Item.itemsList[var4.itemID].shouldRotateAroundWhenRendering()) + { + GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.0F, -0.125F, 0.0F); + } + + this.func_82422_c(); + GL11.glScalef(var6, -var6, var6); + GL11.glTranslatef(-0.5F, 0.0F, 0.0F); + GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + } + else + { + var6 = 0.375F; + GL11.glTranslatef(-0.125F, 0.1875F, -0.1875F); + GL11.glScalef(var6, var6, var6); + GL11.glRotatef(60.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(20.0F, 0.0F, 0.0F, 1.0F); + } + + this.renderManager.itemRenderer.renderItem(par1EntityLiving, var4, 0); + + if (var4.getItem().requiresMultipleRenderPasses()) + { + for (int x = 1; x < var4.getItem().getRenderPasses(var4.getItemDamage()); x++) + { + this.renderManager.itemRenderer.renderItem(par1EntityLiving, var4, x); + } + } + + GL11.glPopMatrix(); + } + } + + protected void func_82422_c() + { + GL11.glTranslatef(0.0F, 0.1875F, 0.0F); + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then + * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic + * (Render> 16 & 255) / 255.0F; + float var2 = (float)(var0 >> 8 & 255) / 255.0F; + float var3 = (float)(var0 & 255) / 255.0F; + GL11.glColor4f(var1, var2, var3, 1.0F); + } +} diff --git a/tinker/armory/content/ArmorStandBlock.java b/tinker/armory/content/ArmorStandBlock.java new file mode 100644 index 00000000..84a22ab0 --- /dev/null +++ b/tinker/armory/content/ArmorStandBlock.java @@ -0,0 +1,5 @@ +package tinker.armory.content; + +public class ArmorStandBlock { + +} diff --git a/tinker/armory/content/ArmorStandEntity.java b/tinker/armory/content/ArmorStandEntity.java new file mode 100644 index 00000000..1f12be7d --- /dev/null +++ b/tinker/armory/content/ArmorStandEntity.java @@ -0,0 +1,157 @@ +package tinker.armory.content; + +import tinker.armory.Armory; +import tinker.armory.client.ArmorStandContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +public class ArmorStandEntity extends EntityEquipment +{ + //Container inventory; + public ArmorStandEntity(World world) + { + super(world); + this.texture = "/tinkertextures/mob/armorstandtexture.png"; + //inventory = new ArmorStandContainer(this); + } + + public boolean interact (EntityPlayer player) + { + //if (player.getCurrentEquippedItem() == null) + if (player.isSneaking()) + { + //faceEntity(player, 10.0F, (float)this.getVerticalFaceSpeed()); + //int facing = (int) ((player.rotationYawHead + 225) * 16 / 360) % 16; + int facing = (int) (player.rotationYawHead + 191) % 360; + facing = (int) (facing / 22.5f); + //System.out.println("Facing: "+facing); + //System.out.println("Facing: "+facing + " Angle: "+facing*22.5f); + setRotation(facing * 22.5f, 0); + } + else + player.openGui(Armory.instance, entityId, worldObj, (int) posX, (int) posY, (int) posZ); + return true; + } + + @Override + protected void setRotation (float rotation, float vertical) + { + this.rotationYaw = rotation; + this.rotationYawHead = rotation; + this.rotationPitch = vertical; + } + + @Override + public Container getContainer (EntityPlayer player) + { + return new ArmorStandContainer(player.inventory, this); + } + + @Override + public int getSizeInventory () + { + return 5; + } + + @Override + public ItemStack getStackInSlot (int slot) + { + return getCurrentItemOrArmor(slot); + } + + @Override + public ItemStack decrStackSize (int slot, int stackSize) + { + if (getCurrentItemOrArmor(slot) != null) + { + if (getCurrentItemOrArmor(slot).stackSize <= stackSize) + { + ItemStack itemstack = getCurrentItemOrArmor(slot); + setCurrentItemOrArmor(slot, null); + return itemstack; + } + ItemStack itemstack1 = getCurrentItemOrArmor(slot).splitStack(stackSize); + if (getCurrentItemOrArmor(slot).stackSize == 0) + { + setCurrentItemOrArmor(slot, null); + } + return itemstack1; + } + else + { + return null; + } + } + + @Override + public ItemStack getStackInSlotOnClosing (int var1) + { + return null; + } + + @Override + public void setInventorySlotContents (int slot, ItemStack itemstack) + { + setCurrentItemOrArmor(slot, itemstack); + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) + { + itemstack.stackSize = getInventoryStackLimit(); + } + } + + @Override + public String getInvName () + { + return "Inventory"; + } + + @Override + public int getInventoryStackLimit () + { + return 1; + } + + @Override + public void onInventoryChanged () + { + + } + + @Override + public boolean isUseableByPlayer (EntityPlayer var1) + { + return true; + } + + public void openChest () + { + } + + public void closeChest () + { + } + + protected int getDropItemId() + { + return Armory.armorStandItem.itemID; + } + + @Override + public void writeEntityToNBT(NBTTagCompound tags) + { + super.writeEntityToNBT(tags); + tags.setFloat("rotationYaw", rotationYaw); + tags.setFloat("rotationYawHead", rotationYawHead); + } + + @Override + public void readEntityFromNBT(NBTTagCompound tags) + { + super.readEntityFromNBT(tags); + rotationYaw = tags.getFloat("rotationYaw"); + rotationYawHead = tags.getFloat("rotationYawHead"); + } +} diff --git a/tinker/armory/content/ArmorStandItem.java b/tinker/armory/content/ArmorStandItem.java new file mode 100644 index 00000000..5b6b2f7f --- /dev/null +++ b/tinker/armory/content/ArmorStandItem.java @@ -0,0 +1,83 @@ +package tinker.armory.content; + +import tinker.armory.Armory; +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class ArmorStandItem extends Item +{ + public ArmorStandItem(int id) + { + super(id); + setCreativeTab(CreativeTabs.tabMisc); + } + + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) + { + int var11 = world.getBlockId(x, y, z); + + if (var11 == Block.snow.blockID) + { + side = 1; + } + else if (var11 != Block.vine.blockID && var11 != Block.tallGrass.blockID && var11 != Block.deadBush.blockID + && (Block.blocksList[var11] == null || !Block.blocksList[var11].isBlockReplaceable(world, x, y, z))) + { + if (side == 0) + --y; + + if (side == 1) + ++y; + + if (side == 2) + --z; + + if (side == 3) + ++z; + + if (side == 4) + --x; + + if (side == 5) + ++x; + } + + if (stack.stackSize == 0) + { + return false; + } + else if (!player.canPlayerEdit(x, y, z, side, stack)) + { + return false; + } + if (spawnEntity(x, y, z, new ArmorStandEntity(world), world, player) ) + { + stack.stackSize--; + return true; + } + player.swingItem(); + return false; + } + + public static boolean spawnEntity(double x, double y, double z, Entity entity, World world, EntityPlayer player) + { + if (!world.isRemote) + { + entity.setPosition(x+0.5, y, z+0.5); + world.spawnEntityInWorld(entity); + world.playAuxSFX(2001, (int)x, (int)y, (int)z, Block.stone.blockID); + return true; + } + return false; + } + + public String getTextureFile() + { + return Armory.texture; + } +} diff --git a/tinker/armory/content/EntityEquipment.java b/tinker/armory/content/EntityEquipment.java new file mode 100644 index 00000000..6d77b1b1 --- /dev/null +++ b/tinker/armory/content/EntityEquipment.java @@ -0,0 +1,97 @@ +package tinker.armory.content; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; + +/* + * Dummy class, used for rendering equipment and nothing else! + */ + +public abstract class EntityEquipment extends EntityLiving + implements IInventory +{ + public EntityEquipment(World par1World) + { + super(par1World); + equipmentDropChances = new float[] { 1f, 1f, 1f, 1f, 1f }; + } + + public abstract Container getContainer(EntityPlayer player); + + public String getTexture() + { + return this.texture; + } + + protected void kill() + { + this.attackEntityFrom(DamageSource.outOfWorld, 1000); + } + + protected void dropFewItems(boolean par1, int par2) + { + this.dropItem(this.getDropItemId(), 1); + } + + protected void dropEquipment(boolean par1, int par2) + { + for (int var3 = 0; var3 < this.getLastActiveItems().length; ++var3) + { + ItemStack var4 = this.getCurrentItemOrArmor(var3); + boolean var5 = this.equipmentDropChances[var3] > 1.0F; + + if (var4 != null && (par1 || var5) && this.rand.nextFloat() - (float)par2 * 0.01F < this.equipmentDropChances[var3]) + { + if (!var5 && var4.isItemStackDamageable()) + { + int var6 = Math.max(var4.getMaxDamage() - 25, 1); + int var7 = var4.getMaxDamage() - this.rand.nextInt(this.rand.nextInt(var6) + 1); + + if (var7 > var6) + { + var7 = var6; + } + + if (var7 < 1) + { + var7 = 1; + } + + //var4.setItemDamage(var7); + } + + this.entityDropItem(var4, 0.0F); + } + } + } + + public int getMaxHealth() { return 5; } + public boolean canBePushed() { return false; } + protected int decreaseAirSupply(int par1) { return 0; } + //public boolean attackEntityFrom(DamageSource par1DamageSource, int par2) { return false; } + //protected void damageEntity(DamageSource par1DamageSource, int par2) { super.damageEntity(par1DamageSource, par2); } + protected void updateFallState(double par1, boolean par3) {} + public void knockBack(Entity par1Entity, int par2, double par3, double par5) {} + protected void fall(float par1) {} + public void moveEntityWithHeading(float par1, float par2) {} + public boolean canBreatheUnderwater() { return true; } + public void onLivingUpdate() { } + public boolean isBlocking() { return true; } + protected void jump() {} + protected boolean canDespawn() { return true; } + //protected void despawnEntity() { super.despawnEntity(); } + protected void updateAITasks() {} + protected void updateEntityActionState() {} + protected void updateArmSwingProgress() {} + public boolean getCanSpawnHere() { return false; } + protected void updatePotionEffects() {} + public void addPotionEffect(PotionEffect par1PotionEffect) {} + public boolean isPotionApplicable(PotionEffect par1PotionEffect) { return false; } +} diff --git a/tinker/armory/content/Toolrack.java b/tinker/armory/content/Toolrack.java new file mode 100644 index 00000000..c0edd817 --- /dev/null +++ b/tinker/armory/content/Toolrack.java @@ -0,0 +1,192 @@ +package tinker.armory.content; + +import java.util.List; + +import tinker.armory.client.RenderToolrack; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public class Toolrack extends BlockContainer +{ + public Toolrack(int id, Material material) + { + super(id, material); + } + + @Override + public boolean renderAsNormalBlock() + { + return false; + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + public int getRenderType() + { + return RenderToolrack.rackModel; + } + + @Override + public TileEntity createNewTileEntity(World world) + { + return new ToolrackLogic(); + } + + public int getBlockTextureFromSideAndMetadata(int side, int meta) + { + return 6; + } + + public void addCollidingBlockToList(World var1, int var2, int var3, int var4, AxisAlignedBB var5, List var6, Entity var7) + { + this.setBounds(var1.getBlockMetadata(var2, var3, var4)); + super.addCollidingBlockToList(var1, var2, var3, var4, var5, var6, var7); + } + + public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) + { + this.setBounds(var1.getBlockMetadata(var2, var3, var4)); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int size, float hitX, float hitY, float hitZ) + { + System.out.println("Activating tool rack"); + if (world.isRemote) + { + System.out.println("World's remote"); + return true; + } + else + { + ToolrackLogic logic = (ToolrackLogic)world.getBlockTileEntity(x, y, z); + + //if (logic != null && player instanceof EntityPlayerMP) + if (logic != null) + { + System.out.println("Logic exists"); + int facing = world.getBlockMetadata(x, y, z) / 4; + byte slot = 0; + double var13 = (double)x + 0.5D - player.posX; + double var15 = (double)z + 0.5D - player.posZ; + + if (facing == 0) + { + var15 -= 0.25D; + } + else if (facing == 1) + { + var13 -= 0.25D; + } + else if (facing == 2) + { + var15 += 0.25D; + } + else if (facing == 3) + { + var13 += 0.25D; + } + + double var17 = var13 + var15 * Math.tan(Math.toRadians((double)player.rotationYaw)); + double var19 = var15 - var13 * Math.tan(Math.toRadians((double)(player.rotationYaw + 90.0F))); + + if (facing == 0 && var17 < 0.0D || facing == 1 && var19 > 0.0D || facing == 2 && var17 > 0.0D || facing == 3 && var19 < 0.0D) + { + slot = 1; + } + + ItemStack stack = player.getCurrentEquippedItem(); + + if (!logic.isItemInColumn(slot) && stack != null && logic.canHoldItem(stack)) + { + //logic.setInventorySlotContents(slot, stack); + stack = player.inventory.decrStackSize(player.inventory.currentItem, 1); + logic.setInventorySlotContents(slot, stack); + } + else + { + ItemStack insideStack = logic.takeItemInColumn(slot); + + if (insideStack == null) + { + insideStack = logic.takeItemInColumn(1 - slot); + } + + if (insideStack != null) + { + this.spawnItem(world, x, y, z, insideStack); + } + } + + world.markBlockForUpdate(x, y, z); + } + + return true; + } + } + + protected void spawnItem(World world, int x, int y, int z, ItemStack stack) + { + if (!world.isRemote) + { + EntityItem var6 = new EntityItem(world, (double)x + 0.5D, (double)y + 0.5D, (double)z + 0.5D, stack); + var6.delayBeforeCanPickup = 5; + int var7 = world.getBlockMetadata(x, y, z) & 3; + var6.motionX = var6.motionY = var6.motionZ = 0.0D; + + if (var7 == 0) + { + var6.motionZ = 0.05D; + } + else if (var7 == 1) + { + var6.motionX = 0.05D; + } + else if (var7 == 2) + { + var6.motionZ = -0.05D; + } + else if (var7 == 3) + { + var6.motionX = -0.05D; + } + + world.spawnEntityInWorld(var6); + } + } + + public void setBounds(int metadata) + { + int facing = metadata / 4; + + if (facing == 0) + { + this.setBlockBounds(0.0F, 0.2F, 0.0F, 1.0F, 0.9F, 0.25F); + } + else if (facing == 1) + { + this.setBlockBounds(0.0F, 0.2F, 0.0F, 0.25F, 0.9F, 1.0F); + } + else if (facing == 2) + { + this.setBlockBounds(0.0F, 0.2F, 0.75F, 1.0F, 0.9F, 1.0F); + } + else if (facing == 3) + { + this.setBlockBounds(0.75F, 0.2F, 0.0F, 1.0F, 0.9F, 1.0F); + } + } +} diff --git a/tinker/armory/content/ToolrackItem.java b/tinker/armory/content/ToolrackItem.java new file mode 100644 index 00000000..d7b81760 --- /dev/null +++ b/tinker/armory/content/ToolrackItem.java @@ -0,0 +1,29 @@ +package tinker.armory.content; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ToolrackItem extends ItemBlock +{ + public ToolrackItem(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + @Override + public int getMetadata(int md) + { + return md; + } + + public String getItemNameIS(ItemStack itemstack) + { + return (new StringBuilder()).append("block.").append(blockType[itemstack.getItemDamage()]).append("Toolrack").toString(); + } + public static final String blockType[] = + { + "stone", "stonebrick", "brick", "obsidian" + }; +} diff --git a/tinker/armory/content/ToolrackLogic.java b/tinker/armory/content/ToolrackLogic.java new file mode 100644 index 00000000..876aa1b6 --- /dev/null +++ b/tinker/armory/content/ToolrackLogic.java @@ -0,0 +1,201 @@ +package tinker.armory.content; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet132TileEntityData; +import net.minecraft.tileentity.TileEntity; + +public class ToolrackLogic extends TileEntity + implements IInventory +{ + ItemStack[] tools; + + public ToolrackLogic() + { + tools = new ItemStack[2]; + } + + @Override + public int getSizeInventory() + { + return 2; + } + + @Override + public ItemStack getStackInSlot(int slot) + { + return tools[slot]; + } + + @Override + public ItemStack decrStackSize(int slot, int quantity) + { + if (this.tools[slot] == null) + return null; + + else + { + ItemStack stack; + + if (this.tools[slot].stackSize <= quantity) + { + stack = this.tools[slot]; + this.tools[slot] = null; + } + else + { + stack = this.tools[slot].splitStack(quantity); + + if (this.tools[slot].stackSize == 0) + { + this.tools[slot] = null; + } + } + + this.onInventoryChanged(); + return stack; + } + } + + @Override + public ItemStack getStackInSlotOnClosing(int var1) + { + return null; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack stack) + { + this.updateItem(slot, stack); + + if (stack != null && stack.stackSize > this.getInventoryStackLimit()) + { + stack.stackSize = this.getInventoryStackLimit(); + } + + this.onInventoryChanged(); + } + + void updateItem(int slot, ItemStack stack) + { + this.tools[slot] = stack.copy(); + //System.out.println("Item name: "+tools[slot].getItemName()); + //float var3 = 45.0F; + + /*if (mod_ToolRack.reversedItems.contains(Integer.valueOf(var2.itemID))) + { + var3 = -45.0F; + } + else if (mod_ToolRack.straightItems.contains(Integer.valueOf(var2.itemID))) + { + var3 = 0.0F; + }*/ + + //this.rotations[var1] = var3; + } + + public boolean canHoldItem(ItemStack stack) + { + return stack.getMaxStackSize() == 1; + //return var1.getMaxStackSize() == 1 || mod_ToolRack.additionalTools.contains(Integer.valueOf(var1.itemID)); + } + + public boolean isItemInColumn(int var1) + { + return this.tools[var1] != null; + } + + public ItemStack takeItemInColumn(int var1) + { + return this.tools[var1] != null ? this.decrStackSize(var1, 1) : null; + } + + + @Override + public String getInvName() + { + return "Toolrack"; + } + + @Override + public int getInventoryStackLimit() + { + return 1; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) + { + return true; + } + + @Override + public void openChest() + { + + } + + @Override + public void closeChest() + { + + } + + @Override + public void readFromNBT(NBTTagCompound var1) + { + super.readFromNBT(var1); + NBTTagList tagList = var1.getTagList("Items"); + this.tools = new ItemStack[this.getSizeInventory()]; + + for (int iter = 0; iter < tagList.tagCount(); ++iter) + { + NBTTagCompound tagCompund = (NBTTagCompound)tagList.tagAt(iter); + int slot = tagCompund.getByte("Slot"); + + if (slot >= 0 && slot < this.tools.length) + { + this.updateItem(slot, ItemStack.loadItemStackFromNBT(tagCompund)); + } + } + } + + @Override + public void writeToNBT(NBTTagCompound var1) + { + super.writeToNBT(var1); + NBTTagList tagList = new NBTTagList(); + + for (byte iter = 0; iter < this.tools.length; ++iter) + { + if (this.tools[iter] != null) + { + NBTTagCompound tagCompound = new NBTTagCompound(); + tagCompound.setByte("Slot", iter); + this.tools[iter].writeToNBT(tagCompound); + tagList.appendTag(tagCompound); + } + } + + var1.setTag("Items", tagList); + } + + @Override + public Packet getDescriptionPacket() + { + NBTTagCompound compound = new NBTTagCompound(); + this.writeToNBT(compound); + return new Packet132TileEntityData(this.xCoord, this.yCoord, this.zCoord, 1, compound); + } + + @Override + public void onDataPacket(INetworkManager net, Packet132TileEntityData pkt) + { + readFromNBT(pkt.customParam1); + } +} diff --git a/tinker/common/IFacingLogic.java b/tinker/common/IFacingLogic.java index 28f14f0d..288be79d 100644 --- a/tinker/common/IFacingLogic.java +++ b/tinker/common/IFacingLogic.java @@ -1,8 +1,5 @@ package tinker.common; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.common.ISidedInventory; - public interface IFacingLogic { public boolean canFaceVertical(); diff --git a/tinker/common/IMechanicalLogic.java b/tinker/common/IMechanicalLogic.java new file mode 100644 index 00000000..2b9136a9 --- /dev/null +++ b/tinker/common/IMechanicalLogic.java @@ -0,0 +1,6 @@ +package tinker.common; + +public interface IMechanicalLogic +{ + +} \ No newline at end of file diff --git a/tinker/tconstruct/EnumMaterial.java b/tinker/tconstruct/EnumMaterial.java index c44c5d3a..179cd94f 100644 --- a/tinker/tconstruct/EnumMaterial.java +++ b/tinker/tconstruct/EnumMaterial.java @@ -17,8 +17,8 @@ public enum EnumMaterial Cobalt (4, 800, 800, 3, 1.8F, 2, 0), Ardite (4, 800, 800, 3, 1.8F, 0, 0), Manyullyn (5, 1200, 1000, 4, 2.5F, 0, 0), - Copper (1, 180, 500, 2, 1.8F, 0, 0), - Bronze (2, 250, 600, 2, 2.5F, 1, 0), + Copper (1, 180, 500, 2, 1.15F, 0, 0), + Bronze (2, 250, 600, 2, 1.3F, 1, 0), Demonite (5, 1790, 900, 5, 1.66F, 0, 0), Holyshell (5, 1000, 700, 1, 1.5F, 0, 0); diff --git a/tinker/tconstruct/PHConstruct.java b/tinker/tconstruct/PHConstruct.java index c5bd818f..1e93340d 100644 --- a/tinker/tconstruct/PHConstruct.java +++ b/tinker/tconstruct/PHConstruct.java @@ -47,6 +47,7 @@ public class PHConstruct { ores = config.getBlock("Ore Block", 1475).getInt(1475); craftedSoil = config.getBlock("Special Soil", 1476).getInt(1476); searedBrick = config.getBlock("Seared Brick", 1477).getInt(1477); + axle = config.getBlock("Axle", 1478).getInt(1478); blankPattern = config.getItem("Patterns and Misc", "Blank Patterns", 14019).getInt(14019); materials = config.getItem("Patterns and Misc", "Materials", 14020).getInt(14020); @@ -92,18 +93,17 @@ public class PHConstruct { } //Blocks - public static int blankPattern; public static int woodCrafter; - public static int stoneCrafter; - public static int netherCrafter; public static int heldItemBlock; public static int ores; public static int lavaTank; public static int smeltery; public static int craftedSoil; public static int searedBrick; + public static int axle; //Patterns and misc + public static int blankPattern; public static int materials; public static int toolRod; public static int toolShard; diff --git a/tinker/tconstruct/TConstruct.java b/tinker/tconstruct/TConstruct.java index 094e39de..c7fcd4c5 100644 --- a/tinker/tconstruct/TConstruct.java +++ b/tinker/tconstruct/TConstruct.java @@ -27,7 +27,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; * @author: mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "mc1.4.7_1.0.3") +@Mod(modid = "TConstruct", name = "TConstruct", version = "mc1.4.7_1.0.6") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels={"TConstruct"}, packetHandler = tinker.tconstruct.TConstructPacketHandler.class) public class TConstruct { diff --git a/tinker/tconstruct/TConstructContent.java b/tinker/tconstruct/TConstructContent.java index a8270888..459a07ab 100644 --- a/tinker/tconstruct/TConstructContent.java +++ b/tinker/tconstruct/TConstructContent.java @@ -38,6 +38,7 @@ import tinker.tconstruct.tools.Rapier; import tinker.tconstruct.tools.Shovel; import tinker.tconstruct.tools.ToolCore; import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; public class TConstructContent @@ -85,20 +86,20 @@ public class TConstructContent //Crafting blocks public static Block woodCrafter; public static Block smeltery; - //public static Block stoneCrafter; - //public static Block netherCrafter; public static Block heldItemBlock; public static Block ores; public static Block lavaTank; public static Block craftedSoil; public static Block searedBrick; + //public static Block axle; //Tool modifiers public static ModElectric modE; public TConstructContent() { + createEntities(); createItems(); registerMaterials(); addToolRecipes(); @@ -107,6 +108,11 @@ public class TConstructContent GameRegistry.registerFuelHandler(this); } + void createEntities() + { + EntityRegistry.registerModEntity(tinker.tconstruct.entity.EntityWagon.class, "Small Wagon", 0, TConstruct.instance, 32, 5, true); + } + void createItems () { woodCrafter = new ToolStationBlock(PHConstruct.woodCrafter, Material.wood); diff --git a/tinker/tconstruct/blocks/Axle.java b/tinker/tconstruct/blocks/Axle.java new file mode 100644 index 00000000..feb6c86f --- /dev/null +++ b/tinker/tconstruct/blocks/Axle.java @@ -0,0 +1,89 @@ +package tinker.tconstruct.blocks; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import tinker.tconstruct.client.AxleRender; + +public class Axle extends Block +{ + + public Axle(int id, Material material) + { + super(id, material); + this.setHardness(0.3f); + this.setBlockBounds(0, 0, 0, 1, 0.25f, 1); + //this.setCreativeTab(ToolConstruct.materialTab); + } + + /*public String getTextureFile() + { + return "/tinkertextures/ConstructBlocks.png"; + }*/ + + public int getBlockTextureFromSideAndMetadata (int side, int meta) + { + //return 22 + meta*6 + side; + return 18; + } + + @Override + public boolean renderAsNormalBlock () + { + return false; + } + + @Override + public boolean isOpaqueCube () + { + return false; + } + + @Override + public int getRenderType () + { + return AxleRender.axleModelID; + } + + @Override + public int idDropped (int par1, Random par2Random, int par3) + { + return 0; + } + + /*public TileEntity createNewTileEntity (World world, int metadata) + { + return new FrypanLogic(); + }*/ + + /*public void randomDisplayTick (World world, int x, int y, int z, Random random) + { + if (isActive(world, x, y, z)) + { + float f = (float) x + 0.5F; + float f1 = (float) y + 0.25F + (random.nextFloat() * 6F) / 16F; + float f2 = (float) z + 0.5F; + float f4 = random.nextFloat() * 0.6F - 0.3F; + world.spawnParticle("smoke", f, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + } + } + + public int getLightValue (IBlockAccess world, int x, int y, int z) + { + return !isActive(world, x, y, z) ? 0 : 9; + } + + @Override + public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) + { + return TConstructGuiHandler.frypanID; + } + + @Override + public Object getModInstance () + { + return TConstruct.instance; + }*/ +} diff --git a/tinker/tconstruct/client/AxleRender.java b/tinker/tconstruct/client/AxleRender.java new file mode 100644 index 00000000..5f79be5a --- /dev/null +++ b/tinker/tconstruct/client/AxleRender.java @@ -0,0 +1,72 @@ +package tinker.tconstruct.client; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class AxleRender implements ISimpleBlockRenderingHandler +{ + public static int axleModelID = RenderingRegistry.getNextAvailableRenderId(); + @Override + public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) + { + renderer.setRenderBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); + renderDo(renderer, block, metadata); + } + + @Override + public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) + { + renderer.setRenderBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); + renderer.renderStandardBlock(block, x, y, z); + return false; + } + + @Override + public boolean shouldRender3DInInventory () + { + return true; + } + + @Override + public int getRenderId () + { + return axleModelID; + } + + private void renderDo(RenderBlocks renderblocks, Block block, int meta) + { + Tessellator tessellator = Tessellator.instance; + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(0, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(1, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1F); + renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(2, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(3, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 0.0F, 0.0F); + renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(4, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, meta)); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } +} diff --git a/tinker/tconstruct/client/RenderWagon.java b/tinker/tconstruct/client/RenderWagon.java new file mode 100644 index 00000000..dee11706 --- /dev/null +++ b/tinker/tconstruct/client/RenderWagon.java @@ -0,0 +1,135 @@ +package tinker.tconstruct.client; + +import net.minecraft.block.Block; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelMinecart; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.entity.Entity; +import net.minecraft.util.MathHelper; +import net.minecraft.util.Vec3; + +import org.lwjgl.opengl.GL11; + +import tinker.tconstruct.entity.EntityWagon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderWagon extends Render +{ + /** instance of ModelMinecart for rendering */ + protected ModelBase modelMinecart; + + public RenderWagon() + { + this.shadowSize = 0.5F; + this.modelMinecart = new ModelMinecart(); + } + + /** + * Renders the Minecart. + */ + public void renderTheMinecart(EntityWagon wagon, double par2, double par4, double par6, float par8, float par9) + { + GL11.glPushMatrix(); + long var10 = (long)wagon.entityId * 493286711L; + var10 = var10 * var10 * 4392167121L + var10 * 98761L; + float var12 = (((float)(var10 >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; + float var13 = (((float)(var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; + float var14 = (((float)(var10 >> 24 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; + GL11.glTranslatef(var12, var13, var14); + double var15 = wagon.lastTickPosX + (wagon.posX - wagon.lastTickPosX) * (double)par9; + double var17 = wagon.lastTickPosY + (wagon.posY - wagon.lastTickPosY) * (double)par9; + double var19 = wagon.lastTickPosZ + (wagon.posZ - wagon.lastTickPosZ) * (double)par9; + double var21 = 0.30000001192092896D; + Vec3 var23 = wagon.func_70489_a(var15, var17, var19); + float var24 = wagon.prevRotationPitch + (wagon.rotationPitch - wagon.prevRotationPitch) * par9; + + if (var23 != null) + { + Vec3 var25 = wagon.func_70495_a(var15, var17, var19, var21); + Vec3 var26 = wagon.func_70495_a(var15, var17, var19, -var21); + + if (var25 == null) + { + var25 = var23; + } + + if (var26 == null) + { + var26 = var23; + } + + par2 += var23.xCoord - var15; + par4 += (var25.yCoord + var26.yCoord) / 2.0D - var17; + par6 += var23.zCoord - var19; + Vec3 var27 = var26.addVector(-var25.xCoord, -var25.yCoord, -var25.zCoord); + + if (var27.lengthVector() != 0.0D) + { + var27 = var27.normalize(); + par8 = (float)(Math.atan2(var27.zCoord, var27.xCoord) * 180.0D / Math.PI); + var24 = (float)(Math.atan(var27.yCoord) * 73.0D); + } + } + + GL11.glTranslatef((float)par2, (float)par4, (float)par6); + GL11.glRotatef(180.0F - par8, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-var24, 0.0F, 0.0F, 1.0F); + float var28 = (float)wagon.func_70496_j() - par9; + float var30 = (float)wagon.getDamage() - par9; + + if (var30 < 0.0F) + { + var30 = 0.0F; + } + + if (var28 > 0.0F) + { + GL11.glRotatef(MathHelper.sin(var28) * var28 * var30 / 10.0F * (float)wagon.func_70493_k(), 1.0F, 0.0F, 0.0F); + } + + if (wagon.minecartType != 0) + { + this.loadTexture("/terrain.png"); + float var29 = 0.75F; + GL11.glScalef(var29, var29, var29); + + if (wagon.minecartType == 1) + { + GL11.glTranslatef(0.0F, 0.5F, 0.0F); + (new RenderBlocks()).renderBlockAsItem(Block.chest, 0, wagon.getBrightness(par9)); + GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.5F, 0.0F, -0.5F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } + else if (wagon.minecartType == 2) + { + GL11.glTranslatef(0.0F, 0.3125F, 0.0F); + (new RenderBlocks()).renderBlockAsItem(Block.stoneOvenIdle, 0, wagon.getBrightness(par9)); + GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, -0.3125F, 0.0F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } + + GL11.glScalef(1.0F / var29, 1.0F / var29, 1.0F / var29); + } + + this.loadTexture("/tinkertextures/entity/wagon.png"); + GL11.glScalef(-1.0F, -1.0F, 1.0F); + this.modelMinecart.render(wagon, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + GL11.glPopMatrix(); + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then + * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic + * (Render= 10 && i < 37) - { - if (!mergeItemStack(itemstack1, 37, 46, false)) - { - return null; - } - } - else if (i >= 37 && i < 46) - { - if (!mergeItemStack(itemstack1, 10, 37, false)) - { - return null; - } - } - else if (!mergeItemStack(itemstack1, 10, 46, false)) + else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory()-1, false)) { return null; } - if (itemstack1.stackSize == 0) + + if (slotStack.stackSize == 0) { - slot.putStack(null); + slot.putStack((ItemStack)null); } else { slot.onSlotChanged(); } - if (itemstack1.stackSize != itemstack.stackSize) - { - slot.onPickupFromSlot(entityplayer, itemstack1); - } - else - { - return null; - } } - return itemstack;*/ + + return stack;*/ } + } diff --git a/tinker/tconstruct/client/gui/PatternShaperGui.java b/tinker/tconstruct/client/gui/PatternShaperGui.java index 1c5e232f..7f83fdb4 100644 --- a/tinker/tconstruct/client/gui/PatternShaperGui.java +++ b/tinker/tconstruct/client/gui/PatternShaperGui.java @@ -84,7 +84,7 @@ public class PatternShaperGui extends GuiContainer if (button.id == 0) { patternIndex++; - if (patternIndex > TConstructContent.patternOutputs.length) + if (patternIndex > TConstructContent.patternOutputs.length - 1) patternIndex = 0; } else if (button.id == 1) @@ -109,13 +109,12 @@ public class PatternShaperGui extends GuiContainer try { outputStream.writeByte(2); - outputStream.writeInt(logic.worldObj.getWorldInfo().getDimension()); + outputStream.writeInt(logic.worldObj.provider.dimensionId); outputStream.writeInt(logic.xCoord); outputStream.writeInt(logic.yCoord); outputStream.writeInt(logic.zCoord); outputStream.writeShort(stack.itemID); outputStream.writeShort(stack.getItemDamage()); - //outputStream.writeUTF(toolName); } catch (Exception ex) { diff --git a/tinker/tconstruct/client/gui/ToolStationContainer.java b/tinker/tconstruct/client/gui/ToolStationContainer.java index 5fbea25f..772fd7b0 100644 --- a/tinker/tconstruct/client/gui/ToolStationContainer.java +++ b/tinker/tconstruct/client/gui/ToolStationContainer.java @@ -5,7 +5,9 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import tinker.tconstruct.logic.ToolStationLogic; +import tinker.tconstruct.tools.ToolCore; public class ToolStationContainer extends Container { @@ -87,20 +89,25 @@ public class ToolStationContainer extends Container { ItemStack slotStack = slot.getStack(); stack = slotStack.copy(); - if (slotID < logic.getSizeInventory()) { - System.out.println("Merging itemstack, true"); - if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) + if (slotID == 0) + { + if (!this.mergeCraftedStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true, player)) + { + return null; + } + } + else if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) { return null; } } - else if (!this.mergeItemStack(slotStack, 1, logic.getSizeInventory() - 1, false)) + else if (!this.mergeItemStack(slotStack, 1, logic.getSizeInventory(), false)) { return null; } - + if (slotStack.stackSize == 0) { slot.putStack((ItemStack)null); @@ -114,58 +121,110 @@ public class ToolStationContainer extends Container return stack; } - /*@Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + protected void craftTool(ItemStack stack) { - //this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true) - ItemStack itemstack = null; - Slot slot = (Slot)inventorySlots.get(slotID); - if (slot != null && slot.getHasStack()) + NBTTagCompound tags = stack.getTagCompound(); + if (!tags.getCompoundTag("InfiTool").hasKey("Built")) + { + tags.getCompoundTag("InfiTool").setBoolean("Built", true); + for (int i = 1; i <= 3; i++) + logic.decrStackSize(i, 1); + /*if (!player.worldObj.isRemote) + player.worldObj.playAuxSFX(1021, (int)player.posX, (int)player.posY, (int)player.posZ, 0);*/ + } + } + + protected boolean mergeCraftedStack(ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, EntityPlayer player) + { + boolean failedToMerge = false; + int slotIndex = slotsStart; + + if (playerInventory) { - ItemStack slotStack = slot.getStack(); - itemstack = slotStack.copy(); - if (slotID == 0) + slotIndex = slotsTotal - 1; + } + + Slot otherInventorySlot; + ItemStack copyStack = null; + + /*if (stack.isStackable()) + { + while (stack.stackSize > 0 && (!playerInventory && slotIndex < slotsTotal || playerInventory && slotIndex >= slotsStart)) { - if (!mergeItemStack(slotStack, 4, 40, true)) //10 = size of crafting grid, 46 = total, 0 == output slot + otherInventorySlot = (Slot)this.inventorySlots.get(slotIndex); + copyStack = otherInventorySlot.getStack(); + + if (copyStack != null && copyStack.itemID == stack.itemID && (!stack.getHasSubtypes() || stack.getItemDamage() == copyStack.getItemDamage()) && ItemStack.areItemStackTagsEqual(stack, copyStack)) { - return null; + int totalSize = copyStack.stackSize + stack.stackSize; + + if (totalSize <= stack.getMaxStackSize()) + { + stack.stackSize = 0; + copyStack.stackSize = totalSize; + otherInventorySlot.onSlotChanged(); + failedToMerge = true; + } + else if (copyStack.stackSize < stack.getMaxStackSize()) + { + stack.stackSize -= stack.getMaxStackSize() - copyStack.stackSize; + copyStack.stackSize = stack.getMaxStackSize(); + otherInventorySlot.onSlotChanged(); + failedToMerge = true; + } + } + + if (playerInventory) + { + --slotIndex; + } + else + { + ++slotIndex; } } - else if (slotID >= 4 && slotID < 37) + }*/ + + if (stack.stackSize > 0) + { + if (playerInventory) { - if (!mergeItemStack(slotStack, 37, 40, false)) - { - return null; - } - } - else if (slotID >= 37 && slotID < 40) - { - if (!mergeItemStack(slotStack, 4, 37, false)) - { - return null; - } - } - else if (!mergeItemStack(slotStack, 4, 40, false)) - { - return null; - } - if (slotStack.stackSize == 0) - { - slot.putStack(null); + slotIndex = slotsTotal - 1; } else { - slot.onSlotChanged(); + slotIndex = slotsStart; } - if (slotStack.stackSize != itemstack.stackSize) + + while (!playerInventory && slotIndex < slotsTotal || playerInventory && slotIndex >= slotsStart) { - slot.onPickupFromSlot(player, slotStack); - } - else - { - return null; + otherInventorySlot = (Slot)this.inventorySlots.get(slotIndex); + copyStack = otherInventorySlot.getStack(); + + if (copyStack == null) + { + craftTool(stack); + otherInventorySlot.putStack(stack.copy()); + otherInventorySlot.onSlotChanged(); + stack.stackSize = 0; + failedToMerge = true; + break; + } + + if (playerInventory) + { + --slotIndex; + } + else + { + ++slotIndex; + } } } - return itemstack; - }*/ + + if (!failedToMerge) + player.worldObj.playAuxSFX(1021, (int)player.posX, (int)player.posY, (int)player.posZ, 0); + + return failedToMerge; + } } diff --git a/tinker/tconstruct/client/gui/ToolStationGui.java b/tinker/tconstruct/client/gui/ToolStationGui.java index ac3c814c..cf4bd9b0 100644 --- a/tinker/tconstruct/client/gui/ToolStationGui.java +++ b/tinker/tconstruct/client/gui/ToolStationGui.java @@ -343,7 +343,7 @@ public class ToolStationGui extends GuiContainer try { outputStream.writeByte(1); - outputStream.writeInt(logic.worldObj.getWorldInfo().getDimension()); + outputStream.writeInt(logic.worldObj.provider.dimensionId); outputStream.writeInt(logic.xCoord); outputStream.writeInt(logic.yCoord); outputStream.writeInt(logic.zCoord); diff --git a/tinker/tconstruct/crafting/ToolBuilder.java b/tinker/tconstruct/crafting/ToolBuilder.java index 140560b6..a0efece4 100644 --- a/tinker/tconstruct/crafting/ToolBuilder.java +++ b/tinker/tconstruct/crafting/ToolBuilder.java @@ -60,7 +60,7 @@ public class ToolBuilder //System.out.println("Tool name: "+item.getToolName()); int head = headStack.getItemDamage(); - System.out.println("Head:"+head); + //System.out.println("Head:"+head); int handle = handleStack.getItemDamage(); int accessory = -1; if (accessoryStack != null) diff --git a/tinker/tconstruct/entity/EntityWagon.java b/tinker/tconstruct/entity/EntityWagon.java new file mode 100644 index 00000000..28d1ab1a --- /dev/null +++ b/tinker/tconstruct/entity/EntityWagon.java @@ -0,0 +1,1492 @@ +package tinker.tconstruct.entity; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockRail; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.monster.EntityIronGolem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.IMinecartCollisionHandler; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.minecart.MinecartCollisionEvent; +import net.minecraftforge.event.entity.minecart.MinecartInteractEvent; +import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class EntityWagon extends Entity implements IInventory +{ + /** Array of item stacks stored in minecart (for storage minecarts). */ + protected ItemStack[] cargoItems; + protected int fuel; + protected boolean field_70499_f; + + /** The type of minecart, 2 for powered, 1 for storage. */ + public int minecartType; + public double pushX; + public double pushZ; + protected boolean field_82345_h; + + /** Minecart rotational logic matrix */ + protected static final int[][][] matrix = new int[][][] {{{0, 0, -1}, {0, 0, 1}}, {{ -1, 0, 0}, {1, 0, 0}}, {{ -1, -1, 0}, {1, 0, 0}}, {{ -1, 0, 0}, {1, -1, 0}}, {{0, 0, -1}, {0, -1, 1}}, {{0, -1, -1}, {0, 0, 1}}, {{0, 0, 1}, {1, 0, 0}}, {{0, 0, 1}, { -1, 0, 0}}, {{0, 0, -1}, { -1, 0, 0}}, {{0, 0, -1}, {1, 0, 0}}}; + + /** appears to be the progress of the turn */ + protected int turnProgress; + protected double minecartX; + protected double minecartY; + protected double minecartZ; + protected double minecartYaw; + protected double minecartPitch; + @SideOnly(Side.CLIENT) + protected double velocityX; + @SideOnly(Side.CLIENT) + protected double velocityY; + @SideOnly(Side.CLIENT) + protected double velocityZ; + + /* Forge: Minecart Compatibility Layer Integration. */ + public static float defaultMaxSpeedRail = 0.4f; + public static float defaultMaxSpeedGround = 0.4f; + public static float defaultMaxSpeedAirLateral = 0.4f; + public static float defaultMaxSpeedAirVertical = -1f; + public static double defaultDragRidden = 0.996999979019165D; + public static double defaultDragEmpty = 0.9599999785423279D; + public static double defaultDragAir = 0.94999998807907104D; + protected boolean canUseRail = true; + protected boolean canBePushed = true; + private static IMinecartCollisionHandler collisionHandler = null; + + /* Instance versions of the above physics properties */ + protected float maxSpeedRail; + protected float maxSpeedGround; + protected float maxSpeedAirLateral; + protected float maxSpeedAirVertical; + protected double dragAir; + + public EntityWagon(World par1World) + { + super(par1World); + this.cargoItems = new ItemStack[36]; + this.fuel = 0; + this.field_70499_f = false; + this.field_82345_h = true; + this.preventEntitySpawning = true; + this.setSize(0.98F, 0.7F); + this.yOffset = this.height / 2.0F; + + maxSpeedRail = defaultMaxSpeedRail; + maxSpeedGround = defaultMaxSpeedGround; + maxSpeedAirLateral = defaultMaxSpeedAirLateral; + maxSpeedAirVertical = defaultMaxSpeedAirVertical; + dragAir = defaultDragAir; + } + + public EntityWagon(World world, int type) + { + this(world); + minecartType = type; + } + + /** + * returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to + * prevent them from trampling crops + */ + protected boolean canTriggerWalking() + { + return false; + } + + protected void entityInit() + { + this.dataWatcher.addObject(16, new Byte((byte)0)); + this.dataWatcher.addObject(17, new Integer(0)); + this.dataWatcher.addObject(18, new Integer(1)); + this.dataWatcher.addObject(19, new Integer(0)); + } + + /** + * Returns a boundingBox used to collide the entity with other entities and blocks. This enables the entity to be + * pushable on contact, like boats or minecarts. + */ + public AxisAlignedBB getCollisionBox(Entity par1Entity) + { + return par1Entity.boundingBox; + } + + /** + * returns the bounding box for this entity + */ + public AxisAlignedBB getBoundingBox() + { + return this.boundingBox; + } + + /** + * Returns true if this entity should push and be pushed by other entities when colliding. + */ + public boolean canBePushed() + { + return canBePushed; + } + + public EntityWagon(World par1World, double par2, double par4, double par6, int par8) + { + this(par1World); + this.setPosition(par2, par4 + (double)this.yOffset, par6); + this.motionX = 0.0D; + this.motionY = 0.0D; + this.motionZ = 0.0D; + this.prevPosX = par2; + this.prevPosY = par4; + this.prevPosZ = par6; + this.minecartType = par8; + } + + /** + * Returns the Y offset from the entity's position for any entity riding this one. + */ + public double getMountedYOffset() + { + return (double)this.height * 0.0D - 0.30000001192092896D; + } + + /** + * Called when the entity is attacked. + */ + public boolean attackEntityFrom(DamageSource par1DamageSource, int par2) + { + if (!this.worldObj.isRemote && !this.isDead) + { + if (this.isEntityInvulnerable()) + { + return false; + } + else + { + this.func_70494_i(-this.func_70493_k()); + this.func_70497_h(10); + this.setBeenAttacked(); + this.setDamage(this.getDamage() + par2 * 10); + + if (par1DamageSource.getEntity() instanceof EntityPlayer && ((EntityPlayer)par1DamageSource.getEntity()).capabilities.isCreativeMode) + { + this.setDamage(100); + } + + if (this.getDamage() > 40) + { + if (this.riddenByEntity != null) + { + this.riddenByEntity.mountEntity(this); + } + + this.setDead(); + dropCartAsItem(); + } + + return true; + } + } + else + { + return true; + } + } + + @SideOnly(Side.CLIENT) + + /** + * Setups the entity to do the hurt animation. Only used by packets in multiplayer. + */ + public void performHurtAnimation() + { + this.func_70494_i(-this.func_70493_k()); + this.func_70497_h(10); + this.setDamage(this.getDamage() + this.getDamage() * 10); + } + + /** + * Returns true if other Entities should be prevented from moving through this Entity. + */ + public boolean canBeCollidedWith() + { + return !this.isDead; + } + + /** + * Will get destroyed next tick. + */ + public void setDead() + { + if (this.field_82345_h) + { + for (int var1 = 0; var1 < this.getSizeInventory(); ++var1) + { + ItemStack var2 = this.getStackInSlot(var1); + + if (var2 != null) + { + float var3 = this.rand.nextFloat() * 0.8F + 0.1F; + float var4 = this.rand.nextFloat() * 0.8F + 0.1F; + float var5 = this.rand.nextFloat() * 0.8F + 0.1F; + + while (var2.stackSize > 0) + { + int var6 = this.rand.nextInt(21) + 10; + + if (var6 > var2.stackSize) + { + var6 = var2.stackSize; + } + + var2.stackSize -= var6; + EntityItem var7 = new EntityItem(this.worldObj, this.posX + (double)var3, this.posY + (double)var4, this.posZ + (double)var5, new ItemStack(var2.itemID, var6, var2.getItemDamage())); + + if (var2.hasTagCompound()) + { + var7.func_92014_d().setTagCompound((NBTTagCompound)var2.getTagCompound().copy()); + } + + float var8 = 0.05F; + var7.motionX = (double)((float)this.rand.nextGaussian() * var8); + var7.motionY = (double)((float)this.rand.nextGaussian() * var8 + 0.2F); + var7.motionZ = (double)((float)this.rand.nextGaussian() * var8); + this.worldObj.spawnEntityInWorld(var7); + } + } + } + } + + super.setDead(); + } + + /** + * Teleports the entity to another dimension. Params: Dimension number to teleport to + */ + public void travelToDimension(int par1) + { + this.field_82345_h = false; + super.travelToDimension(par1); + } + + /** + * Called to update the entity's position/logic. + */ + public void onUpdate() + { + + if (this.func_70496_j() > 0) + { + this.func_70497_h(this.func_70496_j() - 1); + } + + if (this.getDamage() > 0) + { + this.setDamage(this.getDamage() - 1); + } + + if (this.posY < -64.0D) + { + this.kill(); + } + + if (this.isMinecartPowered() && this.rand.nextInt(4) == 0 && minecartType == 2 && getClass() == EntityWagon.class) + { + this.worldObj.spawnParticle("largesmoke", this.posX, this.posY + 0.8D, this.posZ, 0.0D, 0.0D, 0.0D); + } + + int var2; + + if (!this.worldObj.isRemote && this.worldObj instanceof WorldServer) + { + this.worldObj.theProfiler.startSection("portal"); + MinecraftServer var1 = ((WorldServer)this.worldObj).getMinecraftServer(); + var2 = this.getMaxInPortalTime(); + + if (this.inPortal) + { + if (var1.getAllowNether()) + { + if (this.ridingEntity == null && this.field_82153_h++ >= var2) + { + this.field_82153_h = var2; + this.timeUntilPortal = this.getPortalCooldown(); + byte var3; + + if (this.worldObj.provider.dimensionId == -1) + { + var3 = 0; + } + else + { + var3 = -1; + } + + this.travelToDimension(var3); + } + + this.inPortal = false; + } + } + else + { + if (this.field_82153_h > 0) + { + this.field_82153_h -= 4; + } + + if (this.field_82153_h < 0) + { + this.field_82153_h = 0; + } + } + + if (this.timeUntilPortal > 0) + { + --this.timeUntilPortal; + } + + this.worldObj.theProfiler.endSection(); + } + + if (this.worldObj.isRemote) + { + if (this.turnProgress > 0) + { + double var46 = this.posX + (this.minecartX - this.posX) / (double)this.turnProgress; + double var48 = this.posY + (this.minecartY - this.posY) / (double)this.turnProgress; + double var5 = this.posZ + (this.minecartZ - this.posZ) / (double)this.turnProgress; + double var7 = MathHelper.wrapAngleTo180_double(this.minecartYaw - (double)this.rotationYaw); + this.rotationYaw = (float)((double)this.rotationYaw + var7 / (double)this.turnProgress); + this.rotationPitch = (float)((double)this.rotationPitch + (this.minecartPitch - (double)this.rotationPitch) / (double)this.turnProgress); + --this.turnProgress; + this.setPosition(var46, var48, var5); + this.setRotation(this.rotationYaw, this.rotationPitch); + } + else + { + this.setPosition(this.posX, this.posY, this.posZ); + this.setRotation(this.rotationYaw, this.rotationPitch); + } + } + else + { + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + this.motionY -= 0.03999999910593033D; + int var45 = MathHelper.floor_double(this.posX); + var2 = MathHelper.floor_double(this.posY); + int var47 = MathHelper.floor_double(this.posZ); + + if (BlockRail.isRailBlockAt(this.worldObj, var45, var2 - 1, var47)) + { + --var2; + } + + double var4 = 0.4D; + double var6 = 0.0078125D; + int var8 = this.worldObj.getBlockId(var45, var2, var47); + + /*if (canUseRail() && BlockRail.isRailBlock(var8)) + { + this.fallDistance = 0.0F; + Vec3 var9 = this.func_70489_a(this.posX, this.posY, this.posZ); + int var10 = ((BlockRail)Block.blocksList[var8]).getBasicRailMetadata(worldObj, this, var45, var2, var47); + this.posY = (double)var2; + boolean var11 = false; + boolean var12 = false; + + if (var8 == Block.railPowered.blockID) + { + var11 = (worldObj.getBlockMetadata(var45, var2, var47) & 8) != 0; + var12 = !var11; + } + + if (((BlockRail)Block.blocksList[var8]).isPowered()) + { + var10 &= 7; + } + + if (var10 >= 2 && var10 <= 5) + { + this.posY = (double)(var2 + 1); + } + + adjustSlopeVelocities(var10); + + int[][] var13 = matrix[var10]; + double var14 = (double)(var13[1][0] - var13[0][0]); + double var16 = (double)(var13[1][2] - var13[0][2]); + double var18 = Math.sqrt(var14 * var14 + var16 * var16); + double var20 = this.motionX * var14 + this.motionZ * var16; + + if (var20 < 0.0D) + { + var14 = -var14; + var16 = -var16; + } + + double var22 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.motionX = var22 * var14 / var18; + this.motionZ = var22 * var16 / var18; + double var24; + double var26; + + if (this.riddenByEntity != null) + { + var24 = this.riddenByEntity.motionX * this.riddenByEntity.motionX + this.riddenByEntity.motionZ * this.riddenByEntity.motionZ; + var26 = this.motionX * this.motionX + this.motionZ * this.motionZ; + + if (var24 > 1.0E-4D && var26 < 0.01D) + { + this.motionX += this.riddenByEntity.motionX * 0.1D; + this.motionZ += this.riddenByEntity.motionZ * 0.1D; + var12 = false; + } + } + + if (var12 && shouldDoRailFunctions()) + { + var24 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); + + if (var24 < 0.03D) + { + this.motionX *= 0.0D; + this.motionY *= 0.0D; + this.motionZ *= 0.0D; + } + else + { + this.motionX *= 0.5D; + this.motionY *= 0.0D; + this.motionZ *= 0.5D; + } + } + + var24 = 0.0D; + var26 = (double)var45 + 0.5D + (double)var13[0][0] * 0.5D; + double var28 = (double)var47 + 0.5D + (double)var13[0][2] * 0.5D; + double var30 = (double)var45 + 0.5D + (double)var13[1][0] * 0.5D; + double var32 = (double)var47 + 0.5D + (double)var13[1][2] * 0.5D; + var14 = var30 - var26; + var16 = var32 - var28; + double var34; + double var36; + + if (var14 == 0.0D) + { + this.posX = (double)var45 + 0.5D; + var24 = this.posZ - (double)var47; + } + else if (var16 == 0.0D) + { + this.posZ = (double)var47 + 0.5D; + var24 = this.posX - (double)var45; + } + else + { + var34 = this.posX - var26; + var36 = this.posZ - var28; + var24 = (var34 * var14 + var36 * var16) * 2.0D; + } + + this.posX = var26 + var14 * var24; + this.posZ = var28 + var16 * var24; + this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ); + + moveMinecartOnRail(var45, var2, var47); + + if (var13[0][1] != 0 && MathHelper.floor_double(this.posX) - var45 == var13[0][0] && MathHelper.floor_double(this.posZ) - var47 == var13[0][2]) + { + this.setPosition(this.posX, this.posY + (double)var13[0][1], this.posZ); + } + else if (var13[1][1] != 0 && MathHelper.floor_double(this.posX) - var45 == var13[1][0] && MathHelper.floor_double(this.posZ) - var47 == var13[1][2]) + { + this.setPosition(this.posX, this.posY + (double)var13[1][1], this.posZ); + } + + applyDragAndPushForces(); + + Vec3 var54 = this.func_70489_a(this.posX, this.posY, this.posZ); + + if (var54 != null && var9 != null) + { + double var39 = (var9.yCoord - var54.yCoord) * 0.05D; + var22 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); + + if (var22 > 0.0D) + { + this.motionX = this.motionX / var22 * (var22 + var39); + this.motionZ = this.motionZ / var22 * (var22 + var39); + } + + this.setPosition(this.posX, var54.yCoord, this.posZ); + } + + int var53 = MathHelper.floor_double(this.posX); + int var55 = MathHelper.floor_double(this.posZ); + + if (var53 != var45 || var55 != var47) + { + var22 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.motionX = var22 * (double)(var53 - var45); + this.motionZ = var22 * (double)(var55 - var47); + } + + double var41; + + updatePushForces(); + + if(shouldDoRailFunctions()) + { + ((BlockRail)Block.blocksList[var8]).onMinecartPass(worldObj, this, var45, var2, var47); + } + + if (var11 && shouldDoRailFunctions()) + { + var41 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); + + if (var41 > 0.01D) + { + double var43 = 0.06D; + this.motionX += this.motionX / var41 * var43; + this.motionZ += this.motionZ / var41 * var43; + } + else if (var10 == 1) + { + if (this.worldObj.isBlockNormalCube(var45 - 1, var2, var47)) + { + this.motionX = 0.02D; + } + else if (this.worldObj.isBlockNormalCube(var45 + 1, var2, var47)) + { + this.motionX = -0.02D; + } + } + else if (var10 == 0) + { + if (this.worldObj.isBlockNormalCube(var45, var2, var47 - 1)) + { + this.motionZ = 0.02D; + } + else if (this.worldObj.isBlockNormalCube(var45, var2, var47 + 1)) + { + this.motionZ = -0.02D; + } + } + } + }*/ + moveMinecartOffRail(var45, var2, var47); + + this.doBlockCollisions(); + this.rotationPitch = 0.0F; + double var49 = this.prevPosX - this.posX; + double var50 = this.prevPosZ - this.posZ; + + if (var49 * var49 + var50 * var50 > 0.001D) + { + this.rotationYaw = (float)(Math.atan2(var50, var49) * 180.0D / Math.PI); + + if (this.field_70499_f) + { + this.rotationYaw += 180.0F; + } + } + + double var51 = (double)MathHelper.wrapAngleTo180_float(this.rotationYaw - this.prevRotationYaw); + + if (var51 < -170.0D || var51 >= 170.0D) + { + this.rotationYaw += 180.0F; + this.field_70499_f = !this.field_70499_f; + } + + this.setRotation(this.rotationYaw, this.rotationPitch); + + AxisAlignedBB box = boundingBox.expand(0.2D, 0.0D, 0.2D); + + List var15 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, box); + + if (var15 != null && !var15.isEmpty()) + { + for (int var52 = 0; var52 < var15.size(); ++var52) + { + Entity var17 = (Entity)var15.get(var52); + + if (var17 != this.riddenByEntity && var17.canBePushed() && var17 instanceof EntityWagon) + { + var17.applyEntityCollision(this); + } + } + } + + if (this.riddenByEntity != null && this.riddenByEntity.isDead) + { + if (this.riddenByEntity.ridingEntity == this) + { + this.riddenByEntity.ridingEntity = null; + } + + this.riddenByEntity = null; + } + + updateFuel(); + } + } + + @SideOnly(Side.CLIENT) + public Vec3 func_70495_a(double par1, double par3, double par5, double par7) + { + int var9 = MathHelper.floor_double(par1); + int var10 = MathHelper.floor_double(par3); + int var11 = MathHelper.floor_double(par5); + + if (BlockRail.isRailBlockAt(this.worldObj, var9, var10 - 1, var11)) + { + --var10; + } + + int var12 = this.worldObj.getBlockId(var9, var10, var11); + + return null; + } + + public Vec3 func_70489_a(double par1, double par3, double par5) + { + int var7 = MathHelper.floor_double(par1); + int var8 = MathHelper.floor_double(par3); + int var9 = MathHelper.floor_double(par5); + + if (BlockRail.isRailBlockAt(this.worldObj, var7, var8 - 1, var9)) + { + --var8; + } + + int var10 = this.worldObj.getBlockId(var7, var8, var9); + + if (BlockRail.isRailBlock(var10)) + { + int var11 = 0; + par3 = (double)var8; + + if (var11 >= 2 && var11 <= 5) + { + par3 = (double)(var8 + 1); + } + + int[][] var12 = matrix[var11]; + double var13 = 0.0D; + double var15 = (double)var7 + 0.5D + (double)var12[0][0] * 0.5D; + double var17 = (double)var8 + 0.5D + (double)var12[0][1] * 0.5D; + double var19 = (double)var9 + 0.5D + (double)var12[0][2] * 0.5D; + double var21 = (double)var7 + 0.5D + (double)var12[1][0] * 0.5D; + double var23 = (double)var8 + 0.5D + (double)var12[1][1] * 0.5D; + double var25 = (double)var9 + 0.5D + (double)var12[1][2] * 0.5D; + double var27 = var21 - var15; + double var29 = (var23 - var17) * 2.0D; + double var31 = var25 - var19; + + if (var27 == 0.0D) + { + par1 = (double)var7 + 0.5D; + var13 = par5 - (double)var9; + } + else if (var31 == 0.0D) + { + par5 = (double)var9 + 0.5D; + var13 = par1 - (double)var7; + } + else + { + double var33 = par1 - var15; + double var35 = par5 - var19; + var13 = (var33 * var27 + var35 * var31) * 2.0D; + } + + par1 = var15 + var27 * var13; + par3 = var17 + var29 * var13; + par5 = var19 + var31 * var13; + + if (var29 < 0.0D) + { + ++par3; + } + + if (var29 > 0.0D) + { + par3 += 0.5D; + } + + return this.worldObj.getWorldVec3Pool().getVecFromPool(par1, par3, par5); + } + else + { + return null; + } + } + + /** + * (abstract) Protected helper method to write subclass entity data to NBT. + */ + protected void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) + { + par1NBTTagCompound.setInteger("Type", this.minecartType); + + if (isPoweredCart()) + { + par1NBTTagCompound.setDouble("PushX", this.pushX); + par1NBTTagCompound.setDouble("PushZ", this.pushZ); + par1NBTTagCompound.setInteger("Fuel", this.fuel); + } + + if (getSizeInventory() > 0) + { + NBTTagList var2 = new NBTTagList(); + + for (int var3 = 0; var3 < this.cargoItems.length; ++var3) + { + if (this.cargoItems[var3] != null) + { + NBTTagCompound var4 = new NBTTagCompound(); + var4.setByte("Slot", (byte)var3); + this.cargoItems[var3].writeToNBT(var4); + var2.appendTag(var4); + } + } + + par1NBTTagCompound.setTag("Items", var2); + } + } + + /** + * (abstract) Protected helper method to read subclass entity data from NBT. + */ + protected void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) + { + this.minecartType = par1NBTTagCompound.getInteger("Type"); + + if (isPoweredCart()) + { + this.pushX = par1NBTTagCompound.getDouble("PushX"); + this.pushZ = par1NBTTagCompound.getDouble("PushZ"); + try + { + this.fuel = par1NBTTagCompound.getInteger("Fuel"); + } + catch (ClassCastException e) + { + this.fuel = par1NBTTagCompound.getShort("Fuel"); + } + } + + if (getSizeInventory() > 0) + { + NBTTagList var2 = par1NBTTagCompound.getTagList("Items"); + this.cargoItems = new ItemStack[this.getSizeInventory()]; + + for (int var3 = 0; var3 < var2.tagCount(); ++var3) + { + NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3); + int var5 = var4.getByte("Slot") & 255; + + if (var5 >= 0 && var5 < this.cargoItems.length) + { + this.cargoItems[var5] = ItemStack.loadItemStackFromNBT(var4); + } + } + } + } + + @SideOnly(Side.CLIENT) + public float getShadowSize() + { + return 0.0F; + } + + /** + * Applies a velocity to each of the entities pushing them away from each other. Args: entity + */ + public void applyEntityCollision(Entity par1Entity) + { + if (!this.worldObj.isRemote) + { + if (par1Entity != this.riddenByEntity) + { + if (par1Entity instanceof EntityLiving && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && canBeRidden() && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) + { + par1Entity.mountEntity(this); + } + + double var2 = par1Entity.posX - this.posX; + double var4 = par1Entity.posZ - this.posZ; + double var6 = var2 * var2 + var4 * var4; + + if (var6 >= 9.999999747378752E-5D) + { + var6 = (double)MathHelper.sqrt_double(var6); + var2 /= var6; + var4 /= var6; + double var8 = 1.0D / var6; + + if (var8 > 1.0D) + { + var8 = 1.0D; + } + + var2 *= var8; + var4 *= var8; + var2 *= 0.10000000149011612D; + var4 *= 0.10000000149011612D; + var2 *= (double)(1.0F - this.entityCollisionReduction); + var4 *= (double)(1.0F - this.entityCollisionReduction); + var2 *= 0.5D; + var4 *= 0.5D; + + if (par1Entity instanceof EntityWagon) + { + double var10 = par1Entity.posX - this.posX; + double var12 = par1Entity.posZ - this.posZ; + Vec3 var14 = this.worldObj.getWorldVec3Pool().getVecFromPool(var10, 0.0D, var12).normalize(); + Vec3 var15 = this.worldObj.getWorldVec3Pool().getVecFromPool((double)MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F), 0.0D, (double)MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F)).normalize(); + double var16 = Math.abs(var14.dotProduct(var15)); + + if (var16 < 0.800000011920929D) + { + return; + } + + double var18 = par1Entity.motionX + this.motionX; + double var20 = par1Entity.motionZ + this.motionZ; + + if (((EntityWagon)par1Entity).isPoweredCart() && !isPoweredCart()) + { + this.motionX *= 0.20000000298023224D; + this.motionZ *= 0.20000000298023224D; + this.addVelocity(par1Entity.motionX - var2, 0.0D, par1Entity.motionZ - var4); + par1Entity.motionX *= 0.949999988079071D; + par1Entity.motionZ *= 0.949999988079071D; + } + else if (!((EntityWagon)par1Entity).isPoweredCart() && isPoweredCart()) + { + par1Entity.motionX *= 0.20000000298023224D; + par1Entity.motionZ *= 0.20000000298023224D; + par1Entity.addVelocity(this.motionX + var2, 0.0D, this.motionZ + var4); + this.motionX *= 0.949999988079071D; + this.motionZ *= 0.949999988079071D; + } + else + { + var18 /= 2.0D; + var20 /= 2.0D; + this.motionX *= 0.20000000298023224D; + this.motionZ *= 0.20000000298023224D; + this.addVelocity(var18 - var2, 0.0D, var20 - var4); + par1Entity.motionX *= 0.20000000298023224D; + par1Entity.motionZ *= 0.20000000298023224D; + par1Entity.addVelocity(var18 + var2, 0.0D, var20 + var4); + } + } + else + { + this.addVelocity(-var2, 0.0D, -var4); + par1Entity.addVelocity(var2 / 4.0D, 0.0D, var4 / 4.0D); + } + } + } + } + } + + /** + * Returns the number of slots in the inventory. + */ + public int getSizeInventory() + { + return (minecartType == 1 && getClass() == EntityWagon.class ? 27 : 0); + } + + /** + * Returns the stack in slot i + */ + public ItemStack getStackInSlot(int par1) + { + return this.cargoItems[par1]; + } + + /** + * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a + * new stack. + */ + public ItemStack decrStackSize(int par1, int par2) + { + if (this.cargoItems[par1] != null) + { + ItemStack var3; + + if (this.cargoItems[par1].stackSize <= par2) + { + var3 = this.cargoItems[par1]; + this.cargoItems[par1] = null; + return var3; + } + else + { + var3 = this.cargoItems[par1].splitStack(par2); + + if (this.cargoItems[par1].stackSize == 0) + { + this.cargoItems[par1] = null; + } + + return var3; + } + } + else + { + return null; + } + } + + /** + * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - + * like when you close a workbench GUI. + */ + public ItemStack getStackInSlotOnClosing(int par1) + { + if (this.cargoItems[par1] != null) + { + ItemStack var2 = this.cargoItems[par1]; + this.cargoItems[par1] = null; + return var2; + } + else + { + return null; + } + } + + /** + * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). + */ + public void setInventorySlotContents(int par1, ItemStack par2ItemStack) + { + this.cargoItems[par1] = par2ItemStack; + + if (par2ItemStack != null && par2ItemStack.stackSize > this.getInventoryStackLimit()) + { + par2ItemStack.stackSize = this.getInventoryStackLimit(); + } + } + + /** + * Returns the name of the inventory. + */ + public String getInvName() + { + return "container.minecart"; + } + + /** + * Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. *Isn't + * this more of a set than a get?* + */ + public int getInventoryStackLimit() + { + return 64; + } + + /** + * Called when an the contents of an Inventory change, usually + */ + public void onInventoryChanged() {} + + /** + * Called when a player interacts with a mob. e.g. gets milk from a cow, gets into the saddle on a pig. + */ + public boolean interact(EntityPlayer par1EntityPlayer) + { + + if (canBeRidden()) + { + if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != par1EntityPlayer) + { + return true; + } + + if (!this.worldObj.isRemote) + { + par1EntityPlayer.mountEntity(this); + } + } + else if (getSizeInventory() > 0) + { + if (!this.worldObj.isRemote) + { + par1EntityPlayer.displayGUIChest(this); + } + } + else if (this.minecartType == 2 && getClass() == EntityWagon.class) + { + ItemStack var2 = par1EntityPlayer.inventory.getCurrentItem(); + + if (var2 != null && var2.itemID == Item.coal.itemID) + { + if (--var2.stackSize == 0) + { + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack)null); + } + + this.fuel += 3600; + } + + this.pushX = this.posX - par1EntityPlayer.posX; + this.pushZ = this.posZ - par1EntityPlayer.posZ; + } + + return true; + } + + @SideOnly(Side.CLIENT) + + /** + * Sets the position and rotation. Only difference from the other one is no bounding on the rotation. Args: posX, + * posY, posZ, yaw, pitch + */ + public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) + { + this.minecartX = par1; + this.minecartY = par3; + this.minecartZ = par5; + this.minecartYaw = (double)par7; + this.minecartPitch = (double)par8; + this.turnProgress = par9 + 2; + this.motionX = this.velocityX; + this.motionY = this.velocityY; + this.motionZ = this.velocityZ; + } + + @SideOnly(Side.CLIENT) + + /** + * Sets the velocity to the args. Args: x, y, z + */ + public void setVelocity(double par1, double par3, double par5) + { + this.velocityX = this.motionX = par1; + this.velocityY = this.motionY = par3; + this.velocityZ = this.motionZ = par5; + } + + /** + * Do not make give this method the name canInteractWith because it clashes with Container + */ + public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) + { + return this.isDead ? false : par1EntityPlayer.getDistanceSqToEntity(this) <= 64.0D; + } + + /** + * Is this minecart powered (Fuel > 0) + */ + public boolean isMinecartPowered() + { + return (this.dataWatcher.getWatchableObjectByte(16) & 1) != 0; + } + + /** + * Set if this minecart is powered (Fuel > 0) + */ + protected void setMinecartPowered(boolean par1) + { + if (par1) + { + this.dataWatcher.updateObject(16, Byte.valueOf((byte)(this.dataWatcher.getWatchableObjectByte(16) | 1))); + } + else + { + this.dataWatcher.updateObject(16, Byte.valueOf((byte)(this.dataWatcher.getWatchableObjectByte(16) & -2))); + } + } + + public void openChest() {} + + public void closeChest() {} + + /** + * Sets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over + * 40. + */ + public void setDamage(int par1) + { + this.dataWatcher.updateObject(19, Integer.valueOf(par1)); + } + + /** + * Gets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over + * 40. + */ + public int getDamage() + { + return this.dataWatcher.getWatchableObjectInt(19); + } + + public void func_70497_h(int par1) + { + this.dataWatcher.updateObject(17, Integer.valueOf(par1)); + } + + public int func_70496_j() + { + return this.dataWatcher.getWatchableObjectInt(17); + } + + public void func_70494_i(int par1) + { + this.dataWatcher.updateObject(18, Integer.valueOf(par1)); + } + + public int func_70493_k() + { + return this.dataWatcher.getWatchableObjectInt(18); + } + + /** + * Drops the cart as a item. The exact item dropped is defined by getItemDropped(). + */ + public void dropCartAsItem() + { + for(ItemStack item : getItemsDropped()) + { + entityDropItem(item, 0); + } + } + + /** + * Override this to define which items your cart drops when broken. + * This does not include items contained in the inventory, + * that is handled elsewhere. + * @return A list of items dropped. + */ + public List getItemsDropped() + { + List items = new ArrayList(); + items.add(new ItemStack(Item.minecartEmpty)); + + switch(minecartType) + { + case 1: + items.add(new ItemStack(Block.chest)); + break; + case 2: + items.add(new ItemStack(Block.stoneOvenIdle)); + break; + } + return items; + } + + /** + * This function returns an ItemStack that represents this cart. + * This should be an ItemStack that can be used by the player to place the cart. + * This is the item that was registered with the cart via the registerMinecart function, + * but is not necessary the item the cart drops when destroyed. + * @return An ItemStack that can be used to place the cart. + */ + public ItemStack getCartItem() + { + return null; + //return MinecartRegistry.getItemForCart(this); + } + + /** + * Returns true if this cart is self propelled. + * @return True if powered. + */ + public boolean isPoweredCart() + { + return minecartType == 2 && getClass() == EntityWagon.class; + } + + /** + * Returns true if this cart is a storage cart + * Some carts may have inventories but not be storage carts + * and some carts without inventories may be storage carts. + * @return True if this cart should be classified as a storage cart. + */ + public boolean isStorageCart() + { + return minecartType == 1 && getClass() == EntityWagon.class; + } + + /** + * Returns true if this cart can be ridden by an Entity. + * @return True if this cart can be ridden. + */ + public boolean canBeRidden() + { + if(minecartType == 0 && getClass() == EntityWagon.class) + { + return true; + } + return false; + } + + /** + * Returns true if this cart can currently use rails. + * This function is mainly used to gracefully detach a minecart from a rail. + * @return True if the minecart can use rails. + */ + public boolean canUseRail() + { + return canUseRail; + } + + /** + * Set whether the minecart can use rails. + * This function is mainly used to gracefully detach a minecart from a rail. + * @param use Whether the minecart can currently use rails. + */ + public void setCanUseRail(boolean use) + { + canUseRail = use; + } + + /** + * Return false if this cart should not call IRail.onMinecartPass() and should ignore Powered Rails. + * @return True if this cart should call IRail.onMinecartPass(). + */ + public boolean shouldDoRailFunctions() + { + return true; + } + + /** + * Simply returns the minecartType variable. + * @return minecartType + */ + public int getMinecartType() + { + return minecartType; + } + + /** + * Carts should return their drag factor here + * @return The drag rate. + */ + protected double getDrag() + { + return riddenByEntity != null ? defaultDragRidden : defaultDragEmpty; + } + + /** + * Moved to allow overrides. + * This code applies drag and updates push forces. + */ + protected void applyDragAndPushForces() + { + if(isPoweredCart()) + { + double d27 = MathHelper.sqrt_double(pushX * pushX + pushZ * pushZ); + if(d27 > 0.01D) + { + pushX /= d27; + pushZ /= d27; + double d29 = 0.04; + motionX *= 0.8D; + motionY *= 0.0D; + motionZ *= 0.8D; + motionX += pushX * d29; + motionZ += pushZ * d29; + } + else + { + motionX *= 0.9D; + motionY *= 0.0D; + motionZ *= 0.9D; + } + } + motionX *= getDrag(); + motionY *= 0.0D; + motionZ *= getDrag(); + } + + /** + * Moved to allow overrides. + * This code updates push forces. + */ + protected void updatePushForces() + { + if(isPoweredCart()) + { + double push = MathHelper.sqrt_double(pushX * pushX + pushZ * pushZ); + if(push > 0.01D && motionX * motionX + motionZ * motionZ > 0.001D) + { + pushX /= push; + pushZ /= push; + if(pushX * motionX + pushZ * motionZ < 0.0D) + { + pushX = 0.0D; + pushZ = 0.0D; + } + else + { + pushX = motionX; + pushZ = motionZ; + } + } + } + } + + /** + * Moved to allow overrides. + * This code handles minecart movement and speed capping when not on a rail. + */ + protected void moveMinecartOffRail(int i, int j, int k) + { + double d2 = getMaxSpeedGround(); + if(!onGround) + { + d2 = getMaxSpeedAirLateral(); + } + if(motionX < -d2) motionX = -d2; + if(motionX > d2) motionX = d2; + if(motionZ < -d2) motionZ = -d2; + if(motionZ > d2) motionZ = d2; + double moveY = motionY; + if(getMaxSpeedAirVertical() > 0 && motionY > getMaxSpeedAirVertical()) + { + moveY = getMaxSpeedAirVertical(); + if(Math.abs(motionX) < 0.3f && Math.abs(motionZ) < 0.3f) + { + moveY = 0.15f; + motionY = moveY; + } + } + if(onGround) + { + motionX *= 0.5D; + motionY *= 0.5D; + motionZ *= 0.5D; + } + moveEntity(motionX, moveY, motionZ); + if(!onGround) + { + motionX *= getDragAir(); + motionY *= getDragAir(); + motionZ *= getDragAir(); + } + } + + /** + * Moved to allow overrides. + * This code applies fuel consumption. + */ + protected void updateFuel() + { + if (fuel > 0) fuel--; + if (fuel <= 0) pushX = pushZ = 0.0D; + setMinecartPowered(fuel > 0); + } + + /** + * Moved to allow overrides, This code handle slopes affecting velocity. + * @param metadata The blocks position metadata + */ + protected void adjustSlopeVelocities(int metadata) + { + double acceleration = 0.0078125D; + if (metadata == 2) + { + motionX -= acceleration; + } + else if (metadata == 3) + { + motionX += acceleration; + } + else if (metadata == 4) + { + motionZ += acceleration; + } + else if (metadata == 5) + { + motionZ -= acceleration; + } + } + + /** + * Getters/setters for physics variables + */ + + /** + * Returns the carts max speed. + * Carts going faster than 1.1 cause issues with chunk loading. + * Carts cant traverse slopes or corners at greater than 0.5 - 0.6. + * This value is compared with the rails max speed to determine + * the carts current max speed. A normal rails max speed is 0.4. + * @return Carts max speed. + */ + public float getMaxSpeedRail() + { + return maxSpeedRail; + } + + public void setMaxSpeedRail(float value) + { + maxSpeedRail = value; + } + + public float getMaxSpeedGround() + { + return maxSpeedGround; + } + + public void setMaxSpeedGround(float value) + { + maxSpeedGround = value; + } + + public float getMaxSpeedAirLateral() + { + return maxSpeedAirLateral; + } + + public void setMaxSpeedAirLateral(float value) + { + maxSpeedAirLateral = value; + } + + public float getMaxSpeedAirVertical() + { + return maxSpeedAirVertical; + } + + public void setMaxSpeedAirVertical(float value) + { + maxSpeedAirVertical = value; + } + + public double getDragAir() + { + return dragAir; + } + + public void setDragAir(double value) + { + dragAir = value; + } +} diff --git a/tinker/tconstruct/logic/FrypanLogic.java b/tinker/tconstruct/logic/FrypanLogic.java index 42619810..d439d852 100644 --- a/tinker/tconstruct/logic/FrypanLogic.java +++ b/tinker/tconstruct/logic/FrypanLogic.java @@ -133,11 +133,11 @@ public class FrypanLogic extends EquipLogic public void cookItems () { - System.out.println("Trying to cook"); + //System.out.println("Trying to cook"); if (!canCook()) return; - System.out.println("Can cook"); + //System.out.println("Can cook"); for (int id = 2; id < 10; id++) //Check every slot { if (canCook()) diff --git a/tinker/tconstruct/logic/PartCrafterLogic.java b/tinker/tconstruct/logic/PartCrafterLogic.java index f0e0a357..d9a1deff 100644 --- a/tinker/tconstruct/logic/PartCrafterLogic.java +++ b/tinker/tconstruct/logic/PartCrafterLogic.java @@ -44,7 +44,7 @@ public class PartCrafterLogic extends InventoryLogic //return ((PatternHolderLogic) tile).getGuiContainer(player.inventory, world, x, y, z); } } - System.out.println("Regular container"); + //System.out.println("Regular container"); return new PartCrafterContainer(inventoryplayer, this); } @@ -64,7 +64,7 @@ public class PartCrafterLogic extends InventoryLogic int decrease = cost / value; if (cost % value != 0) decrease++; - super.decrStackSize(1, decrease); //Call super to avoid crafting again + super.decrStackSize(2, decrease); //Call super to avoid crafting again } } diff --git a/tinker/tconstruct/logic/PatternShaperLogic.java b/tinker/tconstruct/logic/PatternShaperLogic.java index d1d77cf2..4108e80b 100644 --- a/tinker/tconstruct/logic/PatternShaperLogic.java +++ b/tinker/tconstruct/logic/PatternShaperLogic.java @@ -27,6 +27,14 @@ public class PatternShaperLogic extends InventoryLogic return new PatternShaperContainer(inventoryplayer, this); } + /*@Override + public void onInventoryChanged() + { + if (inventory[0] == null) + inventory[1] = null; + super.onInventoryChanged(); + }*/ + @Override public void setInventorySlotContents(int slot, ItemStack itemstack) { @@ -39,10 +47,13 @@ public class PatternShaperLogic extends InventoryLogic public ItemStack decrStackSize(int slot, int quantity) { if (slot == 1) - { - super.decrStackSize(0, 1); + { if (getStackInSlot(0) != null) - return super.decrStackSize(slot, 0); + { + ItemStack ret = super.decrStackSize(slot, 0); + decrStackSize(0, 1); + return ret; + } } else if (slot == 0) { diff --git a/tinker/tconstruct/modifiers/ModBlaze.java b/tinker/tconstruct/modifiers/ModBlaze.java index b62f9f51..f476b351 100644 --- a/tinker/tconstruct/modifiers/ModBlaze.java +++ b/tinker/tconstruct/modifiers/ModBlaze.java @@ -40,7 +40,7 @@ public class ModBlaze extends ToolMod @Override public void modify (ItemStack[] input, ItemStack tool) { - System.out.println("Moood"); + //System.out.println("Moood"); NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); if (tags.hasKey(key)) { diff --git a/tinker/tconstruct/modifiers/ModBoolean.java b/tinker/tconstruct/modifiers/ModBoolean.java index 7f002c30..fe0bc98b 100644 --- a/tinker/tconstruct/modifiers/ModBoolean.java +++ b/tinker/tconstruct/modifiers/ModBoolean.java @@ -30,7 +30,7 @@ public class ModBoolean extends ToolMod NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); tags.setBoolean(key, true); - System.out.println("Key: "+key+" "+tags.getBoolean(key)); + //System.out.println("Key: "+key+" "+tags.getBoolean(key)); int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; diff --git a/tinker/tconstruct/modifiers/ToolMod.java b/tinker/tconstruct/modifiers/ToolMod.java index c90eef21..109b24ee 100644 --- a/tinker/tconstruct/modifiers/ToolMod.java +++ b/tinker/tconstruct/modifiers/ToolMod.java @@ -98,17 +98,17 @@ public abstract class ToolMod else if (tags.hasKey("Effect2")) { - System.out.println("Adding Effect 3"); + //System.out.println("Adding Effect 3"); tags.setInteger("Effect3", effectIndex); } else if (tags.hasKey("Effect1")) { - System.out.println("Adding Effect 2"); + //System.out.println("Adding Effect 2"); tags.setInteger("Effect2", effectIndex); } else { - System.out.println("Adding Effect 1"); + //System.out.println("Adding Effect 1"); tags.setInteger("Effect1", effectIndex); } } diff --git a/tinker/tconstruct/tools/Broadsword.java b/tinker/tconstruct/tools/Broadsword.java index 9345458f..ca4b3936 100644 --- a/tinker/tconstruct/tools/Broadsword.java +++ b/tinker/tconstruct/tools/Broadsword.java @@ -31,6 +31,6 @@ public class Broadsword extends Weapon public float getDurabilityModifier () { - return 1.3f; + return 1.2f; } } diff --git a/tinker/tconstruct/tools/DualHarvestTool.java b/tinker/tconstruct/tools/DualHarvestTool.java index aba5ebcc..2b0ac0cb 100644 --- a/tinker/tconstruct/tools/DualHarvestTool.java +++ b/tinker/tconstruct/tools/DualHarvestTool.java @@ -44,7 +44,7 @@ public abstract class DualHarvestTool extends HarvestTool ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(new ItemStack(block.idDropped(bID, random, 0), 1, block.damageDropped(meta))); if (result != null) { - System.out.println("Woo~"); + //System.out.println("Woo~"); world.setBlockWithNotify(x, y, z, 0); if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, bID, x, y, z, player); diff --git a/tinker/tconstruct/tools/HarvestTool.java b/tinker/tconstruct/tools/HarvestTool.java index c4d6c18b..43cb9edc 100644 --- a/tinker/tconstruct/tools/HarvestTool.java +++ b/tinker/tconstruct/tools/HarvestTool.java @@ -37,7 +37,7 @@ public abstract class HarvestTool extends ToolCore ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(new ItemStack(block.idDropped(bID, random, 0), 1, block.damageDropped(meta))); if (result != null) { - System.out.println("Woo~"); + //System.out.println("Woo~"); world.setBlockWithNotify(x, y, z, 0); if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, bID, x, y, z, player); diff --git a/tinker/tconstruct/tools/ToolCore.java b/tinker/tconstruct/tools/ToolCore.java index 87e7a277..8ccbf945 100644 --- a/tinker/tconstruct/tools/ToolCore.java +++ b/tinker/tconstruct/tools/ToolCore.java @@ -285,6 +285,10 @@ public abstract class ToolCore extends Item return colorCode + "4"; //Ardite case 13: return colorCode + "5"; //Manyullyn + case 14: + return colorCode + "c"; //Copper + case 15: + return colorCode + "6"; //Bronze } return colorCode; } @@ -319,6 +323,10 @@ public abstract class ToolCore extends Item return ""; //Ardite case 13: return "Awareness"; //Manyullyn + case 14: + return ""; //Copper + case 15: + return ""; //Bronze default: return ""; } @@ -333,17 +341,19 @@ public abstract class ToolCore extends Item return "\u00A73Reinforced II"; else if (head == 3 || handle == 3 || accessory == 3) return "\u00A7fReinforced I"; + else if (head == 15 || handle == 15 || accessory == 15) + return "\u00A76Reinforced I"; return ""; } static String[] toolMaterialNames = { - "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Nethrrack ", "Slime ", "Paper ", "Cobalt ", "Ardite ", "Manyullyn " + "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Nethrrack ", "Slime ", "Paper ", "Cobalt ", "Ardite ", "Manyullyn " , "Copper ", "Bronze " }; /* Creative mode tools */ public void getSubItems (int id, CreativeTabs tab, List list) { - for (int i = 0; i < 13; i++) + for (int i = 0; i < 15; i++) { Item accessory = getAccessoryItem(); ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, i) : null; @@ -369,7 +379,7 @@ public abstract class ToolCore extends Item if (tags.hasKey("Moss")) { int chance = tags.getInteger("Moss"); - if (random.nextInt(200) < chance) + if (random.nextInt(800) < chance) { AbilityHelper.damageTool(stack, -1, (EntityLiving)entity, true); } @@ -392,7 +402,7 @@ public abstract class ToolCore extends Item ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(new ItemStack(block.idDropped(bID, random, 0), 1, block.damageDropped(meta))); if (result != null) { - System.out.println("Woo~"); + //System.out.println("Woo~"); world.setBlockWithNotify(x, y, z, 0); if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, bID, x, y, z, player);