diff --git a/README.md b/README.md index e638a06a..4a4f8ad2 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,21 @@ -Tinkers' Construct - 1.5 +Tinkers' Construct http://www.minecraftforum.net/topic/1659892-tinkers-construct/ Modify all the things, then do it again! Melt down any metals you find. Turn everything into golems! -To compile from source: Set any visibility flags on fields or methods to public. +To compile from source: use apache ant(http://ant.apache.org/bindownload.cgi) +run ant in the tinkers construct directory + +For all issue reporting; please include the following: + * Minecraft Version + * TinkersConstruct Version + * Forge Version + * Versions of any mods related to the issue + * If there is a crash involved, describe how you got it to crash and the forge crash log + * Any relevant screenshots are greatly appreciated. + Most code is public domain under Creative Commons 0: http://creativecommons.org/publicdomain/zero/1.0/ Textures and binaries are licensed under Creative Commons 3: http://creativecommons.org/licenses/by/3.0/ diff --git a/TConstruct_AT.cfg b/TConstruct_AT.cfg index ef595d3c..c713dc46 100644 --- a/TConstruct_AT.cfg +++ b/TConstruct_AT.cfg @@ -1,6 +1,6 @@ # Tinkers Construct -- Access Transformer # Required for Ant build system. -# Last update: Minecraft 1.6.2 (TC git: e0b414ed74f29cbfb6a2732a70bcf5e7d8d82a08) +# Last update: Minecraft 1.6.2 - 2013 Sept 7(TC git: 0a07dfabd007c6436a73dec7ec70e734116895ad) # EntityArrow - Grabbed 'em all, since so much is accessed public ug.a diff --git a/build.xml b/build.xml index 6c58d5d2..d410b6f9 100644 --- a/build.xml +++ b/build.xml @@ -18,7 +18,7 @@ - + @@ -63,9 +63,8 @@ - - - + + diff --git a/capes.txt b/capes.txt index a3a2cd0b..5cc201aa 100644 --- a/capes.txt +++ b/capes.txt @@ -1,5 +1,7 @@ mDiyo:https://dl.dropboxusercontent.com/u/42769935/mCape.png fuj1n:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png +progwml6:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png +_Sunstrike:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png Fudgy_Fetus:https://dl.dropboxusercontent.com/u/27415688/fudgecape.png Vexatos:https://dl.dropboxusercontent.com/u/57704711/Dokumente/Speziell/Minecraft/Public/TCape.png pillbox:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_orange.png diff --git a/mcmod.info b/mcmod.info deleted file mode 100644 index 43ec2214..00000000 --- a/mcmod.info +++ /dev/null @@ -1,20 +0,0 @@ -[ -{ - "modid": "TConstruct", - "name": "Tinkers' Construct", - "description": "A little of this, a little of that, a lot of tinkering, and a lot of tools", - "version": "1.4", - "mcversion": "1.6.2", - "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", - "updateUrl": "", - "authors": [ - "mDiyo", "fuj1n" - ], - "logoFile": "", - "screenshots": [ - ], - "parent":"", - "dependencies": [ - ] -} -] diff --git a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_1_d.png index 51834b3c..44421b94 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_1_r.png index 7096acb9..8b3a057b 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_h.png index 8e845802..637734ee 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_ul.png index 5e157dfd..d6bd1d86 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_v.png index 174fdf7a..ff01b93a 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_3_l.png index 11209f5e..6ca8b5b9 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_3_u.png index afa59e37..f8e7cd59 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/black/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/black/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_1_d.png index 4dba927e..fed627f9 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_1_r.png index 0628bb63..911e2537 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_h.png index 62f48ca4..98860628 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png index 514d0ec7..cc90edd2 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_v.png index d28b2b35..bcd621bf 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_3_l.png index 24b885a2..91060aea 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_3_u.png index 1ca72fc6..62aaedf6 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_1_d.png index 932fc322..3f07bc06 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_1_r.png index e8be00eb..d439ca8c 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_h.png index be5cd766..88f524c2 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png index c4dfea9b..83decd97 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_v.png index f4be2e2b..3ca3a415 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_3_l.png index 1e24a332..f84abf08 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_3_u.png index 20a11a1c..f399e6b9 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png index 282802a6..2791a93f 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png index 58899d7d..fc73bc88 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png index 6c1e76af..fc7d6b95 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png index 82332e62..762b75b5 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png index ae05e56f..5c63c17e 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png index 252dcb36..40d3bd7e 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png index dbd57896..a6946a68 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_1_d.png index a36221ff..e8e5ca5a 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_1_r.png index 2a2282bb..522fdd57 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_h.png index 39843475..da01c149 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png index c4f1d338..03f3ce22 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_v.png index e8c4a23c..53380d57 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_3_l.png index 79d4e8ad..00e7d0be 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_3_u.png index 08d24efc..98b31c61 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_1_d.png index 88e32fc2..bea639e9 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_1_r.png index ff06b16e..4fec4f14 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_h.png index 5363339f..3cb97bda 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_ul.png index 3fde71a5..4f009c9b 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_v.png index efb419b9..70b29ec4 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_3_l.png index 0ad4f56c..42a5c045 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_3_u.png index dcb63c93..17cfc6d5 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/green/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/green/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png index 226c6a6d..3c1628d9 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png index 6feb91ff..c7bbfcb0 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png index 6a172b42..66076397 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png index 6c2057a5..9c39b62f 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png index 658dc221..a97332f3 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png index 18c9c64b..104e83cc 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png index 1dc3f036..cec0b75e 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png index 75e66bd5..5378dd24 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png index 4ed4a4c4..5f0a8cc1 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png index 59158cf3..fbe127b2 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png index 2a723dff..600829dc 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png index 0a677c9e..6c7f3890 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png index 83e0b777..22112080 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png index 988dade5..d1a284ab 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_1_d.png index 683c3d15..2170a736 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_1_r.png index 70cbc11a..5bdc4e94 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_h.png index a884d4c4..0dc02b88 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png index 42f8acb8..9df18b00 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_v.png index 65c77fb4..08f2984b 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_3_l.png index e07a768a..ffce51c6 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_3_u.png index c501379d..340f8e48 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png index cf9da475..534c4dbf 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png index a81b9a3a..1748cf3f 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png index 91e3c762..5f4267ac 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png index e5aa04ca..22fccd91 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png index 50501f89..91b33024 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png index 1dfbf63b..87f0c842 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png index e9e4126d..a1da8cb5 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_1_d.png index 78a96d3d..46d04d94 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_1_r.png index eca01a4a..1287b64a 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_h.png index 3dfca38b..98623365 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png index 96e80a03..71e662e7 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_v.png index b96c8650..e5ce6df7 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_3_l.png index 7b1f3016..615bb61f 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_3_u.png index d4742720..97bc12c6 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_1_d.png index 07d1d87b..8b7469d7 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_1_r.png index 72684b76..1ff82406 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_h.png index 193b0343..c93fa93c 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png index af0ccc20..c41cc36c 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_v.png index 39883a8e..581b05bf 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_3_l.png index 78afde4a..4156134d 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_3_u.png index 6926906f..79d7cb38 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_1_d.png index f213d516..29182f41 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_1_r.png index 3f5cbc4b..01d089ad 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_h.png index 6b1a9b9a..920d089c 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png index 0f986ff2..409596fe 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_v.png index be341cc7..4e3566c2 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_3_l.png index ff21907f..33b54b24 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_3_u.png index bfa706fd..94931adf 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_1_d.png index e316697f..2af2ef99 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_1_r.png index c009e733..da04c5b2 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_h.png index 8fc79b9f..753e12e9 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_ul.png index da9f4f86..f7ff3486 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_v.png index 57e5a19e..50a0dba2 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_3_l.png index a987dec0..b81eb82b 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_3_u.png index 8b4591bd..ae377eaf 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/red/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/red/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_1_d.png index 59ec9b57..5744acc4 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_1_r.png index bd98c8cd..9fb55f40 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_h.png index d6f9f7fc..3a0e7050 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_ul.png index 57811583..1be746c8 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_v.png index 4e3fa4f6..73060e1a 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_3_l.png index dcf80234..4aa2c6ee 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_3_u.png index fa8857c5..dfa965eb 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/white/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/white/glass_3_u.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png index 3970a59e..5c395d99 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png and b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png index 11ea672e..2960bda3 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png and b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png index 8142ab63..8d2c6c17 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png and b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png index 1e813a4f..b3fcd073 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png and b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png index 9b68873a..1026f95d 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png and b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png index cb911b96..196f852b 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png and b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png differ diff --git a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png index 5cd5235d..88d1bc11 100644 Binary files a/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png and b/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png differ diff --git a/resources/mcmod.info b/resources/mcmod.info index 3c282a2b..1f0153be 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -1,21 +1,36 @@ [ -{ - "modid": "TConstruct", - "name": "Tinkers' Construct", - "description": "A little of this, a little of that, a lot of tinkering, and a lot of tools", - "version": "@VERSION@", - "mcversion": "@MCVERSION@", - "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", - "updateUrl": "", - "authors": [ - "mDiyo" - ], - "credits": "mDiyo", - "logoFile": "", - "screenshots": [ - ], - "parent":"", - "dependencies": [ - ] -} + { + "modid": "TConstruct", + "name": "Tinkers' Construct", + "description": "A little of this, a little of that, a lot of tinkering, and a lot of tools", + "version": "@VERSION@", + "mcversion": "@MCVERSION@", + "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", + "updateUrl": "", + "authors": [ + "mDiyo", "fuj1n", "ProgWML6", "Sunstrike" + ], + "credits": "Ecu", + "logoFile": "", + "screenshots": [], + "parent":"", + "dependencies": [] + }, + { + "modid": "TConstruct|CompatMineFactoryReloaded", + "name": "TConstruct Compat: MFR", + "description": "TConstruct support for Minefactory Reloaded", + "version": "@VERSION@", + "mcversion": "@MCVERSION@", + "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", + "updateUrl": "", + "authors": [], + "credits": "", + "logoFile": "", + "screenshots": [], + "parent":"TConstruct", + "dependencies": [ + "TConstruct" + ] + } ] diff --git a/src/biomesoplenty/api/Biomes.java b/src/biomesoplenty/api/Biomes.java new file mode 100644 index 00000000..c63143b0 --- /dev/null +++ b/src/biomesoplenty/api/Biomes.java @@ -0,0 +1,136 @@ +package biomesoplenty.api; + +import java.util.ArrayList; + +import net.minecraft.world.biome.BiomeGenBase; + +import com.google.common.base.Optional; + +public class Biomes +{ + public static Optional alps = Optional.absent(); + public static Optional alpsForest = Optional.absent(); + public static Optional alpsBase = Optional.absent(); + public static Optional arctic = Optional.absent(); + public static Optional badlands = Optional.absent(); + public static Optional bambooForest = Optional.absent(); + public static Optional bayou = Optional.absent(); + + public static Optional beachGravel = Optional.absent(); + public static Optional beachOvergrown = Optional.absent(); + + public static Optional birchForest = Optional.absent(); + public static Optional bog = Optional.absent(); + public static Optional borealForest = Optional.absent(); + public static Optional brushland = Optional.absent(); + public static Optional canyon = Optional.absent(); + public static Optional canyonRavine = Optional.absent(); + public static Optional chaparral = Optional.absent(); + public static Optional cherryBlossomGrove = Optional.absent(); + public static Optional coniferousForest = Optional.absent(); + public static Optional coniferousForestSnow = Optional.absent(); + public static Optional crag = Optional.absent(); + public static Optional deadForest = Optional.absent(); + public static Optional deadForestSnow = Optional.absent(); + public static Optional deadSwamp = Optional.absent(); + public static Optional deadlands = Optional.absent(); + public static Optional deciduousForest = Optional.absent(); + public static Optional dunes = Optional.absent(); + public static Optional fen = Optional.absent(); + public static Optional field = Optional.absent(); + public static Optional fieldForest = Optional.absent(); + public static Optional frostForest = Optional.absent(); + public static Optional fungiForest = Optional.absent(); + public static Optional garden = Optional.absent(); + public static Optional glacier = Optional.absent(); + public static Optional grassland = Optional.absent(); + public static Optional grove = Optional.absent(); + public static Optional heathland = Optional.absent(); + public static Optional highland = Optional.absent(); + public static Optional hotSprings = Optional.absent(); + public static Optional icyHills = Optional.absent(); + public static Optional jadeCliffs = Optional.absent(); + public static Optional lushDesert = Optional.absent(); + public static Optional lushSwamp = Optional.absent(); + public static Optional mangrove = Optional.absent(); + public static Optional mapleWoods = Optional.absent(); + public static Optional marsh = Optional.absent(); + public static Optional meadow = Optional.absent(); + public static Optional meadowForest = Optional.absent(); + public static Optional mesa = Optional.absent(); + public static Optional moor = Optional.absent(); + public static Optional mountain = Optional.absent(); + public static Optional mysticGrove = Optional.absent(); + + public static Optional netherBase = Optional.absent(); + public static Optional netherGarden = Optional.absent(); + public static Optional netherDesert = Optional.absent(); + public static Optional netherLava = Optional.absent(); + public static Optional netherBone = Optional.absent(); + + public static Optional oasis = Optional.absent(); + + public static Optional oceanCoral = Optional.absent(); + public static Optional oceanKelp = Optional.absent(); + + public static Optional ominousWoods = Optional.absent(); + public static Optional ominousWoodsThick = Optional.absent(); + public static Optional orchard = Optional.absent(); + public static Optional originValley = Optional.absent(); + public static Optional outback = Optional.absent(); + public static Optional overgrownGreens = Optional.absent(); + public static Optional pasture = Optional.absent(); + public static Optional pastureMeadow = Optional.absent(); + public static Optional pastureThin = Optional.absent(); + public static Optional polar = Optional.absent(); + public static Optional prairie = Optional.absent(); + + public static Optional promisedLandForest = Optional.absent(); + public static Optional promisedLandPlains = Optional.absent(); + public static Optional promisedLandSwamp = Optional.absent(); + + public static Optional quagmire = Optional.absent(); + public static Optional rainforest = Optional.absent(); + public static Optional redwoodForest = Optional.absent(); + public static Optional sacredSprings = Optional.absent(); + public static Optional savanna = Optional.absent(); + public static Optional savannaPlateau = Optional.absent(); + public static Optional scrubland = Optional.absent(); + public static Optional seasonalForest = Optional.absent(); + public static Optional seasonalSpruceForest = Optional.absent(); + public static Optional shield = Optional.absent(); + public static Optional shore = Optional.absent(); + public static Optional shrubland = Optional.absent(); + public static Optional shrublandForest = Optional.absent(); + public static Optional silkglades = Optional.absent(); + public static Optional sludgepit = Optional.absent(); + public static Optional spruceWoods = Optional.absent(); + public static Optional steppe = Optional.absent(); + public static Optional temperateRainforest = Optional.absent(); + public static Optional thicket = Optional.absent(); + public static Optional timber = Optional.absent(); + public static Optional timberThin = Optional.absent(); + public static Optional tropicalRainforest = Optional.absent(); + public static Optional tropics = Optional.absent(); + public static Optional tundra = Optional.absent(); + public static Optional volcano = Optional.absent(); + public static Optional wasteland = Optional.absent(); + public static Optional wetland = Optional.absent(); + public static Optional woodland = Optional.absent(); + + public static Optional plainsNew = Optional.absent(); + public static Optional desertNew = Optional.absent(); + public static Optional extremeHillsNew = Optional.absent(); + public static Optional forestNew = Optional.absent(); + public static Optional forestHillsNew = Optional.absent(); + public static Optional taigaNew = Optional.absent(); + public static Optional taigaHillsNew = Optional.absent(); + public static Optional swamplandNew = Optional.absent(); + public static Optional jungleNew = Optional.absent(); + public static Optional jungleHillsNew = Optional.absent(); + + /** + * Add any biomes you wish to spawn in the Nether + */ + public static ArrayList netherBiomes = new ArrayList(); +} diff --git a/src/biomesoplenty/api/BlockReferences.java b/src/biomesoplenty/api/BlockReferences.java new file mode 100644 index 00000000..c9461c98 --- /dev/null +++ b/src/biomesoplenty/api/BlockReferences.java @@ -0,0 +1,225 @@ +package biomesoplenty.api; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import com.google.common.base.Optional; + +public class BlockReferences { + + public static enum EnumBlocks + { + acaciaLog (Blocks.logs1, 0), + cherryLog (Blocks.logs1, 1), + darkLog (Blocks.logs1, 2), + firLog (Blocks.logs1, 3), + holyLog (Blocks.logs2, 0), + magicLog (Blocks.logs2, 1), + mangroveLog (Blocks.logs2, 2), + palmLog (Blocks.logs2, 3), + redwoodLog (Blocks.logs3, 0), + willowLog (Blocks.logs3, 1), + deadLog (Blocks.logs3, 2), + bigFlowerStem (Blocks.logs3, 3), + pineLog (Blocks.logs4, 0), + hellBarkLog (Blocks.logs4, 1), + jacarandaLog (Blocks.logs4, 2), + + acaciaPlank (Blocks.planks, 0), + cherryPlank (Blocks.planks, 1), + darkPlank (Blocks.planks, 2), + firPlank (Blocks.planks, 3), + holyPlank (Blocks.planks, 4), + magicPlank (Blocks.planks, 5), + mangrovePlank (Blocks.planks, 6), + palmPlank (Blocks.planks, 7), + redwoodPlank (Blocks.planks, 8), + willowPlank (Blocks.planks, 9), + bambooThatching (Blocks.planks, 10), + pinePlank (Blocks.planks, 11), + hellBarkPlank (Blocks.planks, 12), + jacarandaPlank (Blocks.planks, 13), + + acaciaLeaves (Blocks.leavesColorized, 0), + mangroveLeaves (Blocks.leavesColorized, 1), + palmLeaves (Blocks.leavesColorized, 2), + redwoodLeaves (Blocks.leavesColorized, 3), + willowLeaves (Blocks.leavesColorized, 4), + pineLeaves (Blocks.leavesColorized, 5), + + yellowAutumnLeaves (Blocks.leaves1, 0), + bambooLeaves (Blocks.leaves1, 1), + magicLeaves (Blocks.leaves1, 2), + darkLeaves (Blocks.leaves1, 3), + deadLeaves (Blocks.leaves1, 4), + firLeaves (Blocks.leaves1, 5), + holyLeaves (Blocks.leaves1, 6), + orangeAutumnLeaves (Blocks.leaves1, 7), + originLeaves (Blocks.leaves2, 0), + pinkCherryLeaves (Blocks.leaves2, 1), + mapleLeaves (Blocks.leaves2, 2), + whiteCherryLeaves (Blocks.leaves2, 3), + hellBarkLeaves (Blocks.leaves2, 4), + jacarandaLeaves (Blocks.leaves2, 5), + + appleLeaves (Blocks.leavesFruit, 3), + appleLeavesFruitless (Blocks.leavesFruit, 0), + + bamboo (Blocks.bamboo, 0), + + poisonIvyItem (Blocks.foliage, 7), + sproutItem (Blocks.foliage, 5), + bushItem (Blocks.foliage, 4), + highGrassItem (Blocks.foliage, 3), + mediumGrassItem (Blocks.foliage, 2), + shortGrassItem (Blocks.foliage, 1), + algae (Blocks.foliage, 0), + + holySapling (Blocks.saplings, 7), + magicSapling (Blocks.saplings, 3), + darkSapling (Blocks.saplings, 4), + deadSapling (Blocks.saplings, 5), + acaciaSapling (Blocks.colorizedSaplings, 0), + firSapling (Blocks.saplings, 6), + mangroveSapling (Blocks.colorizedSaplings, 1), + palmSapling (Blocks.colorizedSaplings, 2), + redwoodSapling (Blocks.colorizedSaplings, 3), + willowSapling (Blocks.colorizedSaplings, 4), + pineSapling (Blocks.colorizedSaplings, 5), + mapleSapling (Blocks.saplings, 11), + orangeAutumnSapling (Blocks.saplings, 8), + pinkCherrySapling (Blocks.saplings, 10), + whiteCherrySapling (Blocks.saplings, 12), + hellBarkSapling (Blocks.saplings, 13), + jacarandaSapling (Blocks.saplings, 14), + appleSapling (Blocks.saplings, 0), + originSapling (Blocks.saplings, 9), + yellowAutumnSapling (Blocks.saplings, 1), + bambooSapling (Blocks.saplings, 2), + + mud (Blocks.mud, 0), + driedDirt (Blocks.driedDirt, 0), + redRock (Blocks.redRock, 0), + ash (Blocks.ash, 0), + ashStone (Blocks.ashStone, 0), + hardIce (Blocks.hardIce, 0), + originGrass (Blocks.originGrass, 0), + longGrass (Blocks.longGrass, 0), + hardSand (Blocks.hardSand, 0), + hardDirt (Blocks.hardDirt, 0), + holyGrass (Blocks.holyGrass, 0), + holyDirt (Blocks.holyDirt, 0), + holyStone (Blocks.holyStone, 0), + holyStoneCobble (Blocks.holyStone, 1), + crystal (Blocks.crystal, 0), + cragRock (Blocks.cragRock, 0), + quicksand (Blocks.mud, 1), + cloud (Blocks.cloud, 0), + smolderingGrass (Blocks.holyGrass, 1), + redRockCobble (Blocks.redRock, 1), + giantFlowerRed (Blocks.petals, 0), + giantFlowerYellow (Blocks.petals, 1), + + amethystOre (Blocks.amethystOre, 0), + amethystBlock (Blocks.amethystOre, 1), + rubyOre (Blocks.amethystOre, 2), + rubyBlock (Blocks.amethystOre, 3), + peridotOre (Blocks.amethystOre, 4), + peridotBlock (Blocks.amethystOre, 5), + topazOre (Blocks.amethystOre, 6), + topazBlock (Blocks.amethystOre, 7), + tanzaniteOre (Blocks.amethystOre, 8), + tanzaniteBlock (Blocks.amethystOre, 9), + apatiteOre (Blocks.amethystOre, 10), + apatiteBlock (Blocks.amethystOre, 11), + sapphireOre (Blocks.amethystOre, 12), + sapphireBlock (Blocks.amethystOre, 13), + + smallBoneSegment (Blocks.bones, 0), + mediumBoneSegment (Blocks.bones, 1), + largeBoneSegment (Blocks.bones, 2), + + kelp (Blocks.coral, 0), + + toadstool (Blocks.mushrooms, 0), + portobello (Blocks.mushrooms, 1), + bluemilk (Blocks.mushrooms, 2), + glowshroom (Blocks.mushrooms, 3), + + deadGrass (Blocks.plants, 0), + desertGrass (Blocks.plants, 1), + desertSprouts (Blocks.plants, 2), + duneGrass (Blocks.plants, 3), + holyTallGrass (Blocks.plants, 4), + thorn (Blocks.plants, 5), + barley (Blocks.plants, 6), + cattail (Blocks.plants, 7), + reed (Blocks.plants, 8), + tinyCactus (Blocks.plants, 12), + + treeMoss (Blocks.treeMoss, 0), + moss (Blocks.moss, 0), + willow (Blocks.willow, 0), + ivy (Blocks.ivy, 0), + + clover (Blocks.flowers, 0), + swampFlower (Blocks.flowers, 1), + deathbloom (Blocks.flowers, 2), + glowFlower (Blocks.flowers, 3), + hydrangea (Blocks.flowers, 4), + daisy (Blocks.flowers, 5), + tulip (Blocks.flowers, 6), + wildFlower (Blocks.flowers, 7), + violet (Blocks.flowers, 8), + anenome (Blocks.flowers, 9), + lilyflower (Blocks.flowers, 10), + rainbowflower (Blocks.flowers, 11), + aloe (Blocks.flowers, 12), + sunflower (Blocks.flowers, 13), + dandelion (Blocks.flowers, 15), + ; + + public Optional block; + public int meta; + + private EnumBlocks(Optional block, int meta) { + this.block = block; + this.meta = meta; + } + + public Optional getBlock() { + return block; + } + + public int getMeta() { + return meta; + } + } + + public static ItemStack getBlockItemStack(String string) + { + Optional stackblock = EnumBlocks.valueOf(string).block; + int stackmeta = EnumBlocks.valueOf(string).meta; + + if (stackmeta != 0) + { + return new ItemStack(stackblock.get(), 1, stackmeta); + } + + return new ItemStack(stackblock.get(), 1); + } + + public static int getBlockID(String string) + { + Optional stackblock = EnumBlocks.valueOf(string).block; + + return stackblock.get().blockID; + } + + public static int getBlockMeta(String string) + { + int stackmeta = EnumBlocks.valueOf(string).meta; + + return stackmeta; + } +} diff --git a/src/biomesoplenty/api/Blocks.java b/src/biomesoplenty/api/Blocks.java new file mode 100644 index 00000000..db6ca30a --- /dev/null +++ b/src/biomesoplenty/api/Blocks.java @@ -0,0 +1,103 @@ +package biomesoplenty.api; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockHalfSlab; + +import com.google.common.base.Optional; + +public class Blocks +{ + // Worldgen Blocks + public static Optional ash = Optional.absent(); + public static Optional ashStone = Optional.absent(); + public static Optional cragRock = Optional.absent(); + public static Optional driedDirt = Optional.absent(); + public static Optional hardDirt = Optional.absent(); + public static Optional hardIce = Optional.absent(); + public static Optional hardSand = Optional.absent(); + public static Optional holyGrass = Optional.absent(); + public static Optional holyDirt = Optional.absent(); + public static Optional holyStone = Optional.absent(); + public static Optional mud = Optional.absent(); + public static Optional originGrass = Optional.absent(); + public static Optional longGrass = Optional.absent(); + public static Optional redRock = Optional.absent(); + public static Optional crystal = Optional.absent(); + + // Planks and logs + public static Optional planks = Optional.absent(); + public static Optional logs1 = Optional.absent(); + public static Optional logs2 = Optional.absent(); + public static Optional logs3 = Optional.absent(); + public static Optional logs4 = Optional.absent(); + + // Stairs + public static Optional acaciaStairs = Optional.absent(); + public static Optional cherryStairs = Optional.absent(); + public static Optional darkStairs = Optional.absent(); + public static Optional firStairs = Optional.absent(); + public static Optional holyStairs = Optional.absent(); + public static Optional magicStairs = Optional.absent(); + public static Optional mangroveStairs = Optional.absent(); + public static Optional palmStairs = Optional.absent(); + public static Optional redwoodStairs = Optional.absent(); + public static Optional willowStairs = Optional.absent(); + public static Optional redCobbleStairs = Optional.absent(); + public static Optional redBricksStairs = Optional.absent(); + public static Optional mudBricksStairs = Optional.absent(); + public static Optional holyCobbleStairs = Optional.absent(); + public static Optional holyBricksStairs = Optional.absent(); + public static Optional pineStairs = Optional.absent(); + public static Optional hellBarkStairs = Optional.absent(); + public static Optional jacarandaStairs = Optional.absent(); + + // Slabs + public static Optional woodenSingleSlab1 = Optional.absent(); + public static Optional woodenDoubleSlab1 = Optional.absent(); + public static Optional woodenSingleSlab2 = Optional.absent(); + public static Optional woodenDoubleSlab2 = Optional.absent(); + public static Optional stoneSingleSlab = Optional.absent(); + public static Optional stoneDoubleSlab = Optional.absent(); + + // Plants + public static Optional flowers = Optional.absent(); + public static Optional mushrooms = Optional.absent(); + public static Optional coral = Optional.absent(); + public static Optional leaves1 = Optional.absent(); + public static Optional leaves2 = Optional.absent(); + public static Optional leavesColorized = Optional.absent(); + public static Optional leavesFruit = Optional.absent(); + public static Optional foliage = Optional.absent(); + public static Optional plants = Optional.absent(); + public static Optional flatPlants = Optional.absent(); + public static Optional saplings = Optional.absent(); + public static Optional colorizedSaplings = Optional.absent(); + public static Optional willow = Optional.absent(); + public static Optional ivy = Optional.absent(); + public static Optional treeMoss = Optional.absent(); + public static Optional moss = Optional.absent(); + public static Optional petals = Optional.absent(); + public static Optional bamboo = Optional.absent(); + public static Optional cloud = Optional.absent(); + + //Nether + public static Optional bones = Optional.absent(); + + public static Optional amethystOre = Optional.absent(); + + public static Optional mudBrick = Optional.absent(); + + public static Optional promisedPortal = Optional.absent(); + public static Optional glass = Optional.absent(); + public static Optional altar = Optional.absent(); + public static Optional puddle = Optional.absent(); + public static Optional grave = Optional.absent(); + + /** + * Populated by Biomes O Plenty with default Biomes O Plenty leaves. Add additional leaves here (E.g. "Blocks.shearBlockIds.put(acaciaLeaves.blockID, 15.0F);") + */ + public static Map shearBlockIds = new HashMap(); +} diff --git a/src/biomesoplenty/api/Entities.java b/src/biomesoplenty/api/Entities.java new file mode 100644 index 00000000..dd4eb491 --- /dev/null +++ b/src/biomesoplenty/api/Entities.java @@ -0,0 +1,24 @@ +package biomesoplenty.api; + +public class Entities { + + public static Class Mudball = getClass("biomesoplenty.entities.projectiles.EntityMudball"); + public static Class Dart = getClass("biomesoplenty.entities.projectiles.EntityDart"); + public static Class JungleSpider = getClass("biomesoplenty.entities.EntityJungleSpider"); + public static Class Rosester = getClass("biomesoplenty.entities.EntityRosester"); + public static Class Glob = getClass("biomesoplenty.entities.EntityGlob"); + + public static Class getClass(String inputstring) + { + Class foundclass = null; + try + { + foundclass = Class.forName(inputstring); + } + catch (ClassNotFoundException e) + { + e.printStackTrace(); + } + return foundclass; + } +} diff --git a/src/biomesoplenty/api/Fluids.java b/src/biomesoplenty/api/Fluids.java new file mode 100644 index 00000000..016f4011 --- /dev/null +++ b/src/biomesoplenty/api/Fluids.java @@ -0,0 +1,18 @@ +package biomesoplenty.api; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraftforge.fluids.Fluid; + +import com.google.common.base.Optional; + +public class Fluids +{ + public static Optional bopBucket = Optional.absent(); + + public static Optional springWater = Optional.absent(); + public static Optional liquidPoison = Optional.absent(); + + public static Optional springWaterFluid = Optional.absent(); + public static Optional liquidPoisonFluid = Optional.absent(); +} diff --git a/src/biomesoplenty/api/Items.java b/src/biomesoplenty/api/Items.java new file mode 100644 index 00000000..839f0e8f --- /dev/null +++ b/src/biomesoplenty/api/Items.java @@ -0,0 +1,51 @@ +package biomesoplenty.api; + +import net.minecraft.item.Item; + +import com.google.common.base.Optional; + +public class Items +{ + public static Optional bopDisc = Optional.absent(); + public static Optional bopDiscMud = Optional.absent(); + + public static Optional swordMud = Optional.absent(); + public static Optional shovelMud = Optional.absent(); + public static Optional pickaxeMud = Optional.absent(); + public static Optional axeMud = Optional.absent(); + public static Optional hoeMud = Optional.absent(); + public static Optional helmetMud = Optional.absent(); + public static Optional chestplateMud = Optional.absent(); + public static Optional leggingsMud = Optional.absent(); + public static Optional bootsMud = Optional.absent(); + + public static Optional swordAmethyst = Optional.absent(); + public static Optional shovelAmethyst = Optional.absent(); + public static Optional pickaxeAmethyst = Optional.absent(); + public static Optional axeAmethyst = Optional.absent(); + public static Optional hoeAmethyst = Optional.absent(); + public static Optional helmetAmethyst = Optional.absent(); + public static Optional chestplateAmethyst = Optional.absent(); + public static Optional leggingsAmethyst = Optional.absent(); + public static Optional bootsAmethyst = Optional.absent(); + + public static Optional scytheWood = Optional.absent(); + public static Optional scytheStone = Optional.absent(); + public static Optional scytheIron = Optional.absent(); + public static Optional scytheGold = Optional.absent(); + public static Optional scytheDiamond = Optional.absent(); + public static Optional scytheMud = Optional.absent(); + public static Optional scytheAmethyst = Optional.absent(); + + public static Optional ancientStaff = Optional.absent(); + public static Optional enderporter = Optional.absent(); + public static Optional food = Optional.absent(); + public static Optional miscItems = Optional.absent(); + public static Optional mudball = Optional.absent(); + public static Optional poison = Optional.absent(); + public static Optional dartBlower = Optional.absent(); + public static Optional dart = Optional.absent(); + public static Optional soulManipulator = Optional.absent(); + + public static Optional flowerBand = Optional.absent(); +} diff --git a/src/biomesoplenty/api/Potions.java b/src/biomesoplenty/api/Potions.java new file mode 100644 index 00000000..0fab7a0c --- /dev/null +++ b/src/biomesoplenty/api/Potions.java @@ -0,0 +1,10 @@ +package biomesoplenty.api; + +import net.minecraft.potion.Potion; + +import com.google.common.base.Optional; + +public class Potions +{ + public static Optional paralysis = Optional.absent(); +} diff --git a/src/tconstruct/blocks/EquipBlock.java b/src/tconstruct/blocks/EquipBlock.java index ba64dc55..e9879697 100644 --- a/src/tconstruct/blocks/EquipBlock.java +++ b/src/tconstruct/blocks/EquipBlock.java @@ -1,5 +1,12 @@ package tconstruct.blocks; +import tconstruct.blocks.logic.EquipLogic; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import tconstruct.library.blocks.InventoryLogic; + import java.util.*; import cpw.mods.fml.relauncher.*; @@ -115,6 +122,54 @@ public class EquipBlock extends InventoryBlock par1World.setBlockMetadataWithNotify(par2, par3, par4, newMeta, 2); } + @Override + public void breakBlock (World par1World, int x, int y, int z, int par5, int meta){ + TileEntity te = par1World.getBlockTileEntity(x, y, z); + + if (te != null && te instanceof EquipLogic) + { + EquipLogic logic = (EquipLogic) te; + for (int iter = 0; iter < logic.getSizeInventory(); ++iter) + { + ItemStack stack = iter == 0 ? logic.getEquipmentItem() : logic.getStackInSlot(iter); + + if (stack != null && logic.canDropInventorySlot(iter)) + { + float jumpX = rand.nextFloat() * 0.8F + 0.1F; + float jumpY = rand.nextFloat() * 0.8F + 0.1F; + float jumpZ = rand.nextFloat() * 0.8F + 0.1F; + + while (stack.stackSize > 0) + { + int itemSize = rand.nextInt(21) + 10; + + if (itemSize > stack.stackSize) + { + itemSize = stack.stackSize; + } + + stack.stackSize -= itemSize; + EntityItem entityitem = new EntityItem(par1World, (double) ((float) x + jumpX), (double) ((float) y + jumpY), (double) ((float) z + jumpZ), new ItemStack(stack.itemID, + itemSize, stack.getItemDamage())); + + if (stack.hasTagCompound()) + { + entityitem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + } + + float offset = 0.05F; + entityitem.motionX = (double) ((float) rand.nextGaussian() * offset); + entityitem.motionY = (double) ((float) rand.nextGaussian() * offset + 0.2F); + entityitem.motionZ = (double) ((float) rand.nextGaussian() * offset); + par1World.spawnEntityInWorld(entityitem); + } + } + } + } + + super.breakBlock(par1World, x, y, z, par5, meta); + } + public int getLightValue (IBlockAccess world, int x, int y, int z) { return !isActive(world, x, y, z) ? 0 : 9; diff --git a/src/tconstruct/blocks/logic/CastingBasinLogic.java b/src/tconstruct/blocks/logic/CastingBasinLogic.java index d0187e39..368f05ae 100644 --- a/src/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/src/tconstruct/blocks/logic/CastingBasinLogic.java @@ -397,7 +397,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.customParam1); + readFromNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } diff --git a/src/tconstruct/blocks/logic/CastingChannelLogic.java b/src/tconstruct/blocks/logic/CastingChannelLogic.java index 3b380ff8..2617aae3 100644 --- a/src/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/src/tconstruct/blocks/logic/CastingChannelLogic.java @@ -571,7 +571,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readCustomNBT(packet.customParam1); + readCustomNBT(packet.data); this.worldObj.markBlockForRenderUpdate(this.xCoord, this.yCoord, this.zCoord); } diff --git a/src/tconstruct/blocks/logic/CastingTableLogic.java b/src/tconstruct/blocks/logic/CastingTableLogic.java index 496ce198..362c7708 100644 --- a/src/tconstruct/blocks/logic/CastingTableLogic.java +++ b/src/tconstruct/blocks/logic/CastingTableLogic.java @@ -395,7 +395,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.customParam1); + readFromNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } diff --git a/src/tconstruct/blocks/logic/DrawbridgeLogic.java b/src/tconstruct/blocks/logic/DrawbridgeLogic.java index ed47f38d..47724844 100644 --- a/src/tconstruct/blocks/logic/DrawbridgeLogic.java +++ b/src/tconstruct/blocks/logic/DrawbridgeLogic.java @@ -482,7 +482,7 @@ public class DrawbridgeLogic extends InventoryLogic implements IFacingLogic, IAc @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.customParam1); + readFromNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } diff --git a/src/tconstruct/blocks/logic/DryingRackLogic.java b/src/tconstruct/blocks/logic/DryingRackLogic.java index b608457d..0eef0d47 100644 --- a/src/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/tconstruct/blocks/logic/DryingRackLogic.java @@ -114,7 +114,7 @@ public class DryingRackLogic extends InventoryLogic @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readCustomNBT(packet.customParam1); + readCustomNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } diff --git a/src/tconstruct/blocks/logic/EquipLogic.java b/src/tconstruct/blocks/logic/EquipLogic.java index d8945ab3..35bc7e00 100644 --- a/src/tconstruct/blocks/logic/EquipLogic.java +++ b/src/tconstruct/blocks/logic/EquipLogic.java @@ -32,20 +32,23 @@ public abstract class EquipLogic extends InventoryLogic return inventory[0]; } - /*@Override + @Override + public void setInventorySlotContents(int slot, ItemStack stack){ + if(slot == 0){ + return; + }else{ + super.setInventorySlotContents(slot, stack); + } + } + + @Override public ItemStack getStackInSlot(int slot) { - return inventory[slot +1]; + return slot != 0 ? inventory[slot] : null; } public boolean isStackInSlot(int slot) { - return inventory[slot +1] != null; + return slot != 0 ? inventory[slot] != null : false; } - - @Override - public int getSizeInventory() - { - return inventory.length - 1; - }*/ } diff --git a/src/tconstruct/blocks/logic/FaucetLogic.java b/src/tconstruct/blocks/logic/FaucetLogic.java index e6d5b512..ca8e0b60 100644 --- a/src/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/tconstruct/blocks/logic/FaucetLogic.java @@ -179,7 +179,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readCustomNBT(packet.customParam1); + readCustomNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } diff --git a/src/tconstruct/blocks/logic/FirestarterLogic.java b/src/tconstruct/blocks/logic/FirestarterLogic.java index c27d6b83..f1f71eea 100644 --- a/src/tconstruct/blocks/logic/FirestarterLogic.java +++ b/src/tconstruct/blocks/logic/FirestarterLogic.java @@ -190,7 +190,7 @@ public class FirestarterLogic extends TileEntity implements IFacingLogic, IActiv @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readCustomNBT(packet.customParam1); + readCustomNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } } diff --git a/src/tconstruct/blocks/logic/GolemCoreLogic.java b/src/tconstruct/blocks/logic/GolemCoreLogic.java index 72697147..7fc2efca 100644 --- a/src/tconstruct/blocks/logic/GolemCoreLogic.java +++ b/src/tconstruct/blocks/logic/GolemCoreLogic.java @@ -111,7 +111,7 @@ public class GolemCoreLogic extends InventoryLogic implements IInventory @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.customParam1); + readFromNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } } diff --git a/src/tconstruct/blocks/logic/LavaTankLogic.java b/src/tconstruct/blocks/logic/LavaTankLogic.java index 49d8c5af..e590c798 100644 --- a/src/tconstruct/blocks/logic/LavaTankLogic.java +++ b/src/tconstruct/blocks/logic/LavaTankLogic.java @@ -158,7 +158,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readCustomNBT(packet.customParam1); + readCustomNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } diff --git a/src/tconstruct/blocks/logic/LiquidTextureLogic.java b/src/tconstruct/blocks/logic/LiquidTextureLogic.java index 1117356e..3406119a 100644 --- a/src/tconstruct/blocks/logic/LiquidTextureLogic.java +++ b/src/tconstruct/blocks/logic/LiquidTextureLogic.java @@ -59,7 +59,7 @@ public class LiquidTextureLogic extends TileEntity @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readCustomNBT(packet.customParam1); + readCustomNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } } diff --git a/src/tconstruct/blocks/logic/MultiServantLogic.java b/src/tconstruct/blocks/logic/MultiServantLogic.java index 23f314f8..5384e884 100644 --- a/src/tconstruct/blocks/logic/MultiServantLogic.java +++ b/src/tconstruct/blocks/logic/MultiServantLogic.java @@ -140,7 +140,7 @@ public class MultiServantLogic extends TileEntity implements IServantLogic @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readCustomNBT(packet.customParam1); + readCustomNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } } diff --git a/src/tconstruct/blocks/logic/RedwireLogic.java b/src/tconstruct/blocks/logic/RedwireLogic.java index a5d1fa04..c28d2a82 100644 --- a/src/tconstruct/blocks/logic/RedwireLogic.java +++ b/src/tconstruct/blocks/logic/RedwireLogic.java @@ -66,7 +66,7 @@ public class RedwireLogic extends TileEntity @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readCustomNBT(packet.customParam1); + readCustomNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } } diff --git a/src/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/tconstruct/blocks/logic/SmelteryDrainLogic.java index 1c6595e9..b72cf67d 100644 --- a/src/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -1,5 +1,6 @@ package tconstruct.blocks.logic; +import tconstruct.library.crafting.AlloyMix; import tconstruct.library.util.IFacingLogic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; @@ -22,38 +23,10 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl return false; } - /*@Override - public FluidStack getLiquid () - { - return null; - } - - @Override - public int getCapacity () - { - if (!hasMaster) - return 0; - - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - return smeltery.getCapacity(); - }*/ - - /*@Override - public int fill (FluidStack resource, boolean doFill) - { - - }*/ - - /*@Override - public FluidStack drain (int maxDrain, boolean doDrain) - { - - }*/ - @Override public int fill (ForgeDirection from, FluidStack resource, boolean doFill) { - if (hasMaster && resource != null) + if (hasValidMaster() && resource != null && canFill(from, resource.getFluid())) { if (doFill) { @@ -74,7 +47,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl @Override public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) { - if (hasValidMaster()) + if (hasValidMaster() && canDrain(from, null)) { SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); return smeltery.drain(maxDrain, doDrain); @@ -88,51 +61,45 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) { - // TODO Auto-generated method stub + // TODO Auto-generated method stub return null; } @Override public boolean canFill (ForgeDirection from, Fluid fluid) { - return false; + return from == getForgeDirection().getOpposite(); } @Override public boolean canDrain (ForgeDirection from, Fluid fluid) { - return false; + // Check that the drain is coming from the from the front of the block + // and that the fluid to be drained is in the smeltery. + boolean containsFluid = fluid == null; + if(fluid!=null){ + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + for (FluidStack fstack : smeltery.moltenMetal){ + if(fstack.fluidID == fluid.getID()){ + containsFluid = true; + break; + } + } + } + return from == getForgeDirection() && containsFluid; } @Override public FluidTankInfo[] getTankInfo (ForgeDirection from) { - return null; - } - - /* - - @Override - public ILiquidTank[] getTanks (ForgeDirection direction) - { - if (hasValidMaster()) + if (hasValidMaster() && (from==getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN)) { SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - return new ILiquidTank[] { smeltery }; + return new FluidTankInfo[] { smeltery.getInfo() }; } return null; } - @Override - public ILiquidTank getTank (ForgeDirection direction, FluidStack type) - { - if (hasValidMaster()) - { - return (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - } - return null; - }*/ - @Override public byte getRenderDirection () { @@ -207,7 +174,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.customParam1); + readFromNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } } diff --git a/src/tconstruct/blocks/logic/SmelteryLogic.java b/src/tconstruct/blocks/logic/SmelteryLogic.java index 164ebf69..b0074170 100644 --- a/src/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/tconstruct/blocks/logic/SmelteryLogic.java @@ -325,7 +325,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { if (currentLiquid + 25 < maxLiquid) { - this.addMoltenMetal(new FluidStack(TContent.moltenEnder.blockID, 25), false); + this.addMoltenMetal(new FluidStack(TContent.moltenEnderFluid, 25), false); } } } @@ -986,8 +986,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci @Override public FluidTankInfo getInfo () { - //TODO: This - return null; + return new FluidTankInfo(this); } /* NBT */ @@ -1076,7 +1075,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.customParam1); + readFromNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } } diff --git a/src/tconstruct/blocks/logic/TileEntityLandmine.java b/src/tconstruct/blocks/logic/TileEntityLandmine.java index 42ed2361..11c51b4d 100644 --- a/src/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/tconstruct/blocks/logic/TileEntityLandmine.java @@ -107,7 +107,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory @Override public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.customParam1); + readFromNBT(packet.data); } @Override diff --git a/src/tconstruct/blocks/logic/ToolStationLogic.java b/src/tconstruct/blocks/logic/ToolStationLogic.java index d88f132b..eed4735f 100644 --- a/src/tconstruct/blocks/logic/ToolStationLogic.java +++ b/src/tconstruct/blocks/logic/ToolStationLogic.java @@ -61,7 +61,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory if (this.worldObj != null) { this.blockMetadata = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord); - this.worldObj.updateTileEntityChunkAndDoNothing(this.xCoord, this.yCoord, this.zCoord, this); + this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, this); } } diff --git a/src/tconstruct/client/CustomBowRenderer.java b/src/tconstruct/client/CustomBowRenderer.java index 5a565648..dea65be4 100644 --- a/src/tconstruct/client/CustomBowRenderer.java +++ b/src/tconstruct/client/CustomBowRenderer.java @@ -72,8 +72,8 @@ public class CustomBowRenderer implements IItemRenderer GL11.glPopMatrix(); return; } - TextureManager texturemanager = this.mc.func_110434_K(); - texturemanager.func_110577_a(texturemanager.func_130087_a(stack.getItemSpriteNumber())); + TextureManager texturemanager = this.mc.getTextureManager(); + texturemanager.bindTexture(texturemanager.getResourceLocation(stack.getItemSpriteNumber())); if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { @@ -101,7 +101,7 @@ public class CustomBowRenderer implements IItemRenderer GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F); - ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, icon.getOriginX(), icon.getOriginY(), 0.0625F); + ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 0.0625F); GL11.glDisable(GL12.GL_RESCALE_NORMAL); diff --git a/src/tconstruct/client/RenderItemCopy.java b/src/tconstruct/client/RenderItemCopy.java index 302eb657..4de772bb 100644 --- a/src/tconstruct/client/RenderItemCopy.java +++ b/src/tconstruct/client/RenderItemCopy.java @@ -52,7 +52,7 @@ public class RenderItemCopy extends Render */ public void doRenderItem (EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9) { - this.func_110777_b(par1EntityItem); + this.bindEntityTexture(par1EntityItem); this.random.setSeed(187L); ItemStack itemstack = par1EntityItem.getEntityItem(); @@ -192,7 +192,7 @@ public class RenderItemCopy extends Render protected ResourceLocation func_110796_a (EntityItem par1EntityItem) { - return this.renderManager.renderEngine.func_130087_a(par1EntityItem.getEntityItem().getItemSpriteNumber()); + return this.renderManager.renderEngine.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber()); } /** @@ -209,9 +209,9 @@ public class RenderItemCopy extends Render if (par2Icon == null) { - TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K(); - ResourceLocation resourcelocation = texturemanager.func_130087_a(par1EntityItem.getEntityItem().getItemSpriteNumber()); - par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno"); + TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); + ResourceLocation resourcelocation = texturemanager.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber()); + par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } float f4 = ((Icon) par2Icon).getMinU(); @@ -261,21 +261,21 @@ public class RenderItemCopy extends Render if (itemstack.getItemSpriteNumber() == 0) { - this.func_110776_a(TextureMap.field_110575_b); + this.bindTexture(TextureMap.locationBlocksTexture); } else { - this.func_110776_a(TextureMap.field_110576_c); + this.bindTexture(TextureMap.locationItemsTexture); } GL11.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12); + ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12); if (itemstack.hasEffect(pass)) { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); - this.renderManager.renderEngine.func_110577_a(field_110798_h); + this.renderManager.renderEngine.bindTexture(field_110798_h); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); float f13 = 0.76F; @@ -358,7 +358,7 @@ public class RenderItemCopy extends Render Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null); if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType())) { - par2TextureManager.func_110577_a(TextureMap.field_110575_b); + par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel); GL11.glScalef(10.0F, 10.0F, 10.0F); @@ -388,7 +388,7 @@ public class RenderItemCopy extends Render for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) { - par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c); + par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); f1 = (float) (k1 >> 16 & 255) / 255.0F; @@ -413,12 +413,12 @@ public class RenderItemCopy extends Render else { GL11.glDisable(GL11.GL_LIGHTING); - ResourceLocation resourcelocation = par2TextureManager.func_130087_a(par3ItemStack.getItemSpriteNumber()); - par2TextureManager.func_110577_a(resourcelocation); + ResourceLocation resourcelocation = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber()); + par2TextureManager.bindTexture(resourcelocation); if (object == null) { - object = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(resourcelocation)).func_110572_b("missingno"); + object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)).getAtlasSprite("missingno"); } i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); @@ -448,7 +448,7 @@ public class RenderItemCopy extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - manager.func_110577_a(field_110798_h); + manager.bindTexture(field_110798_h); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); @@ -479,7 +479,7 @@ public class RenderItemCopy extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - par2TextureManager.func_110577_a(field_110798_h); + par2TextureManager.bindTexture(field_110798_h); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); @@ -601,7 +601,7 @@ public class RenderItemCopy extends Render tessellator.draw(); } - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return this.func_110796_a((EntityItem) par1Entity); } diff --git a/src/tconstruct/client/TClientEvents.java b/src/tconstruct/client/TClientEvents.java index 294d0861..6756a394 100644 --- a/src/tconstruct/client/TClientEvents.java +++ b/src/tconstruct/client/TClientEvents.java @@ -109,13 +109,13 @@ public class TClientEvents highlight = false; } - AttributeInstance attrMaxHealth = this.mc.thePlayer.func_110148_a(SharedMonsterAttributes.field_111267_a); - int health = MathHelper.ceiling_float_int(mc.thePlayer.func_110143_aJ()); + AttributeInstance attrMaxHealth = this.mc.thePlayer.getEntityAttribute(SharedMonsterAttributes.maxHealth); + int health = MathHelper.ceiling_float_int(mc.thePlayer.getHealth()); int healthLast = MathHelper.ceiling_float_int(mc.thePlayer.prevHealth); - float healthMax = (float) attrMaxHealth.func_111126_e(); + float healthMax = (float) attrMaxHealth.getAttributeValue(); if (healthMax > 20) healthMax = 20; - float absorb = this.mc.thePlayer.func_110139_bj(); + float absorb = this.mc.thePlayer.getAbsorptionAmount(); int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F); int rowHeight = Math.max(10 - (healthRows - 2), 3); @@ -187,9 +187,9 @@ public class TClientEvents return; //Extra hearts - this.mc.func_110434_K().func_110577_a(hearts); + this.mc.getTextureManager().bindTexture(hearts); - int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.func_110143_aJ()); + int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.getHealth()); for (int iter = 0; iter < hp / 20; iter++) { int renderHearts = (hp - 20 * (iter + 1)) / 2; @@ -205,7 +205,7 @@ public class TClientEvents } } - this.mc.func_110434_K().func_110577_a(icons); + this.mc.getTextureManager().bindTexture(icons); GuiIngameForge.left_height += 10; if (absorb > 0) GuiIngameForge.left_height += 10; diff --git a/src/tconstruct/client/TClientTickHandler.java b/src/tconstruct/client/TClientTickHandler.java index e86793b5..aa38d30a 100644 --- a/src/tconstruct/client/TClientTickHandler.java +++ b/src/tconstruct/client/TClientTickHandler.java @@ -42,10 +42,10 @@ public class TClientTickHandler implements ITickHandler int scaledHeight = scaledresolution.getScaledHeight(); int xBasePos = scaledWidth / 2 - 91; int yBasePos = scaledHeight - 39; - this.mc.func_110434_K().func_110577_a(hearts); + this.mc.getTextureManager().bindTexture(hearts); //this.mc.renderEngine.bindTexture("/mods/tinker/textures/gui/newhearts.png"); - int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.func_110143_aJ());//(int) player.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111125_b();//player.getHealth(); + int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.getHealth());//(int) player.getEntityAttribute(SharedMonsterAttributes.field_111267_a).func_111125_b();//player.getHealth(); //System.out.println("hp: "+hp); for (int iter = 0; iter < hp / 20; iter++) { diff --git a/src/tconstruct/client/ToolCoreRenderer.java b/src/tconstruct/client/ToolCoreRenderer.java index e2fb975c..72efadf1 100644 --- a/src/tconstruct/client/ToolCoreRenderer.java +++ b/src/tconstruct/client/ToolCoreRenderer.java @@ -113,8 +113,8 @@ public class ToolCoreRenderer implements IItemRenderer xMax[i] = icon.getMaxU(); yMin[i] = icon.getMinV(); yMax[i] = icon.getMaxV(); - sheetWidth[i] = icon.getOriginX(); - sheetHeight[i] = icon.getOriginY(); + sheetWidth[i] = icon.getIconWidth(); + sheetHeight[i] = icon.getIconHeight(); xDiff[i] = xMin[i] - xMax[i]; yDiff[i] = yMin[i] - yMax[i]; width[i] = sheetWidth[i] * xDiff[i]; diff --git a/src/tconstruct/client/block/BreakingFX.java b/src/tconstruct/client/block/BreakingFX.java index b84f880d..52df1068 100644 --- a/src/tconstruct/client/block/BreakingFX.java +++ b/src/tconstruct/client/block/BreakingFX.java @@ -19,7 +19,7 @@ public class BreakingFX extends EntityFX public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item, int par9) { super(par1World, par2, par4, par6, 0.0D, 0.0D, 0.0D); - this.func_110125_a(par8Item.getIconFromDamage(par9)); + this.setParticleIcon(par8Item.getIconFromDamage(par9)); this.particleRed = this.particleGreen = this.particleBlue = 1.0F; this.particleGravity = Block.blockSnow.blockParticleGravity; this.particleScale /= 2.0F; diff --git a/src/tconstruct/client/block/PaneRender.java b/src/tconstruct/client/block/PaneRender.java index d84310b2..430b4e14 100644 --- a/src/tconstruct/client/block/PaneRender.java +++ b/src/tconstruct/client/block/PaneRender.java @@ -79,15 +79,15 @@ public class PaneRender implements ISimpleBlockRenderingHandler icon = renderblocks.getBlockIconFromSideAndMetadata(pane, 0, meta); icon1 = pane.getSideTextureIndex(meta); - meta = icon.getOriginX(); - int k1 = icon.getOriginY(); + meta = icon.getIconWidth(); + int k1 = icon.getIconHeight(); double d = (double) icon.getMinU(); double d1 = (double) icon.getInterpolatedU(8.0D); double d2 = (double) icon.getMaxU(); double d3 = (double) icon.getMinV(); double d4 = (double) icon.getMaxV(); - int l1 = icon1.getOriginX(); - int i2 = icon1.getOriginY(); + int l1 = icon1.getIconWidth(); + int i2 = icon1.getIconHeight(); double d5 = (double) icon1.getInterpolatedU(7.0D); double d6 = (double) icon1.getInterpolatedU(9.0D); double d7 = (double) icon1.getMinV(); diff --git a/src/tconstruct/client/block/SmallFontRenderer.java b/src/tconstruct/client/block/SmallFontRenderer.java index a002a2c2..c4d5fa95 100644 --- a/src/tconstruct/client/block/SmallFontRenderer.java +++ b/src/tconstruct/client/block/SmallFontRenderer.java @@ -107,7 +107,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener this.field_111273_g = par2ResourceLocation; this.renderEngine = par3TextureManager; this.unicodeFlag = true; - par3TextureManager.func_110577_a(this.field_111273_g); + par3TextureManager.bindTexture(this.field_111273_g); for (int i = 0; i < 32; ++i) { @@ -144,7 +144,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener this.readGlyphSizes(); } - public void func_110549_a (ResourceManager par1ResourceManager) + public void onResourceManagerReload (ResourceManager par1ResourceManager) { this.func_111272_d(); } @@ -155,7 +155,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener try { - bufferedimage = ImageIO.read(Minecraft.getMinecraft().func_110442_L().func_110536_a(this.field_111273_g).func_110527_b()); + bufferedimage = ImageIO.read(Minecraft.getMinecraft().getResourceManager().getResource(this.field_111273_g).getInputStream()); } catch (IOException ioexception) { @@ -220,7 +220,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener { try { - InputStream inputstream = Minecraft.getMinecraft().func_110442_L().func_110536_a(new ResourceLocation("font/glyph_sizes.bin")).func_110527_b(); + InputStream inputstream = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation("font/glyph_sizes.bin")).getInputStream(); inputstream.read(this.glyphWidth); } catch (IOException ioexception) @@ -245,7 +245,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener float f = (float) (par1 % 16 * 8); float f1 = (float) (par1 / 16 * 8); float f2 = par2 ? 1.0F : 0.0F; - this.renderEngine.func_110577_a(this.field_111273_g); + this.renderEngine.bindTexture(this.field_111273_g); float f3 = (float) this.charWidth[par1] - 0.01F; GL11.glBegin(GL11.GL_TRIANGLE_STRIP); GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F); @@ -275,7 +275,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener */ private void loadGlyphTexture (int par1) { - this.renderEngine.func_110577_a(this.func_111271_a(par1)); + this.renderEngine.bindTexture(this.func_111271_a(par1)); } /** @@ -1039,4 +1039,5 @@ public class SmallFontRenderer implements ResourceManagerReloadListener { return this.bidiFlag; } + } diff --git a/src/tconstruct/client/entity/CartRender.java b/src/tconstruct/client/entity/CartRender.java index cae6a4bf..62cf5e4d 100644 --- a/src/tconstruct/client/entity/CartRender.java +++ b/src/tconstruct/client/entity/CartRender.java @@ -132,7 +132,7 @@ public class CartRender extends Render this.renderPullcart((CartEntity) par1Entity, par2, par4, par6, par8, par9); } - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return texture; } diff --git a/src/tconstruct/client/entity/CrystalGuardianRender.java b/src/tconstruct/client/entity/CrystalGuardianRender.java index 36c4f47d..ef2f94dd 100644 --- a/src/tconstruct/client/entity/CrystalGuardianRender.java +++ b/src/tconstruct/client/entity/CrystalGuardianRender.java @@ -186,7 +186,7 @@ public class CrystalGuardianRender extends RenderLiving } @Override - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return texture; } diff --git a/src/tconstruct/client/entity/CrystalRender.java b/src/tconstruct/client/entity/CrystalRender.java index a953d963..db7b8920 100644 --- a/src/tconstruct/client/entity/CrystalRender.java +++ b/src/tconstruct/client/entity/CrystalRender.java @@ -64,7 +64,7 @@ public class CrystalRender extends RenderLiving return this.func_77061_b((Crystal) par1EntityLiving, par2, par3); } - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return texture; } diff --git a/src/tconstruct/client/entity/FancyItemRender.java b/src/tconstruct/client/entity/FancyItemRender.java index 0bdcab06..04637ea3 100644 --- a/src/tconstruct/client/entity/FancyItemRender.java +++ b/src/tconstruct/client/entity/FancyItemRender.java @@ -51,7 +51,7 @@ public class FancyItemRender extends Render */ public void doRenderItem (EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9) { - this.func_110777_b(par1EntityItem); + this.bindEntityTexture(par1EntityItem); this.random.setSeed(187L); ItemStack itemstack = par1EntityItem.getEntityItem(); @@ -191,7 +191,7 @@ public class FancyItemRender extends Render protected ResourceLocation func_110796_a (EntityItem par1EntityItem) { - return this.renderManager.renderEngine.func_130087_a(par1EntityItem.getEntityItem().getItemSpriteNumber()); + return this.renderManager.renderEngine.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber()); } /** @@ -208,9 +208,9 @@ public class FancyItemRender extends Render if (par2Icon == null) { - TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K(); - ResourceLocation resourcelocation = texturemanager.func_130087_a(par1EntityItem.getEntityItem().getItemSpriteNumber()); - par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno"); + TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); + ResourceLocation resourcelocation = texturemanager.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber()); + par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } float f4 = ((Icon) par2Icon).getMinU(); @@ -258,21 +258,21 @@ public class FancyItemRender extends Render if (itemstack.getItemSpriteNumber() == 0) { - this.func_110776_a(TextureMap.field_110575_b); + this.bindTexture(TextureMap.locationBlocksTexture); } else { - this.func_110776_a(TextureMap.field_110576_c); + this.bindTexture(TextureMap.locationItemsTexture); } GL11.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12); + ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12); if (itemstack.hasEffect(pass)) { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); - this.renderManager.renderEngine.func_110577_a(field_110798_h); + this.renderManager.renderEngine.bindTexture(field_110798_h); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); float f13 = 0.76F; @@ -325,7 +325,7 @@ public class FancyItemRender extends Render Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null); if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType())) { - par2TextureManager.func_110577_a(TextureMap.field_110575_b); + par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel); GL11.glScalef(10.0F, 10.0F, 10.0F); @@ -355,7 +355,7 @@ public class FancyItemRender extends Render for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) { - par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c); + par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); f1 = (float) (k1 >> 16 & 255) / 255.0F; @@ -380,12 +380,12 @@ public class FancyItemRender extends Render else { GL11.glDisable(GL11.GL_LIGHTING); - ResourceLocation resourcelocation = par2TextureManager.func_130087_a(par3ItemStack.getItemSpriteNumber()); - par2TextureManager.func_110577_a(resourcelocation); + ResourceLocation resourcelocation = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber()); + par2TextureManager.bindTexture(resourcelocation); if (object == null) { - object = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(resourcelocation)).func_110572_b("missingno"); + object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)).getAtlasSprite("missingno"); } i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); @@ -415,7 +415,7 @@ public class FancyItemRender extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - manager.func_110577_a(field_110798_h); + manager.bindTexture(field_110798_h); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); @@ -446,7 +446,7 @@ public class FancyItemRender extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - par2TextureManager.func_110577_a(field_110798_h); + par2TextureManager.bindTexture(field_110798_h); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); @@ -568,7 +568,7 @@ public class FancyItemRender extends Render tessellator.draw(); } - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return this.func_110796_a((EntityItem) par1Entity); } diff --git a/src/tconstruct/client/entity/MiniGardyRender.java b/src/tconstruct/client/entity/MiniGardyRender.java index 63b34098..a4d4bada 100644 --- a/src/tconstruct/client/entity/MiniGardyRender.java +++ b/src/tconstruct/client/entity/MiniGardyRender.java @@ -177,7 +177,7 @@ public class MiniGardyRender extends RenderLiving } @Override - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return texture; } diff --git a/src/tconstruct/client/entity/SlimeCloneRender.java b/src/tconstruct/client/entity/SlimeCloneRender.java index 3ecee9d3..f19fdf9e 100644 --- a/src/tconstruct/client/entity/SlimeCloneRender.java +++ b/src/tconstruct/client/entity/SlimeCloneRender.java @@ -93,7 +93,7 @@ public class SlimeCloneRender extends RenderLiving }*/ @Override - protected ResourceLocation func_110775_a (Entity entity) + protected ResourceLocation getEntityTexture (Entity entity) { //return func_98191_a((SlimeClone)entity); return null; diff --git a/src/tconstruct/client/entity/SlimeRender.java b/src/tconstruct/client/entity/SlimeRender.java index 89da775f..6b1b4ba5 100644 --- a/src/tconstruct/client/entity/SlimeRender.java +++ b/src/tconstruct/client/entity/SlimeRender.java @@ -36,7 +36,7 @@ public class SlimeRender extends RenderLiving public void renderBossHealth (BlueSlime slime) { if (slime.getSlimeSize() >= 8) - BossStatus.func_82824_a(slime, true); + BossStatus.setBossStatus(slime, true); } /** @@ -99,7 +99,7 @@ public class SlimeRender extends RenderLiving } @Override - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return texture; } diff --git a/src/tconstruct/client/entity/projectile/ArrowRender.java b/src/tconstruct/client/entity/projectile/ArrowRender.java index ec530c40..8d117fa9 100644 --- a/src/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/tconstruct/client/entity/projectile/ArrowRender.java @@ -52,7 +52,7 @@ public class ArrowRender extends Render */ public void doRenderItem(ArrowEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9) { - this.func_110777_b(par1ArrowEntity); + this.bindEntityTexture(par1ArrowEntity); this.random.setSeed(187L); ItemStack itemstack = par1ArrowEntity.getEntityItem(); @@ -165,7 +165,7 @@ public class ArrowRender extends Render protected ResourceLocation func_110796_a(ArrowEntity par1ArrowEntity) { - return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } /** @@ -182,9 +182,9 @@ public class ArrowRender extends Render if (par2Icon == null) { - TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K(); - ResourceLocation resourcelocation = texturemanager.func_130087_a(arrow.getEntityItem().getItemSpriteNumber()); - par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno"); + TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); + ResourceLocation resourcelocation = texturemanager.getResourceLocation(arrow.getEntityItem().getItemSpriteNumber()); + par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } float f4 = ((Icon) par2Icon).getMinU(); @@ -227,21 +227,53 @@ public class ArrowRender extends Render if (itemstack.getItemSpriteNumber() == 0) { - this.func_110776_a(TextureMap.field_110575_b); + this.bindTexture(TextureMap.locationBlocksTexture); } else { - this.func_110776_a(TextureMap.field_110576_c); + this.bindTexture(TextureMap.locationItemsTexture); } GL11.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12); + + ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12); + + if (itemstack.hasEffect(pass)) + { + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + this.renderManager.renderEngine.bindTexture(field_110798_h); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float f13 = 0.76F; + GL11.glColor4f(0.5F * f13, 0.25F * f13, 0.8F * f13, 1.0F); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float f14 = 0.125F; + GL11.glScalef(f14, f14, f14); + float f15 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; + GL11.glTranslatef(f15, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(f14, f14, f14); + f15 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; + GL11.glTranslatef(-f15, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } } GL11.glPopMatrix(); } - protected ResourceLocation func_110775_a(Entity par1Entity) + protected ResourceLocation getEntityTexture(Entity par1Entity) { return this.func_110796_a((ArrowEntity) par1Entity); } diff --git a/src/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/tconstruct/client/entity/projectile/ArrowRenderCustom.java index 56fdd49f..90ab955b 100644 --- a/src/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/src/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -91,13 +91,13 @@ public class ArrowRenderCustom extends Render this.doRenderItem((ArrowEntity) par1Entity, par2, par4, par6, par8, par9); } - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return this.func_110796_a((ArrowEntity) par1Entity); } protected ResourceLocation func_110796_a (ArrowEntity par1ArrowEntity) { - return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } } diff --git a/src/tconstruct/client/entity/projectile/DaggerRender.java b/src/tconstruct/client/entity/projectile/DaggerRender.java index a2ea4c83..19982d07 100644 --- a/src/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/tconstruct/client/entity/projectile/DaggerRender.java @@ -52,7 +52,7 @@ public class DaggerRender extends Render */ public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9) { - this.func_110777_b(par1ArrowEntity); + this.bindEntityTexture(par1ArrowEntity); this.random.setSeed(187L); ItemStack itemstack = par1ArrowEntity.getEntityItem(); @@ -188,7 +188,7 @@ public class DaggerRender extends Render protected ResourceLocation func_110796_a (DaggerEntity par1ArrowEntity) { - return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } /** @@ -205,9 +205,9 @@ public class DaggerRender extends Render if (par2Icon == null) { - TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K(); - ResourceLocation resourcelocation = texturemanager.func_130087_a(dagger.getEntityItem().getItemSpriteNumber()); - par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno"); + TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); + ResourceLocation resourcelocation = texturemanager.getResourceLocation(dagger.getEntityItem().getItemSpriteNumber()); + par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } float f4 = ((Icon) par2Icon).getMinU(); @@ -249,23 +249,23 @@ public class DaggerRender extends Render if (itemstack.getItemSpriteNumber() == 0) { - this.func_110776_a(TextureMap.field_110575_b); + this.bindTexture(TextureMap.locationBlocksTexture); } else { - this.func_110776_a(TextureMap.field_110576_c); + this.bindTexture(TextureMap.locationItemsTexture); } GL11.glColor4f(par5, par6, par7, 1.0F); GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); GL11.glRotatef(rotation, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12); + ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12); /*if (itemstack.hasEffect(pass)) { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); - this.renderManager.renderEngine.func_110577_a(field_110798_h); + this.renderManager.renderEngine.bindTexture(field_110798_h); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); float f13 = 0.76F; @@ -317,7 +317,7 @@ public class DaggerRender extends Render Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null); if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType())) { - par2TextureManager.func_110577_a(TextureMap.field_110575_b); + par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel); GL11.glScalef(10.0F, 10.0F, 10.0F); @@ -347,7 +347,7 @@ public class DaggerRender extends Render for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) { - par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c); + par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); f1 = (float) (k1 >> 16 & 255) / 255.0F; @@ -372,12 +372,12 @@ public class DaggerRender extends Render else { GL11.glDisable(GL11.GL_LIGHTING); - ResourceLocation resourcelocation = par2TextureManager.func_130087_a(par3ItemStack.getItemSpriteNumber()); - par2TextureManager.func_110577_a(resourcelocation); + ResourceLocation resourcelocation = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber()); + par2TextureManager.bindTexture(resourcelocation); if (object == null) { - object = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(resourcelocation)).func_110572_b("missingno"); + object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)).getAtlasSprite("missingno"); } i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); @@ -407,7 +407,7 @@ public class DaggerRender extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - manager.func_110577_a(field_110798_h); + manager.bindTexture(field_110798_h); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); @@ -438,7 +438,7 @@ public class DaggerRender extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - par2TextureManager.func_110577_a(field_110798_h); + par2TextureManager.bindTexture(field_110798_h); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); @@ -560,7 +560,7 @@ public class DaggerRender extends Render tessellator.draw(); } - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return this.func_110796_a((DaggerEntity) par1Entity); } diff --git a/src/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/tconstruct/client/entity/projectile/DaggerRenderCustom.java index 8ddd101a..fbfc9473 100644 --- a/src/tconstruct/client/entity/projectile/DaggerRenderCustom.java +++ b/src/tconstruct/client/entity/projectile/DaggerRenderCustom.java @@ -98,13 +98,13 @@ public class DaggerRenderCustom extends Render this.doRenderItem((DaggerEntity) par1Entity, par2, par4, par6, par8, par9); } - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { return this.func_110796_a((DaggerEntity) par1Entity); } protected ResourceLocation func_110796_a (DaggerEntity par1ArrowEntity) { - return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } } diff --git a/src/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/tconstruct/client/entity/projectile/LaunchedItemRender.java index 1c14b7fc..b76fffa9 100644 --- a/src/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -51,7 +51,7 @@ public class LaunchedItemRender extends Render GL11.glTranslatef((float) par2, (float) par4, (float) par6); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glScalef(0.5F, 0.5F, 0.5F); - this.func_110777_b(par1Entity); + this.bindEntityTexture(par1Entity); Tessellator tessellator = Tessellator.instance; if (icon == ItemPotion.func_94589_d("bottle_splash")) @@ -73,9 +73,9 @@ public class LaunchedItemRender extends Render } } - protected ResourceLocation func_110775_a (Entity par1Entity) + protected ResourceLocation getEntityTexture (Entity par1Entity) { - return TextureMap.field_110576_c; + return TextureMap.locationItemsTexture; } private void func_77026_a (Tessellator par1Tessellator, Icon par2Icon) @@ -97,4 +97,5 @@ public class LaunchedItemRender extends Render par1Tessellator.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); par1Tessellator.draw(); } + } diff --git a/src/tconstruct/client/event/EventCloakRender.java b/src/tconstruct/client/event/EventCloakRender.java index 03f82a48..cb225240 100644 --- a/src/tconstruct/client/event/EventCloakRender.java +++ b/src/tconstruct/client/event/EventCloakRender.java @@ -54,7 +54,7 @@ public class EventCloakRender capePlayers.add(abstractClientPlayer); - abstractClientPlayer.func_110310_o().field_110559_g = false; + abstractClientPlayer.getTextureCape().textureUploaded = false; new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); event.renderCape = true; } @@ -123,7 +123,7 @@ public class EventCloakRender Image cape = new ImageIcon(new URL(cloakURL)).getImage(); BufferedImage bo = new BufferedImage(cape.getWidth(null), cape.getHeight(null), BufferedImage.TYPE_INT_ARGB); bo.getGraphics().drawImage(cape, 0, 0, null); - abstractClientPlayer.func_110310_o().field_110560_d = bo; + abstractClientPlayer.getTextureCape().bufferedImage = bo; } catch (MalformedURLException e) { diff --git a/src/tconstruct/client/gui/ArmorExtendedGui.java b/src/tconstruct/client/gui/ArmorExtendedGui.java index b407caf0..2de013bc 100644 --- a/src/tconstruct/client/gui/ArmorExtendedGui.java +++ b/src/tconstruct/client/gui/ArmorExtendedGui.java @@ -85,7 +85,7 @@ public class ArmorExtendedGui extends InventoryEffectRenderer { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); //mc.renderEngine.bindTexture("/mods/tinker/textures/gui/armorextended.png"); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = guiLeft; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/src/tconstruct/client/gui/CraftingStationGui.java b/src/tconstruct/client/gui/CraftingStationGui.java index 722d5a29..387e20e9 100644 --- a/src/tconstruct/client/gui/CraftingStationGui.java +++ b/src/tconstruct/client/gui/CraftingStationGui.java @@ -35,7 +35,7 @@ public class CraftingStationGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int l = (width - xSize) / 2; int i1 = (height - ySize) / 2; drawTexturedModalRect(l, i1, 0, 0, xSize, ySize); diff --git a/src/tconstruct/client/gui/DrawbridgeButton.java b/src/tconstruct/client/gui/DrawbridgeButton.java index 07c561e4..21d9e69c 100644 --- a/src/tconstruct/client/gui/DrawbridgeButton.java +++ b/src/tconstruct/client/gui/DrawbridgeButton.java @@ -36,7 +36,7 @@ public class DrawbridgeButton extends GuiButton { boolean hovering = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.func_110434_K().func_110577_a(background); + mc.getTextureManager().bindTexture(background); int offset = 0; if (!this.enabled) offset = 46; diff --git a/src/tconstruct/client/gui/DrawbridgeGui.java b/src/tconstruct/client/gui/DrawbridgeGui.java index c015766c..65835819 100644 --- a/src/tconstruct/client/gui/DrawbridgeGui.java +++ b/src/tconstruct/client/gui/DrawbridgeGui.java @@ -38,7 +38,7 @@ public class DrawbridgeGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/src/tconstruct/client/gui/FrypanGui.java b/src/tconstruct/client/gui/FrypanGui.java index a26686e9..8506551a 100644 --- a/src/tconstruct/client/gui/FrypanGui.java +++ b/src/tconstruct/client/gui/FrypanGui.java @@ -31,7 +31,7 @@ public class FrypanGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/src/tconstruct/client/gui/GuiButtonTool.java b/src/tconstruct/client/gui/GuiButtonTool.java index ef4d3de8..87996618 100644 --- a/src/tconstruct/client/gui/GuiButtonTool.java +++ b/src/tconstruct/client/gui/GuiButtonTool.java @@ -42,7 +42,7 @@ public class GuiButtonTool extends GuiButton { boolean var4 = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.func_110434_K().func_110577_a(background); + mc.getTextureManager().bindTexture(background); this.field_82253_i = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; int var5 = this.getHoverState(this.field_82253_i); diff --git a/src/tconstruct/client/gui/GuiLandmine.java b/src/tconstruct/client/gui/GuiLandmine.java index f5c927bf..cd0c70f5 100644 --- a/src/tconstruct/client/gui/GuiLandmine.java +++ b/src/tconstruct/client/gui/GuiLandmine.java @@ -77,7 +77,7 @@ public class GuiLandmine extends GuiContainer protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_110577_a(background); + mc.renderEngine.bindTexture(background); int x = (width - xSize) / 2; int y = (height - ySize) / 2; this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); diff --git a/src/tconstruct/client/gui/GuiManual.java b/src/tconstruct/client/gui/GuiManual.java index e5fe4699..1c985d93 100644 --- a/src/tconstruct/client/gui/GuiManual.java +++ b/src/tconstruct/client/gui/GuiManual.java @@ -158,13 +158,13 @@ public class GuiManual extends GuiScreen public void drawScreen (int par1, int par2, float par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(bookRight); + this.mc.getTextureManager().bindTexture(bookRight); int localWidth = (this.width) / 2; byte localHeight = 8; this.drawTexturedModalRect(localWidth, localHeight, 0, 0, this.bookImageWidth, this.bookImageHeight); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(bookLeft); + this.mc.getTextureManager().bindTexture(bookLeft); localWidth = localWidth - this.bookImageWidth; this.drawTexturedModalRect(localWidth, localHeight, 256 - this.bookImageWidth, 0, this.bookImageWidth, this.bookImageHeight); diff --git a/src/tconstruct/client/gui/KnapsackGui.java b/src/tconstruct/client/gui/KnapsackGui.java index ae6a5ea0..c7a37295 100644 --- a/src/tconstruct/client/gui/KnapsackGui.java +++ b/src/tconstruct/client/gui/KnapsackGui.java @@ -53,7 +53,7 @@ public class KnapsackGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = guiLeft; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/src/tconstruct/client/gui/MiniGardyGui.java b/src/tconstruct/client/gui/MiniGardyGui.java index e65e3ade..5273ce3e 100644 --- a/src/tconstruct/client/gui/MiniGardyGui.java +++ b/src/tconstruct/client/gui/MiniGardyGui.java @@ -31,7 +31,7 @@ public class MiniGardyGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/src/tconstruct/client/gui/NewContainerGui.java b/src/tconstruct/client/gui/NewContainerGui.java index bcd556b2..b86e9506 100644 --- a/src/tconstruct/client/gui/NewContainerGui.java +++ b/src/tconstruct/client/gui/NewContainerGui.java @@ -415,7 +415,7 @@ public abstract class NewContainerGui extends GuiScreen if (icon != null) { GL11.glDisable(GL11.GL_LIGHTING); - this.mc.func_110434_K().func_110577_a(TextureMap.field_110576_c); + this.mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture); this.drawTexturedModelRectFromIcon(i, j, icon, 16, 16); GL11.glEnable(GL11.GL_LIGHTING); flag1 = true; diff --git a/src/tconstruct/client/gui/PartCrafterGui.java b/src/tconstruct/client/gui/PartCrafterGui.java index ee2c3f01..d9c41d8d 100644 --- a/src/tconstruct/client/gui/PartCrafterGui.java +++ b/src/tconstruct/client/gui/PartCrafterGui.java @@ -156,7 +156,7 @@ public class PartCrafterGui extends NewContainerGui { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); @@ -184,13 +184,13 @@ public class PartCrafterGui extends NewContainerGui if (drawChestPart) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(minichest); + this.mc.getTextureManager().bindTexture(minichest); this.drawTexturedModalRect(cornerX - 116, cornerY + 11, 0, 0, this.xSize, this.ySize); } // Draw description GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(description); + this.mc.getTextureManager().bindTexture(description); cornerX = (this.width + this.xSize) / 2; cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 126, 0, 126, this.ySize); diff --git a/src/tconstruct/client/gui/PatternChestGui.java b/src/tconstruct/client/gui/PatternChestGui.java index cb7a99be..b4b57f5c 100644 --- a/src/tconstruct/client/gui/PatternChestGui.java +++ b/src/tconstruct/client/gui/PatternChestGui.java @@ -33,7 +33,7 @@ public class PatternChestGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/src/tconstruct/client/gui/SmelteryGui.java b/src/tconstruct/client/gui/SmelteryGui.java index b665f0ac..4a36ac6a 100644 --- a/src/tconstruct/client/gui/SmelteryGui.java +++ b/src/tconstruct/client/gui/SmelteryGui.java @@ -153,13 +153,13 @@ public class SmelteryGui extends NewContainerGui protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2 + 36; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX + 46, cornerY, 0, 0, 176, ySize); //Fuel - Lava - this.mc.func_110434_K().func_110577_a(TextureMap.field_110575_b); + this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); if (logic.fuelGague > 0) { Icon lavaIcon = Block.lavaStill.getIcon(0, 0); @@ -206,12 +206,12 @@ public class SmelteryGui extends NewContainerGui //Liquid gague GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); drawTexturedModalRect(cornerX + 54, cornerY + 16, 176, 76, 52, 52); //Side inventory GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(backgroundSide); + this.mc.getTextureManager().bindTexture(backgroundSide); if (logic.layers > 0) { if (logic.layers == 1) diff --git a/src/tconstruct/client/gui/StencilTableGui.java b/src/tconstruct/client/gui/StencilTableGui.java index 4a462656..f2a25592 100644 --- a/src/tconstruct/client/gui/StencilTableGui.java +++ b/src/tconstruct/client/gui/StencilTableGui.java @@ -49,7 +49,7 @@ public class StencilTableGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); diff --git a/src/tconstruct/client/gui/ToolStationGui.java b/src/tconstruct/client/gui/ToolStationGui.java index e9cc8554..2981d34c 100644 --- a/src/tconstruct/client/gui/ToolStationGui.java +++ b/src/tconstruct/client/gui/ToolStationGui.java @@ -431,7 +431,7 @@ public class ToolStationGui extends NewContainerGui { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); + this.mc.getTextureManager().bindTexture(background); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); @@ -442,7 +442,7 @@ public class ToolStationGui extends NewContainerGui } GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(icons); + this.mc.getTextureManager().bindTexture(icons); // Draw the slots for (int i = 0; i < slotX.length; i++) @@ -456,7 +456,7 @@ public class ToolStationGui extends NewContainerGui // Draw description GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(description); + this.mc.getTextureManager().bindTexture(description); cornerX = (this.width + this.xSize) / 2; cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30); diff --git a/src/tconstruct/client/gui/TurnPageButton.java b/src/tconstruct/client/gui/TurnPageButton.java index 0b1f89ca..13571d40 100644 --- a/src/tconstruct/client/gui/TurnPageButton.java +++ b/src/tconstruct/client/gui/TurnPageButton.java @@ -34,7 +34,7 @@ public class TurnPageButton extends GuiButton { boolean var4 = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - par1Minecraft.func_110434_K().func_110577_a(background); + par1Minecraft.getTextureManager().bindTexture(background); int var5 = 0; int var6 = 192; diff --git a/src/tconstruct/client/pages/BlockCastPage.java b/src/tconstruct/client/pages/BlockCastPage.java index 8abd0931..55439f1c 100644 --- a/src/tconstruct/client/pages/BlockCastPage.java +++ b/src/tconstruct/client/pages/BlockCastPage.java @@ -60,7 +60,7 @@ public class BlockCastPage extends BookPage public void renderBackgroundLayer (int localWidth, int localHeight) { - manual.getMC().func_110434_K().func_110577_a(background); + manual.getMC().getTextureManager().bindTexture(background); manual.drawTexturedModalRect(localWidth, localHeight + 32, 0, 0, 174, 115); manual.drawTexturedModalRect(localWidth + 62, localHeight + 105, 2, 118, 45, 45); } diff --git a/src/tconstruct/client/pages/CraftingPage.java b/src/tconstruct/client/pages/CraftingPage.java index 48d2f532..ea1fdb6d 100644 --- a/src/tconstruct/client/pages/CraftingPage.java +++ b/src/tconstruct/client/pages/CraftingPage.java @@ -95,7 +95,7 @@ public class CraftingPage extends BookPage public void drawBackground (int size, int localWidth, int localHeight) { - manual.getMC().func_110434_K().func_110577_a(background); + manual.getMC().getTextureManager().bindTexture(background); if (size == 2) manual.drawTexturedModalRect(localWidth + 8, localHeight + 46, 0, 116, 154, 78); if (size == 3) diff --git a/src/tconstruct/client/pages/FurnacePage.java b/src/tconstruct/client/pages/FurnacePage.java index e1958af3..d32f7541 100644 --- a/src/tconstruct/client/pages/FurnacePage.java +++ b/src/tconstruct/client/pages/FurnacePage.java @@ -56,7 +56,7 @@ public class FurnacePage extends BookPage public void renderBackgroundLayer (int localWidth, int localHeight) { - manual.getMC().func_110434_K().func_110577_a(background); + manual.getMC().getTextureManager().bindTexture(background); manual.drawTexturedModalRect(localWidth + 32, localHeight + 32, 0, 0, 111, 114); } } diff --git a/src/tconstruct/client/pages/ModifierPage.java b/src/tconstruct/client/pages/ModifierPage.java index 3530b6a8..f156be0b 100644 --- a/src/tconstruct/client/pages/ModifierPage.java +++ b/src/tconstruct/client/pages/ModifierPage.java @@ -57,7 +57,7 @@ public class ModifierPage extends BookPage public void renderBackgroundLayer (int localWidth, int localHeight) { - manual.getMC().func_110434_K().func_110577_a(background); + manual.getMC().getTextureManager().bindTexture(background); manual.drawTexturedModalRect(localWidth + 12, localHeight + 32, 0, 0, 154, 78); } } diff --git a/src/tconstruct/client/pages/PicturePage.java b/src/tconstruct/client/pages/PicturePage.java index 074dab75..d4011434 100644 --- a/src/tconstruct/client/pages/PicturePage.java +++ b/src/tconstruct/client/pages/PicturePage.java @@ -34,7 +34,7 @@ public class PicturePage extends BookPage public void renderBackgroundLayer (int localWidth, int localHeight) { - manual.getMC().func_110434_K().func_110577_a(background); + manual.getMC().getTextureManager().bindTexture(background); //manual.getMC().renderEngine.bindTexture(location); manual.drawTexturedModalRect(localWidth, localHeight + 12, 0, 0, 170, 144); } diff --git a/src/tconstruct/client/tabs/AbstractTab.java b/src/tconstruct/client/tabs/AbstractTab.java index d844a209..d473a37a 100644 --- a/src/tconstruct/client/tabs/AbstractTab.java +++ b/src/tconstruct/client/tabs/AbstractTab.java @@ -32,7 +32,7 @@ public abstract class AbstractTab extends GuiButton int ySize = this.enabled ? 28 : 32; int xOffset = this.id == 2 ? 0 : 1; - mc.renderEngine.func_110577_a(this.texture); + mc.renderEngine.bindTexture(this.texture); this.drawTexturedModalRect(this.xPosition, this.yPosition, xOffset * 28, yTexPos, 28, ySize); RenderHelper.enableGUIStandardItemLighting(); diff --git a/src/tconstruct/dimension/TinkerChunkProvider.java b/src/tconstruct/dimension/TinkerChunkProvider.java index f8eb36a7..b1044b07 100644 --- a/src/tconstruct/dimension/TinkerChunkProvider.java +++ b/src/tconstruct/dimension/TinkerChunkProvider.java @@ -547,10 +547,9 @@ public class TinkerChunkProvider implements IChunkProvider this.genNetherBridge.generate(this, this.worldObj, par1, par2, (byte[]) null); } - @Override - public void func_104112_b () - { - // TODO Auto-generated method stub - - } + @Override + public void saveExtraData() { + // TODO Auto-generated method stub + + } } diff --git a/src/tconstruct/entity/BlueSlime.java b/src/tconstruct/entity/BlueSlime.java index 30a0951d..c879213d 100644 --- a/src/tconstruct/entity/BlueSlime.java +++ b/src/tconstruct/entity/BlueSlime.java @@ -1,15 +1,9 @@ package tconstruct.entity; -import tconstruct.TConstruct; -import tconstruct.common.TContent; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.ToolCore; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingData; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.SpiderEffectsGroupData; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntitySkeleton; @@ -19,13 +13,17 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import tconstruct.TConstruct; +import tconstruct.common.TContent; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.tools.ToolCore; public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData { @@ -53,6 +51,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData this.slimeJumpDelay = this.rand.nextInt(120) + 40; this.setSlimeSize(size); this.jumpMovementFactor = 0.004F * size + 0.01F; + this.setHealth(getMaxHealthForSize()); } protected void damageEntity (DamageSource damageSource, int damage) @@ -122,13 +121,13 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData public EntityLivingData func_110161_a (EntityLivingData par1EntityLivingData) { - Object par1EntityLivingData1 = super.func_110161_a(par1EntityLivingData); + Object par1EntityLivingData1 = super.onSpawnWithEgg(par1EntityLivingData); if (getSlimeSize() == 2 && rand.nextInt(8) == 0) { EntitySkeleton entityskeleton = new EntitySkeleton(this.worldObj); entityskeleton.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F); - entityskeleton.func_110161_a(par1EntityLivingData); + entityskeleton.onSpawnWithEgg(par1EntityLivingData); this.worldObj.spawnEntityInWorld(entityskeleton); entityskeleton.mountEntity(this); } @@ -136,7 +135,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData { EntityCreeper creeper = new EntityCreeper(this.worldObj); creeper.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F); - creeper.func_110161_a(par1EntityLivingData); + creeper.onSpawnWithEgg(par1EntityLivingData); this.worldObj.spawnEntityInWorld(creeper); creeper.mountEntity(this); } @@ -157,7 +156,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData EntitySkeleton skelton = new EntitySkeleton(this.worldObj); skelton.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F); - skelton.func_110161_a(par1EntityLivingData); + skelton.onSpawnWithEgg(par1EntityLivingData); this.worldObj.spawnEntityInWorld(skelton); skelton.mountEntity(slime); } @@ -274,22 +273,23 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData this.dataWatcher.updateObject(16, new Byte((byte) size)); this.setSize(0.6F * (float) size, 0.6F * (float) size); this.setPosition(this.posX, this.posY, this.posZ); - this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(this.getMaxHealth()); - this.setEntityHealth(this.func_110138_aP()); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.getMaxHealth()); + this.setHealth(this.getMaxHealth()); this.experienceValue = size + 2 ^ (size); if (size >= 8) this.experienceValue = 500; } - public int getMaxHealth () + // Invoked by constructor to set max health dependant on current size + private float getMaxHealthForSize () { int i = this.getSlimeSize(); if (i == 1) return 4; if (i == 8) return 100; - return (int) Math.min(i * i + 8, 49); + return (float)Math.min(i * i + 8, 49); } /** @@ -461,7 +461,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData { int size = this.getSlimeSize(); - if (!this.worldObj.isRemote && size > 1 && this.func_110143_aJ() <= 0 && size < 8) + if (!this.worldObj.isRemote && size > 1 && this.getHealth() <= 0 && size < 8) { float f = (-0.5F) * (float) size / 4.0F; float f1 = (-0.5F) * (float) size / 4.0F; diff --git a/src/tconstruct/entity/MetalSlime.java b/src/tconstruct/entity/MetalSlime.java index 90ad99f8..d9b03404 100644 --- a/src/tconstruct/entity/MetalSlime.java +++ b/src/tconstruct/entity/MetalSlime.java @@ -11,6 +11,7 @@ public class MetalSlime extends BlueSlime { super(world); //this.texture = "/mods/tinker/textures/mob/slimemetal.png"; + this.setHealth(getMaxHealthForSize()); } public boolean attackEntityFrom (DamageSource damageSource, int damage) @@ -20,12 +21,13 @@ public class MetalSlime extends BlueSlime return super.attackEntityFrom(damageSource, damage); } - public int getMaxHealth () + // Invoked by constructor to set max health dependant on current size + private float getMaxHealthForSize () { int i = this.getSlimeSize(); if (i == 1) return 4; - return (int) Math.min(i * i + 20, 100); + return (float) Math.min(i * i + 20, 100); } public int getTotalArmorValue () diff --git a/src/tconstruct/entity/projectile/ArrowEntity.java b/src/tconstruct/entity/projectile/ArrowEntity.java index ebc783e1..0832c947 100644 --- a/src/tconstruct/entity/projectile/ArrowEntity.java +++ b/src/tconstruct/entity/projectile/ArrowEntity.java @@ -186,7 +186,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa { EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; - if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).func_96122_a(entityplayer)) + if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { movingobjectposition = null; } diff --git a/src/tconstruct/items/TitleIcon.java b/src/tconstruct/items/TitleIcon.java index 2dede4b3..585188f0 100644 --- a/src/tconstruct/items/TitleIcon.java +++ b/src/tconstruct/items/TitleIcon.java @@ -152,7 +152,7 @@ public class TitleIcon extends Item if (!world.isRemote) { entity.setPosition(x, y, z); - ((EntityLiving) entity).func_110161_a((EntityLivingData) null); + ((EntityLiving) entity).onSpawnWithEgg((EntityLivingData) null); world.spawnEntityInWorld(entity); } } @@ -163,7 +163,7 @@ public class TitleIcon extends Item { entity.setPosition(x, y, z); entity.setAngles(player.cameraYaw, player.cameraYaw); - ((EntityLiving) entity).func_110161_a((EntityLivingData) null); + ((EntityLiving) entity).onSpawnWithEgg((EntityLivingData) null); world.spawnEntityInWorld(entity); } } diff --git a/src/tconstruct/items/blocks/LavaTankItemBlock.java b/src/tconstruct/items/blocks/LavaTankItemBlock.java index 8743267b..926b1251 100644 --- a/src/tconstruct/items/blocks/LavaTankItemBlock.java +++ b/src/tconstruct/items/blocks/LavaTankItemBlock.java @@ -7,6 +7,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; public class LavaTankItemBlock extends ItemBlock { @@ -37,7 +38,7 @@ public class LavaTankItemBlock extends ItemBlock NBTTagCompound liquidTag = stack.getTagCompound().getCompoundTag("Fluid"); if (liquidTag != null) { - list.add("Contains " + liquidTag.getString("FluidName")); + list.add("Contains " + StatCollector.translateToLocal(liquidTag.getString("FluidName"))); list.add(liquidTag.getInteger("Amount") + " mB"); } } diff --git a/src/tconstruct/items/tools/FryingPan.java b/src/tconstruct/items/tools/FryingPan.java index 3548d6b5..58639d1a 100644 --- a/src/tconstruct/items/tools/FryingPan.java +++ b/src/tconstruct/items/tools/FryingPan.java @@ -41,7 +41,7 @@ public class FryingPan extends Weapon @Override public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity mob) { - if (mob.canAttackWithItem() && !mob.func_85031_j(player) && mob.hurtResistantTime < 14) + if (mob.canAttackWithItem() && !mob.hitByEntity(player) && mob.hurtResistantTime < 14) AbilityHelper.onLeftClickEntity(stack, player, mob, this); return true; } diff --git a/src/tconstruct/library/tools/AbilityHelper.java b/src/tconstruct/library/tools/AbilityHelper.java index 08f74e95..f6b0b307 100644 --- a/src/tconstruct/library/tools/AbilityHelper.java +++ b/src/tconstruct/library/tools/AbilityHelper.java @@ -73,7 +73,7 @@ public class AbilityHelper { if (entity.canAttackWithItem() && stack.hasTagCompound()) { - if (!entity.func_85031_j(player)) // can't attack this entity + if (!entity.hitByEntity(player)) // can't attack this entity { NBTTagCompound tags = stack.getTagCompound(); NBTTagCompound toolTags = stack.getTagCompound().getCompoundTag("InfiTool"); @@ -206,7 +206,7 @@ public class AbilityHelper } //damageTool(stack, 1, player, false); tool.onEntityDamaged(player.worldObj, player, entity); - if (!PHConstruct.necroticUHS || (entity instanceof IMob && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).func_110143_aJ() <= 0)) + if (!PHConstruct.necroticUHS || (entity instanceof IMob && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).getHealth() <= 0)) { int drain = toolTags.getInteger("Necrotic") * 2; if (drain > 0) @@ -240,7 +240,7 @@ public class AbilityHelper } } - player.func_130011_c(entity); + player.setLastAttacker(entity); if (entity instanceof EntityLivingBase) { @@ -308,7 +308,7 @@ public class AbilityHelper } } - if (!(living instanceof EntityPlayer) || player.func_96122_a((EntityPlayer) living)) + if (!(living instanceof EntityPlayer) || player.canAttackPlayer((EntityPlayer) living)) { List var6 = player.worldObj.getEntitiesWithinAABB(EntityWolf.class, AxisAlignedBB.getAABBPool().getAABB(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D)); diff --git a/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java b/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java index 2ba82751..a851fcd6 100644 --- a/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java +++ b/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java @@ -1,23 +1,21 @@ package tconstruct.plugins.minefactoryreloaded; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.network.NetworkMod; import net.minecraft.item.ItemStack; import powercrystals.minefactoryreloaded.api.FarmingRegistry; import tconstruct.common.TContent; import tconstruct.entity.BlueSlime; import tconstruct.plugins.minefactoryreloaded.grindables.GrindableStandard; import tconstruct.plugins.minefactoryreloaded.harvestables.HarvestableOreBerry; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.Init; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.network.NetworkMod; @Mod(modid = "TConstruct|CompatMineFactoryReloaded", name = "TConstruct Compat: MFR", version = "0.1", dependencies = "after:MineFactoryReloaded;after:TConstruct") @NetworkMod(clientSideRequired = false, serverSideRequired = false) public class MineFactoryReloaded { - @Init + @EventHandler public static void load (FMLInitializationEvent ev) { if (!Loader.isModLoaded("MineFactoryReloaded")) diff --git a/src/tconstruct/util/TEventHandler.java b/src/tconstruct/util/TEventHandler.java index 32c2535a..06943346 100644 --- a/src/tconstruct/util/TEventHandler.java +++ b/src/tconstruct/util/TEventHandler.java @@ -1,8 +1,5 @@ package tconstruct.util; -import java.util.ArrayList; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -10,12 +7,7 @@ import net.minecraft.entity.EntityLivingData; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntitySpider; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.monster.*; import net.minecraft.entity.passive.EntityChicken; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -46,14 +38,13 @@ import tconstruct.library.crafting.Smeltery; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.event.PartBuilderEvent; import tconstruct.library.event.ToolCraftEvent; -import tconstruct.library.tools.ArrowMaterial; -import tconstruct.library.tools.BowMaterial; -import tconstruct.library.tools.BowstringMaterial; -import tconstruct.library.tools.FletchingMaterial; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.*; import tconstruct.modifiers.ModAttack; import tconstruct.util.player.TPlayerStats; +import java.util.ArrayList; +import java.util.Random; + public class TEventHandler { Random random = new Random(); @@ -413,8 +404,11 @@ public class TEventHandler if (!player.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); - stats.armor.dropItems(); - stats.knapsack.dropItems(); + if (stats != null) + { + stats.armor.dropItems(); + stats.knapsack.dropItems(); + } } } } @@ -464,7 +458,7 @@ public class TEventHandler if (!world.isRemote) { entity.setPosition(x, y, z); - entity.func_110161_a((EntityLivingData) null); + entity.onSpawnWithEgg((EntityLivingData) null); world.spawnEntityInWorld(entity); } } diff --git a/src/tconstruct/util/player/ArmorExtended.java b/src/tconstruct/util/player/ArmorExtended.java index dcad8d2d..2d4df3fe 100644 --- a/src/tconstruct/util/player/ArmorExtended.java +++ b/src/tconstruct/util/player/ArmorExtended.java @@ -176,16 +176,16 @@ public class ArmorExtended implements IInventory //System.out.println("healthChange: "+healthChange+" on side "+FMLCommonHandler.instance().getEffectiveSide()); if (healthChange != 0) { - AttributeInstance attributeinstance = player.func_110140_aT().func_111151_a(SharedMonsterAttributes.field_111267_a); + AttributeInstance attributeinstance = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth); try { - attributeinstance.func_111124_b(attributeinstance.func_111127_a(globalID)); + attributeinstance.removeModifier(attributeinstance.getModifier(globalID)); } catch (Exception e) { } - attributeinstance.func_111121_a(new AttributeModifier(globalID, "tconstruct.heartCanister", bonusHP, 0)); + attributeinstance.applyModifier(new AttributeModifier(globalID, "tconstruct.heartCanister", bonusHP, 0)); } } } @@ -202,10 +202,10 @@ public class ArmorExtended implements IInventory int healthChange = bonusHP - prevHealth; if (healthChange != 0) { - AttributeInstance attributeinstance = player.func_110140_aT().func_111151_a(SharedMonsterAttributes.field_111267_a); + AttributeInstance attributeinstance = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth); try { - attributeinstance.func_111124_b(attributeinstance.func_111127_a(globalID)); + attributeinstance.removeModifier(attributeinstance.getModifier(globalID)); } catch (Exception e) { diff --git a/test/XinStick.java b/test/XinStick.java index 8f4abf77..62ef982a 100644 --- a/test/XinStick.java +++ b/test/XinStick.java @@ -67,7 +67,7 @@ public class XinStick extends Item public static void healPlayer (EntityPlayer player) { - player.setEntityHealth(50); + player.setHealth(50); } public static void spawnItem (double x, double y, double z, ItemStack stack, World world)