diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml index ab91853a..71ae3354 100644 --- a/assets/tinker/lang/en_US.xml +++ b/assets/tinker/lang/en_US.xml @@ -175,16 +175,8 @@ Aluminum Nugget Fake Essence Crystal Aluminum Brass Nugget -<<<<<<< HEAD:assets/tinker/lang/en_US.xml -<<<<<<< HEAD:assets/tinker/lang/en_US.xml Silky Cloth Silky Jewel -======= ->>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml -======= - Silky Cloth - Silky Jewel ->>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml Obsidian Nugget Cobalt Nugget Ardite Nugget @@ -192,11 +184,6 @@ Bronze Nugget Alumite Nugget Steel Nugget -<<<<<<< HEAD:assets/tinker/lang/en_US.xml - - Essence Crystal -======= ->>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml Essence Crystal @@ -220,25 +207,13 @@ Drawbridge Igniter Landmine -<<<<<<< HEAD:assets/tinker/lang/en_US.xml -<<<<<<< HEAD:assets/tinker/lang/en_US.xml -======= ->>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml + Punji Stick Oak Barricade Spruce Barricade Birch Barricade Jungle Barricade -<<<<<<< HEAD:assets/tinker/lang/en_US.xml -<<<<<<< HEAD:assets/tinker/lang/en_US.xml Essence Extractor -======= ->>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml -======= ->>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml -======= - Essence Extractor ->>>>>>> Added early essence extractor, liquid ender, updated lang files:mods/tinker/resources/lang/en_US.xml Block of Cobalt Block of Ardite @@ -363,15 +338,11 @@ Molten Invar Bucket Molten Electrum Bucket Liquified Ender Bucket -<<<<<<< HEAD:assets/tinker/lang/en_US.xml Liquid Slime Bucket -======= ->>>>>>> Slime islands:mods/tinker/resources/lang/en_US.xml Bowstring Enchanted Bowstring -<<<<<<< HEAD:assets/tinker/lang/en_US.xml Molten Iron Molten Gold Molten Copper @@ -396,7 +367,7 @@ Molten Invar Molten Electrum Liquified Ender -======= + Molten Iron Molten Gold Molten Copper @@ -421,7 +392,6 @@ Molten Invar Molten Electrum Liquified Ender ->>>>>>> Added early essence extractor, liquid ender, updated lang files:mods/tinker/resources/lang/en_US.xml Jeweled Apple Gelatinous Slime @@ -447,25 +417,6 @@ %1$s will be a stepping stone for our revolution! %1$s thought swimming in hot liquids was a good idea -<<<<<<< HEAD:assets/tinker/lang/en_US.xml - Wooden - Stone - Iron - Flint - Cactus - Bone - Obsidian - Slime - Paper - Cobalt - Ardite - Manyullyn - Copper - Bronze - Alumite - Steel - Slime -======= Wooden Stone Iron @@ -511,7 +462,6 @@ Bowstring Arrowhead Fletching ->>>>>>> Light Aggregator:mods/tinker/resources/lang/en_US.xml Molten Iron Molten Gold @@ -538,8 +488,4 @@ Molten Shiny Liquid Ender -<<<<<<< HEAD:assets/tinker/lang/en_US.xml - -======= - ->>>>>>> Light Aggregator:mods/tinker/resources/lang/en_US.xml + \ No newline at end of file diff --git a/mods/tinker/textures/blocks/blank.png b/assets/tinker/textures/blocks/blank.png similarity index 100% rename from mods/tinker/textures/blocks/blank.png rename to assets/tinker/textures/blocks/blank.png diff --git a/mods/tinker/textures/blocks/machines/essencecrystal.png b/assets/tinker/textures/blocks/machines/essencecrystal.png similarity index 100% rename from mods/tinker/textures/blocks/machines/essencecrystal.png rename to assets/tinker/textures/blocks/machines/essencecrystal.png diff --git a/mods/tinker/textures/blocks/machines/lightstone.png b/assets/tinker/textures/blocks/machines/lightstone.png similarity index 100% rename from mods/tinker/textures/blocks/machines/lightstone.png rename to assets/tinker/textures/blocks/machines/lightstone.png diff --git a/mods/tinker/textures/gui/extractor.png b/assets/tinker/textures/gui/extractor.png similarity index 100% rename from mods/tinker/textures/gui/extractor.png rename to assets/tinker/textures/gui/extractor.png diff --git a/mods/tinker/resources/lang/de_DE.xml b/mods/tinker/resources/lang/de_DE.xml deleted file mode 100644 index 6a1bd17c..00000000 --- a/mods/tinker/resources/lang/de_DE.xml +++ /dev/null @@ -1,464 +0,0 @@ - - - - TConstuct Werkzeuge - TConstruct Materialien - TConstruct Blöcke - - Werkzeugstation - Werkzeugesse - Basteltisch - Schablonenstanzer - Schablonenkiste - Schmelzerei - Bratpfanne - Rucksack - - Werkzeugstation - Basteltisch - Schablonenkiste - Schablonenstanzer - Gusstisch - - Werkzeugesse - Trockenregal - Schleimiger Matsch - Mörtel - Schleimiger Matsch (Blau) - Friedhoferde - Gesegnete Erde - Gusskanal - - Netherstein-Schlacke - Cobalterz - Arditerz - Kupfererz - Zinnerz - Aluminiumerz - Schlacke - - Eisenbeerenbusch - Goldbeerenbusch - Kupferbeerenbusch - Zinnbeerenbusch - Aluminiumbeerenbusch - Essenzbeerenbusch - - Eisenkies - Goldkies - Kupferkies - Zinnkies - Aluminiumkies - Kobaltkies - - Rauer Braunstein - Raue braune Straße - Braunstein - Brauner Ziegel - Braune Straße - Schöner Braunstein - Ziselierter Braustein - - Raue Braunsteinstufe - Braune Straßenstufe - Braune Stufe - Braune Ziegelstufe - Braune Straßenstufe - Schöne braune Stufe - Ziselierte Braunsteinstufe - - Obsidianziegel - Sandsteinziegel - Nethersteinziegel - Eisenziegel - Goldziegel - Diamantziegel - Lapislazuliziegel - Polierter Steinziegel - Redstoneziegel - Knochenziegel - Schleimziegel - Blauer Schleimziegel - Enderziegel - Obsidianziegel - - Schöner Obsidianziegel - Schöner Sandsteinziegel - Schöner Nethersteinziegel - Schöner Eisenziegel - Schöner Goldziegel - Schöner Diamantziegel - Schöner Lapislazuliziegel - Polierter schöner Steinziegel - Schöner Redstoneziegel - Schöner Knochenziegel - Schöner Schleimziegel - Schöner blauer Schleimziegel - Schöner Enderziegel - Schöner Obsidianziegel - Steinstraße - Schöner Steinziegel - - Wollstufe - Orange Wollstufe - Magenta Wollstufe - Hellblaue Wollstufe - Gelbe Wollstufe - Hellgrüne Wollstufe - Pinke Wollstufe - Graue Wollstufe - Hellgraue Wollstufe - Türkise Wollstufe - Violette Wollstufe - Blaue Wollstufe - Braune Wollstufe - Grüne Wollstufe - Rote Wollstufe - Schwarze Wollstufe - - Eisenbeere - Goldbeere - Kupferbeere - Zinnbeere - Aluminiumbeere - Konzentrierte Essenzbeere - - Goldener Kopf - Erschaffe - - Spitzhacke - Schaufel - Beil - Breitschwert - Langschwert - Rapier - Bratpfanne - Kampf - Dolch - Meißel - Sense - Holzfälleraxt - Hackmesser - Exkavator - Hammer - Streitaxt - Entermesser - Kurzbogen - Pfeil - Trankwerfer - - Leere Schablone - Leere Gussform - - Papierstapel - Schleimkristall - Versengter Ziegelstein - Cobaltbarren - Arditbarren - Manyullynbarren - Moosballen - Lavakristall - Nekrotischer Knochen - Kupferbarren - Zinnbarren - Aluminiumbarren - Rohaluminium - Bronzebarren - Duraluminiumbarren - Alumitbarren - Stahlbarren - Blauer Schleimkristall - Obsidianbarren - Eisenklumpen - Kupferklumpen - Zinnklumpen - Aluminiumklumpen - Falscher Essenzkristall - Duraluminiumklumpen - Seide - Seidiger Edelstein - Obsidianklumpen - Cobaltklumpen - Arditklumpen - Manyullynklumpen - Bronzeklumpen - Alumitklumpen - Stahlklumpen - - Essenzkristall - - Schmelzereikern - Schmelzereiausguss - Versengter Ziegel - Versengter Stein - Versengter Pflasterstein - Versengter Pflasterziegel - Rissiger versengter Ziegel - Versengte Straße - Versengter schöner Ziegel - Versengter ziselierter Ziegel - Versengter ziselierter Ziegel - Gusskanal - - Versengter Tank - Versengtes Glas - Versengtes Fenster - - Zugbrücke - Entzünder - Landmine - Punji-Stab - Eichen-Barrikade - Fichten-Barrikade - Birken-Barrikade - Tropen-Barrikade - Essenz-Extraktor - - Cobaltblock - Arditblock - Manyullynblock - Kupferblock - Bronzeblock - Zinnblock - Aluminiumblock - Duraluminiumblock - Alumitblock - Stahlblock - Block Soliden Enders - - Fackel - Handwerksstation - - Klares Glas - Seelenglas - Klares Seelenglas - - Klare Glasscheibe - Seelenglasscheibe - Klare Seelenglasscheibe - - Weiß getöntes Glas - Orange getöntes Glas - Magenta getöntes Glas - Hellblau getöntes Glas - Gelb getöntes Glas - Hellgrün getöntes Glas - Rosa getöntes Glas - Grau getöntes Glas - Hellgrau getöntes Glas - Türkis getöntes Glas - Violett getöntes Glas - Blau getöntes Glas - Braun getöntes Glas - Grün getöntes Glas - Rot getöntes Glas - Schwarz getöntes Glas - - Weiß getönte Glasscheibe - Orange getönte Glasscheibe - Magenta getönte Glasscheibe - Hellblau getönte Glasscheibe - Gelb getönte Glasscheibe - Hellgrün getönte Glasscheibe - Rosa getönte Glasscheibe - Grau getönte Glasscheibe - Hellgrau getönte Glasscheibe - Türkis getönte Glasscheibe - Violett getönte Glasscheibe - Blau getönte Glasscheibe - Braun getönte Glasscheibe - Grün getönte Glasscheibe - Rot getönte Glasscheibe - Schwarz getönte Glasscheibe - - Versengte Ziegelstufe - Versengte Steinstufe - Versengte Cobblestonestufe - Versengte Pflasterstufe - Versengte Straßenstufe - Versengte schöne Stufe - Versengte ziselierte Stufe - Versengte ziselierte Stufe - - Erdstufe - Myzelstufe - Schleimige Matschstufe - Mörtelstufe - Schleimige Matschstufe (blau) - Friedhofserdenstufe - Gesegnete Erdstufe - - Blaue Schleimerde - Schleimige Blätter - Schleimiger Setzling - Schleimiges Gras - Schleimiges Gras - Schleimiges Gras - Erstarrter Blauer Schleim - Erstarrter Grüner Schleim - - Rucksack - Leere Schablone - Leere Gussform - - Bogensehne - Verzauberte Bogensehne - Federne Befiederung - Blätterne Befiederung - Schleimige Befiederung - Blaue schleimige Befiederung - - Aller Anfang ist schwer - Du und deine Materialien - Die Mächtige Schmelzerei - - Eimer mit geschmolzenem Eisen - Eimer mit geschmolzenem Gold - Eimer mit geschmolzenem Kupfer - Eimer mit geschmolzenem Zinn - Eimer mit geschmolzenem Aluminium - Eimer mit geschmolzenem Cobalt - Eimer mit geschmolzenem Ardit - Eimer mit geschmolzener Bronze - Eimer mit geschmolzenem Duraluminium - Eimer mit geschmolzenem Manyullyn - Eimer mit geschmolzenem Alumit - Eimer mit geschmolzenem Obsidian - Eimer mit geschmolzenem Stahl - Eimer mit geschmolzenem Glas - Eimer mit versengtem Gestein - Eimer mit verflüssigtem Smaragd - Eimer voller Blut - Eimer mit geschmolzenem Nickel - Eimer mit geschmolzenem Blei - Eimer mit geschmolzenem Silber - Eimer mit geschmolzenem Platin - Eimer mit geschmolzenem Invar - Eimer mit geschmolzenem Elektrum - Eimer mit verflüssigtem Ender - Eimer mit flüssigem Schleim - - Bogensehne - Verzauberte Bogensehne - - Geschmolzenes Eisen - Geschmolzenes Gold - Geschmolzenes Kupfer - Geschmolzenes Zinn - Geschmolzenes Aluminium - Geschmolzenes Cobalt - Geschmolzenes Ardit - Geschmolzene Bronze - Geschmolzenes Duraluminium - Geschmolzenes Manyullyn - Geschmolzenes Alumit - Geschmolzenes Obsidian - Geschmolzener Stahl - Geschmolzenes Glas - Versengtes Gestein - Verflüssigter Smaragd - Blut - Geschmolzenes Nickel - Geschmolzenes Silber - Geschmolzenes Blei - Geschmolzenes Platin - Geschmolzenes Invar - Geschmolzenes Elektrum - Verflüssigtes Ender - - Verzierter Apfel - Essbarer Schleim - Leerer Kanister - Rotes Miniaturherz - Herzkanister - Handschuhe - - Gusstisch - Zapfhahn - Gussbecken - - Blauer Schleim - Königsschleim - Guardeschleim - Guardeschleim - - Rüstungs-GUI - Lade Capes neu - - %1$s wurde in eine Proteinmasse verwandelt - %1$s ist mit der Schmelzerei eins geworden - %1$s wird ein Meilenstein für unsere Revolution sein! - %1$s dachte, das Schwimmen in heißen Flüssigkeiten wäre eine gute Idee - - Holz - - Stein - - Eisen - - Feuterstein - - Kaktus - - Knochen - - Obsidian - - Schleim - - Papier - - Netherstein - - Cobalt - - Ardit - - Manyullyn - - Kupfer - - Bronze - - Alumit - - Stahl - - Schleim - - Thaumium - - - Werkzeuggriff - Spitzhackenkopf - Schaufelkopf - Axtkopf - Verbindung - Robuste Verbindung - Robuster Griff - Große Platte - Swertklinge - Großer Schützer - Mittelgroßer Schützer - Querstange - Messerklinge - Voller Schützer - Pfanne - Schildkopf - Meißelkopf - Sensenkopf - Breitschwertkopf - Exkavatorkopf - Große Schwerklinge - Hammerkopf - Bogensehne - Pfeilspitze - Befiederung - - Geschmolzenes Eisen - Geschmolzenes Gold - Geschmolzenes Kupfer - Geschmolzenes Zinn - Geschmolzenes Aluminum - Geschmolzenes Cobalt - Geschmolzenes Ardit - Geschmolzene Bronze - Geschmolzenes Duraluminium - Geschmolzenes Manyullyn - Geschmolzenes Alumit - Geschmolzenes Obsidian - Geschmolzener Stahl - Geschmolzenes Glas - Versengtes Gestein - Verflüssigter Smaragd - Blut - Geschmolzenes Nickel - Geschmolzenes Blei - Geschmolzenes Silber - Geschmolzenes Platin - Geschmolzenes Invar - Geschmolzenes Elektrum - Flüssiges Ender - - diff --git a/mods/tinker/resources/lang/ru_RU.xml b/mods/tinker/resources/lang/ru_RU.xml deleted file mode 100644 index d0670e68..00000000 --- a/mods/tinker/resources/lang/ru_RU.xml +++ /dev/null @@ -1,366 +0,0 @@ - - - - TConstruct инструменты - TConstruct материалы - TConstruct блоки - - Инструментальная станция - Инструментальная кузница - Создатель деталей - Трафаретный стол - Сундук со схемами - Плавильня - Сковорода - Ранец - - Инструментальная станция - Создатель деталей - Сундук со схемами - Трафаретный стол - Литейный стол - - Инструментальная кузница - Штатив для сушки - Слизистая грязь - Осадок - Слизистая грязь - Кладбищенская почва - Священная почва - - Адская окалина - Кобальтовая руда - Ардитовая руда - Медная руда - Оловянная руда - Алюминиевая руда - Каменная окалина - - Железный рудный куст - Золотой рудный куст - Медный рудный куст - Оловянный рудный куст - Алюминиевый рудный куст - Куст рудной эссенции - - Железная гравиевая руда - Золотая гравиевая руда - Медная гравиевая руда - Оловянная гравиевая руда - Алюминиевая гравиевая руда - Кобальтовая гравиевая руда - - Грубый бурый песчаник - Дорога из грубого бурого песчаника - Бурый песчаник - Кирпич из бурого песчаника - Дорога из бурого песчаника - Красивый бурый песчаник - Резной бурый песчаник - - Плита из грубого бурого песчаника - Плита из грубого дорожного бурого песчаника - Плита из бурого песчаника - Плита из кирпича бурого песчаника - Плита из дорожного бурого песчаника - Плита из красивого бурого песчаника - Плита из резного бурого песчаника - - Обсидиановый кирпич - Песчаный кирпич - Адский кирпич - Железный кирпич - Золотой кирпич - Алмазный кирпич - Лазуритовый кирпич - Кирпич из отполированного камня - Редстоун кирпич - Костяной кирпич - Слизистый кирпич - Слизистый кирпич - Кирпич из камня края - Обсидиановый кирпич - - Красивый обсидиановый кирпич - Красивый песчаный кирпич - Красивый адский кирпич - Красивый железный кирпич - Красивый золотой кирпич - Красивый алмазный кирпич - Красивый лазуритовый кирпич - Кирпич из красивого отполированного камня - Кирпич из красивого редстоуна - Красивый костяной кирпич - Красивый слизистый кирпич - Красивый слизистый кирпич - Кирпич из красивого камня края - Красивый обсидиановый кирпич - Каменная дорого - Кирпич из красивого камня - - Плита из шерсти - Плита из оранжевой шерсти - Плита из сиреневой шерсти - Плита из светло-синей шерсти - Плита из жёлтой шерсти - Плита из лаймовой шерсти - Плита из розовой шерсти - Плита из серой шерсти - Плита светло-серой шерсти - Плита из бирюзовой шерсти - Плита из фиолетовой шерсти - Плита из синей шерсти - Плита из коричневой шерсти - Плита из зелёной шерсти - Плита из красной шерсти - Плита из чёрной шерсти - - Кусочки железа - Кусочки золота - Кусочки меди - Кусочки олова - Кусочки алюминия - Кусочки концентрированной эссенции - - Золотистая голова - Spawn - - Кучка бумаги - Кристалл слизи - Обожжённый кирпич - Кобальтовый слиток - Ардитовый слиток - Мануллиновый слиток - Шарик мха - Кристалл лавы - Некротическая кость - Медный слиток - Оловянный слиток - Алюминиевый слиток - Необработанный алюминий - Бронзовый слиток - Слиток алюминиевой латуни - Алюмитовый слиток - Стальной слиток - Кристалл слизи - Обсидиановый слиток - Железный самородок - Медный самородок - Оловянный самородок - Алюминиевый самородок - Кристалл эссенции - Самородок алюминиевой латуни - Шёлковистая ткань - Шёлковистая драгоценность - Обсидиановый самородок - Кобальтовый самородок - Ардитовый самородок - Мануллиновый самородок - Бронзовый самородок - Алюмитовый самородок - Кусочек стали - - Кристалл эссенции - - Контроллер плавильни - Водосток плавильни - Обожжённые кирпичи - Обожжённый камень - Обожжённый булыжник - Обожжённая брусчатка - Потресканные обожжённые кирпичи - Обожжённая дорога - Красивые обожжённые кирпичи - Резные обожжённые кирпичи - Резные обожжённые кирпичи - Разливочный канал - - Обожжённый резервуар - Обожжённое стекло - Обожжённое окно - - Разводной мост - Воспламенитель - Фугас - Колышек - Баррикада из дуба - Баррикада из ели - Баррикада из берёзы - Баррикада из тропического дерева - Экстрактор эссенции - - Кобальтовый блок - Ардитовый блок - Мануллиновый блок - Медный блок - Бронзовый блок - Оловянный блок - Алюминиевый блок - Блок алюминиевой латуни - Алюмитовый блок - Стальной блок - Блок твёрдого эндера - - Факел - Станция крафта - - Чистое стекло - Душевное стекло - Чистое душевное стекло - - Чистая стеклянная панель - Душевная стеклянная панель - Чистая душевная стеклянная панель - - Белое стекло - Оранжевое стекло - Сиреневое стекло - Светло-синее стекло - Жёлтое стекло - Лаймовое стекло - Розовое стекло - Серое стекло - Светло-серое стекло - Бирюзовое стекло - Фиолетовое стекло - Синее стекло - Коричневое стекло - Зелёное стекло - Красное стекло - Чёрное стекло - - Белая стеклянная панель - Оранжевая стеклянная панель - Сиреневая стеклянная панель - Светло-синяя стеклянная панель - Жёлтая стеклянная панель - Лаймовая стеклянная панель - Розовая стеклянная панель - Серая стеклянная панель - Светло-серая стеклянная панель - Бирюзовая стеклянная панель - Фиолетовая стеклянная панель - Синяя стеклянная панель - Коричневая стеклянная панель - Зелёная стеклянная панель - Красная стеклянная панель - Чёрная стеклянная панель - - Плита из обожжённого кирпича - Плита из обожжённого камня - Плита из обожжённого булыжника - Плита из обожжённой брусчатки - Плита из обожжённой дороги - Красивая обожжённая плита - Резная обожжённая плита - Резная обожжённая плита - - Земляная плита - Плита из широкого мицелия - Плита из слизистой грязи - Плита из осадка - Плита из слизистой грязи - Плита из кладбищенской почвы - Плита из священной почвы - - Земля из синей слизи - Листва слизи - Слизистый саженец - Слизистая трава - Слизистая трава - Слизистая трава - Застывшая синяя слизь - Застывшая зелёная слизь - - Ранец - Пустая схема - Чистый чугун - - Тетива - Зачарованная тетива - Feather Fletching - Leaf Fletching - Slime Fletching - Slime Fletching - - Материалы и Вы - Материалы и Вы - Могучая металлургия - - Ведро расплавленного железа - Ведро расплавленного золота - Ведро расплавленной меди - Ведро расплавленного олова - Ведро расплавленного алюминия - Ведро расплавленного кобальта - Ведро расплавленного ардита - Ведро расплавленной бронзы - Ведро расплавленной алюминиевой латуни - Ведро расплавленного мануллина - Ведро расплавленного алюмита - Ведро расплавленного обсидиана - Ведро расплавленной стали - Ведро расплавленного стекла - Ведро расплавленного обожжённого камня - Ведро сжиженного изумруда - Ведро крови - Ведро расплавленного никеля - Ведро расплавленного свинца - Ведро расплавленного серебра - Ведро расплавленного блеска - Ведро расплавленного инвара - Ведро расплавленного электрума - Ведро сжиженного эндера - - Тетива - Зачарованная тетива - - Расплавленное железо - Расплавленное золото - Расплавленная медь - Жидкое олово - Расплавленной алюминий - Расплавленный кобальт - Расплавленный ардит - Расплавленная бронза - Расплавленная алюминиевая латунь - Расплавленный мануллин - Расплавленный алюмит - Расплавленный обсидиан - Расплавленная сталь - Расплавленное стекло - Расплавленный обожжённый камень - Сжиженный изумруд - Кровь - Расплавленный никель - Расплавленное серебро - Расплавленный свинец - Расплавленный блеск - Расплавленный инвар - Расплавленный электрум - Сжиженный эндер - - Драгоценное яблоко - Желатиновая слизь - Пустая жестяная коробка - Миниатюрное красное сердце - Лечащая жестяная коробка - Перчатки для перемещения земли - - Литейный стол - Seared Faucet - Литейный резервуар - - Синий слизень - Король слизней - Слизень охраник - Слизень охраник - - Armor Gui - - %1$s превратился в зелёный сойлент - %1$s сплавился с плавильней - %1$s станет ступенькой в нашей революции! - %1$s думал, что купание в горячих жидкостях хорошая идея - - diff --git a/mods/tinker/resources/lang/zh_CN.xml b/mods/tinker/resources/lang/zh_CN.xml deleted file mode 100644 index 268a5690..00000000 --- a/mods/tinker/resources/lang/zh_CN.xml +++ /dev/null @@ -1,336 +0,0 @@ - - - - 匠魂|工具 - 匠魂|材料 - 匠魂|方块 - - 工具组装台 - 工具装配站 - 零件加工台 - Stencil Table - 模具箱 - 冶炼厂 - 煎锅 - 背包 - - 工具组装台 - 零件加工台 - 模具箱 - 模具桌 - 浇铸台 - - 工具装配站 - 晾干架 - 黏滑泥泞 - 水泥 - 黏滑蓝泥泞 - 黄泉土 - 神圣土 - - 下界岩碎渣 - 钴矿石 - 阿迪特矿石 - 铜矿石 - 锡矿石 - 铝矿石 - 石渣 - - 铁矿莓丛 - 金矿莓丛 - 铜矿莓丛 - 锡矿莓丛 - 铝矿莓丛 - 精华莓丛 - - 铁矿砂砾 - 金矿砂砾 - 铜矿砂砾 - 锡矿砂砾 - 铝矿砂砾 - 钴矿砂砾 - - 光滑褐岩 - 光滑褐岩铺路石 - 褐岩 - 褐岩砖 - 褐岩铺路石 - 平滑褐岩砖 - 錾制褐岩砖 - - 光滑褐岩台阶 - 光滑褐岩铺路台阶 - 褐岩台阶 - 褐岩砖台阶 - 褐岩铺路石台阶 - 平滑褐岩砖台阶 - 錾制褐岩砖台阶 - - 黑曜石砖块 - 沙石砖块 - 平滑下界岩砖块 - 铁砖块 - 金砖块 - 钻石砖块 - 青金石砖块 - 抛光石砖块 - 红石砖块 - 白骨砖块 - 史莱姆砖块 - 蓝色史莱姆砖快 - 末地石砖块 - 黑曜石锭砖 - - 平滑黑曜石砖 - 平滑沙石砖 - 平滑下界岩砖 - 平滑铁砖 - 平滑金砖 - 平滑钻石砖 - 平滑青金石砖 - 平滑抛光石砖 - 平滑红石砖 - 平滑骨砖 - 平滑史莱姆砖 - 平滑蓝史莱姆砖 - 平滑末地石砖 - 平滑黑曜石锭砖 - 铺路石 - 平滑石砖 - - 铁矿莓丛 - 金矿莓丛 - 铜矿莓丛 - 锡矿莓丛 - 铝矿莓丛 - 精华莓丛 - - 黄金头颅 - 生成 - - 一叠纸 - 粘液球水晶 - 焦黑砖 - 钴锭t - 阿迪特锭 - 玛玉灵锭 - 苔藓球 - 熔岩水晶 - 坏死之骨 - 铜锭 - 锡锭 - 铝锭 - 生铝 - 青铜锭 - 含铝黄铜锭 - 耐酸铝锭 - 钢锭 - 蓝色史莱姆水晶 - 黑曜石锭 - 铁粒 - 铜粒 - 锡粒 - 铝粒 - 精华水晶 - 含铝黄铜粒 - 绢布 - 精致珠宝 - 黑曜石粒 - 钴粒 - 阿迪特粒 - 玛玉灵粒 - 青铜粒 - 耐酸铝粒 - 钢粒 - - 冶炼厂填料仓 - 铸造盆 - 冶炼炉砖 - 焦黑石头 - 焦黑圆石 - 焦黑盖板石 - 裂纹焦黑石砖 - 焦黑铺路石 - 平滑焦黑石砖 - 裂纹焦黑石砖 - 雕琢焦黑石砖 - - 冶炼槽 - 冶炼炉玻璃 - 冶炼炉视窗 - - 造桥器 - 点火器 - 地雷 - - 钴方块 - 阿迪特方块 - 玛玉灵方块 - 铜方块 - 青铜方块 - 锡方块 - 铝方块 - 含铝黄铜方块 - 耐酸铝方块 - 钢方块 - - 石柄火把 - - 澄澈玻璃 - 灵魂玻璃 - 澄澈灵魂玻璃 - - 澄澈玻璃板 - 灵魂玻璃板 - 澄澈灵魂玻璃板 - - 白色强化玻璃 - 橙色强化玻璃 - 品红色强化玻璃 - 浅蓝色强化玻璃 - 黄色强化玻璃 - 柠檬色强化玻璃 - 粉色强化玻璃 - 灰色强化玻璃 - 浅灰色强化玻璃 - 青色强化玻璃 - 紫色强化玻璃 - 蓝色强化玻璃 - 棕色强化玻璃 - 绿色强化玻璃 - 红色强化玻璃 - 黑色强化玻璃 - - 白色强化玻璃板 - 橙色强化玻璃板 - 品红色强化玻璃板 - 浅蓝色强化玻璃板 - 黄色强化玻璃板 - 柠檬色强化玻璃板 - 粉色强化玻璃板 - 灰色强化玻璃板 - 浅灰色强化玻璃板 - 青色强化玻璃板 - 紫色强化玻璃板 - 蓝色强化玻璃板 - 棕色强化玻璃板 - 绿色强化玻璃板 - 红色强化玻璃板 - 黑色强化玻璃板 - - 焦黑石砖台阶 - 焦黑石头台阶 - 焦黑圆石台阶 - 焦黑垫脚石台阶 - 焦黑铺路石台阶 - 平滑焦黑石头台阶 - 裂纹焦黑石头台阶 - 雕琢焦黑石头台阶 - - 泥土台阶 - 菌丝台阶 - 史莱姆台阶 - 水泥台阶 - 蓝史莱姆台阶 - 黄泉土台阶 - 混泥土台阶 - - 背包 - 空白模具 - 空白铸形 - - 弓弦 - 附魔弓弦 - 羽毛箭羽 - 树叶箭羽 - 史莱姆箭羽 - 蓝史莱姆箭羽 - - 匠魂宝典Ⅰ - 匠魂宝典Ⅱ - 冶炼秘术 - - 桶装液态铁 - 桶装液态黄金 - 桶装液态铜 - 桶装液态锡 - 桶装液态铝 - 桶装液态钴 - 桶装液态阿迪特 - 桶装液态青铜 - 桶装液态含铝黄铜 - 桶装液态玛玉灵 - 桶装液态耐酸铝 - 桶装液态黑曜石 - 桶装液态钢 - 桶装液态玻璃 - 桶装熔融石头 - 桶装液态绿宝石 - 血桶 - - 弓弦 - 附魔弓弦 - - 液态铁 - 液态黄金 - 液态铜 - 液态锡 - 液态铝 - 液态钴 - 液态阿迪特 - 液态青铜 - 液态含铝黄铜 - 液态玛玉灵 - 液态耐酸铝 - 液态黑曜石 - 液态钢 - 液态玻璃 - 熔融石头 - 液态绿宝石 - 血 - - 宝石苹果 - 胶状黏液 - 心之容器(空) - 微型红心 - 心之容器 - 鼹鼠手套 - - 浇注台 - 浇注道 - 铸造盆 - - 蓝色史莱姆 - 史莱姆王 - 史莱姆护卫 - - 装备界面 - - %1$s被加工成了"绿色食品"! - %1$s被冶炼炉融化了! - %1$s将成为我们革命的垫脚石! - %1$s认为在炽热的液体中游泳是个不错的注意! - - %1$s眼看着他们的腿被炸飞了! - %1$s被地雷炸死了! - %1$s骑着烟花火箭飞上了西天! - - 木 - 石 - 铁 - 燧石 - 仙人掌 - 骨头 - 黑曜石 - 史莱姆 - 纸 - 钴 - 阿迪特 - 玛玉灵 - 铜 - 青铜 - 耐酸铝 - 钢 - 蓝色史莱姆 - - diff --git a/mods/tinker/textures/blocks/Landmine.png b/mods/tinker/textures/blocks/Landmine.png deleted file mode 100644 index 7859155d..00000000 Binary files a/mods/tinker/textures/blocks/Landmine.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/coal_block.png b/mods/tinker/textures/blocks/coal_block.png deleted file mode 100644 index 024404bc..00000000 Binary files a/mods/tinker/textures/blocks/coal_block.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/compressed_ender.png b/mods/tinker/textures/blocks/compressed_ender.png deleted file mode 100644 index b7e9bbbc..00000000 Binary files a/mods/tinker/textures/blocks/compressed_ender.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/craftingstation_bottom.png b/mods/tinker/textures/blocks/craftingstation_bottom.png deleted file mode 100644 index 0d2abb0a..00000000 Binary files a/mods/tinker/textures/blocks/craftingstation_bottom.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/craftingstation_side.png b/mods/tinker/textures/blocks/craftingstation_side.png deleted file mode 100644 index ca9429b8..00000000 Binary files a/mods/tinker/textures/blocks/craftingstation_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/craftingstation_slab_side.png b/mods/tinker/textures/blocks/craftingstation_slab_side.png deleted file mode 100644 index a7b05200..00000000 Binary files a/mods/tinker/textures/blocks/craftingstation_slab_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/craftingstation_top.png b/mods/tinker/textures/blocks/craftingstation_top.png deleted file mode 100644 index 8d6bccfd..00000000 Binary files a/mods/tinker/textures/blocks/craftingstation_top.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/extractor_bottom.png b/mods/tinker/textures/blocks/extractor_bottom.png deleted file mode 100644 index a7755c87..00000000 Binary files a/mods/tinker/textures/blocks/extractor_bottom.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/extractor_side.png b/mods/tinker/textures/blocks/extractor_side.png deleted file mode 100644 index b9f52414..00000000 Binary files a/mods/tinker/textures/blocks/extractor_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/extractor_top.png b/mods/tinker/textures/blocks/extractor_top.png deleted file mode 100644 index 1eaf2fa1..00000000 Binary files a/mods/tinker/textures/blocks/extractor_top.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass.png b/mods/tinker/textures/blocks/glass/clear/glass.png deleted file mode 100644 index d19a2acb..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_1_d.png b/mods/tinker/textures/blocks/glass/clear/glass_1_d.png deleted file mode 100644 index 5dec6de4..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_1_l.png b/mods/tinker/textures/blocks/glass/clear/glass_1_l.png deleted file mode 100644 index 077aa122..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_1_r.png b/mods/tinker/textures/blocks/glass/clear/glass_1_r.png deleted file mode 100644 index 0e856116..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_1_u.png b/mods/tinker/textures/blocks/glass/clear/glass_1_u.png deleted file mode 100644 index 5dd6bc0d..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_dl.png b/mods/tinker/textures/blocks/glass/clear/glass_2_dl.png deleted file mode 100644 index c3dc8478..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_dr.png b/mods/tinker/textures/blocks/glass/clear/glass_2_dr.png deleted file mode 100644 index bd95cc03..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_h.png b/mods/tinker/textures/blocks/glass/clear/glass_2_h.png deleted file mode 100644 index 3f96317e..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_ul.png b/mods/tinker/textures/blocks/glass/clear/glass_2_ul.png deleted file mode 100644 index 0fc8b250..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_ur.png b/mods/tinker/textures/blocks/glass/clear/glass_2_ur.png deleted file mode 100644 index 78f01305..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_v.png b/mods/tinker/textures/blocks/glass/clear/glass_2_v.png deleted file mode 100644 index 32b79772..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_3_d.png b/mods/tinker/textures/blocks/glass/clear/glass_3_d.png deleted file mode 100644 index 437408a1..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_3_l.png b/mods/tinker/textures/blocks/glass/clear/glass_3_l.png deleted file mode 100644 index 2751be8f..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_3_r.png b/mods/tinker/textures/blocks/glass/clear/glass_3_r.png deleted file mode 100644 index bf343351..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_3_u.png b/mods/tinker/textures/blocks/glass/clear/glass_3_u.png deleted file mode 100644 index c572ca6a..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_4.png b/mods/tinker/textures/blocks/glass/clear/glass_4.png deleted file mode 100644 index 86e8064b..00000000 Binary files a/mods/tinker/textures/blocks/glass/clear/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass.png b/mods/tinker/textures/blocks/glass/soul_clear/glass.png deleted file mode 100644 index 4aa7b3ff..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_d.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_d.png deleted file mode 100644 index 53e237d9..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_l.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_l.png deleted file mode 100644 index 1d23b871..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_r.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_r.png deleted file mode 100644 index e5458cec..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_u.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_u.png deleted file mode 100644 index 6f8f67bb..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dl.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dl.png deleted file mode 100644 index 6e146e00..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dr.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dr.png deleted file mode 100644 index 127db342..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_h.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_h.png deleted file mode 100644 index ad2aefc0..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ul.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ul.png deleted file mode 100644 index 86d0d593..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ur.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ur.png deleted file mode 100644 index f62cc1ae..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_v.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_v.png deleted file mode 100644 index f294245d..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_d.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_d.png deleted file mode 100644 index 425d2513..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_l.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_l.png deleted file mode 100644 index 9c97772b..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_r.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_r.png deleted file mode 100644 index 42b4b712..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_u.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_u.png deleted file mode 100644 index 8fa09e9d..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_4.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_4.png deleted file mode 100644 index 86e8064b..00000000 Binary files a/mods/tinker/textures/blocks/glass/soul_clear/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass.png b/mods/tinker/textures/blocks/glass/stained/black/glass.png deleted file mode 100644 index 2bfc485e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/black/glass_1_d.png deleted file mode 100644 index 51834b3c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/black/glass_1_l.png deleted file mode 100644 index e0cc25d5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/black/glass_1_r.png deleted file mode 100644 index 7096acb9..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/black/glass_1_u.png deleted file mode 100644 index 02271f06..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_dl.png deleted file mode 100644 index f6145d8d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_dr.png deleted file mode 100644 index af7a5a7f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_h.png deleted file mode 100644 index 8e845802..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_ul.png deleted file mode 100644 index 5e157dfd..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_ur.png deleted file mode 100644 index 912e1923..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_v.png deleted file mode 100644 index 174fdf7a..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/black/glass_3_d.png deleted file mode 100644 index 554e613f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/black/glass_3_l.png deleted file mode 100644 index 11209f5e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/black/glass_3_r.png deleted file mode 100644 index 454035fb..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/black/glass_3_u.png deleted file mode 100644 index afa59e37..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_4.png b/mods/tinker/textures/blocks/glass/stained/black/glass_4.png deleted file mode 100644 index 4aca4a22..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/black/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass.png b/mods/tinker/textures/blocks/glass/stained/blue/glass.png deleted file mode 100644 index 9116a36d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_d.png deleted file mode 100644 index 4dba927e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_l.png deleted file mode 100644 index 13c04872..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_r.png deleted file mode 100644 index 0628bb63..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_u.png deleted file mode 100644 index 7c557864..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dl.png deleted file mode 100644 index 9ea68093..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dr.png deleted file mode 100644 index 896a452f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_h.png deleted file mode 100644 index 62f48ca4..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png deleted file mode 100644 index 514d0ec7..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ur.png deleted file mode 100644 index a1b9e7ee..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_v.png deleted file mode 100644 index d28b2b35..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_d.png deleted file mode 100644 index 6f09e6a3..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_l.png deleted file mode 100644 index 24b885a2..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_r.png deleted file mode 100644 index 80a70bd4..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_u.png deleted file mode 100644 index 1ca72fc6..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_4.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_4.png deleted file mode 100644 index cd8fb9d5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/blue/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass.png b/mods/tinker/textures/blocks/glass/stained/brown/glass.png deleted file mode 100644 index 66bb5d3b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_d.png deleted file mode 100644 index 932fc322..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_l.png deleted file mode 100644 index 4626b76e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_r.png deleted file mode 100644 index e8be00eb..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_u.png deleted file mode 100644 index 7f91e053..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dl.png deleted file mode 100644 index 4b8044ee..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dr.png deleted file mode 100644 index 7019bc31..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_h.png deleted file mode 100644 index be5cd766..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png deleted file mode 100644 index c4dfea9b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ur.png deleted file mode 100644 index 4e0931c4..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_v.png deleted file mode 100644 index f4be2e2b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_d.png deleted file mode 100644 index 0d276995..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_l.png deleted file mode 100644 index 1e24a332..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_r.png deleted file mode 100644 index 5aad18d8..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_u.png deleted file mode 100644 index 20a11a1c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_4.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_4.png deleted file mode 100644 index b3d317a7..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/brown/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass.png deleted file mode 100644 index 924fb8a8..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png deleted file mode 100644 index 282802a6..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_l.png deleted file mode 100644 index fb3fb87b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png deleted file mode 100644 index 58899d7d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_u.png deleted file mode 100644 index c045559d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dl.png deleted file mode 100644 index 13993b9f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dr.png deleted file mode 100644 index b1007c99..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png deleted file mode 100644 index 6c1e76af..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png deleted file mode 100644 index 82332e62..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ur.png deleted file mode 100644 index 43b0c9d6..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png deleted file mode 100644 index ae05e56f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_d.png deleted file mode 100644 index 25e7cea9..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png deleted file mode 100644 index 252dcb36..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_r.png deleted file mode 100644 index d338c0ee..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png deleted file mode 100644 index dbd57896..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_4.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_4.png deleted file mode 100644 index a2160882..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/cyan/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass.png b/mods/tinker/textures/blocks/glass/stained/gray/glass.png deleted file mode 100644 index 828eca1c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_d.png deleted file mode 100644 index a36221ff..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_l.png deleted file mode 100644 index 4caaddb7..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_r.png deleted file mode 100644 index 2a2282bb..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_u.png deleted file mode 100644 index 86b96fe9..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dl.png deleted file mode 100644 index 207033d3..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dr.png deleted file mode 100644 index d892f344..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_h.png deleted file mode 100644 index 39843475..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png deleted file mode 100644 index c4f1d338..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ur.png deleted file mode 100644 index 115488cd..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_v.png deleted file mode 100644 index e8c4a23c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_d.png deleted file mode 100644 index d0e11e09..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_l.png deleted file mode 100644 index 79d4e8ad..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_r.png deleted file mode 100644 index 5915a6dd..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_u.png deleted file mode 100644 index 08d24efc..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_4.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_4.png deleted file mode 100644 index 0c6d06d4..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/gray/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass.png b/mods/tinker/textures/blocks/glass/stained/green/glass.png deleted file mode 100644 index 9cc66071..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/green/glass_1_d.png deleted file mode 100644 index 88e32fc2..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/green/glass_1_l.png deleted file mode 100644 index 91cba7e6..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/green/glass_1_r.png deleted file mode 100644 index ff06b16e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/green/glass_1_u.png deleted file mode 100644 index 5b6d880c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_dl.png deleted file mode 100644 index ce1553b6..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_dr.png deleted file mode 100644 index 54ed8569..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_h.png deleted file mode 100644 index 5363339f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_ul.png deleted file mode 100644 index 3fde71a5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_ur.png deleted file mode 100644 index f4076072..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_v.png deleted file mode 100644 index efb419b9..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/green/glass_3_d.png deleted file mode 100644 index 08a1815f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/green/glass_3_l.png deleted file mode 100644 index 0ad4f56c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/green/glass_3_r.png deleted file mode 100644 index 77e8d091..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/green/glass_3_u.png deleted file mode 100644 index dcb63c93..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_4.png b/mods/tinker/textures/blocks/glass/stained/green/glass_4.png deleted file mode 100644 index 82a6dfe2..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/green/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass.png deleted file mode 100644 index ab875d1b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png deleted file mode 100644 index 226c6a6d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_l.png deleted file mode 100644 index 7b675271..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png deleted file mode 100644 index 6feb91ff..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_u.png deleted file mode 100644 index 314da07c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dl.png deleted file mode 100644 index aa8d3028..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dr.png deleted file mode 100644 index 38f450f2..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png deleted file mode 100644 index 6a172b42..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png deleted file mode 100644 index 6c2057a5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ur.png deleted file mode 100644 index 825ea57b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png deleted file mode 100644 index 658dc221..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_d.png deleted file mode 100644 index eafb911c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png deleted file mode 100644 index 18c9c64b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_r.png deleted file mode 100644 index eac910d5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png deleted file mode 100644 index 1dc3f036..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_4.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_4.png deleted file mode 100644 index 36d7f920..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass.png deleted file mode 100644 index ac95a47f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png deleted file mode 100644 index 75e66bd5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_l.png deleted file mode 100644 index 3af84acb..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png deleted file mode 100644 index 4ed4a4c4..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_u.png deleted file mode 100644 index 233b4234..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dl.png deleted file mode 100644 index 073de069..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dr.png deleted file mode 100644 index 94ba0982..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png deleted file mode 100644 index 59158cf3..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png deleted file mode 100644 index 2a723dff..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ur.png deleted file mode 100644 index d37b4e89..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png deleted file mode 100644 index 0a677c9e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_d.png deleted file mode 100644 index b744df82..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png deleted file mode 100644 index 83e0b777..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_r.png deleted file mode 100644 index d2515255..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png deleted file mode 100644 index 988dade5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_4.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_4.png deleted file mode 100644 index 6101f150..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass.png b/mods/tinker/textures/blocks/glass/stained/lime/glass.png deleted file mode 100644 index a32346e4..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_d.png deleted file mode 100644 index 683c3d15..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_l.png deleted file mode 100644 index 2f39604f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_r.png deleted file mode 100644 index 70cbc11a..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_u.png deleted file mode 100644 index 19beca01..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dl.png deleted file mode 100644 index f66d25f0..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dr.png deleted file mode 100644 index bea5fc2c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_h.png deleted file mode 100644 index a884d4c4..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png deleted file mode 100644 index 42f8acb8..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ur.png deleted file mode 100644 index d1897364..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_v.png deleted file mode 100644 index 65c77fb4..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_d.png deleted file mode 100644 index 6324c6fd..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_l.png deleted file mode 100644 index e07a768a..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_r.png deleted file mode 100644 index e4bf8054..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_u.png deleted file mode 100644 index c501379d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_4.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_4.png deleted file mode 100644 index 376ed8bf..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/lime/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass.png deleted file mode 100644 index 1e57694c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png deleted file mode 100644 index cf9da475..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_l.png deleted file mode 100644 index 388856f5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png deleted file mode 100644 index a81b9a3a..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_u.png deleted file mode 100644 index ac79d7f5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dl.png deleted file mode 100644 index 0fcb2fe6..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dr.png deleted file mode 100644 index 569ddf67..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png deleted file mode 100644 index 91e3c762..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png deleted file mode 100644 index e5aa04ca..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ur.png deleted file mode 100644 index 7f46973d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png deleted file mode 100644 index 50501f89..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_d.png deleted file mode 100644 index 7998cd28..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png deleted file mode 100644 index 1dfbf63b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_r.png deleted file mode 100644 index 341e64a1..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png deleted file mode 100644 index e9e4126d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_4.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_4.png deleted file mode 100644 index 33786330..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/magenta/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass.png b/mods/tinker/textures/blocks/glass/stained/orange/glass.png deleted file mode 100644 index 97b30ea1..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_d.png deleted file mode 100644 index 78a96d3d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_l.png deleted file mode 100644 index 2813e261..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_r.png deleted file mode 100644 index eca01a4a..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_u.png deleted file mode 100644 index 5a492582..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dl.png deleted file mode 100644 index 86b18951..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dr.png deleted file mode 100644 index 6cc80f3d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_h.png deleted file mode 100644 index 3dfca38b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png deleted file mode 100644 index 96e80a03..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ur.png deleted file mode 100644 index 4b0c91da..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_v.png deleted file mode 100644 index b96c8650..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_d.png deleted file mode 100644 index 38f52c12..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_l.png deleted file mode 100644 index 7b1f3016..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_r.png deleted file mode 100644 index ab336a40..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_u.png deleted file mode 100644 index d4742720..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_4.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_4.png deleted file mode 100644 index 7b7cc745..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/orange/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass.png b/mods/tinker/textures/blocks/glass/stained/pink/glass.png deleted file mode 100644 index ca12296d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_d.png deleted file mode 100644 index 07d1d87b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_l.png deleted file mode 100644 index f0c21536..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_r.png deleted file mode 100644 index 72684b76..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_u.png deleted file mode 100644 index b5bcbfb1..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dl.png deleted file mode 100644 index 0d3fedeb..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dr.png deleted file mode 100644 index 6797f9ed..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_h.png deleted file mode 100644 index 193b0343..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png deleted file mode 100644 index af0ccc20..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ur.png deleted file mode 100644 index c84979f8..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_v.png deleted file mode 100644 index 39883a8e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_d.png deleted file mode 100644 index 13e67cb8..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_l.png deleted file mode 100644 index 78afde4a..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_r.png deleted file mode 100644 index 0afe67e9..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_u.png deleted file mode 100644 index 6926906f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_4.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_4.png deleted file mode 100644 index 2fc8f490..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/pink/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass.png b/mods/tinker/textures/blocks/glass/stained/purple/glass.png deleted file mode 100644 index a923aac6..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_d.png deleted file mode 100644 index f213d516..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_l.png deleted file mode 100644 index 05354b89..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_r.png deleted file mode 100644 index 3f5cbc4b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_u.png deleted file mode 100644 index a674b38f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dl.png deleted file mode 100644 index 162f6bfe..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dr.png deleted file mode 100644 index e6a1b214..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_h.png deleted file mode 100644 index 6b1a9b9a..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png deleted file mode 100644 index 0f986ff2..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ur.png deleted file mode 100644 index a661ec2d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_v.png deleted file mode 100644 index be341cc7..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_d.png deleted file mode 100644 index 046b71d5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_l.png deleted file mode 100644 index ff21907f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_r.png deleted file mode 100644 index 1442b5f9..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_u.png deleted file mode 100644 index bfa706fd..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_4.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_4.png deleted file mode 100644 index 8a62e941..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/purple/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass.png b/mods/tinker/textures/blocks/glass/stained/red/glass.png deleted file mode 100644 index cb2306e1..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/red/glass_1_d.png deleted file mode 100644 index e316697f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/red/glass_1_l.png deleted file mode 100644 index d3a820eb..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/red/glass_1_r.png deleted file mode 100644 index c009e733..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/red/glass_1_u.png deleted file mode 100644 index 7dafbdf8..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_dl.png deleted file mode 100644 index af15d5d0..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_dr.png deleted file mode 100644 index 7c5e70e5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_h.png deleted file mode 100644 index 8fc79b9f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_ul.png deleted file mode 100644 index da9f4f86..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_ur.png deleted file mode 100644 index 82ed0ce4..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_v.png deleted file mode 100644 index 57e5a19e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/red/glass_3_d.png deleted file mode 100644 index 48e4f542..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/red/glass_3_l.png deleted file mode 100644 index a987dec0..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/red/glass_3_r.png deleted file mode 100644 index 2d9acc6b..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/red/glass_3_u.png deleted file mode 100644 index 8b4591bd..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_4.png b/mods/tinker/textures/blocks/glass/stained/red/glass_4.png deleted file mode 100644 index db57cf67..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/red/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass.png b/mods/tinker/textures/blocks/glass/stained/white/glass.png deleted file mode 100644 index 2ef7a496..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/white/glass_1_d.png deleted file mode 100644 index 59ec9b57..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/white/glass_1_l.png deleted file mode 100644 index c1fcd38d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/white/glass_1_r.png deleted file mode 100644 index bd98c8cd..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/white/glass_1_u.png deleted file mode 100644 index f40cecdb..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_dl.png deleted file mode 100644 index 3c1c4be3..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_dr.png deleted file mode 100644 index 59115f0f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_h.png deleted file mode 100644 index d6f9f7fc..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_ul.png deleted file mode 100644 index 57811583..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_ur.png deleted file mode 100644 index 6fc7f67f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_v.png deleted file mode 100644 index 4e3fa4f6..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/white/glass_3_d.png deleted file mode 100644 index 31913a33..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/white/glass_3_l.png deleted file mode 100644 index dcf80234..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/white/glass_3_r.png deleted file mode 100644 index 2473ad90..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/white/glass_3_u.png deleted file mode 100644 index fa8857c5..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_4.png b/mods/tinker/textures/blocks/glass/stained/white/glass_4.png deleted file mode 100644 index ca6bc049..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/white/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass.png deleted file mode 100644 index a0b7440c..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png deleted file mode 100644 index 3970a59e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_l.png deleted file mode 100644 index e7b0d4a9..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png deleted file mode 100644 index 11ea672e..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_u.png deleted file mode 100644 index 9bb46774..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dl.png deleted file mode 100644 index 2f857534..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dl.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dr.png deleted file mode 100644 index 01cef7aa..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dr.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png deleted file mode 100644 index 8142ab63..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png deleted file mode 100644 index 1e813a4f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ur.png deleted file mode 100644 index 442bec07..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ur.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png deleted file mode 100644 index 9b68873a..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_d.png deleted file mode 100644 index baf01ecf..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_d.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png deleted file mode 100644 index cb911b96..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_r.png deleted file mode 100644 index da3d734f..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_r.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png deleted file mode 100644 index 5cd5235d..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_4.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_4.png deleted file mode 100644 index 72b4afef..00000000 Binary files a/mods/tinker/textures/blocks/glass/stained/yellow/glass_4.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/ham_bone.png b/mods/tinker/textures/blocks/ham_bone.png deleted file mode 100644 index 6a27e1d5..00000000 Binary files a/mods/tinker/textures/blocks/ham_bone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/ham_skin.png b/mods/tinker/textures/blocks/ham_skin.png deleted file mode 100644 index df722ae2..00000000 Binary files a/mods/tinker/textures/blocks/ham_skin.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_electrum.png b/mods/tinker/textures/blocks/liquid_electrum.png deleted file mode 100644 index 817345f6..00000000 Binary files a/mods/tinker/textures/blocks/liquid_electrum.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_electrum.txt b/mods/tinker/textures/blocks/liquid_electrum.txt deleted file mode 100644 index b0a7c084..00000000 --- a/mods/tinker/textures/blocks/liquid_electrum.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/mods/tinker/textures/blocks/liquid_electrum_flow.png b/mods/tinker/textures/blocks/liquid_electrum_flow.png deleted file mode 100644 index aa63b513..00000000 Binary files a/mods/tinker/textures/blocks/liquid_electrum_flow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_electrum_flow.txt b/mods/tinker/textures/blocks/liquid_electrum_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/mods/tinker/textures/blocks/liquid_electrum_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/mods/tinker/textures/blocks/liquid_ender.png b/mods/tinker/textures/blocks/liquid_ender.png deleted file mode 100644 index bbc90b39..00000000 Binary files a/mods/tinker/textures/blocks/liquid_ender.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_ender.txt b/mods/tinker/textures/blocks/liquid_ender.txt deleted file mode 100644 index d8fe765a..00000000 --- a/mods/tinker/textures/blocks/liquid_ender.txt +++ /dev/null @@ -1,32 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -20*2 -21*2 -22*2 -23*2 -24*2 -25*2 -26*2 -27*2 -28*2 -29*2 -30*2 -31*2 diff --git a/mods/tinker/textures/blocks/liquid_ender_flow.png b/mods/tinker/textures/blocks/liquid_ender_flow.png deleted file mode 100644 index 2612655c..00000000 Binary files a/mods/tinker/textures/blocks/liquid_ender_flow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_ender_flow.txt b/mods/tinker/textures/blocks/liquid_ender_flow.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/mods/tinker/textures/blocks/liquid_ferrous.png b/mods/tinker/textures/blocks/liquid_ferrous.png deleted file mode 100644 index 7d917ffd..00000000 Binary files a/mods/tinker/textures/blocks/liquid_ferrous.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_ferrous.txt b/mods/tinker/textures/blocks/liquid_ferrous.txt deleted file mode 100644 index b0a7c084..00000000 --- a/mods/tinker/textures/blocks/liquid_ferrous.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/mods/tinker/textures/blocks/liquid_ferrous_flow.png b/mods/tinker/textures/blocks/liquid_ferrous_flow.png deleted file mode 100644 index 1f641b56..00000000 Binary files a/mods/tinker/textures/blocks/liquid_ferrous_flow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_ferrous_flow.txt b/mods/tinker/textures/blocks/liquid_ferrous_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/mods/tinker/textures/blocks/liquid_ferrous_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/mods/tinker/textures/blocks/liquid_invar.png b/mods/tinker/textures/blocks/liquid_invar.png deleted file mode 100644 index 2984f30e..00000000 Binary files a/mods/tinker/textures/blocks/liquid_invar.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_invar.txt b/mods/tinker/textures/blocks/liquid_invar.txt deleted file mode 100644 index b0a7c084..00000000 --- a/mods/tinker/textures/blocks/liquid_invar.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/mods/tinker/textures/blocks/liquid_invar_flow.png b/mods/tinker/textures/blocks/liquid_invar_flow.png deleted file mode 100644 index 68321fab..00000000 Binary files a/mods/tinker/textures/blocks/liquid_invar_flow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_invar_flow.txt b/mods/tinker/textures/blocks/liquid_invar_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/mods/tinker/textures/blocks/liquid_invar_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/mods/tinker/textures/blocks/liquid_lead.png b/mods/tinker/textures/blocks/liquid_lead.png deleted file mode 100644 index 448d1757..00000000 Binary files a/mods/tinker/textures/blocks/liquid_lead.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_lead.txt b/mods/tinker/textures/blocks/liquid_lead.txt deleted file mode 100644 index b0a7c084..00000000 --- a/mods/tinker/textures/blocks/liquid_lead.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/mods/tinker/textures/blocks/liquid_lead_flow.png b/mods/tinker/textures/blocks/liquid_lead_flow.png deleted file mode 100644 index 7ec2852e..00000000 Binary files a/mods/tinker/textures/blocks/liquid_lead_flow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_lead_flow.txt b/mods/tinker/textures/blocks/liquid_lead_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/mods/tinker/textures/blocks/liquid_lead_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/mods/tinker/textures/blocks/liquid_shiny.png b/mods/tinker/textures/blocks/liquid_shiny.png deleted file mode 100644 index 9c1ab339..00000000 Binary files a/mods/tinker/textures/blocks/liquid_shiny.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_shiny.txt b/mods/tinker/textures/blocks/liquid_shiny.txt deleted file mode 100644 index b0a7c084..00000000 --- a/mods/tinker/textures/blocks/liquid_shiny.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/mods/tinker/textures/blocks/liquid_shiny_flow.png b/mods/tinker/textures/blocks/liquid_shiny_flow.png deleted file mode 100644 index 4b564dae..00000000 Binary files a/mods/tinker/textures/blocks/liquid_shiny_flow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_shiny_flow.txt b/mods/tinker/textures/blocks/liquid_shiny_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/mods/tinker/textures/blocks/liquid_shiny_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/mods/tinker/textures/blocks/liquid_silver.png b/mods/tinker/textures/blocks/liquid_silver.png deleted file mode 100644 index f669a50a..00000000 Binary files a/mods/tinker/textures/blocks/liquid_silver.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_silver.txt b/mods/tinker/textures/blocks/liquid_silver.txt deleted file mode 100644 index b0a7c084..00000000 --- a/mods/tinker/textures/blocks/liquid_silver.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/mods/tinker/textures/blocks/liquid_silver_flow.png b/mods/tinker/textures/blocks/liquid_silver_flow.png deleted file mode 100644 index 7ac66ba5..00000000 Binary files a/mods/tinker/textures/blocks/liquid_silver_flow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_silver_flow.txt b/mods/tinker/textures/blocks/liquid_silver_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/mods/tinker/textures/blocks/liquid_silver_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/mods/tinker/textures/blocks/liquid_villager.png b/mods/tinker/textures/blocks/liquid_villager.png deleted file mode 100644 index a9d1b9bf..00000000 Binary files a/mods/tinker/textures/blocks/liquid_villager.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/liquid_villager_flow.png b/mods/tinker/textures/blocks/liquid_villager_flow.png deleted file mode 100644 index 01752191..00000000 Binary files a/mods/tinker/textures/blocks/liquid_villager_flow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/partbuilder_slab_side.png b/mods/tinker/textures/blocks/partbuilder_slab_side.png deleted file mode 100644 index e3f0bda7..00000000 Binary files a/mods/tinker/textures/blocks/partbuilder_slab_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/patternchest_slab_side.png b/mods/tinker/textures/blocks/patternchest_slab_side.png deleted file mode 100644 index 658ef27f..00000000 Binary files a/mods/tinker/textures/blocks/patternchest_slab_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/punji.png b/mods/tinker/textures/blocks/punji.png deleted file mode 100644 index b25debb2..00000000 Binary files a/mods/tinker/textures/blocks/punji.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slime_blue.png b/mods/tinker/textures/blocks/slime_blue.png deleted file mode 100644 index 4fc22c5d..00000000 Binary files a/mods/tinker/textures/blocks/slime_blue.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slime_blue.txt b/mods/tinker/textures/blocks/slime_blue.txt deleted file mode 100644 index d8fe765a..00000000 --- a/mods/tinker/textures/blocks/slime_blue.txt +++ /dev/null @@ -1,32 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -20*2 -21*2 -22*2 -23*2 -24*2 -25*2 -26*2 -27*2 -28*2 -29*2 -30*2 -31*2 diff --git a/mods/tinker/textures/blocks/slime_blue_flow.png b/mods/tinker/textures/blocks/slime_blue_flow.png deleted file mode 100644 index 929420e0..00000000 Binary files a/mods/tinker/textures/blocks/slime_blue_flow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slime_blue_flow.txt b/mods/tinker/textures/blocks/slime_blue_flow.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/mods/tinker/textures/blocks/slimeblock_blue.png b/mods/tinker/textures/blocks/slimeblock_blue.png deleted file mode 100644 index cc2a161b..00000000 Binary files a/mods/tinker/textures/blocks/slimeblock_blue.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimeblock_green.png b/mods/tinker/textures/blocks/slimeblock_green.png deleted file mode 100644 index e0d9f10d..00000000 Binary files a/mods/tinker/textures/blocks/slimeblock_green.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimeblock_purple.png b/mods/tinker/textures/blocks/slimeblock_purple.png deleted file mode 100644 index 4c63c537..00000000 Binary files a/mods/tinker/textures/blocks/slimeblock_purple.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimedirt_blue.png b/mods/tinker/textures/blocks/slimedirt_blue.png deleted file mode 100644 index 133b401b..00000000 Binary files a/mods/tinker/textures/blocks/slimedirt_blue.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimedirt_green.png b/mods/tinker/textures/blocks/slimedirt_green.png deleted file mode 100644 index d4992452..00000000 Binary files a/mods/tinker/textures/blocks/slimedirt_green.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimegrass_blue_fern.png b/mods/tinker/textures/blocks/slimegrass_blue_fern.png deleted file mode 100644 index e50c38a7..00000000 Binary files a/mods/tinker/textures/blocks/slimegrass_blue_fern.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimegrass_blue_side.png b/mods/tinker/textures/blocks/slimegrass_blue_side.png deleted file mode 100644 index 988c5281..00000000 Binary files a/mods/tinker/textures/blocks/slimegrass_blue_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimegrass_blue_tall.png b/mods/tinker/textures/blocks/slimegrass_blue_tall.png deleted file mode 100644 index bb10912e..00000000 Binary files a/mods/tinker/textures/blocks/slimegrass_blue_tall.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimegrass_blue_top.png b/mods/tinker/textures/blocks/slimegrass_blue_top.png deleted file mode 100644 index 5d9ad68e..00000000 Binary files a/mods/tinker/textures/blocks/slimegrass_blue_top.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimegrass_green_blue_side.png b/mods/tinker/textures/blocks/slimegrass_green_blue_side.png deleted file mode 100644 index d8a186cb..00000000 Binary files a/mods/tinker/textures/blocks/slimegrass_green_blue_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimegrass_green_dirt_side.png b/mods/tinker/textures/blocks/slimegrass_green_dirt_side.png deleted file mode 100644 index 3d057239..00000000 Binary files a/mods/tinker/textures/blocks/slimegrass_green_dirt_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimegrass_green_green_side.png b/mods/tinker/textures/blocks/slimegrass_green_green_side.png deleted file mode 100644 index 1b5b9b22..00000000 Binary files a/mods/tinker/textures/blocks/slimegrass_green_green_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimegrass_green_top.png b/mods/tinker/textures/blocks/slimegrass_green_top.png deleted file mode 100644 index cf7ff8b4..00000000 Binary files a/mods/tinker/textures/blocks/slimegrass_green_top.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimeleaves_blue_fancy.png b/mods/tinker/textures/blocks/slimeleaves_blue_fancy.png deleted file mode 100644 index deb17e7a..00000000 Binary files a/mods/tinker/textures/blocks/slimeleaves_blue_fancy.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimeleaves_blue_fast.png b/mods/tinker/textures/blocks/slimeleaves_blue_fast.png deleted file mode 100644 index 6c91818b..00000000 Binary files a/mods/tinker/textures/blocks/slimeleaves_blue_fast.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimesapling_blue.png b/mods/tinker/textures/blocks/slimesapling_blue.png deleted file mode 100644 index c48bc13d..00000000 Binary files a/mods/tinker/textures/blocks/slimesapling_blue.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/slimesnow_blue.png b/mods/tinker/textures/blocks/slimesnow_blue.png deleted file mode 100644 index 9a81f243..00000000 Binary files a/mods/tinker/textures/blocks/slimesnow_blue.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/smeltery_furnace_off.png b/mods/tinker/textures/blocks/smeltery_furnace_off.png deleted file mode 100644 index de9b0116..00000000 Binary files a/mods/tinker/textures/blocks/smeltery_furnace_off.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/smeltery_furnace_on.png b/mods/tinker/textures/blocks/smeltery_furnace_on.png deleted file mode 100644 index aa10a92f..00000000 Binary files a/mods/tinker/textures/blocks/smeltery_furnace_on.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/stenciltable_slab_side.png b/mods/tinker/textures/blocks/stenciltable_slab_side.png deleted file mode 100644 index 5342f060..00000000 Binary files a/mods/tinker/textures/blocks/stenciltable_slab_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/toolforge_slab_side.png b/mods/tinker/textures/blocks/toolforge_slab_side.png deleted file mode 100644 index 106a5942..00000000 Binary files a/mods/tinker/textures/blocks/toolforge_slab_side.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/toolstation_slab_side.png b/mods/tinker/textures/blocks/toolstation_slab_side.png deleted file mode 100644 index 35b32924..00000000 Binary files a/mods/tinker/textures/blocks/toolstation_slab_side.png and /dev/null differ diff --git a/mods/tinker/textures/gui/crafting.png b/mods/tinker/textures/gui/crafting.png deleted file mode 100644 index 254daccd..00000000 Binary files a/mods/tinker/textures/gui/crafting.png and /dev/null differ diff --git a/mods/tinker/textures/gui/drawbridge.png b/mods/tinker/textures/gui/drawbridge.png deleted file mode 100644 index f247f1d0..00000000 Binary files a/mods/tinker/textures/gui/drawbridge.png and /dev/null differ diff --git a/mods/tinker/textures/gui/landmine.png b/mods/tinker/textures/gui/landmine.png deleted file mode 100644 index 1e881185..00000000 Binary files a/mods/tinker/textures/gui/landmine.png and /dev/null differ diff --git a/mods/tinker/textures/items/arrow/thaumium_arrow_head.png b/mods/tinker/textures/items/arrow/thaumium_arrow_head.png deleted file mode 100644 index b5effc73..00000000 Binary files a/mods/tinker/textures/items/arrow/thaumium_arrow_head.png and /dev/null differ diff --git a/mods/tinker/textures/items/arrow/thaumium_arrow_shaft.png b/mods/tinker/textures/items/arrow/thaumium_arrow_shaft.png deleted file mode 100644 index 50070b32..00000000 Binary files a/mods/tinker/textures/items/arrow/thaumium_arrow_shaft.png and /dev/null differ diff --git a/mods/tinker/textures/items/blanksprite.png b/mods/tinker/textures/items/blanksprite.png deleted file mode 100644 index 827bd32d..00000000 Binary files a/mods/tinker/textures/items/blanksprite.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/bucket_electrum.png b/mods/tinker/textures/items/materials/bucket_electrum.png deleted file mode 100644 index 00d1819d..00000000 Binary files a/mods/tinker/textures/items/materials/bucket_electrum.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/bucket_ender.png b/mods/tinker/textures/items/materials/bucket_ender.png deleted file mode 100644 index d957a2c2..00000000 Binary files a/mods/tinker/textures/items/materials/bucket_ender.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/bucket_invar.png b/mods/tinker/textures/items/materials/bucket_invar.png deleted file mode 100644 index c8e0f24b..00000000 Binary files a/mods/tinker/textures/items/materials/bucket_invar.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/bucket_lead.png b/mods/tinker/textures/items/materials/bucket_lead.png deleted file mode 100644 index 164cc3ba..00000000 Binary files a/mods/tinker/textures/items/materials/bucket_lead.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/bucket_nickel.png b/mods/tinker/textures/items/materials/bucket_nickel.png deleted file mode 100644 index ff248756..00000000 Binary files a/mods/tinker/textures/items/materials/bucket_nickel.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/bucket_shiny.png b/mods/tinker/textures/items/materials/bucket_shiny.png deleted file mode 100644 index b2082441..00000000 Binary files a/mods/tinker/textures/items/materials/bucket_shiny.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/bucket_silver.png b/mods/tinker/textures/items/materials/bucket_silver.png deleted file mode 100644 index c8e81d96..00000000 Binary files a/mods/tinker/textures/items/materials/bucket_silver.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/cast_bowstring.png b/mods/tinker/textures/items/materials/cast_bowstring.png deleted file mode 100644 index 3b0fc0a9..00000000 Binary files a/mods/tinker/textures/items/materials/cast_bowstring.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/cast_fletching.png b/mods/tinker/textures/items/materials/cast_fletching.png deleted file mode 100644 index 3b0fc0a9..00000000 Binary files a/mods/tinker/textures/items/materials/cast_fletching.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/material_nugget_alumite.png b/mods/tinker/textures/items/materials/material_nugget_alumite.png deleted file mode 100644 index 4cad27ca..00000000 Binary files a/mods/tinker/textures/items/materials/material_nugget_alumite.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/material_nugget_ardite.png b/mods/tinker/textures/items/materials/material_nugget_ardite.png deleted file mode 100644 index f82ee499..00000000 Binary files a/mods/tinker/textures/items/materials/material_nugget_ardite.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/material_nugget_bronze.png b/mods/tinker/textures/items/materials/material_nugget_bronze.png deleted file mode 100644 index 960ce169..00000000 Binary files a/mods/tinker/textures/items/materials/material_nugget_bronze.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/material_nugget_cobalt.png b/mods/tinker/textures/items/materials/material_nugget_cobalt.png deleted file mode 100644 index 2907aeb5..00000000 Binary files a/mods/tinker/textures/items/materials/material_nugget_cobalt.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/material_nugget_manyullyn.png b/mods/tinker/textures/items/materials/material_nugget_manyullyn.png deleted file mode 100644 index c70ccaf9..00000000 Binary files a/mods/tinker/textures/items/materials/material_nugget_manyullyn.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/material_nugget_obsidian.png b/mods/tinker/textures/items/materials/material_nugget_obsidian.png deleted file mode 100644 index 06a43ece..00000000 Binary files a/mods/tinker/textures/items/materials/material_nugget_obsidian.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/material_nugget_steel.png b/mods/tinker/textures/items/materials/material_nugget_steel.png deleted file mode 100644 index f216cfee..00000000 Binary files a/mods/tinker/textures/items/materials/material_nugget_steel.png and /dev/null differ diff --git a/mods/tinker/textures/items/parts/thaumium_arrowhead.png b/mods/tinker/textures/items/parts/thaumium_arrowhead.png deleted file mode 100644 index 06f155f5..00000000 Binary files a/mods/tinker/textures/items/parts/thaumium_arrowhead.png and /dev/null differ diff --git a/mods/tinker/textures/mob/googirl_blue.png b/mods/tinker/textures/mob/googirl_blue.png deleted file mode 100644 index 8e431911..00000000 Binary files a/mods/tinker/textures/mob/googirl_blue.png and /dev/null differ diff --git a/tconstruct/TConstruct.java b/tconstruct/TConstruct.java index a32d135b..aacf6d3c 100644 --- a/tconstruct/TConstruct.java +++ b/tconstruct/TConstruct.java @@ -40,7 +40,7 @@ import cpw.mods.fml.relauncher.Side; * @dependencies: IC2 API, MFR API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.3", dependencies = "required-after:Forge@[7.7.1.687,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.3d7", dependencies = "required-after:Forge@[7.7.1.687,)") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { @@ -118,10 +118,11 @@ public class TConstruct @EventHandler public void init (FMLInitializationEvent event) { - if(event.getSide() == Side.CLIENT){ - MinecraftForge.EVENT_BUS.register(new EventCloakRender()); - } - + if (event.getSide() == Side.CLIENT) + { + MinecraftForge.EVENT_BUS.register(new EventCloakRender()); + } + content.intermodCommunication(); GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0)); } @@ -129,8 +130,8 @@ public class TConstruct @EventHandler public void postInit (FMLPostInitializationEvent evt) { - Behavior.registerBuiltInBehaviors(); - SpecialStackHandler.registerBuiltInStackHandlers(); + Behavior.registerBuiltInBehaviors(); + SpecialStackHandler.registerBuiltInStackHandlers(); content.modIntegration(); TContent.modRecipes(); content.createEntities(); diff --git a/tconstruct/blocks/AntiLight.java b/tconstruct/blocks/AntiLight.java index 1e72b356..21d6c3a9 100644 --- a/tconstruct/blocks/AntiLight.java +++ b/tconstruct/blocks/AntiLight.java @@ -21,32 +21,32 @@ public class AntiLight extends Block } @Override - public int getLightOpacity(World world, int x, int y, int z) + public int getLightOpacity (World world, int x, int y, int z) { return world.getBlockMetadata(x, y, z); } - + @Override - public boolean isAirBlock(World world, int x, int y, int z) + public boolean isAirBlock (World world, int x, int y, int z) { return true; } - + @Override - public boolean renderAsNormalBlock() + public boolean renderAsNormalBlock () { return false; } @Override - public boolean isOpaqueCube() + public boolean isOpaqueCube () { return false; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister par1IconRegister) + public void registerIcons (IconRegister par1IconRegister) { this.blockIcon = par1IconRegister.registerIcon("tinker:blank"); } @@ -56,19 +56,19 @@ public class AntiLight extends Block { return null; } - - public boolean canCollideCheck(int par1, boolean par2) + + public boolean canCollideCheck (int par1, boolean par2) { return false; } - - public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + + public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return false; } - - public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) + + public void onBlockExploded (World world, int x, int y, int z, Explosion explosion) { - + } } diff --git a/tconstruct/blocks/CastingChannelBlock.java b/tconstruct/blocks/CastingChannelBlock.java index 2c58eb36..71c52a17 100644 --- a/tconstruct/blocks/CastingChannelBlock.java +++ b/tconstruct/blocks/CastingChannelBlock.java @@ -47,7 +47,7 @@ public class CastingChannelBlock extends BlockContainer tile.setActive(true); } } - + ItemStack stack = player.getCurrentEquippedItem(); if (stack != null && stack.itemID == this.blockID) return false; diff --git a/tconstruct/blocks/CraftingSlab.java b/tconstruct/blocks/CraftingSlab.java index f41c6e8c..1f16f4f3 100644 --- a/tconstruct/blocks/CraftingSlab.java +++ b/tconstruct/blocks/CraftingSlab.java @@ -41,13 +41,9 @@ public class CraftingSlab extends InventoryBlock @Override public String[] getTextureNames () { - String[] textureNames = { - "craftingstation_top", "craftingstation_slab_side", "craftingstation_bottom", - "toolstation_top", "toolstation_slab_side", "toolstation_bottom", - "partbuilder_oak_top", "partbuilder_slab_side", "partbuilder_oak_bottom", - "stenciltable_oak_top", "stenciltable_slab_side", "stenciltable_oak_bottom", - "patternchest_top", "patternchest_slab_side", "patternchest_bottom", - "toolforge_top", "toolforge_slab_side", "toolforge_top" }; + String[] textureNames = { "craftingstation_top", "craftingstation_slab_side", "craftingstation_bottom", "toolstation_top", "toolstation_slab_side", "toolstation_bottom", + "partbuilder_oak_top", "partbuilder_slab_side", "partbuilder_oak_bottom", "stenciltable_oak_top", "stenciltable_slab_side", "stenciltable_oak_bottom", "patternchest_top", + "patternchest_slab_side", "patternchest_bottom", "toolforge_top", "toolforge_slab_side", "toolforge_top" }; return textureNames; } @@ -125,7 +121,7 @@ public class CraftingSlab extends InventoryBlock { case 0: return TProxyCommon.craftingStationID; - case 1: + case 1: return TProxyCommon.toolStationID; case 2: return TProxyCommon.partBuilderID; @@ -173,7 +169,7 @@ public class CraftingSlab extends InventoryBlock } super.onBlockPlacedBy(world, x, y, z, entityliving, stack); } - + @Override public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) { @@ -193,14 +189,14 @@ public class CraftingSlab extends InventoryBlock float maxY = meta == 1 ? 1.0F : 0.5F; setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F); } - + public int onBlockPlaced (World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, float clickZ, int metadata) { if (side == 1) return metadata; if (side == 0 || clickY >= 0.5F) return metadata | 8; - + return metadata; } diff --git a/tconstruct/blocks/CraftingStationBlock.java b/tconstruct/blocks/CraftingStationBlock.java index 630b413f..d34eb8ed 100644 --- a/tconstruct/blocks/CraftingStationBlock.java +++ b/tconstruct/blocks/CraftingStationBlock.java @@ -34,7 +34,7 @@ public class CraftingStationBlock extends InventoryBlock @Override public String[] getTextureNames () { - String[] textureNames = { "craftingstation_top", "craftingstation_side", "craftingstation_bottom"}; + String[] textureNames = { "craftingstation_top", "craftingstation_side", "craftingstation_bottom" }; return textureNames; } diff --git a/tconstruct/blocks/EquipBlock.java b/tconstruct/blocks/EquipBlock.java index 4aaf4af7..ba64dc55 100644 --- a/tconstruct/blocks/EquipBlock.java +++ b/tconstruct/blocks/EquipBlock.java @@ -89,30 +89,32 @@ public class EquipBlock extends InventoryBlock world.spawnParticle("flame", f, f1, f2 + f4, 0.0D, 0.0D, 0.0D); } } - - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); - int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - - int newMeta = 0; - - switch(i3){ - case 3: - newMeta = 0; - break; - case 0: - newMeta = 3; - break; - case 1: - newMeta = 1; - break; - case 2: - newMeta = 2; - break; - } - par1World.setBlockMetadataWithNotify(par2, par3, par4, newMeta, 2); + + public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) + { + super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); + int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + + int newMeta = 0; + + switch (i3) + { + case 3: + newMeta = 0; + break; + case 0: + newMeta = 3; + break; + case 1: + newMeta = 1; + break; + case 2: + newMeta = 2; + break; + } + par1World.setBlockMetadataWithNotify(par2, par3, par4, newMeta, 2); } - + public int getLightValue (IBlockAccess world, int x, int y, int z) { return !isActive(world, x, y, z) ? 0 : 9; diff --git a/tconstruct/blocks/EssenceExtractor.java b/tconstruct/blocks/EssenceExtractor.java index 58e9f5a5..2d253f5a 100644 --- a/tconstruct/blocks/EssenceExtractor.java +++ b/tconstruct/blocks/EssenceExtractor.java @@ -39,17 +39,16 @@ public class EssenceExtractor extends BlockContainer /** * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc) */ - public boolean renderAsNormalBlock() + public boolean renderAsNormalBlock () { return false; } @SideOnly(Side.CLIENT) - /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick (World par1World, int par2, int par3, int par4, Random par5Random) { super.randomDisplayTick(par1World, par2, par3, par4, par5Random); @@ -73,7 +72,9 @@ public class EssenceExtractor extends BlockContainer break; } - par1World.spawnParticle("enchantmenttable", (double)par2 + 0.5D, (double)par3 + 2.0D, (double)par4 + 0.5D, (double)((float)(l - par2) + par5Random.nextFloat()) - 0.5D, (double)((float)(j1 - par3) - par5Random.nextFloat() - 1.0F), (double)((float)(i1 - par4) + par5Random.nextFloat()) - 0.5D); + par1World.spawnParticle("enchantmenttable", (double) par2 + 0.5D, (double) par3 + 2.0D, (double) par4 + 0.5D, + (double) ((float) (l - par2) + par5Random.nextFloat()) - 0.5D, (double) ((float) (j1 - par3) - par5Random.nextFloat() - 1.0F), + (double) ((float) (i1 - par4) + par5Random.nextFloat()) - 0.5D); } } } @@ -85,17 +86,16 @@ public class EssenceExtractor extends BlockContainer * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block. */ - public boolean isOpaqueCube() + public boolean isOpaqueCube () { return false; } @SideOnly(Side.CLIENT) - /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public Icon getIcon(int par1, int par2) + public Icon getIcon (int par1, int par2) { return par1 == 0 ? this.field_94460_b : (par1 == 1 ? this.field_94461_a : this.blockIcon); } @@ -103,11 +103,11 @@ public class EssenceExtractor extends BlockContainer /** * Returns a new instance of a block's tile entity class. Called on placing the block. */ - public TileEntity createNewTileEntity(World par1World) + public TileEntity createNewTileEntity (World par1World) { return new EssenceExtractorLogic(); } - + /* Right-click to form a crystal */ @Override @@ -119,7 +119,7 @@ public class EssenceExtractor extends BlockContainer } else { - EssenceExtractorLogic logic = (EssenceExtractorLogic)world.getBlockTileEntity(x, y, z); + EssenceExtractorLogic logic = (EssenceExtractorLogic) world.getBlockTileEntity(x, y, z); int amount = logic.removeEssence(); if (amount > 0) { @@ -127,7 +127,7 @@ public class EssenceExtractor extends BlockContainer NBTTagCompound tags = new NBTTagCompound(); tags.setInteger("Essence", amount); crystal.setTagCompound(tags); - + EntityItem entityitem = new EntityItem(world, player.posX, player.posY - 1.0D, player.posZ, crystal); world.spawnEntityInWorld(entityitem); if (!(player instanceof FakePlayer)) @@ -139,7 +139,7 @@ public class EssenceExtractor extends BlockContainer /** * Called upon block activation (right click on the block.) */ - public boolean onBlockActivated(World par1World, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + public boolean onBlockActivated (World par1World, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { if (par1World.isRemote) { @@ -147,7 +147,7 @@ public class EssenceExtractor extends BlockContainer } else { - EssenceExtractorLogic logic = (EssenceExtractorLogic)par1World.getBlockTileEntity(x, y, z); + EssenceExtractorLogic logic = (EssenceExtractorLogic) par1World.getBlockTileEntity(x, y, z); logic.addEssence(player); logic.getEssenceMessage(player); return true; @@ -157,23 +157,22 @@ public class EssenceExtractor extends BlockContainer /** * Called when the block is placed in the world. */ - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLiving par5EntityLiving, ItemStack par6ItemStack) + public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLiving par5EntityLiving, ItemStack par6ItemStack) { super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLiving, par6ItemStack); if (par6ItemStack.hasDisplayName()) { - ((EssenceExtractorLogic)par1World.getBlockTileEntity(par2, par3, par4)).func_94134_a(par6ItemStack.getDisplayName()); + ((EssenceExtractorLogic) par1World.getBlockTileEntity(par2, par3, par4)).func_94134_a(par6ItemStack.getDisplayName()); } } @SideOnly(Side.CLIENT) - /** * When this method is called, your block should register all the icons it needs with the given IconRegister. This * is the only chance you get to register icons. */ - public void registerIcons(IconRegister par1IconRegister) + public void registerIcons (IconRegister par1IconRegister) { this.blockIcon = par1IconRegister.registerIcon("tinker:extractor_side"); this.field_94461_a = par1IconRegister.registerIcon("tinker:extractor_top"); diff --git a/tconstruct/blocks/GlassBlockConnected.java b/tconstruct/blocks/GlassBlockConnected.java index a32b26d5..93fb31e0 100644 --- a/tconstruct/blocks/GlassBlockConnected.java +++ b/tconstruct/blocks/GlassBlockConnected.java @@ -72,10 +72,11 @@ public class GlassBlockConnected extends Block public Icon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons) { - if(PHConstruct.connectedTexturesMode == 0){ - return icons[0]; - } - + if (PHConstruct.connectedTexturesMode == 0) + { + return icons[0]; + } + boolean isOpenUp = false, isOpenDown = false, isOpenLeft = false, isOpenRight = false; switch (par5) @@ -623,9 +624,10 @@ public class GlassBlockConnected extends Block icons[14] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_3_r"); icons[15] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_4"); } - - @Override - public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { - return true; - } + + @Override + public boolean canPlaceTorchOnTop (World world, int x, int y, int z) + { + return true; + } } diff --git a/tconstruct/blocks/GlassBlockConnectedMeta.java b/tconstruct/blocks/GlassBlockConnectedMeta.java index c50e5882..479526df 100644 --- a/tconstruct/blocks/GlassBlockConnectedMeta.java +++ b/tconstruct/blocks/GlassBlockConnectedMeta.java @@ -93,9 +93,10 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected return par1; } - @Override - public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { - return true; - } - + @Override + public boolean canPlaceTorchOnTop (World world, int x, int y, int z) + { + return true; + } + } diff --git a/tconstruct/blocks/GravelOre.java b/tconstruct/blocks/GravelOre.java index 17f87a45..dae64425 100644 --- a/tconstruct/blocks/GravelOre.java +++ b/tconstruct/blocks/GravelOre.java @@ -5,7 +5,6 @@ import java.util.Random; import tconstruct.library.TConstructRegistry; - import net.minecraft.block.BlockSand; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/tconstruct/blocks/RedstoneMachine.java b/tconstruct/blocks/RedstoneMachine.java index f81cb157..cf5df045 100644 --- a/tconstruct/blocks/RedstoneMachine.java +++ b/tconstruct/blocks/RedstoneMachine.java @@ -228,7 +228,7 @@ public class RedstoneMachine extends InventoryBlock boolean activeNearbyRedstone (World world, int x, int y, int z) { - return activeRedstone(world, x + 1, y, z) || activeRedstone(world, x - 1, y, z) || activeRedstone(world, x, y, z+1) || activeRedstone(world, x, y, z-1); + return activeRedstone(world, x + 1, y, z) || activeRedstone(world, x - 1, y, z) || activeRedstone(world, x, y, z + 1) || activeRedstone(world, x, y, z - 1); } boolean activeRedstone (World world, int x, int y, int z) @@ -236,10 +236,10 @@ public class RedstoneMachine extends InventoryBlock Block wire = Block.blocksList[world.getBlockId(x, y, z)]; if (wire != null && wire.blockID == Block.redstoneWire.blockID) return world.getBlockMetadata(x, y, z) > 0; - + return false; } - + /* Keep inventory */ @Override public boolean removeBlockByPlayer (World world, EntityPlayer player, int x, int y, int z) @@ -284,7 +284,7 @@ public class RedstoneMachine extends InventoryBlock return world.setBlockToAir(x, y, z); } - + protected void dropDrawbridgeLogic (World world, int x, int y, int z, ItemStack stack) { if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) diff --git a/tconstruct/blocks/SearedSlab.java b/tconstruct/blocks/SearedSlab.java index 587d1a0d..fdda9cad 100644 --- a/tconstruct/blocks/SearedSlab.java +++ b/tconstruct/blocks/SearedSlab.java @@ -21,7 +21,7 @@ public class SearedSlab extends SlabBase this.setCreativeTab(TConstructRegistry.blockTab); setHardness(12F); } - + @Override @SideOnly(Side.CLIENT) public void registerIcons (IconRegister iconRegister) @@ -37,7 +37,7 @@ public class SearedSlab extends SlabBase return TContent.smeltery.getIcon(side, 2); if (meta <= 3) return TContent.smeltery.getIcon(side, meta + 3); - + return TContent.smeltery.getIcon(side, meta + 4); } diff --git a/tconstruct/blocks/SlabBase.java b/tconstruct/blocks/SlabBase.java index 577a6058..eb96fb85 100644 --- a/tconstruct/blocks/SlabBase.java +++ b/tconstruct/blocks/SlabBase.java @@ -27,7 +27,7 @@ public class SlabBase extends Block super(id, material); this.setCreativeTab(TConstructRegistry.blockTab); } - + public SlabBase(int id, Material material, Block model, int meta, int totalSize) { super(id, material); @@ -56,17 +56,17 @@ public class SlabBase extends Block float maxY = meta == 1 ? 1.0F : 0.5F; setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F); } - + public int onBlockPlaced (World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, float clickZ, int metadata) { if (side == 1) return metadata; if (side == 0 || clickY >= 0.5F) return metadata | 8; - + return metadata; } - + public boolean isOpaqueCube () { return false; @@ -76,7 +76,7 @@ public class SlabBase extends Block { return false; } - + @Override @SideOnly(Side.CLIENT) public void registerIcons (IconRegister iconRegister) @@ -99,7 +99,7 @@ public class SlabBase extends Block list.add(new ItemStack(id, 1, iter)); } } - + public int damageDropped (int meta) { return meta % 8; diff --git a/tconstruct/blocks/SoilBlock.java b/tconstruct/blocks/SoilBlock.java index 0e8b5adc..6d134a85 100644 --- a/tconstruct/blocks/SoilBlock.java +++ b/tconstruct/blocks/SoilBlock.java @@ -38,8 +38,8 @@ public class SoilBlock extends TConstructBlock } } } - - public float getBlockHardness(World world, int x, int y, int z) + + public float getBlockHardness (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == 5) diff --git a/tconstruct/blocks/SpeedSlab.java b/tconstruct/blocks/SpeedSlab.java index 4f5396be..739c287c 100644 --- a/tconstruct/blocks/SpeedSlab.java +++ b/tconstruct/blocks/SpeedSlab.java @@ -23,7 +23,7 @@ public class SpeedSlab extends SlabBase this.setCreativeTab(TConstructRegistry.blockTab); setHardness(3F); } - + @Override @SideOnly(Side.CLIENT) public void registerIcons (IconRegister iconRegister) @@ -46,7 +46,7 @@ public class SpeedSlab extends SlabBase list.add(new ItemStack(id, 1, iter)); } } - + @Override public void onEntityWalking (World world, int x, int y, int z, Entity entity) { diff --git a/tconstruct/blocks/TConstructBlock.java b/tconstruct/blocks/TConstructBlock.java index a4a29597..d7d19675 100644 --- a/tconstruct/blocks/TConstructBlock.java +++ b/tconstruct/blocks/TConstructBlock.java @@ -4,7 +4,6 @@ import java.util.List; import tconstruct.library.TConstructRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/tconstruct/blocks/ToolForgeBlock.java b/tconstruct/blocks/ToolForgeBlock.java index dff2c45a..d2c2cd1f 100644 --- a/tconstruct/blocks/ToolForgeBlock.java +++ b/tconstruct/blocks/ToolForgeBlock.java @@ -101,10 +101,11 @@ public class ToolForgeBlock extends InventoryBlock } @Override - public boolean isBlockSolidOnSide(World world, int x, int y, int z, ForgeDirection side){ - return side == ForgeDirection.UP; + public boolean isBlockSolidOnSide (World world, int x, int y, int z, ForgeDirection side) + { + return side == ForgeDirection.UP; } - + @Override public int getRenderType () { diff --git a/tconstruct/blocks/ToolStationBlock.java b/tconstruct/blocks/ToolStationBlock.java index 088a0656..cb2204f1 100644 --- a/tconstruct/blocks/ToolStationBlock.java +++ b/tconstruct/blocks/ToolStationBlock.java @@ -89,12 +89,13 @@ public class ToolStationBlock extends InventoryBlock { return false; } - + @Override - public boolean isBlockSolidOnSide(World world, int x, int y, int z, ForgeDirection side){ - return side == ForgeDirection.UP; + public boolean isBlockSolidOnSide (World world, int x, int y, int z, ForgeDirection side) + { + return side == ForgeDirection.UP; } - + @Override public int getRenderType () { diff --git a/tconstruct/blocks/logic/CastingBasinLogic.java b/tconstruct/blocks/logic/CastingBasinLogic.java index fe3a8fb0..daeb473a 100644 --- a/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/tconstruct/blocks/logic/CastingBasinLogic.java @@ -247,8 +247,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) { return drain(maxDrain, doDrain); - } - + } @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) @@ -272,7 +271,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl @Override public FluidTankInfo[] getTankInfo (ForgeDirection from) { - return new FluidTankInfo[] {getInfo()}; + return new FluidTankInfo[] { getInfo() }; } @Override @@ -353,8 +352,8 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl { this.liquid = FluidStack.loadFluidStackFromNBT(tags.getCompoundTag("Fluid")); } - //FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); - //this.liquid = new FluidStack(tags.getInteger("itemID"), tags.getInteger("amount"), tags.getInteger("itemMeta")); + //FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); + //this.liquid = new FluidStack(tags.getInteger("itemID"), tags.getInteger("amount"), tags.getInteger("itemMeta")); else this.liquid = null; diff --git a/tconstruct/blocks/logic/CastingChannelLogic.java b/tconstruct/blocks/logic/CastingChannelLogic.java index cc314aef..3b380ff8 100644 --- a/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/tconstruct/blocks/logic/CastingChannelLogic.java @@ -462,7 +462,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui moveLiquidToTanks(); return filled; } - + public FluidStack drain (int maxDrain, boolean doDrain) { if ((this.liquid == null)) @@ -628,6 +628,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui { pullingLiquids = flag; } + @Override public boolean canFill (ForgeDirection from, Fluid fluid) { @@ -643,7 +644,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui @Override public FluidTankInfo[] getTankInfo (ForgeDirection from) { - return new FluidTankInfo[] {getInfo()}; + return new FluidTankInfo[] { getInfo() }; } @Override diff --git a/tconstruct/blocks/logic/CastingTableLogic.java b/tconstruct/blocks/logic/CastingTableLogic.java index 88fd914a..25f644f3 100644 --- a/tconstruct/blocks/logic/CastingTableLogic.java +++ b/tconstruct/blocks/logic/CastingTableLogic.java @@ -247,8 +247,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) { return drain(maxDrain, doDrain); - } - + } @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) @@ -272,7 +271,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl @Override public FluidTankInfo[] getTankInfo (ForgeDirection from) { - return new FluidTankInfo[] {getInfo()}; + return new FluidTankInfo[] { getInfo() }; } @Override diff --git a/tconstruct/blocks/logic/CrystalLogic.java b/tconstruct/blocks/logic/CrystalLogic.java index 62988791..61d4cb23 100644 --- a/tconstruct/blocks/logic/CrystalLogic.java +++ b/tconstruct/blocks/logic/CrystalLogic.java @@ -12,17 +12,17 @@ public class CrystalLogic extends TileEntity implements IActiveLogic boolean active; boolean growing; int crystalValue; - - public int getCrystalValue() + + public int getCrystalValue () { return crystalValue; } - - public void setCrystalValue(int value) + + public void setCrystalValue (int value) { this.crystalValue = value; } - + @Override public boolean getActive () { @@ -36,16 +36,16 @@ public class CrystalLogic extends TileEntity implements IActiveLogic active = flag; } - public boolean growing() + public boolean growing () { return growing; } - - public void setGrowth(boolean flag) + + public void setGrowth (boolean flag) { growing = flag; } - + @Override public void readFromNBT (NBTTagCompound tags) { diff --git a/tconstruct/blocks/logic/EssenceExtractorLogic.java b/tconstruct/blocks/logic/EssenceExtractorLogic.java index 7a95a406..d50131e5 100644 --- a/tconstruct/blocks/logic/EssenceExtractorLogic.java +++ b/tconstruct/blocks/logic/EssenceExtractorLogic.java @@ -33,7 +33,7 @@ public class EssenceExtractorLogic extends TileEntityEnchantmentTable private int essenceAmount; static DecimalFormat df = new DecimalFormat("##.##"); - + /*public EssenceExtractorLogic() { df.setRoundingMode(RoundingMode.DOWN); @@ -186,8 +186,8 @@ public class EssenceExtractorLogic extends TileEntityEnchantmentTable essenceAmount += amount; player.addExperienceLevel(-player.experienceLevel - 1); } - - public int removeEssence() + + public int removeEssence () { int amount = this.essenceAmount; this.essenceAmount = 0; diff --git a/tconstruct/blocks/logic/FirestarterLogic.java b/tconstruct/blocks/logic/FirestarterLogic.java index ff47001c..c27d6b83 100644 --- a/tconstruct/blocks/logic/FirestarterLogic.java +++ b/tconstruct/blocks/logic/FirestarterLogic.java @@ -90,7 +90,7 @@ public class FirestarterLogic extends TileEntity implements IFacingLogic, IActiv } } } - + public void updateEntity () { if (shouldActivate) diff --git a/tconstruct/blocks/logic/LavaTankLogic.java b/tconstruct/blocks/logic/LavaTankLogic.java index 682a5870..49d8c5af 100644 --- a/tconstruct/blocks/logic/LavaTankLogic.java +++ b/tconstruct/blocks/logic/LavaTankLogic.java @@ -48,7 +48,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler } return amount; } - + @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) { @@ -75,7 +75,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler FluidStack fluid = null; if (tank.getFluid() != null) fluid = tank.getFluid().copy(); - return new FluidTankInfo[] { new FluidTankInfo(fluid, tank.getCapacity())}; + return new FluidTankInfo[] { new FluidTankInfo(fluid, tank.getCapacity()) }; } /*@Override diff --git a/tconstruct/blocks/logic/LightAggregator.java b/tconstruct/blocks/logic/LightAggregator.java index a800188b..f1d2154f 100644 --- a/tconstruct/blocks/logic/LightAggregator.java +++ b/tconstruct/blocks/logic/LightAggregator.java @@ -105,7 +105,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic { worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 1, 3); spawnNegativeAir(1, 1); - + int value = 8; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -120,7 +120,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic { worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 2, 3); spawnNegativeAir(2, 1); - + int value = 16; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -135,7 +135,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic { worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 3, 3); spawnNegativeAir(3, 1); - + int value = 24; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -154,7 +154,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 4, 3); worldObj.setBlock(xCoord, yCoord + 2, zCoord, TContent.lightCrystalBase.blockID, 6, 3); spawnNegativeAir(5, 1); - + int value = 32; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -177,7 +177,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 5, 3); worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 2, zCoord, 7, 3); spawnNegativeAir(6, 1); - + int value = 40; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -192,7 +192,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic { worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 2, zCoord, 8, 3); spawnNegativeAir(7, 1); - + int value = 48; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -211,7 +211,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 2, zCoord, 9, 3); worldObj.setBlock(xCoord, yCoord + 3, zCoord, TContent.lightCrystalBase.blockID, 10, 3); spawnNegativeAir(9, 1); - + int value = 56; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -232,7 +232,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic { worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 3, zCoord, 11, 3); spawnNegativeAir(10, 1); - + int value = 64; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -247,7 +247,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic { worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 3, zCoord, 12, 3); spawnNegativeAir(11, 1); - + int value = 72; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -266,7 +266,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 3, zCoord, 13, 3); worldObj.setBlock(xCoord, yCoord + 4, zCoord, TContent.lightCrystalBase.blockID, 14, 3); spawnNegativeAir(13, 1); - + int value = 80; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); @@ -287,7 +287,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic { worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 4, zCoord, 15, 3); spawnNegativeAir(15, 1); - + int value = 88; Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); diff --git a/tconstruct/blocks/logic/SmelteryDrainLogic.java b/tconstruct/blocks/logic/SmelteryDrainLogic.java index c719f18b..1c6595e9 100644 --- a/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -84,7 +84,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl return null; } } - + @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) { diff --git a/tconstruct/blocks/slime/SlimeFluid.java b/tconstruct/blocks/slime/SlimeFluid.java index 6c5fbb1a..e2e85cb5 100644 --- a/tconstruct/blocks/slime/SlimeFluid.java +++ b/tconstruct/blocks/slime/SlimeFluid.java @@ -19,6 +19,7 @@ public class SlimeFluid extends BlockFluidClassic { Icon stillIcon; Icon flowIcon; + public SlimeFluid(int id, Fluid fluid, Material material) { super(id, fluid, material); @@ -40,20 +41,20 @@ public class SlimeFluid extends BlockFluidClassic return stillIcon; return flowIcon; } - - public void updateTick(World world, int x, int y, int z, Random rand) + + public void updateTick (World world, int x, int y, int z, Random rand) { super.updateTick(world, x, y, z, rand); - if (rand.nextInt(100) == 0 && world.getBlockMetadata(x, y, z) == 0 && world.checkNoEntityCollision(AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 2, y + 2, z + 2)) ) + if (rand.nextInt(100) == 0 && world.getBlockMetadata(x, y, z) == 0 && world.checkNoEntityCollision(AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 2, y + 2, z + 2))) { BlueSlime entityslime = new BlueSlime(world); - entityslime.setPosition((double)x + 0.5D, (double)y + 1.5D, (double)z + 0.5D); + entityslime.setPosition((double) x + 0.5D, (double) y + 1.5D, (double) z + 0.5D); world.spawnEntityInWorld(entityslime); } } - + public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List) { - + } } diff --git a/tconstruct/blocks/slime/SlimeGrass.java b/tconstruct/blocks/slime/SlimeGrass.java index c5f463ac..3eff225f 100644 --- a/tconstruct/blocks/slime/SlimeGrass.java +++ b/tconstruct/blocks/slime/SlimeGrass.java @@ -36,8 +36,9 @@ public class SlimeGrass extends Block { if (meta == 1) //dirt return 0; - - else //slime dirt + + else + //slime dirt return 5; } @@ -57,6 +58,9 @@ public class SlimeGrass extends Block @SideOnly(Side.CLIENT) public Icon getIcon (int side, int meta) { + if (meta >= 2) + meta = 0; + if (side == 0) { return meta % 2 == 1 ? Block.dirt.getIcon(0, 0) : icons[1]; @@ -84,10 +88,10 @@ public class SlimeGrass extends Block public boolean canSustainPlant (World world, int x, int y, int z, ForgeDirection direction, IPlantable plant) { EnumPlantType plantType = plant.getPlantType(world, x, y + 1, z); - return plantType == EnumPlantType.Plains && plant.getPlantID(world, x, y+1, z) != Block.tallGrass.blockID; + return plantType == EnumPlantType.Plains && plant.getPlantID(world, x, y + 1, z) != Block.tallGrass.blockID; } - - public void onPlantGrow(World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) + + public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) { world.setBlock(x, y, z, TContent.craftedSoil.blockID, 5, 3); } @@ -128,8 +132,8 @@ public class SlimeGrass extends Block } } } - - public int idDropped(int metadata, Random random, int fortune) + + public int idDropped (int metadata, Random random, int fortune) { if (metadata == 1) return TContent.craftedSoil.blockID; diff --git a/tconstruct/blocks/slime/SlimeLeaves.java b/tconstruct/blocks/slime/SlimeLeaves.java index 3dd094a9..73251120 100644 --- a/tconstruct/blocks/slime/SlimeLeaves.java +++ b/tconstruct/blocks/slime/SlimeLeaves.java @@ -59,7 +59,7 @@ public class SlimeLeaves extends BlockLeaves for (int i = 0; i < this.fastIcons.length; i++) { - this.fastIcons[i] = iconRegister.registerIcon("tinker:" + fastLeaves[i] ); + this.fastIcons[i] = iconRegister.registerIcon("tinker:" + fastLeaves[i]); this.fancyIcons[i] = iconRegister.registerIcon("tinker:" + fancyLeaves[i]); } } @@ -82,14 +82,13 @@ public class SlimeLeaves extends BlockLeaves list.add(new ItemStack(id, 1, iter)); } } - - /* Drops */ + /* Drops */ /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped (int par1, Random par2Random, int par3) { return TContent.slimeSapling.blockID; } @@ -97,7 +96,7 @@ public class SlimeLeaves extends BlockLeaves /** * Drops the block items with a specified chance of dropping the specified items */ - public void dropBlockAsItemWithChance(World world, int x, int y, int z, int meta, float chance, int fortune) + public void dropBlockAsItemWithChance (World world, int x, int y, int z, int meta, float chance, int fortune) { if (!world.isRemote) { diff --git a/tconstruct/blocks/slime/SlimeTallGrass.java b/tconstruct/blocks/slime/SlimeTallGrass.java index f76a7bb2..910cc91b 100644 --- a/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/tconstruct/blocks/slime/SlimeTallGrass.java @@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class SlimeTallGrass extends BlockFlower implements IShearable { - private static final String[] grassTypes = new String[] {"slimegrass_blue_tall"}; + private static final String[] grassTypes = new String[] { "slimegrass_blue_tall" }; @SideOnly(Side.CLIENT) private Icon[] iconArray; @@ -32,11 +32,10 @@ public class SlimeTallGrass extends BlockFlower implements IShearable } @SideOnly(Side.CLIENT) - /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public Icon getIcon(int side, int meta) + public Icon getIcon (int side, int meta) { /*if (meta >= this.iconArray.length) { @@ -49,7 +48,7 @@ public class SlimeTallGrass extends BlockFlower implements IShearable /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped (int par1, Random par2Random, int par3) { return -1; } @@ -57,24 +56,24 @@ public class SlimeTallGrass extends BlockFlower implements IShearable /** * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive). */ - public int quantityDroppedWithBonus(int par1, Random par2Random) + public int quantityDroppedWithBonus (int par1, Random par2Random) { return 1 + par2Random.nextInt(par1 * 2 + 1); } + /** * Get the block's damage value (for use with pick block). */ - public int getDamageValue(World par1World, int par2, int par3, int par4) + public int getDamageValue (World par1World, int par2, int par3, int par4) { return par1World.getBlockMetadata(par2, par3, par4); } @SideOnly(Side.CLIENT) - /** * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) */ - public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) + public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < 1; ++j) { @@ -83,23 +82,22 @@ public class SlimeTallGrass extends BlockFlower implements IShearable } @SideOnly(Side.CLIENT) - /** * When this method is called, your block should register all the icons it needs with the given IconRegister. This * is the only chance you get to register icons. */ - public void registerIcons(IconRegister par1IconRegister) + public void registerIcons (IconRegister par1IconRegister) { this.iconArray = new Icon[grassTypes.length]; for (int i = 0; i < this.iconArray.length; ++i) { - this.iconArray[i] = par1IconRegister.registerIcon("tinker:"+grassTypes[i]); + this.iconArray[i] = par1IconRegister.registerIcon("tinker:" + grassTypes[i]); } } @Override - public ArrayList getBlockDropped(World world, int x, int y, int z, int meta, int fortune) + public ArrayList getBlockDropped (World world, int x, int y, int z, int meta, int fortune) { ArrayList ret = new ArrayList(); if (world.rand.nextInt(8) != 0) @@ -116,13 +114,13 @@ public class SlimeTallGrass extends BlockFlower implements IShearable } @Override - public boolean isShearable(ItemStack item, World world, int x, int y, int z) + public boolean isShearable (ItemStack item, World world, int x, int y, int z) { return true; } @Override - public ArrayList onSheared(ItemStack item, World world, int x, int y, int z, int fortune) + public ArrayList onSheared (ItemStack item, World world, int x, int y, int z, int fortune) { ArrayList ret = new ArrayList(); ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z))); diff --git a/tconstruct/blocks/traps/BarricadeBlock.java b/tconstruct/blocks/traps/BarricadeBlock.java index 84c78918..eb11131d 100644 --- a/tconstruct/blocks/traps/BarricadeBlock.java +++ b/tconstruct/blocks/traps/BarricadeBlock.java @@ -33,11 +33,11 @@ public class BarricadeBlock extends Block { return modelBlock.getIcon(2, modelMeta); } - + @Override - public void registerIcons(IconRegister par1IconRegister) + public void registerIcons (IconRegister par1IconRegister) { - + } public boolean renderAsNormalBlock () @@ -120,8 +120,8 @@ public class BarricadeBlock extends Block } @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/tconstruct/blocks/traps/Landmine.java b/tconstruct/blocks/traps/Landmine.java index 89555aa8..e1aea297 100644 --- a/tconstruct/blocks/traps/Landmine.java +++ b/tconstruct/blocks/traps/Landmine.java @@ -6,7 +6,6 @@ import java.util.Random; import tconstruct.library.TConstructRegistry; - import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.EnumMobType; diff --git a/tconstruct/blocks/traps/Punji.java b/tconstruct/blocks/traps/Punji.java index ff7a4c0a..52346279 100644 --- a/tconstruct/blocks/traps/Punji.java +++ b/tconstruct/blocks/traps/Punji.java @@ -77,7 +77,7 @@ public class Punji extends Block } @Override - public int quantityDropped(int meta, int fortune, Random random) + public int quantityDropped (int meta, int fortune, Random random) { return meta + 1; } @@ -112,8 +112,8 @@ public class Punji extends Block } @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/tconstruct/client/StepSoundSlime.java b/tconstruct/client/StepSoundSlime.java index 54d83c45..03492cfd 100644 --- a/tconstruct/client/StepSoundSlime.java +++ b/tconstruct/client/StepSoundSlime.java @@ -14,7 +14,7 @@ public class StepSoundSlime extends StepSound /** * Used when a block breaks, EXA: Player break, Shep eating grass, etc.. */ - public String getBreakSound() + public String getBreakSound () { return this.stepSoundName + ".big"; } @@ -22,7 +22,7 @@ public class StepSoundSlime extends StepSound /** * Used when a entity walks over, or otherwise interacts with the block. */ - public String getStepSound() + public String getStepSound () { return this.stepSoundName + ".small"; } diff --git a/tconstruct/client/TClientTickHandler.java b/tconstruct/client/TClientTickHandler.java index e2e65934..ca48390b 100644 --- a/tconstruct/client/TClientTickHandler.java +++ b/tconstruct/client/TClientTickHandler.java @@ -19,14 +19,14 @@ public class TClientTickHandler implements ITickHandler int ticks = 0; private static final ResourceLocation hearts = new ResourceLocation("tinker", "textures/gui/newhearts.png"); - + @Override public void tickEnd (EnumSet type, Object... tickData) { TContent.oreBerry.setGraphicsLevel(Block.leaves.graphicsLevel); TContent.oreBerrySecond.setGraphicsLevel(Block.leaves.graphicsLevel); TContent.slimeLeaves.setGraphicsLevel(Block.leaves.graphicsLevel); - + /*if (PHConstruct.alphaHunger) { GuiIngameForge.renderFood = false; diff --git a/tconstruct/client/TControls.java b/tconstruct/client/TControls.java index e55222fe..ae1eb6d7 100644 --- a/tconstruct/client/TControls.java +++ b/tconstruct/client/TControls.java @@ -36,8 +36,7 @@ public class TControls extends TKeyHandler public TControls() { - super(new KeyBinding[] { armorKey, refreshCapes }, new boolean[] { false, false }, getVanillaKeyBindings(), - new boolean[] { false, false }); + super(new KeyBinding[] { armorKey, refreshCapes }, new boolean[] { false, false }, getVanillaKeyBindings(), new boolean[] { false, false }); //System.out.println("Controls registered"); } @@ -68,8 +67,9 @@ public class TControls extends TKeyHandler { TabRegistry.addTabsToInventory((GuiContainer) mc.currentScreen); } - if (kb == refreshCapes && mc.currentScreen == null){ - EventCloakRender.instance.refreshCapes(); + if (kb == refreshCapes && mc.currentScreen == null) + { + EventCloakRender.instance.refreshCapes(); } /*if (kb == jumpKey) //Double jump { diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java index 2fdddfef..d907aba8 100644 --- a/tconstruct/client/TProxyClient.java +++ b/tconstruct/client/TProxyClient.java @@ -173,7 +173,7 @@ public class TProxyClient extends TProxyCommon public static ArmorExtended armorExtended = new ArmorExtended(); public static KnapsackInventory knapsack = new KnapsackInventory(); - + @Override public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { @@ -629,11 +629,11 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TContent.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); TConstructClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TContent.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); - + //Traps ItemStack reed = new ItemStack(Item.reed); TConstructClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TContent.punji), reed, null, reed, null, reed, null, reed, null, reed); - TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TContent.barricadeOak), null, log, null, log); + TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TContent.barricadeOak), null, log, null, log); //Machines ItemStack alubrassIngot = new ItemStack(TContent.materials, 1, 14); diff --git a/tconstruct/client/ToolCoreRenderer.java b/tconstruct/client/ToolCoreRenderer.java index 76a54b6f..e2fb975c 100644 --- a/tconstruct/client/ToolCoreRenderer.java +++ b/tconstruct/client/ToolCoreRenderer.java @@ -22,7 +22,7 @@ public class ToolCoreRenderer implements IItemRenderer case ENTITY: return true; case EQUIPPED: - GL11.glTranslatef(0.03f, 0F, -0.09375F); + GL11.glTranslatef(0.03f, 0F, -0.09375F); case EQUIPPED_FIRST_PERSON: case INVENTORY: return true; diff --git a/tconstruct/client/block/BarricadeRender.java b/tconstruct/client/block/BarricadeRender.java index cc0bec7a..cdccefb0 100644 --- a/tconstruct/client/block/BarricadeRender.java +++ b/tconstruct/client/block/BarricadeRender.java @@ -23,100 +23,100 @@ public class BarricadeRender implements ISimpleBlockRenderingHandler { int meta = world.getBlockMetadata(x, y, z); int type = meta % 4; - + if (meta / 4 == 0) { //if (type >= 0) renderer.setRenderBounds(0.125, 0.0, 0.5, 0.375, 1.0, 0.75); renderer.renderStandardBlock(barricade, x, y, z); - + if (type >= 1) { renderer.setRenderBounds(0.625, 0.0, 0.5, 0.875, 1.0, 0.75); renderer.renderStandardBlock(barricade, x, y, z); } - + if (type >= 2) { renderer.setRenderBounds(0.0, 0.125, 0.25, 1.0, 0.375, 0.5); renderer.renderStandardBlock(barricade, x, y, z); } - + if (type >= 3) { renderer.setRenderBounds(0.0, 0.625, 0.25, 1.0, 0.875, 0.5); renderer.renderStandardBlock(barricade, x, y, z); } } - + if (meta / 4 == 1) { //if (type >= 0) renderer.setRenderBounds(0.25, 0.0, 0.125, 0.5, 1.0, 0.375); renderer.renderStandardBlock(barricade, x, y, z); - + if (type >= 1) { renderer.setRenderBounds(0.25, 0.0, 0.625, 0.5, 1.0, 0.875); renderer.renderStandardBlock(barricade, x, y, z); } - + if (type >= 2) { renderer.setRenderBounds(0.5, 0.125, 0.0, 0.75, 0.375, 1.0); renderer.renderStandardBlock(barricade, x, y, z); } - + if (type >= 3) { renderer.setRenderBounds(0.5, 0.625, 0.0, 0.75, 0.875, 1.0); renderer.renderStandardBlock(barricade, x, y, z); } } - + if (meta / 4 == 2) { //if (type >= 0) renderer.setRenderBounds(0.125, 0.0, 0.25, 0.375, 1.0, 0.5); renderer.renderStandardBlock(barricade, x, y, z); - + if (type >= 1) { renderer.setRenderBounds(0.625, 0.0, 0.25, 0.875, 1.0, 0.5); renderer.renderStandardBlock(barricade, x, y, z); } - + if (type >= 2) { renderer.setRenderBounds(0.0, 0.125, 0.5, 1.0, 0.375, 0.75); renderer.renderStandardBlock(barricade, x, y, z); } - + if (type >= 3) { renderer.setRenderBounds(0.0, 0.625, 0.5, 1.0, 0.875, 0.75); renderer.renderStandardBlock(barricade, x, y, z); } } - + if (meta / 4 == 3) { //if (type >= 0) renderer.setRenderBounds(0.5, 0.0, 0.125, 0.75, 1.0, 0.375); renderer.renderStandardBlock(barricade, x, y, z); - + if (type >= 1) { renderer.setRenderBounds(0.5, 0.0, 0.625, 0.75, 1.0, 0.875); renderer.renderStandardBlock(barricade, x, y, z); } - + if (type >= 2) { renderer.setRenderBounds(0.25, 0.125, 0.0, 0.5, 0.375, 1.0); renderer.renderStandardBlock(barricade, x, y, z); } - + if (type >= 3) { renderer.setRenderBounds(0.25, 0.625, 0.0, 0.5, 0.875, 1.0); diff --git a/tconstruct/client/block/BlockSkinRenderHelper.java b/tconstruct/client/block/BlockSkinRenderHelper.java index 0f0b1c6d..eccec619 100644 --- a/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/tconstruct/client/block/BlockSkinRenderHelper.java @@ -867,11 +867,12 @@ public class BlockSkinRenderHelper var8 = var11; } - return Minecraft.isAmbientOcclusionEnabled() ? renderFakeBlockWithAmbientOcclusion(stillIcon, flowingIcon, x, y, z, var6, var7, var8, renderer, world) : renderFakeBlockWithColorMultiplier(stillIcon, flowingIcon, x, y, z, - var6, var7, var8, renderer, world); + return Minecraft.isAmbientOcclusionEnabled() ? renderFakeBlockWithAmbientOcclusion(stillIcon, flowingIcon, x, y, z, var6, var7, var8, renderer, world) : renderFakeBlockWithColorMultiplier( + stillIcon, flowingIcon, x, y, z, var6, var7, var8, renderer, world); } - static boolean renderFakeBlockWithAmbientOcclusion (Icon stillIcon, Icon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) + static boolean renderFakeBlockWithAmbientOcclusion (Icon stillIcon, Icon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, + IBlockAccess world) { Block block = Block.stone; render.enableAO = true; @@ -1588,7 +1589,8 @@ public class BlockSkinRenderHelper return flag; } - static boolean renderFakeBlockWithColorMultiplier (Icon stillIcon, Icon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) + static boolean renderFakeBlockWithColorMultiplier (Icon stillIcon, Icon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, + IBlockAccess world) { Block block = Block.stone; render.enableAO = false; diff --git a/tconstruct/client/block/BreakingFX.java b/tconstruct/client/block/BreakingFX.java index 9e513ba5..b84f880d 100644 --- a/tconstruct/client/block/BreakingFX.java +++ b/tconstruct/client/block/BreakingFX.java @@ -36,35 +36,35 @@ public class BreakingFX extends EntityFX this.motionZ += par12; } - public int getFXLayer() + public int getFXLayer () { return 2; } - public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) + public void renderParticle (Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { - float f6 = ((float)this.particleTextureIndexX + this.particleTextureJitterX / 4.0F) / 16.0F; + float f6 = ((float) this.particleTextureIndexX + this.particleTextureJitterX / 4.0F) / 16.0F; float f7 = f6 + 0.015609375F; - float f8 = ((float)this.particleTextureIndexY + this.particleTextureJitterY / 4.0F) / 16.0F; + float f8 = ((float) this.particleTextureIndexY + this.particleTextureJitterY / 4.0F) / 16.0F; float f9 = f8 + 0.015609375F; float f10 = 0.1F * this.particleScale; if (this.particleIcon != null) { - f6 = this.particleIcon.getInterpolatedU((double)(this.particleTextureJitterX / 4.0F * 16.0F)); - f7 = this.particleIcon.getInterpolatedU((double)((this.particleTextureJitterX + 1.0F) / 4.0F * 16.0F)); - f8 = this.particleIcon.getInterpolatedV((double)(this.particleTextureJitterY / 4.0F * 16.0F)); - f9 = this.particleIcon.getInterpolatedV((double)((this.particleTextureJitterY + 1.0F) / 4.0F * 16.0F)); + f6 = this.particleIcon.getInterpolatedU((double) (this.particleTextureJitterX / 4.0F * 16.0F)); + f7 = this.particleIcon.getInterpolatedU((double) ((this.particleTextureJitterX + 1.0F) / 4.0F * 16.0F)); + f8 = this.particleIcon.getInterpolatedV((double) (this.particleTextureJitterY / 4.0F * 16.0F)); + f9 = this.particleIcon.getInterpolatedV((double) ((this.particleTextureJitterY + 1.0F) / 4.0F * 16.0F)); } - float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); - float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); - float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); + float f11 = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) par2 - interpPosX); + float f12 = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) par2 - interpPosY); + float f13 = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) par2 - interpPosZ); float f14 = 1.0F; par1Tessellator.setColorOpaque_F(f14 * this.particleRed, f14 * this.particleGreen, f14 * this.particleBlue); - par1Tessellator.addVertexWithUV((double)(f11 - par3 * f10 - par6 * f10), (double)(f12 - par4 * f10), (double)(f13 - par5 * f10 - par7 * f10), (double)f6, (double)f9); - par1Tessellator.addVertexWithUV((double)(f11 - par3 * f10 + par6 * f10), (double)(f12 + par4 * f10), (double)(f13 - par5 * f10 + par7 * f10), (double)f6, (double)f8); - par1Tessellator.addVertexWithUV((double)(f11 + par3 * f10 + par6 * f10), (double)(f12 + par4 * f10), (double)(f13 + par5 * f10 + par7 * f10), (double)f7, (double)f8); - par1Tessellator.addVertexWithUV((double)(f11 + par3 * f10 - par6 * f10), (double)(f12 - par4 * f10), (double)(f13 + par5 * f10 - par7 * f10), (double)f7, (double)f9); + par1Tessellator.addVertexWithUV((double) (f11 - par3 * f10 - par6 * f10), (double) (f12 - par4 * f10), (double) (f13 - par5 * f10 - par7 * f10), (double) f6, (double) f9); + par1Tessellator.addVertexWithUV((double) (f11 - par3 * f10 + par6 * f10), (double) (f12 + par4 * f10), (double) (f13 - par5 * f10 + par7 * f10), (double) f6, (double) f8); + par1Tessellator.addVertexWithUV((double) (f11 + par3 * f10 + par6 * f10), (double) (f12 + par4 * f10), (double) (f13 + par5 * f10 + par7 * f10), (double) f7, (double) f8); + par1Tessellator.addVertexWithUV((double) (f11 + par3 * f10 - par6 * f10), (double) (f12 - par4 * f10), (double) (f13 + par5 * f10 - par7 * f10), (double) f7, (double) f9); } } diff --git a/tconstruct/client/block/CrystalBlockRender.java b/tconstruct/client/block/CrystalBlockRender.java index cf247e70..00f0aedb 100644 --- a/tconstruct/client/block/CrystalBlockRender.java +++ b/tconstruct/client/block/CrystalBlockRender.java @@ -45,7 +45,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.setRenderBounds(0.5F, 0.0F, 0.8125F, 0.5625F, 0.0625F, 0.875F); renderer.renderStandardBlock(block, x, y, z); } - + //Base if (metadata == 0) { @@ -84,7 +84,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.375F, 0.875F, 0.375F, 0.625F, 0.9325F, 0.625F); renderer.renderStandardBlock(block, x, y, z); - + renderer.setRenderBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.75F, 0.75F); renderer.renderStandardBlock(block, x, y, z); @@ -107,7 +107,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.setRenderBounds(0.625F, 0.0F, 0.5F, 0.875F, 0.75, 0.875F); renderer.renderStandardBlock(block, x, y, z); } - + else if (metadata == 5) //Transition { renderer.setRenderBounds(0.25F, 0.0F, 0.25F, 0.75F, 1.0F, 0.75F); @@ -141,7 +141,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.375F, 0.5F, 0.375F, 0.625F, 0.625F, 0.625F); renderer.renderStandardBlock(block, x, y, z); - + renderer.setRenderBounds(0.25F, 0.0F, 0.5F, 0.4325F, 0.25F, 0.75F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.4325F, 0.0F, 0.125F, 0.625F, 0.375F, 0.3125F); @@ -155,7 +155,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.375F, 0.875F, 0.375F, 0.625F, 0.9325F, 0.625F); renderer.renderStandardBlock(block, x, y, z); - + renderer.setRenderBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.75F, 0.75F); renderer.renderStandardBlock(block, x, y, z); @@ -168,7 +168,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler { renderer.setRenderBounds(0.3125F, 0.75F, 0.3125F, 0.6875F, 1.0F, 0.6875F); renderer.renderStandardBlock(block, x, y, z); - + renderer.setRenderBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.75F, 0.75F); renderer.renderStandardBlock(block, x, y, z); @@ -179,7 +179,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.setRenderBounds(0.625F, 0.0F, 0.5F, 0.8125F, 0.625, 0.8125F); renderer.renderStandardBlock(block, x, y, z); } - + //3rd Layer else if (metadata == 10) { @@ -196,7 +196,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.4325F, 0.4325F, 0.375F, 0.5625F, 0.5F, 0.5625F); renderer.renderStandardBlock(block, x, y, z); - + renderer.setRenderBounds(0.4325F, 0F, 0.1875F, 0.625F, 0.3125F, 0.3125F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.4325F, 0F, 0.4325F, 0.6875F, 0.3125, 0.6875); @@ -208,7 +208,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.375F, 0.75F, 0.375F, 0.5625F, 0.875F, 0.5625F); renderer.renderStandardBlock(block, x, y, z); - + renderer.setRenderBounds(0.4325F, 0F, 0.1875F, 0.625F, 0.675F, 0.3125F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.4325F, 0F, 0.4325F, 0.6875F, 0.5625F, 0.6875); @@ -220,13 +220,13 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.renderStandardBlock(block, x, y, z); /*renderer.setRenderBounds(0.375F, 0.75F, 0.375F, 0.5625F, 0.875F, 0.5625F); renderer.renderStandardBlock(block, x, y, z);*/ - + renderer.setRenderBounds(0.4325F, 0F, 0.1875F, 0.625F, 0.875F, 0.3125F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.4325F, 0F, 0.4325F, 0.6875F, 0.75, 0.6875); renderer.renderStandardBlock(block, x, y, z); } - + //4th Layer else if (metadata == 14) { @@ -248,7 +248,7 @@ public class CrystalBlockRender implements ISimpleBlockRenderingHandler renderer.setRenderBounds(0.4375F, 0.6875F, 0.4375F, 0.5625F, 0.75F, 0.5625F); renderer.renderStandardBlock(block, x, y, z); } - + //Unused /*else if (metadata == 4) //Leftover fragments { diff --git a/tconstruct/client/block/FrypanRender.java b/tconstruct/client/block/FrypanRender.java index ffafa11b..a5659661 100644 --- a/tconstruct/client/block/FrypanRender.java +++ b/tconstruct/client/block/FrypanRender.java @@ -29,31 +29,33 @@ public class FrypanRender implements ISimpleBlockRenderingHandler renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.125F, 0.125F, 0.0F, 0.875F, 0.25F, 0.125F); renderer.renderStandardBlock(block, x, y, z); -// renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); -// renderer.renderStandardBlock(block, x, y, z); + // renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); + // renderer.renderStandardBlock(block, x, y, z); renderHandle(world, x, y, z, block, renderer); return true; } - public void renderHandle(IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer){ - switch(world.getBlockMetadata(x, y, z)){ - case 0: - renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); - break; - case 1: + public void renderHandle (IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer) + { + switch (world.getBlockMetadata(x, y, z)) + { + case 0: + renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); + break; + case 1: renderer.setRenderBounds(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F); - break; - case 2: - renderer.setRenderBounds(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F); - break; - case 3: - renderer.setRenderBounds(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F); - break; - } - + break; + case 2: + renderer.setRenderBounds(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F); + break; + case 3: + renderer.setRenderBounds(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F); + break; + } + renderer.renderStandardBlock(block, x, y, z); } - + @Override public boolean shouldRender3DInInventory () { diff --git a/tconstruct/client/block/RenderLiquid.java b/tconstruct/client/block/RenderLiquid.java index b91cebf1..02caafec 100644 --- a/tconstruct/client/block/RenderLiquid.java +++ b/tconstruct/client/block/RenderLiquid.java @@ -14,1652 +14,1656 @@ import net.minecraft.world.IBlockAccess; public class RenderLiquid { - public static boolean renderMetadataBlock(Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) - { - int var5 = block.colorMultiplier(world, x, y, z); - float var6 = (var5 >> 16 & 0xFF) / 255.0F; - float var7 = (var5 >> 8 & 0xFF) / 255.0F; - float var8 = (var5 & 0xFF) / 255.0F; - - if (EntityRenderer.anaglyphEnable) - { - float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F; - float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F; - float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F; - var6 = var9; - var7 = var10; - var8 = var11; - } - - return (Minecraft.isAmbientOcclusionEnabled()) && (Block.lightValue[block.blockID] == 0) ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); - } - - static boolean renderMetadataBlockWithAmbientOcclusion(Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { - render.enableAO = true; - boolean flag = false; - float f3 = 0.0F; - float f4 = 0.0F; - float f5 = 0.0F; - float f6 = 0.0F; - boolean flag1 = true; - int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(983055); - - if (render.getBlockIcon(block).getIconName().equals("grass_top")) - { - flag1 = false; - } - else if (render.hasOverrideBlockTexture()) - { - flag1 = false; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) - { - if (render.renderMinY <= 0.0D) - { - yPos--; - } - - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)]; - - if ((!flag4) && (!flag2)) - { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; - } - else - { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); - } - - if ((!flag5) && (!flag2)) - { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; - } - else - { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); - } - - if ((!flag4) && (!flag3)) - { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); - } - - if ((!flag5) && (!flag3)) - { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); - } - - if (render.renderMinY <= 0.0D) - { - yPos++; - } - - int i1 = l; - - if ((render.renderMinY <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos - 1, zPos))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; - f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) - { - if (render.renderMaxY >= 1.0D) - { - yPos++; - } - - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)]; - - if ((!flag4) && (!flag2)) - { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; - } - else - { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); - } - - if ((!flag4) && (!flag3)) - { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); - } - - if ((!flag5) && (!flag2)) - { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; - } - else - { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); - } - - if ((!flag5) && (!flag3)) - { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); - } - - if (render.renderMaxY >= 1.0D) - { - yPos--; - } - - int i1 = l; - - if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos + 1, zPos))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue); - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) - { - if (render.renderMinZ <= 0.0D) - { - zPos--; - } - - render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)]; - - if ((!flag2) && (!flag4)) - { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); - } - - if ((!flag2) && (!flag5)) - { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); - } - - if ((!flag3) && (!flag4)) - { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); - } - - if ((!flag3) && (!flag5)) - { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); - } - - if (render.renderMinZ <= 0.0D) - { - zPos++; - } - - int i1 = l; - - if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos - 1))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - Icon icon = block.getIcon(2, metadata); - render.renderFaceZNeg(block, xPos, yPos, zPos, icon); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) - { - if (render.renderMaxZ >= 1.0D) - { - zPos++; - } - - render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)]; - - if ((!flag2) && (!flag4)) - { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); - } - - if ((!flag2) && (!flag5)) - { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); - } - - if ((!flag3) && (!flag4)) - { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); - } - - if ((!flag3) && (!flag5)) - { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); - } - - if (render.renderMaxZ >= 1.0D) - { - zPos--; - } - - int i1 = l; - - if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos + 1))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - Icon icon = block.getIcon(3, metadata); - render.renderFaceZPos(block, xPos, yPos, zPos, icon); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) - { - if (render.renderMinX <= 0.0D) - { - xPos--; - } - - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)]; - - if ((!flag5) && (!flag2)) - { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); - } - - if ((!flag4) && (!flag2)) - { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); - } - - if ((!flag5) && (!flag3)) - { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); - } - - if ((!flag4) && (!flag3)) - { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); - } - - if (render.renderMinX <= 0.0D) - { - xPos++; - } - - int i1 = l; - - if ((render.renderMinX <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos - 1, yPos, zPos))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; - f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - Icon icon = block.getIcon(4, metadata); - render.renderFaceXNeg(block, xPos, yPos, zPos, icon); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) - { - if (render.renderMaxX >= 1.0D) - { - xPos++; - } - - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)]; - - if ((!flag2) && (!flag4)) - { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); - } - - if ((!flag2) && (!flag5)) - { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); - } - - if ((!flag3) && (!flag4)) - { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); - } - - if ((!flag3) && (!flag5)) - { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); - } - - if (render.renderMaxX >= 1.0D) - { - xPos--; - } - - int i1 = l; - - if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos + 1, yPos, zPos))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - Icon icon = block.getIcon(5, metadata); - render.renderFaceXPos(block, xPos, yPos, zPos, icon); - - flag = true; - } - - render.enableAO = false; - return flag; - } - - static boolean renderMetadataBlockWithColorMultiplier(Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { - render.enableAO = false; - Tessellator tessellator = Tessellator.instance; - boolean flag = false; - float f3 = 0.5F; - float f4 = 1.0F; - float f5 = 0.8F; - float f6 = 0.6F; - float f7 = f4 * colorRed; - float f8 = f4 * colorGreen; - float f9 = f4 * colorBlue; - float f10 = f3; - float f11 = f5; - float f12 = f6; - float f13 = f3; - float f14 = f5; - float f15 = f6; - float f16 = f3; - float f17 = f5; - float f18 = f6; - - if (block != Block.grass) - { - f10 = f3 * colorRed; - f11 = f5 * colorRed; - f12 = f6 * colorRed; - f13 = f3 * colorGreen; - f14 = f5 * colorGreen; - f15 = f6 * colorGreen; - f16 = f3 * colorBlue; - f17 = f5 * colorBlue; - f18 = f6 * colorBlue; - } - - int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) - { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); - tessellator.setColorOpaque_F(f10, f13, f16); - render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) - { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); - tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) - { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); - tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZNeg(block, xPos, yPos, zPos, block.getIcon(2, metadata)); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) - { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); - tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZPos(block, xPos, yPos, zPos, block.getIcon(3, metadata)); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) - { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); - tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXNeg(block, xPos, yPos, zPos, block.getIcon(4, metadata)); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) - { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); - tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXPos(block, xPos, yPos, zPos, block.getIcon(5, metadata)); - - flag = true; - } - - return flag; - } - - public static boolean renderFakeBlock(Icon texture, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) - { - Block block = Block.stone; - int var5 = block.colorMultiplier(world, x, y, z); - float var6 = (var5 >> 16 & 0xFF) / 255.0F; - float var7 = (var5 >> 8 & 0xFF) / 255.0F; - float var8 = (var5 & 0xFF) / 255.0F; - - if (EntityRenderer.anaglyphEnable) - { - float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F; - float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F; - float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F; - var6 = var9; - var7 = var10; - var8 = var11; - } - - return Minecraft.isAmbientOcclusionEnabled() ? renderFakeBlockWithAmbientOcclusion(texture, x, y, z, var6, var7, var8, renderer, world) : renderFakeBlockWithColorMultiplier(texture, x, y, z, var6, var7, var8, renderer, world); - } - - static boolean renderFakeBlockWithAmbientOcclusion(Icon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { - Block block = Block.stone; - render.enableAO = true; - boolean flag = false; - float f3 = 0.0F; - float f4 = 0.0F; - float f5 = 0.0F; - float f6 = 0.0F; - boolean flag1 = true; - int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(983055); - - if (render.getBlockIcon(block).getIconName().equals("grass_top")) - { - flag1 = false; - } - else if (render.hasOverrideBlockTexture()) - { - flag1 = false; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) - { - if (render.renderMinY <= 0.0D) - { - yPos--; - } - - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)]; - - if ((!flag4) && (!flag2)) - { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; - } - else - { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); - } - - if ((!flag5) && (!flag2)) - { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; - } - else - { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); - } - - if ((!flag4) && (!flag3)) - { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); - } - - if ((!flag5) && (!flag3)) - { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); - } - - if (render.renderMinY <= 0.0D) - { - yPos++; - } - - int i1 = l; - - if ((render.renderMinY <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos - 1, zPos))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; - f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - render.renderFaceYNeg(block, xPos, yPos, zPos, texture); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) - { - if (render.renderMaxY >= 1.0D) - { - yPos++; - } - - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)]; - - if ((!flag4) && (!flag2)) - { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; - } - else - { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); - } - - if ((!flag4) && (!flag3)) - { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); - } - - if ((!flag5) && (!flag2)) - { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; - } - else - { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); - } - - if ((!flag5) && (!flag3)) - { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); - } - - if (render.renderMaxY >= 1.0D) - { - yPos--; - } - - int i1 = l; - - if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos + 1, zPos))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue); - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - render.renderFaceYPos(block, xPos, yPos, zPos, texture); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) - { - if (render.renderMinZ <= 0.0D) - { - zPos--; - } - - render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)]; - - if ((!flag2) && (!flag4)) - { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); - } - - if ((!flag2) && (!flag5)) - { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); - } - - if ((!flag3) && (!flag4)) - { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); - } - - if ((!flag3) && (!flag5)) - { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); - } - - if (render.renderMinZ <= 0.0D) - { - zPos++; - } - - int i1 = l; - - if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos - 1))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - render.renderFaceZNeg(block, xPos, yPos, zPos, texture); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) - { - if (render.renderMaxZ >= 1.0D) - { - zPos++; - } - - render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)]; - - if ((!flag2) && (!flag4)) - { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); - } - - if ((!flag2) && (!flag5)) - { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); - } - - if ((!flag3) && (!flag4)) - { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); - } - - if ((!flag3) && (!flag5)) - { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); - } - - if (render.renderMaxZ >= 1.0D) - { - zPos--; - } - - int i1 = l; - - if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos + 1))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - render.renderFaceZPos(block, xPos, yPos, zPos, texture); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) - { - if (render.renderMinX <= 0.0D) - { - xPos--; - } - - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)]; - - if ((!flag5) && (!flag2)) - { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); - } - - if ((!flag4) && (!flag2)) - { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); - } - - if ((!flag5) && (!flag3)) - { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); - } - - if ((!flag4) && (!flag3)) - { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); - } - - if (render.renderMinX <= 0.0D) - { - xPos++; - } - - int i1 = l; - - if ((render.renderMinX <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos - 1, yPos, zPos))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; - f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - render.renderFaceXNeg(block, xPos, yPos, zPos, texture); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) - { - if (render.renderMaxX >= 1.0D) - { - xPos++; - } - - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)]; - - if ((!flag2) && (!flag4)) - { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); - } - - if ((!flag2) && (!flag5)) - { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); - } - - if ((!flag3) && (!flag4)) - { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); - } - - if ((!flag3) && (!flag5)) - { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); - } - - if (render.renderMaxX >= 1.0D) - { - xPos--; - } - - int i1 = l; - - if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos + 1, yPos, zPos))) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - } - - float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); - - if (flag1) - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); - } - else - { - render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); - render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); - render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); - } - - render.colorRedTopLeft *= f3; - render.colorGreenTopLeft *= f3; - render.colorBlueTopLeft *= f3; - render.colorRedBottomLeft *= f4; - render.colorGreenBottomLeft *= f4; - render.colorBlueBottomLeft *= f4; - render.colorRedBottomRight *= f5; - render.colorGreenBottomRight *= f5; - render.colorBlueBottomRight *= f5; - render.colorRedTopRight *= f6; - render.colorGreenTopRight *= f6; - render.colorBlueTopRight *= f6; - render.renderFaceXPos(block, xPos, yPos, zPos, texture); - - flag = true; - } - - render.enableAO = false; - return flag; - } - - static boolean renderFakeBlockWithColorMultiplier(Icon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { - Block block = Block.stone; - render.enableAO = false; - Tessellator tessellator = Tessellator.instance; - boolean flag = false; - float f3 = 0.5F; - float f4 = 1.0F; - float f5 = 0.8F; - float f6 = 0.6F; - float f7 = f4 * colorRed; - float f8 = f4 * colorGreen; - float f9 = f4 * colorBlue; - float f10 = f3; - float f11 = f5; - float f12 = f6; - float f13 = f3; - float f14 = f5; - float f15 = f6; - float f16 = f3; - float f17 = f5; - float f18 = f6; - - if (block != Block.grass) - { - f10 = f3 * colorRed; - f11 = f5 * colorRed; - f12 = f6 * colorRed; - f13 = f3 * colorGreen; - f14 = f5 * colorGreen; - f15 = f6 * colorGreen; - f16 = f3 * colorBlue; - f17 = f5 * colorBlue; - f18 = f6 * colorBlue; - } - - int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) - { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); - tessellator.setColorOpaque_F(f10, f13, f16); - render.renderFaceYNeg(block, xPos, yPos, zPos, texture); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) - { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); - tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, xPos, yPos, zPos, texture); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) - { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); - tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZNeg(block, xPos, yPos, zPos, texture); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) - { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); - tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZPos(block, xPos, yPos, zPos, texture); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) - { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); - tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXNeg(block, xPos, yPos, zPos, texture); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) - { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); - tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXPos(block, xPos, yPos, zPos, texture); - - flag = true; - } - - return flag; - } + public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) + { + int var5 = block.colorMultiplier(world, x, y, z); + float var6 = (var5 >> 16 & 0xFF) / 255.0F; + float var7 = (var5 >> 8 & 0xFF) / 255.0F; + float var8 = (var5 & 0xFF) / 255.0F; + + if (EntityRenderer.anaglyphEnable) + { + float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F; + float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F; + float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F; + var6 = var9; + var7 = var10; + var8 = var11; + } + + return (Minecraft.isAmbientOcclusionEnabled()) && (Block.lightValue[block.blockID] == 0) ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) + : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); + } + + static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, + IBlockAccess world) + { + render.enableAO = true; + boolean flag = false; + float f3 = 0.0F; + float f4 = 0.0F; + float f5 = 0.0F; + float f6 = 0.0F; + boolean flag1 = true; + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); + Tessellator tessellator = Tessellator.instance; + tessellator.setBrightness(983055); + + if (render.getBlockIcon(block).getIconName().equals("grass_top")) + { + flag1 = false; + } + else if (render.hasOverrideBlockTexture()) + { + flag1 = false; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) + { + if (render.renderMinY <= 0.0D) + { + yPos--; + } + + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)]; + + if ((!flag4) && (!flag2)) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + } + + if ((!flag5) && (!flag2)) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + } + + if ((!flag4) && (!flag3)) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + } + + if ((!flag5) && (!flag3)) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + } + + if (render.renderMinY <= 0.0D) + { + yPos++; + } + + int i1 = l; + + if ((render.renderMinY <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos - 1, zPos))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; + f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; + f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; + f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) + { + if (render.renderMaxY >= 1.0D) + { + yPos++; + } + + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)]; + + if ((!flag4) && (!flag2)) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + } + + if ((!flag4) && (!flag3)) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + } + + if ((!flag5) && (!flag2)) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + } + + if ((!flag5) && (!flag3)) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + } + + if (render.renderMaxY >= 1.0D) + { + yPos--; + } + + int i1 = l; + + if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos + 1, zPos))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) + { + if (render.renderMinZ <= 0.0D) + { + zPos--; + } + + render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)]; + + if ((!flag2) && (!flag4)) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + } + + if ((!flag2) && (!flag5)) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + } + + if ((!flag3) && (!flag4)) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + } + + if ((!flag3) && (!flag5)) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + } + + if (render.renderMinZ <= 0.0D) + { + zPos++; + } + + int i1 = l; + + if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos - 1))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + Icon icon = block.getIcon(2, metadata); + render.renderFaceZNeg(block, xPos, yPos, zPos, icon); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) + { + if (render.renderMaxZ >= 1.0D) + { + zPos++; + } + + render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)]; + + if ((!flag2) && (!flag4)) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + } + + if ((!flag2) && (!flag5)) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + } + + if ((!flag3) && (!flag4)) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + } + + if ((!flag3) && (!flag5)) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + } + + if (render.renderMaxZ >= 1.0D) + { + zPos--; + } + + int i1 = l; + + if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos + 1))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + Icon icon = block.getIcon(3, metadata); + render.renderFaceZPos(block, xPos, yPos, zPos, icon); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) + { + if (render.renderMinX <= 0.0D) + { + xPos--; + } + + render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)]; + + if ((!flag5) && (!flag2)) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + } + + if ((!flag4) && (!flag2)) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + } + + if ((!flag5) && (!flag3)) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + } + + if ((!flag4) && (!flag3)) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + } + + if (render.renderMinX <= 0.0D) + { + xPos++; + } + + int i1 = l; + + if ((render.renderMinX <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos - 1, yPos, zPos))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + Icon icon = block.getIcon(4, metadata); + render.renderFaceXNeg(block, xPos, yPos, zPos, icon); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) + { + if (render.renderMaxX >= 1.0D) + { + xPos++; + } + + render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)]; + + if ((!flag2) && (!flag4)) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + } + + if ((!flag2) && (!flag5)) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + } + + if ((!flag3) && (!flag4)) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + } + + if ((!flag3) && (!flag5)) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + } + + if (render.renderMaxX >= 1.0D) + { + xPos--; + } + + int i1 = l; + + if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos + 1, yPos, zPos))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; + f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + Icon icon = block.getIcon(5, metadata); + render.renderFaceXPos(block, xPos, yPos, zPos, icon); + + flag = true; + } + + render.enableAO = false; + return flag; + } + + static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, + IBlockAccess world) + { + render.enableAO = false; + Tessellator tessellator = Tessellator.instance; + boolean flag = false; + float f3 = 0.5F; + float f4 = 1.0F; + float f5 = 0.8F; + float f6 = 0.6F; + float f7 = f4 * colorRed; + float f8 = f4 * colorGreen; + float f9 = f4 * colorBlue; + float f10 = f3; + float f11 = f5; + float f12 = f6; + float f13 = f3; + float f14 = f5; + float f15 = f6; + float f16 = f3; + float f17 = f5; + float f18 = f6; + + if (block != Block.grass) + { + f10 = f3 * colorRed; + f11 = f5 * colorRed; + f12 = f6 * colorRed; + f13 = f3 * colorGreen; + f14 = f5 * colorGreen; + f15 = f6 * colorGreen; + f16 = f3 * colorBlue; + f17 = f5 * colorBlue; + f18 = f6 * colorBlue; + } + + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) + { + tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); + tessellator.setColorOpaque_F(f10, f13, f16); + render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) + { + tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); + tessellator.setColorOpaque_F(f7, f8, f9); + render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) + { + tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); + tessellator.setColorOpaque_F(f11, f14, f17); + render.renderFaceZNeg(block, xPos, yPos, zPos, block.getIcon(2, metadata)); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) + { + tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); + tessellator.setColorOpaque_F(f11, f14, f17); + render.renderFaceZPos(block, xPos, yPos, zPos, block.getIcon(3, metadata)); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) + { + tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); + tessellator.setColorOpaque_F(f12, f15, f18); + render.renderFaceXNeg(block, xPos, yPos, zPos, block.getIcon(4, metadata)); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) + { + tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); + tessellator.setColorOpaque_F(f12, f15, f18); + render.renderFaceXPos(block, xPos, yPos, zPos, block.getIcon(5, metadata)); + + flag = true; + } + + return flag; + } + + public static boolean renderFakeBlock (Icon texture, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) + { + Block block = Block.stone; + int var5 = block.colorMultiplier(world, x, y, z); + float var6 = (var5 >> 16 & 0xFF) / 255.0F; + float var7 = (var5 >> 8 & 0xFF) / 255.0F; + float var8 = (var5 & 0xFF) / 255.0F; + + if (EntityRenderer.anaglyphEnable) + { + float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F; + float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F; + float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F; + var6 = var9; + var7 = var10; + var8 = var11; + } + + return Minecraft.isAmbientOcclusionEnabled() ? renderFakeBlockWithAmbientOcclusion(texture, x, y, z, var6, var7, var8, renderer, world) : renderFakeBlockWithColorMultiplier(texture, x, y, z, + var6, var7, var8, renderer, world); + } + + static boolean renderFakeBlockWithAmbientOcclusion (Icon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) + { + Block block = Block.stone; + render.enableAO = true; + boolean flag = false; + float f3 = 0.0F; + float f4 = 0.0F; + float f5 = 0.0F; + float f6 = 0.0F; + boolean flag1 = true; + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); + Tessellator tessellator = Tessellator.instance; + tessellator.setBrightness(983055); + + if (render.getBlockIcon(block).getIconName().equals("grass_top")) + { + flag1 = false; + } + else if (render.hasOverrideBlockTexture()) + { + flag1 = false; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) + { + if (render.renderMinY <= 0.0D) + { + yPos--; + } + + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)]; + + if ((!flag4) && (!flag2)) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + } + + if ((!flag5) && (!flag2)) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + } + + if ((!flag4) && (!flag3)) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + } + + if ((!flag5) && (!flag3)) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + } + + if (render.renderMinY <= 0.0D) + { + yPos++; + } + + int i1 = l; + + if ((render.renderMinY <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos - 1, zPos))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; + f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; + f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; + f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYNeg(block, xPos, yPos, zPos, texture); + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) + { + if (render.renderMaxY >= 1.0D) + { + yPos++; + } + + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)]; + + if ((!flag4) && (!flag2)) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + } + + if ((!flag4) && (!flag3)) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + } + + if ((!flag5) && (!flag2)) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + } + + if ((!flag5) && (!flag3)) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + } + + if (render.renderMaxY >= 1.0D) + { + yPos--; + } + + int i1 = l; + + if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos + 1, zPos))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYPos(block, xPos, yPos, zPos, texture); + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) + { + if (render.renderMinZ <= 0.0D) + { + zPos--; + } + + render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)]; + + if ((!flag2) && (!flag4)) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + } + + if ((!flag2) && (!flag5)) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + } + + if ((!flag3) && (!flag4)) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + } + + if ((!flag3) && (!flag5)) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + } + + if (render.renderMinZ <= 0.0D) + { + zPos++; + } + + int i1 = l; + + if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos - 1))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceZNeg(block, xPos, yPos, zPos, texture); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) + { + if (render.renderMaxZ >= 1.0D) + { + zPos++; + } + + render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)]; + + if ((!flag2) && (!flag4)) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + } + + if ((!flag2) && (!flag5)) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + } + + if ((!flag3) && (!flag4)) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + } + + if ((!flag3) && (!flag5)) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + } + + if (render.renderMaxZ >= 1.0D) + { + zPos--; + } + + int i1 = l; + + if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos + 1))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceZPos(block, xPos, yPos, zPos, texture); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) + { + if (render.renderMinX <= 0.0D) + { + xPos--; + } + + render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)]; + + if ((!flag5) && (!flag2)) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + } + + if ((!flag4) && (!flag2)) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + } + + if ((!flag5) && (!flag3)) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + } + + if ((!flag4) && (!flag3)) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + } + + if (render.renderMinX <= 0.0D) + { + xPos++; + } + + int i1 = l; + + if ((render.renderMinX <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos - 1, yPos, zPos))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceXNeg(block, xPos, yPos, zPos, texture); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) + { + if (render.renderMaxX >= 1.0D) + { + xPos++; + } + + render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)]; + boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)]; + boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)]; + boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)]; + + if ((!flag2) && (!flag4)) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + } + + if ((!flag2) && (!flag5)) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + } + + if ((!flag3) && (!flag4)) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + } + + if ((!flag3) && (!flag5)) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + } + + if (render.renderMaxX >= 1.0D) + { + xPos--; + } + + int i1 = l; + + if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos + 1, yPos, zPos))) + { + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + } + + float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; + f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + + if (flag1) + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); + } + else + { + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); + } + + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceXPos(block, xPos, yPos, zPos, texture); + + flag = true; + } + + render.enableAO = false; + return flag; + } + + static boolean renderFakeBlockWithColorMultiplier (Icon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) + { + Block block = Block.stone; + render.enableAO = false; + Tessellator tessellator = Tessellator.instance; + boolean flag = false; + float f3 = 0.5F; + float f4 = 1.0F; + float f5 = 0.8F; + float f6 = 0.6F; + float f7 = f4 * colorRed; + float f8 = f4 * colorGreen; + float f9 = f4 * colorBlue; + float f10 = f3; + float f11 = f5; + float f12 = f6; + float f13 = f3; + float f14 = f5; + float f15 = f6; + float f16 = f3; + float f17 = f5; + float f18 = f6; + + if (block != Block.grass) + { + f10 = f3 * colorRed; + f11 = f5 * colorRed; + f12 = f6 * colorRed; + f13 = f3 * colorGreen; + f14 = f5 * colorGreen; + f15 = f6 * colorGreen; + f16 = f3 * colorBlue; + f17 = f5 * colorBlue; + f18 = f6 * colorBlue; + } + + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) + { + tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); + tessellator.setColorOpaque_F(f10, f13, f16); + render.renderFaceYNeg(block, xPos, yPos, zPos, texture); + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) + { + tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); + tessellator.setColorOpaque_F(f7, f8, f9); + render.renderFaceYPos(block, xPos, yPos, zPos, texture); + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) + { + tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); + tessellator.setColorOpaque_F(f11, f14, f17); + render.renderFaceZNeg(block, xPos, yPos, zPos, texture); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) + { + tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); + tessellator.setColorOpaque_F(f11, f14, f17); + render.renderFaceZPos(block, xPos, yPos, zPos, texture); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) + { + tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); + tessellator.setColorOpaque_F(f12, f15, f18); + render.renderFaceXNeg(block, xPos, yPos, zPos, texture); + + flag = true; + } + + if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) + { + tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); + tessellator.setColorOpaque_F(f12, f15, f18); + render.renderFaceXPos(block, xPos, yPos, zPos, texture); + + flag = true; + } + + return flag; + } } diff --git a/tconstruct/client/block/SmallFontRenderer.java b/tconstruct/client/block/SmallFontRenderer.java index cc9e5432..a002a2c2 100644 --- a/tconstruct/client/block/SmallFontRenderer.java +++ b/tconstruct/client/block/SmallFontRenderer.java @@ -144,12 +144,12 @@ public class SmallFontRenderer implements ResourceManagerReloadListener this.readGlyphSizes(); } - public void func_110549_a(ResourceManager par1ResourceManager) + public void func_110549_a (ResourceManager par1ResourceManager) { this.func_111272_d(); } - private void func_111272_d() + private void func_111272_d () { BufferedImage bufferedimage; @@ -169,7 +169,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener int k = j / 16; int l = i / 16; byte b0 = 1; - float f = 8.0F / (float)l; + float f = 8.0F / (float) l; int i1 = 0; while (i1 < 256) @@ -209,14 +209,14 @@ public class SmallFontRenderer implements ResourceManagerReloadListener } ++l1; - this.charWidth[i1] = (int)(0.5D + (double)((float)l1 * f)) + b0; + this.charWidth[i1] = (int) (0.5D + (double) ((float) l1 * f)) + b0; ++i1; break; } } } - private void readGlyphSizes() + private void readGlyphSizes () { try { @@ -232,7 +232,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Pick how to render a single character and return the width used. */ - private float renderCharAtPos(int par1, char par2, boolean par3) + private float renderCharAtPos (int par1, char par2, boolean par3) { return par2 == 32 ? 4.0F : (par1 > 0 && !this.unicodeFlag ? this.renderDefaultChar(par1 + 32, par3) : this.renderUnicodeChar(par2, par3)); } @@ -240,13 +240,13 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Render a single character with the default.png font at current (posX,posY) location... */ - private float renderDefaultChar(int par1, boolean par2) + private float renderDefaultChar (int par1, boolean par2) { - float f = (float)(par1 % 16 * 8); - float f1 = (float)(par1 / 16 * 8); + 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); - float f3 = (float)this.charWidth[par1] - 0.01F; + float f3 = (float) this.charWidth[par1] - 0.01F; GL11.glBegin(GL11.GL_TRIANGLE_STRIP); GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F); GL11.glVertex3f(this.posX + f2, this.posY, 0.0F); @@ -257,14 +257,14 @@ public class SmallFontRenderer implements ResourceManagerReloadListener GL11.glTexCoord2f((f + f3 - 1.0F) / 128.0F, (f1 + 7.99F) / 128.0F); GL11.glVertex3f(this.posX + f3 - 1.0F - f2, this.posY + 7.99F, 0.0F); GL11.glEnd(); - return (float)this.charWidth[par1]; + return (float) this.charWidth[par1]; } - private ResourceLocation func_111271_a(int par1) + private ResourceLocation func_111271_a (int par1) { if (field_111274_c[par1] == null) { - field_111274_c[par1] = new ResourceLocation(String.format("textures/font/unicode_page_%02x.png", new Object[] {Integer.valueOf(par1)})); + field_111274_c[par1] = new ResourceLocation(String.format("textures/font/unicode_page_%02x.png", new Object[] { Integer.valueOf(par1) })); } return field_111274_c[par1]; @@ -273,7 +273,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Load one of the /font/glyph_XX.png into a new GL texture and store the texture ID in glyphTextureName array. */ - private void loadGlyphTexture(int par1) + private void loadGlyphTexture (int par1) { this.renderEngine.func_110577_a(this.func_111271_a(par1)); } @@ -281,7 +281,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Render a single Unicode character at current (posX,posY) location using one of the /font/glyph_XX.png files... */ - private float renderUnicodeChar(char par1, boolean par2) + private float renderUnicodeChar (char par1, boolean par2) { if (this.glyphWidth[par1] == 0) { @@ -293,10 +293,10 @@ public class SmallFontRenderer implements ResourceManagerReloadListener this.loadGlyphTexture(i); int j = this.glyphWidth[par1] >>> 4; int k = this.glyphWidth[par1] & 15; - float f = (float)j; - float f1 = (float)(k + 1); - float f2 = (float)(par1 % 16 * 16) + f; - float f3 = (float)((par1 & 255) / 16 * 16); + float f = (float) j; + float f1 = (float) (k + 1); + float f2 = (float) (par1 % 16 * 16) + f; + float f3 = (float) ((par1 & 255) / 16 * 16); float f4 = f1 - f - 0.02F; float f5 = par2 ? 1.0F : 0.0F; GL11.glBegin(GL11.GL_TRIANGLE_STRIP); @@ -316,7 +316,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Draws the specified string with a shadow. */ - public int drawStringWithShadow(String par1Str, int par2, int par3, int par4) + public int drawStringWithShadow (String par1Str, int par2, int par3, int par4) { return this.drawString(par1Str, par2, par3, par4, true); } @@ -324,7 +324,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Draws the specified string. */ - public int drawString(String par1Str, int par2, int par3, int par4) + public int drawString (String par1Str, int par2, int par3, int par4) { return this.drawString(par1Str, par2, par3, par4, false); } @@ -332,7 +332,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Draws the specified string. Args: string, x, y, color, dropShadow */ - public int drawString(String par1Str, int par2, int par3, int par4, boolean par5) + public int drawString (String par1Str, int par2, int par3, int par4, boolean par5) { this.resetStyles(); @@ -359,7 +359,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Apply Unicode Bidirectional Algorithm to string and return a new possibly reordered string for visual rendering. */ - private String bidiReorder(String par1Str) + private String bidiReorder (String par1Str) { if (par1Str != null && Bidi.requiresBidi(par1Str.toCharArray(), 0, par1Str.length())) { @@ -374,11 +374,11 @@ public class SmallFontRenderer implements ResourceManagerReloadListener i = bidi.getRunLimit(j); int l = bidi.getRunLevel(j); String s1 = par1Str.substring(k, i); - abyte[j] = (byte)l; + abyte[j] = (byte) l; astring[j] = s1; } - String[] astring1 = (String[])astring.clone(); + String[] astring1 = (String[]) astring.clone(); Bidi.reorderVisually(abyte, 0, astring, 0, abyte.length); StringBuilder stringbuilder = new StringBuilder(); i = 0; @@ -440,7 +440,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Reset all style flag fields in the class to false; called at the start of string rendering */ - private void resetStyles() + private void resetStyles () { this.randomStyle = false; this.boldStyle = false; @@ -452,7 +452,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Render a single line string at the current (posX,posY) and update posX */ - private void renderStringAtPos(String par1Str, boolean par2) + private void renderStringAtPos (String par1Str, boolean par2) { for (int i = 0; i < par1Str.length(); ++i) { @@ -484,7 +484,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener k = this.colorCode[j]; this.textColor = k; - GL11.glColor4f((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.alpha); + GL11.glColor4f((float) (k >> 16) / 255.0F, (float) (k >> 8 & 255) / 255.0F, (float) (k & 255) / 255.0F, this.alpha); } else if (j == 16) { @@ -527,8 +527,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener do { k = this.fontRandom.nextInt(ChatAllowedCharacters.allowedCharacters.length()); - } - while (this.charWidth[j + 32] != this.charWidth[k + 32]); + } while (this.charWidth[j + 32] != this.charWidth[k + 32]); j = k; } @@ -579,10 +578,10 @@ public class SmallFontRenderer implements ResourceManagerReloadListener tessellator = Tessellator.instance; GL11.glDisable(GL11.GL_TEXTURE_2D); tessellator.startDrawingQuads(); - tessellator.addVertex((double)this.posX, (double)(this.posY + (float)(this.FONT_HEIGHT / 2)), 0.0D); - tessellator.addVertex((double)(this.posX + f1), (double)(this.posY + (float)(this.FONT_HEIGHT / 2)), 0.0D); - tessellator.addVertex((double)(this.posX + f1), (double)(this.posY + (float)(this.FONT_HEIGHT / 2) - 1.0F), 0.0D); - tessellator.addVertex((double)this.posX, (double)(this.posY + (float)(this.FONT_HEIGHT / 2) - 1.0F), 0.0D); + tessellator.addVertex((double) this.posX, (double) (this.posY + (float) (this.FONT_HEIGHT / 2)), 0.0D); + tessellator.addVertex((double) (this.posX + f1), (double) (this.posY + (float) (this.FONT_HEIGHT / 2)), 0.0D); + tessellator.addVertex((double) (this.posX + f1), (double) (this.posY + (float) (this.FONT_HEIGHT / 2) - 1.0F), 0.0D); + tessellator.addVertex((double) this.posX, (double) (this.posY + (float) (this.FONT_HEIGHT / 2) - 1.0F), 0.0D); tessellator.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); } @@ -593,15 +592,15 @@ public class SmallFontRenderer implements ResourceManagerReloadListener GL11.glDisable(GL11.GL_TEXTURE_2D); tessellator.startDrawingQuads(); int l = this.underlineStyle ? -1 : 0; - tessellator.addVertex((double)(this.posX + (float)l), (double)(this.posY + (float)this.FONT_HEIGHT), 0.0D); - tessellator.addVertex((double)(this.posX + f1), (double)(this.posY + (float)this.FONT_HEIGHT), 0.0D); - tessellator.addVertex((double)(this.posX + f1), (double)(this.posY + (float)this.FONT_HEIGHT - 1.0F), 0.0D); - tessellator.addVertex((double)(this.posX + (float)l), (double)(this.posY + (float)this.FONT_HEIGHT - 1.0F), 0.0D); + tessellator.addVertex((double) (this.posX + (float) l), (double) (this.posY + (float) this.FONT_HEIGHT), 0.0D); + tessellator.addVertex((double) (this.posX + f1), (double) (this.posY + (float) this.FONT_HEIGHT), 0.0D); + tessellator.addVertex((double) (this.posX + f1), (double) (this.posY + (float) this.FONT_HEIGHT - 1.0F), 0.0D); + tessellator.addVertex((double) (this.posX + (float) l), (double) (this.posY + (float) this.FONT_HEIGHT - 1.0F), 0.0D); tessellator.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); } - this.posX += (float)((int)f1); + this.posX += (float) ((int) f1); } } } @@ -609,7 +608,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Render string either left or right aligned depending on bidiFlag */ - private int renderStringAligned(String par1Str, int par2, int par3, int par4, int par5, boolean par6) + private int renderStringAligned (String par1Str, int par2, int par3, int par4, int par5, boolean par6) { if (this.bidiFlag) { @@ -624,7 +623,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Render single line string by setting GL color, current (posX,posY), and calling renderStringAtPos() */ - private int renderString(String par1Str, int par2, int par3, int par4, boolean par5) + private int renderString (String par1Str, int par2, int par3, int par4, boolean par5) { if (par1Str == null) { @@ -642,22 +641,22 @@ public class SmallFontRenderer implements ResourceManagerReloadListener par4 = (par4 & 16579836) >> 2 | par4 & -16777216; } - this.red = (float)(par4 >> 16 & 255) / 255.0F; - this.blue = (float)(par4 >> 8 & 255) / 255.0F; - this.green = (float)(par4 & 255) / 255.0F; - this.alpha = (float)(par4 >> 24 & 255) / 255.0F; + this.red = (float) (par4 >> 16 & 255) / 255.0F; + this.blue = (float) (par4 >> 8 & 255) / 255.0F; + this.green = (float) (par4 & 255) / 255.0F; + this.alpha = (float) (par4 >> 24 & 255) / 255.0F; GL11.glColor4f(this.red, this.blue, this.green, this.alpha); - this.posX = (float)par2; - this.posY = (float)par3; + this.posX = (float) par2; + this.posY = (float) par3; this.renderStringAtPos(par1Str, par5); - return (int)this.posX; + return (int) this.posX; } } /** * Returns the width of this string. Equivalent of FontMetrics.stringWidth(String s). */ - public int getStringWidth(String par1Str) + public int getStringWidth (String par1Str) { if (par1Str == null) { @@ -708,7 +707,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Returns the width of this character as rendered. */ - public int getCharWidth(char par1) + public int getCharWidth (char par1) { if (par1 == 167) { @@ -750,7 +749,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Trims a string to fit a specified Width. */ - public String trimStringToWidth(String par1Str, int par2) + public String trimStringToWidth (String par1Str, int par2) { return this.trimStringToWidth(par1Str, par2, false); } @@ -758,7 +757,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Trims a string to a specified width, and will reverse it if par3 is set. */ - public String trimStringToWidth(String par1Str, int par2, boolean par3) + public String trimStringToWidth (String par1Str, int par2, boolean par3) { StringBuilder stringbuilder = new StringBuilder(); int j = 0; @@ -823,7 +822,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Remove all newline characters from the end of the string */ - private String trimStringNewline(String par1Str) + private String trimStringNewline (String par1Str) { while (par1Str != null && par1Str.endsWith("\n")) { @@ -836,7 +835,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Splits and draws a String with wordwrap (maximum length is parameter k) */ - public void drawSplitString(String par1Str, int par2, int par3, int par4, int par5) + public void drawSplitString (String par1Str, int par2, int par3, int par4, int par5) { this.resetStyles(); this.textColor = par5; @@ -848,13 +847,13 @@ public class SmallFontRenderer implements ResourceManagerReloadListener * Perform actual work of rendering a multi-line string with wordwrap and with darker drop shadow color if flag is * set */ - private void renderSplitString(String par1Str, int par2, int par3, int par4, boolean par5) + private void renderSplitString (String par1Str, int par2, int par3, int par4, boolean par5) { List list = this.listFormattedStringToWidth(par1Str, par4); for (Iterator iterator = list.iterator(); iterator.hasNext(); par3 += this.FONT_HEIGHT) { - String s1 = (String)iterator.next(); + String s1 = (String) iterator.next(); this.renderStringAligned(s1, par2, par3, par4, this.textColor, par5); } } @@ -862,7 +861,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Returns the width of the wordwrapped String (maximum length is parameter k) */ - public int splitStringWidth(String par1Str, int par2) + public int splitStringWidth (String par1Str, int par2) { return this.FONT_HEIGHT * this.listFormattedStringToWidth(par1Str, par2).size(); } @@ -871,7 +870,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener * Set unicodeFlag controlling whether strings should be rendered with Unicode fonts instead of the default.png * font. */ - public void setUnicodeFlag(boolean par1) + public void setUnicodeFlag (boolean par1) { this.unicodeFlag = par1; } @@ -880,7 +879,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener * Get unicodeFlag controlling whether strings should be rendered with Unicode fonts instead of the default.png * font. */ - public boolean getUnicodeFlag() + public boolean getUnicodeFlag () { return this.unicodeFlag; } @@ -888,7 +887,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Set bidiFlag to control if the Unicode Bidirectional Algorithm should be run before rendering any string. */ - public void setBidiFlag(boolean par1) + public void setBidiFlag (boolean par1) { this.bidiFlag = par1; } @@ -896,7 +895,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Breaks a string into a list of pieces that will fit a specified width. */ - public List listFormattedStringToWidth(String par1Str, int par2) + public List listFormattedStringToWidth (String par1Str, int par2) { return Arrays.asList(this.wrapFormattedStringToWidth(par1Str, par2).split("\n")); } @@ -904,7 +903,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Inserts newline and formatting into a string to wrap it within the specified width. */ - String wrapFormattedStringToWidth(String par1Str, int par2) + String wrapFormattedStringToWidth (String par1Str, int par2) { int j = this.sizeStringToWidth(par1Str, par2); @@ -925,7 +924,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Determines how many characters from the string will fit into the specified width. */ - private int sizeStringToWidth(String par1Str, int par2) + private int sizeStringToWidth (String par1Str, int par2) { int j = par1Str.length(); int k = 0; @@ -938,38 +937,38 @@ public class SmallFontRenderer implements ResourceManagerReloadListener switch (c0) { - case 10: - --l; - break; - case 167: - if (l < j - 1) - { - ++l; - char c1 = par1Str.charAt(l); + case 10: + --l; + break; + case 167: + if (l < j - 1) + { + ++l; + char c1 = par1Str.charAt(l); - if (c1 != 108 && c1 != 76) + if (c1 != 108 && c1 != 76) + { + if (c1 == 114 || c1 == 82 || isFormatColor(c1)) { - if (c1 == 114 || c1 == 82 || isFormatColor(c1)) - { - flag = false; - } - } - else - { - flag = true; + flag = false; } } - - break; - case 32: - i1 = l; - default: - k += this.getCharWidth(c0); - - if (flag) + else { - ++k; + flag = true; } + } + + break; + case 32: + i1 = l; + default: + k += this.getCharWidth(c0); + + if (flag) + { + ++k; + } } if (c0 == 10) @@ -991,7 +990,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Checks if the char code is a hexadecimal character, used to set colour. */ - private static boolean isFormatColor(char par0) + private static boolean isFormatColor (char par0) { return par0 >= 48 && par0 <= 57 || par0 >= 97 && par0 <= 102 || par0 >= 65 && par0 <= 70; } @@ -999,7 +998,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Checks if the char code is O-K...lLrRk-o... used to set special formatting. */ - private static boolean isFormatSpecial(char par0) + private static boolean isFormatSpecial (char par0) { return par0 >= 107 && par0 <= 111 || par0 >= 75 && par0 <= 79 || par0 == 114 || par0 == 82; } @@ -1007,7 +1006,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Digests a string for nonprinting formatting characters then returns a string containing only that formatting. */ - private static String getFormatFromString(String par0Str) + private static String getFormatFromString (String par0Str) { String s1 = ""; int i = -1; @@ -1036,7 +1035,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener /** * Get bidiFlag that controls if the Unicode Bidirectional Algorithm should be run before rendering any string */ - public boolean getBidiFlag() + public boolean getBidiFlag () { return this.bidiFlag; } diff --git a/tconstruct/client/block/SmelteryRender.java b/tconstruct/client/block/SmelteryRender.java index 3e67d599..9aae4b3e 100644 --- a/tconstruct/client/block/SmelteryRender.java +++ b/tconstruct/client/block/SmelteryRender.java @@ -148,7 +148,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler Block liquidBlock = Block.blocksList[blockToRender.itemID]; BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY, posZ + i / 3, renderer, world); } - + /*else //No items, only blocks //Item { diff --git a/tconstruct/client/block/TankRender.java b/tconstruct/client/block/TankRender.java index c92cbac9..9b297503 100644 --- a/tconstruct/client/block/TankRender.java +++ b/tconstruct/client/block/TankRender.java @@ -50,7 +50,6 @@ public class TankRender implements ISimpleBlockRenderingHandler BlockSkinRenderHelper.renderMetadataBlock(Block.blocksList[fluid.getBlockID()], 0, x, y, z, renderer, world); else BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); - renderer.setRenderBounds(00, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); } diff --git a/tconstruct/client/entity/CartRender.java b/tconstruct/client/entity/CartRender.java index 1813be74..cae6a4bf 100644 --- a/tconstruct/client/entity/CartRender.java +++ b/tconstruct/client/entity/CartRender.java @@ -131,11 +131,11 @@ public class CartRender extends Render { this.renderPullcart((CartEntity) par1Entity, par2, par4, par6, par8, par9); } - - protected ResourceLocation func_110775_a(Entity par1Entity) + + protected ResourceLocation func_110775_a (Entity par1Entity) { return texture; } - + static final ResourceLocation texture = new ResourceLocation("assets/tinker/textures/mob/pullcart.png"); } diff --git a/tconstruct/client/entity/CrystalGuardianRender.java b/tconstruct/client/entity/CrystalGuardianRender.java index d59a71f6..36c4f47d 100644 --- a/tconstruct/client/entity/CrystalGuardianRender.java +++ b/tconstruct/client/entity/CrystalGuardianRender.java @@ -186,10 +186,10 @@ public class CrystalGuardianRender extends RenderLiving } @Override - protected ResourceLocation func_110775_a(Entity par1Entity) + protected ResourceLocation func_110775_a (Entity par1Entity) { return texture; } - + static final ResourceLocation texture = new ResourceLocation("assets/tinker/textures/mob/crystalguardamber.png"); } diff --git a/tconstruct/client/entity/CrystalRender.java b/tconstruct/client/entity/CrystalRender.java index 25a34889..a953d963 100644 --- a/tconstruct/client/entity/CrystalRender.java +++ b/tconstruct/client/entity/CrystalRender.java @@ -64,10 +64,10 @@ public class CrystalRender extends RenderLiving return this.func_77061_b((Crystal) par1EntityLiving, par2, par3); } - protected ResourceLocation func_110775_a(Entity par1Entity) + protected ResourceLocation func_110775_a (Entity par1Entity) { return texture; } - + static final ResourceLocation texture = new ResourceLocation("assets/tinker/textures/mob/crystalwater.png"); } diff --git a/tconstruct/client/entity/MiniGardyRender.java b/tconstruct/client/entity/MiniGardyRender.java index a0e57f05..63b34098 100644 --- a/tconstruct/client/entity/MiniGardyRender.java +++ b/tconstruct/client/entity/MiniGardyRender.java @@ -175,12 +175,12 @@ public class MiniGardyRender extends RenderLiving { GL11.glTranslatef(0.0F, 0.1875F, 0.0F); } - + @Override - protected ResourceLocation func_110775_a(Entity par1Entity) + protected ResourceLocation func_110775_a (Entity par1Entity) { return texture; } - + static final ResourceLocation texture = new ResourceLocation("assets/tinker/textures/mob/googirl.png"); } diff --git a/tconstruct/client/entity/SlimeRender.java b/tconstruct/client/entity/SlimeRender.java index fe96fddf..89da775f 100644 --- a/tconstruct/client/entity/SlimeRender.java +++ b/tconstruct/client/entity/SlimeRender.java @@ -97,9 +97,9 @@ public class SlimeRender extends RenderLiving { return this.shouldSlimeRenderPass((BlueSlime) par1EntityLiving, par2, par3); } - + @Override - protected ResourceLocation func_110775_a(Entity par1Entity) + protected ResourceLocation func_110775_a (Entity par1Entity) { return texture; } diff --git a/tconstruct/client/entity/projectile/ArrowRender.java b/tconstruct/client/entity/projectile/ArrowRender.java index 9e50f56f..78595815 100644 --- a/tconstruct/client/entity/projectile/ArrowRender.java +++ b/tconstruct/client/entity/projectile/ArrowRender.java @@ -75,7 +75,7 @@ public class ArrowRender extends Render { block = Block.blocksList[itemstack.itemID]; } - + if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); diff --git a/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/tconstruct/client/entity/projectile/ArrowRenderCustom.java index e0ceb314..56fdd49f 100644 --- a/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -22,79 +22,81 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ArrowRenderCustom extends Render { - private static RenderItem renderer = new RenderItem(); - private Random random = new Random(); + private static RenderItem renderer = new RenderItem(); + private Random random = new Random(); - public ArrowRenderCustom() {} + public ArrowRenderCustom() + { + } - /** - * Renders the item - */ - public void doRenderItem(ArrowEntity arrow, double par2, double par4, double par6, float par8, float par9) - { - random.setSeed(187L); - ItemStack item = arrow.getEntityItem(); - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glRotatef(arrow.prevRotationYaw + (arrow.rotationYaw - arrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(arrow.prevRotationPitch + (arrow.rotationPitch - arrow.prevRotationPitch) * par9 - 45.0F, 0.0F, 0.0F, 1.0F); - float shake = arrow.arrowShake - par9; - if (shake > 0.0F) - GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); - GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); - float scale = 1.35f; - GL11.glScalef(scale, scale, scale); - ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, renderBlocks); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } + /** + * Renders the item + */ + public void doRenderItem (ArrowEntity arrow, double par2, double par4, double par6, float par8, float par9) + { + random.setSeed(187L); + ItemStack item = arrow.getEntityItem(); + GL11.glPushMatrix(); + GL11.glTranslatef((float) par2, (float) par4, (float) par6); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glRotatef(arrow.prevRotationYaw + (arrow.rotationYaw - arrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(arrow.prevRotationPitch + (arrow.rotationPitch - arrow.prevRotationPitch) * par9 - 45.0F, 0.0F, 0.0F, 1.0F); + float shake = arrow.arrowShake - par9; + if (shake > 0.0F) + GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); + GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); + float scale = 1.35f; + GL11.glScalef(scale, scale, scale); + ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, renderBlocks); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } - /** - * Renders the item's icon or block into the UI at the specified position. - */ - public void renderItemIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { - renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); - } + /** + * Renders the item's icon or block into the UI at the specified position. + */ + public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + { + renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); + } - /** - * Render the item's icon or block into the GUI, including the glint effect. - */ - public void renderItemAndEffectIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { - renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); - } + /** + * Render the item's icon or block into the GUI, including the glint effect. + */ + public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + { + renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); + } - /** - * Renders the item's overlay information. Examples being stack count or - * damage on top of the item's image at the specified position. - */ - public void renderItemOverlayIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { - renderer.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); - } + /** + * Renders the item's overlay information. Examples being stack count or + * damage on top of the item's image at the specified position. + */ + public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + { + renderer.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); + } - /** - * Actually renders the given argument. This is a synthetic bridge method, - * always casting down its argument and then handing it off to a worker - * function which does the actual work. In all probabilty, the class Render - * is generic (Render 0.0F) GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); @@ -62,7 +62,7 @@ public class DaggerRenderCustom extends Render /** * Renders the item's icon or block into the UI at the specified position. */ - public void renderItemIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) { renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } @@ -70,7 +70,7 @@ public class DaggerRenderCustom extends Render /** * Render the item's icon or block into the GUI, including the glint effect. */ - public void renderItemAndEffectIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) { renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } @@ -79,7 +79,7 @@ public class DaggerRenderCustom extends Render * Renders the item's overlay information. Examples being stack count or * damage on top of the item's image at the specified position. */ - public void renderItemOverlayIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) { renderer.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } @@ -93,16 +93,16 @@ public class DaggerRenderCustom extends Render * f1). But JAD is pre 1.5 so doesn't do that. */ @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) + public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - this.doRenderItem((DaggerEntity)par1Entity, par2, par4, par6, par8, par9); + this.doRenderItem((DaggerEntity) par1Entity, par2, par4, par6, par8, par9); } - + protected ResourceLocation func_110775_a (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()); diff --git a/tconstruct/client/entity/projectile/LaunchedItemRender.java b/tconstruct/client/entity/projectile/LaunchedItemRender.java index f03a1d9f..1c14b7fc 100644 --- a/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -41,14 +41,14 @@ public class LaunchedItemRender extends Render * (Render> 16 & 255) / 255.0F; - float f3 = (float)(i >> 8 & 255) / 255.0F; - float f4 = (float)(i & 255) / 255.0F; + int i = PotionHelper.func_77915_a(((LaunchedPotion) par1Entity).getPotionDamage(), false); + float f2 = (float) (i >> 16 & 255) / 255.0F; + float f3 = (float) (i >> 8 & 255) / 255.0F; + float f4 = (float) (i & 255) / 255.0F; GL11.glColor3f(f2, f3, f4); GL11.glPushMatrix(); this.func_77026_a(tessellator, ItemPotion.func_94589_d("overlay")); @@ -73,12 +73,12 @@ public class LaunchedItemRender extends Render } } - protected ResourceLocation func_110775_a(Entity par1Entity) + protected ResourceLocation func_110775_a (Entity par1Entity) { return TextureMap.field_110576_c; } - private void func_77026_a(Tessellator par1Tessellator, Icon par2Icon) + private void func_77026_a (Tessellator par1Tessellator, Icon par2Icon) { float f = par2Icon.getMinU(); float f1 = par2Icon.getMaxU(); @@ -91,10 +91,10 @@ public class LaunchedItemRender extends Render GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); par1Tessellator.startDrawingQuads(); par1Tessellator.setNormal(0.0F, 1.0F, 0.0F); - par1Tessellator.addVertexWithUV((double)(0.0F - f5), (double)(0.0F - f6), 0.0D, (double)f, (double)f3); - par1Tessellator.addVertexWithUV((double)(f4 - f5), (double)(0.0F - f6), 0.0D, (double)f1, (double)f3); - par1Tessellator.addVertexWithUV((double)(f4 - f5), (double)(f4 - f6), 0.0D, (double)f1, (double)f2); - par1Tessellator.addVertexWithUV((double)(0.0F - f5), (double)(f4 - f6), 0.0D, (double)f, (double)f2); + par1Tessellator.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); + par1Tessellator.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); + par1Tessellator.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); + par1Tessellator.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); par1Tessellator.draw(); } } diff --git a/tconstruct/client/event/EventCloakRender.java b/tconstruct/client/event/EventCloakRender.java index a7591a28..03f82a48 100644 --- a/tconstruct/client/event/EventCloakRender.java +++ b/tconstruct/client/event/EventCloakRender.java @@ -14,121 +14,151 @@ import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.event.ForgeSubscribe; -public class EventCloakRender { - - private final String serverLocation = "https://raw.github.com/mDiyo/TinkersConstruct/master/capes.txt"; - private final int timeout = 1000; - - private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics(); - private HashMap cloaks = new HashMap(); - private ArrayList capePlayers = new ArrayList(); - - public static EventCloakRender instance; - - public EventCloakRender(){ - buildCloakURLDatabase(); - instance = this; - } - - @ForgeSubscribe - public void onPreRenderSpecials(RenderPlayerEvent.Specials.Pre event){ - if(Loader.isModLoaded("shadersmod")){ - return; - } - if(event.entityPlayer instanceof AbstractClientPlayer){ - AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer)event.entityPlayer; - - if (!capePlayers.contains(abstractClientPlayer)) { - String cloakURL = cloaks.get(event.entityPlayer.username); - - if(cloakURL == null){ - return; - } - - capePlayers.add(abstractClientPlayer); - - abstractClientPlayer.func_110310_o().field_110559_g = false; - new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); - event.renderCape = true; - } - } - } - - public void buildCloakURLDatabase(){ - URL url; - try { - url = new URL(serverLocation); - URLConnection con = url.openConnection(); - con.setConnectTimeout(timeout); - con.setReadTimeout(timeout); - InputStream io = con.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(io)); - - String str; - int linetracker = 1; - while((str = br.readLine()) != null){ - if(str.contains(":")){ - String nick = str.substring(0, str.indexOf(":")); - String link = str.substring(str.indexOf(":") + 1); - new Thread(new CloakPreload(link)).start(); - cloaks.put(nick, link); - }else{ - System.err.println("[TinkersConstruct] [skins.txt] Syntax error on line " + linetracker + ": " + str); - } - linetracker++; - } - - br.close(); - } catch (MalformedURLException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - private class CloakThread implements Runnable{ +public class EventCloakRender +{ - AbstractClientPlayer abstractClientPlayer; - String cloakURL; - - public CloakThread(AbstractClientPlayer player, String cloak){ - abstractClientPlayer = player; - cloakURL = cloak; - } + private final String serverLocation = "https://raw.github.com/mDiyo/TinkersConstruct/master/capes.txt"; + private final int timeout = 1000; - @Override - public void run() { - try { - 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; - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } - } - - private class CloakPreload implements Runnable{ - String cloakURL; - - public CloakPreload(String link){ - cloakURL = link; - } - - @Override - public void run(){ - try { - TEST_GRAPHICS.drawImage(new ImageIcon(new URL(cloakURL)).getImage(), 0, 0, null); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } - } - - public void refreshCapes(){ - cloaks.clear(); - capePlayers.clear(); - buildCloakURLDatabase(); - } + private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics(); + private HashMap cloaks = new HashMap(); + private ArrayList capePlayers = new ArrayList(); + + public static EventCloakRender instance; + + public EventCloakRender() + { + buildCloakURLDatabase(); + instance = this; + } + + @ForgeSubscribe + public void onPreRenderSpecials (RenderPlayerEvent.Specials.Pre event) + { + if (Loader.isModLoaded("shadersmod")) + { + return; + } + if (event.entityPlayer instanceof AbstractClientPlayer) + { + AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer) event.entityPlayer; + + if (!capePlayers.contains(abstractClientPlayer)) + { + String cloakURL = cloaks.get(event.entityPlayer.username); + + if (cloakURL == null) + { + return; + } + + capePlayers.add(abstractClientPlayer); + + abstractClientPlayer.func_110310_o().field_110559_g = false; + new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); + event.renderCape = true; + } + } + } + + public void buildCloakURLDatabase () + { + URL url; + try + { + url = new URL(serverLocation); + URLConnection con = url.openConnection(); + con.setConnectTimeout(timeout); + con.setReadTimeout(timeout); + InputStream io = con.getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(io)); + + String str; + int linetracker = 1; + while ((str = br.readLine()) != null) + { + if (str.contains(":")) + { + String nick = str.substring(0, str.indexOf(":")); + String link = str.substring(str.indexOf(":") + 1); + new Thread(new CloakPreload(link)).start(); + cloaks.put(nick, link); + } + else + { + System.err.println("[TinkersConstruct] [skins.txt] Syntax error on line " + linetracker + ": " + str); + } + linetracker++; + } + + br.close(); + } + catch (MalformedURLException e) + { + e.printStackTrace(); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + + private class CloakThread implements Runnable + { + + AbstractClientPlayer abstractClientPlayer; + String cloakURL; + + public CloakThread(AbstractClientPlayer player, String cloak) + { + abstractClientPlayer = player; + cloakURL = cloak; + } + + @Override + public void run () + { + try + { + 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; + } + catch (MalformedURLException e) + { + e.printStackTrace(); + } + } + } + + private class CloakPreload implements Runnable + { + String cloakURL; + + public CloakPreload(String link) + { + cloakURL = link; + } + + @Override + public void run () + { + try + { + TEST_GRAPHICS.drawImage(new ImageIcon(new URL(cloakURL)).getImage(), 0, 0, null); + } + catch (MalformedURLException e) + { + e.printStackTrace(); + } + } + } + + public void refreshCapes () + { + cloaks.clear(); + capePlayers.clear(); + buildCloakURLDatabase(); + } } diff --git a/tconstruct/client/gui/ArmorExtendedGui.java b/tconstruct/client/gui/ArmorExtendedGui.java index 9a3d44ce..b407caf0 100644 --- a/tconstruct/client/gui/ArmorExtendedGui.java +++ b/tconstruct/client/gui/ArmorExtendedGui.java @@ -39,12 +39,12 @@ public class ArmorExtendedGui extends InventoryEffectRenderer int cornerY = (this.height - this.ySize) / 2; this.buttonList.clear(); -// InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); -// this.buttonList.add(tab); -// tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1); -// tab.enabled = false; -// this.buttonList.add(tab); - + // InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); + // this.buttonList.add(tab); + // tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1); + // tab.enabled = false; + // this.buttonList.add(tab); + TabRegistry.updateTabValues(cornerX, cornerY, InventoryTabArmorExtended.class); TabRegistry.addTabsToList(this.buttonList); } @@ -60,25 +60,25 @@ public class ArmorExtendedGui extends InventoryEffectRenderer super.drawScreen(par1, par2, par3); this.xSize_lo = (float) par1; this.ySize_lo = (float) par2; -// if (stats.inventory[2] != null && stats.inventory[2].getItem() == TContent.knapsack) -// { -// if (this.buttonList.size() < 3) -// { -// int cornerX = guiLeft; -// int cornerY = (this.height - this.ySize) / 2; -// InventoryTab tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); -// this.buttonList.add(tab); -// } -// } -// else -// { -// if (this.buttonList.size() >= 3) -// { -// buttonList.remove(2); -// } -// } + // if (stats.inventory[2] != null && stats.inventory[2].getItem() == TContent.knapsack) + // { + // if (this.buttonList.size() < 3) + // { + // int cornerX = guiLeft; + // int cornerY = (this.height - this.ySize) / 2; + // InventoryTab tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); + // this.buttonList.add(tab); + // } + // } + // else + // { + // if (this.buttonList.size() >= 3) + // { + // buttonList.remove(2); + // } + // } } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/armorextended.png"); protected void drawGuiContainerBackgroundLayer (float f, int i, int j) diff --git a/tconstruct/client/gui/CraftingStationGui.java b/tconstruct/client/gui/CraftingStationGui.java index 5452a735..722d5a29 100644 --- a/tconstruct/client/gui/CraftingStationGui.java +++ b/tconstruct/client/gui/CraftingStationGui.java @@ -28,7 +28,7 @@ public class CraftingStationGui extends GuiContainer fontRenderer.drawString("Crafting", 28, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/crafting.png"); @Override diff --git a/tconstruct/client/gui/DrawbridgeButton.java b/tconstruct/client/gui/DrawbridgeButton.java index 126be8e7..07c561e4 100644 --- a/tconstruct/client/gui/DrawbridgeButton.java +++ b/tconstruct/client/gui/DrawbridgeButton.java @@ -17,12 +17,14 @@ public class DrawbridgeButton extends GuiButton */ int uPos; int vPos; + public DrawbridgeButton(int id, int xPos, int yPos, int u, int v, int xSize, int ySize) { super(id, xPos, yPos, xSize, ySize, ""); uPos = u; vPos = v; } + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/drawbridge.png"); /** diff --git a/tconstruct/client/gui/DrawbridgeGui.java b/tconstruct/client/gui/DrawbridgeGui.java index 66a955ef..c015766c 100644 --- a/tconstruct/client/gui/DrawbridgeGui.java +++ b/tconstruct/client/gui/DrawbridgeGui.java @@ -32,7 +32,7 @@ public class DrawbridgeGui extends GuiContainer fontRenderer.drawString("Drawbridge", 8, 6, 0x404040); fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/drawbridge.png"); protected void drawGuiContainerBackgroundLayer (float f, int i, int j) @@ -43,7 +43,7 @@ public class DrawbridgeGui extends GuiContainer int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); } - + public void initGui () { super.initGui(); @@ -81,7 +81,7 @@ public class DrawbridgeGui extends GuiContainer b.enabled = true; } button.enabled = false; - + logic.setPlacementDirection((byte) button.id); updateServer((byte) button.id); } diff --git a/tconstruct/client/gui/FrypanGui.java b/tconstruct/client/gui/FrypanGui.java index d8108c01..a26686e9 100644 --- a/tconstruct/client/gui/FrypanGui.java +++ b/tconstruct/client/gui/FrypanGui.java @@ -25,7 +25,7 @@ public class FrypanGui extends GuiContainer fontRenderer.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040); fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/frypan.png"); protected void drawGuiContainerBackgroundLayer (float f, int i, int j) diff --git a/tconstruct/client/gui/GlowstoneAggregatorGui.java b/tconstruct/client/gui/GlowstoneAggregatorGui.java index 9be4d6b3..2b29ae52 100644 --- a/tconstruct/client/gui/GlowstoneAggregatorGui.java +++ b/tconstruct/client/gui/GlowstoneAggregatorGui.java @@ -27,7 +27,7 @@ public class GlowstoneAggregatorGui extends GuiContainer fontRenderer.drawString("Crystal Value: " + logic.crystalValue, 8, 16, 0x404040); fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/aggregator.png"); protected void drawGuiContainerBackgroundLayer (float f, int i, int j) diff --git a/tconstruct/client/gui/GuiButtonTool.java b/tconstruct/client/gui/GuiButtonTool.java index 745cd4c2..ef4d3de8 100644 --- a/tconstruct/client/gui/GuiButtonTool.java +++ b/tconstruct/client/gui/GuiButtonTool.java @@ -8,7 +8,6 @@ import org.lwjgl.opengl.GL11; import tconstruct.library.client.ToolGuiElement; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/tconstruct/client/gui/GuiManual.java b/tconstruct/client/gui/GuiManual.java index 6d131804..e5fe4699 100644 --- a/tconstruct/client/gui/GuiManual.java +++ b/tconstruct/client/gui/GuiManual.java @@ -151,7 +151,7 @@ public class GuiManual extends GuiScreen pageRight = null; } } - + private static final ResourceLocation bookRight = new ResourceLocation("tinker", "textures/gui/bookright.png"); private static final ResourceLocation bookLeft = new ResourceLocation("tinker", "textures/gui/bookleft.png"); diff --git a/tconstruct/client/gui/KnapsackGui.java b/tconstruct/client/gui/KnapsackGui.java index 203ba310..ae6a5ea0 100644 --- a/tconstruct/client/gui/KnapsackGui.java +++ b/tconstruct/client/gui/KnapsackGui.java @@ -32,14 +32,14 @@ public class KnapsackGui extends GuiContainer TabRegistry.updateTabValues(cornerX, cornerY, InventoryTabKnapsack.class); TabRegistry.addTabsToList(this.buttonList); - -// InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); -// this.buttonList.add(tab); -// tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1); -// this.buttonList.add(tab); -// tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); -// tab.enabled = false; -// this.buttonList.add(tab); + + // InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); + // this.buttonList.add(tab); + // tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1); + // this.buttonList.add(tab); + // tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); + // tab.enabled = false; + // this.buttonList.add(tab); } protected void drawGuiContainerForegroundLayer (int par1, int par2) @@ -47,7 +47,7 @@ public class KnapsackGui extends GuiContainer fontRenderer.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040); fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/knapsack.png"); protected void drawGuiContainerBackgroundLayer (float f, int i, int j) diff --git a/tconstruct/client/gui/MiniGardyGui.java b/tconstruct/client/gui/MiniGardyGui.java index a912b96f..e65e3ade 100644 --- a/tconstruct/client/gui/MiniGardyGui.java +++ b/tconstruct/client/gui/MiniGardyGui.java @@ -25,7 +25,7 @@ public class MiniGardyGui extends GuiContainer fontRenderer.drawString(gardy.getEntityName(), 8, 6, 0x404040); fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/googirl.png"); protected void drawGuiContainerBackgroundLayer (float f, int i, int j) diff --git a/tconstruct/client/gui/PartCrafterGui.java b/tconstruct/client/gui/PartCrafterGui.java index fbb0e753..ee2c3f01 100644 --- a/tconstruct/client/gui/PartCrafterGui.java +++ b/tconstruct/client/gui/PartCrafterGui.java @@ -147,7 +147,7 @@ public class PartCrafterGui extends NewContainerGui return String.valueOf(num); } } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/toolparts.png"); private static final ResourceLocation minichest = new ResourceLocation("tinker", "textures/gui/patternchestmini.png"); private static final ResourceLocation description = new ResourceLocation("tinker", "textures/gui/description.png"); diff --git a/tconstruct/client/gui/PatternChestGui.java b/tconstruct/client/gui/PatternChestGui.java index 66bf6380..cb7a99be 100644 --- a/tconstruct/client/gui/PatternChestGui.java +++ b/tconstruct/client/gui/PatternChestGui.java @@ -27,9 +27,9 @@ public class PatternChestGui extends GuiContainer fontRenderer.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040); fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternchest.png"); - + protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/tconstruct/client/gui/StencilTableGui.java b/tconstruct/client/gui/StencilTableGui.java index 88e5e315..4a462656 100644 --- a/tconstruct/client/gui/StencilTableGui.java +++ b/tconstruct/client/gui/StencilTableGui.java @@ -43,7 +43,7 @@ public class StencilTableGui extends GuiContainer fontRenderer.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternshaper.png"); protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) diff --git a/tconstruct/client/gui/ToolStationGui.java b/tconstruct/client/gui/ToolStationGui.java index c828c452..e9cc8554 100644 --- a/tconstruct/client/gui/ToolStationGui.java +++ b/tconstruct/client/gui/ToolStationGui.java @@ -99,7 +99,8 @@ public class ToolStationGui extends NewContainerGui for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.toolButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter, cornerX - 110 + 22 * (iter % 5), cornerY + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); + GuiButtonTool button = new GuiButtonTool(iter, cornerX - 110 + 22 * (iter % 5), cornerY + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, + element); this.buttonList.add(button); } } @@ -418,7 +419,7 @@ public class ToolStationGui extends NewContainerGui return String.valueOf(num); } } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/toolstation.png"); private static final ResourceLocation icons = new ResourceLocation("tinker", "textures/gui/icons.png"); private static final ResourceLocation description = new ResourceLocation("tinker", "textures/gui/description.png"); diff --git a/tconstruct/client/gui/TurnPageButton.java b/tconstruct/client/gui/TurnPageButton.java index c601afe4..0b1f89ca 100644 --- a/tconstruct/client/gui/TurnPageButton.java +++ b/tconstruct/client/gui/TurnPageButton.java @@ -22,7 +22,7 @@ public class TurnPageButton extends GuiButton super(par1, par2, par3, 23, 13, ""); this.nextPage = par4; } - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/bookleft.png"); /** diff --git a/tconstruct/client/pages/BlockCastPage.java b/tconstruct/client/pages/BlockCastPage.java index c1ceb078..8abd0931 100644 --- a/tconstruct/client/pages/BlockCastPage.java +++ b/tconstruct/client/pages/BlockCastPage.java @@ -11,7 +11,6 @@ import org.w3c.dom.NodeList; import tconstruct.library.client.TConstructClientRegistry; - public class BlockCastPage extends BookPage { String text; @@ -58,6 +57,7 @@ public class BlockCastPage extends BookPage } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/booksmeltery.png"); + public void renderBackgroundLayer (int localWidth, int localHeight) { manual.getMC().func_110434_K().func_110577_a(background); diff --git a/tconstruct/client/pages/BookPage.java b/tconstruct/client/pages/BookPage.java index 02f3f239..b7065aba 100644 --- a/tconstruct/client/pages/BookPage.java +++ b/tconstruct/client/pages/BookPage.java @@ -1,6 +1,5 @@ package tconstruct.client.pages; - import org.w3c.dom.Element; import tconstruct.client.gui.GuiManual; diff --git a/tconstruct/client/pages/ContentsTablePage.java b/tconstruct/client/pages/ContentsTablePage.java index b7b847c2..7a1846f2 100644 --- a/tconstruct/client/pages/ContentsTablePage.java +++ b/tconstruct/client/pages/ContentsTablePage.java @@ -10,7 +10,6 @@ import org.w3c.dom.NodeList; import tconstruct.library.client.TConstructClientRegistry; - public class ContentsTablePage extends BookPage { String text; diff --git a/tconstruct/client/pages/CraftingPage.java b/tconstruct/client/pages/CraftingPage.java index cdb055bb..48d2f532 100644 --- a/tconstruct/client/pages/CraftingPage.java +++ b/tconstruct/client/pages/CraftingPage.java @@ -11,7 +11,6 @@ import org.w3c.dom.NodeList; import tconstruct.library.client.TConstructClientRegistry; - public class CraftingPage extends BookPage { String text; @@ -93,6 +92,7 @@ public class CraftingPage extends BookPage } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/bookcrafting.png"); + public void drawBackground (int size, int localWidth, int localHeight) { manual.getMC().func_110434_K().func_110577_a(background); diff --git a/tconstruct/client/pages/FurnacePage.java b/tconstruct/client/pages/FurnacePage.java index cc90c614..e1958af3 100644 --- a/tconstruct/client/pages/FurnacePage.java +++ b/tconstruct/client/pages/FurnacePage.java @@ -11,7 +11,6 @@ import org.w3c.dom.NodeList; import tconstruct.library.client.TConstructClientRegistry; - public class FurnacePage extends BookPage { String text; @@ -52,6 +51,7 @@ public class FurnacePage extends BookPage RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); } + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/bookfurnace.png"); public void renderBackgroundLayer (int localWidth, int localHeight) diff --git a/tconstruct/client/pages/ModifierPage.java b/tconstruct/client/pages/ModifierPage.java index 2621cb8d..3530b6a8 100644 --- a/tconstruct/client/pages/ModifierPage.java +++ b/tconstruct/client/pages/ModifierPage.java @@ -11,7 +11,6 @@ import org.w3c.dom.NodeList; import tconstruct.library.client.TConstructClientRegistry; - public class ModifierPage extends BookPage { String type; @@ -55,6 +54,7 @@ public class ModifierPage extends BookPage } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/bookmodify.png"); + public void renderBackgroundLayer (int localWidth, int localHeight) { manual.getMC().func_110434_K().func_110577_a(background); diff --git a/tconstruct/client/pages/PicturePage.java b/tconstruct/client/pages/PicturePage.java index 7a63f2c5..074dab75 100644 --- a/tconstruct/client/pages/PicturePage.java +++ b/tconstruct/client/pages/PicturePage.java @@ -20,7 +20,7 @@ public class PicturePage extends BookPage nodes = element.getElementsByTagName("location"); if (nodes != null) location = nodes.item(0).getTextContent(); - + background = new ResourceLocation(location); } @@ -29,8 +29,9 @@ public class PicturePage extends BookPage { manual.fonts.drawSplitString(text, localWidth + 8, localHeight, 178, 0); } - + ResourceLocation background; + public void renderBackgroundLayer (int localWidth, int localHeight) { manual.getMC().func_110434_K().func_110577_a(background); diff --git a/tconstruct/client/pages/SidebarPage.java b/tconstruct/client/pages/SidebarPage.java index 0c3f19bf..5b83d416 100644 --- a/tconstruct/client/pages/SidebarPage.java +++ b/tconstruct/client/pages/SidebarPage.java @@ -10,7 +10,6 @@ import org.w3c.dom.NodeList; import tconstruct.library.client.TConstructClientRegistry; - public class SidebarPage extends BookPage { String text; diff --git a/tconstruct/client/pages/ToolPage.java b/tconstruct/client/pages/ToolPage.java index 98def200..8911178a 100644 --- a/tconstruct/client/pages/ToolPage.java +++ b/tconstruct/client/pages/ToolPage.java @@ -10,7 +10,6 @@ import org.w3c.dom.NodeList; import tconstruct.library.client.TConstructClientRegistry; - public class ToolPage extends BookPage { String title; diff --git a/tconstruct/client/tabs/AbstractTab.java b/tconstruct/client/tabs/AbstractTab.java index 2ef21b60..d844a209 100644 --- a/tconstruct/client/tabs/AbstractTab.java +++ b/tconstruct/client/tabs/AbstractTab.java @@ -22,7 +22,7 @@ public abstract class AbstractTab extends GuiButton } @Override - public void drawButton(Minecraft mc, int mouseX, int mouseY) + public void drawButton (Minecraft mc, int mouseX, int mouseY) { if (this.drawButton) { @@ -50,7 +50,7 @@ public abstract class AbstractTab extends GuiButton } @Override - public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) + public boolean mousePressed (Minecraft mc, int mouseX, int mouseY) { boolean inWindow = this.enabled && this.drawButton && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; @@ -62,7 +62,7 @@ public abstract class AbstractTab extends GuiButton return inWindow; } - public abstract void onTabClicked(); - - public abstract boolean shouldAddToList(); + public abstract void onTabClicked (); + + public abstract boolean shouldAddToList (); } diff --git a/tconstruct/client/tabs/InventoryTabArmorExtended.java b/tconstruct/client/tabs/InventoryTabArmorExtended.java index f13ca824..393032fc 100644 --- a/tconstruct/client/tabs/InventoryTabArmorExtended.java +++ b/tconstruct/client/tabs/InventoryTabArmorExtended.java @@ -12,13 +12,13 @@ public class InventoryTabArmorExtended extends AbstractTab } @Override - public void onTabClicked() + public void onTabClicked () { TControls.openArmorGui(); } @Override - public boolean shouldAddToList() + public boolean shouldAddToList () { return true; } diff --git a/tconstruct/client/tabs/InventoryTabKnapsack.java b/tconstruct/client/tabs/InventoryTabKnapsack.java index 0c2311e1..2bf80a72 100644 --- a/tconstruct/client/tabs/InventoryTabKnapsack.java +++ b/tconstruct/client/tabs/InventoryTabKnapsack.java @@ -13,13 +13,13 @@ public class InventoryTabKnapsack extends AbstractTab } @Override - public void onTabClicked() + public void onTabClicked () { TControls.openKnapsackGui(); } @Override - public boolean shouldAddToList() + public boolean shouldAddToList () { return TProxyClient.armorExtended.inventory[2] != null && TProxyClient.armorExtended.inventory[2].getItem() == TContent.knapsack; } diff --git a/tconstruct/client/tabs/InventoryTabVanilla.java b/tconstruct/client/tabs/InventoryTabVanilla.java index ace59dcc..399b180f 100644 --- a/tconstruct/client/tabs/InventoryTabVanilla.java +++ b/tconstruct/client/tabs/InventoryTabVanilla.java @@ -11,13 +11,13 @@ public class InventoryTabVanilla extends AbstractTab } @Override - public void onTabClicked() + public void onTabClicked () { TabRegistry.openInventoryGui(); } @Override - public boolean shouldAddToList() + public boolean shouldAddToList () { return true; } diff --git a/tconstruct/client/tabs/TabRegistry.java b/tconstruct/client/tabs/TabRegistry.java index d81b9106..9c762fdc 100644 --- a/tconstruct/client/tabs/TabRegistry.java +++ b/tconstruct/client/tabs/TabRegistry.java @@ -12,21 +12,21 @@ import cpw.mods.fml.client.FMLClientHandler; public class TabRegistry { private static ArrayList tabList = new ArrayList(); - - public static void registerTab(AbstractTab tab) + + public static void registerTab (AbstractTab tab) { tabList.add(tab); } - public static ArrayList getTabList() + public static ArrayList getTabList () { return tabList; } - public static void addTabsToInventory(GuiContainer gui) + public static void addTabsToInventory (GuiContainer gui) { - if (gui.getClass() == GuiInventory.class) - { + if (gui.getClass() == GuiInventory.class) + { //Values are public at runtime. int cornerX = gui.guiLeft; int cornerY = gui.guiTop; @@ -36,23 +36,23 @@ public class TabRegistry addTabsToList(gui.buttonList); } } - + private static Minecraft mc = FMLClientHandler.instance().getClient(); - public static void openInventoryGui() + public static void openInventoryGui () { GuiInventory inventory = new GuiInventory(mc.thePlayer); mc.displayGuiScreen(inventory); TabRegistry.addTabsToInventory(inventory); } - - public static void updateTabValues(int cornerX, int cornerY, Class selectedButton) + + public static void updateTabValues (int cornerX, int cornerY, Class selectedButton) { int count = 2; for (int i = 0; i < tabList.size(); i++) { AbstractTab t = tabList.get(i); - + if (t.shouldAddToList()) { t.id = count; @@ -63,8 +63,8 @@ public class TabRegistry } } } - - public static void addTabsToList(List buttonList) + + public static void addTabsToList (List buttonList) { for (AbstractTab tab : tabList) { diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index ae2e8fd7..ae508c30 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -296,7 +296,7 @@ public class TContent implements IFuelHandler public static Block toolForge; public static Block craftingStationWood; public static Block craftingSlabWood; - + public static Block heldItemBlock; public static Block craftedSoil; @@ -515,13 +515,6 @@ public class TContent implements IFuelHandler GameRegistry.registerBlock(toolForge, ToolForgeItemBlock.class, "ToolForgeBlock"); GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge"); - craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation"); - GameRegistry.registerBlock(craftingStationWood, "CraftingStation"); - GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation"); - - craftingSlabWood = new CraftingSlab(PHConstruct.woodCrafterSlab, Material.wood).setUnlocalizedName("CraftingSlab"); - GameRegistry.registerBlock(craftingSlabWood, CraftingSlabItemBlock.class, "CraftingSlab"); - craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation"); GameRegistry.registerBlock(craftingStationWood, "CraftingStation"); GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation"); @@ -555,7 +548,7 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("hambone", new ItemStack(meatBlock)); LanguageRegistry.addName(meatBlock, "Hambone"); GameRegistry.addRecipe(new ItemStack(meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Item.bone), 'm', new ItemStack(Item.porkRaw)); - + woolSlab1 = new SlabBase(PHConstruct.woolSlab1, Material.cloth, Block.cloth, 0, 8).setUnlocalizedName("cloth"); woolSlab1.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); GameRegistry.registerBlock(woolSlab1, WoolSlab1Item.class, "WoolSlab1"); @@ -591,31 +584,6 @@ public class TContent implements IFuelHandler GameRegistry.registerTileEntity(DrawbridgeLogic.class, "Drawbridge"); GameRegistry.registerTileEntity(FirestarterLogic.class, "Firestarter"); - //Traps - landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(TConstructRegistry.blockTab) - .setUnlocalizedName("landmine"); - GameRegistry.registerBlock(landmine, ItemBlockLandmine.class, "Redstone.Landmine"); - GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); - - punji = new Punji(PHConstruct.punji).setUnlocalizedName("trap.punji"); - GameRegistry.registerBlock(punji, "trap.punji"); - - barricadeOak = new BarricadeBlock(PHConstruct.barricadeOak, Block.wood, 0).setUnlocalizedName("trap.barricade.oak"); - GameRegistry.registerBlock(barricadeOak, BarricadeItem.class, "trap.barricade.oak"); - - barricadeSpruce = new BarricadeBlock(PHConstruct.barricadeSpruce, Block.wood, 1).setUnlocalizedName("trap.barricade.spruce"); - GameRegistry.registerBlock(barricadeSpruce, BarricadeItem.class, "trap.barricade.spruce"); - - barricadeBirch = new BarricadeBlock(PHConstruct.barricadeBirch, Block.wood, 2).setUnlocalizedName("trap.barricade.birch"); - GameRegistry.registerBlock(barricadeBirch, BarricadeItem.class, "trap.barricade.birch"); - - barricadeJungle = new BarricadeBlock(PHConstruct.barricadeJungle, Block.wood, 3).setUnlocalizedName("trap.barricade.jungle"); - GameRegistry.registerBlock(barricadeJungle, BarricadeItem.class, "trap.barricade.jungle"); - - essenceExtractor = new EssenceExtractor(PHConstruct.essenceExtractor).setHardness(12f).setUnlocalizedName("extractor.essence"); - GameRegistry.registerBlock(essenceExtractor, "extractor.essence"); - GameRegistry.registerTileEntity(EssenceExtractorLogic.class, "extractor.essence"); - //Traps landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(CreativeTabs.tabRedstone) .setUnlocalizedName("landmine"); @@ -871,7 +839,7 @@ public class TContent implements IFuelHandler fluids[24] = blueSlimeFluid; fluidBlocks[24] = slimePool; FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(blueSlimeFluid, 1000), new ItemStack(buckets, 1, 24), new ItemStack(Item.bucketEmpty))); - + slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(slimeStep).setUnlocalizedName("slime.gel"); GameRegistry.registerBlock(slimeGel, SlimeGelItemBlock.class, "slime.gel"); @@ -941,7 +909,7 @@ public class TContent implements IFuelHandler stainedGlassClearPane = new GlassPaneStained(PHConstruct.stainedGlassClearPane); GameRegistry.registerBlock(stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); - + //Crystalline aggregator = new Aggregator(PHConstruct.aggregator).setUnlocalizedName("Aggregator"); aggregator.stepSound = Block.soundMetalFootstep; @@ -952,7 +920,7 @@ public class TContent implements IFuelHandler lightCrystalBase.stepSound = Block.soundGlassFootstep; GameRegistry.registerBlock(lightCrystalBase, LightCrystalItem.class, "Block.Crystal"); GameRegistry.registerTileEntity(CrystalLogic.class, "CrystalLogic"); - + darkBlock = new AntiLight(PHConstruct.darkBlock).setUnlocalizedName("Antilight"); GameRegistry.registerBlock(darkBlock, "Antilight"); @@ -1850,7 +1818,7 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(Item.goldenCarrot), surround, '#', new ItemStack(Item.ingotGold), 'm', new ItemStack(Item.carrot)); GameRegistry.addRecipe(new ItemStack(goldHead), surround, '#', new ItemStack(Item.ingotGold), 'm', new ItemStack(Item.skull, 1, 3)); GameRegistry.addShapelessRecipe(new ItemStack(Item.speckledMelon), new ItemStack(Block.blockGold), new ItemStack(Item.melon)); - tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue*8), new ItemStack(Item.appleRed), true, 50); + tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 8), new ItemStack(Item.appleRed), true, 50); } else { @@ -1858,9 +1826,9 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(Item.appleGold), surround, '#', new ItemStack(oreBerries, 1, 1), 'm', new ItemStack(Item.appleRed)); GameRegistry.addRecipe(new ItemStack(Item.goldenCarrot), surround, '#', new ItemStack(oreBerries, 1, 1), 'm', new ItemStack(Item.appleRed)); GameRegistry.addRecipe(new ItemStack(goldHead), surround, '#', new ItemStack(oreBerries, 1, 1), 'm', new ItemStack(Item.appleRed)); - tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue/9*8), new ItemStack(Item.appleRed), true, 50); + tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue / 9 * 8), new ItemStack(Item.appleRed), true, 50); } - tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue*8*9), new ItemStack(Item.appleRed), true, 50); + tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 8 * 9), new ItemStack(Item.appleRed), true, 50); //Drying rack DryingRackRecipes.addDryingRecipe(Item.rottenFlesh, 20 * 60 * 5, Item.leather); @@ -1903,7 +1871,7 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 12)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 13)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 5), "b", 'b', new ItemStack(toolForge, 1, Short.MAX_VALUE)); - + GameRegistry.addRecipe(new ItemStack(essenceExtractor, 1, 0), " b ", "eme", "mmm", 'b', Item.book, 'e', Item.emerald, 'm', Block.whiteStone); //Slime @@ -1912,7 +1880,7 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(slimeGel, 1, 1), "##", "##", '#', Item.slimeBall); GameRegistry.addRecipe(new ItemStack(Item.slimeBall, 4, 0), "#", '#', new ItemStack(slimeGel, 1, 1)); - //Slab crafters + //Slab crafters GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', new ItemStack(Block.workbench)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 1), "b", 'b', new ItemStack(toolStationWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 1)); @@ -2029,7 +1997,7 @@ public class TContent implements IFuelHandler for (int i = 0; i < matNames.length; i++) OreDictionary.registerOre(matNames[i] + "Rod", new ItemStack(toolRod, 1, i)); OreDictionary.registerOre("thaumiumRod", new ItemStack(toolRod, 1, 31)); - + String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; for (int i = 0; i < 16; i++) diff --git a/tconstruct/common/TProxyCommon.java b/tconstruct/common/TProxyCommon.java index a2b07752..ae46f125 100644 --- a/tconstruct/common/TProxyCommon.java +++ b/tconstruct/common/TProxyCommon.java @@ -36,19 +36,20 @@ public class TProxyCommon implements IGuiHandler public static int inventoryGui = 100; public static int armorGuiID = 101; public static int knapsackGuiID = 102; - + public static int miniGardyGui = 131; public static int manualGuiID = -1; @Override public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { + { if (ID < 0) return null; - - if (ID == landmineID){ - return new ContainerLandmine(player, (TileEntityLandmine)world.getBlockTileEntity(x, y, z)); + + if (ID == landmineID) + { + return new ContainerLandmine(player, (TileEntityLandmine) world.getBlockTileEntity(x, y, z)); } else if (ID < 100) @@ -192,7 +193,7 @@ public class TProxyCommon implements IGuiHandler LanguageRegistry.addName(TContent.knapsack, "Knapsack"); //LanguageRegistry.addName(TContent.shortbow, "Shortbow"); //LanguageRegistry.addName(TContent.arrow, "Arrow"); - + LanguageRegistry.addName(TContent.meatBlock, "Hambone"); } diff --git a/tconstruct/crystal/CrystalValues.java b/tconstruct/crystal/CrystalValues.java index 24783170..eae47d24 100644 --- a/tconstruct/crystal/CrystalValues.java +++ b/tconstruct/crystal/CrystalValues.java @@ -11,9 +11,9 @@ public class CrystalValues int stone; int fire; int water; - + final String valueType; - + public CrystalValues(String type) { valueType = type; @@ -63,8 +63,8 @@ public class CrystalValues } return 0; } - - protected void setValue(int[] array) + + protected void setValue (int[] array) { light = array[0]; time = array[1]; @@ -73,20 +73,20 @@ public class CrystalValues fire = array[4]; water = array[5]; } - - public CrystalValues loadFromNBT(NBTTagCompound tags) + + public CrystalValues loadFromNBT (NBTTagCompound tags) { - int[] crystalArray = tags.getIntArray("TConstruct.Crystal."+valueType); + int[] crystalArray = tags.getIntArray("TConstruct.Crystal." + valueType); if (crystalArray != null && crystalArray.length >= 6) { this.setValue(crystalArray); } return this; } - - public void saveToNBT(NBTTagCompound tags) + + public void saveToNBT (NBTTagCompound tags) { - int[] crystalArray = new int[] {light, time, life, stone, fire, water}; + int[] crystalArray = new int[] { light, time, life, stone, fire, water }; tags.setIntArray("TConstruct.Crystal.", crystalArray); } } \ No newline at end of file diff --git a/tconstruct/crystal/Crystallinity.java b/tconstruct/crystal/Crystallinity.java index 8d4ebe07..ef0d8476 100644 --- a/tconstruct/crystal/Crystallinity.java +++ b/tconstruct/crystal/Crystallinity.java @@ -10,9 +10,9 @@ public class Crystallinity { Light, Life, Time, Stone, Fire, Water } - + public static HashMap theftValue = new HashMap(); //Value of materials - public static HashMap charge = new HashMap(); //Balance of crystal + public static HashMap charge = new HashMap(); //Balance of crystal public static void updateTheft (int dim, int posX, int posZ, int value, CrystalType type) { diff --git a/tconstruct/crystal/TheftValueTracker.java b/tconstruct/crystal/TheftValueTracker.java index b26d0b34..f0d08f55 100644 --- a/tconstruct/crystal/TheftValueTracker.java +++ b/tconstruct/crystal/TheftValueTracker.java @@ -4,9 +4,6 @@ import java.util.HashMap; import tconstruct.library.util.ValueCoordTuple; - - - public class TheftValueTracker { public static HashMap crystallinity = new HashMap(); diff --git a/tconstruct/entity/BlueSlime.java b/tconstruct/entity/BlueSlime.java index af8acdc9..6d213ebc 100644 --- a/tconstruct/entity/BlueSlime.java +++ b/tconstruct/entity/BlueSlime.java @@ -119,8 +119,8 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData skelton.mountEntity(slime); } }*/ - - public EntityLivingData func_110161_a(EntityLivingData par1EntityLivingData) + + public EntityLivingData func_110161_a (EntityLivingData par1EntityLivingData) { Object par1EntityLivingData1 = super.func_110161_a(par1EntityLivingData); @@ -162,7 +162,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData skelton.mountEntity(slime); } - return (EntityLivingData)par1EntityLivingData1; + return (EntityLivingData) par1EntityLivingData1; } @Override @@ -268,16 +268,16 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData if (size >= 8) this.experienceValue = 500; }*/ - - public void setSlimeSize(int size) + + public void setSlimeSize (int size) { - this.dataWatcher.updateObject(16, new Byte((byte)size)); - this.setSize(0.6F * (float)size, 0.6F * (float)size); + 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.experienceValue = size + 2^(size); + this.experienceValue = size + 2 ^ (size); if (size >= 8) this.experienceValue = 500; } diff --git a/tconstruct/entity/ai/GAISwim.java b/tconstruct/entity/ai/GAISwim.java index c01750fc..c46aa849 100644 --- a/tconstruct/entity/ai/GAISwim.java +++ b/tconstruct/entity/ai/GAISwim.java @@ -11,9 +11,9 @@ public class GAISwim extends GolemAIBase golem.getNavigator().setCanSwim(true); } - public boolean shouldExecute() + public boolean shouldExecute () { - if(golem.isInWater() || this.golem.handleLavaMovement()) + if (golem.isInWater() || this.golem.handleLavaMovement()) { return true; } @@ -28,7 +28,7 @@ public class GAISwim extends GolemAIBase } }*/ - public void updateTask() + public void updateTask () { if (this.golem.getRNG().nextFloat() < 0.8F) { diff --git a/tconstruct/entity/projectile/ArrowEntity.java b/tconstruct/entity/projectile/ArrowEntity.java index 4eae1edc..c3f3c0ae 100644 --- a/tconstruct/entity/projectile/ArrowEntity.java +++ b/tconstruct/entity/projectile/ArrowEntity.java @@ -81,7 +81,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa { this.setDead(); } - + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); @@ -240,7 +240,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa } entity.setFire(fireAspect); } - + int drain = toolTags.getInteger("Necrotic") * 2; if (drain > 0 && shootingEntity != null && shootingEntity instanceof EntityLiving) ((EntityLiving) shootingEntity).heal(random.nextInt(drain + 1)); diff --git a/tconstruct/inventory/AggregatorContainer.java b/tconstruct/inventory/AggregatorContainer.java index 4ae59a81..e37ff1ce 100644 --- a/tconstruct/inventory/AggregatorContainer.java +++ b/tconstruct/inventory/AggregatorContainer.java @@ -38,7 +38,7 @@ public class AggregatorContainer extends Container } } - public void addCraftingToCrafters(ICrafting par1ICrafting) + public void addCraftingToCrafters (ICrafting par1ICrafting) { super.addCraftingToCrafters(par1ICrafting); par1ICrafting.sendProgressBarUpdate(this, 0, logic.crystalValue); diff --git a/tconstruct/inventory/CraftingStationContainer.java b/tconstruct/inventory/CraftingStationContainer.java index 550988f1..68b525e6 100644 --- a/tconstruct/inventory/CraftingStationContainer.java +++ b/tconstruct/inventory/CraftingStationContainer.java @@ -1,6 +1,5 @@ package tconstruct.inventory; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -31,9 +30,9 @@ public class CraftingStationContainer extends Container this.posZ = z; craftMatrix = new InventoryCraftingStation(this, 3, 3, logic); craftResult = new InventoryCraftingStationResult(logic); - + this.addSlotToContainer(new SlotCrafting(inventorplayer.player, this.craftMatrix, this.craftResult, 0, 124, 35)); - + int row; int column; @@ -62,12 +61,12 @@ public class CraftingStationContainer extends Container this.onCraftMatrixChanged(this.craftMatrix); } - public void onCraftMatrixChanged(IInventory par1IInventory) + public void onCraftMatrixChanged (IInventory par1IInventory) { this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj)); } - public void onContainerClosed(EntityPlayer par1EntityPlayer) + public void onContainerClosed (EntityPlayer par1EntityPlayer) { super.onContainerClosed(par1EntityPlayer); @@ -85,15 +84,15 @@ public class CraftingStationContainer extends Container } } - public boolean canInteractWith(EntityPlayer par1EntityPlayer) + public boolean canInteractWith (EntityPlayer par1EntityPlayer) { - return par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D; + return par1EntityPlayer.getDistanceSq((double) this.posX + 0.5D, (double) this.posY + 0.5D, (double) this.posZ + 0.5D) <= 64.0D; } - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) + public ItemStack transferStackInSlot (EntityPlayer par1EntityPlayer, int par2) { ItemStack itemstack = null; - Slot slot = (Slot)this.inventorySlots.get(par2); + Slot slot = (Slot) this.inventorySlots.get(par2); if (slot != null && slot.getHasStack()) { @@ -130,7 +129,7 @@ public class CraftingStationContainer extends Container if (itemstack1.stackSize == 0) { - slot.putStack((ItemStack)null); + slot.putStack((ItemStack) null); } else { @@ -148,7 +147,7 @@ public class CraftingStationContainer extends Container return itemstack; } - public boolean func_94530_a(ItemStack par1ItemStack, Slot par2Slot) + public boolean func_94530_a (ItemStack par1ItemStack, Slot par2Slot) { return par2Slot.inventory != this.craftResult && super.func_94530_a(par1ItemStack, par2Slot); } diff --git a/tconstruct/inventory/DrawbridgeSlot.java b/tconstruct/inventory/DrawbridgeSlot.java index a93a0fc4..214f6182 100644 --- a/tconstruct/inventory/DrawbridgeSlot.java +++ b/tconstruct/inventory/DrawbridgeSlot.java @@ -11,32 +11,36 @@ import net.minecraft.item.ItemStack; public class DrawbridgeSlot extends SlotBlocksOnly { DrawbridgeLogic logic; + public DrawbridgeSlot(IInventory iinventory, int par2, int par3, int par4, DrawbridgeLogic logic) { super(iinventory, par2, par3, par4); this.logic = logic; } - + @Override - public boolean isItemValid(ItemStack par1ItemStack) + public boolean isItemValid (ItemStack par1ItemStack) { - if(!super.isItemValid(par1ItemStack)){ - if(TConstructRegistry.blockToItemMapping[par1ItemStack.itemID] == 0){ - return false; - } - } - + if (!super.isItemValid(par1ItemStack)) + { + if (TConstructRegistry.blockToItemMapping[par1ItemStack.itemID] == 0) + { + return false; + } + } + return !logic.hasExtended(); } - + @Override - public boolean canTakeStack(EntityPlayer par1EntityPlayer) + public boolean canTakeStack (EntityPlayer par1EntityPlayer) { return !logic.hasExtended(); } - - @Override - public int getSlotStackLimit(){ - return inventory.getInventoryStackLimit(); - } + + @Override + public int getSlotStackLimit () + { + return inventory.getInventoryStackLimit(); + } } diff --git a/tconstruct/inventory/InventoryCraftingStation.java b/tconstruct/inventory/InventoryCraftingStation.java index 04df8a47..ba6f8347 100644 --- a/tconstruct/inventory/InventoryCraftingStation.java +++ b/tconstruct/inventory/InventoryCraftingStation.java @@ -28,17 +28,17 @@ public class InventoryCraftingStation extends InventoryCrafting /** * Returns the number of slots in the inventory. */ - public int getSizeInventory() + public int getSizeInventory () { return 9; } - public ItemStack getStackInSlot(int slot) + public ItemStack getStackInSlot (int slot) { - return slot >= this.getSizeInventory()+1 ? null : logic.getStackInSlot(slot+1); + return slot >= this.getSizeInventory() + 1 ? null : logic.getStackInSlot(slot + 1); } - public ItemStack getStackInRowAndColumn(int row, int column) + public ItemStack getStackInRowAndColumn (int row, int column) { if (row >= 0 && row < this.inventoryWidth) { @@ -51,17 +51,17 @@ public class InventoryCraftingStation extends InventoryCrafting } } - public String getInvName() + public String getInvName () { return "container.crafting"; } - public boolean isInvNameLocalized() + public boolean isInvNameLocalized () { return false; } - public ItemStack getStackInSlotOnClosing(int par1) + public ItemStack getStackInSlotOnClosing (int par1) { return null; } @@ -71,9 +71,9 @@ public class InventoryCraftingStation extends InventoryCrafting * new stack. */ @Override - public ItemStack decrStackSize(int slotID, int par2) + public ItemStack decrStackSize (int slotID, int par2) { - ItemStack stack = logic.getStackInSlot(slotID+1); + ItemStack stack = logic.getStackInSlot(slotID + 1); if (stack != null) { ItemStack itemstack; @@ -82,7 +82,7 @@ public class InventoryCraftingStation extends InventoryCrafting { itemstack = stack.copy(); stack = null; - logic.setInventorySlotContents(slotID+1, null); + logic.setInventorySlotContents(slotID + 1, null); this.eventHandler.onCraftMatrixChanged(this); return itemstack; } @@ -108,9 +108,9 @@ public class InventoryCraftingStation extends InventoryCrafting /** * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). */ - public void setInventorySlotContents(int slot, ItemStack itemstack) + public void setInventorySlotContents (int slot, ItemStack itemstack) { - logic.setInventorySlotContents(slot+1, itemstack); + logic.setInventorySlotContents(slot + 1, itemstack); this.eventHandler.onCraftMatrixChanged(this); } @@ -118,7 +118,7 @@ public class InventoryCraftingStation extends InventoryCrafting * Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. *Isn't * this more of a set than a get?* */ - public int getInventoryStackLimit() + public int getInventoryStackLimit () { return 64; } @@ -126,24 +126,30 @@ public class InventoryCraftingStation extends InventoryCrafting /** * Called when an the contents of an Inventory change, usually */ - public void onInventoryChanged() {} + public void onInventoryChanged () + { + } /** * Do not make give this method the name canInteractWith because it clashes with Container */ - public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) + public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer) { return true; } - public void openChest() {} + public void openChest () + { + } - public void closeChest() {} + public void closeChest () + { + } /** * Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot. */ - public boolean isStackValidForSlot(int par1, ItemStack par2ItemStack) + public boolean isStackValidForSlot (int par1, ItemStack par2ItemStack) { return true; } diff --git a/tconstruct/inventory/InventoryCraftingStationResult.java b/tconstruct/inventory/InventoryCraftingStationResult.java index 633307dc..e6fa0412 100644 --- a/tconstruct/inventory/InventoryCraftingStationResult.java +++ b/tconstruct/inventory/InventoryCraftingStationResult.java @@ -8,15 +8,16 @@ import tconstruct.blocks.logic.CraftingStationLogic; public class InventoryCraftingStationResult extends InventoryCraftResult { CraftingStationLogic logic; - + public InventoryCraftingStationResult(CraftingStationLogic logic) { this.logic = logic; } + /** * Returns the number of slots in the inventory. */ - public int getSizeInventory() + public int getSizeInventory () { return 1; } @@ -24,7 +25,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult /** * Returns the stack in slot i */ - public ItemStack getStackInSlot(int par1) + public ItemStack getStackInSlot (int par1) { return logic.getStackInSlot(0);//this.stackResult[0]; } @@ -32,7 +33,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult /** * Returns the name of the inventory. */ - public String getInvName() + public String getInvName () { return "Result"; } @@ -41,7 +42,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult * If this returns false, the inventory name will be used as an unlocalized name, and translated into the player's * language. Otherwise it will be used directly. */ - public boolean isInvNameLocalized() + public boolean isInvNameLocalized () { return false; } @@ -50,7 +51,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a * new stack. */ - public ItemStack decrStackSize(int par1, int par2) + public ItemStack decrStackSize (int par1, int par2) { ItemStack stack = logic.getStackInSlot(0); if (stack != null) @@ -69,7 +70,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - * like when you close a workbench GUI. */ - public ItemStack getStackInSlotOnClosing(int par1) + public ItemStack getStackInSlotOnClosing (int par1) { return null; } @@ -78,7 +79,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). */ @Override - public void setInventorySlotContents(int par1, ItemStack par2ItemStack) + public void setInventorySlotContents (int par1, ItemStack par2ItemStack) { logic.setInventorySlotContents(0, par2ItemStack); } @@ -87,7 +88,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult * Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. *Isn't * this more of a set than a get?* */ - public int getInventoryStackLimit() + public int getInventoryStackLimit () { return 64; } @@ -95,24 +96,30 @@ public class InventoryCraftingStationResult extends InventoryCraftResult /** * Called when an the contents of an Inventory change, usually */ - public void onInventoryChanged() {} + public void onInventoryChanged () + { + } /** * Do not make give this method the name canInteractWith because it clashes with Container */ - public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) + public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer) { return true; } - public void openChest() {} + public void openChest () + { + } - public void closeChest() {} + public void closeChest () + { + } /** * Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot. */ - public boolean isStackValidForSlot(int par1, ItemStack par2ItemStack) + public boolean isStackValidForSlot (int par1, ItemStack par2ItemStack) { return true; } diff --git a/tconstruct/inventory/SlotTool.java b/tconstruct/inventory/SlotTool.java index d7d6ab63..b234eb32 100644 --- a/tconstruct/inventory/SlotTool.java +++ b/tconstruct/inventory/SlotTool.java @@ -4,7 +4,6 @@ import java.util.Random; import tconstruct.library.tools.ToolCore; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/tconstruct/inventory/SlotToolForge.java b/tconstruct/inventory/SlotToolForge.java index aa33be19..d5c2d9bb 100644 --- a/tconstruct/inventory/SlotToolForge.java +++ b/tconstruct/inventory/SlotToolForge.java @@ -4,7 +4,6 @@ import java.util.Random; import tconstruct.library.tools.ToolCore; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/tconstruct/items/Bowstring.java b/tconstruct/items/Bowstring.java index bab04b75..eb185981 100644 --- a/tconstruct/items/Bowstring.java +++ b/tconstruct/items/Bowstring.java @@ -49,6 +49,6 @@ public class Bowstring extends CraftingItem implements IToolPart if (TContent.thaumcraftAvailable) list.add(new ItemStack(id, 1, 1)); if (Loader.isModLoaded("Natura")) - list.add(new ItemStack(id, 1, 2)); + list.add(new ItemStack(id, 1, 2)); } } diff --git a/tconstruct/items/CraftingItem.java b/tconstruct/items/CraftingItem.java index 09ad26d8..558800e7 100644 --- a/tconstruct/items/CraftingItem.java +++ b/tconstruct/items/CraftingItem.java @@ -4,7 +4,6 @@ import java.util.List; import tconstruct.library.TConstructRegistry; - import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/tconstruct/items/GoldenHead.java b/tconstruct/items/GoldenHead.java index e676ba31..677d9a24 100644 --- a/tconstruct/items/GoldenHead.java +++ b/tconstruct/items/GoldenHead.java @@ -69,7 +69,7 @@ public class GoldenHead extends ItemFood { this.itemIcon = iconRegister.registerIcon("tinker:skull_char_gold"); } - + @Override @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) diff --git a/tconstruct/items/MaterialItem.java b/tconstruct/items/MaterialItem.java index 3b0fbb48..3fcbc8ad 100644 --- a/tconstruct/items/MaterialItem.java +++ b/tconstruct/items/MaterialItem.java @@ -1,6 +1,5 @@ package tconstruct.items; - public class MaterialItem extends CraftingItem { diff --git a/tconstruct/items/Pattern.java b/tconstruct/items/Pattern.java index 53c3c86c..7566ca04 100644 --- a/tconstruct/items/Pattern.java +++ b/tconstruct/items/Pattern.java @@ -6,7 +6,6 @@ import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder.MaterialSet; import tconstruct.library.util.IPattern; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/tconstruct/items/TitleIcon.java b/tconstruct/items/TitleIcon.java index 2ad4441b..2dede4b3 100644 --- a/tconstruct/items/TitleIcon.java +++ b/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).func_110161_a((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).func_110161_a((EntityLivingData) null); world.spawnEntityInWorld(entity); } } @@ -174,7 +174,7 @@ public class TitleIcon extends Item { entity.setPosition(x, y, z); entity.setSlimeSize(8); - entity.func_110161_a((EntityLivingData)null); + entity.func_110161_a((EntityLivingData) null); world.spawnEntityInWorld(entity); } } @@ -185,7 +185,7 @@ public class TitleIcon extends Item { entity.setPosition(x, y, z); entity.setSlimeSize(8); - entity.func_110161_a((EntityLivingData)null); + entity.func_110161_a((EntityLivingData) null); world.spawnEntityInWorld(entity); } } diff --git a/tconstruct/items/ToolPart.java b/tconstruct/items/ToolPart.java index d0a4fd02..81798fe1 100644 --- a/tconstruct/items/ToolPart.java +++ b/tconstruct/items/ToolPart.java @@ -12,6 +12,7 @@ import net.minecraft.util.StatCollector; public class ToolPart extends CraftingItem implements IToolPart { public String partName; + public ToolPart(int id, String textureType, String name) { super(id, toolMaterialNames, buildTextureNames(textureType), "parts/"); @@ -19,12 +20,12 @@ public class ToolPart extends CraftingItem implements IToolPart this.setMaxDamage(0); this.partName = name; } - + @Override public String getItemDisplayName (ItemStack par1ItemStack) { StringBuilder builder = new StringBuilder(); - builder.append(StatCollector.translateToLocal("parttype."+toolTextureNames[par1ItemStack.getItemDamage()])).append(" ").append(StatCollector.translateToLocal("toolpart."+partName)); + builder.append(StatCollector.translateToLocal("parttype." + toolTextureNames[par1ItemStack.getItemDamage()])).append(" ").append(StatCollector.translateToLocal("toolpart." + partName)); return builder.toString(); /*String s = ("" + StatCollector.translateToLocal("toolpart."+partName)).trim(); String s1 = toolMaterialNames[par1ItemStack.getItemDamage()]; diff --git a/tconstruct/items/blocks/BarricadeItem.java b/tconstruct/items/blocks/BarricadeItem.java index e7961b42..1c89674a 100644 --- a/tconstruct/items/blocks/BarricadeItem.java +++ b/tconstruct/items/blocks/BarricadeItem.java @@ -27,8 +27,8 @@ public class BarricadeItem extends ItemBlock { list.add("Stacks up to 4 times"); } - - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) + + public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { int i1 = world.getBlockId(x, y, z); @@ -92,7 +92,8 @@ public class BarricadeItem extends ItemBlock if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { - world.playSoundEffect((double)((float)x + 0.5F), (double)((float)y + 0.5F), (double)((float)z + 0.5F), block.stepSound.getPlaceSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.getPlaceSound(), + (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); --stack.stackSize; } diff --git a/tconstruct/items/blocks/GlassBlockItem.java b/tconstruct/items/blocks/GlassBlockItem.java index f3525efd..29546b1c 100644 --- a/tconstruct/items/blocks/GlassBlockItem.java +++ b/tconstruct/items/blocks/GlassBlockItem.java @@ -10,7 +10,7 @@ import net.minecraft.util.MathHelper; public class GlassBlockItem extends ItemBlock { - public static final String blockType[] = { "glass.pure"};//, "glass.soul", "glass.soul.pure" }; + public static final String blockType[] = { "glass.pure" };//, "glass.soul", "glass.soul.pure" }; public GlassBlockItem(int id) { @@ -59,8 +59,8 @@ public class GlassBlockItem extends ItemBlock } } } - - String getDirectionString(byte key) + + String getDirectionString (byte key) { if (key == 0) return ("Up"); @@ -68,7 +68,7 @@ public class GlassBlockItem extends ItemBlock return ("Right"); if (key == 2) return ("Down"); - + return "Left"; } } diff --git a/tconstruct/items/blocks/LavaTankItemBlock.java b/tconstruct/items/blocks/LavaTankItemBlock.java index cb76c1e2..8743267b 100644 --- a/tconstruct/items/blocks/LavaTankItemBlock.java +++ b/tconstruct/items/blocks/LavaTankItemBlock.java @@ -37,8 +37,8 @@ public class LavaTankItemBlock extends ItemBlock NBTTagCompound liquidTag = stack.getTagCompound().getCompoundTag("Fluid"); if (liquidTag != null) { - list.add("Contains "+liquidTag.getString("FluidName")); - list.add(liquidTag.getInteger("Amount")+" mB"); + list.add("Contains " + liquidTag.getString("FluidName")); + list.add(liquidTag.getInteger("Amount") + " mB"); } } } diff --git a/tconstruct/items/blocks/LightCrystalItem.java b/tconstruct/items/blocks/LightCrystalItem.java index 4675c1a1..878d2224 100644 --- a/tconstruct/items/blocks/LightCrystalItem.java +++ b/tconstruct/items/blocks/LightCrystalItem.java @@ -98,27 +98,27 @@ public class LightCrystalItem extends ItemBlock { int localID = world.getBlockId(x, y + 1, z); if (localID != Block.vine.blockID && localID != Block.tallGrass.blockID && localID != Block.deadBush.blockID - && (Block.blocksList[localID] == null || !Block.blocksList[localID].isBlockReplaceable(world, x, y+1, z))) + && (Block.blocksList[localID] == null || !Block.blocksList[localID].isBlockReplaceable(world, x, y + 1, z))) { - placeBlockAt(stack, player, world, x, y+1, z, side, hitX, hitY, hitZ, secondMeta(crystalValue)); + placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY, hitZ, secondMeta(crystalValue)); } } if (height > 2) { int localID = world.getBlockId(x, y + 2, z); if (localID != Block.vine.blockID && localID != Block.tallGrass.blockID && localID != Block.deadBush.blockID - && (Block.blocksList[localID] == null || !Block.blocksList[localID].isBlockReplaceable(world, x, y+2, z))) + && (Block.blocksList[localID] == null || !Block.blocksList[localID].isBlockReplaceable(world, x, y + 2, z))) { - placeBlockAt(stack, player, world, x, y+2, z, side, hitX, hitY, hitZ, thirdMeta(crystalValue)); + placeBlockAt(stack, player, world, x, y + 2, z, side, hitX, hitY, hitZ, thirdMeta(crystalValue)); } } if (height > 3) { int localID = world.getBlockId(x, y + 3, z); if (localID != Block.vine.blockID && localID != Block.tallGrass.blockID && localID != Block.deadBush.blockID - && (Block.blocksList[localID] == null || !Block.blocksList[localID].isBlockReplaceable(world, x, y+3, z))) + && (Block.blocksList[localID] == null || !Block.blocksList[localID].isBlockReplaceable(world, x, y + 3, z))) { - placeBlockAt(stack, player, world, x, y+3, z, side, hitX, hitY, hitZ, topMeta(crystalValue)); + placeBlockAt(stack, player, world, x, y + 3, z, side, hitX, hitY, hitZ, topMeta(crystalValue)); } } } diff --git a/tconstruct/items/blocks/MetalOreItemBlock.java b/tconstruct/items/blocks/MetalOreItemBlock.java index bb0f4742..d6f172e5 100644 --- a/tconstruct/items/blocks/MetalOreItemBlock.java +++ b/tconstruct/items/blocks/MetalOreItemBlock.java @@ -37,8 +37,8 @@ public class MetalOreItemBlock extends ItemBlock NBTTagCompound liquidTag = stack.getTagCompound().getCompoundTag("Liquid"); if (liquidTag != null) { - list.add("Contains "+liquidTag.getString("LiquidName")); - list.add(liquidTag.getInteger("Amount")+" mB"); + list.add("Contains " + liquidTag.getString("LiquidName")); + list.add(liquidTag.getInteger("Amount") + " mB"); } } } diff --git a/tconstruct/items/blocks/RedstoneMachineItem.java b/tconstruct/items/blocks/RedstoneMachineItem.java index e3722a7a..75ce50c9 100644 --- a/tconstruct/items/blocks/RedstoneMachineItem.java +++ b/tconstruct/items/blocks/RedstoneMachineItem.java @@ -29,7 +29,7 @@ public class RedstoneMachineItem extends ItemBlock int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); return (new StringBuilder()).append("block.").append(blockType[pos]).toString(); } - + @Override public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { @@ -60,8 +60,8 @@ public class RedstoneMachineItem extends ItemBlock } } } - - String getDirectionString(byte key) + + String getDirectionString (byte key) { if (key == 0) return ("Up"); @@ -69,7 +69,7 @@ public class RedstoneMachineItem extends ItemBlock return ("Right"); if (key == 2) return ("Down"); - + return "Left"; } } diff --git a/tconstruct/items/blocks/WoolSlab1Item.java b/tconstruct/items/blocks/WoolSlab1Item.java index 35f37383..90beea27 100644 --- a/tconstruct/items/blocks/WoolSlab1Item.java +++ b/tconstruct/items/blocks/WoolSlab1Item.java @@ -27,12 +27,12 @@ public class WoolSlab1Item extends ItemBlock return meta; } - public String getUnlocalizedName(ItemStack par1ItemStack) + public String getUnlocalizedName (ItemStack par1ItemStack) { int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 7); return super.getUnlocalizedName() + "." + ItemDye.dyeColorNames[15 - i] + ".slab"; } - + @Override public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { diff --git a/tconstruct/items/blocks/WoolSlab2Item.java b/tconstruct/items/blocks/WoolSlab2Item.java index 3b2ad988..5457ecb0 100644 --- a/tconstruct/items/blocks/WoolSlab2Item.java +++ b/tconstruct/items/blocks/WoolSlab2Item.java @@ -25,12 +25,12 @@ public class WoolSlab2Item extends ItemBlock return meta; } - public String getUnlocalizedName(ItemStack par1ItemStack) + public String getUnlocalizedName (ItemStack par1ItemStack) { int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 7); return super.getUnlocalizedName() + "." + ItemDye.dyeColorNames[7 - i] + ".slab"; } - + @Override public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { diff --git a/tconstruct/items/tools/Battleaxe.java b/tconstruct/items/tools/Battleaxe.java index 27514520..ca117580 100644 --- a/tconstruct/items/tools/Battleaxe.java +++ b/tconstruct/items/tools/Battleaxe.java @@ -53,7 +53,7 @@ public class Battleaxe extends HarvestTool return AbilityHelper.onBlockChanged(itemstack, world, bID, x, y, z, player, random); } - static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.pumpkin}; + static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.pumpkin }; @Override public Item getHeadItem () @@ -245,7 +245,7 @@ public class Battleaxe extends HarvestTool { if (!stack.hasTagCompound()) return false; - + World world = player.worldObj; final int woodID = world.getBlockId(x, y, z); final Block wood = Block.blocksList[woodID]; diff --git a/tconstruct/items/tools/Excavator.java b/tconstruct/items/tools/Excavator.java index 5f08b0a1..cc99bdba 100644 --- a/tconstruct/items/tools/Excavator.java +++ b/tconstruct/items/tools/Excavator.java @@ -138,7 +138,7 @@ public class Excavator extends HarvestTool { if (!stack.hasTagCompound()) return false; - + World world = player.worldObj; final int blockID = world.getBlockId(x, y, z); final int meta = world.getBlockMetadata(x, y, z); diff --git a/tconstruct/items/tools/Hammer.java b/tconstruct/items/tools/Hammer.java index 21c80a07..927e1341 100644 --- a/tconstruct/items/tools/Hammer.java +++ b/tconstruct/items/tools/Hammer.java @@ -210,7 +210,7 @@ public class Hammer extends HarvestTool { if (!stack.hasTagCompound()) return false; - + World world = player.worldObj; final int blockID = world.getBlockId(x, y, z); final int meta = world.getBlockMetadata(x, y, z); @@ -232,7 +232,7 @@ public class Hammer extends HarvestTool break; } } - + if (block == Block.silverfish) validStart = true; @@ -258,7 +258,7 @@ public class Hammer extends HarvestTool xRange = 0; break; } - + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); int toolLevel = tags.getInteger("HarvestLevel"); for (int xPos = x - xRange; xPos <= x + xRange; xPos++) @@ -339,10 +339,10 @@ public class Hammer extends HarvestTool return getblockSpeed(tags, block, meta); } } - + /*if (block == Block.silverfish) return getblockSpeed(tags, block, meta);*/ - + return super.getStrVsBlock(stack, block, meta); } diff --git a/tconstruct/items/tools/LumberAxe.java b/tconstruct/items/tools/LumberAxe.java index 7117a0c0..7e11e124 100644 --- a/tconstruct/items/tools/LumberAxe.java +++ b/tconstruct/items/tools/LumberAxe.java @@ -137,7 +137,7 @@ public class LumberAxe extends HarvestTool { if (!stack.hasTagCompound()) return false; - + World world = player.worldObj; final int woodID = world.getBlockId(x, y, z); final Block wood = Block.blocksList[woodID]; diff --git a/tconstruct/items/tools/Scythe.java b/tconstruct/items/tools/Scythe.java index 374593bb..080dfc11 100644 --- a/tconstruct/items/tools/Scythe.java +++ b/tconstruct/items/tools/Scythe.java @@ -153,7 +153,7 @@ public class Scythe extends Weapon { if (!stack.hasTagCompound()) return false; - + World world = player.worldObj; final int blockID = world.getBlockId(x, y, z); final int meta = world.getBlockMetadata(x, y, z); diff --git a/tconstruct/landmine/Helper.java b/tconstruct/landmine/Helper.java index cdd13f7d..72ee0958 100644 --- a/tconstruct/landmine/Helper.java +++ b/tconstruct/landmine/Helper.java @@ -10,63 +10,67 @@ import net.minecraftforge.common.ForgeDirection; * @author fuj1n * */ -public class Helper { +public class Helper +{ + + public static ForgeDirection convertMetaToForgeOrientation (int metadata) + { + switch (metadata) + { + case 6: + return ForgeDirection.DOWN; + case 7: + return ForgeDirection.UP; + case 1: + return ForgeDirection.WEST; + case 3: + return ForgeDirection.NORTH; + case 2: + return ForgeDirection.EAST; + case 4: + return ForgeDirection.SOUTH; + case 5: + return ForgeDirection.DOWN; + case 0: + return ForgeDirection.UP; + } + + return ForgeDirection.UNKNOWN; + } + + public static void renderInventoryCube (Block block, int metadata, int modelID, RenderBlocks renderer) + { + Tessellator tessellator = Tessellator.instance; + + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderer.renderFaceYPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 1, metadata)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1.0F, 0.0F); + renderer.renderFaceYNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 0, metadata)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderer.renderFaceXPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 2, metadata)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(-1.0F, 0.0F, 0.0F); + renderer.renderFaceXNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 3, metadata)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderer.renderFaceZPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 4, metadata)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1.0F); + renderer.renderFaceZNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata)); + tessellator.draw(); + } - public static ForgeDirection convertMetaToForgeOrientation(int metadata){ - switch(metadata){ - case 6: - return ForgeDirection.DOWN; - case 7: - return ForgeDirection.UP; - case 1: - return ForgeDirection.WEST; - case 3: - return ForgeDirection.NORTH; - case 2: - return ForgeDirection.EAST; - case 4: - return ForgeDirection.SOUTH; - case 5: - return ForgeDirection.DOWN; - case 0: - return ForgeDirection.UP; - } - - return ForgeDirection.UNKNOWN; - } - - public static void renderInventoryCube(Block block, int metadata, int modelID, RenderBlocks renderer){ - Tessellator tessellator = Tessellator.instance; - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 1, metadata)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 0, metadata)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 2, metadata)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 3, metadata)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 4, metadata)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata)); - tessellator.draw(); - } - } diff --git a/tconstruct/landmine/block/BlockLandmine.java b/tconstruct/landmine/block/BlockLandmine.java index 37ca363c..14e16c3a 100644 --- a/tconstruct/landmine/block/BlockLandmine.java +++ b/tconstruct/landmine/block/BlockLandmine.java @@ -44,487 +44,597 @@ import tconstruct.landmine.tileentity.TileEntityLandmine; * @author fuj1n * */ -public class BlockLandmine extends BlockContainer { +public class BlockLandmine extends BlockContainer +{ - // Should explode when broken instead of dropping items(may not actually work - boolean explodeOnBroken = false; + // Should explode when broken instead of dropping items(may not actually work + boolean explodeOnBroken = false; - public BlockLandmine(int par1) { - super(par1, Material.tnt); - this.setTickRandomly(true); - this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); - } + public BlockLandmine(int par1) + { + super(par1, Material.tnt); + this.setTickRandomly(true); + this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + } - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - if (world.getBlockId(x, y, z) == this.blockID && world.getBlockTileEntity(x, y, z) instanceof TileEntityLandmine) { - TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z); - - if (te != null) { - if (te.getStackInSlot(3) != null) { - return lightValue[te.getStackInSlot(3).itemID]; - } - } - } - return super.getLightValue(world, x, y, z); - } - - @Override - public int tickRate(World par1World) { - return 20; - } - - @Override - public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - TileEntityLandmine te = (TileEntityLandmine) par1IBlockAccess.getBlockTileEntity(par2, par3, par4); - - ItemStack camo = te.getStackInSlot(3); - if (camo != null && camo.itemID < blocksList.length) { - return Block.blocksList[camo.itemID].getIcon(par5, camo.getItemDamage()); - } else { - return this.getIcon(par5, par1IBlockAccess.getBlockMetadata(par2, par3, par4)); - } - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public int getRenderType() { - return RenderLandmine.model; - } - - @Override - public void onBlockClicked(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer) { - super.onBlockClicked(par1World, par2, par3, par4, par5EntityPlayer); - - if(this.explodeOnBroken){ - checkExplosion(par1World, par2, par3, par4, true); - } - } - - @Override - public void registerIcons(IconRegister par1IconRegister) { - this.blockIcon = par1IconRegister.registerIcon("tinker:Landmine"); - } - - @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - par5EntityPlayer.openGui(TConstruct.instance, TProxyCommon.landmineID, par1World, par2, par3, par4); - return true; - } - - @Override - public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) { - TileEntityLandmine tileentity = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); - - int metadata = par1World.getBlockMetadata(par2, par3, par4); - - if (tileentity != null && (!explodeOnBroken || !hasItems(par1World, par2, par3, par4)) && par6 != 193 && !tileentity.isExploding) { - int id = this.blockID; - if (id > 0) { - ItemStack is = new ItemStack(id, 1, damageDropped(tileentity.triggerType)); - if(tileentity.isInvNameLocalized()){ - is.setItemName(tileentity.getInvName()); - } - dropBlockAsItem_do(par1World, par2, par3, par4, new ItemStack(id, 1, damageDropped(tileentity.triggerType))); - } - - for (int j1 = 0; j1 < tileentity.getSizeInventory(); ++j1) { - ItemStack itemstack = tileentity.getStackInSlot(j1); - - if (itemstack != null) { - while (itemstack.stackSize > 0) { - - int ss = itemstack.stackSize; - itemstack.stackSize -= ss; - EntityItem entityitem = new EntityItem(par1World, (double) ((float) par2), (double) ((float) par3), (double) ((float) par4), new ItemStack(itemstack.itemID, ss, itemstack.getItemDamage())); - - if (itemstack.hasTagCompound()) { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); - } - - float f3 = 0.05F; - entityitem.motionX = (double) (f3); - entityitem.motionY = (double) (f3 + 0.2F); - entityitem.motionZ = (double) (f3); - par1World.spawnEntityInWorld(entityitem); - } - } - } - - par1World.func_96440_m(par2, par3, par4, par5); - } else if (explodeOnBroken) { - checkExplosion(par1World, par2, par3, par4, true); - } - - super.breakBlock(par1World, par2, par3, par4, par5, par6); - } - - @Override - public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) { - par3List.add(new ItemStack(par1, 1, 0)); - par3List.add(new ItemStack(par1, 1, 1)); - par3List.add(new ItemStack(par1, 1, 2)); - par3List.add(new ItemStack(par1, 1, 3)); - } - - @Override - public boolean getBlocksMovement(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { - return true; - } - - @Override - public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) { - ForgeDirection dir = ForgeDirection.getOrientation(par5); - return (dir == DOWN && par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN)) || (dir == UP && par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP)) || (dir == NORTH && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH)) || (dir == SOUTH && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH)) || (dir == WEST && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST)) || (dir == EAST && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST)); - } - - @Override - public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { - return par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST) || par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST) || par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH) || par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH) || par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP) || par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN); - } - - @Override - public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { - int j1 = par9 & 8; - int k1 = par9 & 7; - byte b0 = -1; - - if (par5 == 0 && par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN)) { - b0 = 0; - } - - if (par5 == 1 && par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP)) { - b0 = 5; - } - - if (par5 == 2 && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH)) { - b0 = 4; - } - - if (par5 == 3 && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH)) { - b0 = 3; - } - - if (par5 == 4 && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST)) { - b0 = 2; - } - - if (par5 == 5 && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST)) { - b0 = 1; - } - - return b0 + j1; - } - - @Override - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - int l = par1World.getBlockMetadata(par2, par3, par4); - int i1 = l & 7; - int j1 = l & 8; - - if (i1 == invertMetadata(1)) { - if ((MathHelper.floor_double((double) (par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 1) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, 5 | j1, 2); - } else { - par1World.setBlockMetadataWithNotify(par2, par3, par4, 6 | j1, 2); - } - } else if (i1 == invertMetadata(0)) { - if ((MathHelper.floor_double((double) (par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 1) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, 7 | j1, 2); - } else { - par1World.setBlockMetadataWithNotify(par2, par3, par4, 0 | j1, 2); - } - } - - if (par6ItemStack.hasDisplayName()) { - ((TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4)).setGuiDisplayName(par6ItemStack.getDisplayName()); - } - } - - public static int invertMetadata(int par0) { - switch (par0) { - case 0: - return 0; - case 1: - return 5; - case 2: - return 4; - case 3: - return 3; - case 4: - return 2; - case 5: - return 1; - default: - return -1; - } - } - - @Override - public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5) { - checkPlacement(par1World, par2, par3, par4, par5); - - checkExplosion(par1World, par2, par3, par4, false); - } - - public void checkPlacement(World par1World, int par2, int par3, int par4, int par5) { - if (this.checkIfAttachedToBlock(par1World, par2, par3, par4)) { - int i1 = par1World.getBlockMetadata(par2, par3, par4) & 7; - boolean flag = false; - - if (!par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST) && i1 == 1) { - flag = true; - } - - if (!par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST) && i1 == 2) { - flag = true; - } - - if (!par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH) && i1 == 3) { - flag = true; - } - - if (!par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH) && i1 == 4) { - flag = true; - } - - if (!par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP) && i1 == 5) { - flag = true; - } - - if (!par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP) && i1 == 6) { - flag = true; - } - - if (!par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN) && i1 == 0) { - flag = true; - } - - if (!par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN) && i1 == 7) { - flag = true; - } - - if (flag) { - this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockToAir(par2, par3, par4); - } - } - } - - private boolean checkIfAttachedToBlock(World par1World, int par2, int par3, int par4) { - if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { - this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockToAir(par2, par3, par4); - return false; - } else { - return true; - } - } - - @Override - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) { - if (!par1World.isRemote) { - checkExplosion(par1World, par2, par3, par4, false); - } - } - - public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { - if (!par1World.isRemote) { - this.checkExplosion(par1World, par2, par3, par4, false); - } - } - - public void checkExplosion(World par1World, int par2, int par3, int par4, boolean skipCheck) { - if (skipCheck || getMineState(par1World, par2, par3, par4) > 0) { - if (hasItems(par1World, par2, par3, par4)) { - TileEntityLandmine te = (TileEntityLandmine)par1World.getBlockTileEntity(par2, par3, par4); - if(te.soundcountything <= 0){ - par1World.playSoundEffect((double) par2 + 0.5D, (double) par3 + 0.1D, (double) par4 + 0.5D, "random.click", 0.3F, 0.6F); - te.setSoundPlayed(); - } - new LandmineExplodeLogic(par1World, par2, par3, par4, getMineTriggerer(par1World, par2, par3, par4)).explode(); - } - } - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { - return null; - } - - private boolean hasItems(World par1World, int par2, int par3, int par4) { - TileEntityLandmine te = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); - if (te != null && te.getStackInSlot(0) != null || te.getStackInSlot(1) != null || te.getStackInSlot(2) != null) { - return true; - } else { - return false; - } - } - - protected int getMineState(World par1World, int par2, int par3, int par4) { - EnumMobType triggerMobType; - - TileEntityLandmine te = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); - - // Change to return 1 if you want the landmine to blow up when the block - // holding it is broken - if (te == null) { - return 0; - } - switch (te.triggerType) { - case 0: - triggerMobType = EnumMobType.everything; - break; - case 1: - triggerMobType = EnumMobType.mobs; - break; - case 2: - triggerMobType = EnumMobType.players; - break; - default: - triggerMobType = null; - break; - } - - if (triggerMobType != null) { - List list = null; - - if (triggerMobType == EnumMobType.everything) { - list = par1World.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); - } - - if (triggerMobType == EnumMobType.mobs) { - list = par1World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); - } - - if (triggerMobType == EnumMobType.players) { - list = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); - } - - if (list != null && !list.isEmpty()) { - Iterator iterator = list.iterator(); - - while (iterator.hasNext()) { - Entity entity = (Entity) iterator.next(); - - if (!entity.doesEntityNotTriggerPressurePlate()) { - return 1; - } - } - } - } - - return par1World.isBlockIndirectlyGettingPowered(par2, par3, par4) ? 1 : 0; - } - - public Entity getMineTriggerer(World par1World, int par2, int par3, int par4) { - - EnumMobType triggerMobType; - - TileEntityLandmine te = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); - - // Change to return 1 if you want the landmine to blow up when the - // block holding it is broken - if (te == null) { - return null; - } - switch (te.triggerType) { - case 0: - triggerMobType = EnumMobType.everything; - break; - case 1: - triggerMobType = EnumMobType.mobs; - break; - case 2: - triggerMobType = EnumMobType.players; - break; - default: - triggerMobType = null; - break; - } - - if (triggerMobType != null) { - List list = null; - - if (triggerMobType == EnumMobType.everything) { - list = par1World.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); - } - - if (triggerMobType == EnumMobType.mobs) { - list = par1World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); - } - - if (triggerMobType == EnumMobType.players) { - list = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); - } - - if (list != null && !list.isEmpty()) { - Iterator iterator = list.iterator(); - - while (iterator.hasNext()) { - Entity entity = (Entity) iterator.next(); - - if (!entity.doesEntityNotTriggerPressurePlate()) { - return entity; - } - } - } - } - - return new EntityTNTPrimed(par1World, par2, par3, par4, (EntityLivingBase) null); - } - - @Override - public boolean canDropFromExplosion(Explosion par1Explosion) { - return false; - } - - @SuppressWarnings("incomplete-switch") @Override - public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { - int l = par1IBlockAccess.getBlockMetadata(par2, par3, par4); - int i1 = l & 7; - boolean flag = (l & 8) > 0; + public int getLightValue (IBlockAccess world, int x, int y, int z) + { + if (world.getBlockId(x, y, z) == this.blockID && world.getBlockTileEntity(x, y, z) instanceof TileEntityLandmine) + { + TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z); - ForgeDirection dir = Helper.convertMetaToForgeOrientation(i1); - switch (dir) { - case DOWN: - this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); - break; - case UP: - this.setBlockBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); - break; - case NORTH: - this.setBlockBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); - break; - case SOUTH: - this.setBlockBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); - break; - case EAST: - this.setBlockBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); - break; - case WEST: - this.setBlockBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); - break; - } - } + if (te != null) + { + if (te.getStackInSlot(3) != null) + { + return lightValue[te.getStackInSlot(3).itemID]; + } + } + } + return super.getLightValue(world, x, y, z); + } - @Override - public int idDropped(int par1, Random par2Random, int par3) { - return 0; - } + @Override + public int tickRate (World par1World) + { + return 20; + } - @Override - public TileEntity createNewTileEntity(World world) { - return new TileEntityLandmine(); - } + @Override + public Icon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + { + TileEntityLandmine te = (TileEntityLandmine) par1IBlockAccess.getBlockTileEntity(par2, par3, par4); + + ItemStack camo = te.getStackInSlot(3); + if (camo != null && camo.itemID < blocksList.length) + { + return Block.blocksList[camo.itemID].getIcon(par5, camo.getItemDamage()); + } + else + { + return this.getIcon(par5, par1IBlockAccess.getBlockMetadata(par2, par3, par4)); + } + } + + @Override + public boolean isOpaqueCube () + { + return false; + } + + @Override + public boolean renderAsNormalBlock () + { + return false; + } + + @Override + public int getRenderType () + { + return RenderLandmine.model; + } + + @Override + public void onBlockClicked (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer) + { + super.onBlockClicked(par1World, par2, par3, par4, par5EntityPlayer); + + if (this.explodeOnBroken) + { + checkExplosion(par1World, par2, par3, par4, true); + } + } + + @Override + public void registerIcons (IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("tinker:Landmine"); + } + + @Override + public boolean onBlockActivated (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) + { + par5EntityPlayer.openGui(TConstruct.instance, TProxyCommon.landmineID, par1World, par2, par3, par4); + return true; + } + + @Override + public void breakBlock (World par1World, int par2, int par3, int par4, int par5, int par6) + { + TileEntityLandmine tileentity = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); + + int metadata = par1World.getBlockMetadata(par2, par3, par4); + + if (tileentity != null && (!explodeOnBroken || !hasItems(par1World, par2, par3, par4)) && par6 != 193 && !tileentity.isExploding) + { + int id = this.blockID; + if (id > 0) + { + ItemStack is = new ItemStack(id, 1, damageDropped(tileentity.triggerType)); + if (tileentity.isInvNameLocalized()) + { + is.setItemName(tileentity.getInvName()); + } + dropBlockAsItem_do(par1World, par2, par3, par4, new ItemStack(id, 1, damageDropped(tileentity.triggerType))); + } + + for (int j1 = 0; j1 < tileentity.getSizeInventory(); ++j1) + { + ItemStack itemstack = tileentity.getStackInSlot(j1); + + if (itemstack != null) + { + while (itemstack.stackSize > 0) + { + + int ss = itemstack.stackSize; + itemstack.stackSize -= ss; + EntityItem entityitem = new EntityItem(par1World, (double) ((float) par2), (double) ((float) par3), (double) ((float) par4), new ItemStack(itemstack.itemID, ss, + itemstack.getItemDamage())); + + if (itemstack.hasTagCompound()) + { + entityitem.getEntityItem().setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); + } + + float f3 = 0.05F; + entityitem.motionX = (double) (f3); + entityitem.motionY = (double) (f3 + 0.2F); + entityitem.motionZ = (double) (f3); + par1World.spawnEntityInWorld(entityitem); + } + } + } + + par1World.func_96440_m(par2, par3, par4, par5); + } + else if (explodeOnBroken) + { + checkExplosion(par1World, par2, par3, par4, true); + } + + super.breakBlock(par1World, par2, par3, par4, par5, par6); + } + + @Override + public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List) + { + par3List.add(new ItemStack(par1, 1, 0)); + par3List.add(new ItemStack(par1, 1, 1)); + par3List.add(new ItemStack(par1, 1, 2)); + par3List.add(new ItemStack(par1, 1, 3)); + } + + @Override + public boolean getBlocksMovement (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + { + return true; + } + + @Override + public boolean canPlaceBlockOnSide (World par1World, int par2, int par3, int par4, int par5) + { + ForgeDirection dir = ForgeDirection.getOrientation(par5); + return (dir == DOWN && par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN)) || (dir == UP && par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP)) + || (dir == NORTH && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH)) || (dir == SOUTH && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH)) + || (dir == WEST && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST)) || (dir == EAST && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST)); + } + + @Override + public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) + { + return par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST) || par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST) || par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH) + || par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH) || par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP) || par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN); + } + + @Override + public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) + { + int j1 = par9 & 8; + int k1 = par9 & 7; + byte b0 = -1; + + if (par5 == 0 && par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN)) + { + b0 = 0; + } + + if (par5 == 1 && par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP)) + { + b0 = 5; + } + + if (par5 == 2 && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH)) + { + b0 = 4; + } + + if (par5 == 3 && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH)) + { + b0 = 3; + } + + if (par5 == 4 && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST)) + { + b0 = 2; + } + + if (par5 == 5 && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST)) + { + b0 = 1; + } + + return b0 + j1; + } + + @Override + public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) + { + int l = par1World.getBlockMetadata(par2, par3, par4); + int i1 = l & 7; + int j1 = l & 8; + + if (i1 == invertMetadata(1)) + { + if ((MathHelper.floor_double((double) (par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 1) == 0) + { + par1World.setBlockMetadataWithNotify(par2, par3, par4, 5 | j1, 2); + } + else + { + par1World.setBlockMetadataWithNotify(par2, par3, par4, 6 | j1, 2); + } + } + else if (i1 == invertMetadata(0)) + { + if ((MathHelper.floor_double((double) (par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 1) == 0) + { + par1World.setBlockMetadataWithNotify(par2, par3, par4, 7 | j1, 2); + } + else + { + par1World.setBlockMetadataWithNotify(par2, par3, par4, 0 | j1, 2); + } + } + + if (par6ItemStack.hasDisplayName()) + { + ((TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4)).setGuiDisplayName(par6ItemStack.getDisplayName()); + } + } + + public static int invertMetadata (int par0) + { + switch (par0) + { + case 0: + return 0; + case 1: + return 5; + case 2: + return 4; + case 3: + return 3; + case 4: + return 2; + case 5: + return 1; + default: + return -1; + } + } + + @Override + public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, int par5) + { + checkPlacement(par1World, par2, par3, par4, par5); + + checkExplosion(par1World, par2, par3, par4, false); + } + + public void checkPlacement (World par1World, int par2, int par3, int par4, int par5) + { + if (this.checkIfAttachedToBlock(par1World, par2, par3, par4)) + { + int i1 = par1World.getBlockMetadata(par2, par3, par4) & 7; + boolean flag = false; + + if (!par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST) && i1 == 1) + { + flag = true; + } + + if (!par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST) && i1 == 2) + { + flag = true; + } + + if (!par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH) && i1 == 3) + { + flag = true; + } + + if (!par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH) && i1 == 4) + { + flag = true; + } + + if (!par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP) && i1 == 5) + { + flag = true; + } + + if (!par1World.isBlockSolidOnSide(par2, par3 - 1, par4, UP) && i1 == 6) + { + flag = true; + } + + if (!par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN) && i1 == 0) + { + flag = true; + } + + if (!par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN) && i1 == 7) + { + flag = true; + } + + if (flag) + { + this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); + par1World.setBlockToAir(par2, par3, par4); + } + } + } + + private boolean checkIfAttachedToBlock (World par1World, int par2, int par3, int par4) + { + if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) + { + this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); + par1World.setBlockToAir(par2, par3, par4); + return false; + } + else + { + return true; + } + } + + @Override + public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random) + { + if (!par1World.isRemote) + { + checkExplosion(par1World, par2, par3, par4, false); + } + } + + public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int par4, Entity par5Entity) + { + if (!par1World.isRemote) + { + this.checkExplosion(par1World, par2, par3, par4, false); + } + } + + public void checkExplosion (World par1World, int par2, int par3, int par4, boolean skipCheck) + { + if (skipCheck || getMineState(par1World, par2, par3, par4) > 0) + { + if (hasItems(par1World, par2, par3, par4)) + { + TileEntityLandmine te = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); + if (te.soundcountything <= 0) + { + par1World.playSoundEffect((double) par2 + 0.5D, (double) par3 + 0.1D, (double) par4 + 0.5D, "random.click", 0.3F, 0.6F); + te.setSoundPlayed(); + } + new LandmineExplodeLogic(par1World, par2, par3, par4, getMineTriggerer(par1World, par2, par3, par4)).explode(); + } + } + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, int par3, int par4) + { + return null; + } + + private boolean hasItems (World par1World, int par2, int par3, int par4) + { + TileEntityLandmine te = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); + if (te != null && te.getStackInSlot(0) != null || te.getStackInSlot(1) != null || te.getStackInSlot(2) != null) + { + return true; + } + else + { + return false; + } + } + + protected int getMineState (World par1World, int par2, int par3, int par4) + { + EnumMobType triggerMobType; + + TileEntityLandmine te = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); + + // Change to return 1 if you want the landmine to blow up when the block + // holding it is broken + if (te == null) + { + return 0; + } + switch (te.triggerType) + { + case 0: + triggerMobType = EnumMobType.everything; + break; + case 1: + triggerMobType = EnumMobType.mobs; + break; + case 2: + triggerMobType = EnumMobType.players; + break; + default: + triggerMobType = null; + break; + } + + if (triggerMobType != null) + { + List list = null; + + if (triggerMobType == EnumMobType.everything) + { + list = par1World.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); + } + + if (triggerMobType == EnumMobType.mobs) + { + list = par1World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); + } + + if (triggerMobType == EnumMobType.players) + { + list = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); + } + + if (list != null && !list.isEmpty()) + { + Iterator iterator = list.iterator(); + + while (iterator.hasNext()) + { + Entity entity = (Entity) iterator.next(); + + if (!entity.doesEntityNotTriggerPressurePlate()) + { + return 1; + } + } + } + } + + return par1World.isBlockIndirectlyGettingPowered(par2, par3, par4) ? 1 : 0; + } + + public Entity getMineTriggerer (World par1World, int par2, int par3, int par4) + { + + EnumMobType triggerMobType; + + TileEntityLandmine te = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); + + // Change to return 1 if you want the landmine to blow up when the + // block holding it is broken + if (te == null) + { + return null; + } + switch (te.triggerType) + { + case 0: + triggerMobType = EnumMobType.everything; + break; + case 1: + triggerMobType = EnumMobType.mobs; + break; + case 2: + triggerMobType = EnumMobType.players; + break; + default: + triggerMobType = null; + break; + } + + if (triggerMobType != null) + { + List list = null; + + if (triggerMobType == EnumMobType.everything) + { + list = par1World.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); + } + + if (triggerMobType == EnumMobType.mobs) + { + list = par1World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); + } + + if (triggerMobType == EnumMobType.players) + { + list = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().getAABB(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); + } + + if (list != null && !list.isEmpty()) + { + Iterator iterator = list.iterator(); + + while (iterator.hasNext()) + { + Entity entity = (Entity) iterator.next(); + + if (!entity.doesEntityNotTriggerPressurePlate()) + { + return entity; + } + } + } + } + + return new EntityTNTPrimed(par1World, par2, par3, par4, (EntityLivingBase) null); + } + + @Override + public boolean canDropFromExplosion (Explosion par1Explosion) + { + return false; + } + + @SuppressWarnings("incomplete-switch") + @Override + public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + { + int l = par1IBlockAccess.getBlockMetadata(par2, par3, par4); + int i1 = l & 7; + boolean flag = (l & 8) > 0; + + ForgeDirection dir = Helper.convertMetaToForgeOrientation(i1); + switch (dir) + { + case DOWN: + this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + break; + case UP: + this.setBlockBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); + break; + case NORTH: + this.setBlockBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); + break; + case SOUTH: + this.setBlockBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); + break; + case EAST: + this.setBlockBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); + break; + case WEST: + this.setBlockBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); + break; + } + } + + @Override + public int idDropped (int par1, Random par2Random, int par3) + { + return 0; + } + + @Override + public TileEntity createNewTileEntity (World world) + { + return new TileEntityLandmine(); + } } diff --git a/tconstruct/landmine/client/gui/GuiLandmine.java b/tconstruct/landmine/client/gui/GuiLandmine.java index b6d8be12..fd65fc63 100644 --- a/tconstruct/landmine/client/gui/GuiLandmine.java +++ b/tconstruct/landmine/client/gui/GuiLandmine.java @@ -14,61 +14,73 @@ import org.lwjgl.opengl.GL11; import tconstruct.landmine.inventory.ContainerLandmine; import tconstruct.landmine.logic.behavior.Behavior; - /** * * @author fuj1n * */ -public class GuiLandmine extends GuiContainer { +public class GuiLandmine extends GuiContainer +{ - ContainerLandmine container; + ContainerLandmine container; - ResourceLocation background = new ResourceLocation("tinker:textures/gui/landmine.png"); + ResourceLocation background = new ResourceLocation("tinker:textures/gui/landmine.png"); - public GuiLandmine(ContainerLandmine par1Container) { - super(par1Container); - container = par1Container; - } + public GuiLandmine(ContainerLandmine par1Container) + { + super(par1Container); + container = par1Container; + } - @Override - protected void drawItemStackTooltip(ItemStack par1ItemStack, int par2, int par3) { - List list = par1ItemStack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); - - Behavior b = Behavior.getBehaviorFromStack(par1ItemStack); - if(b != null){ - b.getInformation(par1ItemStack, list); - } - - for (int k = 0; k < list.size(); ++k) { - if (k == 0) { - list.set(k, "\u00a7" + Integer.toHexString(par1ItemStack.getRarity().rarityColor) + (String) list.get(k)); - } else { - list.set(k, EnumChatFormatting.GRAY + (String) list.get(k)); - } - } + @Override + protected void drawItemStackTooltip (ItemStack par1ItemStack, int par2, int par3) + { + List list = par1ItemStack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); - FontRenderer font = par1ItemStack.getItem().getFontRenderer(par1ItemStack); - drawHoveringText(list, par2, par3, (font == null ? fontRenderer : font)); - } + Behavior b = Behavior.getBehaviorFromStack(par1ItemStack); + if (b != null) + { + b.getInformation(par1ItemStack, list); + } - @Override - protected void drawGuiContainerForegroundLayer(int i, int j) { - if (container.te != null) { - fontRenderer.drawString(container.te.getInvName(), 8, 5, 4210752); - } else { - fontRenderer.drawString("Landmine", 8, 5, 4210752); - } - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 3, 4210752); - } + for (int k = 0; k < list.size(); ++k) + { + if (k == 0) + { + list.set(k, "\u00a7" + Integer.toHexString(par1ItemStack.getRarity().rarityColor) + (String) list.get(k)); + } + else + { + list.set(k, EnumChatFormatting.GRAY + (String) list.get(k)); + } + } - @Override - 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); - int x = (width - xSize) / 2; - int y = (height - ySize) / 2; - this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - } + FontRenderer font = par1ItemStack.getItem().getFontRenderer(par1ItemStack); + drawHoveringText(list, par2, par3, (font == null ? fontRenderer : font)); + } + + @Override + protected void drawGuiContainerForegroundLayer (int i, int j) + { + if (container.te != null) + { + fontRenderer.drawString(container.te.getInvName(), 8, 5, 4210752); + } + else + { + fontRenderer.drawString("Landmine", 8, 5, 4210752); + } + fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 3, 4210752); + } + + @Override + 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); + int x = (width - xSize) / 2; + int y = (height - ySize) / 2; + this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + } } diff --git a/tconstruct/landmine/client/render/RenderLandmine.java b/tconstruct/landmine/client/render/RenderLandmine.java index 48e3c2ac..1a8e60f4 100644 --- a/tconstruct/landmine/client/render/RenderLandmine.java +++ b/tconstruct/landmine/client/render/RenderLandmine.java @@ -16,72 +16,82 @@ import cpw.mods.fml.client.registry.RenderingRegistry; * @author fuj1n * */ -public class RenderLandmine implements ISimpleBlockRenderingHandler { +public class RenderLandmine implements ISimpleBlockRenderingHandler +{ public static int model = RenderingRegistry.getNextAvailableRenderId(); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, 0F, -0.5F); - - renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); - Helper.renderInventoryCube(block, metadata, modelID, renderer); - - GL11.glPopMatrix(); - } - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if(modelId == getRenderId()){ - renderBasedOnSide(world, x, y, z, block, modelId, renderer); - return true; - }else{ - return false; - } - } + @Override + public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) + { + GL11.glPushMatrix(); + GL11.glTranslatef(-0.5F, 0F, -0.5F); - public void renderBasedOnSide(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer){ + renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + Helper.renderInventoryCube(block, metadata, modelID, renderer); + + GL11.glPopMatrix(); + } + + @Override + public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) + { + if (modelId == getRenderId()) + { + renderBasedOnSide(world, x, y, z, block, modelId, renderer); + return true; + } + else + { + return false; + } + } + + public void renderBasedOnSide (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) + { int l = world.getBlockMetadata(x, y, z); int i1 = l & 7; boolean flag = (l & 8) > 0; - - ForgeDirection dir = Helper.convertMetaToForgeOrientation(i1); - - //System.out.println(i1 + " for " + dir); - - switch(dir){ - case DOWN: - renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); - break; - case UP: - renderer.setRenderBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); - break; - case NORTH: - renderer.setRenderBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); - break; - case SOUTH: - renderer.setRenderBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); - break; - case EAST: - renderer.setRenderBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); - break; - case WEST: - renderer.setRenderBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); - break; - } - - renderer.renderStandardBlock(block, x, y, z); - } - - @Override - public boolean shouldRender3DInInventory() { - return true; - } - @Override - public int getRenderId() { - return model; - } + ForgeDirection dir = Helper.convertMetaToForgeOrientation(i1); + + //System.out.println(i1 + " for " + dir); + + switch (dir) + { + case DOWN: + renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + break; + case UP: + renderer.setRenderBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); + break; + case NORTH: + renderer.setRenderBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); + break; + case SOUTH: + renderer.setRenderBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); + break; + case EAST: + renderer.setRenderBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); + break; + case WEST: + renderer.setRenderBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); + break; + } + + renderer.renderStandardBlock(block, x, y, z); + } + + @Override + public boolean shouldRender3DInInventory () + { + return true; + } + + @Override + public int getRenderId () + { + return model; + } } diff --git a/tconstruct/landmine/damageSource/DamageSourceLandmine.java b/tconstruct/landmine/damageSource/DamageSourceLandmine.java index 2e1da52d..bc8bdeef 100644 --- a/tconstruct/landmine/damageSource/DamageSourceLandmine.java +++ b/tconstruct/landmine/damageSource/DamageSourceLandmine.java @@ -5,15 +5,18 @@ import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.DamageSource; import net.minecraft.util.StatCollector; -public class DamageSourceLandmine extends DamageSource{ +public class DamageSourceLandmine extends DamageSource +{ - public DamageSourceLandmine(String s) { - super(s); - this.setDamageBypassesArmor(); - } - - public ChatMessageComponent getDeathMessage(EntityLivingBase par1EntityLivingBase){ - return super.getDeathMessage(par1EntityLivingBase); + public DamageSourceLandmine(String s) + { + super(s); + this.setDamageBypassesArmor(); + } + + public ChatMessageComponent getDeathMessage (EntityLivingBase par1EntityLivingBase) + { + return super.getDeathMessage(par1EntityLivingBase); } } diff --git a/tconstruct/landmine/inventory/ContainerLandmine.java b/tconstruct/landmine/inventory/ContainerLandmine.java index d420a9f6..8c26d862 100644 --- a/tconstruct/landmine/inventory/ContainerLandmine.java +++ b/tconstruct/landmine/inventory/ContainerLandmine.java @@ -20,383 +20,492 @@ import net.minecraft.tileentity.TileEntityFurnace; * @author fuj1n * */ -public class ContainerLandmine extends Container { - - public TileEntityLandmine te; - public EntityPlayer entityPlayer; - private int field_94536_g; - private int field_94535_f = -1; - private final Set field_94537_h = new HashSet(); - - public ContainerLandmine(EntityPlayer player, TileEntityLandmine te) { - this.te = te; - this.entityPlayer = player; - addInventorySlots(te); - bindPlayerInventory(player.inventory); - } - - public void addInventorySlots(TileEntityLandmine inv) { - addSlotToContainer(new SlotBehavedOnly(inv, 0, 35, 53)); - addSlotToContainer(new SlotBehavedOnly(inv, 1, 80, 53)); - addSlotToContainer(new SlotBehavedOnly(inv, 2, 125, 53)); - addSlotToContainer(new SlotOpaqueBlocksOnly(inv, 3, 80, 21)); - } - - public void bindPlayerInventory(InventoryPlayer inventory) { - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 142)); - } - } - - @Override - public boolean canInteractWith(EntityPlayer entityplayer) { - return te.isUseableByPlayer(entityplayer); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - // This code actually works perfectly, but does not respect the global - // TileEntity stack limit, shift clicking ability disabled. - /* - * ItemStack itemstack = null; Slot slot = (Slot) - * this.inventorySlots.get(par2); - * - * if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = - * slot.getStack(); itemstack = itemstack1.copy(); - * - * if (par2 == 2) { if (!this.mergeItemStack(itemstack1, 3, 39, true)) { - * return null; } - * - * slot.onSlotChange(itemstack1, itemstack); } else if (par2 != 1 && - * par2 != 0) { if (!this.mergeItemStack(itemstack1, 0, 1, false)) { if - * (!this.mergeItemStack(itemstack1, 1, 2, false)) { if - * (!this.mergeItemStack(itemstack1, 30, 39, false)) { return null; } - * else if (par2 >= 30 && par2 < 39 && !this.mergeItemStack(itemstack1, - * 3, 30, false)) { return null; } } } } else if - * (!this.mergeItemStack(itemstack1, 3, 39, false)) { return null; } - * - * if (itemstack1.stackSize == 0) { slot.putStack((ItemStack) null); } - * else { slot.onSlotChanged(); } - * - * if (itemstack1.stackSize == itemstack.stackSize) { return null; } - * - * slot.onPickupFromSlot(par1EntityPlayer, itemstack1); } - * - * return itemstack; - */ - return null; - } - - /* Disabled for another(less buggy and sticky) system */ - @Override - public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) { - ItemStack itemstack = null; - InventoryPlayer inventoryplayer = par4EntityPlayer.inventory; - int l; - ItemStack itemstack1; - - if (par3 == 5) { - int i1 = this.field_94536_g; - this.field_94536_g = func_94532_c(par2); - - if ((i1 != 1 || this.field_94536_g != 2) && i1 != this.field_94536_g) { - this.func_94533_d(); - } else if (inventoryplayer.getItemStack() == null) { - this.func_94533_d(); - } else if (this.field_94536_g == 0) { - this.field_94535_f = func_94529_b(par2); - - if (func_94528_d(this.field_94535_f)) { - this.field_94536_g = 1; - this.field_94537_h.clear(); - } else { - this.func_94533_d(); - } - } else if (this.field_94536_g == 1) { - Slot slot = (Slot) this.inventorySlots.get(par1); - - if (slot != null && func_94527_a(slot, inventoryplayer.getItemStack(), true) && slot.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize > this.field_94537_h.size() && this.canDragIntoSlot(slot)) { - this.field_94537_h.add(slot); - } - } else if (this.field_94536_g == 2) { - if (!this.field_94537_h.isEmpty()) { - itemstack1 = inventoryplayer.getItemStack().copy(); - l = inventoryplayer.getItemStack().stackSize; - Iterator iterator = this.field_94537_h.iterator(); - - while (iterator.hasNext()) { - Slot slot1 = (Slot) iterator.next(); - - if (slot1 != null && func_94527_a(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize >= this.field_94537_h.size() && this.canDragIntoSlot(slot1)) { - ItemStack itemstack2 = itemstack1.copy(); - int j1 = slot1.getHasStack() ? slot1.getStack().stackSize : 0; - func_94525_a(this.field_94537_h, this.field_94535_f, itemstack2, j1); - - if (itemstack2.stackSize > itemstack2.getMaxStackSize()) { - itemstack2.stackSize = itemstack2.getMaxStackSize(); - } - - if (itemstack2.stackSize > slot1.getSlotStackLimit()) { - itemstack2.stackSize = slot1.getSlotStackLimit(); - } - - l -= itemstack2.stackSize - j1; - slot1.putStack(itemstack2); - } - } - - itemstack1.stackSize = l; - - if (itemstack1.stackSize <= 0) { - itemstack1 = null; - } - - inventoryplayer.setItemStack(itemstack1); - } - - this.func_94533_d(); - } else { - this.func_94533_d(); - } - } else if (this.field_94536_g != 0) { - this.func_94533_d(); - } else { - Slot slot2; - int k1; - ItemStack itemstack3; - - if ((par3 == 0 || par3 == 1) && (par2 == 0 || par2 == 1)) { - if (par1 == -999) { - if (inventoryplayer.getItemStack() != null && par1 == -999) { - if (par2 == 0) { - par4EntityPlayer.dropPlayerItem(inventoryplayer.getItemStack()); - inventoryplayer.setItemStack((ItemStack) null); - } - - if (par2 == 1) { - par4EntityPlayer.dropPlayerItem(inventoryplayer.getItemStack().splitStack(1)); - - if (inventoryplayer.getItemStack().stackSize == 0) { - inventoryplayer.setItemStack((ItemStack) null); - } - } - } - } else if (par3 == 1) { - if (par1 < 0) { - return null; - } - - slot2 = (Slot) this.inventorySlots.get(par1); - - if (slot2 != null && slot2.canTakeStack(par4EntityPlayer)) { - itemstack1 = this.transferStackInSlot(par4EntityPlayer, par1); - - if (itemstack1 != null) { - l = itemstack1.itemID; - itemstack = itemstack1.copy(); - - if (slot2 != null && slot2.getStack() != null && slot2.getStack().itemID == l) { - this.retrySlotClick(par1, par2, true, par4EntityPlayer); - } - } - } - } else { - if (par1 < 0) { - return null; - } - - slot2 = (Slot) this.inventorySlots.get(par1); - - boolean shouldDoStuff = true; - - if ((!(slot2 instanceof SlotBehavedOnly))) { - shouldDoStuff = false; - } - - if (slot2 != null) { - itemstack1 = slot2.getStack(); - ItemStack itemstack4 = inventoryplayer.getItemStack(); - - if (itemstack1 != null) { - itemstack = itemstack1.copy(); - } - - if (itemstack1 == null) { - if (itemstack4 != null && slot2.isItemValid(itemstack4)) { - k1 = par2 == 0 ? itemstack4.stackSize : 1; - - if (k1 > slot2.getSlotStackLimit()) { - k1 = slot2.getSlotStackLimit(); - } - - if (itemstack4.stackSize >= k1) { - slot2.putStack(itemstack4.splitStack(k1)); - } - - if (itemstack4.stackSize == 0) { - inventoryplayer.setItemStack((ItemStack) null); - } - } else if (shouldDoStuff && slot2 instanceof SlotBehavedOnly && itemstack4 != null && slot2.isItemValid(new ItemStack(itemstack4.itemID, 1, itemstack4.getItemDamage()))) { - k1 = par2 == 0 ? 1 : 1; - - if (k1 > slot2.getSlotStackLimit()) { - k1 = slot2.getSlotStackLimit(); - } - - if (itemstack4.stackSize >= k1) { - slot2.putStack(itemstack4.splitStack(k1)); - } - - if (itemstack4.stackSize == 0) { - inventoryplayer.setItemStack((ItemStack) null); - } - } - } else if (slot2.canTakeStack(par4EntityPlayer)) { - if (itemstack4 == null) { - k1 = par2 == 0 ? itemstack1.stackSize : (itemstack1.stackSize + 1) / 2; - itemstack3 = slot2.decrStackSize(k1); - inventoryplayer.setItemStack(itemstack3); - - if (itemstack1.stackSize == 0) { - slot2.putStack((ItemStack) null); - } - - slot2.onPickupFromSlot(par4EntityPlayer, inventoryplayer.getItemStack()); - } else if (slot2.isItemValid(itemstack4)) { - if (itemstack1.itemID == itemstack4.itemID && itemstack1.getItemDamage() == itemstack4.getItemDamage() && ItemStack.areItemStackTagsEqual(itemstack1, itemstack4)) { - k1 = par2 == 0 ? itemstack4.stackSize : 1; - - if (k1 > slot2.getSlotStackLimit() - itemstack1.stackSize) { - k1 = slot2.getSlotStackLimit() - itemstack1.stackSize; - } - - if (k1 > itemstack4.getMaxStackSize() - itemstack1.stackSize) { - k1 = itemstack4.getMaxStackSize() - itemstack1.stackSize; - } - - itemstack4.splitStack(k1); - - if (itemstack4.stackSize == 0) { - inventoryplayer.setItemStack((ItemStack) null); - } - - itemstack1.stackSize += k1; - } else if (itemstack4.stackSize <= slot2.getSlotStackLimit()) { - slot2.putStack(itemstack4); - inventoryplayer.setItemStack(itemstack1); - } - } else if (itemstack1.itemID == itemstack4.itemID && itemstack4.getMaxStackSize() > 1 && (!itemstack1.getHasSubtypes() || itemstack1.getItemDamage() == itemstack4.getItemDamage()) && ItemStack.areItemStackTagsEqual(itemstack1, itemstack4)) { - k1 = itemstack1.stackSize; - - if (k1 > 0 && k1 + itemstack4.stackSize <= itemstack4.getMaxStackSize()) { - itemstack4.stackSize += k1; - itemstack1 = slot2.decrStackSize(k1); - - if (itemstack1.stackSize == 0) { - slot2.putStack((ItemStack) null); - } - - slot2.onPickupFromSlot(par4EntityPlayer, inventoryplayer.getItemStack()); - } - } - } - - slot2.onSlotChanged(); - } - } - } else if (par3 == 2 && par2 >= 0 && par2 < 9) { - slot2 = (Slot) this.inventorySlots.get(par1); - - if (slot2.canTakeStack(par4EntityPlayer)) { - itemstack1 = inventoryplayer.getStackInSlot(par2); - boolean flag = itemstack1 == null || slot2.inventory == inventoryplayer && slot2.isItemValid(itemstack1); - k1 = -1; - - if (!flag) { - k1 = inventoryplayer.getFirstEmptyStack(); - flag |= k1 > -1; - } - - if (slot2.getHasStack() && flag) { - itemstack3 = slot2.getStack(); - inventoryplayer.setInventorySlotContents(par2, itemstack3.copy()); - - if ((slot2.inventory != inventoryplayer || !slot2.isItemValid(itemstack1)) && itemstack1 != null) { - if (k1 > -1) { - inventoryplayer.addItemStackToInventory(itemstack1); - slot2.decrStackSize(itemstack3.stackSize); - slot2.putStack((ItemStack) null); - slot2.onPickupFromSlot(par4EntityPlayer, itemstack3); - } - } else { - slot2.decrStackSize(itemstack3.stackSize); - slot2.putStack(itemstack1); - slot2.onPickupFromSlot(par4EntityPlayer, itemstack3); - } - } else if (!slot2.getHasStack() && itemstack1 != null && slot2.isItemValid(itemstack1)) { - inventoryplayer.setInventorySlotContents(par2, (ItemStack) null); - slot2.putStack(itemstack1); - } - } - } else if (par3 == 3 && par4EntityPlayer.capabilities.isCreativeMode && inventoryplayer.getItemStack() == null && par1 >= 0) { - slot2 = (Slot) this.inventorySlots.get(par1); - - if (slot2 != null && slot2.getHasStack()) { - itemstack1 = slot2.getStack().copy(); - itemstack1.stackSize = itemstack1.getMaxStackSize(); - inventoryplayer.setItemStack(itemstack1); - } - } else if (par3 == 4 && inventoryplayer.getItemStack() == null && par1 >= 0) { - slot2 = (Slot) this.inventorySlots.get(par1); - - if (slot2 != null && slot2.getHasStack() && slot2.canTakeStack(par4EntityPlayer)) { - itemstack1 = slot2.decrStackSize(par2 == 0 ? 1 : slot2.getStack().stackSize); - slot2.onPickupFromSlot(par4EntityPlayer, itemstack1); - par4EntityPlayer.dropPlayerItem(itemstack1); - } - } else if (par3 == 6 && par1 >= 0) { - slot2 = (Slot) this.inventorySlots.get(par1); - itemstack1 = inventoryplayer.getItemStack(); - - if (itemstack1 != null && (slot2 == null || !slot2.getHasStack() || !slot2.canTakeStack(par4EntityPlayer))) { - l = par2 == 0 ? 0 : this.inventorySlots.size() - 1; - k1 = par2 == 0 ? 1 : -1; - - for (int l1 = 0; l1 < 2; ++l1) { - for (int i2 = l; i2 >= 0 && i2 < this.inventorySlots.size() && itemstack1.stackSize < itemstack1.getMaxStackSize(); i2 += k1) { - Slot slot3 = (Slot) this.inventorySlots.get(i2); - - if (slot3.getHasStack() && func_94527_a(slot3, itemstack1, true) && slot3.canTakeStack(par4EntityPlayer) && this.func_94530_a(itemstack1, slot3) && (l1 != 0 || slot3.getStack().stackSize != slot3.getStack().getMaxStackSize())) { - int j2 = Math.min(itemstack1.getMaxStackSize() - itemstack1.stackSize, slot3.getStack().stackSize); - ItemStack itemstack5 = slot3.decrStackSize(j2); - itemstack1.stackSize += j2; - - if (itemstack5.stackSize <= 0) { - slot3.putStack((ItemStack) null); - } - - slot3.onPickupFromSlot(par4EntityPlayer, itemstack5); - } - } - } - } - - this.detectAndSendChanges(); - } - } - - return itemstack; - } - - @Override - public boolean canDragIntoSlot(Slot par1Slot) { - return false; - } +public class ContainerLandmine extends Container +{ + + public TileEntityLandmine te; + public EntityPlayer entityPlayer; + private int field_94536_g; + private int field_94535_f = -1; + private final Set field_94537_h = new HashSet(); + + public ContainerLandmine(EntityPlayer player, TileEntityLandmine te) + { + this.te = te; + this.entityPlayer = player; + addInventorySlots(te); + bindPlayerInventory(player.inventory); + } + + public void addInventorySlots (TileEntityLandmine inv) + { + addSlotToContainer(new SlotBehavedOnly(inv, 0, 35, 53)); + addSlotToContainer(new SlotBehavedOnly(inv, 1, 80, 53)); + addSlotToContainer(new SlotBehavedOnly(inv, 2, 125, 53)); + addSlotToContainer(new SlotOpaqueBlocksOnly(inv, 3, 80, 21)); + } + + public void bindPlayerInventory (InventoryPlayer inventory) + { + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 9; j++) + { + addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (int i = 0; i < 9; i++) + { + addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 142)); + } + } + + @Override + public boolean canInteractWith (EntityPlayer entityplayer) + { + return te.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot (EntityPlayer par1EntityPlayer, int par2) + { + // This code actually works perfectly, but does not respect the global + // TileEntity stack limit, shift clicking ability disabled. + /* + * ItemStack itemstack = null; Slot slot = (Slot) + * this.inventorySlots.get(par2); + * + * if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = + * slot.getStack(); itemstack = itemstack1.copy(); + * + * if (par2 == 2) { if (!this.mergeItemStack(itemstack1, 3, 39, true)) { + * return null; } + * + * slot.onSlotChange(itemstack1, itemstack); } else if (par2 != 1 && + * par2 != 0) { if (!this.mergeItemStack(itemstack1, 0, 1, false)) { if + * (!this.mergeItemStack(itemstack1, 1, 2, false)) { if + * (!this.mergeItemStack(itemstack1, 30, 39, false)) { return null; } + * else if (par2 >= 30 && par2 < 39 && !this.mergeItemStack(itemstack1, + * 3, 30, false)) { return null; } } } } else if + * (!this.mergeItemStack(itemstack1, 3, 39, false)) { return null; } + * + * if (itemstack1.stackSize == 0) { slot.putStack((ItemStack) null); } + * else { slot.onSlotChanged(); } + * + * if (itemstack1.stackSize == itemstack.stackSize) { return null; } + * + * slot.onPickupFromSlot(par1EntityPlayer, itemstack1); } + * + * return itemstack; + */ + return null; + } + + /* Disabled for another(less buggy and sticky) system */ + @Override + public ItemStack slotClick (int par1, int par2, int par3, EntityPlayer par4EntityPlayer) + { + ItemStack itemstack = null; + InventoryPlayer inventoryplayer = par4EntityPlayer.inventory; + int l; + ItemStack itemstack1; + + if (par3 == 5) + { + int i1 = this.field_94536_g; + this.field_94536_g = func_94532_c(par2); + + if ((i1 != 1 || this.field_94536_g != 2) && i1 != this.field_94536_g) + { + this.func_94533_d(); + } + else if (inventoryplayer.getItemStack() == null) + { + this.func_94533_d(); + } + else if (this.field_94536_g == 0) + { + this.field_94535_f = func_94529_b(par2); + + if (func_94528_d(this.field_94535_f)) + { + this.field_94536_g = 1; + this.field_94537_h.clear(); + } + else + { + this.func_94533_d(); + } + } + else if (this.field_94536_g == 1) + { + Slot slot = (Slot) this.inventorySlots.get(par1); + + if (slot != null && func_94527_a(slot, inventoryplayer.getItemStack(), true) && slot.isItemValid(inventoryplayer.getItemStack()) + && inventoryplayer.getItemStack().stackSize > this.field_94537_h.size() && this.canDragIntoSlot(slot)) + { + this.field_94537_h.add(slot); + } + } + else if (this.field_94536_g == 2) + { + if (!this.field_94537_h.isEmpty()) + { + itemstack1 = inventoryplayer.getItemStack().copy(); + l = inventoryplayer.getItemStack().stackSize; + Iterator iterator = this.field_94537_h.iterator(); + + while (iterator.hasNext()) + { + Slot slot1 = (Slot) iterator.next(); + + if (slot1 != null && func_94527_a(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) + && inventoryplayer.getItemStack().stackSize >= this.field_94537_h.size() && this.canDragIntoSlot(slot1)) + { + ItemStack itemstack2 = itemstack1.copy(); + int j1 = slot1.getHasStack() ? slot1.getStack().stackSize : 0; + func_94525_a(this.field_94537_h, this.field_94535_f, itemstack2, j1); + + if (itemstack2.stackSize > itemstack2.getMaxStackSize()) + { + itemstack2.stackSize = itemstack2.getMaxStackSize(); + } + + if (itemstack2.stackSize > slot1.getSlotStackLimit()) + { + itemstack2.stackSize = slot1.getSlotStackLimit(); + } + + l -= itemstack2.stackSize - j1; + slot1.putStack(itemstack2); + } + } + + itemstack1.stackSize = l; + + if (itemstack1.stackSize <= 0) + { + itemstack1 = null; + } + + inventoryplayer.setItemStack(itemstack1); + } + + this.func_94533_d(); + } + else + { + this.func_94533_d(); + } + } + else if (this.field_94536_g != 0) + { + this.func_94533_d(); + } + else + { + Slot slot2; + int k1; + ItemStack itemstack3; + + if ((par3 == 0 || par3 == 1) && (par2 == 0 || par2 == 1)) + { + if (par1 == -999) + { + if (inventoryplayer.getItemStack() != null && par1 == -999) + { + if (par2 == 0) + { + par4EntityPlayer.dropPlayerItem(inventoryplayer.getItemStack()); + inventoryplayer.setItemStack((ItemStack) null); + } + + if (par2 == 1) + { + par4EntityPlayer.dropPlayerItem(inventoryplayer.getItemStack().splitStack(1)); + + if (inventoryplayer.getItemStack().stackSize == 0) + { + inventoryplayer.setItemStack((ItemStack) null); + } + } + } + } + else if (par3 == 1) + { + if (par1 < 0) + { + return null; + } + + slot2 = (Slot) this.inventorySlots.get(par1); + + if (slot2 != null && slot2.canTakeStack(par4EntityPlayer)) + { + itemstack1 = this.transferStackInSlot(par4EntityPlayer, par1); + + if (itemstack1 != null) + { + l = itemstack1.itemID; + itemstack = itemstack1.copy(); + + if (slot2 != null && slot2.getStack() != null && slot2.getStack().itemID == l) + { + this.retrySlotClick(par1, par2, true, par4EntityPlayer); + } + } + } + } + else + { + if (par1 < 0) + { + return null; + } + + slot2 = (Slot) this.inventorySlots.get(par1); + + boolean shouldDoStuff = true; + + if ((!(slot2 instanceof SlotBehavedOnly))) + { + shouldDoStuff = false; + } + + if (slot2 != null) + { + itemstack1 = slot2.getStack(); + ItemStack itemstack4 = inventoryplayer.getItemStack(); + + if (itemstack1 != null) + { + itemstack = itemstack1.copy(); + } + + if (itemstack1 == null) + { + if (itemstack4 != null && slot2.isItemValid(itemstack4)) + { + k1 = par2 == 0 ? itemstack4.stackSize : 1; + + if (k1 > slot2.getSlotStackLimit()) + { + k1 = slot2.getSlotStackLimit(); + } + + if (itemstack4.stackSize >= k1) + { + slot2.putStack(itemstack4.splitStack(k1)); + } + + if (itemstack4.stackSize == 0) + { + inventoryplayer.setItemStack((ItemStack) null); + } + } + else if (shouldDoStuff && slot2 instanceof SlotBehavedOnly && itemstack4 != null && slot2.isItemValid(new ItemStack(itemstack4.itemID, 1, itemstack4.getItemDamage()))) + { + k1 = par2 == 0 ? 1 : 1; + + if (k1 > slot2.getSlotStackLimit()) + { + k1 = slot2.getSlotStackLimit(); + } + + if (itemstack4.stackSize >= k1) + { + slot2.putStack(itemstack4.splitStack(k1)); + } + + if (itemstack4.stackSize == 0) + { + inventoryplayer.setItemStack((ItemStack) null); + } + } + } + else if (slot2.canTakeStack(par4EntityPlayer)) + { + if (itemstack4 == null) + { + k1 = par2 == 0 ? itemstack1.stackSize : (itemstack1.stackSize + 1) / 2; + itemstack3 = slot2.decrStackSize(k1); + inventoryplayer.setItemStack(itemstack3); + + if (itemstack1.stackSize == 0) + { + slot2.putStack((ItemStack) null); + } + + slot2.onPickupFromSlot(par4EntityPlayer, inventoryplayer.getItemStack()); + } + else if (slot2.isItemValid(itemstack4)) + { + if (itemstack1.itemID == itemstack4.itemID && itemstack1.getItemDamage() == itemstack4.getItemDamage() && ItemStack.areItemStackTagsEqual(itemstack1, itemstack4)) + { + k1 = par2 == 0 ? itemstack4.stackSize : 1; + + if (k1 > slot2.getSlotStackLimit() - itemstack1.stackSize) + { + k1 = slot2.getSlotStackLimit() - itemstack1.stackSize; + } + + if (k1 > itemstack4.getMaxStackSize() - itemstack1.stackSize) + { + k1 = itemstack4.getMaxStackSize() - itemstack1.stackSize; + } + + itemstack4.splitStack(k1); + + if (itemstack4.stackSize == 0) + { + inventoryplayer.setItemStack((ItemStack) null); + } + + itemstack1.stackSize += k1; + } + else if (itemstack4.stackSize <= slot2.getSlotStackLimit()) + { + slot2.putStack(itemstack4); + inventoryplayer.setItemStack(itemstack1); + } + } + else if (itemstack1.itemID == itemstack4.itemID && itemstack4.getMaxStackSize() > 1 + && (!itemstack1.getHasSubtypes() || itemstack1.getItemDamage() == itemstack4.getItemDamage()) && ItemStack.areItemStackTagsEqual(itemstack1, itemstack4)) + { + k1 = itemstack1.stackSize; + + if (k1 > 0 && k1 + itemstack4.stackSize <= itemstack4.getMaxStackSize()) + { + itemstack4.stackSize += k1; + itemstack1 = slot2.decrStackSize(k1); + + if (itemstack1.stackSize == 0) + { + slot2.putStack((ItemStack) null); + } + + slot2.onPickupFromSlot(par4EntityPlayer, inventoryplayer.getItemStack()); + } + } + } + + slot2.onSlotChanged(); + } + } + } + else if (par3 == 2 && par2 >= 0 && par2 < 9) + { + slot2 = (Slot) this.inventorySlots.get(par1); + + if (slot2.canTakeStack(par4EntityPlayer)) + { + itemstack1 = inventoryplayer.getStackInSlot(par2); + boolean flag = itemstack1 == null || slot2.inventory == inventoryplayer && slot2.isItemValid(itemstack1); + k1 = -1; + + if (!flag) + { + k1 = inventoryplayer.getFirstEmptyStack(); + flag |= k1 > -1; + } + + if (slot2.getHasStack() && flag) + { + itemstack3 = slot2.getStack(); + inventoryplayer.setInventorySlotContents(par2, itemstack3.copy()); + + if ((slot2.inventory != inventoryplayer || !slot2.isItemValid(itemstack1)) && itemstack1 != null) + { + if (k1 > -1) + { + inventoryplayer.addItemStackToInventory(itemstack1); + slot2.decrStackSize(itemstack3.stackSize); + slot2.putStack((ItemStack) null); + slot2.onPickupFromSlot(par4EntityPlayer, itemstack3); + } + } + else + { + slot2.decrStackSize(itemstack3.stackSize); + slot2.putStack(itemstack1); + slot2.onPickupFromSlot(par4EntityPlayer, itemstack3); + } + } + else if (!slot2.getHasStack() && itemstack1 != null && slot2.isItemValid(itemstack1)) + { + inventoryplayer.setInventorySlotContents(par2, (ItemStack) null); + slot2.putStack(itemstack1); + } + } + } + else if (par3 == 3 && par4EntityPlayer.capabilities.isCreativeMode && inventoryplayer.getItemStack() == null && par1 >= 0) + { + slot2 = (Slot) this.inventorySlots.get(par1); + + if (slot2 != null && slot2.getHasStack()) + { + itemstack1 = slot2.getStack().copy(); + itemstack1.stackSize = itemstack1.getMaxStackSize(); + inventoryplayer.setItemStack(itemstack1); + } + } + else if (par3 == 4 && inventoryplayer.getItemStack() == null && par1 >= 0) + { + slot2 = (Slot) this.inventorySlots.get(par1); + + if (slot2 != null && slot2.getHasStack() && slot2.canTakeStack(par4EntityPlayer)) + { + itemstack1 = slot2.decrStackSize(par2 == 0 ? 1 : slot2.getStack().stackSize); + slot2.onPickupFromSlot(par4EntityPlayer, itemstack1); + par4EntityPlayer.dropPlayerItem(itemstack1); + } + } + else if (par3 == 6 && par1 >= 0) + { + slot2 = (Slot) this.inventorySlots.get(par1); + itemstack1 = inventoryplayer.getItemStack(); + + if (itemstack1 != null && (slot2 == null || !slot2.getHasStack() || !slot2.canTakeStack(par4EntityPlayer))) + { + l = par2 == 0 ? 0 : this.inventorySlots.size() - 1; + k1 = par2 == 0 ? 1 : -1; + + for (int l1 = 0; l1 < 2; ++l1) + { + for (int i2 = l; i2 >= 0 && i2 < this.inventorySlots.size() && itemstack1.stackSize < itemstack1.getMaxStackSize(); i2 += k1) + { + Slot slot3 = (Slot) this.inventorySlots.get(i2); + + if (slot3.getHasStack() && func_94527_a(slot3, itemstack1, true) && slot3.canTakeStack(par4EntityPlayer) && this.func_94530_a(itemstack1, slot3) + && (l1 != 0 || slot3.getStack().stackSize != slot3.getStack().getMaxStackSize())) + { + int j2 = Math.min(itemstack1.getMaxStackSize() - itemstack1.stackSize, slot3.getStack().stackSize); + ItemStack itemstack5 = slot3.decrStackSize(j2); + itemstack1.stackSize += j2; + + if (itemstack5.stackSize <= 0) + { + slot3.putStack((ItemStack) null); + } + + slot3.onPickupFromSlot(par4EntityPlayer, itemstack5); + } + } + } + } + + this.detectAndSendChanges(); + } + } + + return itemstack; + } + + @Override + public boolean canDragIntoSlot (Slot par1Slot) + { + return false; + } } diff --git a/tconstruct/landmine/inventory/SlotBehavedOnly.java b/tconstruct/landmine/inventory/SlotBehavedOnly.java index e3fd30e2..aa46bd2d 100644 --- a/tconstruct/landmine/inventory/SlotBehavedOnly.java +++ b/tconstruct/landmine/inventory/SlotBehavedOnly.java @@ -6,36 +6,45 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotBehavedOnly extends Slot{ +public class SlotBehavedOnly extends Slot +{ - public SlotBehavedOnly(IInventory par1iInventory, int par2, int par3, int par4) { - super(par1iInventory, par2, par3, par4); - } - - @Override - public boolean isItemValid(ItemStack par1ItemStack){ - Behavior b = Behavior.getBehaviorFromStack(par1ItemStack); - - if(b == null){ - return false; - } - - int stackL = b.getStackLimit(par1ItemStack); - - if(b != null && this.inventory.getStackInSlot(this.slotNumber) != null && !this.inventory.getStackInSlot(this.slotNumber).isItemEqual(par1ItemStack)){ - ItemStack is = this.inventory.getStackInSlot(this.slotNumber); - if(is.stackSize + par1ItemStack.stackSize <= stackL){ - return true; - } - }else{ - return par1ItemStack.stackSize <= stackL; - } - - return false; - //return b != null; - } - - public int getSlotStackLimit(ItemStack par1ItemStack){ - return Behavior.getBehaviorFromStack(par1ItemStack) != null ? Behavior.getBehaviorFromStack(par1ItemStack).getStackLimit(par1ItemStack) : 1; - } + public SlotBehavedOnly(IInventory par1iInventory, int par2, int par3, int par4) + { + super(par1iInventory, par2, par3, par4); + } + + @Override + public boolean isItemValid (ItemStack par1ItemStack) + { + Behavior b = Behavior.getBehaviorFromStack(par1ItemStack); + + if (b == null) + { + return false; + } + + int stackL = b.getStackLimit(par1ItemStack); + + if (b != null && this.inventory.getStackInSlot(this.slotNumber) != null && !this.inventory.getStackInSlot(this.slotNumber).isItemEqual(par1ItemStack)) + { + ItemStack is = this.inventory.getStackInSlot(this.slotNumber); + if (is.stackSize + par1ItemStack.stackSize <= stackL) + { + return true; + } + } + else + { + return par1ItemStack.stackSize <= stackL; + } + + return false; + //return b != null; + } + + public int getSlotStackLimit (ItemStack par1ItemStack) + { + return Behavior.getBehaviorFromStack(par1ItemStack) != null ? Behavior.getBehaviorFromStack(par1ItemStack).getStackLimit(par1ItemStack) : 1; + } } diff --git a/tconstruct/landmine/inventory/SlotBlocksOnly.java b/tconstruct/landmine/inventory/SlotBlocksOnly.java index ee3eb9bc..c1d46393 100644 --- a/tconstruct/landmine/inventory/SlotBlocksOnly.java +++ b/tconstruct/landmine/inventory/SlotBlocksOnly.java @@ -10,19 +10,23 @@ import net.minecraft.item.ItemStack; * @author fuj1n * */ -public class SlotBlocksOnly extends Slot { +public class SlotBlocksOnly extends Slot +{ - public SlotBlocksOnly(IInventory par1iInventory, int par2, int par3, int par4) { - super(par1iInventory, par2, par3, par4); - } + public SlotBlocksOnly(IInventory par1iInventory, int par2, int par3, int par4) + { + super(par1iInventory, par2, par3, par4); + } - public boolean isItemValid(ItemStack par1ItemStack) { - return par1ItemStack.getItem() instanceof ItemBlock; - } - - @Override - public int getSlotStackLimit(){ - return 1; - } + public boolean isItemValid (ItemStack par1ItemStack) + { + return par1ItemStack.getItem() instanceof ItemBlock; + } + + @Override + public int getSlotStackLimit () + { + return 1; + } } diff --git a/tconstruct/landmine/inventory/SlotOpaqueBlocksOnly.java b/tconstruct/landmine/inventory/SlotOpaqueBlocksOnly.java index 1dbfdbce..5547618f 100644 --- a/tconstruct/landmine/inventory/SlotOpaqueBlocksOnly.java +++ b/tconstruct/landmine/inventory/SlotOpaqueBlocksOnly.java @@ -9,24 +9,29 @@ import net.minecraft.item.ItemStack; * @author fuj1n * */ -public class SlotOpaqueBlocksOnly extends SlotBlocksOnly { +public class SlotOpaqueBlocksOnly extends SlotBlocksOnly +{ - public SlotOpaqueBlocksOnly(IInventory par1iInventory, int par2, int par3, int par4) { - super(par1iInventory, par2, par3, par4); - } + public SlotOpaqueBlocksOnly(IInventory par1iInventory, int par2, int par3, int par4) + { + super(par1iInventory, par2, par3, par4); + } - public boolean isItemValid(ItemStack par1ItemStack) { - if (super.isItemValid(par1ItemStack)) { - Block b = Block.blocksList[par1ItemStack.itemID]; - return b.isOpaqueCube() && b.renderAsNormalBlock(); - } + public boolean isItemValid (ItemStack par1ItemStack) + { + if (super.isItemValid(par1ItemStack)) + { + Block b = Block.blocksList[par1ItemStack.itemID]; + return b.isOpaqueCube() && b.renderAsNormalBlock(); + } - return false; - } + return false; + } - @Override - public int getSlotStackLimit() { - return 1; - } + @Override + public int getSlotStackLimit () + { + return 1; + } } diff --git a/tconstruct/landmine/item/ItemBlockLandmine.java b/tconstruct/landmine/item/ItemBlockLandmine.java index c3c1f021..37bcffa4 100644 --- a/tconstruct/landmine/item/ItemBlockLandmine.java +++ b/tconstruct/landmine/item/ItemBlockLandmine.java @@ -15,65 +15,75 @@ import tconstruct.landmine.tileentity.TileEntityLandmine; * @author fuj1n * */ -public class ItemBlockLandmine extends ItemBlock{ +public class ItemBlockLandmine extends ItemBlock +{ - public ItemBlockLandmine(int par1) { - super(par1); - this.setHasSubtypes(true); - } + public ItemBlockLandmine(int par1) + { + super(par1); + this.setHasSubtypes(true); + } - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - String interaction = null; - - switch(par1ItemStack.getItemDamage()){ - case 0: - interaction = "everything"; - break; - case 1: - interaction = "mobs, players and redstone"; - break; - case 2: - interaction = "players and redstone"; - break; - default: - interaction = "redstone only"; - break; - } - - par3List.add("Interacts with: " + interaction); - } - - @Override - public int getMetadata(int par1){ - return 0; - } - - @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!world.setBlock(x, y, z, TContent.landmine.blockID, metadata, 3)) { - return false; - } + @Override + public void addInformation (ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + String interaction = null; - if (world.getBlockId(x, y, z) == TContent.landmine.blockID) { - TContent.landmine.onBlockPlacedBy(world, x, y, z, player, stack); - - TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z); - if(te == null){ - te = (TileEntityLandmine) TContent.landmine.createTileEntity(world, metadata); - } - - te.triggerType = stack.getItemDamage(); - world.setBlockTileEntity(x, y, z, te); - - TContent.landmine.onPostBlockPlaced(world, x, y, z, metadata); - } + switch (par1ItemStack.getItemDamage()) + { + case 0: + interaction = "everything"; + break; + case 1: + interaction = "mobs, players and redstone"; + break; + case 2: + interaction = "players and redstone"; + break; + default: + interaction = "redstone only"; + break; + } - return true; - } - - public static Random getRandom(){ - return itemRand; - } + par3List.add("Interacts with: " + interaction); + } + + @Override + public int getMetadata (int par1) + { + return 0; + } + + @Override + public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) + { + if (!world.setBlock(x, y, z, TContent.landmine.blockID, metadata, 3)) + { + return false; + } + + if (world.getBlockId(x, y, z) == TContent.landmine.blockID) + { + TContent.landmine.onBlockPlacedBy(world, x, y, z, player, stack); + + TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z); + if (te == null) + { + te = (TileEntityLandmine) TContent.landmine.createTileEntity(world, metadata); + } + + te.triggerType = stack.getItemDamage(); + world.setBlockTileEntity(x, y, z, te); + + TContent.landmine.onPostBlockPlaced(world, x, y, z, metadata); + } + + return true; + } + + public static Random getRandom () + { + return itemRand; + } } diff --git a/tconstruct/landmine/logic/LandmineExplodeLogic.java b/tconstruct/landmine/logic/LandmineExplodeLogic.java index 6649b088..5b9a2a9c 100644 --- a/tconstruct/landmine/logic/LandmineExplodeLogic.java +++ b/tconstruct/landmine/logic/LandmineExplodeLogic.java @@ -16,177 +16,207 @@ import net.minecraft.world.World; * @author fuj1n * */ -public class LandmineExplodeLogic { - - private final World worldObj; - private final Entity triggerer; - private final TileEntityLandmine tileEntity; - private final int x, y, z; - - public LandmineExplodeLogic(World par1World, int par2, int par3, int par4, Entity entity){ - worldObj = par1World; - this.tileEntity = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); - this.x = par2; - this.y = par3; - this.z = par4; - this.triggerer = entity; - } - - public void explode(){ - if(triggerer == null){ - return; - } - - boolean preventExplode = false; - boolean isOffensive = true; - boolean cancelDefault = false; - - ArrayList stacks = new ArrayList(); - boolean hasExploded = false; - - if(tileEntity == null){ - return; - } - - tileEntity.isExploding = true; - - for(int i = 0; i < tileEntity.getSizeTriggerInventory(); i++){ - ItemStack currentStack = tileEntity.getStackInSlot(i); - Behavior b = Behavior.getBehaviorFromStack(currentStack); - if (b != null) { - - if(b.doesBehaviorPreventRemovalOfBlock(currentStack)){ - preventExplode = true; - } - - if(!b.isBehaviorExchangableWithOffensive(currentStack)){ - isOffensive = false; - } - - if(b.overridesDefault()){ - cancelDefault = true; - } - - if (!stacks.isEmpty() && Behavior.arrayContainsEqualStack(stacks, currentStack) && b.effectStacks()) { - stacks.get(Behavior.arrayIndexOfStack(stacks, currentStack)).stackSize += currentStack.stackSize; - } else { - stacks.add(currentStack); - } - } - } - - LandmineSpecialStackLogic specialStacks = new LandmineSpecialStackLogic(worldObj, x, y, z, triggerer, isOffensive, stacks); - specialStacks.handleSpecialStacks(); - - Iterator i1 = stacks.iterator(); - while(i1.hasNext()){ - ItemStack currentStack = i1.next(); - Behavior b = Behavior.getBehaviorFromStack(currentStack); - if(b != null){ - if (isOffensive || !b.isOffensive(currentStack)) { - b.executeLogic(worldObj, x, y, z, currentStack, triggerer, !preventExplode); - if (b.shouldItemBeRemoved(currentStack, !preventExplode)) { - if (b.effectStacks()) { - for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) { - if (tileEntity.getStackInSlot(i) != null) { - if (tileEntity.getStackInSlot(i).isItemEqual(currentStack)) { - tileEntity.setInventorySlotContents(i, null); - } - } - } - } else { - boolean hasRemoved = false; +public class LandmineExplodeLogic +{ + + private final World worldObj; + private final Entity triggerer; + private final TileEntityLandmine tileEntity; + private final int x, y, z; + + public LandmineExplodeLogic(World par1World, int par2, int par3, int par4, Entity entity) + { + worldObj = par1World; + this.tileEntity = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); + this.x = par2; + this.y = par3; + this.z = par4; + this.triggerer = entity; + } + + public void explode () + { + if (triggerer == null) + { + return; + } + + boolean preventExplode = false; + boolean isOffensive = true; + boolean cancelDefault = false; + + ArrayList stacks = new ArrayList(); + boolean hasExploded = false; + + if (tileEntity == null) + { + return; + } + + tileEntity.isExploding = true; + + for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) + { + ItemStack currentStack = tileEntity.getStackInSlot(i); + Behavior b = Behavior.getBehaviorFromStack(currentStack); + if (b != null) + { + + if (b.doesBehaviorPreventRemovalOfBlock(currentStack)) + { + preventExplode = true; + } + + if (!b.isBehaviorExchangableWithOffensive(currentStack)) + { + isOffensive = false; + } + + if (b.overridesDefault()) + { + cancelDefault = true; + } + + if (!stacks.isEmpty() && Behavior.arrayContainsEqualStack(stacks, currentStack) && b.effectStacks()) + { + stacks.get(Behavior.arrayIndexOfStack(stacks, currentStack)).stackSize += currentStack.stackSize; + } + else + { + stacks.add(currentStack); + } + } + } + + LandmineSpecialStackLogic specialStacks = new LandmineSpecialStackLogic(worldObj, x, y, z, triggerer, isOffensive, stacks); + specialStacks.handleSpecialStacks(); + + Iterator i1 = stacks.iterator(); + while (i1.hasNext()) + { + ItemStack currentStack = i1.next(); + Behavior b = Behavior.getBehaviorFromStack(currentStack); + if (b != null) + { + if (isOffensive || !b.isOffensive(currentStack)) + { + b.executeLogic(worldObj, x, y, z, currentStack, triggerer, !preventExplode); + if (b.shouldItemBeRemoved(currentStack, !preventExplode)) + { + if (b.effectStacks()) + { + for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) + { + if (tileEntity.getStackInSlot(i) != null) + { + if (tileEntity.getStackInSlot(i).isItemEqual(currentStack)) + { + tileEntity.setInventorySlotContents(i, null); + } + } + } + } + else + { + boolean hasRemoved = false; + + for (int i = 0; i < tileEntity.getSizeTriggerInventory() && !hasRemoved; i++) + { + if (tileEntity.getStackInSlot(i) != null) + { + if (tileEntity.getStackInSlot(i).isItemEqual(currentStack)) + { + tileEntity.setInventorySlotContents(i, null); + hasRemoved = true; + } + } + } + } + } + } + } + } + + Behavior defBeh = Behavior.getDefaulBehavior(); + if (defBeh != null && isOffensive && !cancelDefault) + { + defBeh.executeLogic(worldObj, x, y, z, null, triggerer, !preventExplode); + } + + if (hasExploded || defBeh != null && !preventExplode) + { + worldObj.removeBlockTileEntity(x, y, z); + worldObj.setBlockToAir(x, y, z); + } + else + { + tileEntity.isExploding = false; + } + + } + + //Legacy explode logic + /*public void explode(){ + if(triggerer == null){ + return; + } + + boolean preventRemoval = false; + + ItemStack stackEffect = null; + boolean hasExploded = false; + + if(tileEntity == null){ + return; + } + + tileEntity.isExploding = true; + + for(int i = 0; i < tileEntity.getSizeInventory() - 1; i++){ + ItemStack currentItemStack = tileEntity.getStackInSlot(i); + if(currentItemStack != null){ + Behavior b = Behavior.getBehaviorFromStack(stackEffect); + if(Behavior.getBehaviorFromStack(currentItemStack).doesBehaviorPreventRemovalOfBlock(currentItemStack)){ + preventRemoval = true; + } + if(stackEffect != null && (b != null && b.effectStacks()) && currentItemStack.isItemEqual(stackEffect)){ + stackEffect.stackSize += currentItemStack.stackSize; + }else if(stackEffect == null){ + stackEffect = currentItemStack; + stackEffect.stackSize = currentItemStack.stackSize; + }else{ + Behavior beh = Behavior.getBehaviorFromStack(stackEffect); + ItemStack currentStackEffect = stackEffect; + stackEffect = currentItemStack; + stackEffect.stackSize = currentItemStack.stackSize; + if(beh != null){ + hasExploded = true; + tileEntity.setInventorySlotContents(i, null); + beh.executeLogic(worldObj, x, y, z, currentStackEffect, triggerer); + } + } + } + } + + Behavior beh = Behavior.getBehaviorFromStack(stackEffect); + ItemStack currentStackEffect = stackEffect; + stackEffect = null; + if(beh != null){ + hasExploded = true; + beh.executeLogic(worldObj, x, y, z, currentStackEffect, triggerer); + } + + Behavior defBeh = Behavior.getDefaulBehavior(); + if(defBeh != null){ + defBeh.executeLogic(worldObj, x, y, z, null, triggerer); + } + + if(hasExploded || defBeh != null){ + worldObj.removeBlockTileEntity(x, y, z); + worldObj.setBlockToAir(x, y, z); + }else{ + tileEntity.isExploding = false; + } + }*/ - for (int i = 0; i < tileEntity.getSizeTriggerInventory() && !hasRemoved; i++) { - if (tileEntity.getStackInSlot(i) != null) { - if (tileEntity.getStackInSlot(i).isItemEqual(currentStack)) { - tileEntity.setInventorySlotContents(i, null); - hasRemoved = true; - } - } - } - } - } - } - } - } - - Behavior defBeh = Behavior.getDefaulBehavior(); - if(defBeh != null && isOffensive && !cancelDefault){ - defBeh.executeLogic(worldObj, x, y, z, null, triggerer, !preventExplode); - } - - if(hasExploded || defBeh != null && !preventExplode){ - worldObj.removeBlockTileEntity(x, y, z); - worldObj.setBlockToAir(x, y, z); - }else{ - tileEntity.isExploding = false; - } - - } - - //Legacy explode logic - /*public void explode(){ - if(triggerer == null){ - return; - } - - boolean preventRemoval = false; - - ItemStack stackEffect = null; - boolean hasExploded = false; - - if(tileEntity == null){ - return; - } - - tileEntity.isExploding = true; - - for(int i = 0; i < tileEntity.getSizeInventory() - 1; i++){ - ItemStack currentItemStack = tileEntity.getStackInSlot(i); - if(currentItemStack != null){ - Behavior b = Behavior.getBehaviorFromStack(stackEffect); - if(Behavior.getBehaviorFromStack(currentItemStack).doesBehaviorPreventRemovalOfBlock(currentItemStack)){ - preventRemoval = true; - } - if(stackEffect != null && (b != null && b.effectStacks()) && currentItemStack.isItemEqual(stackEffect)){ - stackEffect.stackSize += currentItemStack.stackSize; - }else if(stackEffect == null){ - stackEffect = currentItemStack; - stackEffect.stackSize = currentItemStack.stackSize; - }else{ - Behavior beh = Behavior.getBehaviorFromStack(stackEffect); - ItemStack currentStackEffect = stackEffect; - stackEffect = currentItemStack; - stackEffect.stackSize = currentItemStack.stackSize; - if(beh != null){ - hasExploded = true; - tileEntity.setInventorySlotContents(i, null); - beh.executeLogic(worldObj, x, y, z, currentStackEffect, triggerer); - } - } - } - } - - Behavior beh = Behavior.getBehaviorFromStack(stackEffect); - ItemStack currentStackEffect = stackEffect; - stackEffect = null; - if(beh != null){ - hasExploded = true; - beh.executeLogic(worldObj, x, y, z, currentStackEffect, triggerer); - } - - Behavior defBeh = Behavior.getDefaulBehavior(); - if(defBeh != null){ - defBeh.executeLogic(worldObj, x, y, z, null, triggerer); - } - - if(hasExploded || defBeh != null){ - worldObj.removeBlockTileEntity(x, y, z); - worldObj.setBlockToAir(x, y, z); - }else{ - tileEntity.isExploding = false; - } - }*/ - } diff --git a/tconstruct/landmine/logic/LandmineSpecialStackLogic.java b/tconstruct/landmine/logic/LandmineSpecialStackLogic.java index 0356b929..8acdf923 100644 --- a/tconstruct/landmine/logic/LandmineSpecialStackLogic.java +++ b/tconstruct/landmine/logic/LandmineSpecialStackLogic.java @@ -10,35 +10,40 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class LandmineSpecialStackLogic { +public class LandmineSpecialStackLogic +{ + + private final World worldObj; + private final Entity triggerer; + private final TileEntityLandmine tileEntity; + private final int x, y, z; + private final boolean isOffensive; + private final ArrayList stackEffects; + + public LandmineSpecialStackLogic(World par1World, int par2, int par3, int par4, Entity entity, boolean mayHurtPlayer, ArrayList items) + { + worldObj = par1World; + this.tileEntity = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); + this.x = par2; + this.y = par3; + this.z = par4; + this.triggerer = entity; + this.isOffensive = mayHurtPlayer; + this.stackEffects = items; + } + + public void handleSpecialStacks () + { + Iterator i1 = SpecialStackHandler.handlers.iterator(); + + while (i1.hasNext()) + { + SpecialStackHandler h = i1.next(); + if (isOffensive || !h.isOffensive(stackEffects)) + { + h.checkStack(worldObj, x, y, z, triggerer, stackEffects); + } + } + } - private final World worldObj; - private final Entity triggerer; - private final TileEntityLandmine tileEntity; - private final int x, y, z; - private final boolean isOffensive; - private final ArrayList stackEffects; - - public LandmineSpecialStackLogic(World par1World, int par2, int par3, int par4, Entity entity, boolean mayHurtPlayer, ArrayList items){ - worldObj = par1World; - this.tileEntity = (TileEntityLandmine) par1World.getBlockTileEntity(par2, par3, par4); - this.x = par2; - this.y = par3; - this.z = par4; - this.triggerer = entity; - this.isOffensive = mayHurtPlayer; - this.stackEffects = items; - } - - public void handleSpecialStacks(){ - Iterator i1 = SpecialStackHandler.handlers.iterator(); - - while(i1.hasNext()){ - SpecialStackHandler h = i1.next(); - if(isOffensive || !h.isOffensive(stackEffects)){ - h.checkStack(worldObj, x, y, z, triggerer, stackEffects); - } - } - } - } diff --git a/tconstruct/landmine/logic/behavior/Behavior.java b/tconstruct/landmine/logic/behavior/Behavior.java index b188f1f6..1839087b 100644 --- a/tconstruct/landmine/logic/behavior/Behavior.java +++ b/tconstruct/landmine/logic/behavior/Behavior.java @@ -22,165 +22,205 @@ import net.minecraftforge.common.ForgeDirection; * @author fuj1n * */ -public abstract class Behavior { - - public static HashMap behaviorsListItems = new HashMap(); - public static HashMap behaviorsListBlocks = new HashMap(); - protected static Behavior defaultBehavior; - - public static Behavior dummy = new BehaviorDummy(); - public static Behavior utilityMode = new BehaviorPreventExplode(); - public static Behavior explosive = new BehaviorExplosive(); - public static Behavior firework = new BehaviorFirework(); - public static Behavior blockThrow = new BehaviorBlockThrow(); - public static Behavior potion = new BehaviorPotion(); - public static Behavior fireball = new BehaviorFirecharge(); - public static Behavior spawn = new BehaviorSpawnEgg(); - public static Behavior shoot = new BehaviorProjectile(); - public static Behavior shear = new BehaviorShears(); - - public static void registerBuiltInBehaviors(){ - defaultBehavior = new BehaviorDefault(); - - addBehavior(new ItemStack(Item.stick), dummy); - addBehavior(new ItemStack(Item.redstone), utilityMode); - addBehavior(new ItemStack(Block.torchWood), blockThrow); - addBehavior(new ItemStack(Item.gunpowder), explosive); - addBehavior(new ItemStack(Block.tnt), explosive); - addBehavior(new ItemStack(Item.firework), firework); - addBehavior(new ItemStack(Item.potion), potion); - addBehavior(new ItemStack(Item.fireballCharge), fireball); - addBehavior(new ItemStack(Item.monsterPlacer), spawn); - addBehavior(new ItemStack(Item.arrow), shoot); - addBehavior(new ItemStack(Item.snowball), shoot); - addBehavior(new ItemStack(Item.enderPearl), shoot); - addBehavior(new ItemStack(Item.shears), shear); - - //Make sure the part below this comment is executed last(to avoid conflicts) - for(int i = 1; i < Block.blocksList.length; i++){ - if(Block.blocksList[i] != null && Block.blocksList[i].isOpaqueCube() && Block.blocksList[i].renderAsNormalBlock() && !(Block.blocksList[i] instanceof ITileEntityProvider) && !behaviorsListBlocks.containsKey(new ItemStack(Block.blocksList[i]))){ - addBehavior(new ItemStack(Block.blocksList[i]), blockThrow); - } - } - } - - public static Behavior getBehaviorFromStack(ItemStack par1ItemStack){ - if(par1ItemStack == null){ - return null; - } - - if(par1ItemStack.getItem() instanceof ItemBlock){ - if(!behaviorsListBlocks.isEmpty()){ - return behaviorsListBlocks.get(par1ItemStack.itemID); - }else{ - return null; - } - }else{ - if(!behaviorsListItems.isEmpty()){ - return behaviorsListItems.get(par1ItemStack.itemID); - }else{ - return null; - } - } - } - - public static Behavior getDefaulBehavior(){ - return defaultBehavior; - } - - public static void addBehavior(ItemStack par1ItemStack, Behavior par2Behavior){ - if(par1ItemStack.getItem() instanceof ItemBlock){ - if(!behaviorsListBlocks.containsKey(par1ItemStack.itemID)){ - behaviorsListBlocks.put(par1ItemStack.itemID, par2Behavior); - } - }else{ - if(!behaviorsListItems.containsKey(par1ItemStack.itemID)){ - behaviorsListItems.put(par1ItemStack.itemID, par2Behavior); - } - } - } +public abstract class Behavior +{ + + public static HashMap behaviorsListItems = new HashMap(); + public static HashMap behaviorsListBlocks = new HashMap(); + protected static Behavior defaultBehavior; + + public static Behavior dummy = new BehaviorDummy(); + public static Behavior utilityMode = new BehaviorPreventExplode(); + public static Behavior explosive = new BehaviorExplosive(); + public static Behavior firework = new BehaviorFirework(); + public static Behavior blockThrow = new BehaviorBlockThrow(); + public static Behavior potion = new BehaviorPotion(); + public static Behavior fireball = new BehaviorFirecharge(); + public static Behavior spawn = new BehaviorSpawnEgg(); + public static Behavior shoot = new BehaviorProjectile(); + public static Behavior shear = new BehaviorShears(); + + public static void registerBuiltInBehaviors () + { + defaultBehavior = new BehaviorDefault(); + + addBehavior(new ItemStack(Item.stick), dummy); + addBehavior(new ItemStack(Item.redstone), utilityMode); + addBehavior(new ItemStack(Block.torchWood), blockThrow); + addBehavior(new ItemStack(Item.gunpowder), explosive); + addBehavior(new ItemStack(Block.tnt), explosive); + addBehavior(new ItemStack(Item.firework), firework); + addBehavior(new ItemStack(Item.potion), potion); + addBehavior(new ItemStack(Item.fireballCharge), fireball); + addBehavior(new ItemStack(Item.monsterPlacer), spawn); + addBehavior(new ItemStack(Item.arrow), shoot); + addBehavior(new ItemStack(Item.snowball), shoot); + addBehavior(new ItemStack(Item.enderPearl), shoot); + addBehavior(new ItemStack(Item.shears), shear); + + //Make sure the part below this comment is executed last(to avoid conflicts) + for (int i = 1; i < Block.blocksList.length; i++) + { + if (Block.blocksList[i] != null && Block.blocksList[i].isOpaqueCube() && Block.blocksList[i].renderAsNormalBlock() && !(Block.blocksList[i] instanceof ITileEntityProvider) + && !behaviorsListBlocks.containsKey(new ItemStack(Block.blocksList[i]))) + { + addBehavior(new ItemStack(Block.blocksList[i]), blockThrow); + } + } + } + + public static Behavior getBehaviorFromStack (ItemStack par1ItemStack) + { + if (par1ItemStack == null) + { + return null; + } + + if (par1ItemStack.getItem() instanceof ItemBlock) + { + if (!behaviorsListBlocks.isEmpty()) + { + return behaviorsListBlocks.get(par1ItemStack.itemID); + } + else + { + return null; + } + } + else + { + if (!behaviorsListItems.isEmpty()) + { + return behaviorsListItems.get(par1ItemStack.itemID); + } + else + { + return null; + } + } + } + + public static Behavior getDefaulBehavior () + { + return defaultBehavior; + } + + public static void addBehavior (ItemStack par1ItemStack, Behavior par2Behavior) + { + if (par1ItemStack.getItem() instanceof ItemBlock) + { + if (!behaviorsListBlocks.containsKey(par1ItemStack.itemID)) + { + behaviorsListBlocks.put(par1ItemStack.itemID, par2Behavior); + } + } + else + { + if (!behaviorsListItems.containsKey(par1ItemStack.itemID)) + { + behaviorsListItems.put(par1ItemStack.itemID, par2Behavior); + } + } + } + + public abstract void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved); + + public int getStackLimit (ItemStack par1ItemStack) + { + return 1; + } + + public void getInformation (ItemStack par1ItemStack, List par2List) + { + } + + //Will return false if the effect does not stack among the slots + public boolean effectStacks () + { + return true; + } + + public EnumFacing getFacing (World par1World, int par2, int par3, int par4) + { + ForgeDirection dir = Helper.convertMetaToForgeOrientation(par1World.getBlockMetadata(par2, par3, par4)); + + switch (dir) + { + case DOWN: + return EnumFacing.UP; + case UP: + return EnumFacing.DOWN; + case WEST: + return EnumFacing.WEST; + case EAST: + return EnumFacing.EAST; + case SOUTH: + return EnumFacing.NORTH; + case NORTH: + return EnumFacing.SOUTH; + default: + return EnumFacing.UP; + } + } + + public boolean doesBehaviorPreventRemovalOfBlock (ItemStack par1ItemStack) + { + return false; + } + + public boolean isOffensive (ItemStack par1ItemStack) + { + return true; + } + + public boolean isBehaviorExchangableWithOffensive (ItemStack par1ItemStack) + { + return true; + } + + public boolean shouldItemBeRemoved (ItemStack par1ItemStack, boolean willBlockGetRemoved) + { + return true; + } + + public static final int arrayIndexOfStack (ArrayList stacks, ItemStack item) + { + Iterator i1 = stacks.iterator(); + + int index = 0; + + while (i1.hasNext()) + { + ItemStack stack = i1.next(); + if (stack.isItemEqual(item)) + { + return index; + } + index++; + } + + return -1; + } + + public static final boolean arrayContainsEqualStack (ArrayList stacks, ItemStack item) + { + Iterator i1 = stacks.iterator(); + + while (i1.hasNext()) + { + ItemStack stack = i1.next(); + if (stack.isItemEqual(item)) + { + return true; + } + } + + return false; + } + + public boolean overridesDefault () + { + return false; + } - public abstract void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved); - - public int getStackLimit(ItemStack par1ItemStack){ - return 1; - } - - public void getInformation(ItemStack par1ItemStack, List par2List){} - - //Will return false if the effect does not stack among the slots - public boolean effectStacks(){ - return true; - } - - public EnumFacing getFacing(World par1World, int par2, int par3, int par4){ - ForgeDirection dir = Helper.convertMetaToForgeOrientation(par1World.getBlockMetadata(par2, par3, par4)); - - switch(dir){ - case DOWN: - return EnumFacing.UP; - case UP: - return EnumFacing.DOWN; - case WEST: - return EnumFacing.WEST; - case EAST: - return EnumFacing.EAST; - case SOUTH: - return EnumFacing.NORTH; - case NORTH: - return EnumFacing.SOUTH; - default: - return EnumFacing.UP; - } - } - - public boolean doesBehaviorPreventRemovalOfBlock(ItemStack par1ItemStack){ - return false; - } - - public boolean isOffensive(ItemStack par1ItemStack){ - return true; - } - - public boolean isBehaviorExchangableWithOffensive(ItemStack par1ItemStack){ - return true; - } - - public boolean shouldItemBeRemoved(ItemStack par1ItemStack, boolean willBlockGetRemoved){ - return true; - } - - public static final int arrayIndexOfStack(ArrayList stacks, ItemStack item){ - Iterator i1 = stacks.iterator(); - - int index = 0; - - while(i1.hasNext()){ - ItemStack stack = i1.next(); - if(stack.isItemEqual(item)){ - return index; - } - index++; - } - - return -1; - } - - public static final boolean arrayContainsEqualStack(ArrayList stacks, ItemStack item){ - Iterator i1 = stacks.iterator(); - - while(i1.hasNext()){ - ItemStack stack = i1.next(); - if(stack.isItemEqual(item)){ - return true; - } - } - - return false; - } - - public boolean overridesDefault(){ - return false; - } - } diff --git a/tconstruct/landmine/logic/behavior/BehaviorBlockThrow.java b/tconstruct/landmine/logic/behavior/BehaviorBlockThrow.java index 7fb31950..3f059919 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorBlockThrow.java +++ b/tconstruct/landmine/logic/behavior/BehaviorBlockThrow.java @@ -12,69 +12,76 @@ import net.minecraft.world.World; * @author fuj1n * */ -public class BehaviorBlockThrow extends Behavior{ +public class BehaviorBlockThrow extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { - for(int i = 0; i < par5ItemStack.stackSize; i++){ - int direction = par1World.rand.nextInt(8); - double speed = 2D * Math.random() + 0.01D; - double upVecReduction = 0.25D; - double randomnessFactor = 0.5D; - double vec0 = 0, vec1 = par1World.rand.nextDouble() * upVecReduction, vec2 = 0; - switch (direction) { - case 0: - vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; - //vec2 = par1World.rand.nextDouble() * randomnessFactor; - break; - case 1: - vec0 = -speed + par1World.rand.nextDouble() * randomnessFactor; - //vec2 = par1World.rand.nextDouble() * randomnessFactor; - break; - case 2: - vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; - //vec0 = par1World.rand.nextDouble() * randomnessFactor; - break; - case 3: - vec2 = -speed + par1World.rand.nextDouble() * randomnessFactor; - //vec0 = par1World.rand.nextDouble() * randomnessFactor; - break; - case 4: - vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; - vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; - break; - case 5: - vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; - vec2 = -speed + par1World.rand.nextDouble() * randomnessFactor; - break; - case 6: - vec0 = -speed + par1World.rand.nextDouble() * randomnessFactor; - vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; - break; - case 7: - vec0 = -speed; - vec2 = -speed; - break; - default: - vec0 = speed; - break; - } - - EntityFallingSand entityfallingsand = new EntityFallingSand(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 2F), (double) ((float) par4 + 0.5F), par5ItemStack.itemID, par5ItemStack.getItemDamage()); - entityfallingsand.preventEntitySpawning = false; - entityfallingsand.fallTime = 2; - entityfallingsand.setVelocity(vec0, vec1, vec2); - par1World.spawnEntityInWorld(entityfallingsand); - } - } - - @Override - public boolean isOffensive(ItemStack par1ItemStack){ - return true; - } - - @Override - public int getStackLimit(ItemStack par1ItemStack){ - return 64; - } + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + for (int i = 0; i < par5ItemStack.stackSize; i++) + { + int direction = par1World.rand.nextInt(8); + double speed = 2D * Math.random() + 0.01D; + double upVecReduction = 0.25D; + double randomnessFactor = 0.5D; + double vec0 = 0, vec1 = par1World.rand.nextDouble() * upVecReduction, vec2 = 0; + switch (direction) + { + case 0: + vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; + //vec2 = par1World.rand.nextDouble() * randomnessFactor; + break; + case 1: + vec0 = -speed + par1World.rand.nextDouble() * randomnessFactor; + //vec2 = par1World.rand.nextDouble() * randomnessFactor; + break; + case 2: + vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; + //vec0 = par1World.rand.nextDouble() * randomnessFactor; + break; + case 3: + vec2 = -speed + par1World.rand.nextDouble() * randomnessFactor; + //vec0 = par1World.rand.nextDouble() * randomnessFactor; + break; + case 4: + vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; + vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; + break; + case 5: + vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; + vec2 = -speed + par1World.rand.nextDouble() * randomnessFactor; + break; + case 6: + vec0 = -speed + par1World.rand.nextDouble() * randomnessFactor; + vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; + break; + case 7: + vec0 = -speed; + vec2 = -speed; + break; + default: + vec0 = speed; + break; + } + + EntityFallingSand entityfallingsand = new EntityFallingSand(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 2F), (double) ((float) par4 + 0.5F), par5ItemStack.itemID, + par5ItemStack.getItemDamage()); + entityfallingsand.preventEntitySpawning = false; + entityfallingsand.fallTime = 2; + entityfallingsand.setVelocity(vec0, vec1, vec2); + par1World.spawnEntityInWorld(entityfallingsand); + } + } + + @Override + public boolean isOffensive (ItemStack par1ItemStack) + { + return true; + } + + @Override + public int getStackLimit (ItemStack par1ItemStack) + { + return 64; + } } diff --git a/tconstruct/landmine/logic/behavior/BehaviorDefault.java b/tconstruct/landmine/logic/behavior/BehaviorDefault.java index 39839742..fa841b53 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorDefault.java +++ b/tconstruct/landmine/logic/behavior/BehaviorDefault.java @@ -5,13 +5,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tconstruct.landmine.damageSource.DamageSourceLandmine; -public class BehaviorDefault extends Behavior{ +public class BehaviorDefault extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { - if(triggerer != null){ - triggerer.attackEntityFrom(new DamageSourceLandmine("Landmine"), 5F); - } - } + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + if (triggerer != null) + { + triggerer.attackEntityFrom(new DamageSourceLandmine("Landmine"), 5F); + } + } } diff --git a/tconstruct/landmine/logic/behavior/BehaviorDummy.java b/tconstruct/landmine/logic/behavior/BehaviorDummy.java index 5f2724b2..883e015a 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorDummy.java +++ b/tconstruct/landmine/logic/behavior/BehaviorDummy.java @@ -11,8 +11,11 @@ import net.minecraft.world.World; * @author fuj1n * */ -public class BehaviorDummy extends Behavior{ - - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) {} +public class BehaviorDummy extends Behavior +{ + + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + } } diff --git a/tconstruct/landmine/logic/behavior/BehaviorExplosive.java b/tconstruct/landmine/logic/behavior/BehaviorExplosive.java index db4c7a6a..03502eb6 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorExplosive.java +++ b/tconstruct/landmine/logic/behavior/BehaviorExplosive.java @@ -15,41 +15,52 @@ import net.minecraft.world.World; * @author fuj1n * */ -public class BehaviorExplosive extends Behavior{ +public class BehaviorExplosive extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { - float explodeStrenght = 0; - if(par5ItemStack.itemID == Block.tnt.blockID){ - explodeStrenght = 4.0F * par5ItemStack.stackSize; - }else if(par5ItemStack.itemID == Item.gunpowder.itemID){ - explodeStrenght = 0.8F * par5ItemStack.stackSize; - } - - par1World.createExplosion(new EntityTNTPrimed(par1World, par2, par3, par4, (EntityLivingBase) null), par2, par3, par4, explodeStrenght, true); - } + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + float explodeStrenght = 0; + if (par5ItemStack.itemID == Block.tnt.blockID) + { + explodeStrenght = 4.0F * par5ItemStack.stackSize; + } + else if (par5ItemStack.itemID == Item.gunpowder.itemID) + { + explodeStrenght = 0.8F * par5ItemStack.stackSize; + } + + par1World.createExplosion(new EntityTNTPrimed(par1World, par2, par3, par4, (EntityLivingBase) null), par2, par3, par4, explodeStrenght, true); + } + + @Override + public void getInformation (ItemStack par1ItemStack, List par2List) + { + String str = "UNDEFINED"; + if (par1ItemStack.itemID == Block.tnt.blockID) + { + str = "medium"; + } + else if (par1ItemStack.itemID == Item.gunpowder.itemID) + { + str = "small"; + } + + //par2List.add("This item explodes with " + str + " power when the landmine is triggered."); + } + + @Override + public boolean isOffensive (ItemStack par1ItemStack) + { + return true; + } + + @Override + //Change this to false to greatly decrease the maximum potential of explosions but at the same time, make them launch the player much higher(I mean the explosions with 2 or more TNT + public boolean effectStacks () + { + return true; + } - @Override - public void getInformation(ItemStack par1ItemStack, List par2List){ - String str = "UNDEFINED"; - if(par1ItemStack.itemID == Block.tnt.blockID){ - str = "medium"; - }else if(par1ItemStack.itemID == Item.gunpowder.itemID){ - str = "small"; - } - - //par2List.add("This item explodes with " + str + " power when the landmine is triggered."); - } - - @Override - public boolean isOffensive(ItemStack par1ItemStack){ - return true; - } - - @Override - //Change this to false to greatly decrease the maximum potential of explosions but at the same time, make them launch the player much higher(I mean the explosions with 2 or more TNT - public boolean effectStacks(){ - return true; - } - } diff --git a/tconstruct/landmine/logic/behavior/BehaviorFirecharge.java b/tconstruct/landmine/logic/behavior/BehaviorFirecharge.java index 7f9f0a18..40948bfc 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorFirecharge.java +++ b/tconstruct/landmine/logic/behavior/BehaviorFirecharge.java @@ -5,7 +5,6 @@ import java.util.Random; import tconstruct.landmine.item.ItemBlockLandmine; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.EntitySmallFireball; @@ -19,36 +18,44 @@ import net.minecraft.world.World; * @author fuj1n * */ -public class BehaviorFirecharge extends Behavior { +public class BehaviorFirecharge extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { - EnumFacing face = getFacing(par1World, par2, par3, par4); - - for (int n = 0; n < par5ItemStack.stackSize; n++) { - triggerer.attackEntityFrom(DamageSource.generic, 9F); - triggerer.setFire(4); - double d0 = par2 + (double) ((float) face.getFrontOffsetX() * 0.3F); - double d1 = par3 + (double) ((float) face.getFrontOffsetX() * 0.3F); - double d2 = par4 + (double) ((float) face.getFrontOffsetZ() * 0.3F); - Random random = par1World.rand; - double d3 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetX(); - double d4 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetY(); - double d5 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetZ(); - par1World.spawnEntityInWorld(new EntitySmallFireball(par1World, d0, d1, d2, d3, d4, d5)); + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + EnumFacing face = getFacing(par1World, par2, par3, par4); - for (int i = par2 - 2; i <= (par2 + 2); i++) { - for (int j = par4 - 2; j <= (par4 + 2); j++) { - if ((par1World.getBlockId(i, par3, j) == 0 || (Block.blocksList[par1World.getBlockId(i, par3, j)] != null && Block.blocksList[par1World.getBlockId(i, par3, j)].isBlockReplaceable(par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Block.fire.canPlaceBlockAt(par1World, i, par3, j)) { - par1World.setBlock(i, par3, j, Block.fire.blockID); - } - } - } - } - } - - @Override - public boolean isOffensive(ItemStack par1ItemStack){ - return true; - } + for (int n = 0; n < par5ItemStack.stackSize; n++) + { + triggerer.attackEntityFrom(DamageSource.generic, 9F); + triggerer.setFire(4); + double d0 = par2 + (double) ((float) face.getFrontOffsetX() * 0.3F); + double d1 = par3 + (double) ((float) face.getFrontOffsetX() * 0.3F); + double d2 = par4 + (double) ((float) face.getFrontOffsetZ() * 0.3F); + Random random = par1World.rand; + double d3 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetX(); + double d4 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetY(); + double d5 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetZ(); + par1World.spawnEntityInWorld(new EntitySmallFireball(par1World, d0, d1, d2, d3, d4, d5)); + + for (int i = par2 - 2; i <= (par2 + 2); i++) + { + for (int j = par4 - 2; j <= (par4 + 2); j++) + { + if ((par1World.getBlockId(i, par3, j) == 0 || (Block.blocksList[par1World.getBlockId(i, par3, j)] != null && Block.blocksList[par1World.getBlockId(i, par3, j)].isBlockReplaceable( + par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Block.fire.canPlaceBlockAt(par1World, i, par3, j)) + { + par1World.setBlock(i, par3, j, Block.fire.blockID); + } + } + } + } + } + + @Override + public boolean isOffensive (ItemStack par1ItemStack) + { + return true; + } } diff --git a/tconstruct/landmine/logic/behavior/BehaviorFirework.java b/tconstruct/landmine/logic/behavior/BehaviorFirework.java index ad043508..d2715230 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorFirework.java +++ b/tconstruct/landmine/logic/behavior/BehaviorFirework.java @@ -14,38 +14,46 @@ import net.minecraft.world.World; * @author fuj1n * */ -public class BehaviorFirework extends Behavior{ +public class BehaviorFirework extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { - for (int i = 0; i < par5ItemStack.stackSize; i++) { - EntityFireworkRocket entityfireworkrocket = new EntityFireworkRocket(par1World, (double) par2, (double) par3, (double) par4, par5ItemStack); - par1World.spawnEntityInWorld(entityfireworkrocket); + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + for (int i = 0; i < par5ItemStack.stackSize; i++) + { + EntityFireworkRocket entityfireworkrocket = new EntityFireworkRocket(par1World, (double) par2, (double) par3, (double) par4, par5ItemStack); + par1World.spawnEntityInWorld(entityfireworkrocket); - boolean shouldRun = true; - if (triggerer instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) triggerer; - if (player.capabilities.isCreativeMode) { - // Remove the bellow comment to make the player in creative - // mode not get launched - // shouldRun = false; - } - } + boolean shouldRun = true; + if (triggerer instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) triggerer; + if (player.capabilities.isCreativeMode) + { + // Remove the bellow comment to make the player in creative + // mode not get launched + // shouldRun = false; + } + } - if (shouldRun) { - triggerer.mountEntity(entityfireworkrocket); - } - } - } + if (shouldRun) + { + triggerer.mountEntity(entityfireworkrocket); + } + } + } + + @Override + public boolean isOffensive (ItemStack par1ItemStack) + { + return false; + } + + @Override + public boolean overridesDefault () + { + return true; + } - @Override - public boolean isOffensive(ItemStack par1ItemStack){ - return false; - } - - @Override - public boolean overridesDefault(){ - return true; - } - } diff --git a/tconstruct/landmine/logic/behavior/BehaviorPotion.java b/tconstruct/landmine/logic/behavior/BehaviorPotion.java index 3247bbb0..97bb9fd6 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorPotion.java +++ b/tconstruct/landmine/logic/behavior/BehaviorPotion.java @@ -20,42 +20,58 @@ import net.minecraft.world.World; * @author fuj1n * */ -public class BehaviorPotion extends Behavior { +public class BehaviorPotion extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { - if (ItemPotion.isSplash(par5ItemStack.getItemDamage())) { - par1World.playSoundAtEntity(triggerer, "random.bow", 0.5F, 0.4F / (ItemBlockLandmine.getRandom().nextFloat() * 0.4F + 0.8F)); + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + if (ItemPotion.isSplash(par5ItemStack.getItemDamage())) + { + par1World.playSoundAtEntity(triggerer, "random.bow", 0.5F, 0.4F / (ItemBlockLandmine.getRandom().nextFloat() * 0.4F + 0.8F)); - if (!par1World.isRemote) { - if (triggerer instanceof EntityLivingBase) { - par1World.spawnEntityInWorld(new EntityPotion(par1World, (EntityLivingBase) triggerer, par5ItemStack)); - } else { - par1World.spawnEntityInWorld(new EntityPotion(par1World, par2, par3, par4, par5ItemStack)); - } - } - }else{ - if(triggerer instanceof EntityPlayer){ - Item.potion.onEaten(par5ItemStack, par1World, (EntityPlayer)triggerer); - }else if(triggerer instanceof EntityLivingBase){ - if (!par1World.isRemote) { - List list = Item.potion.getEffects(par5ItemStack); + if (!par1World.isRemote) + { + if (triggerer instanceof EntityLivingBase) + { + par1World.spawnEntityInWorld(new EntityPotion(par1World, (EntityLivingBase) triggerer, par5ItemStack)); + } + else + { + par1World.spawnEntityInWorld(new EntityPotion(par1World, par2, par3, par4, par5ItemStack)); + } + } + } + else + { + if (triggerer instanceof EntityPlayer) + { + Item.potion.onEaten(par5ItemStack, par1World, (EntityPlayer) triggerer); + } + else if (triggerer instanceof EntityLivingBase) + { + if (!par1World.isRemote) + { + List list = Item.potion.getEffects(par5ItemStack); - if (list != null) { - Iterator iterator = list.iterator(); + if (list != null) + { + Iterator iterator = list.iterator(); - while (iterator.hasNext()) { - PotionEffect potioneffect = (PotionEffect) iterator.next(); - ((EntityLivingBase)triggerer).addPotionEffect(new PotionEffect(potioneffect)); - } - } - } - } - } - } + while (iterator.hasNext()) + { + PotionEffect potioneffect = (PotionEffect) iterator.next(); + ((EntityLivingBase) triggerer).addPotionEffect(new PotionEffect(potioneffect)); + } + } + } + } + } + } - @Override - public boolean isOffensive(ItemStack par1ItemStack){ - return false; - } + @Override + public boolean isOffensive (ItemStack par1ItemStack) + { + return false; + } } diff --git a/tconstruct/landmine/logic/behavior/BehaviorPreventExplode.java b/tconstruct/landmine/logic/behavior/BehaviorPreventExplode.java index ba0b06c7..f7c3fa7c 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorPreventExplode.java +++ b/tconstruct/landmine/logic/behavior/BehaviorPreventExplode.java @@ -4,29 +4,36 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class BehaviorPreventExplode extends Behavior{ +public class BehaviorPreventExplode extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) {} - - @Override - public boolean isBehaviorExchangableWithOffensive(ItemStack par1ItemStack){ - return false; - } - - @Override - public boolean doesBehaviorPreventRemovalOfBlock(ItemStack par1ItemStack){ - return true; - } - - @Override - public boolean shouldItemBeRemoved(ItemStack par1ItemStack, boolean willBlockBeRemoved){ - return false; - } - - @Override - public boolean isOffensive(ItemStack par1ItemStack){ - return false; - } + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + } + + @Override + public boolean isBehaviorExchangableWithOffensive (ItemStack par1ItemStack) + { + return false; + } + + @Override + public boolean doesBehaviorPreventRemovalOfBlock (ItemStack par1ItemStack) + { + return true; + } + + @Override + public boolean shouldItemBeRemoved (ItemStack par1ItemStack, boolean willBlockBeRemoved) + { + return false; + } + + @Override + public boolean isOffensive (ItemStack par1ItemStack) + { + return false; + } } diff --git a/tconstruct/landmine/logic/behavior/BehaviorProjectile.java b/tconstruct/landmine/logic/behavior/BehaviorProjectile.java index a02d4515..97c48354 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorProjectile.java +++ b/tconstruct/landmine/logic/behavior/BehaviorProjectile.java @@ -16,43 +16,54 @@ import net.minecraft.world.World; * @author fuj1n * */ -public class BehaviorProjectile extends Behavior{ +public class BehaviorProjectile extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { - IProjectile entity = null; - - EnumFacing enumfacing = getFacing(par1World, par2, par3, par4); + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + IProjectile entity = null; - if(par5ItemStack.itemID == Item.arrow.itemID){ - entity = new EntityArrow(par1World, par2, par3, par4); - ((EntityArrow)entity).canBePickedUp = 1; - }else if(par5ItemStack.itemID == Item.snowball.itemID){ - entity = new EntitySnowball(par1World, par2, par3, par4); - }else if(par5ItemStack.itemID == Item.enderPearl.itemID){ - if(triggerer instanceof EntityLivingBase){ - entity = new EntityEnderPearl(par1World, (EntityLivingBase)triggerer); - ((EntityEnderPearl)entity).setPosition(par2, par3, par4); - }else{ - entity = new EntityEnderPearl(par1World, par2, par3, par4); - } - } - - if(entity == null){ - return; - } - - entity.setThrowableHeading((double)enumfacing.getFrontOffsetX(), (double)((float)enumfacing.getFrontOffsetY() + 0.1F), (double)enumfacing.getFrontOffsetZ(), 1.1F, 6.0F); - par1World.spawnEntityInWorld((Entity)entity); + EnumFacing enumfacing = getFacing(par1World, par2, par3, par4); + + if (par5ItemStack.itemID == Item.arrow.itemID) + { + entity = new EntityArrow(par1World, par2, par3, par4); + ((EntityArrow) entity).canBePickedUp = 1; + } + else if (par5ItemStack.itemID == Item.snowball.itemID) + { + entity = new EntitySnowball(par1World, par2, par3, par4); + } + else if (par5ItemStack.itemID == Item.enderPearl.itemID) + { + if (triggerer instanceof EntityLivingBase) + { + entity = new EntityEnderPearl(par1World, (EntityLivingBase) triggerer); + ((EntityEnderPearl) entity).setPosition(par2, par3, par4); + } + else + { + entity = new EntityEnderPearl(par1World, par2, par3, par4); + } + } + + if (entity == null) + { + return; + } + + entity.setThrowableHeading((double) enumfacing.getFrontOffsetX(), (double) ((float) enumfacing.getFrontOffsetY() + 0.1F), (double) enumfacing.getFrontOffsetZ(), 1.1F, 6.0F); + par1World.spawnEntityInWorld((Entity) entity); par1World.playAuxSFX(1002, par2, par3, par4, 0); - } + } + + //Projectiles: snowballs, arrows + + @Override + public boolean isOffensive (ItemStack par1ItemStack) + { + return true; + } - - //Projectiles: snowballs, arrows - - @Override - public boolean isOffensive(ItemStack par1ItemStack){ - return true; - } - } diff --git a/tconstruct/landmine/logic/behavior/BehaviorShears.java b/tconstruct/landmine/logic/behavior/BehaviorShears.java index b241d3f3..24670a25 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorShears.java +++ b/tconstruct/landmine/logic/behavior/BehaviorShears.java @@ -24,71 +24,88 @@ import net.minecraftforge.common.IShearable; * @author fuj1n * */ -public class BehaviorShears extends Behavior{ +public class BehaviorShears extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { - Random rand = ItemBlockLandmine.getRandom(); - - List sheeps = par1World.getEntitiesWithinAABB(IShearable.class, AxisAlignedBB.getAABBPool().getAABB(par2 - 2, par3 - 2, par4 - 2, par2 + 2, par3 + 2, par4 + 2)); - - if(sheeps != null && !sheeps.isEmpty()){ - Iterator i1 = sheeps.iterator(); - IShearable sheep; - while (i1.hasNext()) { - sheep = i1.next(); - if (sheep.isShearable(par5ItemStack, par1World, par2, par3, par4)) { - if (rand.nextInt(2) == 0) { - ArrayList drops = sheep.onSheared(par5ItemStack, par1World, par2, par3, par4, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, par5ItemStack)); - if (sheep instanceof EntityLivingBase) { - par5ItemStack.damageItem(1, (EntityLivingBase) sheep); - } - Iterator i2 = drops.iterator(); - while (i2.hasNext()) { - if (sheep instanceof Entity) { - Entity ent = (Entity) sheep; - dropItem(par1World, (int) ent.posX, (int) ent.posY, (int) ent.posZ, i2.next()); - } else { - dropItem(par1World, par2, par3, par4, i2.next()); - } - } - } - } - } - } - - if(willBlockBeRemoved){ - dropItem(par1World, par2, par3, par4, par5ItemStack); - } - } + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { + Random rand = ItemBlockLandmine.getRandom(); - protected void dropItem(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack) { - if (!par1World.isRemote && par1World.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - float f = 0.7F; - double d0 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d1 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d2 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(par1World, (double) par2 + d0, (double) par3 + d1, (double) par4 + d2, par5ItemStack); - entityitem.delayBeforeCanPickup = 10; - par1World.spawnEntityInWorld(entityitem); - } + List sheeps = par1World.getEntitiesWithinAABB(IShearable.class, AxisAlignedBB.getAABBPool().getAABB(par2 - 2, par3 - 2, par4 - 2, par2 + 2, par3 + 2, par4 + 2)); + + if (sheeps != null && !sheeps.isEmpty()) + { + Iterator i1 = sheeps.iterator(); + IShearable sheep; + while (i1.hasNext()) + { + sheep = i1.next(); + if (sheep.isShearable(par5ItemStack, par1World, par2, par3, par4)) + { + if (rand.nextInt(2) == 0) + { + ArrayList drops = sheep.onSheared(par5ItemStack, par1World, par2, par3, par4, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, par5ItemStack)); + if (sheep instanceof EntityLivingBase) + { + par5ItemStack.damageItem(1, (EntityLivingBase) sheep); + } + Iterator i2 = drops.iterator(); + while (i2.hasNext()) + { + if (sheep instanceof Entity) + { + Entity ent = (Entity) sheep; + dropItem(par1World, (int) ent.posX, (int) ent.posY, (int) ent.posZ, i2.next()); + } + else + { + dropItem(par1World, par2, par3, par4, i2.next()); + } + } + } + } + } + } + + if (willBlockBeRemoved) + { + dropItem(par1World, par2, par3, par4, par5ItemStack); + } } - - //Shear some sheep around a small area - - @Override - public boolean shouldItemBeRemoved(ItemStack par1ItemStack, boolean willBlockBeRemoved){ - return willBlockBeRemoved; - } - - @Override - public boolean isOffensive(ItemStack par1ItemStack){ - return false; - } - - @Override - public boolean effectStacks(){ - return false; - } - + + protected void dropItem (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack) + { + if (!par1World.isRemote && par1World.getGameRules().getGameRuleBooleanValue("doTileDrops")) + { + float f = 0.7F; + double d0 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; + double d1 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; + double d2 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(par1World, (double) par2 + d0, (double) par3 + d1, (double) par4 + d2, par5ItemStack); + entityitem.delayBeforeCanPickup = 10; + par1World.spawnEntityInWorld(entityitem); + } + } + + //Shear some sheep around a small area + + @Override + public boolean shouldItemBeRemoved (ItemStack par1ItemStack, boolean willBlockBeRemoved) + { + return willBlockBeRemoved; + } + + @Override + public boolean isOffensive (ItemStack par1ItemStack) + { + return false; + } + + @Override + public boolean effectStacks () + { + return false; + } + } diff --git a/tconstruct/landmine/logic/behavior/BehaviorSpawnEgg.java b/tconstruct/landmine/logic/behavior/BehaviorSpawnEgg.java index 5b438acb..e33822fa 100644 --- a/tconstruct/landmine/logic/behavior/BehaviorSpawnEgg.java +++ b/tconstruct/landmine/logic/behavior/BehaviorSpawnEgg.java @@ -14,30 +14,34 @@ import net.minecraft.world.World; * @author fuj1n * */ -public class BehaviorSpawnEgg extends Behavior{ +public class BehaviorSpawnEgg extends Behavior +{ - @Override - public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { + @Override + public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) + { EnumFacing enumfacing = getFacing(par1World, par2, par3, par4); - double d0 = par2 + Math.random() + (double)enumfacing.getFrontOffsetX(); - double d1 = (double)((float)par3 + 0.2F); - double d2 = par4 + Math.random() + (double)enumfacing.getFrontOffsetZ(); + double d0 = par2 + Math.random() + (double) enumfacing.getFrontOffsetX(); + double d1 = (double) ((float) par3 + 0.2F); + double d2 = par4 + Math.random() + (double) enumfacing.getFrontOffsetZ(); Entity entity = ItemMonsterPlacer.spawnCreature(par1World, par5ItemStack.getItemDamage(), d0, d1, d2); if (entity instanceof EntityLivingBase && par5ItemStack.hasDisplayName()) { - ((EntityLiving)entity).setCustomNameTag(par5ItemStack.getDisplayName()); + ((EntityLiving) entity).setCustomNameTag(par5ItemStack.getDisplayName()); } - } - - @Override - public boolean effectStacks(){ - return false; - } - - @Override - public boolean isOffensive(ItemStack par1ItemStack){ - return true; - } + } + + @Override + public boolean effectStacks () + { + return false; + } + + @Override + public boolean isOffensive (ItemStack par1ItemStack) + { + return true; + } } diff --git a/tconstruct/landmine/logic/behavior/stackCombo/SpecialStackHandler.java b/tconstruct/landmine/logic/behavior/stackCombo/SpecialStackHandler.java index 97b1eaa8..a7230047 100644 --- a/tconstruct/landmine/logic/behavior/stackCombo/SpecialStackHandler.java +++ b/tconstruct/landmine/logic/behavior/stackCombo/SpecialStackHandler.java @@ -18,77 +18,93 @@ import net.minecraftforge.common.ForgeDirection; * @author fuj1n * */ -public abstract class SpecialStackHandler { - - public static ArrayList handlers = new ArrayList(); - - public static void registerBuiltInStackHandlers(){ - addSpecialBehavior(new SpecialStackHandlerRocketFireball()); - } - - public static void addSpecialBehavior(SpecialStackHandler handler){ - if(!handlers.contains(handler)){ - handlers.add(handler); - } - } +public abstract class SpecialStackHandler +{ - public abstract void checkStack(World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks); - - public EnumFacing getFacing(World par1World, int par2, int par3, int par4){ - ForgeDirection dir = Helper.convertMetaToForgeOrientation(par1World.getBlockMetadata(par2, par3, par4)); - - switch(dir){ - case DOWN: - return EnumFacing.UP; - case UP: - return EnumFacing.DOWN; - case WEST: - return EnumFacing.WEST; - case EAST: - return EnumFacing.EAST; - case SOUTH: - return EnumFacing.NORTH; - case NORTH: - return EnumFacing.SOUTH; - default: - return EnumFacing.UP; - } - } - - public final void removeItemFromInventory(World par1World, int x, int y, int z, ItemStack item){ - if(item == null || item.stackSize <= 0){ - return; - } - - TileEntityLandmine tileEntity = (TileEntityLandmine) par1World.getBlockTileEntity(x, y, z); + public static ArrayList handlers = new ArrayList(); + + public static void registerBuiltInStackHandlers () + { + addSpecialBehavior(new SpecialStackHandlerRocketFireball()); + } + + public static void addSpecialBehavior (SpecialStackHandler handler) + { + if (!handlers.contains(handler)) + { + handlers.add(handler); + } + } + + public abstract void checkStack (World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks); + + public EnumFacing getFacing (World par1World, int par2, int par3, int par4) + { + ForgeDirection dir = Helper.convertMetaToForgeOrientation(par1World.getBlockMetadata(par2, par3, par4)); + + switch (dir) + { + case DOWN: + return EnumFacing.UP; + case UP: + return EnumFacing.DOWN; + case WEST: + return EnumFacing.WEST; + case EAST: + return EnumFacing.EAST; + case SOUTH: + return EnumFacing.NORTH; + case NORTH: + return EnumFacing.SOUTH; + default: + return EnumFacing.UP; + } + } + + public final void removeItemFromInventory (World par1World, int x, int y, int z, ItemStack item) + { + if (item == null || item.stackSize <= 0) + { + return; + } + + TileEntityLandmine tileEntity = (TileEntityLandmine) par1World.getBlockTileEntity(x, y, z); + + while (item.stackSize > 0) + { + boolean hasRemovedThisIteration = false; + for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) + { + if (!hasRemovedThisIteration && tileEntity.getStackInSlot(i) != null) + { + if (tileEntity.getStackInSlot(i).isItemEqual(item)) + { + tileEntity.decrStackSize(i, 1); + item.stackSize--; + } + } + + if (!hasRemovedThisIteration && i == tileEntity.getSizeTriggerInventory() - 1) + { + item.stackSize--; + } + } + } + } + + public static final int arrayIndexOfStack (ArrayList stacks, ItemStack item) + { + return Behavior.arrayIndexOfStack(stacks, item); + } + + public static final boolean arrayContainsEqualStack (ArrayList stacks, ItemStack item) + { + return Behavior.arrayContainsEqualStack(stacks, item); + } + + public boolean isOffensive (ArrayList par1ArrayList) + { + return true; + } - while(item.stackSize > 0){ - boolean hasRemovedThisIteration = false; - for(int i = 0; i < tileEntity.getSizeTriggerInventory(); i++){ - if(!hasRemovedThisIteration && tileEntity.getStackInSlot(i) != null){ - if(tileEntity.getStackInSlot(i).isItemEqual(item)){ - tileEntity.decrStackSize(i, 1); - item.stackSize--; - } - } - - if(!hasRemovedThisIteration && i == tileEntity.getSizeTriggerInventory() - 1){ - item.stackSize--; - } - } - } - } - - public static final int arrayIndexOfStack(ArrayList stacks, ItemStack item){ - return Behavior.arrayIndexOfStack(stacks, item); - } - - public static final boolean arrayContainsEqualStack(ArrayList stacks, ItemStack item){ - return Behavior.arrayContainsEqualStack(stacks, item); - } - - public boolean isOffensive(ArrayList par1ArrayList){ - return true; - } - } diff --git a/tconstruct/landmine/logic/behavior/stackCombo/SpecialStackHandlerRocketFireball.java b/tconstruct/landmine/logic/behavior/stackCombo/SpecialStackHandlerRocketFireball.java index 6f2c7c41..6935f27b 100644 --- a/tconstruct/landmine/logic/behavior/stackCombo/SpecialStackHandlerRocketFireball.java +++ b/tconstruct/landmine/logic/behavior/stackCombo/SpecialStackHandlerRocketFireball.java @@ -13,51 +13,60 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -public class SpecialStackHandlerRocketFireball extends SpecialStackHandler{ +public class SpecialStackHandlerRocketFireball extends SpecialStackHandler +{ - @Override - public void checkStack(World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks) { - if (stacks.isEmpty()) { - return; - } + @Override + public void checkStack (World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks) + { + if (stacks.isEmpty()) + { + return; + } - if (this.arrayContainsEqualStack(stacks, new ItemStack(Item.firework)) && this.arrayContainsEqualStack(stacks, new ItemStack(Item.fireballCharge))) { - int index0 = this.arrayIndexOfStack(stacks, new ItemStack(Item.firework)); - int index1 = this.arrayIndexOfStack(stacks, new ItemStack(Item.fireballCharge)); - EnumFacing face = getFacing(par1World, par2, par3, par4); + if (this.arrayContainsEqualStack(stacks, new ItemStack(Item.firework)) && this.arrayContainsEqualStack(stacks, new ItemStack(Item.fireballCharge))) + { + int index0 = this.arrayIndexOfStack(stacks, new ItemStack(Item.firework)); + int index1 = this.arrayIndexOfStack(stacks, new ItemStack(Item.fireballCharge)); + EnumFacing face = getFacing(par1World, par2, par3, par4); - while (stacks.get(index0).stackSize > 0 && stacks.get(index1).stackSize > 0) { - double d0 = par2 + (double) ((float) face.getFrontOffsetX() * 0.3F); - double d1 = par3 + (double) ((float) face.getFrontOffsetX() * 0.3F); - double d2 = par4 + (double) ((float) face.getFrontOffsetZ() * 0.3F); - Random random = par1World.rand; - double d3 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetX(); - double d4 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetY(); - double d5 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetZ(); - EntityFireball fireball = new EntityLargeFireball(par1World, d0, d1, d2, d3, d4, d5); - par1World.spawnEntityInWorld(fireball); + while (stacks.get(index0).stackSize > 0 && stacks.get(index1).stackSize > 0) + { + double d0 = par2 + (double) ((float) face.getFrontOffsetX() * 0.3F); + double d1 = par3 + (double) ((float) face.getFrontOffsetX() * 0.3F); + double d2 = par4 + (double) ((float) face.getFrontOffsetZ() * 0.3F); + Random random = par1World.rand; + double d3 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetX(); + double d4 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetY(); + double d5 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetZ(); + EntityFireball fireball = new EntityLargeFireball(par1World, d0, d1, d2, d3, d4, d5); + par1World.spawnEntityInWorld(fireball); - if (triggerer instanceof EntityLivingBase) { - boolean shouldRun = true; - if (triggerer instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) triggerer; - if (player.capabilities.isCreativeMode) { - // Remove the bellow comment to make the player in - // creative mode not get launched - // shouldRun = false; - } - } + if (triggerer instanceof EntityLivingBase) + { + boolean shouldRun = true; + if (triggerer instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) triggerer; + if (player.capabilities.isCreativeMode) + { + // Remove the bellow comment to make the player in + // creative mode not get launched + // shouldRun = false; + } + } - if (shouldRun) { - triggerer.mountEntity(fireball); - } - } - - this.removeItemFromInventory(par1World, par2, par3, par4, new ItemStack(Item.firework, 1)); - stacks.get(index0).stackSize--; - this.removeItemFromInventory(par1World, par2, par3, par4, new ItemStack(Item.fireballCharge, 1)); - stacks.get(index1).stackSize--; - } - } - } + if (shouldRun) + { + triggerer.mountEntity(fireball); + } + } + + this.removeItemFromInventory(par1World, par2, par3, par4, new ItemStack(Item.firework, 1)); + stacks.get(index0).stackSize--; + this.removeItemFromInventory(par1World, par2, par3, par4, new ItemStack(Item.fireballCharge, 1)); + stacks.get(index1).stackSize--; + } + } + } } diff --git a/tconstruct/landmine/tileentity/TileEntityLandmine.java b/tconstruct/landmine/tileentity/TileEntityLandmine.java index bff2fd33..6eab63d5 100644 --- a/tconstruct/landmine/tileentity/TileEntityLandmine.java +++ b/tconstruct/landmine/tileentity/TileEntityLandmine.java @@ -18,202 +18,254 @@ import net.minecraft.tileentity.TileEntityFurnace; * @author fuj1n * */ -public class TileEntityLandmine extends TileEntity implements IInventory{ +public class TileEntityLandmine extends TileEntity implements IInventory +{ - private ItemStack[] inventory = new ItemStack[getSizeInventory()]; - private String containerName; - - public int soundcountythingmax = 10; - public int soundcountything = 0; - - private boolean shouldUpdateLogic = true; - - public int triggerType; - public boolean isExploding = false; - - - public int getSizeTriggerInventory(){ - return 3; - } - - @Override - public int getSizeInventory() { - return 4; - } + private ItemStack[] inventory = new ItemStack[getSizeInventory()]; + private String containerName; - @Override - public void writeToNBT(NBTTagCompound par1NBTTagCompound) { - super.writeToNBT(par1NBTTagCompound); - NBTTagList nbttaglist = new NBTTagList(); + public int soundcountythingmax = 10; + public int soundcountything = 0; - for (int i = 0; i < this.inventory.length; ++i) { - if (this.inventory[i] != null) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - this.inventory[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } + private boolean shouldUpdateLogic = true; - par1NBTTagCompound.setTag("Items", nbttaglist); + public int triggerType; + public boolean isExploding = false; - par1NBTTagCompound.setInteger("triggerType", triggerType); - - if (this.isInvNameLocalized()) { - par1NBTTagCompound.setString("CustomName", this.containerName); - } - } - - @Override - public void readFromNBT(NBTTagCompound par1NBTTagCompound) { - super.readFromNBT(par1NBTTagCompound); - NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items"); - this.inventory = new ItemStack[this.getSizeInventory()]; - - for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.tagAt(i); - byte b0 = nbttagcompound1.getByte("Slot"); - - if (b0 >= 0 && b0 < this.inventory.length) { - this.inventory[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); - } - } - - triggerType = par1NBTTagCompound.getInteger("triggerType"); - - if (par1NBTTagCompound.hasKey("CustomName")) { - this.containerName = par1NBTTagCompound.getString("CustomName"); - } - } - - @Override - public Packet getDescriptionPacket(){ - NBTTagCompound nbt = new NBTTagCompound(); - writeToNBT(nbt); - return new Packet132TileEntityData(xCoord, yCoord, zCoord, 0, nbt); - } - - @Override - public void onDataPacket(INetworkManager net, Packet132TileEntityData packet){ - readFromNBT(packet.customParam1); - } - - @Override - public ItemStack getStackInSlot(int i) { - if(i < inventory.length){ - return inventory[i]; - }else{ - return null; - } - } - - @Override - public ItemStack decrStackSize(int par1, int par2) { - if (par1 < inventory.length) { - if (inventory[par1] != null) { - ItemStack itemstack; - - if (inventory[par1].stackSize <= par2) { - itemstack = inventory[par1]; - inventory[par1] = null; - return itemstack; - } else { - itemstack = inventory[par1].splitStack(par2); - - if (inventory[par1].stackSize == 0) { - inventory[par1] = null; - } - - return itemstack; - } - } else { - return null; - } - }else{ - return null; - } + public int getSizeTriggerInventory () + { + return 3; } - @Override - public ItemStack getStackInSlotOnClosing(int i) { - if (i < inventory.length && this.inventory[i] != null) { - ItemStack itemstack = this.inventory[i]; - this.inventory[i] = null; - return itemstack; - } else { - return null; - } - } + @Override + public int getSizeInventory () + { + return 4; + } - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - if(i < inventory.length){ - inventory[i] = itemstack; - } - } + @Override + public void writeToNBT (NBTTagCompound par1NBTTagCompound) + { + super.writeToNBT(par1NBTTagCompound); + NBTTagList nbttaglist = new NBTTagList(); - @Override - public String getInvName() { + for (int i = 0; i < this.inventory.length; ++i) + { + if (this.inventory[i] != null) + { + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + nbttagcompound1.setByte("Slot", (byte) i); + this.inventory[i].writeToNBT(nbttagcompound1); + nbttaglist.appendTag(nbttagcompound1); + } + } + + par1NBTTagCompound.setTag("Items", nbttaglist); + + par1NBTTagCompound.setInteger("triggerType", triggerType); + + if (this.isInvNameLocalized()) + { + par1NBTTagCompound.setString("CustomName", this.containerName); + } + } + + @Override + public void readFromNBT (NBTTagCompound par1NBTTagCompound) + { + super.readFromNBT(par1NBTTagCompound); + NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items"); + this.inventory = new ItemStack[this.getSizeInventory()]; + + for (int i = 0; i < nbttaglist.tagCount(); ++i) + { + NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.tagAt(i); + byte b0 = nbttagcompound1.getByte("Slot"); + + if (b0 >= 0 && b0 < this.inventory.length) + { + this.inventory[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); + } + } + + triggerType = par1NBTTagCompound.getInteger("triggerType"); + + if (par1NBTTagCompound.hasKey("CustomName")) + { + this.containerName = par1NBTTagCompound.getString("CustomName"); + } + } + + @Override + public Packet getDescriptionPacket () + { + NBTTagCompound nbt = new NBTTagCompound(); + writeToNBT(nbt); + return new Packet132TileEntityData(xCoord, yCoord, zCoord, 0, nbt); + } + + @Override + public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) + { + readFromNBT(packet.customParam1); + } + + @Override + public ItemStack getStackInSlot (int i) + { + if (i < inventory.length) + { + return inventory[i]; + } + else + { + return null; + } + } + + @Override + public ItemStack decrStackSize (int par1, int par2) + { + if (par1 < inventory.length) + { + if (inventory[par1] != null) + { + ItemStack itemstack; + + if (inventory[par1].stackSize <= par2) + { + itemstack = inventory[par1]; + inventory[par1] = null; + return itemstack; + } + else + { + itemstack = inventory[par1].splitStack(par2); + + if (inventory[par1].stackSize == 0) + { + inventory[par1] = null; + } + + return itemstack; + } + } + else + { + return null; + } + } + else + { + return null; + } + } + + @Override + public ItemStack getStackInSlotOnClosing (int i) + { + if (i < inventory.length && this.inventory[i] != null) + { + ItemStack itemstack = this.inventory[i]; + this.inventory[i] = null; + return itemstack; + } + else + { + return null; + } + } + + @Override + public void setInventorySlotContents (int i, ItemStack itemstack) + { + if (i < inventory.length) + { + inventory[i] = itemstack; + } + } + + @Override + public String getInvName () + { return this.isInvNameLocalized() ? this.containerName : "Landmine"; - } + } - @Override - public boolean isInvNameLocalized() { - return containerName != null && containerName.length() > 0; - } + @Override + public boolean isInvNameLocalized () + { + return containerName != null && containerName.length() > 0; + } - @Override - public int getInventoryStackLimit() { - return 64; - } - - public void setGuiDisplayName(String par1Str){ + @Override + public int getInventoryStackLimit () + { + return 64; + } + + public void setGuiDisplayName (String par1Str) + { this.containerName = par1Str; } - @Override - public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) <= 64.0D; - } + @Override + public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer) + { + return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, + (double) this.zCoord + 0.5D) <= 64.0D; + } - @Override - public void openChest() {} + @Override + public void openChest () + { + } - @Override - public void closeChest() {} + @Override + public void closeChest () + { + } + + @Override + public void onInventoryChanged () + { + super.onInventoryChanged(); + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + + @Override + public boolean isItemValidForSlot (int i, ItemStack itemstack) + { + //Should automatic camo insertion be allowed. + if (i == 3) + { + return false; + } + else + { + //Here for mDiyo to decide if he wants automation for insertion/extraction of the items to be an option. + //Would be useful for building automated mine laying machines. + return false; + } + } + + public void setSoundPlayed () + { + soundcountythingmax = 35; + soundcountything = soundcountythingmax; + } + + @Override + public void updateEntity () + { + if (shouldUpdateLogic) + { + worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + shouldUpdateLogic = false; + } + if (soundcountything > 0) + { + soundcountything--; + } + } - @Override - public void onInventoryChanged() { - super.onInventoryChanged(); - this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - //Should automatic camo insertion be allowed. - if(i == 3){ - return false; - }else{ - //Here for mDiyo to decide if he wants automation for insertion/extraction of the items to be an option. - //Would be useful for building automated mine laying machines. - return false; - } - } - - public void setSoundPlayed(){ - soundcountythingmax = 35; - soundcountything = soundcountythingmax; - } - - @Override - public void updateEntity(){ - if(shouldUpdateLogic){ - worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); - shouldUpdateLogic = false; - } - if(soundcountything > 0){ - soundcountything--; - } - } - } diff --git a/tconstruct/library/TConstructRegistry.java b/tconstruct/library/TConstructRegistry.java index 71884226..301d5bc4 100644 --- a/tconstruct/library/TConstructRegistry.java +++ b/tconstruct/library/TConstructRegistry.java @@ -18,7 +18,6 @@ import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.TabTools; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/tconstruct/library/blocks/InventoryBlock.java b/tconstruct/library/blocks/InventoryBlock.java index 243c2683..43f1d1c9 100644 --- a/tconstruct/library/blocks/InventoryBlock.java +++ b/tconstruct/library/blocks/InventoryBlock.java @@ -5,7 +5,6 @@ import java.util.Random; import tconstruct.library.util.IActiveLogic; import tconstruct.library.util.IFacingLogic; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -144,7 +143,7 @@ public abstract class InventoryBlock extends BlockContainer if (stack.hasDisplayName()) { - ((InventoryLogic)world.getBlockTileEntity(x, y, z)).setInvName(stack.getDisplayName()); + ((InventoryLogic) world.getBlockTileEntity(x, y, z)).setInvName(stack.getDisplayName()); } } diff --git a/tconstruct/library/blocks/InventoryLogic.java b/tconstruct/library/blocks/InventoryLogic.java index b38e9ab7..6e9533db 100644 --- a/tconstruct/library/blocks/InventoryLogic.java +++ b/tconstruct/library/blocks/InventoryLogic.java @@ -158,8 +158,8 @@ public abstract class InventoryLogic extends TileEntity implements IInventory } protected abstract String getDefaultName (); - - public void setInvName(String name) + + public void setInvName (String name) { this.invName = name; } diff --git a/tconstruct/library/client/TConstructClientRegistry.java b/tconstruct/library/client/TConstructClientRegistry.java index f400ded5..e516e59d 100644 --- a/tconstruct/library/client/TConstructClientRegistry.java +++ b/tconstruct/library/client/TConstructClientRegistry.java @@ -8,7 +8,6 @@ import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/tconstruct/library/crafting/AlloyMix.java b/tconstruct/library/crafting/AlloyMix.java index b30d6d3b..c9bdb65b 100644 --- a/tconstruct/library/crafting/AlloyMix.java +++ b/tconstruct/library/crafting/AlloyMix.java @@ -63,7 +63,7 @@ public class AlloyMix { FluidStack mixer = (FluidStack) iter.next(); //if (mixer.itemID == liquid.itemID && mixer.itemMeta == liquid.itemMeta) - if (mixer.isFluidEqual(liquid)) + if (mixer.isFluidEqual(liquid)) { int eAmt = low * mixer.amount; liquid.amount -= eAmt; diff --git a/tconstruct/library/crafting/Detailing.java b/tconstruct/library/crafting/Detailing.java index 71685837..3aaa8097 100644 --- a/tconstruct/library/crafting/Detailing.java +++ b/tconstruct/library/crafting/Detailing.java @@ -5,7 +5,6 @@ import java.util.List; import tconstruct.library.tools.ToolCore; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/tconstruct/library/crafting/PatternBuilder.java b/tconstruct/library/crafting/PatternBuilder.java index eca8f72f..be61072d 100644 --- a/tconstruct/library/crafting/PatternBuilder.java +++ b/tconstruct/library/crafting/PatternBuilder.java @@ -10,7 +10,6 @@ import tconstruct.library.event.PartBuilderEvent; import tconstruct.library.tools.CustomMaterial; import tconstruct.library.util.IPattern; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/tconstruct/library/crafting/ShapelessToolRecipe.java b/tconstruct/library/crafting/ShapelessToolRecipe.java index 27e88ddc..114c7a12 100644 --- a/tconstruct/library/crafting/ShapelessToolRecipe.java +++ b/tconstruct/library/crafting/ShapelessToolRecipe.java @@ -6,7 +6,6 @@ import java.util.List; import tconstruct.library.tools.ToolCore; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapelessRecipes; diff --git a/tconstruct/library/crafting/ToolBuilder.java b/tconstruct/library/crafting/ToolBuilder.java index 1d103767..30c9cf1a 100644 --- a/tconstruct/library/crafting/ToolBuilder.java +++ b/tconstruct/library/crafting/ToolBuilder.java @@ -12,7 +12,6 @@ import tconstruct.library.tools.ToolMaterial; import tconstruct.library.tools.ToolMod; import tconstruct.library.util.IToolPart; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -111,8 +110,8 @@ public class ToolBuilder { return buildTool(headStack, handleStack, accessoryStack, null, name); } - - public int getMaterialID(ItemStack stack) + + public int getMaterialID (ItemStack stack) { if (stack == null) return -1; @@ -123,7 +122,7 @@ public class ToolBuilder return 5; else if (item instanceof IToolPart) return ((IToolPart) item).getMaterialID(stack); - + return -1; } diff --git a/tconstruct/library/tools/AbilityHelper.java b/tconstruct/library/tools/AbilityHelper.java index 45124ddf..08f74e95 100644 --- a/tconstruct/library/tools/AbilityHelper.java +++ b/tconstruct/library/tools/AbilityHelper.java @@ -239,7 +239,7 @@ public class AbilityHelper ((EntityPlayer) player).triggerAchievement(AchievementList.overkill); } } - + player.func_130011_c(entity); if (entity instanceof EntityLivingBase) diff --git a/tconstruct/library/tools/BowBase.java b/tconstruct/library/tools/BowBase.java index cd1473a9..db429390 100644 --- a/tconstruct/library/tools/BowBase.java +++ b/tconstruct/library/tools/BowBase.java @@ -231,7 +231,7 @@ public abstract class BowBase extends ToolCore @Override public boolean requiresMultipleRenderPasses () { - return false; + return true; } /* Rendering */ diff --git a/tconstruct/library/tools/HarvestTool.java b/tconstruct/library/tools/HarvestTool.java index 71402f37..16b08cdf 100644 --- a/tconstruct/library/tools/HarvestTool.java +++ b/tconstruct/library/tools/HarvestTool.java @@ -22,9 +22,9 @@ public abstract class HarvestTool extends ToolCore @Override public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) { - if(!stack.hasTagCompound()) + if (!stack.hasTagCompound()) return false; - + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = player.worldObj; int bID = player.worldObj.getBlockId(x, y, z); diff --git a/tconstruct/library/tools/ToolCore.java b/tconstruct/library/tools/ToolCore.java index b4dd5de4..b567d6b2 100644 --- a/tconstruct/library/tools/ToolCore.java +++ b/tconstruct/library/tools/ToolCore.java @@ -13,7 +13,6 @@ import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -129,7 +128,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox @Override public boolean requiresMultipleRenderPasses () { - return false; + return true; } @SideOnly(Side.CLIENT) @@ -140,10 +139,10 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox } @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack par1ItemStack) - { - return false; - } + public boolean hasEffect (ItemStack par1ItemStack) + { + return false; + } //Override me please! public int getPartAmount () @@ -896,9 +895,9 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox { return true; } - + @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack par1ItemStack, int pass) + public boolean hasEffect (ItemStack par1ItemStack, int pass) { return false; } diff --git a/tconstruct/library/util/Trait.java b/tconstruct/library/util/Trait.java index 3891303d..bbd07193 100644 --- a/tconstruct/library/util/Trait.java +++ b/tconstruct/library/util/Trait.java @@ -11,7 +11,7 @@ public class Trait protected int[] alleles; static Random rand = new Random(); String traitName; - + public Trait(String name, NBTTagCompound tags) { traitName = name; @@ -43,8 +43,8 @@ public class Trait } } } - - public Trait setName(String name) + + public Trait setName (String name) { this.traitName = name; return this; @@ -64,8 +64,8 @@ public class Trait return average; } - - public Trait breed(byte[] other, float mutationChance, float mutationVariance) + + public Trait breed (byte[] other, float mutationChance, float mutationVariance) { int[] newAlleles = breedNumbers(other, mutationChance, mutationVariance); Trait trait = new Trait(newAlleles).setName(this.traitName); @@ -110,14 +110,14 @@ public class Trait return mutator; } - - public void saveToNBT(NBTTagCompound tags) + + public void saveToNBT (NBTTagCompound tags) { - tags.setIntArray(traitName+".Alleles", alleles); + tags.setIntArray(traitName + ".Alleles", alleles); } - - public void loadFromNBT(NBTTagCompound tags) + + public void loadFromNBT (NBTTagCompound tags) { - alleles = tags.getIntArray(traitName+".Alleles"); + alleles = tags.getIntArray(traitName + ".Alleles"); } } diff --git a/tconstruct/modifiers/ModAttack.java b/tconstruct/modifiers/ModAttack.java index c9dff0f0..bc00ee4d 100644 --- a/tconstruct/modifiers/ModAttack.java +++ b/tconstruct/modifiers/ModAttack.java @@ -6,7 +6,6 @@ import java.util.List; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.ToolMod; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tconstruct/modifiers/ModBlaze.java b/tconstruct/modifiers/ModBlaze.java index c5da23b8..bea3683e 100644 --- a/tconstruct/modifiers/ModBlaze.java +++ b/tconstruct/modifiers/ModBlaze.java @@ -6,7 +6,6 @@ import java.util.List; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.ToolMod; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tconstruct/modifiers/ModButtertouch.java b/tconstruct/modifiers/ModButtertouch.java index 82815243..e4b40396 100644 --- a/tconstruct/modifiers/ModButtertouch.java +++ b/tconstruct/modifiers/ModButtertouch.java @@ -7,7 +7,6 @@ import java.util.Map; import tconstruct.library.tools.ToolCore; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; diff --git a/tconstruct/modifiers/ModElectric.java b/tconstruct/modifiers/ModElectric.java index a697a6f8..309be061 100644 --- a/tconstruct/modifiers/ModElectric.java +++ b/tconstruct/modifiers/ModElectric.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import tconstruct.library.tools.ToolCore; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tconstruct/modifiers/ModLapis.java b/tconstruct/modifiers/ModLapis.java index 685b2526..1ac6b3fe 100644 --- a/tconstruct/modifiers/ModLapis.java +++ b/tconstruct/modifiers/ModLapis.java @@ -9,7 +9,6 @@ import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.ToolMod; import tconstruct.library.tools.Weapon; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; diff --git a/tconstruct/modifiers/ModPiston.java b/tconstruct/modifiers/ModPiston.java index 10e22a3f..473a3efa 100644 --- a/tconstruct/modifiers/ModPiston.java +++ b/tconstruct/modifiers/ModPiston.java @@ -6,7 +6,6 @@ import java.util.List; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.ToolMod; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tconstruct/modifiers/ModRedstone.java b/tconstruct/modifiers/ModRedstone.java index e9fadd33..53d4b8ba 100644 --- a/tconstruct/modifiers/ModRedstone.java +++ b/tconstruct/modifiers/ModRedstone.java @@ -6,7 +6,6 @@ import java.util.List; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.ToolMod; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tconstruct/util/PHConstruct.java b/tconstruct/util/PHConstruct.java index 835b4f8a..8fa2cd4c 100644 --- a/tconstruct/util/PHConstruct.java +++ b/tconstruct/util/PHConstruct.java @@ -146,14 +146,14 @@ public class PHConstruct punji = config.getBlock("Punji", 3232).getInt(3232); woodCrafter = config.getBlock("Crafting Station", 3233).getInt(3233); essenceExtractor = config.getBlock("Essence Extractor", 3234).getInt(3234); - + slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235); slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237); slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238); slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239); slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240); slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241); - + meatBlock = config.getBlock("Meat Block", 3242).getInt(3242); woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243); woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244); @@ -343,7 +343,7 @@ public class PHConstruct worldBorderSize = config.get("Ultra Hardcore Changes", "World Border Radius", 1000).getInt(1000); freePatterns = config.get("Ultra Hardcore Changes", "Add Patterns to Pattern Chests", false, "Gives all tier 1 patterns when pattern chest is placed").getBoolean(false); necroticUHS = config.get("Ultra Hardcore Changes", "Necrotic modifier only heals on hostile mob kills", false).getBoolean(false); - + //Slime pools islandRarity = config.get("Worldgen", "Slime Island Rarity", 450).getInt(450); @@ -374,7 +374,7 @@ public class PHConstruct public static int heldItemBlock; public static int woodCrafter; public static int woodCrafterSlab; - + public static int ores; public static int lavaTank; public static int smeltery; diff --git a/tconstruct/util/TEventHandler.java b/tconstruct/util/TEventHandler.java index ac00f913..beb4bbd1 100644 --- a/tconstruct/util/TEventHandler.java +++ b/tconstruct/util/TEventHandler.java @@ -501,7 +501,7 @@ public class TEventHandler Crystallinity.theftValue.remove(coord); } } - + if (Crystallinity.charge.containsKey(coord)) { CrystalValues crystal = Crystallinity.charge.get(coord); @@ -512,9 +512,8 @@ public class TEventHandler } } } - - /* Bonemeal */ + /* Bonemeal */ @ForgeSubscribe public void bonemealEvent (BonemealEvent event) @@ -1437,7 +1436,7 @@ public class TEventHandler { Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 0, 400, new FluidStack(TContent.moltenShinyFluid, TConstruct.ingotLiquidValue)); } - + ores = OreDictionary.getOres("dustInvar"); for (ItemStack ore : ores) { diff --git a/tconstruct/util/network/TPacketHandler.java b/tconstruct/util/network/TPacketHandler.java index e7bd562d..954af76c 100644 --- a/tconstruct/util/network/TPacketHandler.java +++ b/tconstruct/util/network/TPacketHandler.java @@ -121,7 +121,7 @@ public class TPacketHandler implements IPacketHandler break; } } - + else if (packetID == 5) //Drawbridge { int dimension = inputStream.readInt(); diff --git a/tconstruct/util/player/ArmorExtendedClient.java b/tconstruct/util/player/ArmorExtendedClient.java index c08e7b8b..9e9b95e6 100644 --- a/tconstruct/util/player/ArmorExtendedClient.java +++ b/tconstruct/util/player/ArmorExtendedClient.java @@ -1,6 +1,5 @@ package tconstruct.util.player; - public class ArmorExtendedClient extends ArmorExtended { /*public void recalculateSkills(EntityPlayer player, TPlayerStats stats) diff --git a/tconstruct/util/player/FakePlayerLogic.java b/tconstruct/util/player/FakePlayerLogic.java index 2e9c2392..bcc9e76b 100644 --- a/tconstruct/util/player/FakePlayerLogic.java +++ b/tconstruct/util/player/FakePlayerLogic.java @@ -8,13 +8,14 @@ import tconstruct.library.blocks.InventoryLogic; public class FakePlayerLogic extends FakePlayer { InventoryLogic logic; + public FakePlayerLogic(World world, String name, InventoryLogic logic) { super(world, name); this.logic = logic; } - public ChunkCoordinates getPlayerCoordinates() + public ChunkCoordinates getPlayerCoordinates () { return new ChunkCoordinates(logic.xCoord, logic.yCoord, logic.zCoord); } diff --git a/tconstruct/util/player/TPlayerHandler.java b/tconstruct/util/player/TPlayerHandler.java index 8ece5502..d872b258 100644 --- a/tconstruct/util/player/TPlayerHandler.java +++ b/tconstruct/util/player/TPlayerHandler.java @@ -81,7 +81,7 @@ public class TPlayerHandler implements IPlayerTracker entityplayer.addChatMessage("Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct."); } } - + updatePlayerInventory(entityplayer, stats); }