diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index f7e39258..d7b95f1a 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -119,6 +119,7 @@ tile.cloth.red.slab.name=Red Wool Slab tile.cloth.black.slab.name=Black Wool Slab tile.GlueBlock.name=Glue Block +tile.liquid.glue.name=Glue item.oreberry.iron.name=Iron Oreberry item.oreberry.gold.name=Gold Oreberry @@ -244,6 +245,7 @@ item.tconstruct.Materials.AlumiteNugget.name=Alumite Nugget item.tconstruct.Materials.SteelNugget.name=Steel Nugget item.tconstruct.Materials.PigIronIngot.name=Pig Iron Ingot item.tconstruct.Materials.PigIronNugget.name=Pig Iron Platter +item.tconstruct.Materials.GlueBall.name=Ball of Glue item.tconstruct.ArmorPattern.helmet.name=Helmet Cast item.tconstruct.ArmorPattern.chestplate.name=Chestplate Cast @@ -414,6 +416,7 @@ item.tconstruct.bucket.Electrum.name=Molten Electrum Bucket item.tconstruct.bucket.Ender.name=Liquified Ender Bucket item.tconstruct.bucket.Slime.name=Liquid Slime Bucket item.tconstruct.bucket.PigIron.name=Molten Pig Iron Bucket +item.tconstruct.bucket.Glue.name=Sticky Glue Bucket item.tconstruct.bowstring.string.name=Bowstring item.tconstruct.bowstring.enchantedfabriI donc.name=Enchanted Bowstring @@ -590,4 +593,59 @@ achievement.tconstruct.preparedFight.desc=Create your first weapon achievement.tconstruct.enemySlayer.desc=Slay a mob achievement.tconstruct.dualConvenience.desc=Kill a mob with a frying pan, and then cook their meat in it -searedtank.tooltip=Keeps any fluids it has when harvested +knapsack.tooltip=A Knapsack to hold your things. +strangefood1.tooltip=\u00a7b\u00a7oIt smells terrible, but if you= +strangefood2.tooltip=\u00a7b\u00a7ohave nothing else to eat...= +hambone1.tooltip=\u00A74Hambone! +hambone2.tooltip=Usable for Beacon bases +metalblock.tooltip=Usable for Beacon bases +craftedsoil1.tooltip=Heals Undead +craftedsoil2.tooltip=Harmful to Undead +fancybrick1.tooltip=Somewhat expensive +fancybrick2.tooltip=Quite expensive +fancybrick3.tooltip=Emits Redstone signal up to +fancybrick4.tooltip=4 blocks away +fancybrick4.tooltip=Bouncy! +brick1.tooltip=Somewhat expensive +brick2.tooltip=Quite expensive +brick3.tooltip=Emits Redstone signal up to +brick4.tooltip=4 blocks away +brick4.tooltip=Bouncy! +craftedsoil.slab1.tooltip=Heals Undead +craftedsoil.slab2.tooltip=Harmful to Undead +speedblock1.tooltip=You run pretty fast on it +speedblock2.tooltip=You run a bit faster on it +speedblock.slab1.tooltip=You run pretty fast on it +speedblock.slab2.tooltip=You run a bit faster on it +manual1.tooltip=\u00a7oBy: Skyla +manual2.tooltip=\u00a7oBy: Skyla +manual3.tooltip=\u00a7oBy: Thruul M'gon +searedtank1.tooltip=Contains +searedtank2.tooltip=Keeps any fluids it has when harvested +oreberries1.tooltip=Sweet Irony +oreberries2.tooltip=Pure Luster +oreberries3.tooltip=Tastes like metal +oreberries4.tooltip=Tin Man +oreberries5.tooltip=White Chocolate +oreberries6.tooltip=Tastes like Creeper +hearthcanister1.tooltip=Crafting Item +hearthcanister2.tooltip=Crafting Item +hearthcanister3.tooltip=Part of low-level Heart Canisters +hearthcanister4.tooltip=Accessory +hearthcanister5.tooltip=Permanent health increase +landmine1.tooltip=everything +landmine2.tooltip=mobs, players and redstone +landmine3.tooltip=players and redstone +landmine4.tooltip=redstone only +goldenhead1.tooltip=\u00a75\u00a7oSome say consuming the head of a +goldenhead2.tooltip=\u00a75\u00a7ofallen foe strengthens the blood +oreberrybush1.tooltip=Sweet Irony +oreberrybush2.tooltip=Pure Luster +oreberrybush3.tooltip=Tastes like metal +oreberrybush4.tooltip=Tin Man +oreberrybush5.tooltip=White Chocolate +oreberrybush6.tooltip=Tastes like Creeper +barricade.tooltip=Stacks up to 4 times +pattern1.tooltip=Material Cost: +pattern2.tooltip=Material Cost: +potionlauncher.tooltip=Test Item diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index 0562e0fb..c20dcb10 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -118,6 +118,9 @@ tile.cloth.green.slab.name=Lastra di Lana Verde tile.cloth.red.slab.name=Lastra di Lana Rossa tile.cloth.black.slab.name=Lastra di Lana Nera +tile.GlueBlock.name=Blocco di Colla +tile.liquid.glue.name=Colla + item.oreberry.iron.name=Baccagrezza di Ferro item.oreberry.gold.name=Baccagrezza d'Oro item.oreberry.copper.name=Baccagrezza di Rame @@ -204,6 +207,7 @@ item.tconstruct.MetalPattern.bowstring.name=Stampo per Corda d'Arco item.tconstruct.MetalPattern.fletching.name=Stampo per Testa di Freccia item.tconstruct.MetalPattern.arrowhead.name=Stampo per Impennaggio item.tconstruct.MetalPattern.ingot.name=Stampo per Lingotti +item.tconstruct.MetalPattern.gem.name=Stampo per Gemma item.tconstruct.Materials.PaperStack.name=Pila di Carta item.tconstruct.Materials.SlimeCrystal.name=Cristallo di Slime @@ -241,6 +245,7 @@ item.tconstruct.Materials.AlumiteNugget.name=Pepita di Alumite item.tconstruct.Materials.SteelNugget.name=Pepita d'Acciaio item.tconstruct.Materials.PigIronIngot.name=Lingotto di Ferro Suino item.tconstruct.Materials.PigIronNugget.name=Piatto di Ferro Suino +item.tconstruct.Materials.GlueBall.name=Palla di Colla item.tconstruct.helmetWood.name=Elmo di Legno item.tconstruct.chestplateWood.name=Corazza di Legno @@ -411,6 +416,7 @@ item.tconstruct.bucket.Electrum.name=Secchio di Elettro Fuso item.tconstruct.bucket.Ender.name=Secchio di Ender Liquefatto item.tconstruct.bucket.Slime.name=Secchio di Slime Liquido item.tconstruct.bucket.PigIron.name==Secchio di Ferro Suino Fuso +item.tconstruct.bucket.Glue.name=Secchio di Colla Appiccicosa item.tconstruct.bowstring.string.name=Corda d'Arco item.tconstruct.bowstring.enchantedfabriI donc.name=Corda d'Arco Incantato @@ -587,4 +593,59 @@ achievement.tconstruct.preparedFight.desc=Crea la tua prima arma achievement.tconstruct.enemySlayer.desc=Uccidi un mob achievement.tconstruct.convenientDuo=Uccidi un mob con una padella, e cuoci la sua carne in questa -searedtank.tooltip=Tiene ogni fluido quando raccolto +knapsack.tooltip=Uno Zaino per tenere le tue cosse. +strangefood1.tooltip=\u00a7b\u00a7opuzza terribimente, ma se= +strangefood2.tooltip=\u00a7b\u00a7onon hai nient'altro da mangiare...= +hambone1.tooltip=\u00A74Hambone! +hambone2.tooltip=Usabile come base per il Faro +metalblock.tooltip=Usabile come base per il Faro +craftedsoil1.tooltip=Cura i non-morti +craftedsoil2.tooltip=Doloroso per i non-morti +fancybrick1.tooltip=In qualche modo costoso +fancybrick2.tooltip=Abbastanza costoso +fancybrick3.tooltip=Emette un segnale di pietrarossa +fancybrick4.tooltip=fino a 4 blocchi +fancybrick4.tooltip=Rimbalzante! +brick1.tooltip=In qualche modo costoso +brick2.tooltip=Abbastanza costoso +brick3.tooltip=Emette un segnale di pietrarossa +brick4.tooltip=fino a 4 blocchi +brick4.tooltip=Rimbalzante! +craftedsoil.slab1.tooltip=Cura i non-morti +craftedsoil.slab2.tooltip=Doloroso per i non-morti +speedblock1.tooltip=Corri abbastanza velocemente su questo +speedblock2.tooltip=Corri un po' più velocemente su questo +speedblock.slab1.tooltip=Corri abbastanza velocemente su questo +speedblock.slab2.tooltip=Corri un po' più velocemente su questo +manual1.tooltip=\u00a7oDi: Skyla +manual2.tooltip=\u00a7oDi: Skyla +manual3.tooltip=\u00a7oDi: Thruul M'gon +searedtank1.tooltip=Contiene +searedtank2.tooltip=Tiene ogni fluido quando raccolto +oreberries1.tooltip=Dolce Ferro +oreberries2.tooltip=Puro Lustro +oreberries3.tooltip=Sa di metallo +oreberries4.tooltip=Uomo di Latta +oreberries5.tooltip=Cioccolato Bianco +oreberries6.tooltip=Ha il sapore di un Creeper +hearthcanister1.tooltip=Oggetto per Crafting +hearthcanister2.tooltip=Oggetto per Crafting +hearthcanister3.tooltip=Parte di un Contenitore di Cuori di basso livello +hearthcanister4.tooltip=Accessorio +hearthcanister5.tooltip=Aumento di vita permamente +landmine1.tooltip=tutto +landmine2.tooltip=mob, giocatori e pietrarossa +landmine3.tooltip=giocatori e pietrarossa +landmine4.tooltip=solo pietrarossa +goldenhead1.tooltip=\u00a75\u00a7oQualcuno di che mangiando la testa di un +goldenhead2.tooltip=\u00a75\u00a7onemico caduto rinforza il sangue +oreberrybush1.tooltip=Dolce Ferro +oreberrybush2.tooltip=Puro Lustro +oreberrybush3.tooltip=Ha il gusto di metallo +oreberrybush4.tooltip=Uomo di Latta +oreberrybush5.tooltip=Cioccolato Bianco +oreberrybush6.tooltip=Ha il sapore di un Creeper +barricade.tooltip=Stacks up to 4 times +pattern1.tooltip=Costo di Materiale: +pattern2.tooltip=Costo di Materiale: +potionlauncher.tooltip=Oggetto di prova diff --git a/resources/assets/tinker/lang/ru_RU.lang b/resources/assets/tinker/lang/ru_RU.lang index fd080f7f..5a2d7846 100644 --- a/resources/assets/tinker/lang/ru_RU.lang +++ b/resources/assets/tinker/lang/ru_RU.lang @@ -16,6 +16,7 @@ ToolStation.Parts.name=Создатель деталей ToolStation.PatternChest.name=Сундук со схемами ToolStation.PatternShaper.name=Трафаретный стол ToolStation.CastingTable.name=Литейный стол +tile.FurnaceSlab.name=Плита печки tile.ToolForge.name=Инструментальная кузница tile.Armor.DryingRack.name=Штатив для сушки @@ -24,8 +25,11 @@ CraftedSoil.Grout.name=Осадок CraftedSoil.BlueSlime.name=Слизистая грязь CraftedSoil.GraveyardSoil.name=Кладбищенская почва CraftedSoil.ConsecratedSoil.name=Священная почва +tile.CastingChannel.name=Разливочный канал +tile.slime.channel.name=Сточная слизь +tile.slime.pad.name=Прыжковая панель -MetalOre.NetherSlag.name=Адская окалина +MetalOre.NetherSlag.name=Окалина Нижнего мира MetalOre.Cobalt.name=Кобальтовая руда MetalOre.Ardite.name=Ардитовая руда MetalOre.Copper.name=Медная руда @@ -65,17 +69,17 @@ block.brownstone.smooth.chiseled.slab.name=Плита из резного бур block.brick.obsidian.name=Обсидиановый кирпич block.brick.sandstone.name=Песчаный кирпич -block.brick.netherrack.name=Адский кирпич +block.brick.netherrack.name=Кирпич Нижнего мира block.brick.iron.name=Железный кирпич block.brick.gold.name=Золотой кирпич block.brick.diamond.name=Алмазный кирпич block.brick.lapis.name=Лазуритовый кирпич block.brick.stone.refined.name=Кирпич из отполированного камня -block.brick.redstone.name=Редстоун кирпич +block.brick.redstone.name=Красный кирпич block.brick.bone.name=Костяной кирпич block.brick.slime.name=Слизистый кирпич block.brick.blueslime.name=Слизистый кирпич -block.brick.endstone.name=Кирпич из камня края +block.brick.endstone.name=Кирпич из камня Края block.brick.obsidian.ingot.name=Обсидиановый кирпич block.fancybrick.obsidian.name=Красивый обсидиановый кирпич @@ -86,7 +90,7 @@ block.fancybrick.gold.name=Красивый золотой кирпич block.fancybrick.diamond.name=Красивый алмазный кирпич block.fancybrick.lapis.name=Красивый лазуритовый кирпич block.fancybrick.stone.refined.name=Кирпич из красивого отполированного камня -block.fancybrick.redstone.name=Кирпич из красивого редстоуна +block.fancybrick.redstone.name=Кирпич из красивого красного камня block.fancybrick.bone.name=Красивый костяной кирпич block.fancybrick.slime.name=Красивый слизистый кирпич block.fancybrick.blueslime.name=Красивый слизистый кирпич @@ -95,6 +99,8 @@ block.fancybrick.obsidian.ingot.name=Красивый обсидиановый block.fancybrick.stone.road.name=Каменная дорого block.fancybrick.stone.name=Кирпич из красивого камня +tile.rail.wood.name=Деревянные рельсы + tile.cloth.white.slab.name=Плита из шерсти tile.cloth.orange.slab.name=Плита из оранжевой шерсти tile.cloth.magenta.slab.name=Плита из сиреневой шерсти @@ -112,6 +118,9 @@ tile.cloth.green.slab.name=Плита из зелёной шерсти tile.cloth.red.slab.name=Плита из красной шерсти tile.cloth.black.slab.name=Плита из чёрной шерсти +tile.GlueBlock.name=Блок клея +tile.liquid.glue.name=Клей + item.oreberry.iron.name=Кусочки железа item.oreberry.gold.name=Кусочки золота item.oreberry.copper.name=Кусочки меди @@ -120,16 +129,72 @@ item.oreberry.aluminum.name=Кусочки алюминия item.oreberry.essence.name=Кусочки концентрированной эссенции item.goldenhead.name=Золотистая голова -item.tconstruct.titleicon.name=Spawn +item.tconstruct.titleicon.name=Призвать существо - + +item.tconstruct.Pattern.blank_pattern.name=Пустая схема +item.tconstruct.Pattern.rod.name=Схема стержня инструмента +item.tconstruct.Pattern.pickaxe.name=Схема головки кирки +item.tconstruct.Pattern.shovel.name=Схема головки лопаты +item.tconstruct.Pattern.axe.name=Схема головки топора +item.tconstruct.Pattern.swordblade.name=Схема лезвия меча +item.tconstruct.Pattern.largeguard.name=Wide Guard Pattern +item.tconstruct.Pattern.mediumguard.name=Hand Guard Pattern +item.tconstruct.Pattern.crossbar.name=Crossbar Pattern +item.tconstruct.Pattern.binding.name=Схема связующего звена инструмента +item.tconstruct.Pattern.frypan.name=Схема сковороды +item.tconstruct.Pattern.sign.name=Wide Board Pattern +item.tconstruct.Pattern.knifeblade.name=Схема лезвия ножа +item.tconstruct.Pattern.chisel.name=Схема головки зубила +item.tconstruct.Pattern.largerod.name=Схема прочного стержня +item.tconstruct.Pattern.toughbinding.name=Схема прочного связующего звена +item.tconstruct.Pattern.largeplate.name=Large Plate Pattern +item.tconstruct.Pattern.broadaxe.name=Broadaxe Head Pattern +item.tconstruct.Pattern.scythe.name=Схема головки косы +item.tconstruct.Pattern.excavator.name=Схема головки землекопалки +item.tconstruct.Pattern.largeblade.name=Схема большого лезвия +item.tconstruct.Pattern.hammerhead.name=Схема головки молотка +item.tconstruct.Pattern.fullguard.name=Full Guard Pattern +item.tconstruct.Pattern.bowstring.name=Схема тетивы +item.tconstruct.Pattern.fletching.name=Схема оперения +item.tconstruct.Pattern.arrowhead.name=Схема наконечника + +item.tconstruct.Pattern.blank_cast.name=Пустой слепок +item.tconstruct.MetalPattern.rod.name=Слепок стержня инструмента +item.tconstruct.MetalPattern.pickaxe.name=Слепок головки кирки +item.tconstruct.MetalPattern.shovel.name=Слепок головки лопаты +item.tconstruct.MetalPattern.axe.name=Слепок головки топора +item.tconstruct.MetalPattern.swordblade.name=Слепок лезвия меча +item.tconstruct.MetalPattern.largeguard.name=Wide Guard Cast +item.tconstruct.MetalPattern.mediumguard.name=Hand Guard Cast +item.tconstruct.MetalPattern.crossbar.name=Crossbar Cast +item.tconstruct.MetalPattern.binding.name=Слепок связующего звена инструмента +item.tconstruct.MetalPattern.frypan.name=Слепок сковороды +item.tconstruct.MetalPattern.sign.name=Wide Board Cast +item.tconstruct.MetalPattern.knifeblade.name=Слепок лезвия ножа +item.tconstruct.MetalPattern.chisel.name=Слепок головки зубила +item.tconstruct.MetalPattern.largerod.name=Слепок прочного стержня +item.tconstruct.MetalPattern.toughbinding.name=Слепок прочного связующего звена +item.tconstruct.MetalPattern.largeplate.name=Large Plate Cast +item.tconstruct.MetalPattern.broadaxe.name=Broadaxe Head Cast +item.tconstruct.MetalPattern.scythe.name=Слепок головки косы +item.tconstruct.MetalPattern.excavator.name=Слепок головки землекопалки +item.tconstruct.MetalPattern.largeblade.name=Слепок большого лезвия +item.tconstruct.MetalPattern.hammerhead.name=Слепок головки молотка +item.tconstruct.MetalPattern.fullguard.name=Full Guard Cast +item.tconstruct.MetalPattern.bowstring.name=Слепок тетивы +item.tconstruct.MetalPattern.fletching.name=Слепок оперения +item.tconstruct.MetalPattern.arrowhead.name=Слепок наконечника +item.tconstruct.MetalPattern.ingot.name=Слепок слитка +item.tconstruct.MetalPattern.gem.name=Слепок жемчужины item.tconstruct.Materials.PaperStack.name=Кучка бумаги -item.tconstruct.Materials.SlimeCrystal.name=Кристалл слизи +item.tconstruct.Materials.SlimeCrystal.name=Слизистый кристалл item.tconstruct.Materials.SearedBrick.name=Обожжённый кирпич item.tconstruct.Materials.CobaltIngot.name=Кобальтовый слиток item.tconstruct.Materials.ArditeIngot.name=Ардитовый слиток item.tconstruct.Materials.ManyullynIngot.name=Мануллиновый слиток item.tconstruct.Materials.Mossball.name=Шарик мха -item.tconstruct.Materials.LavaCrystal.name=Кристалл лавы +item.tconstruct.Materials.LavaCrystal.name=Лавовый кристалл item.tconstruct.Materials.NecroticBone.name=Некротическая кость item.tconstruct.Materials.CopperIngot.name=Медный слиток item.tconstruct.Materials.TinIngot.name=Оловянный слиток @@ -139,7 +204,7 @@ item.tconstruct.Materials.BronzeIngot.name=Бронзовый слиток item.tconstruct.Materials.AluBrassIngot.name=Слиток алюминиевой латуни item.tconstruct.Materials.AlumiteIngot.name=Алюмитовый слиток item.tconstruct.Materials.SteelIngot.name=Стальной слиток -item.tconstruct.Materials.BlueSlimeCrystal.name=Кристалл слизи +item.tconstruct.Materials.BlueSlimeCrystal.name=Слизистый кристалл item.tconstruct.Materials.ObsidianIngot.name=Обсидиановый слиток item.tconstruct.Materials.IronNugget.name=Железный самородок item.tconstruct.Materials.CopperNugget.name=Медный самородок @@ -156,8 +221,26 @@ item.tconstruct.Materials.ManyullynNugget.name=Мануллиновый само item.tconstruct.Materials.BronzeNugget.name=Бронзовый самородок item.tconstruct.Materials.AlumiteNugget.name=Алюмитовый самородок item.tconstruct.Materials.SteelNugget.name=Кусочек стали +item.tconstruct.Materials.PigIronIngot.name=Чугунный слиток +item.tconstruct.Materials.PigIronNugget.name=Чугунная тарелка +item.tconstruct.Materials.GlueIngot.name=Слиток клея -item.tconstruct.crystal.essence.name=Кристалл эссенции +item.tconstruct.ArmorPattern.helmet.name=Слепок шлема +item.tconstruct.ArmorPattern.chestplate.name=Слепок кирасы +item.tconstruct.ArmorPattern.leggings.name=Слепок понож +item.tconstruct.ArmorPattern.boots.name=Слепок ботинок + +item.tconstruct.helmetWood.name=Деревянный шлем +item.tconstruct.chestplateWood.name=Деревянная кираса +item.tconstruct.leggingsWood.name=Деревянные поножи +item.tconstruct.bootsWood.name=Деревянные ботинки + +item.tconstruct.jerky.beef.name=Вяленая говядина +item.tconstruct.jerky.pig.name=Вяленый бекон +item.tconstruct.jerky.chicken.name=Вяленая курятина +item.tconstruct.jerky.sheep.name=Вяленая баранина +item.tconstruct.jerky.fish.name=Вяленая рыбка +item.tconstruct.jerky.zombie.name=Вяленый монстр Smeltery.Controller.name=Контроллер плавильни Smeltery.Drain.name=Водосток плавильни @@ -170,18 +253,20 @@ Smeltery.Road.name=Обожжённая дорога Smeltery.Brick.Fancy.name=Красивые обожжённые кирпичи Smeltery.Brick.Square.name=Резные обожжённые кирпичи Smeltery.Brick.Creeper.name=Резные обожжённые кирпичи +Smeltery.Channel.name=Разливочный канал LavaTank.Tank.name=Обожжённый резервуар LavaTank.Gague.name=Обожжённое стекло LavaTank.Window.name=Обожжённое окно -tile.landmine.name=Фугас +tile.landmine.name=Мина + tile.trap.punji.name=Колышек tile.trap.barricade.oak.name=Баррикада из дуба tile.trap.barricade.spruce.name=Баррикада из ели tile.trap.barricade.birch.name=Баррикада из берёзы tile.trap.barricade.jungle.name=Баррикада из тропического дерева -tile.extractor.essence.name=Экстрактор эссенции +tile.explosive.slime.name=SDX StorageMetals.Cobalt.name=Кобальтовый блок StorageMetals.Ardite.name=Ардитовый блок @@ -193,10 +278,11 @@ StorageMetals.Aluminum.name=Алюминиевый блок StorageMetals.AlBrass.name=Блок алюминиевой латуни StorageMetals.Alumite.name=Алюмитовый блок StorageMetals.Steel.name=Стальной блок -StorageMetals.Ender.name=Блок твёрдого эндера +StorageMetals.Ender.name=Блок твёрдого камня Края tile.decoration.stonetorch.name=Факел -tile.CraftingStation.name=Станция крафта +tile.decoration.stoneladder.name=Лестница +tile.CraftingStation.name=Станция создания block.glass.pure.name=Чистое стекло block.glass.soul.name=Душевное стекло @@ -258,7 +344,7 @@ block.soil.slab.graveyardsoil.name=Плита из кладбищенской п block.soil.slab.consecratedsoil.name=Плита из священной почвы block.slime.soil.blue.name=Земля из синей слизи -block.slime.leaves.blue.name=Листва слизи +block.slime.leaves.blue.name=Слизистая листва block.slime.sapling.bluegreen.name=Слизистый саженец block.slime.grass.blue.name=Слизистая трава block.slime.grass.dirt.name=Слизистая трава @@ -268,14 +354,15 @@ block.slime.congealed.green.name=Застывшая зелёная слизь item.tconstruct.storage.knapsack.name=Ранец item.tconstruct.blankpattern.pattern.name=Пустая схема -item.tconstruct.blankpattern.cast.name=Чистый чугун +item.tconstruct.blankpattern.cast.name=Пустой слепок item.tconstruct.Bowstring.string.name=Тетива item.tconstruct.Bowstring.enchantedfabric.name=Зачарованная тетива -item.tconstruct.Fletching.feather.name=Feather Fletching -item.tconstruct.Fletching.leaf.name=Leaf Fletching -item.tconstruct.Fletching.slime.name=Slime Fletching -item.tconstruct.Fletching.blueslime.name=Slime Fletching +item.tconstruct.Bowstring.flamestring.name=Огненная тетива +item.tconstruct.Fletching.feather.name=Перьевое оперение +item.tconstruct.Fletching.leaf.name=Листовое оперение +item.tconstruct.Fletching.slime.name=Слизистое оперение +item.tconstruct.Fletching.blueslime.name=Слизистое оперение item.tconstruct.manual.beginner.name=Материалы и Вы item.tconstruct.manual.toolstation.name=Материалы и Вы @@ -304,8 +391,10 @@ item.tconstruct.bucket.Silver.name=Ведро расплавленного се item.tconstruct.bucket.Shiny.name=Ведро расплавленного блеска item.tconstruct.bucket.Invar.name=Ведро расплавленного инвара item.tconstruct.bucket.Electrum.name=Ведро расплавленного электрума -item.tconstruct.bucket.Ender.name=Ведро сжиженного эндера +item.tconstruct.bucket.Ender.name=Ведро жидкости Края item.tconstruct.bucket.Slime.name=Ведро жидкой слизи +item.tconstruct.bucket.PigIron.name=Ведро расплавленного чугуна +item.tconstruct.bucket.Glue.name=Ведро липкого клея item.tconstruct.bowstring.string.name=Тетива item.tconstruct.bowstring.enchantedfabriI donc.name=Зачарованная тетива @@ -333,7 +422,33 @@ tile.metal.molten.lead.name=Расплавленный свинец tile.metal.molten.shiny.name=Расплавленный блеск tile.metal.molten.invar.name=Расплавленный инвар tile.metal.molten.Electrum.name=Расплавленный электрум -tile.fluid.ender.name=Сжиженный эндер +tile.fluid.ender.name=Жидкость Края +tile.liquid.slime.name=Сжиженная слизь + +LiquidMetal.Iron.name=Расплавленное железо +LiquidMetal.Gold.name=Расплавленное золото +LiquidMetal.Copper.name=Расплавленная медь +LiquidMetal.Tin.name=Жидкое олово +LiquidMetal.Aluminum.name=Расплавленной алюминий +LiquidMetal.Cobalt.name=Расплавленный кобальт +LiquidMetal.Ardite.name=Расплавленный ардит +LiquidMetal.Bronze.name=Расплавленная бронза +LiquidMetal.AluBrass.name=Расплавленная алюминиевая латунь +LiquidMetal.Manyullyn.name=Расплавленный мануллин +LiquidMetal.Alumite.name=Расплавленный алюмит +LiquidMetal.Obsidian.name=Расплавленный обсидиан +LiquidMetal.Steel.name=Расплавленная сталь +LiquidMetal.Glass.name=Расплавленное стекло +LiquidMetal.Stone.name=Расплавленный обожжённый камень +LiquidMetal.Villager.name=Сжиженный изумруд +LiquidMetal.Cow.name=Кровь +LiquidMetal.Nickel.name=Расплавленный никель +LiquidMetal.Silver.name=Расплавленное серебро +LiquidMetal.Lead.name=Расплавленный свинец +LiquidMetal.Shiny.name=Расплавленный блеск +LiquidMetal.Invar.name=Расплавленный инвар +LiquidMetal.Electrum.name=Расплавленный электрум +LiquidMetal.Ender.name=Жидкость Края item.food.apple.diamond.name=Драгоценное яблоко item.tconstruct.strangefood.edibleslime.name=Желатиновая слизь @@ -348,9 +463,10 @@ SearedBlock.Basin.name=Литейный резервуар entity.TConstruct.EdibleSlime.name=Синий слизень entity.TConstruct.KingSlime.name=Король слизней -entity.TConstruct.Gardeslime.name=Слизень охраник +entity.TConstruct.Gardeslime.name=Слизень охраник +entity.TConstruct.MiniGardy.name=Слизень охраник -key.tarmor=Armor Gui +key.tarmor=Gui брони key.tcapes.reload=Перезагрузить плащи death.one.smeltery=%1$s превратился в зелёный сойлент @@ -358,6 +474,9 @@ death.two.smeltery=%1$s сплавился с плавильней death.three.smeltery=%1$s станет ступенькой в нашей революции! death.four.smeltery=%1$s думал, что купание в горячих жидкостях хорошая идея +death.attack.Landmine=%1$s наблюдал как его ноги взорвались на мине +death.attack.FireworkExplode=%1$s был разорван диким взрывом фейерверка + fluid.iron.molten=Расплавленное железо fluid.gold.molten=Расплавленное золото fluid.copper.molten=Расплавленная медь @@ -378,7 +497,85 @@ fluid.blood=Кровь fluid.nickel.molten=Расплавленный никель fluid.lead.molten=Расплавленный свинец fluid.silver.molten=Расплавленное серебро -fluid.platinum.molten=Расплавленная платина -fluid.invar=Расплавленный инвар fluid.shiny=Расплавленный блеск -fluid.ender=Жидкий эндер +fluid.invar=Расплавленный инвар +fluid.electrum.molten=Расплавленный электрум +fluid.ender=Жидкость Края +fluid.slime.blue=Жидкая синяя слизь +fluid.pigiron.molten=Чугун + +tconstruct.achievementPage.name=TConstruct +achievement.tconstruct.beginner=Learning to Tinker +achievement.tconstruct.pattern=Stencil Worker +achievement.tconstruct.tinkerer=Tinkerer +achievement.tconstruct.proTinkerer=Pro Tinkerer +achievement.tconstruct.smelteryMaker=Создатель плавильни +achievement.tconstruct.preparedFight=К бою готов +achievement.tconstruct.enemySlayer=Убийца врагов +achievement.tconstruct.dualConvenience=Двойное удобство + +achievement.tconstruct.beginner.desc=Откройте руководство "Материалы и Вы" +achievement.tconstruct.pattern.desc=Создайте свой ​​первый пустой шаблон +achievement.tconstruct.tinkerer.desc=Создайте свой первый инструмент +achievement.tconstruct.proTinkerer.desc=Создайте свой первый "tier 2" инструмент +achievement.tconstruct.smelteryMaker.desc=Создайте компонент плавильни +achievement.tconstruct.preparedFight.desc=Создайте своё первое оружие +achievement.tconstruct.enemySlayer.desc=Убейте моба +achievement.tconstruct.dualConvenience.desc=Убийте моба сковородой, а затем приготовьте его мясо на ней + +knapsack.tooltip=Ранец для хранения ваших вещей. +strangefood1.tooltip=\u00a7b\u00a7oПахнет ужасно, но если вам= +strangefood2.tooltip=\u00a7b\u00a7oбольше нечего поесть...= +hambone1.tooltip=\u00A74Hambone! +hambone2.tooltip=Подходит для основания маяка +metalblock.tooltip=Подходит для основания маяка +craftedsoil1.tooltip=Лечит нежить +craftedsoil2.tooltip=Губительно для нежити +fancybrick1.tooltip=Несколько дорогой +fancybrick2.tooltip=Довольно дорогой +fancybrick3.tooltip=Излучает сигнал красн. камня до +fancybrick4.tooltip=4 блоков +fancybrick4.tooltip=Упругий! +brick1.tooltip=Несколько дорогой +brick2.tooltip=Довольно дорогой +brick3.tooltip=Излучает сигнал красн. камня до +brick4.tooltip=4 блоков +brick4.tooltip=Упругий! +craftedsoil.slab1.tooltip=Лечит нежить +craftedsoil.slab2.tooltip=Губительно для нежити +speedblock1.tooltip=Вы бегаете довольно быстро на этом +speedblock2.tooltip=Вы бегаете немного быстрее на этом +speedblock.slab1.tooltip=Вы бегаете довольно быстро на этом +speedblock.slab2.tooltip=Вы бегаете немного быстрее на этом +manual1.tooltip=\u00a7oBy: Skyla +manual2.tooltip=\u00a7oBy: Skyla +manual3.tooltip=\u00a7oBy: Thruul M'gon +searedtank1.tooltip=Содержит +searedtank2.tooltip=Сохраняет любые имеющиеся жидкости, когда собирает их +oreberries1.tooltip=Сладкое железо +oreberries2.tooltip=Чистый блеск +oreberries3.tooltip=На вкус как металл +oreberries4.tooltip=Оловянный человек +oreberries5.tooltip=Белый шоколад +oreberries6.tooltip=На вкус как крипер +hearthcanister1.tooltip=Crafting Item +hearthcanister2.tooltip=Crafting Item +hearthcanister3.tooltip=Часть низкоуровневых лечащих жестяных коробок +hearthcanister4.tooltip=Аксессуар +hearthcanister5.tooltip=Постоянное увеличение здоровья +landmine1.tooltip=со всем +landmine2.tooltip=мобами, игроками и красным камнем +landmine3.tooltip=игроками и красным камнем +landmine4.tooltip=только с красным камнем +goldenhead1.tooltip=\u00a75\u00a7oНекоторые говорят, что употребление головы +goldenhead2.tooltip=\u00a75\u00a7oпавшего врага укрепляет кровь +oreberrybush1.tooltip=Сладкое железо +oreberrybush2.tooltip=Чистый блеск +oreberrybush3.tooltip=На вкус как металл +oreberrybush4.tooltip=Оловянный человек +oreberrybush5.tooltip=Белый шоколад +oreberrybush6.tooltip=На вкус как крипер +barricade.tooltip=Stacks up to 4 times +pattern1.tooltip=Material Cost: +pattern2.tooltip=Material Cost: +potionlauncher.tooltip=Тестовый предмет diff --git a/resources/assets/tinker/textures/blocks/liquid_glue.png b/resources/assets/tinker/textures/blocks/liquid_glue.png new file mode 100644 index 00000000..75592501 Binary files /dev/null and b/resources/assets/tinker/textures/blocks/liquid_glue.png differ diff --git a/resources/assets/tinker/textures/blocks/liquid_glue.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_glue.png.mcmeta new file mode 100644 index 00000000..4f0718ac --- /dev/null +++ b/resources/assets/tinker/textures/blocks/liquid_glue.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/resources/assets/tinker/textures/blocks/liquid_glue_flow.png b/resources/assets/tinker/textures/blocks/liquid_glue_flow.png new file mode 100644 index 00000000..3588a77d Binary files /dev/null and b/resources/assets/tinker/textures/blocks/liquid_glue_flow.png differ diff --git a/resources/assets/tinker/textures/blocks/liquid_glue_flow.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_glue_flow.png.mcmeta new file mode 100644 index 00000000..4f0718ac --- /dev/null +++ b/resources/assets/tinker/textures/blocks/liquid_glue_flow.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/resources/assets/tinker/textures/items/materials/bucket_glue.png b/resources/assets/tinker/textures/items/materials/bucket_glue.png new file mode 100644 index 00000000..ddc29bea Binary files /dev/null and b/resources/assets/tinker/textures/items/materials/bucket_glue.png differ diff --git a/resources/assets/tinker/textures/items/materials/material_glueball.png b/resources/assets/tinker/textures/items/materials/material_glueball.png new file mode 100644 index 00000000..35a0b6b8 Binary files /dev/null and b/resources/assets/tinker/textures/items/materials/material_glueball.png differ diff --git a/src/main/java/tconstruct/blocks/BloodBlock.java b/src/main/java/tconstruct/blocks/BloodBlock.java index ef5511c0..038e003a 100644 --- a/src/main/java/tconstruct/blocks/BloodBlock.java +++ b/src/main/java/tconstruct/blocks/BloodBlock.java @@ -20,8 +20,8 @@ public class BloodBlock extends TConstructFluid { if (entity instanceof EntityLivingBase) { - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 200, 0)); - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 20*10, 4)); + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20*15, 0)); + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 20*5, 1)); } } } diff --git a/src/main/java/tconstruct/blocks/GlueFluid.java b/src/main/java/tconstruct/blocks/GlueFluid.java new file mode 100644 index 00000000..f7ad3d8a --- /dev/null +++ b/src/main/java/tconstruct/blocks/GlueFluid.java @@ -0,0 +1,65 @@ +package tconstruct.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.fluids.BlockFluidFinite; +import net.minecraftforge.fluids.Fluid; + +public class GlueFluid extends BlockFluidFinite { + + Icon stillIcon; + Icon flowIcon; + + public GlueFluid(int id, Fluid fluid, Material material) + { + super(id, fluid, material); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons (IconRegister iconRegister) + { + stillIcon = iconRegister.registerIcon("tinker:liquid_glue"); + flowIcon = iconRegister.registerIcon("tinker:liquid_glue_flow"); + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon (int side, int meta) + { + if (side == 0 || side == 1) + return stillIcon; + return flowIcon; + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + entity.motionX *= 0.1; + entity.motionZ *= 0.1; + + if (entity instanceof EntityLivingBase) { + EntityLivingBase lvb = (EntityLivingBase)entity; + // Well you'd feel ill too standing in glue... + if (lvb.isPotionActive(Potion.hunger)) { + lvb.getActivePotionEffect(Potion.hunger).duration = 20; + } else { + lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); + } + + // Glue is sticky stuff + if (lvb.isPotionActive(Potion.moveSlowdown)) { + lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30; + } else { + lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4)); + } + } + } +} diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index dee1b9bd..421a2c45 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -21,7 +21,7 @@ public class DryingRackLogic extends InventoryLogic public DryingRackLogic() { - super(1); + super(1, 1); } @Override diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index 72284e2a..97d08f3e 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -10,6 +10,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.monster.EntityIronGolem; +import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -345,6 +346,17 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } } } + else if (o instanceof EntityHorse) + { + EntityHorse horse = (EntityHorse) o; + if (PHConstruct.meltableHorses && horse.attackEntityFrom(new SmelteryDamageSource(), 5)) + { + if (currentLiquid + 108 < maxLiquid) + { + this.fill(new FluidStack(TContent.glueFluid, 108), true); + } + } + } else if (o instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) o; @@ -661,6 +673,12 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci //worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); //worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } + + /*@Override + public void setInventorySlotContents (int slot, ItemStack itemstack) + { + inventory[slot] = itemstack != null ? itemstack.splitStack(1) : null; //May include unintended side effects. Possible fix for max stack size of 1? + }*/ /* Multiblock */ @Override diff --git a/src/main/java/tconstruct/client/TClientEvents.java b/src/main/java/tconstruct/client/TClientEvents.java index 22437194..5988e4ed 100644 --- a/src/main/java/tconstruct/client/TClientEvents.java +++ b/src/main/java/tconstruct/client/TClientEvents.java @@ -58,8 +58,8 @@ public class TClientEvents /* Liquids */ - Icon[] stillIcons = new Icon[1]; - Icon[] flowIcons = new Icon[1]; + Icon[] stillIcons = new Icon[2]; + Icon[] flowIcons = new Icon[2]; @ForgeSubscribe public void preStitch (TextureStitchEvent.Pre event) diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index c84f3867..1254f325 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -950,7 +950,7 @@ public class TProxyClient extends TProxyCommon @Override public void postInit () { - MinecraftForgeClient.registerItemRenderer(TContent.armorPattern.itemID, new RenderArmorCast()); + //MinecraftForgeClient.registerItemRenderer(TContent.armorPattern.itemID, new RenderArmorCast()); } } diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java index f2a25592..3c58a2ae 100644 --- a/src/main/java/tconstruct/client/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/client/gui/StencilTableGui.java @@ -93,7 +93,7 @@ public class StencilTableGui extends GuiContainer if (button.id == 0) { patternIndex++; - if (patternIndex == 21) + if (patternIndex == 21 || patternIndex == 26) patternIndex++; if (patternIndex >= TContent.patternOutputs.length) patternIndex = 0; @@ -101,10 +101,10 @@ public class StencilTableGui extends GuiContainer else if (button.id == 1) { patternIndex--; - if (patternIndex == 21) - patternIndex--; if (patternIndex < 0) patternIndex = TContent.patternOutputs.length - 1; + if (patternIndex == 21 || patternIndex == 26) + patternIndex--; } ItemStack stack = new ItemStack(TContent.woodPattern, 1, patternIndex + 1); logic.setInventorySlotContents(1, stack); diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 7c028a27..f2bac884 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -1,5 +1,6 @@ package tconstruct.common; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.library.crafting.ToolBuilder; @@ -57,7 +58,7 @@ public class TContent implements IFuelHandler public static Item toolShard; public static Item woodPattern; public static Item metalPattern; - public static Item armorPattern; + //public static Item armorPattern; public static Item manualBook; public static Item buckets; @@ -248,6 +249,10 @@ public class TContent implements IFuelHandler public static Block slimeChannel; public static Block slimePad; + //Glue + public static Fluid glueFluid; + public static Block glueFluidBlock; + //Ores public static Block oreSlag; public static Block oreGravel; @@ -324,8 +329,8 @@ public class TContent implements IFuelHandler //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true); } - public static Fluid[] fluids = new Fluid[26]; - public static Block[] fluidBlocks = new Block[25]; + public static Fluid[] fluids = new Fluid[27]; + public static Block[] fluidBlocks = new Block[26]; void registerBlocks () { @@ -716,12 +721,23 @@ public class TContent implements IFuelHandler blueSlimeFluid.setBlockID(slimePool); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(blueSlimeFluid, 1000), new ItemStack(buckets, 1, 24), new ItemStack(Item.bucketEmpty))); + //Glue + glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); + if (!FluidRegistry.registerFluid(glueFluid)) + glueFluid = FluidRegistry.getFluid("glue"); + glueFluidBlock = new GlueFluid(PHConstruct.glueFluidBlock, glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(slimeStep).setUnlocalizedName("liquid.glue"); + GameRegistry.registerBlock(glueFluidBlock, "liquid.glue"); + fluids[25] = glueFluid; + fluidBlocks[25] = glueFluidBlock; + glueFluid.setBlockID(glueFluidBlock); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(glueFluid, 1000), new ItemStack(buckets, 1, 26), new ItemStack(Item.bucketEmpty))); + pigIronFluid = new Fluid("pigiron.molten"); if (!FluidRegistry.registerFluid(pigIronFluid)) pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); else pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300); - fluids[25] = pigIronFluid; + fluids[26] = pigIronFluid; slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(slimeStep).setLightOpacity(0).setUnlocalizedName("slime.gel"); GameRegistry.registerBlock(slimeGel, SlimeGelItemBlock.class, "slime.gel"); @@ -822,16 +838,16 @@ public class TContent implements IFuelHandler toolShard = new ToolShard(PHConstruct.toolShard, "_chunk").setUnlocalizedName("tconstruct.ToolShard"); woodPattern = new Pattern(PHConstruct.woodPattern, "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); metalPattern = new MetalPattern(PHConstruct.metalPattern, "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); - armorPattern = new ArmorPattern(PHConstruct.armorPattern, "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); + //armorPattern = new ArmorPattern(PHConstruct.armorPattern, "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); GameRegistry.registerItem(materials, "materials"); GameRegistry.registerItem(woodPattern, "woodPattern"); GameRegistry.registerItem(metalPattern, "metalPattern"); - GameRegistry.registerItem(armorPattern, "armorPattern"); + //GameRegistry.registerItem(armorPattern, "armorPattern"); TConstructRegistry.addItemToDirectory("blankPattern", blankPattern); TConstructRegistry.addItemToDirectory("woodPattern", woodPattern); TConstructRegistry.addItemToDirectory("metalPattern", metalPattern); - TConstructRegistry.addItemToDirectory("armorPattern", armorPattern); + //TConstructRegistry.addItemToDirectory("armorPattern", armorPattern); String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; @@ -844,11 +860,11 @@ public class TContent implements IFuelHandler { TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(metalPattern, 1, i)); } - String[] armorPartTypes = { "helmet", "chestplate", "leggings", "boots" }; + /*String[] armorPartTypes = { "helmet", "chestplate", "leggings", "boots" }; for (int i = 1; i < armorPartTypes.length; i++) { TConstructRegistry.addItemStackToDirectory(armorPartTypes[i] + "Cast", new ItemStack(armorPattern, 1, i)); - } + }*/ manualBook = new Manual(PHConstruct.manual); GameRegistry.registerItem(manualBook, "manualBook"); @@ -879,9 +895,10 @@ public class TContent implements IFuelHandler shortbow = new Shortbow(PHConstruct.shortbow); arrow = new Arrow(PHConstruct.arrow); - Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe, shortbow, arrow }; - String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", "scythe", - "excavator", "hammer", "battleaxe", "shortbow", "arrow" }; + Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe, + shortbow, arrow }; + String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", + "scythe", "excavator", "hammer", "battleaxe", "shortbow", "arrow" }; for (int i = 0; i < tools.length; i++) { @@ -973,7 +990,7 @@ public class TContent implements IFuelHandler String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper", "nuggetTin", "nuggetAluminum", "nuggetSilver", "nuggetAluminumBrass", "silkyCloth", "silkyJewel", "nuggetObsidian", "nuggetCobalt", "nuggetArdite", "nuggetManyullyn", "nuggetBronze", - "nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron" }; + "nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron", "glueball" }; for (int i = 0; i < materialStrings.length; i++) { @@ -1126,6 +1143,7 @@ public class TContent implements IFuelHandler pb.registerFullMaterial(new ItemStack(materials, 1, 17), 2, "BlueSlime", new ItemStack(toolShard, 1, 17), new ItemStack(toolRod, 1, 17), 17); else pb.registerMaterialSet("BlueSlime", new ItemStack(TContent.toolShard, 1, 17), new ItemStack(TContent.toolRod, 1, 17), 17); + pb.registerFullMaterial(new ItemStack(materials, 1, 34), 2, "PigIron", new ItemStack(toolShard, 1, 18), new ItemStack(toolRod, 1, 18), 18); pb.addToolPattern((IPattern) woodPattern); } @@ -1581,10 +1599,11 @@ public class TContent implements IFuelHandler tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Item.emerald), 80); //Ingots - tableCasting.addCastingRecipe(new ItemStack(materials, 1, 2), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), ingotcast, 80); //stone - - //Gems + tableCasting.addCastingRecipe(new ItemStack(materials, 1, 2), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); //stone + + //Misc tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new FluidStack(moltenEmeraldFluid, 640), gemcast, 80); + tableCasting.addCastingRecipe(new ItemStack(materials, 1, 36), new FluidStack(glueFluid, TConstruct.ingotLiquidValue), null, 50); //Buckets ItemStack bucket = new ItemStack(Item.bucketEmpty); @@ -1593,7 +1612,7 @@ public class TContent implements IFuelHandler { tableCasting.addCastingRecipe(new ItemStack(buckets, 1, sc), new FluidStack(fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); } - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 25), new FluidStack(fluids[25], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 26), new FluidStack(fluids[26], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); // Clear glass pane casting tableCasting.addCastingRecipe(new ItemStack(glassPane), new FluidStack(moltenGlassFluid, 250), null, 80); @@ -1673,15 +1692,16 @@ public class TContent implements IFuelHandler basinCasting.addCastingRecipe(new ItemStack(clearGlass, 1, 0), new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //glass basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 4), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 5), new FluidStack(moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100); - basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 640*9), null, true, 100); //emerald + basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 640 * 9), null, true, 100); //emerald basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender + basinCasting.addCastingRecipe(new ItemStack(glueBlock), new FluidStack(glueFluid, TConstruct.blockLiquidValue), null, true, 100); //glue // basinCasting.addCastingRecipe(new ItemStack(slimeGel, 1, 0), new FluidStack(blueSlimeFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //Armor casts - FluidRenderProperties frp = new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN); + /*FluidRenderProperties frp = new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN); FluidStack aluFlu = new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10); FluidStack gloFlu = new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10); ItemStack[] armor = { new ItemStack(helmetWood), new ItemStack(chestplateWood), new ItemStack(leggingsWood), new ItemStack(bootsWood) }; @@ -1689,7 +1709,7 @@ public class TContent implements IFuelHandler { basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, sc), aluFlu, armor[sc], 50, frp); basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, sc), gloFlu, armor[sc], 50, frp); - } + }*/ } private void addRecipesForSmeltery () @@ -1730,7 +1750,8 @@ public class TContent implements IFuelHandler // Items Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); + Smeltery.addMelting(FluidType.Glue, new ItemStack(materials, 1, 36), 0, TConstruct.ingotLiquidValue); Smeltery.addMelting(FluidType.Ender, new ItemStack(Item.enderPearl, 4), 0, 250); Smeltery.addMelting(metalBlock, 10, 50, new FluidStack(moltenEnderFluid, 1000)); @@ -1766,7 +1787,9 @@ public class TContent implements IFuelHandler Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(moltenGlassFluid, 250)); Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 640*9)); + Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 640 * 9)); + Smeltery.addMelting(glueBlock, 0, 250, new FluidStack(glueFluid, TConstruct.blockLiquidValue)); + Smeltery.addMelting(craftedSoil, 1, 600, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 4)); Smeltery.addMelting(clearGlass, 0, 500, new FluidStack(moltenGlassFluid, 1000)); Smeltery.addMelting(glassPane, 0, 350, new FluidStack(moltenGlassFluid, 250)); @@ -1971,6 +1994,7 @@ public class TContent implements IFuelHandler ensureOreIsRegistered("ingotGold", new ItemStack(Item.ingotGold)); OreDictionary.registerOre("ingotObsidian", new ItemStack(materials, 1, 18)); OreDictionary.registerOre("ingotPigIron", new ItemStack(materials, 1, 34)); + OreDictionary.registerOre("itemRawRubber", new ItemStack(materials, 1, 36)); OreDictionary.registerOre("blockCobalt", new ItemStack(metalBlock, 1, 0)); OreDictionary.registerOre("blockArdite", new ItemStack(metalBlock, 1, 1)); @@ -2013,7 +2037,7 @@ public class TContent implements IFuelHandler ensureOreIsRegistered("crafterWood", new ItemStack(Block.workbench, 1)); - OreDictionary.registerOre("torchStone", new ItemStack(stoneTorch)); + OreDictionary.registerOre("torchStone", new ItemStack(stoneTorch)); String[] matNames = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime" }; @@ -2035,6 +2059,7 @@ public class TContent implements IFuelHandler //Vanilla stuff OreDictionary.registerOre("slimeball", new ItemStack(Item.slimeBall)); OreDictionary.registerOre("slimeball", new ItemStack(strangeFood, 1, 0)); + OreDictionary.registerOre("slimeball", new ItemStack(materials, 1, 36)); OreDictionary.registerOre("glass", new ItemStack(clearGlass)); OreDictionary.registerOre("glass", new ItemStack(Block.glass)); RecipeRemover.removeShapedRecipe(new ItemStack(Block.pistonStickyBase)); @@ -2359,6 +2384,14 @@ public class TContent implements IFuelHandler { basinCasting.addCastingRecipe(new ItemStack(speedBlock, 81), new FluidStack(moltenElectrumFluid, TConstruct.blockLiquidValue * 9), ores.get(0), 100); } + + /* Rubber */ + ores = OreDictionary.getOres("itemRubber"); + if (ores.size() > 0) + { + FurnaceRecipes.smelting().addSmelting(materials.itemID, 36, ores.get(0), 0.2f); + } + //new ItemStack(materials, 1, 36) } public static Object getStaticItem (String name, String classPackage) @@ -2384,8 +2417,6 @@ public class TContent implements IFuelHandler { if (fuel.itemID == materials.itemID && fuel.getItemDamage() == 7) return 26400; - if (fuel.itemID == woodPattern.itemID) - return 800; return 0; } diff --git a/src/main/java/tconstruct/items/ArmorPattern.java b/src/main/java/tconstruct/items/ArmorPattern.java index fd1d8866..2d4120ca 100644 --- a/src/main/java/tconstruct/items/ArmorPattern.java +++ b/src/main/java/tconstruct/items/ArmorPattern.java @@ -50,10 +50,10 @@ public class ArmorPattern extends CraftingItem implements ItemBlocklike public void getSubItems (int id, CreativeTabs tab, List list) { - /*for (int i = 0; i < patternName.length; i++) + for (int i = 0; i < patternName.length; i++) { list.add(new ItemStack(id, 1, i)); - }*/ + } } } \ No newline at end of file diff --git a/src/main/java/tconstruct/items/FilledBucket.java b/src/main/java/tconstruct/items/FilledBucket.java index 9c8bc986..76b88b08 100644 --- a/src/main/java/tconstruct/items/FilledBucket.java +++ b/src/main/java/tconstruct/items/FilledBucket.java @@ -2,6 +2,8 @@ package tconstruct.items; import java.util.List; +import net.minecraftforge.fluids.BlockFluidFinite; +import tconstruct.TConstruct; import tconstruct.blocks.logic.LiquidTextureLogic; import tconstruct.common.TContent; @@ -137,11 +139,16 @@ public class FilledBucket extends ItemBucket } else { - int id = 0; - int metadata = 0; - if (type == 25) - metadata = 0; - world.setBlock(clickX, clickY, clickZ, TContent.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids + try { + int metadata = 0; + if (TContent.fluidBlocks[type] instanceof BlockFluidFinite) + metadata = 7; + + world.setBlock(clickX, clickY, clickZ, TContent.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids + } catch (ArrayIndexOutOfBoundsException ex) { + TConstruct.logger.warning("AIOBE occured when placing bucket into world; " + ex); + return false; + } return true; } @@ -180,8 +187,8 @@ public class FilledBucket extends ItemBucket } public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", - "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "PigIron" }; + "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron" }; public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", - "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "pigiron" }; + "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron" }; } diff --git a/src/main/java/tconstruct/items/GoldenHead.java b/src/main/java/tconstruct/items/GoldenHead.java index 677d9a24..647ef6a3 100644 --- a/src/main/java/tconstruct/items/GoldenHead.java +++ b/src/main/java/tconstruct/items/GoldenHead.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -74,7 +75,7 @@ public class GoldenHead extends ItemFood @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("\u00a75\u00a7oSome say consuming the head of a"); - list.add("\u00a75\u00a7ofallen foe strengthens the blood"); + list.add(StatCollector.translateToLocal("goldenhead1.tooltip")); + list.add(StatCollector.translateToLocal("goldenhead2.tooltip")); } } diff --git a/src/main/java/tconstruct/items/Manual.java b/src/main/java/tconstruct/items/Manual.java index a9a2c630..14a3d14e 100644 --- a/src/main/java/tconstruct/items/Manual.java +++ b/src/main/java/tconstruct/items/Manual.java @@ -9,6 +9,7 @@ import tconstruct.TConstruct; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -40,13 +41,13 @@ public class Manual extends CraftingItem switch (stack.getItemDamage()) { case 0: - list.add("\u00a7oBy: Skyla"); + list.add(StatCollector.translateToLocal("manual1.tooltip")); break; case 1: - list.add("\u00a7oBy: Skyla"); + list.add(StatCollector.translateToLocal("manual2.tooltip")); break; case 2: - list.add("\u00a7oBy: Thruul M'gon"); + list.add(StatCollector.translateToLocal("manual3.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/MaterialItem.java b/src/main/java/tconstruct/items/MaterialItem.java index 3713c372..e9ecd050 100644 --- a/src/main/java/tconstruct/items/MaterialItem.java +++ b/src/main/java/tconstruct/items/MaterialItem.java @@ -24,28 +24,10 @@ public class MaterialItem extends CraftingItem static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", "CopperIngot", "TinIngot", "", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", "TinNugget", "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget", - "SteelNugget", "PigIronIngot", "PigIronNugget" }; + "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall" }; static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone", "copperingot", "tiningot", "aluminumingot", "aluminumraw", "bronzeingot", "alubrassingot", "alumiteingot", "steelingot", "blueslimecrystal", "obsidianingot", "nugget_iron", "nugget_copper", "nugget_tin", "nugget_aluminum", "", "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn", - "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron" }; - - /*@Override - @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (stack.getItemDamage() == 23) - { - if (stack.hasTagCompound()) - { - int amount = stack.getTagCompound().getInteger("Essence"); - list.add("Stored Levels: " + EssenceExtractorLogic.getEssencelevels(amount)); - } - else - { - list.add("Stored Levels: 0"); - } - } - }*/ + "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", "glueball" }; } diff --git a/src/main/java/tconstruct/items/OreBerries.java b/src/main/java/tconstruct/items/OreBerries.java index b8987d4a..4acdd9e6 100644 --- a/src/main/java/tconstruct/items/OreBerries.java +++ b/src/main/java/tconstruct/items/OreBerries.java @@ -7,6 +7,7 @@ import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,22 +28,22 @@ public class OreBerries extends CraftingItem switch (stack.getItemDamage()) { case 0: - list.add("Sweet Irony"); + list.add(StatCollector.translateToLocal("oreberries1.tooltip")); break; case 1: - list.add("Pure Luster"); + list.add(StatCollector.translateToLocal("oreberries2.tooltip")); break; case 2: - list.add("Tastes like metal"); + list.add(StatCollector.translateToLocal("oreberries3.tooltip")); break; case 3: - list.add("Tin Man"); + list.add(StatCollector.translateToLocal("oreberries4.tooltip")); break; case 4: - list.add("White Chocolate"); + list.add(StatCollector.translateToLocal("oreberries5.tooltip")); break; case 5: - list.add("Tastes like Creeper"); + list.add(StatCollector.translateToLocal("oreberries6.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/Pattern.java b/src/main/java/tconstruct/items/Pattern.java index 62bb2fc6..4b43ffea 100644 --- a/src/main/java/tconstruct/items/Pattern.java +++ b/src/main/java/tconstruct/items/Pattern.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder.MaterialSet; import tconstruct.library.util.IPattern; @@ -69,9 +70,9 @@ public class Pattern extends CraftingItem implements IPattern if (cost > 0) { if (cost - (int) cost < 0.1) - list.add("Material Cost: " + (int) cost); + list.add(StatCollector.translateToLocal("pattern1.tooltip") + (int) cost); else - list.add("Material Cost: " + cost); + list.add(StatCollector.translateToLocal("pattern2.tooltip") + cost); } } diff --git a/src/main/java/tconstruct/items/StrangeFood.java b/src/main/java/tconstruct/items/StrangeFood.java index 53d9d49f..a92e5eaa 100644 --- a/src/main/java/tconstruct/items/StrangeFood.java +++ b/src/main/java/tconstruct/items/StrangeFood.java @@ -2,6 +2,7 @@ package tconstruct.items; import java.util.List; +import net.minecraft.util.StatCollector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; @@ -18,7 +19,7 @@ public class StrangeFood extends SpecialFood @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("\u00a7b\u00a7oIt smells terrible, but if you"); - list.add("\u00a7b\u00a7ohave nothing else to eat..."); + list.add(StatCollector.translateToLocal("strangefood1.tooltip")); + list.add(StatCollector.translateToLocal("strangefood2.tooltip")); } } diff --git a/src/main/java/tconstruct/items/armor/HeartCanister.java b/src/main/java/tconstruct/items/armor/HeartCanister.java index 7bae44df..13606f03 100644 --- a/src/main/java/tconstruct/items/armor/HeartCanister.java +++ b/src/main/java/tconstruct/items/armor/HeartCanister.java @@ -10,6 +10,7 @@ import tconstruct.util.player.TPlayerStats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -55,15 +56,15 @@ public class HeartCanister extends CraftingItem switch (stack.getItemDamage()) { case 0: - list.add("Crafting Item"); + list.add(StatCollector.translateToLocal("hearthcanister1.tooltip")); break; case 1: - list.add("Crafting Item"); - list.add("Part of low-level Heart Canisters"); + list.add(StatCollector.translateToLocal("hearthcanister2.tooltip")); + list.add(StatCollector.translateToLocal("hearthcanister3.tooltip")); break; case 2: - list.add("Accessory"); - list.add("Permanent health increase"); + list.add(StatCollector.translateToLocal("hearthcanister4.tooltip")); + list.add(StatCollector.translateToLocal("hearthcanister5.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/armor/Knapsack.java b/src/main/java/tconstruct/items/armor/Knapsack.java index e8ee10b3..03218861 100644 --- a/src/main/java/tconstruct/items/armor/Knapsack.java +++ b/src/main/java/tconstruct/items/armor/Knapsack.java @@ -3,7 +3,7 @@ package tconstruct.items.armor; import java.util.List; import tconstruct.items.CraftingItem; - +import net.minecraft.util.StatCollector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; @@ -25,7 +25,7 @@ public class Knapsack extends CraftingItem switch (stack.getItemDamage()) { case 0: - list.add("A Knapsack to hold your things."); + list.add(StatCollector.translateToLocal("knapsack.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/items/blocks/BarricadeItem.java index 1c89674a..bdbb8cdc 100644 --- a/src/main/java/tconstruct/items/blocks/BarricadeItem.java +++ b/src/main/java/tconstruct/items/blocks/BarricadeItem.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import net.minecraft.util.StatCollector; public class BarricadeItem extends ItemBlock { @@ -25,7 +26,7 @@ public class BarricadeItem extends ItemBlock @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("Stacks up to 4 times"); + list.add(StatCollector.translateToLocal("barricade.tooltip")); } 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/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java index 72bc83b0..81ca3c77 100644 --- a/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java @@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; public class CraftedSoilItemBlock extends ItemBlock { @@ -40,10 +41,10 @@ public class CraftedSoilItemBlock extends ItemBlock switch (stack.getItemDamage()) { case 3: - list.add("Heals Undead"); + list.add(StatCollector.translateToLocal("craftedsoil1.tooltip")); break; case 4: - list.add("Harmful to Undead"); + list.add(StatCollector.translateToLocal("craftedsoil2.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java b/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java index 3a289786..843493de 100644 --- a/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import net.minecraft.util.StatCollector; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -38,8 +39,8 @@ public class HamboneItemBlock extends ItemBlock @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("\u00A74Hambone!"); - list.add("Usable for Beacon bases"); + list.add(StatCollector.translateToLocal("hambone1.tooltip")); + list.add(StatCollector.translateToLocal("hambone2.tooltip")); } /** Number of ticks to run while 'EnumAction'ing until result. */ diff --git a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java index d6542c3f..7f9690f2 100644 --- a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java @@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraft.util.StatCollector; import tconstruct.blocks.logic.TileEntityLandmine; import tconstruct.common.TContent; @@ -32,16 +33,16 @@ public class ItemBlockLandmine extends ItemBlock switch (par1ItemStack.getItemDamage()) { case 0: - interaction = "everything"; + interaction = StatCollector.translateToLocal("landmine1.tooltip"); break; case 1: - interaction = "mobs, players and redstone"; + interaction = StatCollector.translateToLocal("landmine2.tooltip"); break; case 2: - interaction = "players and redstone"; + interaction = StatCollector.translateToLocal("landmine3.tooltip"); break; default: - interaction = "redstone only"; + interaction = StatCollector.translateToLocal("landmine4.tooltip"); break; } diff --git a/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java b/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java index e3b81edf..1c20c2eb 100644 --- a/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java @@ -38,13 +38,13 @@ public class LavaTankItemBlock extends ItemBlock NBTTagCompound liquidTag = stack.getTagCompound().getCompoundTag("Fluid"); if (liquidTag != null) { - list.add("Contains " + StatCollector.translateToLocal(liquidTag.getString("FluidName"))); + list.add(StatCollector.translateToLocal("searedtank1.tooltip") + StatCollector.translateToLocal(liquidTag.getString("FluidName"))); list.add(liquidTag.getInteger("Amount") + " mB"); } } else { - list.add(StatCollector.translateToLocal("searedtank.tooltip")); + list.add(StatCollector.translateToLocal("searedtank2.tooltip")); } } } diff --git a/src/main/java/tconstruct/items/blocks/MetalItemBlock.java b/src/main/java/tconstruct/items/blocks/MetalItemBlock.java index 6960a314..a6c25987 100644 --- a/src/main/java/tconstruct/items/blocks/MetalItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/MetalItemBlock.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; public class MetalItemBlock extends ItemBlock { @@ -32,6 +33,6 @@ public class MetalItemBlock extends ItemBlock @Override public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("Usable for Beacon bases"); + list.add(StatCollector.translateToLocal("metalblock.tooltip")); } } diff --git a/src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java b/src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java index d50fce0b..02a8099a 100644 --- a/src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java +++ b/src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -40,18 +41,18 @@ public class MultiBrickFancyItem extends ItemBlock { case 5: case 6: - list.add("Somewhat expensive"); + list.add(StatCollector.translateToLocal("fancybrick1.tooltip")); break; case 7: - list.add("Quite expensive"); + list.add(StatCollector.translateToLocal("fancybrick2.tooltip")); break; case 8: - list.add("Emits Redstone signal up to"); - list.add("4 blocks away"); + list.add(StatCollector.translateToLocal("fancybrick3.tooltip")); + list.add(StatCollector.translateToLocal("fancybrick4.tooltip")); break; case 10: case 11: - list.add("Bouncy!"); + list.add(StatCollector.translateToLocal("fancybrick5.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/blocks/MultiBrickItem.java b/src/main/java/tconstruct/items/blocks/MultiBrickItem.java index 951a8c8c..5d9f7ae8 100644 --- a/src/main/java/tconstruct/items/blocks/MultiBrickItem.java +++ b/src/main/java/tconstruct/items/blocks/MultiBrickItem.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -40,18 +41,18 @@ public class MultiBrickItem extends ItemBlock { case 5: case 6: - list.add("Somewhat expensive"); + list.add(StatCollector.translateToLocal("brick1.tooltip")); break; case 7: - list.add("Quite expensive"); + list.add(StatCollector.translateToLocal("brick2.tooltip")); break; case 8: - list.add("Emits Redstone signal up to"); - list.add("4 blocks away"); + list.add(StatCollector.translateToLocal("brick3.tooltip")); + list.add(StatCollector.translateToLocal("brick4.tooltip")); break; case 10: case 11: - list.add("Bouncy!"); + list.add(StatCollector.translateToLocal("brick5.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java index e78e5662..4c874192 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java @@ -12,6 +12,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.IPlantable; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -76,16 +77,16 @@ public class OreberryBushItem extends ItemBlock switch (stack.getItemDamage() % 4) { case 0: - list.add("Sweet Irony"); + list.add(StatCollector.translateToLocal("oreberrybush1.tooltip")); break; case 1: - list.add("Pure Luster"); + list.add(StatCollector.translateToLocal("oreberrybush2.tooltip")); break; case 2: - list.add("Tastes like metal"); + list.add(StatCollector.translateToLocal("oreberrybush3.tooltip")); break; case 3: - list.add("Tin Man"); + list.add(StatCollector.translateToLocal("oreberrybush4.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java index 2db417c4..690bcb61 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java @@ -12,6 +12,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.IPlantable; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -80,10 +81,10 @@ public class OreberryBushSecondItem extends ItemBlock switch (stack.getItemDamage() % 4) { case 0: - list.add("White Chocolate"); + list.add(StatCollector.translateToLocal("oreberrybush5.tooltip")); break; case 1: - list.add("Tastes like Creeper"); + list.add(StatCollector.translateToLocal("oreberrybush6.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/blocks/SoilSlabItem.java b/src/main/java/tconstruct/items/blocks/SoilSlabItem.java index 0c930cc1..92f3e3d0 100644 --- a/src/main/java/tconstruct/items/blocks/SoilSlabItem.java +++ b/src/main/java/tconstruct/items/blocks/SoilSlabItem.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -37,11 +38,11 @@ public class SoilSlabItem extends ItemBlock { switch (stack.getItemDamage()) { - case 3: - list.add("Heals Undead"); + case 3: + list.add(StatCollector.translateToLocal("craftedsoil.slab1.tooltip")); break; case 4: - list.add("Harmful to Undead"); + list.add(StatCollector.translateToLocal("craftedsoil.slab2.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java b/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java index a4e01ee2..28cb1016 100644 --- a/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java +++ b/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; public class SpeedBlockItem extends ItemBlock { @@ -34,8 +35,8 @@ public class SpeedBlockItem extends ItemBlock { int metadata = stack.getItemDamage(); if (metadata == 1 || metadata == 4) - list.add("You run pretty fast on it"); + list.add(StatCollector.translateToLocal("speedblock1.tooltip")); else - list.add("You run a bit faster on it"); + list.add(StatCollector.translateToLocal("speedblock2.tooltip")); } } diff --git a/src/main/java/tconstruct/items/blocks/SpeedSlabItem.java b/src/main/java/tconstruct/items/blocks/SpeedSlabItem.java index 151f1792..66f53370 100644 --- a/src/main/java/tconstruct/items/blocks/SpeedSlabItem.java +++ b/src/main/java/tconstruct/items/blocks/SpeedSlabItem.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; public class SpeedSlabItem extends ItemBlock { @@ -34,8 +35,8 @@ public class SpeedSlabItem extends ItemBlock { int metadata = stack.getItemDamage() % 8; if (metadata == 1 || metadata == 4) - list.add("You run pretty fast on it"); + list.add(StatCollector.translateToLocal("speedblock.slab1.tooltip")); else - list.add("You run a bit faster on it"); + list.add(StatCollector.translateToLocal("speedblock.slab2.tooltip")); } } diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 399aee1b..61957ba8 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -1,15 +1,18 @@ package tconstruct.items.tools; import java.util.ArrayList; +import java.util.List; import tconstruct.common.TContent; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.HarvestTool; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -203,6 +206,26 @@ public class Hammer extends HarvestTool return emptyIcon; } + @Override + public void getSubItems (int id, CreativeTabs tab, List list) + { + super.getSubItems(id, tab, list); + + ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 10), new ItemStack(getHandleItem(), 1, 8), new ItemStack(getAccessoryItem(), 1, 11), new ItemStack( + getExtraItem(), 1, 11), "InfiMiner"); + + NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + tags.setInteger("Modifiers", 0); + tags.setInteger("Attack", Integer.MAX_VALUE / 100); + tags.setInteger("TotalDurability", Integer.MAX_VALUE / 100); + tags.setInteger("BaseDurability", Integer.MAX_VALUE / 100); + tags.setInteger("MiningSpeed", Integer.MAX_VALUE / 100); + tags.setInteger("Unbreaking", 10); + + tags.setBoolean("Built", true); + list.add(tool); + } + @Override public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) { @@ -234,7 +257,7 @@ public class Hammer extends HarvestTool if (block == Block.silverfish) validStart = true; - MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 5.0D); + MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 4.5D); if (mop == null || !validStart) return super.onBlockStartBreak(stack, x, y, z, player); diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index d2d8a5e0..43af273d 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -14,6 +14,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Icon; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -179,6 +180,6 @@ public class PotionLauncher extends Item @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("Test Item"); + list.add(StatCollector.translateToLocal("potionlauncher.tooltip")); } } diff --git a/src/main/java/tconstruct/library/blocks/InventoryLogic.java b/src/main/java/tconstruct/library/blocks/InventoryLogic.java index d0ef03f1..d14088a7 100644 --- a/src/main/java/tconstruct/library/blocks/InventoryLogic.java +++ b/src/main/java/tconstruct/library/blocks/InventoryLogic.java @@ -20,10 +20,17 @@ public abstract class InventoryLogic extends TileEntity implements IInventory { protected ItemStack[] inventory; protected String invName; + protected int stackSizeLimit; public InventoryLogic(int invSize) + { + this(invSize, 64); + } + + public InventoryLogic(int invSize, int maxStackSize) { inventory = new ItemStack[invSize]; + stackSizeLimit = maxStackSize; } /* Inventory management */ @@ -48,7 +55,7 @@ public abstract class InventoryLogic extends TileEntity implements IInventory @Override public int getInventoryStackLimit () { - return 64; + return stackSizeLimit; } public boolean canDropInventorySlot (int slot) diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index b919fd45..6bd6a857 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -59,7 +59,9 @@ public enum FluidType /** Slime Smelting **/ Slime(TContent.slimeGel.blockID, 0, 250, TContent.blueSlimeFluid, false), /** Pigiron Smelting **/ - PigIron(TContent.meatBlock.blockID, 0, 610, TContent.pigIronFluid, true); + PigIron(TContent.meatBlock.blockID, 0, 610, TContent.pigIronFluid, true), + /** Glue Smelting **/ + Glue(TContent.glueBlock.blockID, 0, 125, TContent.glueFluid, false); public final int renderBlockID; public final int renderMeta; diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index cdef201f..af8390cf 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -730,7 +730,9 @@ public class AbilityHelper float f1 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * f; float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; - double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f + 1.62D - (double) player.yOffset; + double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f; + if (!world.isRemote && player instanceof EntityPlayer) + d1 += 1.62D; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; Vec3 vec3 = world.getWorldVec3Pool().getVecFromPool(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java new file mode 100644 index 00000000..327240e7 --- /dev/null +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java @@ -0,0 +1,38 @@ +package tconstruct.plugins.minefactoryreloaded.harvestables; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import powercrystals.minefactoryreloaded.api.IFactoryGrindable; +import powercrystals.minefactoryreloaded.api.MobDrop; +import tconstruct.common.TContent; + +public class GrindableHorse implements IFactoryGrindable +{ + @Override + public Class getGrindableEntity () + { + return EntityHorse.class; + } + + @Override + public List grind (World world, EntityLivingBase entity, Random random) + { + List drops = new ArrayList(); + + drops.add(new MobDrop(10, new ItemStack(TContent.materials, random.nextInt(4) + 1, 36))); + + return drops; + } + + @Override + public boolean processEntity (EntityLivingBase entity) + { + return false; + } +} diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java index c0ca1473..b972f7c7 100644 --- a/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java @@ -2,6 +2,7 @@ package tconstruct.plugins.minefactoryreloaded; import powercrystals.minefactoryreloaded.api.FactoryRegistry; import tconstruct.common.TContent; +import tconstruct.plugins.minefactoryreloaded.harvestables.GrindableHorse; import tconstruct.plugins.minefactoryreloaded.harvestables.HarvestableOreBerry; public class mfrRegistering @@ -10,6 +11,6 @@ public class mfrRegistering { FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerry.blockID, TContent.oreBerries.itemID, 0)); FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerrySecond.blockID, TContent.oreBerries.itemID, 4)); - + FactoryRegistry.registerGrindable(new GrindableHorse()); } } diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 1b67818f..a0bb621d 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -133,7 +133,9 @@ public class PHConstruct moltenEmerald = config.getBlock("Molten Emerald", 3216).getInt(3216); blood = config.getBlock("Liquid Cow", 3217).getInt(3217); moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218); - + + glueBlock = config.getBlock("Glue Block", 3219).getInt(3219); + glueFluidBlock = config.getBlock("Glue Fluid Block", 3220).getInt(3220); // signalBus = config.getBlock("Signal Bus", 3221).getInt(3221); // signalTerminal = config.getBlock("Signal Terminal", 3222).getInt(3222); @@ -162,7 +164,6 @@ public class PHConstruct woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243); woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244); woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); - glueBlock = config.getBlock("Glue Block", 3256).getInt(3256); castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235); @@ -486,6 +487,10 @@ public class PHConstruct public static int slimeChannel; public static int slimePad; + // Glue + public static int glueFluidBlock; + public static int glueBlock; + //Decoration public static int stoneTorch; public static int stoneLadder; @@ -497,7 +502,6 @@ public class PHConstruct public static int meatBlock; public static int woolSlab1; public static int woolSlab2; - public static int glueBlock; //Patterns and misc public static int blankPattern; @@ -717,6 +721,7 @@ public class PHConstruct //Looks public static int connectedTexturesMode; public static File cfglocation; + //dimensionblacklist public static boolean slimeIslGenDim0Only; public static int[] cfgDimBlackList;