From 4ef09aa3616e862ab64813310688e02c41d428d7 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:12:23 +0400 Subject: [PATCH 01/29] Fix tabs in ru_RU.xml, add new names. --- resources/assets/biomesoplenty/lang/ru_RU.xml | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/ru_RU.xml b/resources/assets/biomesoplenty/lang/ru_RU.xml index 951ea44cb..22d169101 100644 --- a/resources/assets/biomesoplenty/lang/ru_RU.xml +++ b/resources/assets/biomesoplenty/lang/ru_RU.xml @@ -1,7 +1,7 @@ - Russian (ru_RU) Localization File + Russian (ru_RU) Localization File Грязь @@ -97,14 +97,14 @@ Саженец хурмы Ива - Плющ - Листва яблони - Листва хурмы + Плющ + Листва яблони + Листва хурмы Бамбук - Кирпичные ступеньки из грязи - Оригинальная трава + Кирпичные ступеньки из грязи + Оригинальная трава Блок высокой травы - Древесный мох + Древесный мох Ламинария Розовый коралл @@ -112,18 +112,18 @@ Синий коралл Светящийся коралл - Ступеньки из красного булыжника - Кирпичные ступеньки из красного камня - - Очищенная трава - Тлеющая трава - - Небесный камень - Небесный булыжник - Небесные кирпичи - - Ступеньки из небесного булыжника - Ступеньки из небесных кирпичей + Ступеньки из красного булыжника + Кирпичные ступеньки из красного камня + + Очищенная трава + Тлеющая трава + + Небесный камень + Небесный булыжник + Небесные кирпичи + + Ступеньки из небесного булыжника + Ступеньки из небесных кирпичей Портал в "Землю Обетованную" @@ -142,9 +142,9 @@ Сапфировая руда Сапфировый блок - Мох + Мох - Блок облака + Блок облака Малый сегмент кости Средний сегмент кости @@ -160,7 +160,7 @@ Лужица - Могильная плита + Могильная плита Плита из красного булыжника Кирпичная плита из красного камня @@ -355,15 +355,18 @@ Пышный венок Экзотический венок + Болотные сапоги + Ласты + Аметистовое ведро - Аметистовое ведро с родниковой водой - Ведро с ядом + Аметистовое ведро родниковой воды + Ведро яда - Яд + Жидкий яд Родниковая вода - Яд + Жидкий яд Родниковая вода From 0740f60da48ae756b4719804d3bd28238cfa363a Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:15:16 +0400 Subject: [PATCH 02/29] Fix tabs in en_US.xml --- resources/assets/biomesoplenty/lang/en_US.xml | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index bb1602e02..cdea9dd8b 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -20,7 +20,7 @@ Red Rock Red Rock Cobblestone Red Rock Bricks - + Ash Block Dead Grass @@ -63,15 +63,15 @@ High Grass Poison Ivy Berry Bush - + Giant Red Flower Giant Yellow Flower - + Toadstool Portobello Blue Milk Cap Glowshroom - + Apple Sapling Yellow Autumn Sapling Bamboo Sapling @@ -95,35 +95,35 @@ Redwood Sapling Willow Sapling Pine Sapling - + Willow - Ivy - Apple Leaves + Ivy + Apple Leaves Persimmon Leaves Bamboo - Mud Bricks Stairs - Origin Grass Block + Mud Bricks Stairs + Origin Grass Block Long Grass Block - Tree Moss + Tree Moss Kelp Pink Coral Orange Coral Blue Coral Glowing Coral - - Red Rock Cobblestone Stairs - Red Rock Bricks Stairs - - Purified Grass Block - Smoldering Grass Block - - Skystone - Skystone Cobblestone - Skystone Bricks - - Skystone Cobblestone Stairs - Skystone Bricks Stairs + + Red Rock Cobblestone Stairs + Red Rock Bricks Stairs + + Purified Grass Block + Smoldering Grass Block + + Skystone + Skystone Cobblestone + Skystone Bricks + + Skystone Cobblestone Stairs + Skystone Bricks Stairs Promised Land Portal @@ -141,26 +141,26 @@ Block of Apatite Sapphire Ore Block of Sapphire - - Moss - - Cloud Block + + Moss + + Cloud Block Small Bone Segment Medium Bone Segment Large Bone Segment Celestial Lens - + Sacrificial Focus Sacrificial Focus Sacrificial Focus - + Altar Frame - + Puddle - - Gravestone + + Gravestone Red Rock Cobblestone Slab Red Rock Bricks Slab @@ -272,7 +272,7 @@ Redwood Leaves Willow Leaves Pine Leaves - + Berry Shroom Powder @@ -286,7 +286,7 @@ Dart Blower Dart Poison Dart - + Mud Ball Mud Brick @@ -316,7 +316,7 @@ Muddy Chestplate Muddy Leggings Muddy Boots - + Amethyst Pickaxe Amethyst Axe Amethyst Shovel @@ -326,7 +326,7 @@ Amethyst Chestplate Amethyst Leggings Amethyst Boots - + Wooden Scythe Stone Scythe Iron Scythe @@ -357,26 +357,26 @@ Wading Boots Flippers - + Amethyst Bucket Spring Water Amethyst Bucket Liquid Poison Bucket - + Liquid Poison Spring Water - + Liquid Poison - Spring Water - + Spring Water + A gateway to the Promised Land has appeared in the sky above. A gateway to the Overworld has appeared in the sky above. - + - Biomes O' Plenty - + Biomes O' Plenty + - Biomes O' Plenty + Biomes O' Plenty From db160d29e04b321448e205005d4310b3779d5171 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:16:56 +0400 Subject: [PATCH 03/29] Fix tabs in zh_CN.xml, delete unused names --- resources/assets/biomesoplenty/lang/zh_CN.xml | 649 +++++++++--------- 1 file changed, 324 insertions(+), 325 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/zh_CN.xml b/resources/assets/biomesoplenty/lang/zh_CN.xml index 89052f2fa..c2e601647 100644 --- a/resources/assets/biomesoplenty/lang/zh_CN.xml +++ b/resources/assets/biomesoplenty/lang/zh_CN.xml @@ -1,364 +1,363 @@ - Simplified Chinese (zh_CN) Localization File + Simplified Chinese (zh_CN) Localization File - - 泥巴 - 流沙 + + 泥巴 + 流沙 - 火山灰岩 - 硬化沙子 - 硬化泥土 - 硬化冰块 - 干燥泥土 - 崖壁岩石 - 泥巴砖块 - 纯净泥土 - 仙域水晶 + 火山灰岩 + 硬化沙子 + 硬化泥土 + 硬化冰块 + 干燥泥土 + 崖壁岩石 + 泥巴砖块 + 纯净泥土 + 仙域水晶 - 红岩 - 红岩圆石 - 红岩砖块 - - 灰烬块 + 红岩 + 红岩圆石 + 红岩砖块 - 枯萎草 - 沙漠草 - 沙漠野菜 - 沙丘草 - 纯净高草 - 荆棘 - 大麦 - 香蒲 - 香蒲 - 香蒲 - 芦苇 + 灰烬块 - 苜蓿 - 沼泽花 - 死亡花 - 闪光花 - 绣球花 - 雏菊 - 郁金香 - 野花 - 紫罗兰 - 银莲花 - 水百合 - 仙人球 - 龙舌兰 - 向日葵 - 向日葵 - 蒲公英 + 枯萎草 + 沙漠草 + 沙漠野菜 + 沙丘草 + 纯净高草 + 荆棘 + 大麦 + 香蒲 + 香蒲 + 香蒲 + 芦苇 + 仙人球 - 海藻 - 小草 - 矮草 - 高草 - 灌木 - 野菜 - 高草 - 毒藤 - 浆果灌木 - - 巨大红色花 - 巨大黄色花 - - 毒菌 - 双孢蘑菇 - 蓝牛奶伞菌 - 夜光菇 - - 苹果树苗 - 黄色秋天树苗 - 竹笋 - 魔法树苗 - 黑暗树苗 - 垂死树苗 - 杉树树苗 - 阁楼木树苗 - 橙色秋天树苗 - 起源树苗 - 粉色樱桃树苗 - 枫树树苗 - 白色樱桃树树苗 - 地狱皮树苗 - 蓝花楹木树苗 + 苜蓿 + 沼泽花 + 死亡花 + 闪光花 + 绣球花 + 野花 + 紫罗兰 + 银莲花 + 水百合 + 龙舌兰 + 向日葵 + 向日葵 + 蒲公英 - 刺槐树树苗 - 红树树苗 - 棕榈树苗 - 红木树苗 - 柳树树苗 - 松树树苗 - - 柳树 - 藤蔓 - 苹果树叶 - 竹子 - 泥巴砖块楼梯 - 源草 - 树藓 + 海藻 + 小草 + 矮草 + 高草 + 灌木 + 野菜 + 高草 + 毒藤 + 浆果灌木 - 巨藻 - - 红岩圆石楼梯 - 红岩砖块楼梯 - - 纯净草 - 阴燃草 - - 苍空石 - 苍空圆石 - 苍空砖块 - - 苍空圆石楼梯 - 苍空砖块楼梯 + 巨大红色花 + 巨大黄色花 - 应许之地传送门 + 毒菌 + 双孢蘑菇 + 蓝牛奶伞菌 + 夜光菇 - 紫晶矿石 - 紫晶块 - 红宝石矿石 - 红宝石块 - 橄榄石矿石 - 橄榄石块 - 黄玉矿石 - 黄玉块 - 坦桑矿石 - 坦桑石块 - 磷灰石矿石 - 磷灰石块 - 蓝宝石矿石 - 蓝宝石块 - - 苔藓 - - 云块 + 苹果树苗 + 黄色秋天树苗 + 竹笋 + 魔法树苗 + 黑暗树苗 + 垂死树苗 + 杉树树苗 + 阁楼木树苗 + 橙色秋天树苗 + 起源树苗 + 粉色樱桃树苗 + 枫树树苗 + 白色樱桃树树苗 + 地狱皮树苗 + 蓝花楹木树苗 - 一小截骨头 - 一截骨头 - 一大截骨头 + 刺槐树树苗 + 红树树苗 + 棕榈树苗 + 红木树苗 + 柳树树苗 + 松树树苗 - 仙域透镜 - - 献祭之核 - 献祭之核 - 献祭之核 - - 祭坛框架 - - 胶土 - - 坟墓 + 柳树 + 藤蔓 + 苹果树叶 + 竹子 + 泥巴砖块楼梯 + 源草 + 树藓 - 红岩圆石台阶 - 红岩砖块台阶 - 泥巴砖块台阶 - 苍空石圆石台阶 - 苍空石砖块台阶 + 巨藻 - 红岩圆石台阶 - 红岩砖块台阶 - 泥巴砖块台阶 - 苍空石圆石台阶 - 苍空石砖块台阶 + 红岩圆石楼梯 + 红岩砖块楼梯 - 刺槐树木板 - 樱桃树木板 - 黑暗树木板 - 杉树木板 - 阁楼树木板 - 魔法树木板 - 红树木板 - 棕榈树木板 - 红木树木板 - 柳树木板 - 竹板 - 松树木板 - 地狱皮树木板 - 蓝花楹树木板 + 纯净草 + 阴燃草 - 刺槐树原木 - 樱桃树原木 - 黑暗树原木 - 杉树原木 + 苍空石 + 苍空圆石 + 苍空砖块 - 阁楼树原木 - 魔法树原木 - 红树原木 - 棕榈树原木 + 苍空圆石楼梯 + 苍空砖块楼梯 - 红木原木 - 柳树原木 - 垂死树原木 - 巨大花茎 + 应许之地传送门 - 松树原木 - 地狱皮树原木 - 蓝花楹树原木 + 紫晶矿石 + 紫晶块 + 红宝石矿石 + 红宝石块 + 橄榄石矿石 + 橄榄石块 + 黄玉矿石 + 黄玉块 + 坦桑矿石 + 坦桑石块 + 磷灰石矿石 + 磷灰石块 + 蓝宝石矿石 + 蓝宝石块 - 黄色秋天树叶 - 竹叶 - 魔法树叶 - 黑暗树叶 - 垂死树叶 - 杉树树叶 - 阁楼树树叶 - 橙色秋天树叶 + 苔藓 - Origin树叶 - 粉樱桃树叶 - 枫树叶 - 白樱桃树叶 - 地狱皮树叶 - 蓝花楹树叶 + 云块 - 刺槐树木板 - 樱桃树木板 - 黑暗树木板 - 杉树木板 - 阁楼树木板 - 魔法树木板 - 红树木板 - 棕榈树木板 - 红木木板 - 柳树木板 - 松树木板 - 地狱皮树木板 - 蓝花楹树木板 + 一小截骨头 + 一截骨头 + 一大截骨头 - 刺槐树台阶 - 樱桃树台阶 - 黑暗树台阶 - 杉树台阶 - 阁楼树台阶 - 魔法树台阶 - 红树台阶 - 棕榈树台阶 - 红木台阶 - 柳树台阶 - 松树台阶 - 地狱皮树台阶 - 蓝花楹树台阶 + 仙域透镜 - 刺槐木楼梯 - 樱桃木楼梯 - 黑暗木楼梯 - 冷杉木楼梯 - 阁楼木楼梯 - 魔法木楼梯 - 红树木楼梯 - 棕榈木楼梯 - 红杉木楼梯 - 柳树木楼梯 - 松树木楼梯 - 地狱皮木楼梯 - 蓝花楹树楼梯 + 献祭之核 + 献祭之核 + 献祭之核 - 刺槐树叶 - 红树叶 - 棕榈叶 - 红杉叶 - 柳树叶 - 松树叶 - - - 蘑菇粉 + 祭坛框架 - 葵花籽 - - 浆果 + 胶土 - 飞镖吹筒 - 飞镖 - 毒飞镖 - - 泥球 + 坟墓 - 泥砖 - 一小堆灰烬 - 紫晶 - 毒药 - 仙域水晶碎片 - 蓝色染料 - 棕色染料 - 绿色染料 - 白色染料 - 黑色染料 - 红宝石 - 橄榄石 - 黄玉 - 坦桑石 - 磷灰石 - 蓝宝石 - 幽魂灵魂 + 红岩圆石台阶 + 红岩砖块台阶 + 泥巴砖块台阶 + 苍空石圆石台阶 + 苍空石砖块台阶 - 泥巴镐 - 泥巴斧 - 泥巴铲 - 泥巴剑 - 泥巴锄 - 泥巴头盔 - 泥巴胸甲 - 泥巴护腿 - 泥巴鞋子 - - 紫晶镐 - 紫晶斧 - 紫晶铲 - 紫晶剑 - 紫晶锄 - 紫晶头盔 - 紫晶胸甲 - 紫晶护腿 - 紫晶鞋子 - - 木头镰刀 - 石头镰刀 - 铁镰刀 - 金镰刀 - 钻石镰刀 - 泥土镰刀 - 紫晶镰刀 + 红岩圆石台阶 + 红岩砖块台阶 + 泥巴砖块台阶 + 苍空石圆石台阶 + 苍空石砖块台阶 - 上古手杖 - 上古手杖手柄 - 上古手杖杆 - 上古手杖龙头 - 废弃的上古手杖 + 刺槐树木板 + 樱桃树木板 + 黑暗树木板 + 杉树木板 + 阁楼树木板 + 魔法树木板 + 红树木板 + 棕榈树木板 + 红木树木板 + 柳树木板 + 竹板 + 松树木板 + 地狱皮树木板 + 蓝花楹树木板 - 灵魂操纵器 - 幽魂灵魂操纵器 - 村民灵魂操纵器 + 刺槐树原木 + 樱桃树原木 + 黑暗树原木 + 杉树原木 - 末地逃逸护符 + 阁楼树原木 + 魔法树原木 + 红树原木 + 棕榈树原木 - 音乐唱片 - 音乐唱片 + 红木原木 + 柳树原木 + 垂死树原木 + 巨大花茎 - 黯淡之花环 - 平凡之花环 - 丰饶之花环 - 异域之花环 - - - 紫晶桶 - 泉水桶 - 毒液桶 - - 毒液 - 泉水 - - - 通往应许之地的神迹之门降临于苍穹之上. - 神迹之门降临于苍穹之上. - - - 超多生态群落 - - - 超多生态群落 + 松树原木 + 地狱皮树原木 + 蓝花楹树原木 + + 黄色秋天树叶 + 竹叶 + 魔法树叶 + 黑暗树叶 + 垂死树叶 + 杉树树叶 + 阁楼树树叶 + 橙色秋天树叶 + + Origin树叶 + 粉樱桃树叶 + 枫树叶 + 白樱桃树叶 + 地狱皮树叶 + 蓝花楹树叶 + + 刺槐树木板 + 樱桃树木板 + 黑暗树木板 + 杉树木板 + 阁楼树木板 + 魔法树木板 + 红树木板 + 棕榈树木板 + 红木木板 + 柳树木板 + 松树木板 + 地狱皮树木板 + 蓝花楹树木板 + + 刺槐树台阶 + 樱桃树台阶 + 黑暗树台阶 + 杉树台阶 + 阁楼树台阶 + 魔法树台阶 + 红树台阶 + 棕榈树台阶 + 红木台阶 + 柳树台阶 + 松树台阶 + 地狱皮树台阶 + 蓝花楹树台阶 + + 刺槐木楼梯 + 樱桃木楼梯 + 黑暗木楼梯 + 冷杉木楼梯 + 阁楼木楼梯 + 魔法木楼梯 + 红树木楼梯 + 棕榈木楼梯 + 红杉木楼梯 + 柳树木楼梯 + 松树木楼梯 + 地狱皮木楼梯 + 蓝花楹树楼梯 + + 刺槐树叶 + 红树叶 + 棕榈叶 + 红杉叶 + 柳树叶 + 松树叶 + + + 浆果 + 蘑菇粉 + 葵花籽 + + 飞镖吹筒 + 飞镖 + 毒飞镖 + + 泥球 + + 泥砖 + 一小堆灰烬 + 紫晶 + 毒药 + 仙域水晶碎片 + 蓝色染料 + 棕色染料 + 绿色染料 + 白色染料 + 黑色染料 + 红宝石 + 橄榄石 + 黄玉 + 坦桑石 + 磷灰石 + 蓝宝石 + 幽魂灵魂 + + 泥巴镐 + 泥巴斧 + 泥巴铲 + 泥巴剑 + 泥巴锄 + 泥巴头盔 + 泥巴胸甲 + 泥巴护腿 + 泥巴鞋子 + + 紫晶镐 + 紫晶斧 + 紫晶铲 + 紫晶剑 + 紫晶锄 + 紫晶头盔 + 紫晶胸甲 + 紫晶护腿 + 紫晶鞋子 + + 木头镰刀 + 石头镰刀 + 铁镰刀 + 金镰刀 + 钻石镰刀 + 泥土镰刀 + 紫晶镰刀 + + 上古手杖 + 上古手杖手柄 + 上古手杖杆 + 上古手杖龙头 + 废弃的上古手杖 + + 灵魂操纵器 + 幽魂灵魂操纵器 + 村民灵魂操纵器 + + 末地逃逸护符 + + 音乐唱片 + 音乐唱片 + + 黯淡之花环 + 平凡之花环 + 丰饶之花环 + 异域之花环 + + + 紫晶桶 + 泉水桶 + 毒液桶 + + 毒液 + 泉水 + + 毒液 + 泉水 + + + 通往应许之地的神迹之门降临于苍穹之上. + 神迹之门降临于苍穹之上. + + + 超多生态群落 + + + 超多生态群落 From c906fd3496abf6b15f46f89a66321938ce8e788a Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:19:05 +0400 Subject: [PATCH 04/29] Fix tabs in de_DE.xml --- resources/assets/biomesoplenty/lang/de_DE.xml | 674 +++++++++--------- 1 file changed, 337 insertions(+), 337 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/de_DE.xml b/resources/assets/biomesoplenty/lang/de_DE.xml index 11bdb36d0..0eff57908 100644 --- a/resources/assets/biomesoplenty/lang/de_DE.xml +++ b/resources/assets/biomesoplenty/lang/de_DE.xml @@ -1,379 +1,379 @@ - Deutsche (de_DE) Sprachdatei vom 09.06.2013 erstellt von Baalith. + Deutsche (de_DE) Sprachdatei vom 09.06.2013 erstellt von Baalith. - - Matsch - Treibsand + + Matsch + Treibsand - Aschestein - Gehärteter Sand - Gehärtete Erde - Packeis - Getrocknete Erde - Gpitzer Fels - Lehmziegel - Heilige Erde - Himmlischer Kristall + Aschestein + Gehärteter Sand + Gehärtete Erde + Packeis + Getrocknete Erde + Gpitzer Fels + Lehmziegel + Heilige Erde + Himmlischer Kristall - Rotfels - Rotfelssteinpflaster - Rotfelsziegel - - Ascheblock + Rotfels + Rotfelssteinpflaster + Rotfelsziegel - Totes Gras - Wüstengras - Wüstensprossen - Dünengras - Heiliges Hohes Gras - Dornen - Gerste - Rohrkolben - Rohrkolben - Rohrkolben - Schilf - Kleiner Kaktus - Witherwarze + Ascheblock - Klee - Sumpfblume - Tote Blume - Schimmernde Blume - Blaue Hortensie - Orange Kosmee - Pinke Narzisse - Wildblume - Veilchen - Weißes Windröschen - Wasserlilie - Chromablume - Aloe - Sonnenblume - Sonnenblume - Weißer Löwenzahn + Totes Gras + Wüstengras + Wüstensprossen + Dünengras + Heiliges Hohes Gras + Dornen + Gerste + Rohrkolben + Rohrkolben + Rohrkolben + Schilf + Kleiner Kaktus + Witherwarze - Algen - Kurzes Gras - Gras - Hohes Gras - Busch - Sprössling - Hohes Gras - Gift-Efeu - Beerenbusch - - Riesige Rote Blume - Riesige Gelbe Blume - - Fliegenpilz - Champignon - Indigo-Reizker - Glimmerling - - Apfelsetzling - Gelber Herbstsetzling - Bambussetzling - Magischer Setzling - Dunkler Setzling - Sterbender Setzling - Tannensetzling - Heiliger Setzling - Oranger Herbstsetzling - Ursprünglicher Setzling - Pinkfarbener Kirschsetzling - Ahornsetzling - Weißer Kirschsetzling - Höllenrindensetzling - Jacarandasetzling - Kakibaumsetzling + Klee + Sumpfblume + Tote Blume + Schimmernde Blume + Blaue Hortensie + Orange Kosmee + Pinke Narzisse + Wildblume + Veilchen + Weißes Windröschen + Wasserlilie + Chromablume + Aloe + Sonnenblume + Sonnenblume + Weißer Löwenzahn - Akaziensetzling - Mangrovensetzling - Palmsetzling - Mammutbaumsetzling - Weidensetzling - Piniensetzling - - Weide - Efeu - Apfelbaumblätter - Kakibaumblätter - Bambus - Lehmziegelstufen - Ursprüngliches Gras - Langes Gras - Baummoos + Algen + Kurzes Gras + Gras + Hohes Gras + Busch + Sprössling + Hohes Gras + Gift-Efeu + Beerenbusch - Seetang + Riesige Rote Blume + Riesige Gelbe Blume + + Fliegenpilz + Champignon + Indigo-Reizker + Glimmerling + + Apfelsetzling + Gelber Herbstsetzling + Bambussetzling + Magischer Setzling + Dunkler Setzling + Sterbender Setzling + Tannensetzling + Heiliger Setzling + Oranger Herbstsetzling + Ursprünglicher Setzling + Pinkfarbener Kirschsetzling + Ahornsetzling + Weißer Kirschsetzling + Höllenrindensetzling + Jacarandasetzling + Kakibaumsetzling + + Akaziensetzling + Mangrovensetzling + Palmsetzling + Mammutbaumsetzling + Weidensetzling + Piniensetzling + + Weide + Efeu + Apfelbaumblätter + Kakibaumblätter + Bambus + Lehmziegelstufen + Ursprüngliches Gras + Langes Gras + Baummoos + + Seetang Pinke Koralle Orange Koralle Blaue Koralle Leuchtende Koralle - - Rotfelssteinpflastertreppe - Rotfelsziegeltreppe - - Heiliges Gras - Verkohltes Gras - - Heiliger Stein - Heiliges Kopfsteinpflaster - Heilige Ziegel - - Heilige Kopfsteinpflastertreppe - Heilige Ziegeltreppe - Portal zum Gelobten Land + Rotfelssteinpflastertreppe + Rotfelsziegeltreppe - Amethysterz - Amethystblock - Rubinerz - Rubinblock - Peridoterz - Peridotblock - Topazerz - Topazblock - Tansaniterz - Tansanitblock - Apatiterz - Apatitblock - Saphirerz - Saphirblock - - Moos - - Wolkenblock + Heiliges Gras + Verkohltes Gras - Kleines Knochensegment - Knochensegment - Großes Knochensegment + Heiliger Stein + Heiliges Kopfsteinpflaster + Heilige Ziegel - Himmlische Linse - - Opfer-Fokus - Opfer-Fokus - Opfer-Fokus - - Altarrahmen - - Pfütze - - Grabstein + Heilige Kopfsteinpflastertreppe + Heilige Ziegeltreppe - Rotfelssteinpflasterstufe - Rotfelsziegelstufe - Lehmziegelstufe - Heilige Kopfsteinpflasterstufe - Heilige Ziegelstufe + Portal zum Gelobten Land - Rotfelssteinpflasterstufe - Rotfelsziegelstufe - Lehmziegelstufe - Heilige Kopfsteinpflasterstufe - Heilige Ziegelstufe + Amethysterz + Amethystblock + Rubinerz + Rubinblock + Peridoterz + Peridotblock + Topazerz + Topazblock + Tansaniterz + Tansanitblock + Apatiterz + Apatitblock + Saphirerz + Saphirblock - Akazienholzbretter - Kirschholzbretter - Dunkle Holzbretter - Tannenholzbretter - Heilige Holzbretter - Magische Holzbretter - Mangrovenholzbretter - Palmholzbretter - Mammutbaumholzbretter - Weidenholzbretter - Bambusbretter - Pinienholzbretter - Höllenrindenholzbretter - Jacarandaholzbretter + Moos - Akazienholz - Kirschholz - Dunkles Holz - Tannenholz + Wolkenblock - Heiliges Holz - Magisches Holz - Mangrovenholz - Palmholz + Kleines Knochensegment + Knochensegment + Großes Knochensegment - Mammutbaumholz - Weidenholz - Totes Holz - Riesiger Blumenstamm + Himmlische Linse - Pinienholz - Höllenrindenholz - Jacarandaholz + Opfer-Fokus + Opfer-Fokus + Opfer-Fokus - Gelbes Herbstlaub - Bambuslaub - Magisches Laub - Dunkles Laub - Sterbendes Laub - Tannenlaub - Heiliges Laub - Orangefarbenes Herbstlaub + Altarrahmen - Ursprüngliches Laub - Pinkfarbenes Kirschlaub - Ahornlaub - Weißes Kirschlaub - Höllenrindenlaub - Jacarandalaub + Pfütze - Akazienholzstufe - Kirschholzstufe - Dunkle Holzstufe - Tannenholzstufe - Heilige Holzstufe - Magische Holzstufe - Mangrovenholzstufe - Palmholzstufe - Mammutbaumholzstufe - Weidenholzstufe - Pinienholzstufe - Höllenrindenholzstufe - Jacarandaholzstufe + Grabstein - Akazienholzstufe - Kirschholzstufe - Dunkle Holzstufe - Tannenholzstufe - Heilige Holzstufe - Magische Holzstufe - Mangrovenholzstufe - Palmholzstufe - Mammutbaumholzstufe - Weidenholzstufe - Pinienholzstufe - Höllenrindenholzstufe - Jacarandaholzstufe + Rotfelssteinpflasterstufe + Rotfelsziegelstufe + Lehmziegelstufe + Heilige Kopfsteinpflasterstufe + Heilige Ziegelstufe - Akazienholztreppe - Kirschholztreppe - Dunkle Holztreppe - Tannenholztreppe - Heilige Holztreppe - Magische Holztreppe - Mangrovenholztreppe - Palmholztreppe - Mammutbaumholztreppe - Weidenholztreppe - Pinienholztreppe - Höllenrindenholztreppe - Jacarandaholztreppe + Rotfelssteinpflasterstufe + Rotfelsziegelstufe + Lehmziegelstufe + Heilige Kopfsteinpflasterstufe + Heilige Ziegelstufe - Akazienlaub - Mangrovenlaub - Palmlaub - Mammutbaumlaub - Weidenlaub - Pinienlaub - - - Beere - Pilzpulver - Wilde Karotten - Sonnenblumenkerne - Obstsalat - Gemüsesalat - Pilzsalat - Kaki + Akazienholzbretter + Kirschholzbretter + Dunkle Holzbretter + Tannenholzbretter + Heilige Holzbretter + Magische Holzbretter + Mangrovenholzbretter + Palmholzbretter + Mammutbaumholzbretter + Weidenholzbretter + Bambusbretter + Pinienholzbretter + Höllenrindenholzbretter + Jacarandaholzbretter - Blasrohr - Dart - Vergifteter Dart - - Matschball + Akazienholz + Kirschholz + Dunkles Holz + Tannenholz - Matschziegel - Aschehaufen - Amethyst - Gift - Himmlischer Kristallsplitter - Blauer Farbstoff - Brauner Farbstoff - Grüner Farbstoff - Weißer Farbstoff - Schwarzer Farbstoff - Rubin - Peridot - Topaz - Tansanit - Apatit - Saphir - Umhergeisternde Seele + Heiliges Holz + Magisches Holz + Mangrovenholz + Palmholz - Matschige Spitzhacke - Matschige Axt - Matschige Schaufel - Matschiges Schwert - Matschige Hacke - Matschiger Helm - Matschiger Harnisch - Matschige Hose - Matschige Stiefel - - Amethystspitzhacke - Amethystaxt - Amethystschaufel - Amethystschwert - Amethysthacke - Amethysthelm - Amethystharnisch - Amethystbeinschutz - Amethyststiefel - - Holzsense - Steinsense - Eisensense - Goldsense - Diamantsense - Matschsense - Amethystsense + Mammutbaumholz + Weidenholz + Totes Holz + Riesiger Blumenstamm - Antiker Stab - Antiker Stabgriff - Antike Stabsstange - Antike Stabspitze - Verbrauchter Antiker Stab + Pinienholz + Höllenrindenholz + Jacarandaholz - Seelenmanipulator - Umhergeisternde-Seelen-Manipulator - Dorfbewohnerseelen-Manipulator + Gelbes Herbstlaub + Bambuslaub + Magisches Laub + Dunkles Laub + Sterbendes Laub + Tannenlaub + Heiliges Laub + Orangefarbenes Herbstlaub - Enderporter + Ursprüngliches Laub + Pinkfarbenes Kirschlaub + Ahornlaub + Weißes Kirschlaub + Höllenrindenlaub + Jacarandalaub - Schallplatte - Verdreckte Schallplatte + Akazienholzstufe + Kirschholzstufe + Dunkle Holzstufe + Tannenholzstufe + Heilige Holzstufe + Magische Holzstufe + Mangrovenholzstufe + Palmholzstufe + Mammutbaumholzstufe + Weidenholzstufe + Pinienholzstufe + Höllenrindenholzstufe + Jacarandaholzstufe - Einfaches Blumenband - Blumenband - Üppiges Blumenband - Exotisches Blumenband - - - Amethyst-Eimer - Amethyst-Eimer mit Quellwasser - Eimer mit Gift - - Gift - Quellwasser - - Gift - Quellwasser - - - Ein Portal zum gelobten Land ist im Himmel entstanden. - Ein Portal ist im Himmel entstanden. - - - Biomes O' Plenty - - - Biomes O' Plenty + Akazienholzstufe + Kirschholzstufe + Dunkle Holzstufe + Tannenholzstufe + Heilige Holzstufe + Magische Holzstufe + Mangrovenholzstufe + Palmholzstufe + Mammutbaumholzstufe + Weidenholzstufe + Pinienholzstufe + Höllenrindenholzstufe + Jacarandaholzstufe + + Akazienholztreppe + Kirschholztreppe + Dunkle Holztreppe + Tannenholztreppe + Heilige Holztreppe + Magische Holztreppe + Mangrovenholztreppe + Palmholztreppe + Mammutbaumholztreppe + Weidenholztreppe + Pinienholztreppe + Höllenrindenholztreppe + Jacarandaholztreppe + + Akazienlaub + Mangrovenlaub + Palmlaub + Mammutbaumlaub + Weidenlaub + Pinienlaub + + + Beere + Pilzpulver + Wilde Karotten + Sonnenblumenkerne + Obstsalat + Gemüsesalat + Pilzsalat + Kaki + + Blasrohr + Dart + Vergifteter Dart + + Matschball + + Matschziegel + Aschehaufen + Amethyst + Gift + Himmlischer Kristallsplitter + Blauer Farbstoff + Brauner Farbstoff + Grüner Farbstoff + Weißer Farbstoff + Schwarzer Farbstoff + Rubin + Peridot + Topaz + Tansanit + Apatit + Saphir + Umhergeisternde Seele + + Matschige Spitzhacke + Matschige Axt + Matschige Schaufel + Matschiges Schwert + Matschige Hacke + Matschiger Helm + Matschiger Harnisch + Matschige Hose + Matschige Stiefel + + Amethystspitzhacke + Amethystaxt + Amethystschaufel + Amethystschwert + Amethysthacke + Amethysthelm + Amethystharnisch + Amethystbeinschutz + Amethyststiefel + + Holzsense + Steinsense + Eisensense + Goldsense + Diamantsense + Matschsense + Amethystsense + + Antiker Stab + Antiker Stabgriff + Antike Stabsstange + Antike Stabspitze + Verbrauchter Antiker Stab + + Seelenmanipulator + Umhergeisternde-Seelen-Manipulator + Dorfbewohnerseelen-Manipulator + + Enderporter + + Schallplatte + Verdreckte Schallplatte + + Einfaches Blumenband + Blumenband + Üppiges Blumenband + Exotisches Blumenband + + + Amethyst-Eimer + Amethyst-Eimer mit Quellwasser + Eimer mit Gift + + Gift + Quellwasser + + Gift + Quellwasser + + + Ein Portal zum gelobten Land ist im Himmel entstanden. + Ein Portal ist im Himmel entstanden. + + + Biomes O' Plenty + + + Biomes O' Plenty From 9166e3d00c47a5e72d973c11f8a0152df762c536 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:20:54 +0400 Subject: [PATCH 05/29] Fix tabs in fr_CA.xml, delete unused names --- resources/assets/biomesoplenty/lang/fr_CA.xml | 103 +++++++++--------- 1 file changed, 49 insertions(+), 54 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/fr_CA.xml b/resources/assets/biomesoplenty/lang/fr_CA.xml index efb9a6378..4b3d77df6 100644 --- a/resources/assets/biomesoplenty/lang/fr_CA.xml +++ b/resources/assets/biomesoplenty/lang/fr_CA.xml @@ -20,7 +20,7 @@ Roche Rouge Roche Rouge Briques de Pierre Rouge - + Ash Block Herbe Morte @@ -34,19 +34,17 @@ Massettes Massettes Roseau + Petit Cactus Trèfles Fleur des Marais Clochettes de la Mort Fleur Luisante Hydrangéa - Marguerite - Tulipe Fleur Sauvage Violette Anémone Fleur de Nénuphar - Petit Cactus Aloé Tornesol Tornesol @@ -61,15 +59,15 @@ Herbe Haute Sumac Vénéneux Buisson à Baies - + Fleur Rouge Géante Fleur Jaune Géante - + Psylocybes Champignon de Paris Lactaire Indigo Champignol Luisant - + Pousse de Pomier Pousse d'arbe d'automne jaune Pousse de Bambou @@ -92,29 +90,30 @@ Pousse de Séquoia Pousse de Saule Pousse de Pin - - Lianes de Saule - Sumac - Feuilles de Pomier - Bambou - Escaliers en Briques de Boue - Herbe Originelle Bloc d'Herbe Longue - Mousse d'Arbre - Algue Brune - - Escaliers en Pierre Rouge - Escaliers en Briques de Pierre Rouge - - Herbe Purifiée - Herbe en Fusion - - Roche Céleste - Pierre Céleste - Briques de Pierre Céleste - - Escaliers en Pierre Céleste - Escaliers en Roche Céleste + Lianes de Saule + Sumac + Feuilles de Pomier + Bambou + Escaliers en Briques de Boue + Herbe Originelle + Bloc d'Herbe Longue + Mousse d'Arbre + + Algue Brune + + Escaliers en Pierre Rouge + Escaliers en Briques de Pierre Rouge + + Herbe Purifiée + Herbe en Fusion + + Roche Céleste + Pierre Céleste + Briques de Pierre Céleste + + Escaliers en Pierre Céleste + Escaliers en Roche Céleste Portail de la Terre Promise @@ -133,25 +132,25 @@ Minerai de saphir Bloc de saphir - Mousse - - Bloc de Nuage + Mousse + + Bloc de Nuage Petit Morceau d'Os Morceau d'Os Moyen Gros Morceau d'Os Lentille Céleste - + Foyer de Sacrifice Foyer de Sacrifice Foyer de Sacrifice - + Autel - + Flaque - - Tombe + + Tombe Dalle en Pierre Rouge Dalle en Briques de Pierre Rouge @@ -263,12 +262,8 @@ Feuilles de Séquoia Feuilles de Saule Feuilles de Pin - - - Poudre de champignon - Graines de tournesol - + Baie Poudre de champignon Carottes Sauvages @@ -280,7 +275,7 @@ Sarbacanne Fléchettes Fléchettes Empoisonnées - + Boule de boue Brique de boue @@ -310,7 +305,7 @@ Plastron en boue Jambières en boue Bottes en boue - + Pioche en améthyste Hache en améthyste Pelle en améthyste @@ -320,7 +315,7 @@ Plastron en améthyste Jambières en améthyste Bottes en améthyste - + Faux en bois Faux en pierre Faux en fer @@ -348,26 +343,26 @@ Couronne de fleurs simple Couronne de fleurs luxuriante Couronne de fleurs exotique - + Seau en améthyste Seau d'eau chaude en améthyste Seau de poison liquide - + Poison liquide Eau chaude - + Poison liquide - Eau chaude - + Eau chaude + Un passage vers la Terre Promise est apparu haut dans le ciel. Un passage vers la terre est apparu haut dans le ciel. - + - Biomes O' Plenty - + Biomes O' Plenty + - Biomes O' Plenty + Biomes O' Plenty From ffdf43c0cca9e066356b1525405605c452f9e735 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:33:48 +0400 Subject: [PATCH 06/29] Fix tabs in fr_FR.xml, delete unused names --- resources/assets/biomesoplenty/lang/fr_FR.xml | 101 +++++++++--------- 1 file changed, 48 insertions(+), 53 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/fr_FR.xml b/resources/assets/biomesoplenty/lang/fr_FR.xml index 048e18bf1..fbc2c1d32 100644 --- a/resources/assets/biomesoplenty/lang/fr_FR.xml +++ b/resources/assets/biomesoplenty/lang/fr_FR.xml @@ -20,7 +20,7 @@ Roche Rouge Roche Rouge Briques de Pierre Rouge - + Ash Block Herbe Morte @@ -34,19 +34,17 @@ Massettes Massettes Roseau + Petit Cactus Trèfles Fleur des Marais Clochettes de la Mort Fleur Luisante Hydrangéa - Marguerite - Tulipe Fleur Sauvage Violette Anémone Fleur de Nénuphar - Petit Cactus Aloé Tornesol Tornesol @@ -61,15 +59,15 @@ Herbe Haute Sumac Vénéneux Buisson à Baies - + Fleur Rouge Géante Fleur Jaune Géante - + Psylocybes Champignon de Paris Lactaire Indigo Champignol Luisant - + Pousse de Pomier Pousse d'arbe d'automne jaune Pousse de Bambou @@ -92,29 +90,30 @@ Pousse de Séquoia Pousse de Saule Pousse de Pin - + Lianes de Saule - Sumac - Feuilles de Pomier + Sumac + Feuilles de Pomier Bambou - Escaliers en Briques de Boue - Herbe Originelle Bloc d'Herbe Longue - Mousse d'Arbre + Escaliers en Briques de Boue + Herbe Originelle + Bloc d'Herbe Longue + Mousse d'Arbre Algue Brune - - Escaliers en Pierre Rouge - Escaliers en Briques de Pierre Rouge - - Herbe Purifiée - Herbe en Fusion - - Roche Céleste - Pierre Céleste - Briques de Pierre Céleste - - Escaliers en Pierre Céleste - Escaliers en Roche Céleste + + Escaliers en Pierre Rouge + Escaliers en Briques de Pierre Rouge + + Herbe Purifiée + Herbe en Fusion + + Roche Céleste + Pierre Céleste + Briques de Pierre Céleste + + Escaliers en Pierre Céleste + Escaliers en Roche Céleste Portail de la Terre Promise @@ -132,26 +131,26 @@ Bloc d'apatite Minerai de saphir Bloc de saphir - - Mousse - - Bloc de Nuage + + Mousse + + Bloc de Nuage Petit Morceau d'Os Morceau d'Os Moyen Gros Morceau d'Os Lentille Céleste - + Foyer de Sacrifice Foyer de Sacrifice Foyer de Sacrifice - + Autel - + Flaque - - Tombe + + Tombe Dalle en Pierre Rouge Dalle en Briques de Pierre Rouge @@ -263,14 +262,10 @@ Feuilles de Séquoia Feuilles de Saule Feuilles de Pin - - - Poudre de champignon - Graines de tournesol - + Baie - Poudre de champignon + Poudre de champignon Carottes Sauvages Graines de tournesol Salade de fruits @@ -280,7 +275,7 @@ Sarbacanne Fléchettes Fléchettes Empoisonnées - + Boule de boue Brique de boue @@ -310,7 +305,7 @@ Plastron en boue Jambières en boue Bottes en boue - + Pioche en améthyste Hache en améthyste Pelle en améthyste @@ -320,7 +315,7 @@ Plastron en améthyste Jambières en améthyste Bottes en améthyste - + Faux en bois Faux en pierre Faux en fer @@ -348,26 +343,26 @@ Couronne de fleurs simple Couronne de fleurs luxuriante Couronne de fleurs exotique - + Seau en améthyste Seau d'eau chaude en améthyste Seau de poison liquide - + Poison liquide Eau chaude - + Poison liquide - Eau chaude - + Eau chaude + Un passage vers la Terre Promise est apparu haut dans le ciel. Un passage vers la terre est apparu haut dans le ciel. - + - Biomes O' Plenty - + Biomes O' Plenty + - Biomes O' Plenty + Biomes O' Plenty From 58242d7dfcc3f3783ed75a670f6c062e0db83800 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:35:47 +0400 Subject: [PATCH 07/29] Fix small derp in fr_CA.xml --- resources/assets/biomesoplenty/lang/fr_CA.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/biomesoplenty/lang/fr_CA.xml b/resources/assets/biomesoplenty/lang/fr_CA.xml index 4b3d77df6..b1db456a6 100644 --- a/resources/assets/biomesoplenty/lang/fr_CA.xml +++ b/resources/assets/biomesoplenty/lang/fr_CA.xml @@ -265,7 +265,7 @@ Baie - Poudre de champignon + Poudre de champignon Carottes Sauvages Graines de tournesol Salade de fruits From 8733f82b3dd7839b09dad608b4ae01cac8e4fc06 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:43:27 +0400 Subject: [PATCH 08/29] Fix tabs in ja_JP.xml, delete unused names --- resources/assets/biomesoplenty/lang/ja_JP.xml | 100 ++++++++---------- 1 file changed, 47 insertions(+), 53 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/ja_JP.xml b/resources/assets/biomesoplenty/lang/ja_JP.xml index d7284075d..396750520 100644 --- a/resources/assets/biomesoplenty/lang/ja_JP.xml +++ b/resources/assets/biomesoplenty/lang/ja_JP.xml @@ -20,7 +20,7 @@ 赤岩 赤岩の丸石 赤岩レンガ - + 火山灰ブロック 古草 @@ -34,19 +34,17 @@ ガマ ガマ ヨシ + 小さなサボテン クローバー 沼の花 死の新芽 光る花 アジサイ - ヒナギク - チューリップ 野草 スミレ アネモネ スイレン - 小さなサボテン アロエ ひまわり ひまわり @@ -61,15 +59,15 @@ 背丈が高い草 ツタウルシ 果実がなった茂み - + 巨大な花(赤) 巨大な花(黄) - + 毒キノコ ポートベロー ブルーミルクキャップ 光るキノコ - + リンゴの木の苗木 紅葉樹(黄)の苗木 竹の苗木 @@ -92,30 +90,30 @@ セコイアの苗木 柳の苗木 松の苗木 - + 柳の葉 - ツタ - リンゴの葉 + ツタ + リンゴの葉 - 泥レンガの階段 - アルファの草ブロック + 泥レンガの階段 + アルファの草ブロック 長い草ブロック - 木の苔 + 木の苔 昆布 - - 赤岩の丸石の階段 - 赤岩レンガの階段 - - 浄化された草ブロック - 燻っている草ブロック - - 天空の石 - 天空の丸石 - 天空の石レンガ - - 天空の丸石の階段 - 天空の石レンガの階段 + + 赤岩の丸石の階段 + 赤岩レンガの階段 + + 浄化された草ブロック + 燻っている草ブロック + + 天空の石 + 天空の丸石 + 天空の石レンガ + + 天空の丸石の階段 + 天空の石レンガの階段 Promised Land Portal @@ -133,26 +131,26 @@ アパタイトブロック サファイア鉱石 サファイアブロック - - - - 雲ブロック + + + + 雲ブロック 骨ブロック(小) 骨ブロック(中) 骨ブロック(大) 天界の水晶体 - + 生贄の炉 生贄の炉 生贄の炉 - + 祭壇の骨組み - + 水たまり - - + + 赤岩の丸石ハーフブロック 赤岩レンガハーフブロック @@ -264,14 +262,10 @@ セコイアの葉 柳の葉 松の葉 - - - マッシュルームパウダー - ひまわりの種 - + 果実 - マッシュルームパウダー + マッシュルームパウダー 野生のニンジン ひまわりの種 フルーツサラダ @@ -281,7 +275,7 @@ 吹き筒 毒矢 - + 泥だんご 泥レンガ @@ -311,7 +305,7 @@ 泥状のチェストプレート 泥状のレギンス 泥状のブーツ - + アメジストのツルハシ アメジストの斧 アメジストのシャベル @@ -321,7 +315,7 @@ アメジストのチェストプレート アメジストのレギンス アメジストのブーツ - + 木の鎌 石の鎌 鉄の鎌 @@ -349,26 +343,26 @@ 質素な花の冠 緑豊かな花の冠 エキゾチックな花の冠 - + アメジストバケツ 温泉入りアメジストバケツ 毒液入りバケツ - + 毒液 温泉 - + 毒液 - 温泉 - + 温泉 + Promised Landへのゲートは上空に現れた。 地上へのゲートは上空に現れた。 - + - Biomes O' Plenty - + Biomes O' Plenty + - Biomes O' Plenty + Biomes O' Plenty From 8587c782bd59501fbaece5ad0c36d6f4ad3c40fa Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:52:08 +0400 Subject: [PATCH 09/29] Fix tabs in nl_NL.xml, delete unused names --- resources/assets/biomesoplenty/lang/nl_NL.xml | 89 ++++++++++--------- 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/nl_NL.xml b/resources/assets/biomesoplenty/lang/nl_NL.xml index 4db302f86..4f235df63 100644 --- a/resources/assets/biomesoplenty/lang/nl_NL.xml +++ b/resources/assets/biomesoplenty/lang/nl_NL.xml @@ -20,7 +20,7 @@ Rode steen Red Rock Cobblestone Rode baksteen - + As Blok Dood gras @@ -34,19 +34,17 @@ Riet Riet Riet + Kleine Cactus klaver Moerasbloem Doodbloem Gloeiendebloem Hortensia - Madeliefje - Tulp Wildebloem Violet Anemoon Waterlely - Kleine Cactus Aloë Zonnebloem Zonnebloem @@ -61,15 +59,15 @@ Hoog Gras Brandnetel Besjes bosje - + Grote rode bloem Grote gele bloem - + Vergiftige paddestoel Portobello Blauwe paddestoel Gloeiende paddestoel - + Apple Sapling Yellow Autumn Sapling Bamboo Sapling @@ -92,29 +90,29 @@ Redwood Sapling Willow Sapling Pine Sapling - + Wilg - Ivy - Appel Bladeren + Ivy + Appel Bladeren Bambo - Modder Bricks Stairs - Origin Grass - Tree Moss + Modder Bricks Stairs + Origin Grass + Tree Moss Kelp - - Red Rock Cobblestone Stairs - Red Rock Bricks Stairs - - Purified Grass - Smoldering Grass - - Luchtsteen - Luchtsteen Cobblestone - Luchtsteen Bricks - - Luchtsteen Cobblestone Stairs - Luchtsteen Bricks Stairs + + Red Rock Cobblestone Stairs + Red Rock Bricks Stairs + + Purified Grass + Smoldering Grass + + Luchtsteen + Luchtsteen Cobblestone + Luchtsteen Bricks + + Luchtsteen Cobblestone Stairs + Luchtsteen Bricks Stairs Beloofde Land Portal @@ -133,9 +131,9 @@ Sapphire Ore Block of Sapphire - Mos - - Wolk Blok + Mos + + Wolk Blok Small Bone Segment Medium Bone Segment @@ -143,7 +141,7 @@ Celestial Lens Sacrificial Focus - + Altar Frame Red Rock Cobblestone Slab @@ -256,18 +254,16 @@ Roodhout Bladeren Wilge Bladeren Naald Bladeren - - - Shroom Powder - ZonneBloemen zaaden - - Bes + + Shroom Powder + ZonneBloemen zaaden + Bes Dart Schieter Dart Gif Dart - + Modder Bal Mud Brick @@ -297,7 +293,7 @@ Modderige Kuras Modderige Beenstukken Modderige Schoenen - + Amethyst Houweel Amethyst Bijl Amethyst Shep @@ -325,16 +321,25 @@ Plain Flower Band Lush Flower Band Exotic Flower Band - - + + Spring Water Bucket Liquid Poison Bucket - + Liquid Poison Spring Water - + + Liquid Poison + Spring Water + Een portal naar de beloofde wereld is verschenen in de lucht. Een portal is verschenen in de lucht. + + Biomes O' Plenty + + + Biomes O' Plenty + From 1e6d61320f43fea3e603290f05d720c99a8d9929 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Sep 2013 12:58:58 +0400 Subject: [PATCH 10/29] Fix tabs in pl_PL.xml, delete unused names --- resources/assets/biomesoplenty/lang/pl_PL.xml | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/pl_PL.xml b/resources/assets/biomesoplenty/lang/pl_PL.xml index 9298b0ad8..940db8dee 100644 --- a/resources/assets/biomesoplenty/lang/pl_PL.xml +++ b/resources/assets/biomesoplenty/lang/pl_PL.xml @@ -2,9 +2,9 @@ Polski (pl_PL) Localization File - + - + Błoto Ruchome piaski @@ -22,7 +22,7 @@ Czerwona skała Czerwony bruk Cegły z czerwonej skały - + Blok popiołu Martwa trawa @@ -64,15 +64,15 @@ Wysoka trawa Trujący bluszcz Krzak jagodowy - + Wielki czerwony kwiat Wielki żółty kwiat - + Muchomor Portobello Lactarius indigo Świecący grzyb - + Sadzonka jabłoni Sadzonka jesiennego żółtego drzewa Sadzonka bambusa @@ -88,37 +88,37 @@ Sadzonka białej wiśni Sadzonka piekielnego drzewa Sadzonka jakarandy - + Sadzonka akacji Sadzonka namorzyna Sadzonka palmy Sadzonka sekwoji Sadzonka wierzby Sadzonka sosny - - Wierzba - Bluszcz - Liście jabłoni - Bambus - Schody z błota - Pierwotna trawa - Blok długiej trawy - Mech - Listownicowce - - Schody z czerwonego bruku - Schody z czerwonej skały - - Blok oczyszczonej trawy - Blok tlącej się trawy - - Niebiańska skała - Niebiański bruk - Niebiańskie cegły - - Schody z niebiańskiego bruku - Schody z niebiańskiej cegły + Wierzba + Bluszcz + Liście jabłoni + Bambus + Schody z błota + Pierwotna trawa + Blok długiej trawy + Mech + + Listownicowce + + Schody z czerwonego bruku + Schody z czerwonej skały + + Blok oczyszczonej trawy + Blok tlącej się trawy + + Niebiańska skała + Niebiański bruk + Niebiańskie cegły + + Schody z niebiańskiego bruku + Schody z niebiańskiej cegły Portal do Ziemi Obiecanej @@ -136,26 +136,26 @@ Blok apatytu Ruda szafiru Blok szafiru - - Mech - - Chmura + + Mech + + Chmura Mała segment kośći Średni segment kośći Duży segment kośći Soczewka Celestii - + Ołtarz ofiarny Ołtarz ofiarny Ołtarz ofiarny - + Rama ołtarza - + Kałuża - - Grób + + Grób Płytka z czerwonego bruku Płytka z czerwonej skały @@ -267,7 +267,7 @@ Liście sekwoji Liście wierzbowe Sosnowe igły - + Jagoda Proszek halucynogenny @@ -280,7 +280,7 @@ Dmuchawka Rzutka Trująca rzutka - + Błotna kulka Cegła z błota @@ -310,7 +310,7 @@ Błotny napierśnik Błotne nagolenniki Błotne bóty - + Ametystowy kilof Ametystowe topór Ametystowa łopata @@ -320,7 +320,7 @@ Ametystowy napierśnik Ametystowe nagolenniki Ametystowe buty - + Drewniana kosa Kamienna kosa Żelazna kosa @@ -348,26 +348,26 @@ Zespół Gładki Kwiat Zespół Bujny Kwiat Zespół Egzotyczny Kwiat - + Ametystowe wiaderko Ametystowe wiaderko ze zdrowotną wodą źródlaną Wiaderko z trucizną - + Trucizna Zdrowotna woda źródlana - + Trucizna - Zdrowotna woda źródlana - + Zdrowotna woda źródlana + Brama niebios pojawiła się w górze Brama świata pojawiła się w górze - + - Biomes O' Plenty - + Biomes O' Plenty + - Biomes O' Plenty + Biomes O' Plenty From e00d8be486d2911a17114fbbab8a44a20d5c06b5 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Sun, 15 Sep 2013 13:41:09 +0200 Subject: [PATCH 11/29] Tabs are bad, use free spaces! I love Notepad++ --- resources/assets/biomesoplenty/lang/de_DE.xml | 635 ++++++++--------- resources/assets/biomesoplenty/lang/en_US.xml | 638 +++++++++--------- resources/assets/biomesoplenty/lang/fr_CA.xml | 614 ++++++++--------- resources/assets/biomesoplenty/lang/fr_FR.xml | 610 ++++++++--------- resources/assets/biomesoplenty/lang/ja_JP.xml | 610 ++++++++--------- resources/assets/biomesoplenty/lang/nl_NL.xml | 574 ++++++++-------- resources/assets/biomesoplenty/lang/pl_PL.xml | 620 ++++++++--------- resources/assets/biomesoplenty/lang/ru_RU.xml | 636 ++++++++--------- resources/assets/biomesoplenty/lang/zh_CN.xml | 600 ++++++++-------- 9 files changed, 2770 insertions(+), 2767 deletions(-) diff --git a/resources/assets/biomesoplenty/lang/de_DE.xml b/resources/assets/biomesoplenty/lang/de_DE.xml index 0eff57908..cf2f07242 100644 --- a/resources/assets/biomesoplenty/lang/de_DE.xml +++ b/resources/assets/biomesoplenty/lang/de_DE.xml @@ -1,379 +1,382 @@ - Deutsche (de_DE) Sprachdatei vom 09.06.2013 erstellt von Baalith. + Deutsche (de_DE) Sprachdatei vom 09.06.2013 erstellt von Baalith, bearbeitet von Vexatos. - - Matsch - Treibsand + + Matsch + Treibsand - Aschestein - Gehärteter Sand - Gehärtete Erde - Packeis - Getrocknete Erde - Gpitzer Fels - Lehmziegel - Heilige Erde - Himmlischer Kristall + Aschestein + Gehärteter Sand + Gehärtete Erde + Packeis + Getrocknete Erde + Gpitzer Fels + Lehmziegel + Heilige Erde + Himmlischer Kristall - Rotfels - Rotfelssteinpflaster - Rotfelsziegel + Rotfels + Rotfelssteinpflaster + Rotfelsziegel - Ascheblock + Ascheblock - Totes Gras - Wüstengras - Wüstensprossen - Dünengras - Heiliges Hohes Gras - Dornen - Gerste - Rohrkolben - Rohrkolben - Rohrkolben - Schilf - Kleiner Kaktus - Witherwarze + Totes Gras + Wüstengras + Wüstensprossen + Dünengras + Heiliges Hohes Gras + Dornen + Gerste + Rohrkolben + Rohrkolben + Rohrkolben + Schilf + Kleiner Kaktus + Witherwarze - Klee - Sumpfblume - Tote Blume - Schimmernde Blume - Blaue Hortensie - Orange Kosmee - Pinke Narzisse - Wildblume - Veilchen - Weißes Windröschen - Wasserlilie - Chromablume - Aloe - Sonnenblume - Sonnenblume - Weißer Löwenzahn + Klee + Sumpfblume + Tote Blume + Schimmernde Blume + Blaue Hortensie + Orange Kosmee + Pinke Narzisse + Wildblume + Veilchen + Weißes Windröschen + Wasserlilie + Chromablume + Aloe + Sonnenblume + Sonnenblume + Weißer Löwenzahn - Algen - Kurzes Gras - Gras - Hohes Gras - Busch - Sprössling - Hohes Gras - Gift-Efeu - Beerenbusch + Algen + Kurzes Gras + Gras + Hohes Gras + Busch + Sprössling + Hohes Gras + Gift-Efeu + Beerenbusch - Riesige Rote Blume - Riesige Gelbe Blume + Riesige Rote Blume + Riesige Gelbe Blume - Fliegenpilz - Champignon - Indigo-Reizker - Glimmerling + Fliegenpilz + Champignon + Indigo-Reizker + Glimmerling - Apfelsetzling - Gelber Herbstsetzling - Bambussetzling - Magischer Setzling - Dunkler Setzling - Sterbender Setzling - Tannensetzling - Heiliger Setzling - Oranger Herbstsetzling - Ursprünglicher Setzling - Pinkfarbener Kirschsetzling - Ahornsetzling - Weißer Kirschsetzling - Höllenrindensetzling - Jacarandasetzling - Kakibaumsetzling + Apfelsetzling + Gelber Herbstsetzling + Bambussetzling + Magischer Setzling + Dunkler Setzling + Sterbender Setzling + Tannensetzling + Heiliger Setzling + Oranger Herbstsetzling + Ursprünglicher Setzling + Pinkfarbener Kirschsetzling + Ahornsetzling + Weißer Kirschsetzling + Höllenrindensetzling + Jacarandasetzling + Kakibaumsetzling - Akaziensetzling - Mangrovensetzling - Palmsetzling - Mammutbaumsetzling - Weidensetzling - Piniensetzling + Akaziensetzling + Mangrovensetzling + Palmsetzling + Mammutbaumsetzling + Weidensetzling + Piniensetzling - Weide - Efeu - Apfelbaumblätter - Kakibaumblätter - Bambus - Lehmziegelstufen - Ursprüngliches Gras - Langes Gras - Baummoos + Weide + Efeu + Apfelbaumblätter + Kakibaumblätter + Bambus + Lehmziegelstufen + Ursprüngliches Gras + Langes Gras + Baummoos - Seetang - Pinke Koralle - Orange Koralle - Blaue Koralle - Leuchtende Koralle + Seetang + Pinke Koralle + Orange Koralle + Blaue Koralle + Leuchtende Koralle - Rotfelssteinpflastertreppe - Rotfelsziegeltreppe + Rotfelssteinpflastertreppe + Rotfelsziegeltreppe - Heiliges Gras - Verkohltes Gras + Heiliges Gras + Verkohltes Gras - Heiliger Stein - Heiliges Kopfsteinpflaster - Heilige Ziegel + Heiliger Stein + Heiliges Kopfsteinpflaster + Heilige Ziegel - Heilige Kopfsteinpflastertreppe - Heilige Ziegeltreppe + Heilige Kopfsteinpflastertreppe + Heilige Ziegeltreppe - Portal zum Gelobten Land + Portal zum Gelobten Land - Amethysterz - Amethystblock - Rubinerz - Rubinblock - Peridoterz - Peridotblock - Topazerz - Topazblock - Tansaniterz - Tansanitblock - Apatiterz - Apatitblock - Saphirerz - Saphirblock + Amethysterz + Amethystblock + Rubinerz + Rubinblock + Peridoterz + Peridotblock + Topazerz + Topazblock + Tansaniterz + Tansanitblock + Apatiterz + Apatitblock + Saphirerz + Saphirblock - Moos + Moos - Wolkenblock + Wolkenblock - Kleines Knochensegment - Knochensegment - Großes Knochensegment + Kleines Knochensegment + Knochensegment + Großes Knochensegment - Himmlische Linse + Himmlische Linse - Opfer-Fokus - Opfer-Fokus - Opfer-Fokus + Opfer-Fokus + Opfer-Fokus + Opfer-Fokus - Altarrahmen + Altarrahmen - Pfütze + Pfütze - Grabstein + Grabstein - Rotfelssteinpflasterstufe - Rotfelsziegelstufe - Lehmziegelstufe - Heilige Kopfsteinpflasterstufe - Heilige Ziegelstufe + Rotfelssteinpflasterstufe + Rotfelsziegelstufe + Lehmziegelstufe + Heilige Kopfsteinpflasterstufe + Heilige Ziegelstufe - Rotfelssteinpflasterstufe - Rotfelsziegelstufe - Lehmziegelstufe - Heilige Kopfsteinpflasterstufe - Heilige Ziegelstufe + Rotfelssteinpflasterstufe + Rotfelsziegelstufe + Lehmziegelstufe + Heilige Kopfsteinpflasterstufe + Heilige Ziegelstufe - Akazienholzbretter - Kirschholzbretter - Dunkle Holzbretter - Tannenholzbretter - Heilige Holzbretter - Magische Holzbretter - Mangrovenholzbretter - Palmholzbretter - Mammutbaumholzbretter - Weidenholzbretter - Bambusbretter - Pinienholzbretter - Höllenrindenholzbretter - Jacarandaholzbretter + Akazienholzbretter + Kirschholzbretter + Dunkle Holzbretter + Tannenholzbretter + Heilige Holzbretter + Magische Holzbretter + Mangrovenholzbretter + Palmholzbretter + Mammutbaumholzbretter + Weidenholzbretter + Bambusbretter + Pinienholzbretter + Höllenrindenholzbretter + Jacarandaholzbretter - Akazienholz - Kirschholz - Dunkles Holz - Tannenholz + Akazienholz + Kirschholz + Dunkles Holz + Tannenholz - Heiliges Holz - Magisches Holz - Mangrovenholz - Palmholz + Heiliges Holz + Magisches Holz + Mangrovenholz + Palmholz - Mammutbaumholz - Weidenholz - Totes Holz - Riesiger Blumenstamm + Mammutbaumholz + Weidenholz + Totes Holz + Riesiger Blumenstamm - Pinienholz - Höllenrindenholz - Jacarandaholz + Pinienholz + Höllenrindenholz + Jacarandaholz - Gelbes Herbstlaub - Bambuslaub - Magisches Laub - Dunkles Laub - Sterbendes Laub - Tannenlaub - Heiliges Laub - Orangefarbenes Herbstlaub + Gelbes Herbstlaub + Bambuslaub + Magisches Laub + Dunkles Laub + Sterbendes Laub + Tannenlaub + Heiliges Laub + Orangefarbenes Herbstlaub - Ursprüngliches Laub - Pinkfarbenes Kirschlaub - Ahornlaub - Weißes Kirschlaub - Höllenrindenlaub - Jacarandalaub + Ursprüngliches Laub + Pinkfarbenes Kirschlaub + Ahornlaub + Weißes Kirschlaub + Höllenrindenlaub + Jacarandalaub - Akazienholzstufe - Kirschholzstufe - Dunkle Holzstufe - Tannenholzstufe - Heilige Holzstufe - Magische Holzstufe - Mangrovenholzstufe - Palmholzstufe - Mammutbaumholzstufe - Weidenholzstufe - Pinienholzstufe - Höllenrindenholzstufe - Jacarandaholzstufe + Akazienholzstufe + Kirschholzstufe + Dunkle Holzstufe + Tannenholzstufe + Heilige Holzstufe + Magische Holzstufe + Mangrovenholzstufe + Palmholzstufe + Mammutbaumholzstufe + Weidenholzstufe + Pinienholzstufe + Höllenrindenholzstufe + Jacarandaholzstufe - Akazienholzstufe - Kirschholzstufe - Dunkle Holzstufe - Tannenholzstufe - Heilige Holzstufe - Magische Holzstufe - Mangrovenholzstufe - Palmholzstufe - Mammutbaumholzstufe - Weidenholzstufe - Pinienholzstufe - Höllenrindenholzstufe - Jacarandaholzstufe + Akazienholzstufe + Kirschholzstufe + Dunkle Holzstufe + Tannenholzstufe + Heilige Holzstufe + Magische Holzstufe + Mangrovenholzstufe + Palmholzstufe + Mammutbaumholzstufe + Weidenholzstufe + Pinienholzstufe + Höllenrindenholzstufe + Jacarandaholzstufe - Akazienholztreppe - Kirschholztreppe - Dunkle Holztreppe - Tannenholztreppe - Heilige Holztreppe - Magische Holztreppe - Mangrovenholztreppe - Palmholztreppe - Mammutbaumholztreppe - Weidenholztreppe - Pinienholztreppe - Höllenrindenholztreppe - Jacarandaholztreppe + Akazienholztreppe + Kirschholztreppe + Dunkle Holztreppe + Tannenholztreppe + Heilige Holztreppe + Magische Holztreppe + Mangrovenholztreppe + Palmholztreppe + Mammutbaumholztreppe + Weidenholztreppe + Pinienholztreppe + Höllenrindenholztreppe + Jacarandaholztreppe - Akazienlaub - Mangrovenlaub - Palmlaub - Mammutbaumlaub - Weidenlaub - Pinienlaub + Akazienlaub + Mangrovenlaub + Palmlaub + Mammutbaumlaub + Weidenlaub + Pinienlaub - - Beere - Pilzpulver - Wilde Karotten - Sonnenblumenkerne - Obstsalat - Gemüsesalat - Pilzsalat - Kaki + + Beere + Pilzpulver + Wilde Karotten + Sonnenblumenkerne + Obstsalat + Gemüsesalat + Pilzsalat + Kaki - Blasrohr - Dart - Vergifteter Dart + Blasrohr + Dart + Vergifteter Dart - Matschball + Matschball - Matschziegel - Aschehaufen - Amethyst - Gift - Himmlischer Kristallsplitter - Blauer Farbstoff - Brauner Farbstoff - Grüner Farbstoff - Weißer Farbstoff - Schwarzer Farbstoff - Rubin - Peridot - Topaz - Tansanit - Apatit - Saphir - Umhergeisternde Seele + Matschziegel + Aschehaufen + Amethyst + Gift + Himmlischer Kristallsplitter + Blauer Farbstoff + Brauner Farbstoff + Grüner Farbstoff + Weißer Farbstoff + Schwarzer Farbstoff + Rubin + Peridot + Topaz + Tansanit + Apatit + Saphir + Umhergeisternde Seele - Matschige Spitzhacke - Matschige Axt - Matschige Schaufel - Matschiges Schwert - Matschige Hacke - Matschiger Helm - Matschiger Harnisch - Matschige Hose - Matschige Stiefel + Matschige Spitzhacke + Matschige Axt + Matschige Schaufel + Matschiges Schwert + Matschige Hacke + Matschiger Helm + Matschiger Harnisch + Matschige Hose + Matschige Stiefel - Amethystspitzhacke - Amethystaxt - Amethystschaufel - Amethystschwert - Amethysthacke - Amethysthelm - Amethystharnisch - Amethystbeinschutz - Amethyststiefel + Amethystspitzhacke + Amethystaxt + Amethystschaufel + Amethystschwert + Amethysthacke + Amethysthelm + Amethystharnisch + Amethystbeinschutz + Amethyststiefel - Holzsense - Steinsense - Eisensense - Goldsense - Diamantsense - Matschsense - Amethystsense + Holzsense + Steinsense + Eisensense + Goldsense + Diamantsense + Matschsense + Amethystsense - Antiker Stab - Antiker Stabgriff - Antike Stabsstange - Antike Stabspitze - Verbrauchter Antiker Stab + Antiker Stab + Antiker Stabgriff + Antike Stabsstange + Antike Stabspitze + Verbrauchter Antiker Stab - Seelenmanipulator - Umhergeisternde-Seelen-Manipulator - Dorfbewohnerseelen-Manipulator + Seelenmanipulator + Umhergeisternde-Seelen-Manipulator + Dorfbewohnerseelen-Manipulator - Enderporter + Enderporter - Schallplatte - Verdreckte Schallplatte + Schallplatte + Verdreckte Schallplatte - Einfaches Blumenband - Blumenband - Üppiges Blumenband - Exotisches Blumenband + Einfaches Blumenband + Blumenband + Üppiges Blumenband + Exotisches Blumenband + + Watstiefel + Schwimmflossen - - Amethyst-Eimer - Amethyst-Eimer mit Quellwasser - Eimer mit Gift + + Amethyst-Eimer + Amethyst-Eimer mit Quellwasser + Eimer mit Gift - Gift - Quellwasser + Gift + Quellwasser - Gift - Quellwasser + Gift + Quellwasser - - Ein Portal zum gelobten Land ist im Himmel entstanden. - Ein Portal ist im Himmel entstanden. + + Ein Portal zum gelobten Land ist im Himmel entstanden. + Ein Portal ist im Himmel entstanden. - - Biomes O' Plenty + + Biomes O' Plenty - - Biomes O' Plenty + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index cdea9dd8b..742f19681 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -1,382 +1,382 @@ - English (en_US) Localization File + English (en_US) Localization File - - Mud - Quicksand + + Mud + Quicksand - Ash Stone - Hardened Sand - Hardened Dirt - Hardened Ice - Dried Dirt - Crag Rock - Mud Bricks - Purified Dirt - Celestial Crystal + Ash Stone + Hardened Sand + Hardened Dirt + Hardened Ice + Dried Dirt + Crag Rock + Mud Bricks + Purified Dirt + Celestial Crystal - Red Rock - Red Rock Cobblestone - Red Rock Bricks + Red Rock + Red Rock Cobblestone + Red Rock Bricks - Ash Block + Ash Block - Dead Grass - Desert Grass - Desert Sprouts - Dune Grass - Purified Tall Grass - Thorns - Barley - Cattail - Cattail - Cattail - Reed - Tiny Cactus - Wither Wart + Dead Grass + Desert Grass + Desert Sprouts + Dune Grass + Purified Tall Grass + Thorns + Barley + Cattail + Cattail + Cattail + Reed + Tiny Cactus + Wither Wart - Clover - Swampflower - Deathbloom - Glowflower - Blue Hydrangea - Orange Cosmos - Pink Daffodil - Wildflower - Violet - White Anemone - Waterlily - Chromaflora - Aloe - Sunflower - Sunflower - White Dandelion + Clover + Swampflower + Deathbloom + Glowflower + Blue Hydrangea + Orange Cosmos + Pink Daffodil + Wildflower + Violet + White Anemone + Waterlily + Chromaflora + Aloe + Sunflower + Sunflower + White Dandelion - Algae - Short Grass - Medium Grass - High Grass - Bush - Sprout - High Grass - Poison Ivy - Berry Bush + Algae + Short Grass + Medium Grass + High Grass + Bush + Sprout + High Grass + Poison Ivy + Berry Bush - Giant Red Flower - Giant Yellow Flower + Giant Red Flower + Giant Yellow Flower - Toadstool - Portobello - Blue Milk Cap - Glowshroom + Toadstool + Portobello + Blue Milk Cap + Glowshroom - Apple Sapling - Yellow Autumn Sapling - Bamboo Sapling - Magic Sapling - Dark Sapling - Dying Sapling - Fir Sapling - Loftwood Sapling - Orange Autumn Sapling - Origin Sapling - Pink Cherry Sapling - Maple Sapling - White Cherry Sapling - Hellbark Sapling - Jacaranda Sapling - Persimmon Sapling + Apple Sapling + Yellow Autumn Sapling + Bamboo Sapling + Magic Sapling + Dark Sapling + Dying Sapling + Fir Sapling + Loftwood Sapling + Orange Autumn Sapling + Origin Sapling + Pink Cherry Sapling + Maple Sapling + White Cherry Sapling + Hellbark Sapling + Jacaranda Sapling + Persimmon Sapling - Acacia Sapling - Mangrove Sapling - Palm Sapling - Redwood Sapling - Willow Sapling - Pine Sapling + Acacia Sapling + Mangrove Sapling + Palm Sapling + Redwood Sapling + Willow Sapling + Pine Sapling - Willow - Ivy - Apple Leaves - Persimmon Leaves - Bamboo - Mud Bricks Stairs - Origin Grass Block - Long Grass Block - Tree Moss + Willow + Ivy + Apple Leaves + Persimmon Leaves + Bamboo + Mud Bricks Stairs + Origin Grass Block + Long Grass Block + Tree Moss - Kelp - Pink Coral - Orange Coral - Blue Coral - Glowing Coral + Kelp + Pink Coral + Orange Coral + Blue Coral + Glowing Coral - Red Rock Cobblestone Stairs - Red Rock Bricks Stairs + Red Rock Cobblestone Stairs + Red Rock Bricks Stairs - Purified Grass Block - Smoldering Grass Block + Purified Grass Block + Smoldering Grass Block - Skystone - Skystone Cobblestone - Skystone Bricks + Skystone + Skystone Cobblestone + Skystone Bricks - Skystone Cobblestone Stairs - Skystone Bricks Stairs + Skystone Cobblestone Stairs + Skystone Bricks Stairs - Promised Land Portal + Promised Land Portal - Amethyst Ore - Block of Amethyst - Ruby Ore - Block of Ruby - Peridot Ore - Block of Peridot - Topaz Ore - Block of Topaz - Tanzanite Ore - Block of Tanzanite - Apatite Ore - Block of Apatite - Sapphire Ore - Block of Sapphire + Amethyst Ore + Block of Amethyst + Ruby Ore + Block of Ruby + Peridot Ore + Block of Peridot + Topaz Ore + Block of Topaz + Tanzanite Ore + Block of Tanzanite + Apatite Ore + Block of Apatite + Sapphire Ore + Block of Sapphire - Moss + Moss - Cloud Block + Cloud Block - Small Bone Segment - Medium Bone Segment - Large Bone Segment + Small Bone Segment + Medium Bone Segment + Large Bone Segment - Celestial Lens + Celestial Lens - Sacrificial Focus - Sacrificial Focus - Sacrificial Focus + Sacrificial Focus + Sacrificial Focus + Sacrificial Focus - Altar Frame + Altar Frame - Puddle + Puddle - Gravestone + Gravestone - Red Rock Cobblestone Slab - Red Rock Bricks Slab - Mud Bricks Slab - Skystone Cobblestone Slab - Skystone Bricks Slab + Red Rock Cobblestone Slab + Red Rock Bricks Slab + Mud Bricks Slab + Skystone Cobblestone Slab + Skystone Bricks Slab - Red Rock Cobblestone Slab - Red Rock Bricks Slab - Mud Bricks Slab - Skystone Cobblestone Slab - Skystone Bricks Slab + Red Rock Cobblestone Slab + Red Rock Bricks Slab + Mud Bricks Slab + Skystone Cobblestone Slab + Skystone Bricks Slab - Acacia Wood Planks - Cherry Wood Planks - Dark Wood Planks - Fir Wood Planks - Loftwood Wood Planks - Magic Wood Planks - Mangrove Wood Planks - Palm Wood Planks - Redwood Wood Planks - Willow Wood Planks - Bamboo Thatching - Pine Wood Planks - Hellbark Wood Planks - Jacaranda Wood Planks + Acacia Wood Planks + Cherry Wood Planks + Dark Wood Planks + Fir Wood Planks + Loftwood Wood Planks + Magic Wood Planks + Mangrove Wood Planks + Palm Wood Planks + Redwood Wood Planks + Willow Wood Planks + Bamboo Thatching + Pine Wood Planks + Hellbark Wood Planks + Jacaranda Wood Planks - Acacia Wood - Cherry Wood - Dark Wood - Fir Wood + Acacia Wood + Cherry Wood + Dark Wood + Fir Wood - Loftwood Wood - Magic Wood - Mangrove Wood - Palm Wood + Loftwood Wood + Magic Wood + Mangrove Wood + Palm Wood - Redwood Wood - Willow Wood - Dead Wood - Giant Flower Stem + Redwood Wood + Willow Wood + Dead Wood + Giant Flower Stem - Pine Wood - Hellbark Wood - Jacaranda Wood + Pine Wood + Hellbark Wood + Jacaranda Wood - Yellow Autumn Leaves - Bamboo Leaves - Magic Leaves - Dark Leaves - Dying Leaves - Fir Leaves - Loftwood Leaves - Orange Autumn Leaves + Yellow Autumn Leaves + Bamboo Leaves + Magic Leaves + Dark Leaves + Dying Leaves + Fir Leaves + Loftwood Leaves + Orange Autumn Leaves - Origin Leaves - Pink Cherry Leaves - Maple Leaves - White Cherry Leaves - Hellbark Leaves - Jacaranda Leaves + Origin Leaves + Pink Cherry Leaves + Maple Leaves + White Cherry Leaves + Hellbark Leaves + Jacaranda Leaves - Acacia Wood Slab - Cherry Wood Slab - Dark Wood Slab - Fir Wood Slab - Loftwood Wood Slab - Magic Wood Slab - Mangrove Wood Slab - Palm Wood Slab - Redwood Wood Slab - Willow Wood Slab - Pine Wood Slab - Hellbark Wood Slab - Jacaranda Wood Slab + Acacia Wood Slab + Cherry Wood Slab + Dark Wood Slab + Fir Wood Slab + Loftwood Wood Slab + Magic Wood Slab + Mangrove Wood Slab + Palm Wood Slab + Redwood Wood Slab + Willow Wood Slab + Pine Wood Slab + Hellbark Wood Slab + Jacaranda Wood Slab - Acacia Wood Slab - Cherry Wood Slab - Dark Wood Slab - Fir Wood Slab - Loftwood Wood Slab - Magic Wood Slab - Mangrove Wood Slab - Palm Wood Slab - Redwood Wood Slab - Willow Wood Slab - Pine Wood Slab - Hellbark Wood Slab - Jacaranda Wood Slab + Acacia Wood Slab + Cherry Wood Slab + Dark Wood Slab + Fir Wood Slab + Loftwood Wood Slab + Magic Wood Slab + Mangrove Wood Slab + Palm Wood Slab + Redwood Wood Slab + Willow Wood Slab + Pine Wood Slab + Hellbark Wood Slab + Jacaranda Wood Slab - Acacia Wood Stairs - Cherry Wood Stairs - Dark Wood Stairs - Fir Wood Stairs - Loftwood Wood Stairs - Magic Wood Stairs - Mangrove Wood Stairs - Palm Wood Stairs - Redwood Wood Stairs - Willow Wood Stairs - Pine Wood Stairs - Hellbark Wood Stairs - Jacaranda Wood Stairs + Acacia Wood Stairs + Cherry Wood Stairs + Dark Wood Stairs + Fir Wood Stairs + Loftwood Wood Stairs + Magic Wood Stairs + Mangrove Wood Stairs + Palm Wood Stairs + Redwood Wood Stairs + Willow Wood Stairs + Pine Wood Stairs + Hellbark Wood Stairs + Jacaranda Wood Stairs - Acacia Leaves - Mangrove Leaves - Palm Leaves - Redwood Leaves - Willow Leaves - Pine Leaves + Acacia Leaves + Mangrove Leaves + Palm Leaves + Redwood Leaves + Willow Leaves + Pine Leaves - - Berry - Shroom Powder - Wild Carrots - Sunflower Seeds - Fruit Salad - Veggie Salad - Shroom Salad - Persimmon + + Berry + Shroom Powder + Wild Carrots + Sunflower Seeds + Fruit Salad + Veggie Salad + Shroom Salad + Persimmon - Dart Blower - Dart - Poison Dart + Dart Blower + Dart + Poison Dart - Mud Ball + Mud Ball - Mud Brick - Pile of Ashes - Amethyst - Poison - Celestial Crystal Shard - Blue Dye - Brown Dye - Green Dye - White Dye - Black Dye - Ruby - Peridot - Topaz - Tanzanite - Apatite - Sapphire - Ghastly Soul + Mud Brick + Pile of Ashes + Amethyst + Poison + Celestial Crystal Shard + Blue Dye + Brown Dye + Green Dye + White Dye + Black Dye + Ruby + Peridot + Topaz + Tanzanite + Apatite + Sapphire + Ghastly Soul - Muddy Pickaxe - Muddy Axe - Muddy Shovel - Muddy Sword - Muddy Hoe - Muddy Helmet - Muddy Chestplate - Muddy Leggings - Muddy Boots + Muddy Pickaxe + Muddy Axe + Muddy Shovel + Muddy Sword + Muddy Hoe + Muddy Helmet + Muddy Chestplate + Muddy Leggings + Muddy Boots - Amethyst Pickaxe - Amethyst Axe - Amethyst Shovel - Amethyst Sword - Amethyst Hoe - Amethyst Helmet - Amethyst Chestplate - Amethyst Leggings - Amethyst Boots + Amethyst Pickaxe + Amethyst Axe + Amethyst Shovel + Amethyst Sword + Amethyst Hoe + Amethyst Helmet + Amethyst Chestplate + Amethyst Leggings + Amethyst Boots - Wooden Scythe - Stone Scythe - Iron Scythe - Gold Scythe - Diamond Scythe - Mud Scythe - Amethyst Scythe + Wooden Scythe + Stone Scythe + Iron Scythe + Gold Scythe + Diamond Scythe + Mud Scythe + Amethyst Scythe - Ancient Staff - Ancient Staff Handle - Ancient Staff Pole - Ancient Staff Topper - Depleted Ancient Staff + Ancient Staff + Ancient Staff Handle + Ancient Staff Pole + Ancient Staff Topper + Depleted Ancient Staff - Soul Manipulator - Ghastly Soul Manipulator - Villager Soul Manipulator + Soul Manipulator + Ghastly Soul Manipulator + Villager Soul Manipulator - Enderporter + Enderporter - Music Disc - Music Disc + Music Disc + Music Disc - Dull Flower Band - Plain Flower Band - Lush Flower Band - Exotic Flower Band - - Wading Boots - Flippers + Dull Flower Band + Plain Flower Band + Lush Flower Band + Exotic Flower Band + + Wading Boots + Flippers - - Amethyst Bucket - Spring Water Amethyst Bucket - Liquid Poison Bucket + + Amethyst Bucket + Spring Water Amethyst Bucket + Liquid Poison Bucket - Liquid Poison - Spring Water + Liquid Poison + Spring Water - Liquid Poison - Spring Water + Liquid Poison + Spring Water - - A gateway to the Promised Land has appeared in the sky above. - A gateway to the Overworld has appeared in the sky above. + + A gateway to the Promised Land has appeared in the sky above. + A gateway to the Overworld has appeared in the sky above. - - Biomes O' Plenty + + Biomes O' Plenty - - Biomes O' Plenty + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/fr_CA.xml b/resources/assets/biomesoplenty/lang/fr_CA.xml index b1db456a6..8c362f121 100644 --- a/resources/assets/biomesoplenty/lang/fr_CA.xml +++ b/resources/assets/biomesoplenty/lang/fr_CA.xml @@ -1,368 +1,368 @@ - French (fr_CA) Localization File + French (fr_CA) Localization File - - Boue - Sable Mouvant + + Boue + Sable Mouvant - Pierre de Cendre - Sable Dur - Terre Dure - Glace Dure - Terre Déséchée - Pierre des Crags - Briques de Boue - Terre Purifiée - Crystal Céleste + Pierre de Cendre + Sable Dur + Terre Dure + Glace Dure + Terre Déséchée + Pierre des Crags + Briques de Boue + Terre Purifiée + Crystal Céleste - Roche Rouge - Roche Rouge - Briques de Pierre Rouge + Roche Rouge + Roche Rouge + Briques de Pierre Rouge - Ash Block + Ash Block - Herbe Morte - Herbe du Déset - Pousses du Désert - Herbe des Dunes - Herbe Haute Purifiée - Ronces - Orge - Massettes - Massettes - Massettes - Roseau - Petit Cactus + Herbe Morte + Herbe du Déset + Pousses du Désert + Herbe des Dunes + Herbe Haute Purifiée + Ronces + Orge + Massettes + Massettes + Massettes + Roseau + Petit Cactus - Trèfles - Fleur des Marais - Clochettes de la Mort - Fleur Luisante - Hydrangéa - Fleur Sauvage - Violette - Anémone - Fleur de Nénuphar - Aloé - Tornesol - Tornesol - Pissenlit + Trèfles + Fleur des Marais + Clochettes de la Mort + Fleur Luisante + Hydrangéa + Fleur Sauvage + Violette + Anémone + Fleur de Nénuphar + Aloé + Tornesol + Tornesol + Pissenlit - Algues - Herbe Coute - Herbe Moyenne - Herbe Haute - Buisson - Pousses - Herbe Haute - Sumac Vénéneux - Buisson à Baies + Algues + Herbe Coute + Herbe Moyenne + Herbe Haute + Buisson + Pousses + Herbe Haute + Sumac Vénéneux + Buisson à Baies - Fleur Rouge Géante - Fleur Jaune Géante + Fleur Rouge Géante + Fleur Jaune Géante - Psylocybes - Champignon de Paris - Lactaire Indigo - Champignol Luisant + Psylocybes + Champignon de Paris + Lactaire Indigo + Champignol Luisant - Pousse de Pomier - Pousse d'arbe d'automne jaune - Pousse de Bambou - Pousse d'Arbre Magique - Pousse d'Arbre Sombre - Pousse d'Arbre Mourrant - Pousse de Grand Sapin - Pousse d'Abre Sacré - Pousse d'abre d'automne orange - Pousse d'Arbre Originel - Pousse de Cerisier Rose - Pousse d'Érable - Pousse de Cerisier Blanc - Pousse de Buisson du Nether - Pousse de Jacaranda + Pousse de Pomier + Pousse d'arbe d'automne jaune + Pousse de Bambou + Pousse d'Arbre Magique + Pousse d'Arbre Sombre + Pousse d'Arbre Mourrant + Pousse de Grand Sapin + Pousse d'Abre Sacré + Pousse d'abre d'automne orange + Pousse d'Arbre Originel + Pousse de Cerisier Rose + Pousse d'Érable + Pousse de Cerisier Blanc + Pousse de Buisson du Nether + Pousse de Jacaranda - Pousse d'Acacia - Pousse de Palétuvier - Pousse de Palmier - Pousse de Séquoia - Pousse de Saule - Pousse de Pin + Pousse d'Acacia + Pousse de Palétuvier + Pousse de Palmier + Pousse de Séquoia + Pousse de Saule + Pousse de Pin - Lianes de Saule - Sumac - Feuilles de Pomier - Bambou - Escaliers en Briques de Boue - Herbe Originelle - Bloc d'Herbe Longue - Mousse d'Arbre + Lianes de Saule + Sumac + Feuilles de Pomier + Bambou + Escaliers en Briques de Boue + Herbe Originelle + Bloc d'Herbe Longue + Mousse d'Arbre - Algue Brune + Algue Brune - Escaliers en Pierre Rouge - Escaliers en Briques de Pierre Rouge + Escaliers en Pierre Rouge + Escaliers en Briques de Pierre Rouge - Herbe Purifiée - Herbe en Fusion + Herbe Purifiée + Herbe en Fusion - Roche Céleste - Pierre Céleste - Briques de Pierre Céleste + Roche Céleste + Pierre Céleste + Briques de Pierre Céleste - Escaliers en Pierre Céleste - Escaliers en Roche Céleste + Escaliers en Pierre Céleste + Escaliers en Roche Céleste - Portail de la Terre Promise + Portail de la Terre Promise - Minerai d'améthyste - Bloc d'améthyste - Minerai de rubis - Bloque de rubis - Minerai de péridotite - Bloc de péridotite - Minerai de topaze - Bloc de topaze - Minerai de tanzanite - Bloc de tanzanitz - Minerai d'apatite - Bloc d'apatite - Minerai de saphir - Bloc de saphir - - Mousse - - Bloc de Nuage + Minerai d'améthyste + Bloc d'améthyste + Minerai de rubis + Bloque de rubis + Minerai de péridotite + Bloc de péridotite + Minerai de topaze + Bloc de topaze + Minerai de tanzanite + Bloc de tanzanitz + Minerai d'apatite + Bloc d'apatite + Minerai de saphir + Bloc de saphir + + Mousse + + Bloc de Nuage - Petit Morceau d'Os - Morceau d'Os Moyen - Gros Morceau d'Os + Petit Morceau d'Os + Morceau d'Os Moyen + Gros Morceau d'Os - Lentille Céleste + Lentille Céleste - Foyer de Sacrifice - Foyer de Sacrifice - Foyer de Sacrifice + Foyer de Sacrifice + Foyer de Sacrifice + Foyer de Sacrifice - Autel + Autel - Flaque + Flaque - Tombe + Tombe - Dalle en Pierre Rouge - Dalle en Briques de Pierre Rouge - Dalle en Briques de boue - Dalle en Pierre Céleste - Dalle en Briques de Pierre Céleste + Dalle en Pierre Rouge + Dalle en Briques de Pierre Rouge + Dalle en Briques de boue + Dalle en Pierre Céleste + Dalle en Briques de Pierre Céleste - Dalle en Pierre Rouge - Dalle en Briques de Pierre Rouge - Dalle en Briques de Boue - Dalle en Pierre Célesta - Dalle en Briques de Pierre Céleste + Dalle en Pierre Rouge + Dalle en Briques de Pierre Rouge + Dalle en Briques de Boue + Dalle en Pierre Célesta + Dalle en Briques de Pierre Céleste - Planche d'Acacia - Planche de Cerisier - Planche d'Arbre Sombre - Planche de Grand Sapin - Planche d'Arbre Sacré - Planche d'Arbre Magique - Planche de Palétuvier - Planche de Palmier - Planche de Séquoia - Planche de Saule - Chaume de Bambou - Planche de Pin - Planche de Buisson du Nether - Planche de Jacaranda + Planche d'Acacia + Planche de Cerisier + Planche d'Arbre Sombre + Planche de Grand Sapin + Planche d'Arbre Sacré + Planche d'Arbre Magique + Planche de Palétuvier + Planche de Palmier + Planche de Séquoia + Planche de Saule + Chaume de Bambou + Planche de Pin + Planche de Buisson du Nether + Planche de Jacaranda - Bois d'Acacia - Bois de Cerisier - Bois d'Arbre Sombre - Bois de Grand Sapin + Bois d'Acacia + Bois de Cerisier + Bois d'Arbre Sombre + Bois de Grand Sapin - Bois d'Arbre Sacré - Bois d'Arbre Sombre - Bois de Palétuvier - Bois de Palmier + Bois d'Arbre Sacré + Bois d'Arbre Sombre + Bois de Palétuvier + Bois de Palmier - Bois de Séquoia - Bois de Saule - Bois Mort - Tige de Fleur Géante + Bois de Séquoia + Bois de Saule + Bois Mort + Tige de Fleur Géante - Bois de Pin - Bois de Buisson du Nether - Bois de Jacaranda + Bois de Pin + Bois de Buisson du Nether + Bois de Jacaranda - Feuilles d'Automne Jaunes - Feuilles de Bambou - Feuilles Magiques - Feuilles Sombres - Feuilles Mourantes - Feuilles de Grand Sapin - Feuilles Sacrées - Feuilles d'Automne Oranges + Feuilles d'Automne Jaunes + Feuilles de Bambou + Feuilles Magiques + Feuilles Sombres + Feuilles Mourantes + Feuilles de Grand Sapin + Feuilles Sacrées + Feuilles d'Automne Oranges - Feuilles Originels - Feuilles de Cerisier Roses - Feuilles d'Érable - Feuilles de Cerisier Blanches - Feuilles du Nether - Feuilles de Jacaranda + Feuilles Originels + Feuilles de Cerisier Roses + Feuilles d'Érable + Feuilles de Cerisier Blanches + Feuilles du Nether + Feuilles de Jacaranda - Dalle en Bois d'Acacia - Dalle en Bois de Cerisier - Dalle en Bois Sombre - Dalle en Bois de Grand Sapin - Dalle en Bois Sacré - dalle en Bois Magique - Dalle en Bois de Palétuvier - Dalle en Bois de Palmier - Dalle en Bois de Séquoia - Dalle en Bois de Saule - Dalle en Bois de Pin - Dalle en Bois de Buisson du Nether - Dalle en Bois de Jacaranda + Dalle en Bois d'Acacia + Dalle en Bois de Cerisier + Dalle en Bois Sombre + Dalle en Bois de Grand Sapin + Dalle en Bois Sacré + dalle en Bois Magique + Dalle en Bois de Palétuvier + Dalle en Bois de Palmier + Dalle en Bois de Séquoia + Dalle en Bois de Saule + Dalle en Bois de Pin + Dalle en Bois de Buisson du Nether + Dalle en Bois de Jacaranda - Dalle en bois d'Acacia - Dalle en bois de Cerisier - Dalle en Bois Sombre - Dalle en Bois de Grand Sapin - Dalle en Bois Sacré - Dalle en Bois Magique - Dalle en bois de Palétuvier - Dalle en bois de Palmier - Dalle en bois de Séquoia - Dalle en bois de Saule - Dalle en bois de Pin - Dalle en bois de buisson du Nether - Dalle en bois de Jaracanda + Dalle en bois d'Acacia + Dalle en bois de Cerisier + Dalle en Bois Sombre + Dalle en Bois de Grand Sapin + Dalle en Bois Sacré + Dalle en Bois Magique + Dalle en bois de Palétuvier + Dalle en bois de Palmier + Dalle en bois de Séquoia + Dalle en bois de Saule + Dalle en bois de Pin + Dalle en bois de buisson du Nether + Dalle en bois de Jaracanda - Escaliers en bois d'Acacia - Escaliers en bois de Cerisier - Escaliers en Bois Sombre - Escaliers en bois de Grand Sapin - Escaliers en Bois Sacré - Escaliers en Bois Magique - Escaliers en bois de Palétuvier - Escaliers en bois de Palmier - Escaliers en bois de séquoia - Escaliers en bois de Saule - Escaliers en bois de Pin - Escaliers en bois de buisson du Nether - Escaliers en bois de Jacaranda + Escaliers en bois d'Acacia + Escaliers en bois de Cerisier + Escaliers en Bois Sombre + Escaliers en bois de Grand Sapin + Escaliers en Bois Sacré + Escaliers en Bois Magique + Escaliers en bois de Palétuvier + Escaliers en bois de Palmier + Escaliers en bois de séquoia + Escaliers en bois de Saule + Escaliers en bois de Pin + Escaliers en bois de buisson du Nether + Escaliers en bois de Jacaranda - Feuilles d'Acacia - Feuilles de Palétuvier - Feuilles de Palmier - Feuilles de Séquoia - Feuilles de Saule - Feuilles de Pin + Feuilles d'Acacia + Feuilles de Palétuvier + Feuilles de Palmier + Feuilles de Séquoia + Feuilles de Saule + Feuilles de Pin - - Baie - Poudre de champignon - Carottes Sauvages - Graines de tournesol - Salade de fruits - Salade végétarienne - Salade de champignons + + Baie + Poudre de champignon + Carottes Sauvages + Graines de tournesol + Salade de fruits + Salade végétarienne + Salade de champignons - Sarbacanne - Fléchettes - Fléchettes Empoisonnées + Sarbacanne + Fléchettes + Fléchettes Empoisonnées - Boule de boue + Boule de boue - Brique de boue - Cendres - Améthyste - Poison - Éclat de crystal céleste - Teinture bleue - Teinture marron - Teinture verte - Teinture blanche - Teinture noire - Rubis - Péridotite - Topaze - Tanzanite - Apatite - Saphir - Âme d'Effroi + Brique de boue + Cendres + Améthyste + Poison + Éclat de crystal céleste + Teinture bleue + Teinture marron + Teinture verte + Teinture blanche + Teinture noire + Rubis + Péridotite + Topaze + Tanzanite + Apatite + Saphir + Âme d'Effroi - Pioche en boue - Hache en boue - Pelle en boue - Épée en boue - Houe en boue - Casque en boue - Plastron en boue - Jambières en boue - Bottes en boue + Pioche en boue + Hache en boue + Pelle en boue + Épée en boue + Houe en boue + Casque en boue + Plastron en boue + Jambières en boue + Bottes en boue - Pioche en améthyste - Hache en améthyste - Pelle en améthyste - Épée en améthyste - Houe en améthyste - Casque en améthyste - Plastron en améthyste - Jambières en améthyste - Bottes en améthyste + Pioche en améthyste + Hache en améthyste + Pelle en améthyste + Épée en améthyste + Houe en améthyste + Casque en améthyste + Plastron en améthyste + Jambières en améthyste + Bottes en améthyste - Faux en bois - Faux en pierre - Faux en fer - Faux en or - Faux en diamand - Faux en boue - Faux en améthyste + Faux en bois + Faux en pierre + Faux en fer + Faux en or + Faux en diamand + Faux en boue + Faux en améthyste - Bâton ancien - Manche de bâton ancien - Centre de bâton ancien - Haut de bâton ancien - Bâton ancien brisé + Bâton ancien + Manche de bâton ancien + Centre de bâton ancien + Haut de bâton ancien + Bâton ancien brisé - Manipulateur d'âmes - Manipulateur d'âmes d'effroi - Manipulateur d'âmes de villageois + Manipulateur d'âmes + Manipulateur d'âmes d'effroi + Manipulateur d'âmes de villageois - Enderporter + Enderporter - Disque - Disque + Disque + Disque - Couronne de fleurs banale - Couronne de fleurs simple - Couronne de fleurs luxuriante - Couronne de fleurs exotique + Couronne de fleurs banale + Couronne de fleurs simple + Couronne de fleurs luxuriante + Couronne de fleurs exotique - - Seau en améthyste - Seau d'eau chaude en améthyste - Seau de poison liquide + + Seau en améthyste + Seau d'eau chaude en améthyste + Seau de poison liquide - Poison liquide - Eau chaude + Poison liquide + Eau chaude - Poison liquide - Eau chaude + Poison liquide + Eau chaude - - Un passage vers la Terre Promise est apparu haut dans le ciel. - Un passage vers la terre est apparu haut dans le ciel. + + Un passage vers la Terre Promise est apparu haut dans le ciel. + Un passage vers la terre est apparu haut dans le ciel. - - Biomes O' Plenty + + Biomes O' Plenty - - Biomes O' Plenty + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/fr_FR.xml b/resources/assets/biomesoplenty/lang/fr_FR.xml index fbc2c1d32..0951f26de 100644 --- a/resources/assets/biomesoplenty/lang/fr_FR.xml +++ b/resources/assets/biomesoplenty/lang/fr_FR.xml @@ -1,368 +1,368 @@ - French (fr_FR) Localization File + French (fr_FR) Localization File - - Boue - Sable Mouvant + + Boue + Sable Mouvant - Pierre de Cendre - Sable Dur - Terre Dure - Glace Dure - Terre Déséchée - Pierre des Crags - Briques de Boue - Terre Purifiée - Crystal Céleste + Pierre de Cendre + Sable Dur + Terre Dure + Glace Dure + Terre Déséchée + Pierre des Crags + Briques de Boue + Terre Purifiée + Crystal Céleste - Roche Rouge - Roche Rouge - Briques de Pierre Rouge + Roche Rouge + Roche Rouge + Briques de Pierre Rouge - Ash Block + Ash Block - Herbe Morte - Herbe du Déset - Pousses du Désert - Herbe des Dunes - Herbe Haute Purifiée - Ronces - Orge - Massettes - Massettes - Massettes - Roseau - Petit Cactus + Herbe Morte + Herbe du Déset + Pousses du Désert + Herbe des Dunes + Herbe Haute Purifiée + Ronces + Orge + Massettes + Massettes + Massettes + Roseau + Petit Cactus - Trèfles - Fleur des Marais - Clochettes de la Mort - Fleur Luisante - Hydrangéa - Fleur Sauvage - Violette - Anémone - Fleur de Nénuphar - Aloé - Tornesol - Tornesol - Pissenlit + Trèfles + Fleur des Marais + Clochettes de la Mort + Fleur Luisante + Hydrangéa + Fleur Sauvage + Violette + Anémone + Fleur de Nénuphar + Aloé + Tornesol + Tornesol + Pissenlit - Algues - Herbe Coute - Herbe Moyenne - Herbe Haute - Buisson - Pousses - Herbe Haute - Sumac Vénéneux - Buisson à Baies + Algues + Herbe Coute + Herbe Moyenne + Herbe Haute + Buisson + Pousses + Herbe Haute + Sumac Vénéneux + Buisson à Baies - Fleur Rouge Géante - Fleur Jaune Géante + Fleur Rouge Géante + Fleur Jaune Géante - Psylocybes - Champignon de Paris - Lactaire Indigo - Champignol Luisant + Psylocybes + Champignon de Paris + Lactaire Indigo + Champignol Luisant - Pousse de Pomier - Pousse d'arbe d'automne jaune - Pousse de Bambou - Pousse d'Arbre Magique - Pousse d'Arbre Sombre - Pousse d'Arbre Mourrant - Pousse de Grand Sapin - Pousse d'Abre Sacré - Pousse d'abre d'automne orange - Pousse d'Arbre Originel - Pousse de Cerisier Rose - Pousse d'Érable - Pousse de Cerisier Blanc - Pousse de Buisson du Nether - Pousse de Jacaranda + Pousse de Pomier + Pousse d'arbe d'automne jaune + Pousse de Bambou + Pousse d'Arbre Magique + Pousse d'Arbre Sombre + Pousse d'Arbre Mourrant + Pousse de Grand Sapin + Pousse d'Abre Sacré + Pousse d'abre d'automne orange + Pousse d'Arbre Originel + Pousse de Cerisier Rose + Pousse d'Érable + Pousse de Cerisier Blanc + Pousse de Buisson du Nether + Pousse de Jacaranda - Pousse d'Acacia - Pousse de Palétuvier - Pousse de Palmier - Pousse de Séquoia - Pousse de Saule - Pousse de Pin + Pousse d'Acacia + Pousse de Palétuvier + Pousse de Palmier + Pousse de Séquoia + Pousse de Saule + Pousse de Pin - Lianes de Saule - Sumac - Feuilles de Pomier - Bambou - Escaliers en Briques de Boue - Herbe Originelle - Bloc d'Herbe Longue - Mousse d'Arbre + Lianes de Saule + Sumac + Feuilles de Pomier + Bambou + Escaliers en Briques de Boue + Herbe Originelle + Bloc d'Herbe Longue + Mousse d'Arbre - Algue Brune + Algue Brune - Escaliers en Pierre Rouge - Escaliers en Briques de Pierre Rouge + Escaliers en Pierre Rouge + Escaliers en Briques de Pierre Rouge - Herbe Purifiée - Herbe en Fusion + Herbe Purifiée + Herbe en Fusion - Roche Céleste - Pierre Céleste - Briques de Pierre Céleste + Roche Céleste + Pierre Céleste + Briques de Pierre Céleste - Escaliers en Pierre Céleste - Escaliers en Roche Céleste + Escaliers en Pierre Céleste + Escaliers en Roche Céleste - Portail de la Terre Promise + Portail de la Terre Promise - Minerai d'améthyste - Bloc d'améthyste - Minerai de rubis - Bloque de rubis - Minerai de péridotite - Bloc de péridotite - Minerai de topaze - Bloc de topaze - Minerai de tanzanite - Bloc de tanzanitz - Minerai d'apatite - Bloc d'apatite - Minerai de saphir - Bloc de saphir + Minerai d'améthyste + Bloc d'améthyste + Minerai de rubis + Bloque de rubis + Minerai de péridotite + Bloc de péridotite + Minerai de topaze + Bloc de topaze + Minerai de tanzanite + Bloc de tanzanitz + Minerai d'apatite + Bloc d'apatite + Minerai de saphir + Bloc de saphir - Mousse + Mousse - Bloc de Nuage + Bloc de Nuage - Petit Morceau d'Os - Morceau d'Os Moyen - Gros Morceau d'Os + Petit Morceau d'Os + Morceau d'Os Moyen + Gros Morceau d'Os - Lentille Céleste + Lentille Céleste - Foyer de Sacrifice - Foyer de Sacrifice - Foyer de Sacrifice + Foyer de Sacrifice + Foyer de Sacrifice + Foyer de Sacrifice - Autel + Autel - Flaque + Flaque - Tombe + Tombe - Dalle en Pierre Rouge - Dalle en Briques de Pierre Rouge - Dalle en Briques de boue - Dalle en Pierre Céleste - Dalle en Briques de Pierre Céleste + Dalle en Pierre Rouge + Dalle en Briques de Pierre Rouge + Dalle en Briques de boue + Dalle en Pierre Céleste + Dalle en Briques de Pierre Céleste - Dalle en Pierre Rouge - Dalle en Briques de Pierre Rouge - Dalle en Briques de Boue - Dalle en Pierre Célesta - Dalle en Briques de Pierre Céleste + Dalle en Pierre Rouge + Dalle en Briques de Pierre Rouge + Dalle en Briques de Boue + Dalle en Pierre Célesta + Dalle en Briques de Pierre Céleste - Planche d'Acacia - Planche de Cerisier - Planche d'Arbre Sombre - Planche de Grand Sapin - Planche d'Arbre Sacré - Planche d'Arbre Magique - Planche de Palétuvier - Planche de Palmier - Planche de Séquoia - Planche de Saule - Chaume de Bambou - Planche de Pin - Planche de Buisson du Nether - Planche de Jacaranda + Planche d'Acacia + Planche de Cerisier + Planche d'Arbre Sombre + Planche de Grand Sapin + Planche d'Arbre Sacré + Planche d'Arbre Magique + Planche de Palétuvier + Planche de Palmier + Planche de Séquoia + Planche de Saule + Chaume de Bambou + Planche de Pin + Planche de Buisson du Nether + Planche de Jacaranda - Bois d'Acacia - Bois de Cerisier - Bois d'Arbre Sombre - Bois de Grand Sapin + Bois d'Acacia + Bois de Cerisier + Bois d'Arbre Sombre + Bois de Grand Sapin - Bois d'Arbre Sacré - Bois d'Arbre Sombre - Bois de Palétuvier - Bois de Palmier + Bois d'Arbre Sacré + Bois d'Arbre Sombre + Bois de Palétuvier + Bois de Palmier - Bois de Séquoia - Bois de Saule - Bois Mort - Tige de Fleur Géante + Bois de Séquoia + Bois de Saule + Bois Mort + Tige de Fleur Géante - Bois de Pin - Bois de Buisson du Nether - Bois de Jacaranda + Bois de Pin + Bois de Buisson du Nether + Bois de Jacaranda - Feuilles d'Automne Jaunes - Feuilles de Bambou - Feuilles Magiques - Feuilles Sombres - Feuilles Mourantes - Feuilles de Grand Sapin - Feuilles Sacrées - Feuilles d'Automne Oranges + Feuilles d'Automne Jaunes + Feuilles de Bambou + Feuilles Magiques + Feuilles Sombres + Feuilles Mourantes + Feuilles de Grand Sapin + Feuilles Sacrées + Feuilles d'Automne Oranges - Feuilles Originels - Feuilles de Cerisier Roses - Feuilles d'Érable - Feuilles de Cerisier Blanches - Feuilles du Nether - Feuilles de Jacaranda + Feuilles Originels + Feuilles de Cerisier Roses + Feuilles d'Érable + Feuilles de Cerisier Blanches + Feuilles du Nether + Feuilles de Jacaranda - Dalle en Bois d'Acacia - Dalle en Bois de Cerisier - Dalle en Bois Sombre - Dalle en Bois de Grand Sapin - Dalle en Bois Sacré - dalle en Bois Magique - Dalle en Bois de Palétuvier - Dalle en Bois de Palmier - Dalle en Bois de Séquoia - Dalle en Bois de Saule - Dalle en Bois de Pin - Dalle en Bois de Buisson du Nether - Dalle en Bois de Jacaranda + Dalle en Bois d'Acacia + Dalle en Bois de Cerisier + Dalle en Bois Sombre + Dalle en Bois de Grand Sapin + Dalle en Bois Sacré + dalle en Bois Magique + Dalle en Bois de Palétuvier + Dalle en Bois de Palmier + Dalle en Bois de Séquoia + Dalle en Bois de Saule + Dalle en Bois de Pin + Dalle en Bois de Buisson du Nether + Dalle en Bois de Jacaranda - Dalle en bois d'Acacia - Dalle en bois de Cerisier - Dalle en Bois Sombre - Dalle en Bois de Grand Sapin - Dalle en Bois Sacré - Dalle en Bois Magique - Dalle en bois de Palétuvier - Dalle en bois de Palmier - Dalle en bois de Séquoia - Dalle en bois de Saule - Dalle en bois de Pin - Dalle en bois de buisson du Nether - Dalle en bois de Jaracanda + Dalle en bois d'Acacia + Dalle en bois de Cerisier + Dalle en Bois Sombre + Dalle en Bois de Grand Sapin + Dalle en Bois Sacré + Dalle en Bois Magique + Dalle en bois de Palétuvier + Dalle en bois de Palmier + Dalle en bois de Séquoia + Dalle en bois de Saule + Dalle en bois de Pin + Dalle en bois de buisson du Nether + Dalle en bois de Jaracanda - Escaliers en bois d'Acacia - Escaliers en bois de Cerisier - Escaliers en Bois Sombre - Escaliers en bois de Grand Sapin - Escaliers en Bois Sacré - Escaliers en Bois Magique - Escaliers en bois de Palétuvier - Escaliers en bois de Palmier - Escaliers en bois de séquoia - Escaliers en bois de Saule - Escaliers en bois de Pin - Escaliers en bois de buisson du Nether - Escaliers en bois de Jacaranda + Escaliers en bois d'Acacia + Escaliers en bois de Cerisier + Escaliers en Bois Sombre + Escaliers en bois de Grand Sapin + Escaliers en Bois Sacré + Escaliers en Bois Magique + Escaliers en bois de Palétuvier + Escaliers en bois de Palmier + Escaliers en bois de séquoia + Escaliers en bois de Saule + Escaliers en bois de Pin + Escaliers en bois de buisson du Nether + Escaliers en bois de Jacaranda - Feuilles d'Acacia - Feuilles de Palétuvier - Feuilles de Palmier - Feuilles de Séquoia - Feuilles de Saule - Feuilles de Pin + Feuilles d'Acacia + Feuilles de Palétuvier + Feuilles de Palmier + Feuilles de Séquoia + Feuilles de Saule + Feuilles de Pin - - Baie - Poudre de champignon - Carottes Sauvages - Graines de tournesol - Salade de fruits - Salade végétarienne - Salade de champignons + + Baie + Poudre de champignon + Carottes Sauvages + Graines de tournesol + Salade de fruits + Salade végétarienne + Salade de champignons - Sarbacanne - Fléchettes - Fléchettes Empoisonnées + Sarbacanne + Fléchettes + Fléchettes Empoisonnées - Boule de boue + Boule de boue - Brique de boue - Cendres - Améthyste - Poison - Éclat de crystal céleste - Teinture bleue - Teinture marron - Teinture verte - Teinture blanche - Teinture noire - Rubis - Péridotite - Topaze - Tanzanite - Apatite - Saphir - Âme d'Effroi + Brique de boue + Cendres + Améthyste + Poison + Éclat de crystal céleste + Teinture bleue + Teinture marron + Teinture verte + Teinture blanche + Teinture noire + Rubis + Péridotite + Topaze + Tanzanite + Apatite + Saphir + Âme d'Effroi - Pioche en boue - Hache en boue - Pelle en boue - Épée en boue - Houe en boue - Casque en boue - Plastron en boue - Jambières en boue - Bottes en boue + Pioche en boue + Hache en boue + Pelle en boue + Épée en boue + Houe en boue + Casque en boue + Plastron en boue + Jambières en boue + Bottes en boue - Pioche en améthyste - Hache en améthyste - Pelle en améthyste - Épée en améthyste - Houe en améthyste - Casque en améthyste - Plastron en améthyste - Jambières en améthyste - Bottes en améthyste + Pioche en améthyste + Hache en améthyste + Pelle en améthyste + Épée en améthyste + Houe en améthyste + Casque en améthyste + Plastron en améthyste + Jambières en améthyste + Bottes en améthyste - Faux en bois - Faux en pierre - Faux en fer - Faux en or - Faux en diamand - Faux en boue - Faux en améthyste + Faux en bois + Faux en pierre + Faux en fer + Faux en or + Faux en diamand + Faux en boue + Faux en améthyste - Bâton ancien - Manche de bâton ancien - Centre de bâton ancien - Haut de bâton ancien - Bâton ancien brisé + Bâton ancien + Manche de bâton ancien + Centre de bâton ancien + Haut de bâton ancien + Bâton ancien brisé - Manipulateur d'âmes - Manipulateur d'âmes d'effroi - Manipulateur d'âmes de villageois + Manipulateur d'âmes + Manipulateur d'âmes d'effroi + Manipulateur d'âmes de villageois - Enderporter + Enderporter - Disque - Disque + Disque + Disque - Couronne de fleurs banale - Couronne de fleurs simple - Couronne de fleurs luxuriante - Couronne de fleurs exotique + Couronne de fleurs banale + Couronne de fleurs simple + Couronne de fleurs luxuriante + Couronne de fleurs exotique - - Seau en améthyste - Seau d'eau chaude en améthyste - Seau de poison liquide + + Seau en améthyste + Seau d'eau chaude en améthyste + Seau de poison liquide - Poison liquide - Eau chaude + Poison liquide + Eau chaude - Poison liquide - Eau chaude + Poison liquide + Eau chaude - - Un passage vers la Terre Promise est apparu haut dans le ciel. - Un passage vers la terre est apparu haut dans le ciel. + + Un passage vers la Terre Promise est apparu haut dans le ciel. + Un passage vers la terre est apparu haut dans le ciel. - - Biomes O' Plenty + + Biomes O' Plenty - - Biomes O' Plenty + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/ja_JP.xml b/resources/assets/biomesoplenty/lang/ja_JP.xml index 396750520..ec10469cb 100644 --- a/resources/assets/biomesoplenty/lang/ja_JP.xml +++ b/resources/assets/biomesoplenty/lang/ja_JP.xml @@ -1,368 +1,368 @@ - Japanese (ja_JP) Localization File + Japanese (ja_JP) Localization File - - - 流砂 + + + 流砂 - 灰石 - 固い砂 - 固い土 - 固い氷 - 乾燥した土 - 岩山の岩 - 泥レンガ - 浄化された土 - 天界のクリスタル + 灰石 + 固い砂 + 固い土 + 固い氷 + 乾燥した土 + 岩山の岩 + 泥レンガ + 浄化された土 + 天界のクリスタル - 赤岩 - 赤岩の丸石 - 赤岩レンガ + 赤岩 + 赤岩の丸石 + 赤岩レンガ - 火山灰ブロック + 火山灰ブロック - 古草 - 砂漠の草 - 砂漠の芽 - 砂丘の草 - 浄化された草 - いばら - 大麦 - ガマ - ガマ - ガマ - ヨシ - 小さなサボテン + 古草 + 砂漠の草 + 砂漠の芽 + 砂丘の草 + 浄化された草 + いばら + 大麦 + ガマ + ガマ + ガマ + ヨシ + 小さなサボテン - クローバー - 沼の花 - 死の新芽 - 光る花 - アジサイ - 野草 - スミレ - アネモネ - スイレン - アロエ - ひまわり - ひまわり - タンポポ + クローバー + 沼の花 + 死の新芽 + 光る花 + アジサイ + 野草 + スミレ + アネモネ + スイレン + アロエ + ひまわり + ひまわり + タンポポ - - 短い草 - やや短い草 - 背丈が高い草 - 茂み - 新芽 - 背丈が高い草 - ツタウルシ - 果実がなった茂み + + 短い草 + やや短い草 + 背丈が高い草 + 茂み + 新芽 + 背丈が高い草 + ツタウルシ + 果実がなった茂み - 巨大な花(赤) - 巨大な花(黄) + 巨大な花(赤) + 巨大な花(黄) - 毒キノコ - ポートベロー - ブルーミルクキャップ - 光るキノコ + 毒キノコ + ポートベロー + ブルーミルクキャップ + 光るキノコ - リンゴの木の苗木 - 紅葉樹(黄)の苗木 - 竹の苗木 - 魔法の苗木 - 闇の苗木 - 枯れそうな木の苗木 - モミの苗木 - ロフトウッドの苗木 - 紅葉樹(橙)の苗木 - アルファの木の苗木 - サクラの木(淡紅)の苗木 - 楓の苗木 - サクラの木(白)の苗木 - 地獄の樹皮の苗木 - ジャカランダの苗木 + リンゴの木の苗木 + 紅葉樹(黄)の苗木 + 竹の苗木 + 魔法の苗木 + 闇の苗木 + 枯れそうな木の苗木 + モミの苗木 + ロフトウッドの苗木 + 紅葉樹(橙)の苗木 + アルファの木の苗木 + サクラの木(淡紅)の苗木 + 楓の苗木 + サクラの木(白)の苗木 + 地獄の樹皮の苗木 + ジャカランダの苗木 - アカシアの苗木 - マングローブの苗木 - ヤシの苗木 - セコイアの苗木 - 柳の苗木 - 松の苗木 + アカシアの苗木 + マングローブの苗木 + ヤシの苗木 + セコイアの苗木 + 柳の苗木 + 松の苗木 - 柳の葉 - ツタ - リンゴの葉 - - 泥レンガの階段 - アルファの草ブロック - 長い草ブロック - 木の苔 + 柳の葉 + ツタ + リンゴの葉 + + 泥レンガの階段 + アルファの草ブロック + 長い草ブロック + 木の苔 - 昆布 + 昆布 - 赤岩の丸石の階段 - 赤岩レンガの階段 + 赤岩の丸石の階段 + 赤岩レンガの階段 - 浄化された草ブロック - 燻っている草ブロック + 浄化された草ブロック + 燻っている草ブロック - 天空の石 - 天空の丸石 - 天空の石レンガ + 天空の石 + 天空の丸石 + 天空の石レンガ - 天空の丸石の階段 - 天空の石レンガの階段 + 天空の丸石の階段 + 天空の石レンガの階段 - Promised Land Portal + Promised Land Portal - アメジスト鉱石 - アメジストブロック - ルビー鉱石 - ルビーブロック - ペリドット鉱石 - ペリドットブロック - トパーズ鉱石 - トパーズブロック - タンザナイト鉱石 - タンザナイトブロック - アパタイト鉱石 - アパタイトブロック - サファイア鉱石 - サファイアブロック + アメジスト鉱石 + アメジストブロック + ルビー鉱石 + ルビーブロック + ペリドット鉱石 + ペリドットブロック + トパーズ鉱石 + トパーズブロック + タンザナイト鉱石 + タンザナイトブロック + アパタイト鉱石 + アパタイトブロック + サファイア鉱石 + サファイアブロック - + - 雲ブロック + 雲ブロック - 骨ブロック(小) - 骨ブロック(中) - 骨ブロック(大) + 骨ブロック(小) + 骨ブロック(中) + 骨ブロック(大) - 天界の水晶体 + 天界の水晶体 - 生贄の炉 - 生贄の炉 - 生贄の炉 + 生贄の炉 + 生贄の炉 + 生贄の炉 - 祭壇の骨組み + 祭壇の骨組み - 水たまり + 水たまり - + - 赤岩の丸石ハーフブロック - 赤岩レンガハーフブロック - 泥レンガハーフブロック - 天空の丸石ハーフブロック - 天空の石レンガハーフブロック + 赤岩の丸石ハーフブロック + 赤岩レンガハーフブロック + 泥レンガハーフブロック + 天空の丸石ハーフブロック + 天空の石レンガハーフブロック - 赤岩の丸石ハーフブロック - 赤岩レンガハーフブロック - 泥レンガハーフブロック - 天空の丸石ハーフブロック - 天空の石レンガハーフブロック + 赤岩の丸石ハーフブロック + 赤岩レンガハーフブロック + 泥レンガハーフブロック + 天空の丸石ハーフブロック + 天空の石レンガハーフブロック - アカシアの木材 - サクラの木材 - 闇の木材 - モミの木材 - ロフトウッドの木材 - 魔法の木材 - マングローブの木材 - ヤシの木材 - セコイアの木材 - 柳の木材 - 竹葺き - 松の木材 - 地獄の樹皮の木材 - ジャカランダの木材 + アカシアの木材 + サクラの木材 + 闇の木材 + モミの木材 + ロフトウッドの木材 + 魔法の木材 + マングローブの木材 + ヤシの木材 + セコイアの木材 + 柳の木材 + 竹葺き + 松の木材 + 地獄の樹皮の木材 + ジャカランダの木材 - アカシアの原木 - サクラの原木 - 闇の原木 - モミの原木 + アカシアの原木 + サクラの原木 + 闇の原木 + モミの原木 - ロフトウッドの原木 - 魔法の原木 - マングローブの原木 - ヤシの原木 + ロフトウッドの原木 + 魔法の原木 + マングローブの原木 + ヤシの原木 - セコイアの原木 - 柳の原木 - 枯れた木の原木 - 巨大な花の幹 + セコイアの原木 + 柳の原木 + 枯れた木の原木 + 巨大な花の幹 - 松の原木 - 地獄の樹皮の原木 - ジャカランダの原木 + 松の原木 + 地獄の樹皮の原木 + ジャカランダの原木 - 紅葉樹(黄)の葉 - 竹の葉 - 魔法の葉 - 闇の葉 - 枯れそうな木の葉 - モミの葉 - ロフトウッドの葉 - 紅葉樹(橙)の葉 + 紅葉樹(黄)の葉 + 竹の葉 + 魔法の葉 + 闇の葉 + 枯れそうな木の葉 + モミの葉 + ロフトウッドの葉 + 紅葉樹(橙)の葉 - アルファの木の葉 - サクラの木(淡紅)の葉 - 楓の葉 - サクラの木(白)の葉 - 地獄の樹皮の葉 - ジャカランダの葉 + アルファの木の葉 + サクラの木(淡紅)の葉 + 楓の葉 + サクラの木(白)の葉 + 地獄の樹皮の葉 + ジャカランダの葉 - アカシアの木材ハーフブロック - サクラの木材ハーフブロック - 闇の木材ハーフブロック - モミの木材ハーフブロック - ロフトウッドの木材ハーフブロック - 魔法の木材ハーフブロック - マングローブの木材ハーフブロック - ヤシの木材ハーフブロック - セコイアの木材ハーフブロック - 柳の木材ハーフブロック - 松の木材ハーフブロック - 地獄の樹皮の木材ハーフブロック - ジャカランダの木材ハーフブロック + アカシアの木材ハーフブロック + サクラの木材ハーフブロック + 闇の木材ハーフブロック + モミの木材ハーフブロック + ロフトウッドの木材ハーフブロック + 魔法の木材ハーフブロック + マングローブの木材ハーフブロック + ヤシの木材ハーフブロック + セコイアの木材ハーフブロック + 柳の木材ハーフブロック + 松の木材ハーフブロック + 地獄の樹皮の木材ハーフブロック + ジャカランダの木材ハーフブロック - アカシアの木材ハーフブロック - サクラの木材ハーフブロック - 闇の木材ハーフブロック - モミの木材ハーフブロック - ロフトウッドの木材ハーフブロック - 魔法の木材ハーフブロック - マングローブの木材ハーフブロック - ヤシの木材ハーフブロック - セコイアの木材ハーフブロック - 柳の木材ハーフブロック - 松の木材ハーフブロック - 地獄の樹皮の木材ハーフブロック - ジャカランダの木材ハーフブロック + アカシアの木材ハーフブロック + サクラの木材ハーフブロック + 闇の木材ハーフブロック + モミの木材ハーフブロック + ロフトウッドの木材ハーフブロック + 魔法の木材ハーフブロック + マングローブの木材ハーフブロック + ヤシの木材ハーフブロック + セコイアの木材ハーフブロック + 柳の木材ハーフブロック + 松の木材ハーフブロック + 地獄の樹皮の木材ハーフブロック + ジャカランダの木材ハーフブロック - アカシアの木材の階段 - サクラの木材の階段 - 闇の木材の階段 - モミの木材の階段 - ロフトウッドの木材の階段 - 魔法の木材の階段 - マングローブの木材の階段 - ヤシの木材の階段 - セコイアの木材の階段 - 柳の木材の階段 - 松の木材の階段 - 地獄の樹皮の木材の階段 - ジャカランダの木材の階段 + アカシアの木材の階段 + サクラの木材の階段 + 闇の木材の階段 + モミの木材の階段 + ロフトウッドの木材の階段 + 魔法の木材の階段 + マングローブの木材の階段 + ヤシの木材の階段 + セコイアの木材の階段 + 柳の木材の階段 + 松の木材の階段 + 地獄の樹皮の木材の階段 + ジャカランダの木材の階段 - アカシアの葉 - マングローブの葉 - ヤシの葉 - セコイアの葉 - 柳の葉 - 松の葉 + アカシアの葉 + マングローブの葉 + ヤシの葉 + セコイアの葉 + 柳の葉 + 松の葉 - - 果実 - マッシュルームパウダー - 野生のニンジン - ひまわりの種 - フルーツサラダ - 野菜のサラダ - マッシュルームサラダ + + 果実 + マッシュルームパウダー + 野生のニンジン + ひまわりの種 + フルーツサラダ + 野菜のサラダ + マッシュルームサラダ - 吹き筒 - - 毒矢 + 吹き筒 + + 毒矢 - 泥だんご + 泥だんご - 泥レンガ - 火山灰の塵 - アメジスト - 毒薬 - 天界のクリスタルの欠片 - 青の染料 - ブラウンの染料 - 緑の染料 - 白の染料 - 黒の染料 - ルビー - ペリドット - トパーズ - タンザナイト - アパタイト - サファイア - 恐ろしい魂 + 泥レンガ + 火山灰の塵 + アメジスト + 毒薬 + 天界のクリスタルの欠片 + 青の染料 + ブラウンの染料 + 緑の染料 + 白の染料 + 黒の染料 + ルビー + ペリドット + トパーズ + タンザナイト + アパタイト + サファイア + 恐ろしい魂 - 泥状のツルハシ - 泥状の斧 - 泥状のシャベル - 泥状の剣 - 泥状のクワ - 泥状のヘルメット - 泥状のチェストプレート - 泥状のレギンス - 泥状のブーツ + 泥状のツルハシ + 泥状の斧 + 泥状のシャベル + 泥状の剣 + 泥状のクワ + 泥状のヘルメット + 泥状のチェストプレート + 泥状のレギンス + 泥状のブーツ - アメジストのツルハシ - アメジストの斧 - アメジストのシャベル - アメジストの剣 - アメジストのクワ - アメジストのヘルメット - アメジストのチェストプレート - アメジストのレギンス - アメジストのブーツ + アメジストのツルハシ + アメジストの斧 + アメジストのシャベル + アメジストの剣 + アメジストのクワ + アメジストのヘルメット + アメジストのチェストプレート + アメジストのレギンス + アメジストのブーツ - 木の鎌 - 石の鎌 - 鉄の鎌 - 金の鎌 - ダイヤの鎌 - 泥状の鎌 - アメジストの鎌 + 木の鎌 + 石の鎌 + 鉄の鎌 + 金の鎌 + ダイヤの鎌 + 泥状の鎌 + アメジストの鎌 - 古代の杖 - 古代の杖の持ち手 - 古代の杖のポール - 古代の杖の上部分 - 枯渇した古代の杖 + 古代の杖 + 古代の杖の持ち手 + 古代の杖のポール + 古代の杖の上部分 + 枯渇した古代の杖 - 霊魂の操縦者 - 恐ろしい霊魂の操縦者 - 村人の霊魂の操縦者 + 霊魂の操縦者 + 恐ろしい霊魂の操縦者 + 村人の霊魂の操縦者 - エンダーポーター + エンダーポーター - 音楽ディスク - 音楽ディスク + 音楽ディスク + 音楽ディスク - 単調な花の冠 - 質素な花の冠 - 緑豊かな花の冠 - エキゾチックな花の冠 + 単調な花の冠 + 質素な花の冠 + 緑豊かな花の冠 + エキゾチックな花の冠 - - アメジストバケツ - 温泉入りアメジストバケツ - 毒液入りバケツ + + アメジストバケツ + 温泉入りアメジストバケツ + 毒液入りバケツ - 毒液 - 温泉 + 毒液 + 温泉 - 毒液 - 温泉 + 毒液 + 温泉 - - Promised Landへのゲートは上空に現れた。 - 地上へのゲートは上空に現れた。 + + Promised Landへのゲートは上空に現れた。 + 地上へのゲートは上空に現れた。 - - Biomes O' Plenty + + Biomes O' Plenty - - Biomes O' Plenty + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/nl_NL.xml b/resources/assets/biomesoplenty/lang/nl_NL.xml index 4f235df63..eaea03209 100644 --- a/resources/assets/biomesoplenty/lang/nl_NL.xml +++ b/resources/assets/biomesoplenty/lang/nl_NL.xml @@ -1,345 +1,345 @@ - Nederlands (nl_NL) Localization File + Nederlands (nl_NL) Localization File - - Modder - Drijfzand + + Modder + Drijfzand - As steen - Versteend zand - Versteend Dirt - Hardened Ice - Dried Dirt - Crag Rock - Mud Bricks - Purified Dirt - Celestial Crystal + As steen + Versteend zand + Versteend Dirt + Hardened Ice + Dried Dirt + Crag Rock + Mud Bricks + Purified Dirt + Celestial Crystal - Rode steen - Red Rock Cobblestone - Rode baksteen + Rode steen + Red Rock Cobblestone + Rode baksteen - As Blok + As Blok - Dood gras - Woestijn gras - Woestijn plant - Duin gras - Lang gras - Doorns - Barley - Riet - Riet - Riet - Riet - Kleine Cactus + Dood gras + Woestijn gras + Woestijn plant + Duin gras + Lang gras + Doorns + Barley + Riet + Riet + Riet + Riet + Kleine Cactus - klaver - Moerasbloem - Doodbloem - Gloeiendebloem - Hortensia - Wildebloem - Violet - Anemoon - Waterlely - Aloë - Zonnebloem - Zonnebloem - Paardebloem + klaver + Moerasbloem + Doodbloem + Gloeiendebloem + Hortensia + Wildebloem + Violet + Anemoon + Waterlely + Aloë + Zonnebloem + Zonnebloem + Paardebloem - Zeewier - Gras - Gras - Gras - Bosje - Spruit - Hoog Gras - Brandnetel - Besjes bosje + Zeewier + Gras + Gras + Gras + Bosje + Spruit + Hoog Gras + Brandnetel + Besjes bosje - Grote rode bloem - Grote gele bloem + Grote rode bloem + Grote gele bloem - Vergiftige paddestoel - Portobello - Blauwe paddestoel - Gloeiende paddestoel + Vergiftige paddestoel + Portobello + Blauwe paddestoel + Gloeiende paddestoel - Apple Sapling - Yellow Autumn Sapling - Bamboo Sapling - Magic Sapling - Dark Sapling - Dying Sapling - Fir Sapling - Loftwood Sapling - Orange Autumn Sapling - Origin Sapling - Pink Cherry Sapling - Maple Sapling - White Cherry Sapling - Hellbark Sapling - Jacaranda Sapling + Apple Sapling + Yellow Autumn Sapling + Bamboo Sapling + Magic Sapling + Dark Sapling + Dying Sapling + Fir Sapling + Loftwood Sapling + Orange Autumn Sapling + Origin Sapling + Pink Cherry Sapling + Maple Sapling + White Cherry Sapling + Hellbark Sapling + Jacaranda Sapling - Acacia Sapling - Mangrove Sapling - Palm Sapling - Redwood Sapling - Willow Sapling - Pine Sapling + Acacia Sapling + Mangrove Sapling + Palm Sapling + Redwood Sapling + Willow Sapling + Pine Sapling - Wilg - Ivy - Appel Bladeren - Bambo - Modder Bricks Stairs - Origin Grass - Tree Moss + Wilg + Ivy + Appel Bladeren + Bambo + Modder Bricks Stairs + Origin Grass + Tree Moss - Kelp + Kelp - Red Rock Cobblestone Stairs - Red Rock Bricks Stairs + Red Rock Cobblestone Stairs + Red Rock Bricks Stairs - Purified Grass - Smoldering Grass + Purified Grass + Smoldering Grass - Luchtsteen - Luchtsteen Cobblestone - Luchtsteen Bricks + Luchtsteen + Luchtsteen Cobblestone + Luchtsteen Bricks - Luchtsteen Cobblestone Stairs - Luchtsteen Bricks Stairs + Luchtsteen Cobblestone Stairs + Luchtsteen Bricks Stairs - Beloofde Land Portal + Beloofde Land Portal - Amethyst Ore - Block of Amethyst - Ruby Ore - Block of Ruby - Peridot Ore - Block of Peridot - Topaz Ore - Block of Topaz - Tanzanite Ore - Block of Tanzanite - Apatite Ore - Block of Apatite - Sapphire Ore - Block of Sapphire - - Mos + Amethyst Ore + Block of Amethyst + Ruby Ore + Block of Ruby + Peridot Ore + Block of Peridot + Topaz Ore + Block of Topaz + Tanzanite Ore + Block of Tanzanite + Apatite Ore + Block of Apatite + Sapphire Ore + Block of Sapphire + + Mos - Wolk Blok + Wolk Blok - Small Bone Segment - Medium Bone Segment - Large Bone Segment + Small Bone Segment + Medium Bone Segment + Large Bone Segment - Celestial Lens - Sacrificial Focus + Celestial Lens + Sacrificial Focus - Altar Frame + Altar Frame - Red Rock Cobblestone Slab - Red Rock Bricks Slab - Mud Bricks Slab - Skystone Cobblestone Slab - Skystone Bricks Slab + Red Rock Cobblestone Slab + Red Rock Bricks Slab + Mud Bricks Slab + Skystone Cobblestone Slab + Skystone Bricks Slab - Red Rock Cobblestone Slab - Red Rock Bricks Slab - Mud Bricks Slab - Skystone Cobblestone Slab - Skystone Bricks Slab + Red Rock Cobblestone Slab + Red Rock Bricks Slab + Mud Bricks Slab + Skystone Cobblestone Slab + Skystone Bricks Slab - Acacia Wood Planks - Cherry Wood Planks - Dark Wood Planks - Fir Wood Planks - Loftwood Wood Planks - Magic Wood Planks - Mangrove Wood Planks - Palm Wood Planks - Redwood Wood Planks - Willow Wood Planks - Bamboo Thatching - Pine Wood Planks - Hellbark Wood Planks - Jacaranda Wood Planks + Acacia Wood Planks + Cherry Wood Planks + Dark Wood Planks + Fir Wood Planks + Loftwood Wood Planks + Magic Wood Planks + Mangrove Wood Planks + Palm Wood Planks + Redwood Wood Planks + Willow Wood Planks + Bamboo Thatching + Pine Wood Planks + Hellbark Wood Planks + Jacaranda Wood Planks - Acacia Wood - Cherry Wood - Dark Wood - Fir Wood + Acacia Wood + Cherry Wood + Dark Wood + Fir Wood - Loftwood Wood - Magic Wood - Mangrove Wood - Palm Wood + Loftwood Wood + Magic Wood + Mangrove Wood + Palm Wood - Redwood Wood - Willow Wood - Dead Wood - Giant Flower Stem + Redwood Wood + Willow Wood + Dead Wood + Giant Flower Stem - Pine Wood - Hellbark Wood - Jacaranda Wood + Pine Wood + Hellbark Wood + Jacaranda Wood - Yellow Autumn Leaves - Bamboo Leaves - Magic Leaves - Dark Leaves - Dying Leaves - Fir Leaves - Loftwood Leaves - Orange Autumn Leaves + Yellow Autumn Leaves + Bamboo Leaves + Magic Leaves + Dark Leaves + Dying Leaves + Fir Leaves + Loftwood Leaves + Orange Autumn Leaves - Origin Leaves - Pink Cherry Leaves - Maple Leaves - White Cherry Leaves - Hellbark Leaves - Jacaranda Leaves + Origin Leaves + Pink Cherry Leaves + Maple Leaves + White Cherry Leaves + Hellbark Leaves + Jacaranda Leaves - Acacia Wood Slab - Cherry Wood Slab - Dark Wood Slab - Fir Wood Slab - Loftwood Wood Slab - Magic Wood Slab - Mangrove Wood Slab - Palm Wood Slab - Redwood Wood Slab - Willow Wood Slab - Pine Wood Slab - Hellbark Wood Slab - Jacaranda Wood Slab + Acacia Wood Slab + Cherry Wood Slab + Dark Wood Slab + Fir Wood Slab + Loftwood Wood Slab + Magic Wood Slab + Mangrove Wood Slab + Palm Wood Slab + Redwood Wood Slab + Willow Wood Slab + Pine Wood Slab + Hellbark Wood Slab + Jacaranda Wood Slab - Acacia Wood Slab - Cherry Wood Slab - Dark Wood Slab - Fir Wood Slab - Loftwood Wood Slab - Magic Wood Slab - Mangrove Wood Slab - Palm Wood Slab - Redwood Wood Slab - Willow Wood Slab - Pine Wood Slab - Hellbark Wood Slab - Jacaranda Wood Slab + Acacia Wood Slab + Cherry Wood Slab + Dark Wood Slab + Fir Wood Slab + Loftwood Wood Slab + Magic Wood Slab + Mangrove Wood Slab + Palm Wood Slab + Redwood Wood Slab + Willow Wood Slab + Pine Wood Slab + Hellbark Wood Slab + Jacaranda Wood Slab - Acacia Wood Stairs - Cherry Wood Stairs - Dark Wood Stairs - Fir Wood Stairs - Loftwood Wood Stairs - Magic Wood Stairs - Mangrove Wood Stairs - Palm Wood Stairs - Redwood Wood Stairs - Willow Wood Stairs - Pine Wood Stairs - Hellbark Wood Stairs - Jacaranda Wood Stairs + Acacia Wood Stairs + Cherry Wood Stairs + Dark Wood Stairs + Fir Wood Stairs + Loftwood Wood Stairs + Magic Wood Stairs + Mangrove Wood Stairs + Palm Wood Stairs + Redwood Wood Stairs + Willow Wood Stairs + Pine Wood Stairs + Hellbark Wood Stairs + Jacaranda Wood Stairs - Acacia Bladeren - Wortelboom Bladeren - Palm Bladeren - Roodhout Bladeren - Wilge Bladeren - Naald Bladeren + Acacia Bladeren + Wortelboom Bladeren + Palm Bladeren + Roodhout Bladeren + Wilge Bladeren + Naald Bladeren - - Shroom Powder - ZonneBloemen zaaden - Bes + + Shroom Powder + ZonneBloemen zaaden + Bes - Dart Schieter - Dart - Gif Dart + Dart Schieter + Dart + Gif Dart - Modder Bal + Modder Bal - Mud Brick - Amethyst - Pile of Ashes - Poison - Celestial Crystal Shard - Blauwe Kleurstof - Buine Kleurstof - Groene Kleurstof - Witte Kleurstof - Zwarte Kleurstof - Ruby - Peridot - Topaz - Tanzanite - Apatite - Sapphire - Ghastly Soul + Mud Brick + Amethyst + Pile of Ashes + Poison + Celestial Crystal Shard + Blauwe Kleurstof + Buine Kleurstof + Groene Kleurstof + Witte Kleurstof + Zwarte Kleurstof + Ruby + Peridot + Topaz + Tanzanite + Apatite + Sapphire + Ghastly Soul - Modderige Houweel - Modderige Bijl - Modderige Shep - Modderige Zwaard - Modderige Schoffel - Modderige Helm - Modderige Kuras - Modderige Beenstukken - Modderige Schoenen + Modderige Houweel + Modderige Bijl + Modderige Shep + Modderige Zwaard + Modderige Schoffel + Modderige Helm + Modderige Kuras + Modderige Beenstukken + Modderige Schoenen - Amethyst Houweel - Amethyst Bijl - Amethyst Shep - Amethyst Zwaard - Amethyst Schoffel - Amethyst Helm - Amethyst Kuras - Amethyst Beenstukken - Amethyst Schoenen + Amethyst Houweel + Amethyst Bijl + Amethyst Shep + Amethyst Zwaard + Amethyst Schoffel + Amethyst Helm + Amethyst Kuras + Amethyst Beenstukken + Amethyst Schoenen - Oude Staf - Oude Staf Onderkant - Oude Staf Middenstuk - Oude Staf Bovenkant - Kapote Oude Staf + Oude Staf + Oude Staf Onderkant + Oude Staf Middenstuk + Oude Staf Bovenkant + Kapote Oude Staf - Soul Manipulator + Soul Manipulator - Enderporter + Enderporter - Muziekplaat - Muziekplaat + Muziekplaat + Muziekplaat - Dull Flower Band - Plain Flower Band - Lush Flower Band - Exotic Flower Band + Dull Flower Band + Plain Flower Band + Lush Flower Band + Exotic Flower Band - - Spring Water Bucket - Liquid Poison Bucket + + Spring Water Bucket + Liquid Poison Bucket - Liquid Poison - Spring Water + Liquid Poison + Spring Water - Liquid Poison - Spring Water + Liquid Poison + Spring Water - - Een portal naar de beloofde wereld is verschenen in de lucht. - Een portal is verschenen in de lucht. + + Een portal naar de beloofde wereld is verschenen in de lucht. + Een portal is verschenen in de lucht. - - Biomes O' Plenty + + Biomes O' Plenty - - Biomes O' Plenty + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/pl_PL.xml b/resources/assets/biomesoplenty/lang/pl_PL.xml index 940db8dee..524eb0922 100644 --- a/resources/assets/biomesoplenty/lang/pl_PL.xml +++ b/resources/assets/biomesoplenty/lang/pl_PL.xml @@ -1,373 +1,373 @@ - Polski (pl_PL) Localization File + Polski (pl_PL) Localization File - + - - Błoto - Ruchome piaski + + Błoto + Ruchome piaski - Popiołowa skała - Utwardzony piasek - Utwardzona ziemia - Utwardzony lód - Wysuszona ziemia - Skała - Cegły z błota - Oczyszczona ziemia - Kryształ Celestii + Popiołowa skała + Utwardzony piasek + Utwardzona ziemia + Utwardzony lód + Wysuszona ziemia + Skała + Cegły z błota + Oczyszczona ziemia + Kryształ Celestii - Czerwona skała - Czerwony bruk - Cegły z czerwonej skały + Czerwona skała + Czerwony bruk + Cegły z czerwonej skały - Blok popiołu + Blok popiołu - Martwa trawa - Pustynna trawa - Pustynne pędy - Trawa z wydm - Oczyszczona wysoka trawa - Ciernie - Jęczmień - Pałka - Pałka - Pałka - Trzcina - Tyci kaktus + Martwa trawa + Pustynna trawa + Pustynne pędy + Trawa z wydm + Oczyszczona wysoka trawa + Ciernie + Jęczmień + Pałka + Pałka + Pałka + Trzcina + Tyci kaktus - Koniczyna - Bagienny kwiat - Martwy kwiat - Błyszczący kwiat - Hortensja - Stokrotka - Tulipan - Dziki kwiat - Fiołek - Zawilec - Lilia wodna - Chromaflora - Aloes - Słonecznik - Słonecznik - Dmuchawiec + Koniczyna + Bagienny kwiat + Martwy kwiat + Błyszczący kwiat + Hortensja + Stokrotka + Tulipan + Dziki kwiat + Fiołek + Zawilec + Lilia wodna + Chromaflora + Aloes + Słonecznik + Słonecznik + Dmuchawiec - Wodorosty - Krótka trawa - Średnia trawa - Wysoka trawa - Krzak - Pęd - Wysoka trawa - Trujący bluszcz - Krzak jagodowy + Wodorosty + Krótka trawa + Średnia trawa + Wysoka trawa + Krzak + Pęd + Wysoka trawa + Trujący bluszcz + Krzak jagodowy - Wielki czerwony kwiat - Wielki żółty kwiat + Wielki czerwony kwiat + Wielki żółty kwiat - Muchomor - Portobello - Lactarius indigo - Świecący grzyb + Muchomor + Portobello + Lactarius indigo + Świecący grzyb - Sadzonka jabłoni - Sadzonka jesiennego żółtego drzewa - Sadzonka bambusa - Magiczna sadzonka - Sadzonka ciemnego drzewa - Sadzonka umierającego drzewa - Sadzonka jodły - Podniebna sadzonka - Sadzonka jesiennego pomarańczowego drzewa - Pierwotna sadzonka - Sadzonka różowej wiśni - Sadzonka klonu - Sadzonka białej wiśni - Sadzonka piekielnego drzewa - Sadzonka jakarandy - - Sadzonka akacji - Sadzonka namorzyna - Sadzonka palmy - Sadzonka sekwoji - Sadzonka wierzby - Sadzonka sosny + Sadzonka jabłoni + Sadzonka jesiennego żółtego drzewa + Sadzonka bambusa + Magiczna sadzonka + Sadzonka ciemnego drzewa + Sadzonka umierającego drzewa + Sadzonka jodły + Podniebna sadzonka + Sadzonka jesiennego pomarańczowego drzewa + Pierwotna sadzonka + Sadzonka różowej wiśni + Sadzonka klonu + Sadzonka białej wiśni + Sadzonka piekielnego drzewa + Sadzonka jakarandy + + Sadzonka akacji + Sadzonka namorzyna + Sadzonka palmy + Sadzonka sekwoji + Sadzonka wierzby + Sadzonka sosny - Wierzba - Bluszcz - Liście jabłoni - Bambus - Schody z błota - Pierwotna trawa - Blok długiej trawy - Mech + Wierzba + Bluszcz + Liście jabłoni + Bambus + Schody z błota + Pierwotna trawa + Blok długiej trawy + Mech - Listownicowce + Listownicowce - Schody z czerwonego bruku - Schody z czerwonej skały + Schody z czerwonego bruku + Schody z czerwonej skały - Blok oczyszczonej trawy - Blok tlącej się trawy + Blok oczyszczonej trawy + Blok tlącej się trawy - Niebiańska skała - Niebiański bruk - Niebiańskie cegły + Niebiańska skała + Niebiański bruk + Niebiańskie cegły - Schody z niebiańskiego bruku - Schody z niebiańskiej cegły + Schody z niebiańskiego bruku + Schody z niebiańskiej cegły - Portal do Ziemi Obiecanej + Portal do Ziemi Obiecanej - Ruda ametystu - Blok ametystu - Ruda rubinu - Blok rubinu - Ruda perydotu - Blok perydotu - Ruda topazu - Blok topazu - Ruda tanzanitu - Blok tanzanitu - Ruda apatytu - Blok apatytu - Ruda szafiru - Blok szafiru + Ruda ametystu + Blok ametystu + Ruda rubinu + Blok rubinu + Ruda perydotu + Blok perydotu + Ruda topazu + Blok topazu + Ruda tanzanitu + Blok tanzanitu + Ruda apatytu + Blok apatytu + Ruda szafiru + Blok szafiru - Mech + Mech - Chmura + Chmura - Mała segment kośći - Średni segment kośći - Duży segment kośći + Mała segment kośći + Średni segment kośći + Duży segment kośći - Soczewka Celestii + Soczewka Celestii - Ołtarz ofiarny - Ołtarz ofiarny - Ołtarz ofiarny + Ołtarz ofiarny + Ołtarz ofiarny + Ołtarz ofiarny - Rama ołtarza + Rama ołtarza - Kałuża + Kałuża - Grób + Grób - Płytka z czerwonego bruku - Płytka z czerwonej skały - Płytka z błota - Płytka z niebiańskiego bruku - Płytka z niebiańskiej cegły + Płytka z czerwonego bruku + Płytka z czerwonej skały + Płytka z błota + Płytka z niebiańskiego bruku + Płytka z niebiańskiej cegły - Płytka z czerwonego bruku - Płytka z czerwonej skały - Płytka z błota - Płytka z niebiańskiego bruku - Płytka z niebiańskiej cegły + Płytka z czerwonego bruku + Płytka z czerwonej skały + Płytka z błota + Płytka z niebiańskiego bruku + Płytka z niebiańskiej cegły - Akacjowe deski - Deski z wiśni - Ciemne deski - Jodłowe deski - Podniebne deski - Magiczne deski - Namorzynowe deski - Palmowe deski - Sekwojowe deski - Wierzbowe deski - Bambusowa strzecha - Sosnowe deski - Piekielne deski - Jakarandowe deski + Akacjowe deski + Deski z wiśni + Ciemne deski + Jodłowe deski + Podniebne deski + Magiczne deski + Namorzynowe deski + Palmowe deski + Sekwojowe deski + Wierzbowe deski + Bambusowa strzecha + Sosnowe deski + Piekielne deski + Jakarandowe deski - Drewno akacji - Drewno wiśni - Ciemne drewno - Jodłowe drewno + Drewno akacji + Drewno wiśni + Ciemne drewno + Jodłowe drewno - Podniebne drewno - Magiczne drewno - Namorzynowe drewno - Palmowe drewno + Podniebne drewno + Magiczne drewno + Namorzynowe drewno + Palmowe drewno - Sekwojowe drewno - Wierzbowe drewno - Martwe drewno - Łodyga wielkiego kwiatu + Sekwojowe drewno + Wierzbowe drewno + Martwe drewno + Łodyga wielkiego kwiatu - Sosnowe drewno - Piekielna kora - Jakarandowe drewno + Sosnowe drewno + Piekielna kora + Jakarandowe drewno - Żółte liście - Bambusowe liście - Magiczne liście - Ciemne liście - Umierające liście - Jodłowe igły - Podniebne liście - Pomarańczowe liście + Żółte liście + Bambusowe liście + Magiczne liście + Ciemne liście + Umierające liście + Jodłowe igły + Podniebne liście + Pomarańczowe liście - Pierwotne liście - Różowe liście - Klonowe liście - Białe liście - Piekielne liście - Jakarandowe liście + Pierwotne liście + Różowe liście + Klonowe liście + Białe liście + Piekielne liście + Jakarandowe liście - Płytka z akacjowych desek - Płytka z wiśniowych desek - Płytka z ciemnych desek - Płytka z jodłowych desek - Płytka z podniebnych desek - Płytka z magicznych desek - Płytka z namorzynowych desek - Płytka z palmowych desek - Płytka z sekwojowych desek - Płytka z wierzbowych desek - Płytka z sosnowych desek - Płytka z piekielnych desek - Płytka z jakarandowych desek + Płytka z akacjowych desek + Płytka z wiśniowych desek + Płytka z ciemnych desek + Płytka z jodłowych desek + Płytka z podniebnych desek + Płytka z magicznych desek + Płytka z namorzynowych desek + Płytka z palmowych desek + Płytka z sekwojowych desek + Płytka z wierzbowych desek + Płytka z sosnowych desek + Płytka z piekielnych desek + Płytka z jakarandowych desek - Płytka z akacjowych desek - Płytka z wiśniowych desek - Płytka z ciemnych desek - Płytka z jodłowych desek - Płytka z podniebnych desek - Płytka z magicznych desek - Płytka z namorzynowych desek - Płytka z palmowych desek - Płytka z sekwojowych desek - Płytka z wierzbowych desek - Płytka z sosnowych desek - Płytka z piekielnych desek - Płytka z jakarandowych desek + Płytka z akacjowych desek + Płytka z wiśniowych desek + Płytka z ciemnych desek + Płytka z jodłowych desek + Płytka z podniebnych desek + Płytka z magicznych desek + Płytka z namorzynowych desek + Płytka z palmowych desek + Płytka z sekwojowych desek + Płytka z wierzbowych desek + Płytka z sosnowych desek + Płytka z piekielnych desek + Płytka z jakarandowych desek - Schody z akacjowych desek - Schody z wiśniowych desek - Schody z ciemnych desek - Schody z jodłowych desek - Schody z podniebnych desek - Schody z magicznych desek - Schody z namorzynowych desek - Schody z palmowych desek - Schody z sekwojowych desek - Schody z wierzbowych desek - Schody z sosnowych desek - Schody z piekielnych desek - Schody z jakarandowych desek + Schody z akacjowych desek + Schody z wiśniowych desek + Schody z ciemnych desek + Schody z jodłowych desek + Schody z podniebnych desek + Schody z magicznych desek + Schody z namorzynowych desek + Schody z palmowych desek + Schody z sekwojowych desek + Schody z wierzbowych desek + Schody z sosnowych desek + Schody z piekielnych desek + Schody z jakarandowych desek - Liście akacji - Liście namorzyna - Liście palmowe - Liście sekwoji - Liście wierzbowe - Sosnowe igły + Liście akacji + Liście namorzyna + Liście palmowe + Liście sekwoji + Liście wierzbowe + Sosnowe igły - - Jagoda - Proszek halucynogenny - Dzikie marchewki - Nasiona słonecznika - Sałatka owocowa - Sałatka warzywna - Sałatka grzybowa + + Jagoda + Proszek halucynogenny + Dzikie marchewki + Nasiona słonecznika + Sałatka owocowa + Sałatka warzywna + Sałatka grzybowa - Dmuchawka - Rzutka - Trująca rzutka + Dmuchawka + Rzutka + Trująca rzutka - Błotna kulka + Błotna kulka - Cegła z błota - Popiół - Ametyst - Trucizna - Odłamek kryształu Celestii - Niebieski barwnik - Brązowy barwnik - Zielony barwnik - Biały barwnik - Czarny barwnik - Rubin - Peridot - Topaz - Tanzanit - Apatyt - Szafir - Upiorna dusza + Cegła z błota + Popiół + Ametyst + Trucizna + Odłamek kryształu Celestii + Niebieski barwnik + Brązowy barwnik + Zielony barwnik + Biały barwnik + Czarny barwnik + Rubin + Peridot + Topaz + Tanzanit + Apatyt + Szafir + Upiorna dusza - Błotny kilof - Błotna siekiera - Błotna łopata - Błotny miecz - Błotna motyka - Błotny hełm - Błotny napierśnik - Błotne nagolenniki - Błotne bóty + Błotny kilof + Błotna siekiera + Błotna łopata + Błotny miecz + Błotna motyka + Błotny hełm + Błotny napierśnik + Błotne nagolenniki + Błotne bóty - Ametystowy kilof - Ametystowe topór - Ametystowa łopata - Ametystowy miecz - Ametystowa motyka - Ametystowy hełm - Ametystowy napierśnik - Ametystowe nagolenniki - Ametystowe buty + Ametystowy kilof + Ametystowe topór + Ametystowa łopata + Ametystowy miecz + Ametystowa motyka + Ametystowy hełm + Ametystowy napierśnik + Ametystowe nagolenniki + Ametystowe buty - Drewniana kosa - Kamienna kosa - Żelazna kosa - Złota kosa - Diamentowa kosa - Błotna kosa - Ametystowa kosa + Drewniana kosa + Kamienna kosa + Żelazna kosa + Złota kosa + Diamentowa kosa + Błotna kosa + Ametystowa kosa - Starożytna laska - Rączka starożytnej laski - Tyczka starożytnej laski - Czubek starożytnej laski - Zużyta starożytna laska + Starożytna laska + Rączka starożytnej laski + Tyczka starożytnej laski + Czubek starożytnej laski + Zużyta starożytna laska - Ster dusz - Ster upiornych dusz - Ster wieśniackich dusz + Ster dusz + Ster upiornych dusz + Ster wieśniackich dusz - Enderporter + Enderporter - Płyta muzyczna - Płyta muzyczna + Płyta muzyczna + Płyta muzyczna - Zespół Mdły Kwiat - Zespół Gładki Kwiat - Zespół Bujny Kwiat - Zespół Egzotyczny Kwiat + Zespół Mdły Kwiat + Zespół Gładki Kwiat + Zespół Bujny Kwiat + Zespół Egzotyczny Kwiat - - Ametystowe wiaderko - Ametystowe wiaderko ze zdrowotną wodą źródlaną - Wiaderko z trucizną + + Ametystowe wiaderko + Ametystowe wiaderko ze zdrowotną wodą źródlaną + Wiaderko z trucizną - Trucizna - Zdrowotna woda źródlana + Trucizna + Zdrowotna woda źródlana - Trucizna - Zdrowotna woda źródlana + Trucizna + Zdrowotna woda źródlana - - Brama niebios pojawiła się w górze - Brama świata pojawiła się w górze + + Brama niebios pojawiła się w górze + Brama świata pojawiła się w górze - - Biomes O' Plenty + + Biomes O' Plenty - - Biomes O' Plenty + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/ru_RU.xml b/resources/assets/biomesoplenty/lang/ru_RU.xml index 22d169101..da8dd206b 100644 --- a/resources/assets/biomesoplenty/lang/ru_RU.xml +++ b/resources/assets/biomesoplenty/lang/ru_RU.xml @@ -1,382 +1,382 @@ - Russian (ru_RU) Localization File + Russian (ru_RU) Localization File - - Грязь - Зыбучий песок + + Грязь + Зыбучий песок - Окаменевший пепел - Затвердевший песок - Затвердевшая земля - Крепкий лёд - Осушенная земля - Горная порода - Кирпичи из грязи - Очищенный грунт - Небесный кристалл + Окаменевший пепел + Затвердевший песок + Затвердевшая земля + Крепкий лёд + Осушенная земля + Горная порода + Кирпичи из грязи + Очищенный грунт + Небесный кристалл - Красный камень - Красный булыжник - Кирпичи из красного камня + Красный камень + Красный булыжник + Кирпичи из красного камня - Блок пепла + Блок пепла - Мёртвая трава - Пустынная трава - Пустынные ростки - Дюнная трава - Очищенная высокая трава - Колючки - Ячмень - Рогоз - Рогоз - Рогоз - Камыш - Крохотный кактус - Иссушающий нарост + Мёртвая трава + Пустынная трава + Пустынные ростки + Дюнная трава + Очищенная высокая трава + Колючки + Ячмень + Рогоз + Рогоз + Рогоз + Камыш + Крохотный кактус + Иссушающий нарост - Клевер - Болотный цветок - Смертельный цветок - Светоцвет - Синяя гортензия - Оранжевая космея - Розовый нарцисс - Колокольчик - Фиалка - Белый анемон - Кувшинка - Радужный цветок - Алоэ - Подсолнечник - Подсолнечник - Белый одуванчик + Клевер + Болотный цветок + Смертельный цветок + Светоцвет + Синяя гортензия + Оранжевая космея + Розовый нарцисс + Колокольчик + Фиалка + Белый анемон + Кувшинка + Радужный цветок + Алоэ + Подсолнечник + Подсолнечник + Белый одуванчик - Водоросли - Низкая трава - Средняя трава - Высокая трава - Куст - Росток - Высокая трава - Ядовитый плющ - Ягодный куст + Водоросли + Низкая трава + Средняя трава + Высокая трава + Куст + Росток + Высокая трава + Ядовитый плющ + Ягодный куст - Гигантский красный цветок - Гигантский жёлтый цветок + Гигантский красный цветок + Гигантский жёлтый цветок - Гриб - Портобелло - Млечник голубой - Светогриб + Гриб + Портобелло + Млечник голубой + Светогриб - Саженец яблони - Саженец жёлтого осеннего дерева - Саженец бамбука - Магический саженец - Тёмный саженец - Погибающий саженец - Саженец пихты - Саженец лофтвуда - Саженец оранжевого осеннего дерева - Оригинальный саженец - Саженец розовой вишни - Саженец клёна - Саженец белой вишни - Саженец адского дерева - Саженец жакаранды + Саженец яблони + Саженец жёлтого осеннего дерева + Саженец бамбука + Магический саженец + Тёмный саженец + Погибающий саженец + Саженец пихты + Саженец лофтвуда + Саженец оранжевого осеннего дерева + Оригинальный саженец + Саженец розовой вишни + Саженец клёна + Саженец белой вишни + Саженец адского дерева + Саженец жакаранды - Саженец акации - Мангровый саженец - Саженец пальмы - Саженец красного дерева - Саженец ивы - Саженец сосны - Саженец хурмы + Саженец акации + Мангровый саженец + Саженец пальмы + Саженец красного дерева + Саженец ивы + Саженец сосны + Саженец хурмы - Ива - Плющ - Листва яблони - Листва хурмы - Бамбук - Кирпичные ступеньки из грязи - Оригинальная трава - Блок высокой травы - Древесный мох + Ива + Плющ + Листва яблони + Листва хурмы + Бамбук + Кирпичные ступеньки из грязи + Оригинальная трава + Блок высокой травы + Древесный мох - Ламинария - Розовый коралл - Оранжевый коралл - Синий коралл - Светящийся коралл + Ламинария + Розовый коралл + Оранжевый коралл + Синий коралл + Светящийся коралл - Ступеньки из красного булыжника - Кирпичные ступеньки из красного камня + Ступеньки из красного булыжника + Кирпичные ступеньки из красного камня - Очищенная трава - Тлеющая трава + Очищенная трава + Тлеющая трава - Небесный камень - Небесный булыжник - Небесные кирпичи + Небесный камень + Небесный булыжник + Небесные кирпичи - Ступеньки из небесного булыжника - Ступеньки из небесных кирпичей + Ступеньки из небесного булыжника + Ступеньки из небесных кирпичей - Портал в "Землю Обетованную" + Портал в "Землю Обетованную" - Аметистовая руда - Аметистовый блок - Рубиновая руда - Рубиновый блок - Оливиновая руда - Оливиновый блок - Топазовая руда - Блок топаза - Танзанитовая руда - Танзанитовый блок - Апатитовая руда - Апатитовый блок - Сапфировая руда - Сапфировый блок + Аметистовая руда + Аметистовый блок + Рубиновая руда + Рубиновый блок + Оливиновая руда + Оливиновый блок + Топазовая руда + Блок топаза + Танзанитовая руда + Танзанитовый блок + Апатитовая руда + Апатитовый блок + Сапфировая руда + Сапфировый блок - Мох + Мох - Блок облака + Блок облака - Малый сегмент кости - Средний сегмент кости - Большой сегмент кости + Малый сегмент кости + Средний сегмент кости + Большой сегмент кости - Небесные линзы + Небесные линзы - Жертвенный фокус - Жертвенный фокус - Жертвенный фокус + Жертвенный фокус + Жертвенный фокус + Жертвенный фокус - Каркас алтаря + Каркас алтаря - Лужица + Лужица - Могильная плита + Могильная плита - Плита из красного булыжника - Кирпичная плита из красного камня - Кирпичная плита из грязи - Плита из небесного булыжника - Плита из небесных кирпичей + Плита из красного булыжника + Кирпичная плита из красного камня + Кирпичная плита из грязи + Плита из небесного булыжника + Плита из небесных кирпичей - Плита из красного булыжника - Кирпичная плита из красного камня - Кирпичная плита из грязи - Плита из небесного булыжника - Плита из небесных кирпичей + Плита из красного булыжника + Кирпичная плита из красного камня + Кирпичная плита из грязи + Плита из небесного булыжника + Плита из небесных кирпичей - Доски из древесины акации - Доски из древесины вишнёвого дерева - Доски из древесины тёмного дерева - Доски из древесины пихты - Доски из древесины лофтвуда - Доски из древесины магического дерева - Доски из древесины мангрового дерева - Доски из древесины пальмы - Доски из древесины красного дерева - Доски из древесины ивы - Бамбук - Доски из древесины сосны - Доски из древесины адского дерева - Доски из древесины жакаранды + Доски из древесины акации + Доски из древесины вишнёвого дерева + Доски из древесины тёмного дерева + Доски из древесины пихты + Доски из древесины лофтвуда + Доски из древесины магического дерева + Доски из древесины мангрового дерева + Доски из древесины пальмы + Доски из древесины красного дерева + Доски из древесины ивы + Бамбук + Доски из древесины сосны + Доски из древесины адского дерева + Доски из древесины жакаранды - Древесина акации - Древесина вишнёвого дерева - Древесина тёмного дерева - Древесина пихты + Древесина акации + Древесина вишнёвого дерева + Древесина тёмного дерева + Древесина пихты - Древесина лофтвуда - Древесина магического дерева - Древесина мангрового дерева - Древесина пальмы + Древесина лофтвуда + Древесина магического дерева + Древесина мангрового дерева + Древесина пальмы - Древесина красного дерева - Древесина ивы - Древесина погибшего дерева - Ствол гигантского цветка + Древесина красного дерева + Древесина ивы + Древесина погибшего дерева + Ствол гигантского цветка - Древесина сосны - Древесина адского дерева - Древесина жакаранды + Древесина сосны + Древесина адского дерева + Древесина жакаранды - Жёлтая осенняя листва - Листва бамбука - Магическая листва - Тёмная листва - Погибающая листва - Листва пихты - Листва лофтвуда - Оранжевая осенняя листва + Жёлтая осенняя листва + Листва бамбука + Магическая листва + Тёмная листва + Погибающая листва + Листва пихты + Листва лофтвуда + Оранжевая осенняя листва - Оригинальная листва - Листва розовой вишни - Листва клёна - Листва белой вишни - Адская листва - Листва жакаранды + Оригинальная листва + Листва розовой вишни + Листва клёна + Листва белой вишни + Адская листва + Листва жакаранды - Плита из древесины акации - Плита из древесины вишнёвого дерева - Плита из древесины тёмного дерева - Плита из древесины пихты - Плита из древесины лофтвуда - Плита из древесины магического дерева - Плита из древесины мангрового дерева - Плита из древесины пальмы - Плита из древесины красного дерева - Плита из древесины ивы - Плита из древесины сосны - Плита из древесины адского дерева - Плита из древесины жакаранды + Плита из древесины акации + Плита из древесины вишнёвого дерева + Плита из древесины тёмного дерева + Плита из древесины пихты + Плита из древесины лофтвуда + Плита из древесины магического дерева + Плита из древесины мангрового дерева + Плита из древесины пальмы + Плита из древесины красного дерева + Плита из древесины ивы + Плита из древесины сосны + Плита из древесины адского дерева + Плита из древесины жакаранды - Плита из древесины акации - Плита из древесины вишнёвого дерева - Плита из древесины тёмного дерева - Плита из древесины пихты - Плита из древесины лофтвуда - Плита из древесины магического дерева - Плита из древесины мангрового дерева - Плита из древесины пальмы - Плита из древесины красного дерева - Плита из древесины ивы - Плита из древесины сосны - Плита из древесины адского дерева - Плита из древесины жакаранды + Плита из древесины акации + Плита из древесины вишнёвого дерева + Плита из древесины тёмного дерева + Плита из древесины пихты + Плита из древесины лофтвуда + Плита из древесины магического дерева + Плита из древесины мангрового дерева + Плита из древесины пальмы + Плита из древесины красного дерева + Плита из древесины ивы + Плита из древесины сосны + Плита из древесины адского дерева + Плита из древесины жакаранды - Ступеньки из древесины акации - Ступеньки из древесины вишнёвого дерева - Ступеньки из древесины тёмного дерева - Ступеньки из древесины пихты - Ступеньки из древесины лофтвуда - Ступеньки из древесины магического дерева - Ступеньки из древесины мангрового дерева - Ступеньки из древесины пальмы - Ступеньки из древесины красного дерева - Ступеньки из древесины ивы - Ступеньки из древесины сосны - Ступеньки из древесины адского дерева - Ступеньки из древесины жакаранды + Ступеньки из древесины акации + Ступеньки из древесины вишнёвого дерева + Ступеньки из древесины тёмного дерева + Ступеньки из древесины пихты + Ступеньки из древесины лофтвуда + Ступеньки из древесины магического дерева + Ступеньки из древесины мангрового дерева + Ступеньки из древесины пальмы + Ступеньки из древесины красного дерева + Ступеньки из древесины ивы + Ступеньки из древесины сосны + Ступеньки из древесины адского дерева + Ступеньки из древесины жакаранды - Листва акации - Листва мангрового дерева - Листва пальмы - Листва красного дерева - Листва ивы - Листва сосны + Листва акации + Листва мангрового дерева + Листва пальмы + Листва красного дерева + Листва ивы + Листва сосны - - Ягода - Молотый гриб - Дикая морковь - Семечки подсолнуха - Фруктовый салат - Овощной салат - Грибной салат - Хурма + + Ягода + Молотый гриб + Дикая морковь + Семечки подсолнуха + Фруктовый салат + Овощной салат + Грибной салат + Хурма - Духовая трубка - Дротик - Отравленный дротик + Духовая трубка + Дротик + Отравленный дротик - Комок грязи + Комок грязи - Кирпичи из грязи - Кучка пепла - Аметист - Яд - Осколок небесного кристалла - Синий краситель - Коричневый краситель - Зелёный краситель - Белый краситель - Чёрный краситель - Рубин - Оливин - Топаз - Танзанит - Апатит - Сапфир - Жуткий дух + Кирпичи из грязи + Кучка пепла + Аметист + Яд + Осколок небесного кристалла + Синий краситель + Коричневый краситель + Зелёный краситель + Белый краситель + Чёрный краситель + Рубин + Оливин + Топаз + Танзанит + Апатит + Сапфир + Жуткий дух - Кирка из грязи - Топор из грязи - Лопата из грязи - Меч из грязи - Мотыга из грязи - Шлем из грязи - Кираса из грязи - Поножи из грязи - Ботинки из грязи + Кирка из грязи + Топор из грязи + Лопата из грязи + Меч из грязи + Мотыга из грязи + Шлем из грязи + Кираса из грязи + Поножи из грязи + Ботинки из грязи - Аметистовая кирка - Аметистовый топор - Аметистовая лопата - Апетистовый меч - Аметистовая мотыга - Аметистовый шлем - Аметистовая кираса - Аметистовые поножи - Аметистовые ботинки + Аметистовая кирка + Аметистовый топор + Аметистовая лопата + Апетистовый меч + Аметистовая мотыга + Аметистовый шлем + Аметистовая кираса + Аметистовые поножи + Аметистовые ботинки - Деревянная коса - Каменная коса - Железная коса - Золотая коса - Алмазная коса - Коса из грязи - Аметистовая коса + Деревянная коса + Каменная коса + Железная коса + Золотая коса + Алмазная коса + Коса из грязи + Аметистовая коса - Древний посох - Рукоять древнего посоха - Древко древнего посоха - Верхушка древнего посоха - Истощённый древний посох + Древний посох + Рукоять древнего посоха + Древко древнего посоха + Верхушка древнего посоха + Истощённый древний посох - Манипулятор духа - Манипулятор жуткого духа - Манипулятор духа жителей + Манипулятор духа + Манипулятор жуткого духа + Манипулятор духа жителей - Телепортер края + Телепортер края - Музыкальная пластинка - Музыкальная пластинка + Музыкальная пластинка + Музыкальная пластинка - Скучный венок - Обычный венок - Пышный венок - Экзотический венок + Скучный венок + Обычный венок + Пышный венок + Экзотический венок - Болотные сапоги - Ласты + Болотные сапоги + Ласты - - Аметистовое ведро - Аметистовое ведро родниковой воды - Ведро яда + + Аметистовое ведро + Аметистовое ведро родниковой воды + Ведро яда - Жидкий яд - Родниковая вода + Жидкий яд + Родниковая вода - Жидкий яд - Родниковая вода + Жидкий яд + Родниковая вода - - Врата в Землю Обетованную открылись выше. - Врата в обычный мир открылись выше. + + Врата в Землю Обетованную открылись выше. + Врата в обычный мир открылись выше. - - Biomes O' Plenty + + Biomes O' Plenty - - Biomes O' Plenty + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/zh_CN.xml b/resources/assets/biomesoplenty/lang/zh_CN.xml index c2e601647..c00fc987e 100644 --- a/resources/assets/biomesoplenty/lang/zh_CN.xml +++ b/resources/assets/biomesoplenty/lang/zh_CN.xml @@ -1,363 +1,363 @@ - Simplified Chinese (zh_CN) Localization File + Simplified Chinese (zh_CN) Localization File - - 泥巴 - 流沙 + + 泥巴 + 流沙 - 火山灰岩 - 硬化沙子 - 硬化泥土 - 硬化冰块 - 干燥泥土 - 崖壁岩石 - 泥巴砖块 - 纯净泥土 - 仙域水晶 + 火山灰岩 + 硬化沙子 + 硬化泥土 + 硬化冰块 + 干燥泥土 + 崖壁岩石 + 泥巴砖块 + 纯净泥土 + 仙域水晶 - 红岩 - 红岩圆石 - 红岩砖块 + 红岩 + 红岩圆石 + 红岩砖块 - 灰烬块 + 灰烬块 - 枯萎草 - 沙漠草 - 沙漠野菜 - 沙丘草 - 纯净高草 - 荆棘 - 大麦 - 香蒲 - 香蒲 - 香蒲 - 芦苇 - 仙人球 + 枯萎草 + 沙漠草 + 沙漠野菜 + 沙丘草 + 纯净高草 + 荆棘 + 大麦 + 香蒲 + 香蒲 + 香蒲 + 芦苇 + 仙人球 - 苜蓿 - 沼泽花 - 死亡花 - 闪光花 - 绣球花 - 野花 - 紫罗兰 - 银莲花 - 水百合 - 龙舌兰 - 向日葵 - 向日葵 - 蒲公英 + 苜蓿 + 沼泽花 + 死亡花 + 闪光花 + 绣球花 + 野花 + 紫罗兰 + 银莲花 + 水百合 + 龙舌兰 + 向日葵 + 向日葵 + 蒲公英 - 海藻 - 小草 - 矮草 - 高草 - 灌木 - 野菜 - 高草 - 毒藤 - 浆果灌木 + 海藻 + 小草 + 矮草 + 高草 + 灌木 + 野菜 + 高草 + 毒藤 + 浆果灌木 - 巨大红色花 - 巨大黄色花 + 巨大红色花 + 巨大黄色花 - 毒菌 - 双孢蘑菇 - 蓝牛奶伞菌 - 夜光菇 + 毒菌 + 双孢蘑菇 + 蓝牛奶伞菌 + 夜光菇 - 苹果树苗 - 黄色秋天树苗 - 竹笋 - 魔法树苗 - 黑暗树苗 - 垂死树苗 - 杉树树苗 - 阁楼木树苗 - 橙色秋天树苗 - 起源树苗 - 粉色樱桃树苗 - 枫树树苗 - 白色樱桃树树苗 - 地狱皮树苗 - 蓝花楹木树苗 + 苹果树苗 + 黄色秋天树苗 + 竹笋 + 魔法树苗 + 黑暗树苗 + 垂死树苗 + 杉树树苗 + 阁楼木树苗 + 橙色秋天树苗 + 起源树苗 + 粉色樱桃树苗 + 枫树树苗 + 白色樱桃树树苗 + 地狱皮树苗 + 蓝花楹木树苗 - 刺槐树树苗 - 红树树苗 - 棕榈树苗 - 红木树苗 - 柳树树苗 - 松树树苗 + 刺槐树树苗 + 红树树苗 + 棕榈树苗 + 红木树苗 + 柳树树苗 + 松树树苗 - 柳树 - 藤蔓 - 苹果树叶 - 竹子 - 泥巴砖块楼梯 - 源草 - 树藓 + 柳树 + 藤蔓 + 苹果树叶 + 竹子 + 泥巴砖块楼梯 + 源草 + 树藓 - 巨藻 + 巨藻 - 红岩圆石楼梯 - 红岩砖块楼梯 + 红岩圆石楼梯 + 红岩砖块楼梯 - 纯净草 - 阴燃草 + 纯净草 + 阴燃草 - 苍空石 - 苍空圆石 - 苍空砖块 + 苍空石 + 苍空圆石 + 苍空砖块 - 苍空圆石楼梯 - 苍空砖块楼梯 + 苍空圆石楼梯 + 苍空砖块楼梯 - 应许之地传送门 + 应许之地传送门 - 紫晶矿石 - 紫晶块 - 红宝石矿石 - 红宝石块 - 橄榄石矿石 - 橄榄石块 - 黄玉矿石 - 黄玉块 - 坦桑矿石 - 坦桑石块 - 磷灰石矿石 - 磷灰石块 - 蓝宝石矿石 - 蓝宝石块 + 紫晶矿石 + 紫晶块 + 红宝石矿石 + 红宝石块 + 橄榄石矿石 + 橄榄石块 + 黄玉矿石 + 黄玉块 + 坦桑矿石 + 坦桑石块 + 磷灰石矿石 + 磷灰石块 + 蓝宝石矿石 + 蓝宝石块 - 苔藓 + 苔藓 - 云块 + 云块 - 一小截骨头 - 一截骨头 - 一大截骨头 + 一小截骨头 + 一截骨头 + 一大截骨头 - 仙域透镜 + 仙域透镜 - 献祭之核 - 献祭之核 - 献祭之核 + 献祭之核 + 献祭之核 + 献祭之核 - 祭坛框架 + 祭坛框架 - 胶土 + 胶土 - 坟墓 + 坟墓 - 红岩圆石台阶 - 红岩砖块台阶 - 泥巴砖块台阶 - 苍空石圆石台阶 - 苍空石砖块台阶 + 红岩圆石台阶 + 红岩砖块台阶 + 泥巴砖块台阶 + 苍空石圆石台阶 + 苍空石砖块台阶 - 红岩圆石台阶 - 红岩砖块台阶 - 泥巴砖块台阶 - 苍空石圆石台阶 - 苍空石砖块台阶 + 红岩圆石台阶 + 红岩砖块台阶 + 泥巴砖块台阶 + 苍空石圆石台阶 + 苍空石砖块台阶 - 刺槐树木板 - 樱桃树木板 - 黑暗树木板 - 杉树木板 - 阁楼树木板 - 魔法树木板 - 红树木板 - 棕榈树木板 - 红木树木板 - 柳树木板 - 竹板 - 松树木板 - 地狱皮树木板 - 蓝花楹树木板 + 刺槐树木板 + 樱桃树木板 + 黑暗树木板 + 杉树木板 + 阁楼树木板 + 魔法树木板 + 红树木板 + 棕榈树木板 + 红木树木板 + 柳树木板 + 竹板 + 松树木板 + 地狱皮树木板 + 蓝花楹树木板 - 刺槐树原木 - 樱桃树原木 - 黑暗树原木 - 杉树原木 + 刺槐树原木 + 樱桃树原木 + 黑暗树原木 + 杉树原木 - 阁楼树原木 - 魔法树原木 - 红树原木 - 棕榈树原木 + 阁楼树原木 + 魔法树原木 + 红树原木 + 棕榈树原木 - 红木原木 - 柳树原木 - 垂死树原木 - 巨大花茎 + 红木原木 + 柳树原木 + 垂死树原木 + 巨大花茎 - 松树原木 - 地狱皮树原木 - 蓝花楹树原木 + 松树原木 + 地狱皮树原木 + 蓝花楹树原木 - 黄色秋天树叶 - 竹叶 - 魔法树叶 - 黑暗树叶 - 垂死树叶 - 杉树树叶 - 阁楼树树叶 - 橙色秋天树叶 + 黄色秋天树叶 + 竹叶 + 魔法树叶 + 黑暗树叶 + 垂死树叶 + 杉树树叶 + 阁楼树树叶 + 橙色秋天树叶 - Origin树叶 - 粉樱桃树叶 - 枫树叶 - 白樱桃树叶 - 地狱皮树叶 - 蓝花楹树叶 + Origin树叶 + 粉樱桃树叶 + 枫树叶 + 白樱桃树叶 + 地狱皮树叶 + 蓝花楹树叶 - 刺槐树木板 - 樱桃树木板 - 黑暗树木板 - 杉树木板 - 阁楼树木板 - 魔法树木板 - 红树木板 - 棕榈树木板 - 红木木板 - 柳树木板 - 松树木板 - 地狱皮树木板 - 蓝花楹树木板 + 刺槐树木板 + 樱桃树木板 + 黑暗树木板 + 杉树木板 + 阁楼树木板 + 魔法树木板 + 红树木板 + 棕榈树木板 + 红木木板 + 柳树木板 + 松树木板 + 地狱皮树木板 + 蓝花楹树木板 - 刺槐树台阶 - 樱桃树台阶 - 黑暗树台阶 - 杉树台阶 - 阁楼树台阶 - 魔法树台阶 - 红树台阶 - 棕榈树台阶 - 红木台阶 - 柳树台阶 - 松树台阶 - 地狱皮树台阶 - 蓝花楹树台阶 + 刺槐树台阶 + 樱桃树台阶 + 黑暗树台阶 + 杉树台阶 + 阁楼树台阶 + 魔法树台阶 + 红树台阶 + 棕榈树台阶 + 红木台阶 + 柳树台阶 + 松树台阶 + 地狱皮树台阶 + 蓝花楹树台阶 - 刺槐木楼梯 - 樱桃木楼梯 - 黑暗木楼梯 - 冷杉木楼梯 - 阁楼木楼梯 - 魔法木楼梯 - 红树木楼梯 - 棕榈木楼梯 - 红杉木楼梯 - 柳树木楼梯 - 松树木楼梯 - 地狱皮木楼梯 - 蓝花楹树楼梯 + 刺槐木楼梯 + 樱桃木楼梯 + 黑暗木楼梯 + 冷杉木楼梯 + 阁楼木楼梯 + 魔法木楼梯 + 红树木楼梯 + 棕榈木楼梯 + 红杉木楼梯 + 柳树木楼梯 + 松树木楼梯 + 地狱皮木楼梯 + 蓝花楹树楼梯 - 刺槐树叶 - 红树叶 - 棕榈叶 - 红杉叶 - 柳树叶 - 松树叶 + 刺槐树叶 + 红树叶 + 棕榈叶 + 红杉叶 + 柳树叶 + 松树叶 - - 浆果 - 蘑菇粉 - 葵花籽 + + 浆果 + 蘑菇粉 + 葵花籽 - 飞镖吹筒 - 飞镖 - 毒飞镖 + 飞镖吹筒 + 飞镖 + 毒飞镖 - 泥球 + 泥球 - 泥砖 - 一小堆灰烬 - 紫晶 - 毒药 - 仙域水晶碎片 - 蓝色染料 - 棕色染料 - 绿色染料 - 白色染料 - 黑色染料 - 红宝石 - 橄榄石 - 黄玉 - 坦桑石 - 磷灰石 - 蓝宝石 - 幽魂灵魂 + 泥砖 + 一小堆灰烬 + 紫晶 + 毒药 + 仙域水晶碎片 + 蓝色染料 + 棕色染料 + 绿色染料 + 白色染料 + 黑色染料 + 红宝石 + 橄榄石 + 黄玉 + 坦桑石 + 磷灰石 + 蓝宝石 + 幽魂灵魂 - 泥巴镐 - 泥巴斧 - 泥巴铲 - 泥巴剑 - 泥巴锄 - 泥巴头盔 - 泥巴胸甲 - 泥巴护腿 - 泥巴鞋子 + 泥巴镐 + 泥巴斧 + 泥巴铲 + 泥巴剑 + 泥巴锄 + 泥巴头盔 + 泥巴胸甲 + 泥巴护腿 + 泥巴鞋子 - 紫晶镐 - 紫晶斧 - 紫晶铲 - 紫晶剑 - 紫晶锄 - 紫晶头盔 - 紫晶胸甲 - 紫晶护腿 - 紫晶鞋子 + 紫晶镐 + 紫晶斧 + 紫晶铲 + 紫晶剑 + 紫晶锄 + 紫晶头盔 + 紫晶胸甲 + 紫晶护腿 + 紫晶鞋子 - 木头镰刀 - 石头镰刀 - 铁镰刀 - 金镰刀 - 钻石镰刀 - 泥土镰刀 - 紫晶镰刀 + 木头镰刀 + 石头镰刀 + 铁镰刀 + 金镰刀 + 钻石镰刀 + 泥土镰刀 + 紫晶镰刀 - 上古手杖 - 上古手杖手柄 - 上古手杖杆 - 上古手杖龙头 - 废弃的上古手杖 + 上古手杖 + 上古手杖手柄 + 上古手杖杆 + 上古手杖龙头 + 废弃的上古手杖 - 灵魂操纵器 - 幽魂灵魂操纵器 - 村民灵魂操纵器 + 灵魂操纵器 + 幽魂灵魂操纵器 + 村民灵魂操纵器 - 末地逃逸护符 + 末地逃逸护符 - 音乐唱片 - 音乐唱片 + 音乐唱片 + 音乐唱片 - 黯淡之花环 - 平凡之花环 - 丰饶之花环 - 异域之花环 + 黯淡之花环 + 平凡之花环 + 丰饶之花环 + 异域之花环 - - 紫晶桶 - 泉水桶 - 毒液桶 + + 紫晶桶 + 泉水桶 + 毒液桶 - 毒液 - 泉水 + 毒液 + 泉水 - 毒液 - 泉水 + 毒液 + 泉水 - - 通往应许之地的神迹之门降临于苍穹之上. - 神迹之门降临于苍穹之上. + + 通往应许之地的神迹之门降临于苍穹之上. + 神迹之门降临于苍穹之上. - - 超多生态群落 + + 超多生态群落 - - 超多生态群落 + + 超多生态群落 From d04322375edfc8c741887b8f44c04fe08f62c425 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 15 Sep 2013 14:20:14 -0400 Subject: [PATCH 12/29] Finished village material stuff --- .../configuration/BOPBiomes.java | 52 +- .../BOPConfigurationTerrainGen.java | 125 ---- .../handlers/VillageMaterialEventHandler.java | 676 ++++++++++++++++++ .../biomesoplenty/worldgen/WorldGenMesa.java | 2 +- 4 files changed, 679 insertions(+), 176 deletions(-) diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index fb667a336..1968e2e75 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -521,79 +521,31 @@ public class BOPBiomes { private static void addVillageBiomes() { - addVillageBiome(Biomes.alps, BOPConfigurationTerrainGen.alpsVillage); addVillageBiome(Biomes.arctic, BOPConfigurationTerrainGen.arcticVillage); - addVillageBiome(Biomes.autumnHills, BOPConfigurationTerrainGen.autumnHillsVillage); - addVillageBiome(Biomes.badlands, BOPConfigurationTerrainGen.badlandsVillage); - addVillageBiome(Biomes.bambooForest, BOPConfigurationTerrainGen.bambooForestVillage); - addVillageBiome(Biomes.bayou, BOPConfigurationTerrainGen.bayouVillage); - addVillageBiome(Biomes.birchForest, BOPConfigurationTerrainGen.birchForestVillage); - addVillageBiome(Biomes.bog, BOPConfigurationTerrainGen.bogVillage); - addVillageBiome(Biomes.borealForest, BOPConfigurationTerrainGen.borealForestVillage); addVillageBiome(Biomes.brushland, BOPConfigurationTerrainGen.brushlandVillage); - addVillageBiome(Biomes.canyon, BOPConfigurationTerrainGen.canyonVillage); addVillageBiome(Biomes.chaparral, BOPConfigurationTerrainGen.chaparralVillage); - addVillageBiome(Biomes.cherryBlossomGrove, BOPConfigurationTerrainGen.cherryBlossomGroveVillage); - addVillageBiome(Biomes.coniferousForest, BOPConfigurationTerrainGen.coniferousForestVillage); - addVillageBiome(Biomes.coniferousForestSnow, BOPConfigurationTerrainGen.coniferousForestSnowVillage); - addVillageBiome(Biomes.deadForest, BOPConfigurationTerrainGen.deadForestVillage); - addVillageBiome(Biomes.deadForestSnow, BOPConfigurationTerrainGen.deadForestSnowVillage); - addVillageBiome(Biomes.deadSwamp, BOPConfigurationTerrainGen.deadSwampVillage); - addVillageBiome(Biomes.deciduousForest, BOPConfigurationTerrainGen.deciduousForestVillage); - addVillageBiome(Biomes.dunes, BOPConfigurationTerrainGen.dunesVillage); - addVillageBiome(Biomes.fen, BOPConfigurationTerrainGen.fenVillage); addVillageBiome(Biomes.field, BOPConfigurationTerrainGen.fieldVillage); - addVillageBiome(Biomes.frostForest, BOPConfigurationTerrainGen.frostForestVillage); - addVillageBiome(Biomes.glacier, BOPConfigurationTerrainGen.glacierVillage); addVillageBiome(Biomes.grassland, BOPConfigurationTerrainGen.grasslandVillage); addVillageBiome(Biomes.grove, BOPConfigurationTerrainGen.groveVillage); addVillageBiome(Biomes.heathland, BOPConfigurationTerrainGen.heathlandVillage); - addVillageBiome(Biomes.highland, BOPConfigurationTerrainGen.highlandVillage); - addVillageBiome(Biomes.hotSprings, BOPConfigurationTerrainGen.hotSpringsVillage); - addVillageBiome(Biomes.jadeCliffs, BOPConfigurationTerrainGen.jadeCliffsVillage); addVillageBiome(Biomes.lushDesert, BOPConfigurationTerrainGen.lushDesertVillage); addVillageBiome(Biomes.lushSwamp, BOPConfigurationTerrainGen.lushSwampVillage); - addVillageBiome(Biomes.mangrove, BOPConfigurationTerrainGen.mangroveVillage); - addVillageBiome(Biomes.mapleWoods, BOPConfigurationTerrainGen.mapleWoodsVillage); - addVillageBiome(Biomes.marsh, BOPConfigurationTerrainGen.marshVillage); addVillageBiome(Biomes.meadow, BOPConfigurationTerrainGen.meadowVillage); - addVillageBiome(Biomes.mesa, BOPConfigurationTerrainGen.mesaVillage); - addVillageBiome(Biomes.moor, BOPConfigurationTerrainGen.moorVillage); - addVillageBiome(Biomes.mountain, BOPConfigurationTerrainGen.mountainVillage); - addVillageBiome(Biomes.oasis, BOPConfigurationTerrainGen.oasisVillage); - addVillageBiome(Biomes.orchard, BOPConfigurationTerrainGen.orchardVillage); + addVillageBiome(Biomes.meadowForest, BOPConfigurationTerrainGen.meadowVillage); addVillageBiome(Biomes.outback, BOPConfigurationTerrainGen.outbackVillage); addVillageBiome(Biomes.overgrownGreens, BOPConfigurationTerrainGen.overgrownGreensVillage); - addVillageBiome(Biomes.pasture, BOPConfigurationTerrainGen.pastureVillage); - addVillageBiome(Biomes.polar, BOPConfigurationTerrainGen.polarVillage); addVillageBiome(Biomes.prairie, BOPConfigurationTerrainGen.prairieVillage); - addVillageBiome(Biomes.quagmire, BOPConfigurationTerrainGen.quagmireVillage); - addVillageBiome(Biomes.rainforest, BOPConfigurationTerrainGen.rainforestVillage); - addVillageBiome(Biomes.redwoodForest, BOPConfigurationTerrainGen.redwoodForestVillage); addVillageBiome(Biomes.savanna, BOPConfigurationTerrainGen.savannaVillage); addVillageBiome(Biomes.scrubland, BOPConfigurationTerrainGen.scrublandVillage); - addVillageBiome(Biomes.seasonalForest, BOPConfigurationTerrainGen.seasonalForestVillage); - addVillageBiome(Biomes.shield, BOPConfigurationTerrainGen.shieldVillage); addVillageBiome(Biomes.shrubland, BOPConfigurationTerrainGen.shrublandVillage); - addVillageBiome(Biomes.sludgepit, BOPConfigurationTerrainGen.sludgepitVillage); addVillageBiome(Biomes.spruceWoods, BOPConfigurationTerrainGen.spruceWoodsVillage); - addVillageBiome(Biomes.temperateRainforest, BOPConfigurationTerrainGen.temperateRainforestVillage); - addVillageBiome(Biomes.thicket, BOPConfigurationTerrainGen.thicketVillage); + addVillageBiome(Biomes.steppe, BOPConfigurationTerrainGen.steppeVillage); addVillageBiome(Biomes.timber, BOPConfigurationTerrainGen.timberVillage); addVillageBiome(Biomes.tropicalRainforest, BOPConfigurationTerrainGen.tropicalRainforestVillage); - addVillageBiome(Biomes.tropics, BOPConfigurationTerrainGen.tropicsVillage); addVillageBiome(Biomes.tundra, BOPConfigurationTerrainGen.tundraVillage); - addVillageBiome(Biomes.volcano, BOPConfigurationTerrainGen.volcanoVillage); - addVillageBiome(Biomes.wetland, BOPConfigurationTerrainGen.wetlandVillage); - addVillageBiome(Biomes.woodland, BOPConfigurationTerrainGen.woodlandVillage); addVillageBiome(Biomes.plainsNew, BOPConfigurationTerrainGen.plainsVillage); addVillageBiome(Biomes.desertNew, BOPConfigurationTerrainGen.desertVillage); - addVillageBiome(Biomes.forestNew, BOPConfigurationTerrainGen.forestVillage); - addVillageBiome(Biomes.extremeHillsNew, BOPConfigurationTerrainGen.extremeHillsVillage); - addVillageBiome(Biomes.taigaNew, BOPConfigurationTerrainGen.taigaVillage); - addVillageBiome(Biomes.swamplandNew, BOPConfigurationTerrainGen.swamplandVillage); - addVillageBiome(Biomes.jungleNew, BOPConfigurationTerrainGen.jungleVillage); } private static void addStrongholdBiomes() diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java index 4f4bfdb0d..69b0926a9 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java @@ -26,91 +26,29 @@ public class BOPConfigurationTerrainGen public static int villageDistance; // Village biomes - public static boolean alpsVillage; public static boolean arcticVillage; - public static boolean autumnHillsVillage; - public static boolean badlandsVillage; - public static boolean bambooForestVillage; - public static boolean bayouVillage; - public static boolean birchForestVillage; - public static boolean bogVillage; - public static boolean borealForestVillage; public static boolean brushlandVillage; - public static boolean canyonVillage; public static boolean chaparralVillage; - public static boolean cherryBlossomGroveVillage; - public static boolean coniferousForestVillage; - public static boolean coniferousForestSnowVillage; - public static boolean cragVillage; - public static boolean deadForestVillage; - public static boolean deadForestSnowVillage; - public static boolean deadSwampVillage; - public static boolean deadlandsVillage; - public static boolean deciduousForestVillage; - public static boolean dunesVillage; - public static boolean fenVillage; public static boolean fieldVillage; - public static boolean frostForestVillage; - public static boolean fungiForestVillage; - public static boolean gardenVillage; - public static boolean glacierVillage; public static boolean grasslandVillage; public static boolean groveVillage; public static boolean heathlandVillage; - public static boolean highlandVillage; - public static boolean hotSpringsVillage; - public static boolean icyHillsVillage; - public static boolean jadeCliffsVillage; public static boolean lushDesertVillage; public static boolean lushSwampVillage; - public static boolean mangroveVillage; - public static boolean mapleWoodsVillage; - public static boolean marshVillage; public static boolean meadowVillage; - public static boolean mesaVillage; - public static boolean moorVillage; - public static boolean mountainVillage; - // public static boolean mushroomIslandVillage; - public static boolean mysticGroveVillage; - public static boolean oasisVillage; - public static boolean ominousWoodsVillage; - public static boolean orchardVillage; - public static boolean originValleyVillage; public static boolean outbackVillage; public static boolean overgrownGreensVillage; - public static boolean pastureVillage; - public static boolean polarVillage; public static boolean prairieVillage; - public static boolean quagmireVillage; - public static boolean rainforestVillage; - public static boolean redwoodForestVillage; - public static boolean sacredSpringsVillage; public static boolean savannaVillage; public static boolean scrublandVillage; - public static boolean seasonalForestVillage; - public static boolean shieldVillage; public static boolean shrublandVillage; - public static boolean silkgladesVillage; - public static boolean sludgepitVillage; public static boolean spruceWoodsVillage; public static boolean steppeVillage; - public static boolean temperateRainforestVillage; - public static boolean thicketVillage; public static boolean timberVillage; public static boolean tropicalRainforestVillage; - public static boolean tropicsVillage; public static boolean tundraVillage; - public static boolean volcanoVillage; - public static boolean wastelandVillage; - public static boolean wetlandVillage; - public static boolean woodlandVillage; public static boolean plainsVillage; public static boolean desertVillage; - public static boolean extremeHillsVillage; - public static boolean forestVillage; - public static boolean taigaVillage; - public static boolean swamplandVillage; - public static boolean jungleVillage; public static void init(File configFile) { @@ -139,93 +77,30 @@ public class BOPConfigurationTerrainGen } // Biomes with villages - alpsVillage = config.get("Allow Villages", "Alps", false).getBoolean(false); arcticVillage = config.get("Allow Villages", "Arctic", true).getBoolean(false); - autumnHillsVillage = config.get("Allow Villages", "AutumnHills", false).getBoolean(false); - badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false); - bambooForestVillage = config.get("Allow Villages", "BambooForest", false).getBoolean(false); - bayouVillage = config.get("Allow Villages", "Bayou", false).getBoolean(false); - birchForestVillage = config.get("Allow Villages", "BirchForest", false).getBoolean(false); - bogVillage = config.get("Allow Villages", "Bog", false).getBoolean(false); - borealForestVillage = config.get("Allow Villages", "BorealForest", false).getBoolean(false); brushlandVillage = config.get("Allow Villages", "Brushland", true).getBoolean(false); - canyonVillage = config.get("Allow Villages", "Canyon", false).getBoolean(false); chaparralVillage = config.get("Allow Villages", "Chaparral", true).getBoolean(false); - cherryBlossomGroveVillage = config.get("Allow Villages", "CherryBlossomGrove", false).getBoolean(false); - coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", false).getBoolean(false); - coniferousForestSnowVillage = config.get("Allow Villages", "ConiferousForestSnow", false).getBoolean(false); - cragVillage = config.get("Allow Villages", "Crag", false).getBoolean(false); - deadForestVillage = config.get("Allow Villages", "DeadForest", false).getBoolean(false); - deadForestSnowVillage = config.get("Allow Villages", "DeadForestSnow", false).getBoolean(false); - deadSwampVillage = config.get("Allow Villages", "DeadSwamp", false).getBoolean(false); - deadlandsVillage = config.get("Allow Villages", "Deadlands", false).getBoolean(false); - deciduousForestVillage = config.get("Allow Villages", "DeciduousForest", false).getBoolean(false); - dunesVillage = config.get("Allow Villages", "Dunes", false).getBoolean(false); - fenVillage = config.get("Allow Villages", "Fen", false).getBoolean(false); fieldVillage = config.get("Allow Villages", "Field", true).getBoolean(false); - frostForestVillage = config.get("Allow Villages", "FrostForest", false).getBoolean(false); - fungiForestVillage = config.get("Allow Villages", "FungiForest", false).getBoolean(false); - gardenVillage = config.get("Allow Villages", "Garden", false).getBoolean(false); - glacierVillage = config.get("Allow Villages", "Glacier", false).getBoolean(false); grasslandVillage = config.get("Allow Villages", "Grassland", true).getBoolean(false); groveVillage = config.get("Allow Villages", "Grove", true).getBoolean(false); heathlandVillage = config.get("Allow Villages", "Heathland", true).getBoolean(false); - highlandVillage = config.get("Allow Villages", "Highland", false).getBoolean(false); - hotSpringsVillage = config.get("Allow Villages", "HotSprings", false).getBoolean(false); - icyHillsVillage = config.get("Allow Villages", "IcyHills", false).getBoolean(false); - jadeCliffsVillage = config.get("Allow Villages", "JadeCliffs", false).getBoolean(false); - lushDesertVillage = config.get("Allow Villages", "LushDesert", true).getBoolean(false); lushSwampVillage = config.get("Allow Villages", "LushSwamp", true).getBoolean(false); - mangroveVillage = config.get("Allow Villages", "Mangrove", false).getBoolean(false); - mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", false).getBoolean(false); - marshVillage = config.get("Allow Villages", "Marsh", false).getBoolean(false); meadowVillage = config.get("Allow Villages", "Meadow", true).getBoolean(false); - mesaVillage = config.get("Allow Villages", "Mesa", false).getBoolean(false); - moorVillage = config.get("Allow Villages", "Moor", false).getBoolean(false); - mountainVillage = config.get("Allow Villages", "Mountain", false).getBoolean(false); - // mushroomIslandVillage = config.get("Allow Villages", "MushroomIsland", false).getBoolean(false); - mysticGroveVillage = config.get("Allow Villages", "MysticGrove", false).getBoolean(false); - oasisVillage = config.get("Allow Villages", "Oasis", false).getBoolean(false); - ominousWoodsVillage = config.get("Allow Villages", "OminousWoods", false).getBoolean(false); - orchardVillage = config.get("Allow Villages", "Orchard", false).getBoolean(false); - originValleyVillage = config.get("Allow Villages", "OriginValley", false).getBoolean(false); outbackVillage = config.get("Allow Villages", "Outback", true).getBoolean(false); overgrownGreensVillage = config.get("Allow Villages", "OvergrownGreens", true).getBoolean(false); - pastureVillage = config.get("Allow Villages", "Pasture", false).getBoolean(false); - polarVillage = config.get("Allow Villages", "Polar", false).getBoolean(false); prairieVillage = config.get("Allow Villages", "Prairie", true).getBoolean(false); - quagmireVillage = config.get("Allow Villages", "Quagmire", false).getBoolean(false); - rainforestVillage = config.get("Allow Villages", "Rainforest", false).getBoolean(false); - redwoodForestVillage = config.get("Allow Villages", "RedwoodForest", false).getBoolean(false); - sacredSpringsVillage = config.get("Allow Villages", "SacredSprings", false).getBoolean(false); savannaVillage = config.get("Allow Villages", "Savanna", true).getBoolean(false); scrublandVillage = config.get("Allow Villages", "Scrubland", true).getBoolean(false); - seasonalForestVillage = config.get("Allow Villages", "SeasonalForest", false).getBoolean(false); - shieldVillage = config.get("Allow Villages", "Shield", false).getBoolean(false); shrublandVillage = config.get("Allow Villages", "Shrubland", true).getBoolean(false); - silkgladesVillage = config.get("Allow Villages", "Silkgladess", false).getBoolean(false); - sludgepitVillage = config.get("Allow Villages", "Sludgepit", false).getBoolean(false); spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", true).getBoolean(false); steppeVillage = config.get("Allow Villages", "Steppe", true).getBoolean(false); - temperateRainforestVillage = config.get("Allow Villages", "TemperateRainforest", false).getBoolean(false); - thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false); timberVillage = config.get("Allow Villages", "Timber", true).getBoolean(false); tropicalRainforestVillage = config.get("Allow Villages", "TropicalRainforest", true).getBoolean(false); - tropicsVillage = config.get("Allow Villages", "Tropics", false).getBoolean(false); tundraVillage = config.get("Allow Villages", "Tundra", true).getBoolean(false); - volcanoVillage = config.get("Allow Villages", "Volcano", false).getBoolean(false); - wastelandVillage = config.get("Allow Villages", "Wasteland", false).getBoolean(false); - wetlandVillage = config.get("Allow Villages", "Wetland", false).getBoolean(false); - woodlandVillage = config.get("Allow Villages", "Woodland", false).getBoolean(false); // Vanilla biomes desertVillage = config.get("Allow Villages", "Desert", true).getBoolean(true); - extremeHillsVillage = config.get("Allow Villages", "ExtremeHills", false).getBoolean(false); - forestVillage = config.get("Allow Villages", "Forest", false).getBoolean(false); - jungleVillage = config.get("Allow Villages", "Jungle", false).getBoolean(false); plainsVillage = config.get("Allow Villages", "Plains", true).getBoolean(true); - swamplandVillage = config.get("Allow Villages", "Swampland", false).getBoolean(false); - taigaVillage = config.get("Allow Villages", "Taiga", false).getBoolean(false); FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Terrain Gen Config!"); } diff --git a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java index 676062ecc..fd5455ea3 100644 --- a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java +++ b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java @@ -141,6 +141,357 @@ public class VillageMaterialEventHandler } } + //Brushland + if (event.biome == Biomes.brushland.get()) + { + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + + //Desert + if (event.biome == Biomes.desertNew.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.sandStone.blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Block.sandStone.blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Block.sandStone.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsSandStone.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsSandStone.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sandStone.blockID; + event.setResult(Result.DENY); + } + } + + //Grove + if (event.biome == Biomes.grove.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.wood.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.leaves.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Block.woodSingleSlab.blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + } + + //Heathland + if (event.biome == Biomes.heathland.get()) + { + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + + //Lush Desert + if (event.biome == Biomes.lushDesert.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.redRock.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.redCobbleStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.stoneSingleSlab.get().blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + + //Lush Swamp + if (event.biome == Biomes.lushSwamp.get()) + { + //Gravel + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.cobblestoneMossy.blockID; + event.setResult(Result.DENY); + } + } + + //Meadow + if (event.biome == Biomes.meadow.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.wood.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + } + + //Meadow Forest + if (event.biome == Biomes.meadowForest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.wood.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + } + + //Outback + if (event.biome == Biomes.outback.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.leaves.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab1.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + + //Overgrown Greens + if (event.biome == Biomes.overgrownGreens.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.cobblestoneMossy.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.leaves.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.grass.blockID; + event.setResult(Result.DENY); + } + } + + //Prairie + if (event.biome == Biomes.prairie.get()) + { + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + //Savanna if (event.biome == Biomes.savanna.get()) { @@ -205,5 +556,330 @@ public class VillageMaterialEventHandler event.setResult(Result.DENY); } } + + //Scrubland + if (event.biome == Biomes.scrubland.get()) + { + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + + //Spruce Woods + if (event.biome == Biomes.spruceWoods.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + } + + //Steppe + if (event.biome == Biomes.steppe.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab1.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + + //Tropical Rainforest + if (event.biome == Biomes.tropicalRainforest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.wood.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodJungle.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsWoodJungle.blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + } + + @ForgeSubscribe + public void getVillageBlockMeta(BiomeEvent.GetVillageBlockMeta event) + { + //Desert + if (event.biome == Biomes.desertNew.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 0; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 2; + event.setResult(Result.DENY); + } + } + + //Grove + if (event.biome == Biomes.grove.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = 5; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + + //Lush Desert + if (event.biome == Biomes.lushDesert.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 0; + event.setResult(Result.DENY); + } + } + + //Meadow + if (event.biome == Biomes.meadow.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + + //Meadow Forest + if (event.biome == Biomes.meadowForest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + + //Outback + if (event.biome == Biomes.outback.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = 4; + event.setResult(Result.DENY); + } + } + + //Overgrown Greens + if (event.biome == Biomes.overgrownGreens.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = 4; + event.setResult(Result.DENY); + } + } + + //Spruce Woods + if (event.biome == Biomes.spruceWoods.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + + //Tropical Rainforest + if (event.biome == Biomes.tropicalRainforest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + } } } \ No newline at end of file diff --git a/common/biomesoplenty/worldgen/WorldGenMesa.java b/common/biomesoplenty/worldgen/WorldGenMesa.java index cf7f0117b..c48227c96 100644 --- a/common/biomesoplenty/worldgen/WorldGenMesa.java +++ b/common/biomesoplenty/worldgen/WorldGenMesa.java @@ -63,7 +63,7 @@ public class WorldGenMesa extends WorldGenerator { double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D); - if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Blocks.redRock.get().blockID) + if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Blocks.redRock.get().blockID && par1World.getBlockMetadata(var38, var41, var44) == 0) { par1World.setBlock(var38, var41, var44, minableBlockId); } From 6ad3ee236303f02c8c29370b9caacc48ed2b459d Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 15 Sep 2013 14:58:32 -0400 Subject: [PATCH 13/29] Added more default village biomes --- .../configuration/BOPBiomes.java | 8 + .../BOPConfigurationTerrainGen.java | 16 ++ .../handlers/VillageMaterialEventHandler.java | 219 ++++++++++++++++++ 3 files changed, 243 insertions(+) diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index 1968e2e75..2de4fea5b 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -524,12 +524,17 @@ public class BOPBiomes { addVillageBiome(Biomes.arctic, BOPConfigurationTerrainGen.arcticVillage); addVillageBiome(Biomes.brushland, BOPConfigurationTerrainGen.brushlandVillage); addVillageBiome(Biomes.chaparral, BOPConfigurationTerrainGen.chaparralVillage); + addVillageBiome(Biomes.coniferousForest, BOPConfigurationTerrainGen.coniferousForestVillage); + addVillageBiome(Biomes.coniferousForestSnow, BOPConfigurationTerrainGen.coniferousForestSnowVillage); + addVillageBiome(Biomes.deciduousForest, BOPConfigurationTerrainGen.deciduousForestVillage); + addVillageBiome(Biomes.frostForest, BOPConfigurationTerrainGen.frostForestVillage); addVillageBiome(Biomes.field, BOPConfigurationTerrainGen.fieldVillage); addVillageBiome(Biomes.grassland, BOPConfigurationTerrainGen.grasslandVillage); addVillageBiome(Biomes.grove, BOPConfigurationTerrainGen.groveVillage); addVillageBiome(Biomes.heathland, BOPConfigurationTerrainGen.heathlandVillage); addVillageBiome(Biomes.lushDesert, BOPConfigurationTerrainGen.lushDesertVillage); addVillageBiome(Biomes.lushSwamp, BOPConfigurationTerrainGen.lushSwampVillage); + addVillageBiome(Biomes.mapleWoods, BOPConfigurationTerrainGen.mapleWoodsVillage); addVillageBiome(Biomes.meadow, BOPConfigurationTerrainGen.meadowVillage); addVillageBiome(Biomes.meadowForest, BOPConfigurationTerrainGen.meadowVillage); addVillageBiome(Biomes.outback, BOPConfigurationTerrainGen.outbackVillage); @@ -543,9 +548,12 @@ public class BOPBiomes { addVillageBiome(Biomes.timber, BOPConfigurationTerrainGen.timberVillage); addVillageBiome(Biomes.tropicalRainforest, BOPConfigurationTerrainGen.tropicalRainforestVillage); addVillageBiome(Biomes.tundra, BOPConfigurationTerrainGen.tundraVillage); + addVillageBiome(Biomes.wetland, BOPConfigurationTerrainGen.wetlandVillage); + addVillageBiome(Biomes.woodland, BOPConfigurationTerrainGen.woodlandVillage); addVillageBiome(Biomes.plainsNew, BOPConfigurationTerrainGen.plainsVillage); addVillageBiome(Biomes.desertNew, BOPConfigurationTerrainGen.desertVillage); + addVillageBiome(Biomes.forestNew, BOPConfigurationTerrainGen.forestVillage); } private static void addStrongholdBiomes() diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java index 69b0926a9..4761599fc 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java @@ -29,12 +29,17 @@ public class BOPConfigurationTerrainGen public static boolean arcticVillage; public static boolean brushlandVillage; public static boolean chaparralVillage; + public static boolean coniferousForestVillage; + public static boolean coniferousForestSnowVillage; + public static boolean deciduousForestVillage; + public static boolean frostForestVillage; public static boolean fieldVillage; public static boolean grasslandVillage; public static boolean groveVillage; public static boolean heathlandVillage; public static boolean lushDesertVillage; public static boolean lushSwampVillage; + public static boolean mapleWoodsVillage; public static boolean meadowVillage; public static boolean outbackVillage; public static boolean overgrownGreensVillage; @@ -47,8 +52,11 @@ public class BOPConfigurationTerrainGen public static boolean timberVillage; public static boolean tropicalRainforestVillage; public static boolean tundraVillage; + public static boolean wetlandVillage; + public static boolean woodlandVillage; public static boolean plainsVillage; public static boolean desertVillage; + public static boolean forestVillage; public static void init(File configFile) { @@ -80,11 +88,16 @@ public class BOPConfigurationTerrainGen arcticVillage = config.get("Allow Villages", "Arctic", true).getBoolean(false); brushlandVillage = config.get("Allow Villages", "Brushland", true).getBoolean(false); chaparralVillage = config.get("Allow Villages", "Chaparral", true).getBoolean(false); + coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", true).getBoolean(false); + coniferousForestSnowVillage = config.get("Allow Villages", "SnowyConiferousForest", true).getBoolean(false); + deciduousForestVillage = config.get("Allow Villages", "DeciduousForest", true).getBoolean(false); + frostForestVillage = config.get("Allow Villages", "FrostForest", true).getBoolean(false); fieldVillage = config.get("Allow Villages", "Field", true).getBoolean(false); grasslandVillage = config.get("Allow Villages", "Grassland", true).getBoolean(false); groveVillage = config.get("Allow Villages", "Grove", true).getBoolean(false); heathlandVillage = config.get("Allow Villages", "Heathland", true).getBoolean(false); lushSwampVillage = config.get("Allow Villages", "LushSwamp", true).getBoolean(false); + mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", true).getBoolean(false); meadowVillage = config.get("Allow Villages", "Meadow", true).getBoolean(false); outbackVillage = config.get("Allow Villages", "Outback", true).getBoolean(false); overgrownGreensVillage = config.get("Allow Villages", "OvergrownGreens", true).getBoolean(false); @@ -97,9 +110,12 @@ public class BOPConfigurationTerrainGen timberVillage = config.get("Allow Villages", "Timber", true).getBoolean(false); tropicalRainforestVillage = config.get("Allow Villages", "TropicalRainforest", true).getBoolean(false); tundraVillage = config.get("Allow Villages", "Tundra", true).getBoolean(false); + wetlandVillage = config.get("Allow Villages", "Wetland", true).getBoolean(false); + woodlandVillage = config.get("Allow Villages", "Woodland", true).getBoolean(false); // Vanilla biomes desertVillage = config.get("Allow Villages", "Desert", true).getBoolean(true); + forestVillage = config.get("Allow Villages", "Forest", true).getBoolean(true); plainsVillage = config.get("Allow Villages", "Plains", true).getBoolean(true); FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Terrain Gen Config!"); diff --git a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java index fd5455ea3..bc005a3f9 100644 --- a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java +++ b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java @@ -152,6 +152,31 @@ public class VillageMaterialEventHandler } } + //Coniferous Forest + if (event.biome == Biomes.coniferousForest.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.firStairs.get().blockID; + event.setResult(Result.DENY); + } + } + //Desert if (event.biome == Biomes.desertNew.get()) { @@ -317,6 +342,17 @@ public class VillageMaterialEventHandler } } + //Maple Woods + if (event.biome == Biomes.spruceWoods.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + } + //Meadow if (event.biome == Biomes.meadow.get()) { @@ -568,6 +604,31 @@ public class VillageMaterialEventHandler } } + //Snowy Coniferous Forest + if (event.biome == Biomes.coniferousForestSnow.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.firStairs.get().blockID; + event.setResult(Result.DENY); + } + } + //Spruce Woods if (event.biome == Biomes.spruceWoods.get()) { @@ -687,11 +748,94 @@ public class VillageMaterialEventHandler event.setResult(Result.DENY); } } + + //Wetland + if (event.biome == Biomes.wetland.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs3.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs3.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.willowStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.willowStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab2.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + } } @ForgeSubscribe public void getVillageBlockMeta(BiomeEvent.GetVillageBlockMeta event) { + //Coniferous Forest + if (event.biome == Biomes.coniferousForest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + } + //Desert if (event.biome == Biomes.desertNew.get()) { @@ -767,6 +911,24 @@ public class VillageMaterialEventHandler } } + //Maple Woods + if (event.biome == Biomes.spruceWoods.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + //Meadow if (event.biome == Biomes.meadow.get()) { @@ -839,6 +1001,31 @@ public class VillageMaterialEventHandler } } + //Snowy Coniferous Forest + if (event.biome == Biomes.coniferousForestSnow.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + } + //Spruce Woods if (event.biome == Biomes.spruceWoods.get()) { @@ -881,5 +1068,37 @@ public class VillageMaterialEventHandler event.setResult(Result.DENY); } } + + //Wetland + if (event.biome == Biomes.wetland.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 9; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } } } \ No newline at end of file From c701cc443f14ac316a8de14129aa7e876c83fac3 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 15 Sep 2013 17:03:29 -0400 Subject: [PATCH 14/29] Added Birch Forest villages --- .../configuration/BOPBiomes.java | 1 + .../BOPConfigurationTerrainGen.java | 2 + .../handlers/VillageMaterialEventHandler.java | 50 +++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index 2de4fea5b..61927798a 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -522,6 +522,7 @@ public class BOPBiomes { private static void addVillageBiomes() { addVillageBiome(Biomes.arctic, BOPConfigurationTerrainGen.arcticVillage); + addVillageBiome(Biomes.birchForest, BOPConfigurationTerrainGen.birchForestVillage); addVillageBiome(Biomes.brushland, BOPConfigurationTerrainGen.brushlandVillage); addVillageBiome(Biomes.chaparral, BOPConfigurationTerrainGen.chaparralVillage); addVillageBiome(Biomes.coniferousForest, BOPConfigurationTerrainGen.coniferousForestVillage); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java index 4761599fc..aaa784f65 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java @@ -27,6 +27,7 @@ public class BOPConfigurationTerrainGen // Village biomes public static boolean arcticVillage; + public static boolean birchForestVillage; public static boolean brushlandVillage; public static boolean chaparralVillage; public static boolean coniferousForestVillage; @@ -86,6 +87,7 @@ public class BOPConfigurationTerrainGen // Biomes with villages arcticVillage = config.get("Allow Villages", "Arctic", true).getBoolean(false); + birchForestVillage = config.get("Allow Villages", "BirchForest", true).getBoolean(false); brushlandVillage = config.get("Allow Villages", "Brushland", true).getBoolean(false); chaparralVillage = config.get("Allow Villages", "Chaparral", true).getBoolean(false); coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", true).getBoolean(false); diff --git a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java index bc005a3f9..c99a5d60f 100644 --- a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java +++ b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java @@ -141,6 +141,17 @@ public class VillageMaterialEventHandler } } + //Birch Forest + if (event.biome == Biomes.birchForest.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodBirch.blockID; + event.setResult(Result.DENY); + } + } + //Brushland if (event.biome == Biomes.brushland.get()) { @@ -377,6 +388,13 @@ public class VillageMaterialEventHandler event.setResult(Result.DENY); } + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Block.woodSingleSlab.blockID; + event.setResult(Result.DENY); + } + //Lava if (event.original == Block.lavaStill.blockID) { @@ -414,6 +432,13 @@ public class VillageMaterialEventHandler event.setResult(Result.DENY); } + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Block.woodSingleSlab.blockID; + event.setResult(Result.DENY); + } + //Lava if (event.original == Block.lavaStill.blockID) { @@ -811,6 +836,17 @@ public class VillageMaterialEventHandler @ForgeSubscribe public void getVillageBlockMeta(BiomeEvent.GetVillageBlockMeta event) { + //Birch Forest + if (event.biome == Biomes.birchForest.get()) + { + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 2; + event.setResult(Result.DENY); + } + } + //Coniferous Forest if (event.biome == Biomes.coniferousForest.get()) { @@ -952,6 +988,13 @@ public class VillageMaterialEventHandler event.replacement = 1; event.setResult(Result.DENY); } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } } //Meadow Forest @@ -977,6 +1020,13 @@ public class VillageMaterialEventHandler event.replacement = 1; event.setResult(Result.DENY); } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } } //Outback From 51248c208be3b793998c562bbed86efcac80e48d Mon Sep 17 00:00:00 2001 From: Adubbz Date: Mon, 16 Sep 2013 16:28:24 +1000 Subject: [PATCH 15/29] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 29b08934d..0c20c3ee3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Build Status](https://drone.io/github.com/Glitchfiend/BiomesOPlenty/status.png)](https://drone.io/github.com/Glitchfiend/BiomesOPlenty/latest) - ## Authors - **Adubbz** - "Madman" - General, Technical, Mod Compatibility From 152a4c72420e37af6a62fdc6757084cbb8f7e6da Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Mon, 16 Sep 2013 19:18:00 -0400 Subject: [PATCH 16/29] Fixed Maple Woods village materials --- .../biomesoplenty/handlers/VillageMaterialEventHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java index c99a5d60f..e05c8a840 100644 --- a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java +++ b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java @@ -354,7 +354,7 @@ public class VillageMaterialEventHandler } //Maple Woods - if (event.biome == Biomes.spruceWoods.get()) + if (event.biome == Biomes.mapleWoods.get()) { //Wooden Stairs if (event.original == Block.stairsWoodOak.blockID) @@ -948,7 +948,7 @@ public class VillageMaterialEventHandler } //Maple Woods - if (event.biome == Biomes.spruceWoods.get()) + if (event.biome == Biomes.mapleWoods.get()) { //Logs if (event.original == Block.wood.blockID) From d835248f9b7b56175e7b020f6247a647bd942d7a Mon Sep 17 00:00:00 2001 From: Amnet Date: Wed, 18 Sep 2013 20:05:48 +0200 Subject: [PATCH 17/29] Added missing config option for Lush Desert. --- .../configuration/configfile/BOPConfigurationTerrainGen.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java index aaa784f65..16d2f6c21 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java @@ -98,6 +98,7 @@ public class BOPConfigurationTerrainGen grasslandVillage = config.get("Allow Villages", "Grassland", true).getBoolean(false); groveVillage = config.get("Allow Villages", "Grove", true).getBoolean(false); heathlandVillage = config.get("Allow Villages", "Heathland", true).getBoolean(false); + lushDesertVillage = config.get("Allow Villages", "LushDesert", true).getBoolean(false); lushSwampVillage = config.get("Allow Villages", "LushSwamp", true).getBoolean(false); mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", true).getBoolean(false); meadowVillage = config.get("Allow Villages", "Meadow", true).getBoolean(false); From a7a886b810c846d5c3405dd1db6f0e75c371a2f3 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Wed, 18 Sep 2013 23:57:33 -0400 Subject: [PATCH 18/29] More village material stuff --- .../handlers/VillageMaterialEventHandler.java | 226 ++++++++++++++++-- 1 file changed, 211 insertions(+), 15 deletions(-) diff --git a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java index e05c8a840..6e1a2e624 100644 --- a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java +++ b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java @@ -60,7 +60,7 @@ public class VillageMaterialEventHandler //Glass Panes if (event.original == Block.thinGlass.blockID) { - event.replacement = Block.blockSnow.blockID; + event.replacement = Block.ice.blockID; event.setResult(Result.DENY); } @@ -71,13 +71,6 @@ public class VillageMaterialEventHandler event.setResult(Result.DENY); } - //Fences - if (event.original == Block.fence.blockID) - { - event.replacement = Block.cobblestoneWall.blockID; - event.setResult(Result.DENY); - } - //Double Stone Slabs if (event.original == Block.stoneDoubleSlab.blockID) { @@ -132,13 +125,6 @@ public class VillageMaterialEventHandler event.replacement = Block.dirt.blockID; event.setResult(Result.DENY); } - - //Pressure Plate - if (event.original == Block.pressurePlatePlanks.blockID) - { - event.replacement = 0; - event.setResult(Result.DENY); - } } //Birch Forest @@ -166,6 +152,13 @@ public class VillageMaterialEventHandler //Coniferous Forest if (event.biome == Biomes.coniferousForest.get()) { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + //Logs if (event.original == Block.wood.blockID) { @@ -186,6 +179,39 @@ public class VillageMaterialEventHandler event.replacement = Blocks.firStairs.get().blockID; event.setResult(Result.DENY); } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.firStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab1.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Desert @@ -276,11 +302,39 @@ public class VillageMaterialEventHandler event.replacement = Block.waterMoving.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Heathland if (event.biome == Biomes.heathland.get()) { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs4.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.jacarandaStairs.get().blockID; + event.setResult(Result.DENY); + } + //Gravel if (event.original == Block.gravel.blockID) { @@ -340,6 +394,13 @@ public class VillageMaterialEventHandler event.replacement = Block.sand.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Lush Swamp @@ -406,6 +467,13 @@ public class VillageMaterialEventHandler event.replacement = Block.waterMoving.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Meadow Forest @@ -450,6 +518,13 @@ public class VillageMaterialEventHandler event.replacement = Block.waterMoving.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Outback @@ -515,6 +590,13 @@ public class VillageMaterialEventHandler event.replacement = Block.sand.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Overgrown Greens @@ -616,6 +698,13 @@ public class VillageMaterialEventHandler event.replacement = Block.sand.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Scrubland @@ -632,6 +721,13 @@ public class VillageMaterialEventHandler //Snowy Coniferous Forest if (event.biome == Biomes.coniferousForestSnow.get()) { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + //Logs if (event.original == Block.wood.blockID) { @@ -652,6 +748,39 @@ public class VillageMaterialEventHandler event.replacement = Blocks.firStairs.get().blockID; event.setResult(Result.DENY); } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.firStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab1.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Spruce Woods @@ -728,6 +857,13 @@ public class VillageMaterialEventHandler event.replacement = Block.sand.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Tropical Rainforest @@ -754,6 +890,13 @@ public class VillageMaterialEventHandler event.setResult(Result.DENY); } + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Block.woodSingleSlab.blockID; + event.setResult(Result.DENY); + } + //Lava if (event.original == Block.lavaStill.blockID) { @@ -772,6 +915,13 @@ public class VillageMaterialEventHandler event.replacement = Block.sand.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } //Wetland @@ -830,6 +980,13 @@ public class VillageMaterialEventHandler event.replacement = Block.waterMoving.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } } } @@ -870,6 +1027,13 @@ public class VillageMaterialEventHandler event.replacement = 3; event.setResult(Result.DENY); } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } } //Desert @@ -929,6 +1093,24 @@ public class VillageMaterialEventHandler } } + //Heathland + if (event.biome == Biomes.heathland.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 2; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 13; + event.setResult(Result.DENY); + } + } + //Lush Desert if (event.biome == Biomes.lushDesert.get()) { @@ -1074,6 +1256,13 @@ public class VillageMaterialEventHandler event.replacement = 3; event.setResult(Result.DENY); } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } } //Spruce Woods @@ -1117,6 +1306,13 @@ public class VillageMaterialEventHandler event.replacement = 3; event.setResult(Result.DENY); } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } } //Wetland From 34cea0548410f056822169423ea4460121532e50 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 16:43:31 -0400 Subject: [PATCH 19/29] Added Italian language file --- .../biomesoplenty/helpers/Localizations.java | 4 +- resources/assets/biomesoplenty/lang/it_IT.xml | 382 ++++++++++++++++++ 2 files changed, 384 insertions(+), 2 deletions(-) create mode 100644 resources/assets/biomesoplenty/lang/it_IT.xml diff --git a/common/biomesoplenty/helpers/Localizations.java b/common/biomesoplenty/helpers/Localizations.java index eec13400b..eb264ff67 100644 --- a/common/biomesoplenty/helpers/Localizations.java +++ b/common/biomesoplenty/helpers/Localizations.java @@ -12,8 +12,8 @@ public class Localizations public static ResourceLocation[] localeFiles = { new ResourceLocation(localizationLocation + "en_US.xml"), new ResourceLocation(localizationLocation + "de_DE.xml"), new ResourceLocation(localizationLocation + "nl_NL.xml"), new ResourceLocation(localizationLocation + "ru_RU.xml"), new ResourceLocation(localizationLocation + "zh_CN.xml"), - new ResourceLocation(localizationLocation + "pl_PL.xml"), new ResourceLocation(localizationLocation + "fr_FR.xml"), new ResourceLocation(localizationLocation + "fr_CA.xml")//, - /*new ResourceLocation(localizationLocation + "ja_JP.xml")*/ }; + new ResourceLocation(localizationLocation + "pl_PL.xml"), new ResourceLocation(localizationLocation + "fr_FR.xml"), new ResourceLocation(localizationLocation + "fr_CA.xml"), + new ResourceLocation(localizationLocation + "it_IT.xml")}; public static boolean isXMLLanguageFile(ResourceLocation fileName) { diff --git a/resources/assets/biomesoplenty/lang/it_IT.xml b/resources/assets/biomesoplenty/lang/it_IT.xml new file mode 100644 index 000000000..60637a8be --- /dev/null +++ b/resources/assets/biomesoplenty/lang/it_IT.xml @@ -0,0 +1,382 @@ + + + + Italian (it_IT) Localization File + + + Fango + Sabbie Mobili + + Pietra-Cenere + Sabbia Indurita + Terra Indurita + Ghiaccio Cristallino + Terra Arida + Roccia di Falesia + Mattoni di Fango + Terra Sacra + Cristallo Celestiale + + Roccia Rossa + Pietrisco di Roccia Rossa + Mattoni di Roccia Rossa + + Blocco di Cenere + + Erba Secca + Erba Desertica + Germogli Desertici + Erba delle Dune + Erba Alta Sacra + Rovi + Orzo + Tifa + Tifa + Tifa + Canna + Piantina Grassa + Verruca Wither + + Trifoglio + Fiore di Palude + Fior di Morte + Fior di Luce + Ortensia Blu + Cosmea Sulfurea + Giunchiglia Rosa + Fiore di Campo + Violetta + Anemone Bianca + Ninfea + Chromaflora + Aloe + Girasole + Girasole + Dente di Leone Bianco + + Alga + Erba Bassa + Erba Media + Erba Alta + Cespuglio + Germoglio + Erba Alta + Edera Velenosa + Cespuglio di Bacche + + Fiore Rosso Gigante + Fiore Giallo Gigante + + Fungo a Ombrello + Champignon + Lactarius Indigo + Fungo Luminoso + + Arboscello di Melo + Arboscello Giallo Autunnale + Arboscello di Bamboo + Arboscello Magico + Arboscello Oscuro + Arboscello Morente + Arboscello d'Abete + Arboscello della Terra Promessa + Arboscello Arancione Autunnale + Arboscello della Valle dell'Origine + Arboscello di Ciliegio Rosa + Arboscello d'Acero + Arboscello di Ciliegio Bianco + Arboscello della Corteccia Infernale + Arboscello di Jacaranda + Arboscello di Cachi + + Arboscello d'Acacia + Arboscello di Mangrovia + Arboscello di Palma + Arboscello di Sequoia + Arboscello di Salice + Arboscello di Pino + + Salice + Edera + Foglie di Melo + Foglie di Cachi + Bamboo + Scalini in Mattoni di Fango + Blocco di Erba della Valle dell'Origine + Blocco di Erba Copiosa + Muschio Parassita + + Alga Kelp + Corallo Rosa + Corallo Arancione + Corallo Blu + Corallo Luminescente + + Scalini in Pietrisco di Roccia Rossa + Scalini in Mattoni di Roccia Rossa + + Blocco di Erba Sacra + Blocco di Erba Ardente + + Pietra del Cielo + Pietrisco del Cielo + Mattoni del Cielo + + Scalini in Pietrisco del Cielo + Scalini in Mattoni del Cielo + + Portale della Terra Promessa + + Ametista Grezza + Blocco di Ametista + Rubino Grezzo + Blocco di Rubino + Peridoto Grezzo + Blocco di Peridoto + Topazio Grezzo + Blocco di Topazio + Tanzanite Grezza + Blocco di Tanzanite + Apatite Grezza + Blocco di Apatite + Zaffiro Grezzo + Blocco di Zaffiro + + Muschio + + Blocco di Nuvola + + Segmento Piccolo d'Ossa + Segmento Medio d'Ossa + Segmento Grande d'Ossa + + Lenti Celestiali + + Centro Sacrificale + Centro Sacrificale + Centro Sacrificale + + Struttura dell'Altare + + Pozzanghera + + Lapide + + Lastra di Pietrisco di Roccia Rossa + Lastra di Mattoni di Roccia Rossa + Lastra di Mattoni di Fango + Lastra di Pietrisco del Cielo + Lastra di Mattoni del Cielo + + Lastra di Pietrisco di Roccia Rossa + Lastra di Mattoni di Roccia Rossa + Lastra di Mattoni di Fango + Lastra di Pietrisco del Cielo + Lastra di Mattoni del Cielo + + Assi in Legno di Acacia + Assi in Legno di Ciliegio + Assi in Legno Oscuro + Assi in Legno d'Abete + Assi in Legno Sacro + Assi in Legno Magico + Assi in Legno di Mangrovia + Assi in Legno di Palma + Assi in Legno di Sequoia + Assi in Legno di Salice + Fascio di Bamboo + Assi in Legno di Pino + Assi in Corteccia dell'inferno + Assi in Legno di Jacaranda + + Legno di Acacia + Legno di Ciliegio + Legno Oscuro + Legno d'Abete + + Legno Sacro + Legno Magico + Legno di Mangrovia + Legno di Palma + + Legno di Sequoia + Legno di Salice + Legno Morto + Stelo di Fiore Gigante + + Legno di Pino + Legno di Corteccia Infernale + Legno di Jacaranda + + Foglie Gialle Autunnali + Foglie di Bamboo + Foglie Magiche + Foglie Oscure + Foglie Morenti + Foglie d'Abete + Foglie Sacre + Foglie Arancioni Autunnali + + Foglie della Valle dell'Origine + Foglie di Ciliegio Rosa + Foglie di Acero + Foglie di Ciliegio Bianco + Foglie di Corteccia Infernale + Foglie di Jacaranda + + Lastra in Legno di Acacia + Lastra in Legno di Ciliegio + Lastra in Legno Oscuro + Lastra in Legno d'Abete + Lastra in Legno Sacro + Lastra in Legno Magico + Lastra in Legno di Mangrovia + Lastra in Legno di Palma + Lastra in Legno di Sequoia + Lastra in Legno di Salice + Lastra in Legno di Pino + Lastra in Corteccia dell'Inferno + Lastra in Legno di Jacaranda + + Lastra in Legno di Acacia + Lastra in Legno di Ciliegio + Lastra in Legno Oscuro + Lastra in Legno d'Abete + Lastra in Legno Sacro + Lastra in Legno Magico + Lastra in Legno di Mangrovia + Lastra in Legno di Palma + Lastra in Legno di Sequoia + Lastra in Legno di Salice + Lastra in Legno di Pino + Lastra in Corteccia dell'Inferno + Lastra in Legno di Jacaranda + + Scalini in Legno di Acacia + Scalini in Legno di Ciliegio + Scalini in Legno Oscuro + Scalini in Legno d'Abete + Scalini in Legno Sacro + Scalini in Legno Magico + Scalini in Legno di Mangrovia + Scalini in Legno di Palma + Scalini in Legno di Sequoia + Scalini in Legno di Salice + Scalini in Legno di Pino + Scalini in Corteccia dell'Inferno + Scalini in Legno di Jacaranda + + Foglie di Acacia + Foglie di Mangrovia + Foglie di Palma + Foglie di Sequoia + Foglie di Salice + Foglie di Pino + + + Bacca + Polvere di Fungo + Carote Selvagge + Semi di Girasole + Macedonia + Insalata di Verdure + Insalata di Funghi + Cachi + + Cerbottana + Dardo + Dardo Avvelenato + + Palla di Fango + + Mattone di Fango + Cumulo di Cenere + Ametista + Veleno + Scheggia di Cristallo Celestiale + Tintura Blu + Tintura Marrone + Tintura Verde + Tintura Bianca + Tintura Nera + Rubino + Peridoto + Topazio + Tanzanite + Apatite + Zaffiro + Anima Dannata + + Piccone di Fango + Ascia di Fango + Pala di Fango + Spada di Fango + Zappa di Fango + Elmo di Fango + Corazza di Fango + Gambali di Fango + Stivali di Fango + + Piccone di Ametista + Ascia di Ametista + Pala di Ametista + Spada di Ametista + Zappa di Ametista + Elmo di Ametista + Corazza di Ametista + Gambali di Ametista + Stivali di Ametista + + Falce di Legno + Falce di Pietra + Falce di Ferro + Falce d'Oro + Falce di Diamante + Falce di Fango + Falce di Ametista + + Verga Venerabile + Manico della Verga Venerabile + Corpo della Verga Venerabile + Sommit della Verga Venerabile + Verga Venerabile Esaurita + + Manipolatore d'Anima + Manipolatore d'Anima - Anima Dannata + Manipolatore d'Anima - Anima di Villico + + Traslatore Ender + + Disco Musicale + Disco Musicale + + Corona di Fiori Comune + Corona di Fiori di Pianura + Corona di Fiori Lussureggiante + Corona di Fiori Esotici + + Stivali da Guado + Pinne + + + Secchio di Ametista + Secchio di Ametista con Acqua Primaverile + Secchio di Liquido Velenoso + + Liquido Velenoso + Acqua Primaverile + + Liquido Velenoso + Acqua Primaverile + + + Un portale per la Terra Promessa apparto nel cielo, sopra di te. + Un portale per l'Overworld apparto nel cielo, sopra di te. + + + Biomes O' Plenty + + + Biomes O' Plenty + + \ No newline at end of file From 91cb1183c1a0b4d8fce129df2ca76583c0f4fee1 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 18:18:50 -0400 Subject: [PATCH 20/29] Added 3 new flowers, Tropics sub-biome, tweaked Tropics biome --- common/biomesoplenty/api/Biomes.java | 3 + common/biomesoplenty/api/BlockReferences.java | 4 + common/biomesoplenty/api/Blocks.java | 1 + .../biomes/BiomeDecoratorBOP.java | 36 +++ .../biomes/BiomeGenBirchForest.java | 1 + .../biomesoplenty/biomes/BiomeGenTropics.java | 3 +- .../biomes/nether/BiomeGenNetherBase.java | 1 + .../biomes/nether/BiomeGenNetherGarden.java | 1 + .../biomes/nether/BiomeGenNetherLava.java | 1 + .../biomesoplenty/blocks/BlockBOPFlower2.java | 206 ++++++++++++++++++ .../configuration/BOPBiomes.java | 8 +- .../configuration/BOPBlocks.java | 4 + .../configfile/BOPConfigurationIDs.java | 5 + .../integration/ForestryIntegration.java | 2 + .../integration/ThaumcraftIntegration.java | 4 + .../itemblocks/ItemBlockFlower2.java | 118 ++++++++++ .../world/layer/BiomeLayerSub.java | 1 + resources/assets/biomesoplenty/lang/en_US.xml | 4 + .../textures/blocks/hibiscus.png | Bin 0 -> 351 bytes .../textures/blocks/lilyofthevalley.png | Bin 0 -> 461 bytes 20 files changed, 401 insertions(+), 2 deletions(-) create mode 100644 common/biomesoplenty/blocks/BlockBOPFlower2.java create mode 100644 common/biomesoplenty/itemblocks/ItemBlockFlower2.java create mode 100644 resources/assets/biomesoplenty/textures/blocks/hibiscus.png create mode 100644 resources/assets/biomesoplenty/textures/blocks/lilyofthevalley.png diff --git a/common/biomesoplenty/api/Biomes.java b/common/biomesoplenty/api/Biomes.java index 48321ab51..796934e4c 100644 --- a/common/biomesoplenty/api/Biomes.java +++ b/common/biomesoplenty/api/Biomes.java @@ -113,7 +113,10 @@ public class Biomes public static Optional timber = Optional.absent(); public static Optional timberThin = Optional.absent(); public static Optional tropicalRainforest = Optional.absent(); + public static Optional tropics = Optional.absent(); + public static Optional tropicsMountain = Optional.absent(); + public static Optional tundra = Optional.absent(); public static Optional volcano = Optional.absent(); public static Optional wasteland = Optional.absent(); diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index dc4ad9a5c..32c73e59f 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -181,6 +181,10 @@ public class BlockReferences { aloe (Blocks.flowers, 12), sunflower (Blocks.flowers, 13), dandelion (Blocks.flowers, 15), + + hibiscus (Blocks.flowers2, 0), + lilyofthevalley (Blocks.flowers2, 1), + burningblossom (Blocks.flowers2, 2), ; public Optional block; diff --git a/common/biomesoplenty/api/Blocks.java b/common/biomesoplenty/api/Blocks.java index b32483a0c..b4e8c5a76 100644 --- a/common/biomesoplenty/api/Blocks.java +++ b/common/biomesoplenty/api/Blocks.java @@ -64,6 +64,7 @@ public class Blocks // Plants public static Optional flowers = Optional.absent(); + public static Optional flowers2 = Optional.absent(); public static Optional mushrooms = Optional.absent(); public static Optional coral = Optional.absent(); public static Optional leaves1 = Optional.absent(); diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index 5fa6ffa31..3a576ea0c 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -219,6 +219,9 @@ public class BiomeDecoratorBOP extends BiomeDecorator public WorldGenerator graveGen; public WorldGenerator pumpkinAltGen; public WorldGenerator coralGen; + public WorldGenerator hibiscusGen; + public WorldGenerator lilyOfTheValleyGen; + public WorldGenerator burningBlossomGen; public WorldGenerator boneSpineGen; public WorldGenerator boneSpine2Gen; @@ -304,6 +307,9 @@ public class BiomeDecoratorBOP extends BiomeDecorator public int gravesPerChunk; public int pumpkinsPerChunk; public int coralPerChunk; + public int hibiscusPerChunk; + public int lilyOfTheValleysPerChunk; + public int burningBlossomsPerChunk; public int boneSpinesPerChunk; public int boneSpines2PerChunk; @@ -453,6 +459,9 @@ public class BiomeDecoratorBOP extends BiomeDecorator tinyCactusGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 12); aloeGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 12); coralGen = new WorldGenCoral(Blocks.coral.get().blockID, 4); + hibiscusGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 0); + lilyOfTheValleyGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 1); + burningBlossomGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 2); lilyflowerGen = new WorldGenLilyflower(); deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2); hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4); @@ -578,6 +587,9 @@ public class BiomeDecoratorBOP extends BiomeDecorator gravesPerChunk = 0; pumpkinsPerChunk = 0; coralPerChunk = 0; + hibiscusPerChunk = 0; + lilyOfTheValleysPerChunk = 0; + burningBlossomsPerChunk = 0; generateLakes = true; generateAsh = false; generateMycelium = false; @@ -1098,6 +1110,30 @@ public class BiomeDecoratorBOP extends BiomeDecorator var5 = chunk_Z + randomGenerator.nextInt(16) + 8; plantBlueGen.generate(currentWorld, randomGenerator, var3, var4, var5); } + + for (var2 = 0; var2 < hibiscusPerChunk; ++var2) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(256); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + hibiscusGen.generate(currentWorld, randomGenerator, var3, var4, var5); + } + + for (var2 = 0; var2 < lilyOfTheValleysPerChunk; ++var2) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(256); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + lilyOfTheValleyGen.generate(currentWorld, randomGenerator, var3, var4, var5); + } + + for (var2 = 0; var2 < burningBlossomsPerChunk; ++var2) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(256); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + burningBlossomGen.generate(currentWorld, randomGenerator, var3, var4, var5); + } for (var2 = 0; var2 < hydrangeasPerChunk; ++var2) { diff --git a/common/biomesoplenty/biomes/BiomeGenBirchForest.java b/common/biomesoplenty/biomes/BiomeGenBirchForest.java index 5452f98b2..b67581cf1 100644 --- a/common/biomesoplenty/biomes/BiomeGenBirchForest.java +++ b/common/biomesoplenty/biomes/BiomeGenBirchForest.java @@ -23,6 +23,7 @@ public class BiomeGenBirchForest extends BiomeGenBase customBiomeDecorator.flowersPerChunk = -999; customBiomeDecorator.tinyFlowersPerChunk = 6; customBiomeDecorator.poisonIvyPerChunk = 3; + customBiomeDecorator.lilyOfTheValleysPerChunk = 15; } /** diff --git a/common/biomesoplenty/biomes/BiomeGenTropics.java b/common/biomesoplenty/biomes/BiomeGenTropics.java index 061d0c885..e703a86a6 100644 --- a/common/biomesoplenty/biomes/BiomeGenTropics.java +++ b/common/biomesoplenty/biomes/BiomeGenTropics.java @@ -24,7 +24,7 @@ public class BiomeGenTropics extends BiomeGenBase super(par1); theBiomeDecorator = new BiomeDecoratorBOP(this); customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - customBiomeDecorator.treesPerChunk = 8; + customBiomeDecorator.treesPerChunk = 4; customBiomeDecorator.grassPerChunk = 7; customBiomeDecorator.flowersPerChunk = 10; customBiomeDecorator.sandPerChunk = 50; @@ -32,6 +32,7 @@ public class BiomeGenTropics extends BiomeGenBase customBiomeDecorator.orangeFlowersPerChunk = 10; customBiomeDecorator.whiteFlowersPerChunk = 4; customBiomeDecorator.sunflowersPerChunk = 2; + customBiomeDecorator.hibiscusPerChunk = 45; customBiomeDecorator.generatePumpkins = false; spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6)); spawnableCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java index 87bcf7d3f..421995690 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java @@ -20,6 +20,7 @@ public class BiomeGenNetherBase extends BiomeGenBase topBlock = (byte)Block.netherrack.blockID; fillerBlock = (byte)Block.netherrack.blockID; customBiomeDecorator.gravesPerChunk = 1; + customBiomeDecorator.burningBlossomsPerChunk = 1; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java index 43894089d..ff7e0b1e6 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java @@ -32,6 +32,7 @@ public class BiomeGenNetherGarden extends BiomeGenBase customBiomeDecorator.glowshroomsPerChunk = 3; customBiomeDecorator.toadstoolsPerChunk = 5; customBiomeDecorator.gravesPerChunk = 1; + customBiomeDecorator.burningBlossomsPerChunk = 8; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java index d0010b874..72cb9b212 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java @@ -30,6 +30,7 @@ public class BiomeGenNetherLava extends BiomeGenBase customBiomeDecorator.netherLavaPerChunk = 20; customBiomeDecorator.smolderingGrassPerChunk = 2; customBiomeDecorator.gravesPerChunk = 1; + customBiomeDecorator.burningBlossomsPerChunk = 4; customBiomeDecorator.generateAsh = true; spawnableMonsterList.clear(); spawnableCreatureList.clear(); diff --git a/common/biomesoplenty/blocks/BlockBOPFlower2.java b/common/biomesoplenty/blocks/BlockBOPFlower2.java new file mode 100644 index 000000000..b08cdfdb9 --- /dev/null +++ b/common/biomesoplenty/blocks/BlockBOPFlower2.java @@ -0,0 +1,206 @@ +package biomesoplenty.blocks; + +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import biomesoplenty.BiomesOPlenty; +import biomesoplenty.api.Blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockBOPFlower2 extends BlockFlower +{ + private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"}; + private Icon[] textures; + + protected BlockBOPFlower2(int blockID, Material material) + { + super(blockID, material); + this.setTickRandomly(true); + float var4 = 0.2F; + this.setBlockBounds(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); + } + + public BlockBOPFlower2(int blockID) + { + this(blockID, Material.plants); + } + + @Override + public void registerIcons(IconRegister iconRegister) + { + textures = new Icon[plants2.length]; + + for (int i = 0; i < plants2.length; ++i) { + textures[i] = iconRegister.registerIcon("biomesoplenty:" + plants2[i]); + } + } + + @Override + public Icon getIcon(int side, int meta) + { + if (meta < 0 || meta >= textures.length) { + meta = 0; + } + + return textures[meta]; + } + + @Override + public int getRenderType() + { + return 1; + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z); + if (meta == 2) + return 9; + else + return 0; + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess world, int par2, int par3, int par4) + { + int meta = world.getBlockMetadata(par2, par3, par4); + + switch (meta) + { + default: + this.setBlockBounds(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F); + break; + } + } + + /** + * A randomly called display update to be able to add particles or other items for display + */ + @Override + public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + { + super.randomDisplayTick(par1World, par2, par3, par4, par5Random); + int meta = par1World.getBlockMetadata(par2, par3, par4); + if (meta == 2) + { + if (par5Random.nextInt(2) == 0) + { + par1World.spawnParticle("smoke", par2 + par5Random.nextFloat(), par3 + par5Random.nextFloat(), par4 + par5Random.nextFloat(), 0.0D, 0.0D, 0.0D); + } + if (par5Random.nextInt(4) == 0) + { + par1World.spawnParticle("flame", par2 + par5Random.nextFloat(), par3 + par5Random.nextFloat(), par4 + par5Random.nextFloat(), 0.0D, 0.0D, 0.0D); + } + } + } + + @Override + @SideOnly(Side.CLIENT) + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) { + for (int i = 0; i < plants2.length; ++i) + { + list.add(new ItemStack(blockID, 1, i)); + } + } + + @Override + protected boolean canThisPlantGrowOnThisBlockID(int id) + { + return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.netherrack.blockID || id == Blocks.longGrass.get().blockID; + } + + protected boolean canThisPlantGrowOnThisBlockID(int id, int metadata) + { + if (metadata == 2) // Burning Blossom + return id == Block.netherrack.blockID; + else + return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Blocks.longGrass.get().blockID; + } + + @Override + public boolean canPlaceBlockOnSide(World world, int x, int y, int z, int side, ItemStack itemStack) + { + int id = world.getBlockId(x, y - 1, z); + int meta = itemStack.getItemDamage(); + //boolean sky = world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z); + + if (itemStack.itemID == blockID) { + switch (meta) + { + case 2: // Burning Blossom + return id == Block.netherrack.blockID; + + default: + return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Blocks.longGrass.get().blockID; + } + } else + return this.canPlaceBlockOnSide(world, x, y, z, side); + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, int neighborID) + { + //super.onNeighborBlockChange(world, x, y, z, neighborID); + this.checkFlowerChange(world, x, y, z); + } + + @Override + public int getDamageValue(World world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z); + + return meta; + } + + @Override + public int damageDropped(int meta) + { + return meta & 15; + } + + @Override + public boolean canBlockStay(World world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z); + + if (world.getBlockId(x, y, z) != blockID) + { + if (meta == 2) + return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z)); + else + return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z)); + } + else + { + if (meta == 2) + return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z)); + else + return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z)); + } + } + + @Override + public boolean isBlockReplaceable(World world, int x, int y, int z) + { + //ItemStack itemstack = new ItemStack(Blocks.flowers.get(), 1, 10); + + if (world.getBlockMetadata(x, y, z) == 10) + //if (!world.isRemote) + //world.spawnEntityInWorld(new EntityItem(world, x, y, z, itemstack)); + return true; + return false; + } +} diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index 61927798a..7243567f1 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -282,7 +282,10 @@ public class BOPBiomes { Biomes.timber = Optional.of((new BiomeGenTimber(BOPConfigurationIDs.timberID)).setColor(353825).setBiomeName("Timber").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); Biomes.timberThin = Optional.of((new BiomeGenTimberThin(BOPConfigurationIDs.timberThinID)).setColor(353825).setBiomeName("Thinned Timber").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); Biomes.tropicalRainforest = Optional.of((new BiomeGenTropicalRainforest(BOPConfigurationIDs.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F)); - Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfigurationIDs.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 1.5F)); + + Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfigurationIDs.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.5F)); + Biomes.tropicsMountain = Optional.of((new BiomeGenTropics(BOPConfigurationIDs.tropicsMountainID)).setColor(9286496).setBiomeName("Tropics Mountain").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.5F, 1.1F)); + Biomes.tundra = Optional.of((new BiomeGenTundra(BOPConfigurationIDs.tundraID)).setColor(14090235).setBiomeName("Tundra").setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.1F, 0.3F)); Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfigurationIDs.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F).setTemperatureRainfall(2.0F, 0.05F)); Biomes.wasteland = Optional.of((new BiomeGenWasteland(BOPConfigurationIDs.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.3F, 0.4F)); @@ -426,7 +429,10 @@ public class BOPBiomes { BiomeDictionary.registerBiomeType(Biomes.timberThin.get(), Type.FOREST); BiomeDictionary.registerBiomeType(Biomes.tropicalRainforest.get(), Type.JUNGLE); + BiomeDictionary.registerBiomeType(Biomes.tropics.get(), Type.JUNGLE, Type.WATER); + BiomeDictionary.registerBiomeType(Biomes.tropicsMountain.get(), Type.JUNGLE, Type.WATER); + BiomeDictionary.registerBiomeType(Biomes.tundra.get(), Type.FROZEN, Type.WASTELAND); BiomeDictionary.registerBiomeType(Biomes.volcano.get(), Type.WASTELAND, Type.MOUNTAIN); BiomeDictionary.registerBiomeType(Biomes.wasteland.get(), Type.WASTELAND); diff --git a/common/biomesoplenty/configuration/BOPBlocks.java b/common/biomesoplenty/configuration/BOPBlocks.java index 3cbd58fb6..53802d431 100644 --- a/common/biomesoplenty/configuration/BOPBlocks.java +++ b/common/biomesoplenty/configuration/BOPBlocks.java @@ -13,6 +13,7 @@ import biomesoplenty.blocks.BlockBOPColorizedLeaves; import biomesoplenty.blocks.BlockBOPColorizedSapling; import biomesoplenty.blocks.BlockBOPCoral; import biomesoplenty.blocks.BlockBOPFlower; +import biomesoplenty.blocks.BlockBOPFlower2; import biomesoplenty.blocks.BlockBOPFoliage; import biomesoplenty.blocks.BlockBOPGeneric; import biomesoplenty.blocks.BlockBOPGeneric.BlockType; @@ -56,6 +57,7 @@ import biomesoplenty.itemblocks.ItemBlockColorizedLeaves; import biomesoplenty.itemblocks.ItemBlockColorizedSapling; import biomesoplenty.itemblocks.ItemBlockCoral; import biomesoplenty.itemblocks.ItemBlockFlower; +import biomesoplenty.itemblocks.ItemBlockFlower2; import biomesoplenty.itemblocks.ItemBlockFoliage; import biomesoplenty.itemblocks.ItemBlockGlass; import biomesoplenty.itemblocks.ItemBlockGrass; @@ -128,6 +130,7 @@ public class BOPBlocks Blocks.ash = Optional.of((new BlockAsh(BOPConfigurationIDs.ashID)).setHardness(0.4F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.ash")); Blocks.plants = Optional.of((new BlockBOPPlant(BOPConfigurationIDs.plantsID)).setUnlocalizedName("bop.plants")); Blocks.flowers = Optional.of((new BlockBOPFlower(BOPConfigurationIDs.flowersID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.flowers")); + Blocks.flowers2 = Optional.of((new BlockBOPFlower2(BOPConfigurationIDs.flowers2ID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.flowers2")); Blocks.mushrooms = Optional.of((new BlockBOPMushroom(BOPConfigurationIDs.mushroomsID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.mushrooms")); Blocks.coral = Optional.of((new BlockBOPCoral(BOPConfigurationIDs.coralID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.coral")); Blocks.willow = Optional.of((new BlockWillow(BOPConfigurationIDs.willowID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.willow")); @@ -215,6 +218,7 @@ public class BOPBlocks GameRegistry.registerBlock(Blocks.ash.get(), "bop.ash"); GameRegistry.registerBlock(Blocks.plants.get(), ItemBlockPlant.class, "bop.plants"); GameRegistry.registerBlock(Blocks.flowers.get(), ItemBlockFlower.class, "bop.flowers"); + GameRegistry.registerBlock(Blocks.flowers2.get(), ItemBlockFlower2.class, "bop.flowers2"); GameRegistry.registerBlock(Blocks.mushrooms.get(), ItemBlockMushroom.class, "bop.mushrooms"); GameRegistry.registerBlock(Blocks.coral.get(), ItemBlockCoral.class, "bop.coral"); GameRegistry.registerBlock(Blocks.willow.get(), ItemBOPWillow.class, "bop.willow"); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java index 64ddf686a..d90c0c41e 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java @@ -31,6 +31,7 @@ public class BOPConfigurationIDs public static int plantsID; public static int flowersID; + public static int flowers2ID; public static int mushroomsID; public static int coralID; public static int willowID; @@ -261,6 +262,7 @@ public class BOPConfigurationIDs public static int timberThinID; public static int tropicalRainforestID; public static int tropicsID; + public static int tropicsMountainID; public static int tundraID; public static int volcanoID; public static int wastelandID; @@ -396,6 +398,8 @@ public class BOPConfigurationIDs graveID = config.getBlock("Grave ID", 1981, null).getInt(); leavesFruit2ID = config.getBlock("Fruit Leaf Block 2 ID", 1982, null).getInt(); + + flowers2ID = config.getBlock("Flower 2 ID", 1983, null).getInt(); // Get Item ID's foodID = config.getItem("Food ID", 21003, null).getInt(); @@ -467,6 +471,7 @@ public class BOPConfigurationIDs //23-79 ExtraBiomesXL + tropicsMountainID = config.get("Biome IDs", "Tropics Mountain (Sub-Biome) ID", 32).getInt(); autumnHillsID = config.get("Biome IDs", "Autumn Hills ID", 33).getInt(); overgrownGreensID = config.get("Biome IDs", "Overgrown Greens ID", 34).getInt(); forestHillsNewID = config.get("Biome IDs", "Forest Hills (Sub-Biome) ID", 35).getInt(); diff --git a/common/biomesoplenty/integration/ForestryIntegration.java b/common/biomesoplenty/integration/ForestryIntegration.java index 89f36b5ff..bed8a4e42 100644 --- a/common/biomesoplenty/integration/ForestryIntegration.java +++ b/common/biomesoplenty/integration/ForestryIntegration.java @@ -85,6 +85,7 @@ public class ForestryIntegration EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.oasisID); EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.rainforestID); EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.tropicsID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.tropicsMountainID); EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.woodlandID); EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.jungleNewID); EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.jungleHillsNewID); @@ -98,6 +99,7 @@ public class ForestryIntegration EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.oasisID); EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.rainforestID); EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.tropicsID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.tropicsMountainID); EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.woodlandID); EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.jungleNewID); EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.jungleHillsNewID); diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java index e8d67c389..c26fd82cc 100644 --- a/common/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/common/biomesoplenty/integration/ThaumcraftIntegration.java @@ -222,6 +222,10 @@ public class ThaumcraftIntegration { ThaumcraftApi.registerObjectTag(getBID("lilyflower"), getBMeta("lilyflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.WATER, 1)); ThaumcraftApi.registerObjectTag(getBID("rainbowflower"), getBMeta("rainbowflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1).add(Aspect.MAGIC, 1)); ThaumcraftApi.registerObjectTag(getBID("sunflower"), getBMeta("sunflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1)); + + ThaumcraftApi.registerObjectTag(getBID("hibiscus"), getBMeta("hibiscus"), (new AspectList()).add(Aspect.PLANT, 4)); + ThaumcraftApi.registerObjectTag(getBID("lilyofthevalley"), getBMeta("lilyofthevalley"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.POISON, 1)); + ThaumcraftApi.registerObjectTag(getBID("burningblossom"), getBMeta("burningblossom"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.FIRE, 2)); } diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java new file mode 100644 index 000000000..0f28c8e45 --- /dev/null +++ b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java @@ -0,0 +1,118 @@ +package biomesoplenty.itemblocks; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import biomesoplenty.BiomesOPlenty; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemBlockFlower2 extends ItemBlock +{ + private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"}; + @SideOnly(Side.CLIENT) + private Icon[] textures; + + public ItemBlockFlower2(int par1) + { + super(par1); + setMaxDamage(0); + setHasSubtypes(true); + } + + @Override + public String getUnlocalizedName(ItemStack itemStack) + { + int meta = itemStack.getItemDamage(); + if (meta < 0 || meta >= plants.length) { + meta = 0; + } + + return super.getUnlocalizedName() + "." + plants[meta]; + } + + @Override + public Icon getIconFromDamage(int meta) + { + return Block.blocksList[itemID].getIcon(0, meta); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isFull3D() + { + return true; + } + + @Override + public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) + { + int id = world.getBlockId(x, y, z); + + if (id == Block.snow.blockID && (world.getBlockMetadata(x, y, z) & 7) < 1) { + side = 1; + } else if (!Block.blocksList[id].isBlockReplaceable(world, x, y, z)) + { + if (side == 0) { + --y; + } + + if (side == 1) { + ++y; + } + + if (side == 2) { + --z; + } + + if (side == 3) { + ++z; + } + + if (side == 4) { + --x; + } + + if (side == 5) { + ++x; + } + } + + if (!player.canPlayerEdit(x, y, z, side, itemStack)) + return false; + else if (itemStack.stackSize == 0) + return false; + else + { + if (world.canPlaceEntityOnSide(this.getBlockID(), x, y, z, false, side, (Entity)null, itemStack)) + { + Block block = Block.blocksList[this.getBlockID()]; + int j1 = block.onBlockPlaced(world, x, y, z, side, hitX, hitY, hitZ, 0); + + if (world.setBlock(x, y, z, this.getBlockID(), itemStack.getItemDamage(), 3)) + { + + if (world.getBlockId(x, y, z) == this.getBlockID()) + { + Block.blocksList[this.getBlockID()].onBlockPlacedBy(world, x, y, z, player, itemStack); + Block.blocksList[this.getBlockID()].onPostBlockPlaced(world, x, y, z, j1); + } + + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block.stepSound.getPlaceSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); + --itemStack.stackSize; + } + } + + return true; + } + } +} diff --git a/common/biomesoplenty/world/layer/BiomeLayerSub.java b/common/biomesoplenty/world/layer/BiomeLayerSub.java index 245a74190..10f1b550a 100644 --- a/common/biomesoplenty/world/layer/BiomeLayerSub.java +++ b/common/biomesoplenty/world/layer/BiomeLayerSub.java @@ -40,6 +40,7 @@ public class BiomeLayerSub extends BiomeLayer if (k1 == Biomes.seasonalForest.get().biomeID && nextInt(2) == 0) { l1 = Biomes.seasonalSpruceForest.get().biomeID; } if (k1 == Biomes.field.get().biomeID && nextInt(2) == 0) { l1 = Biomes.fieldForest.get().biomeID; } if (k1 == Biomes.savanna.get().biomeID && nextInt(4) == 0) { l1 = Biomes.savannaPlateau.get().biomeID; } + if (k1 == Biomes.tropics.get().biomeID && nextInt(3) == 0) { l1 = Biomes.tropicsMountain.get().biomeID; } if (k1 == Biomes.forestNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.forestHillsNew.get().biomeID; } if (k1 == Biomes.taigaNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.taigaHillsNew.get().biomeID; } diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index 742f19681..21f8c3b09 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -53,6 +53,10 @@ Sunflower Sunflower White Dandelion + + Pink Hibiscus + Lily of the Valley + Burning Blossom Algae Short Grass diff --git a/resources/assets/biomesoplenty/textures/blocks/hibiscus.png b/resources/assets/biomesoplenty/textures/blocks/hibiscus.png new file mode 100644 index 0000000000000000000000000000000000000000..03afac84c18a5ac9415236a5e8fbf31a9fa5af17 GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|KvlOr zT^vI!{MQDY6g*@gP|Ue!MT?lxW1|@hC+%6GCci?-|3xEvs6_T&qoPfJF7%}Jui5f? z$^HdXCiR84Jer%bb-8Tdc?Lz_fNY*B+xHi^1^A~Q+oa?6MS~^QY!TP49eeV9ZO-?a zE??Q-AHLziwc{qH!sZUSw&u5D181i#iuV0rQ-Aaxzi&Xn?`sWeSsQjUG%)(^_*!Z& z8Ch)o+?OLGczfx>D>EdIaMfH$kJz`ebY>^VzSXmT6okxHVDkCl?0DAmjA7dWcd1<7 t+9&2E%)KFJEE3LIs<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^7j^FlWO00Bu!L_t(IPo0wMO2a@9g*W%aAEF@iA^f3up$PR_3awgu(NwL9 zidZQKUQsDp@nQ12>|6HU{S>>qfZmt;AS4ouVJ zkf^!jH@7LaZKooauRdW8Ft;p=^W01f#>DAUgQkY#JU@SFQD$EbZ)=1RCwA{PsrS|) zI6+(tc6rS=C%Ue4s7-?iHX<+8XL-CD?u+AxZ7O_BinHe?*BGfLPxh}XROu|G3n(T@ zMQLY7l=q5Xn}O@PX{VtKq4?gS_wI`@3`vI6Q3aWHe}fBX&{}JOt;abF1VO;xFk+u7 zh&taL4i0Xrw9=TPD2l{-dy$Urw^%?00;(Vv(Pi`i)}^yF$ph|w@>r)@cbWH%Sj+-X zvRIww#Sj>=n8j*yp72{7$4M%G1Oj*{XrTO+`4Hk0%q*_z@jSB@00000NkvXXu0mjf DThqMz literal 0 HcmV?d00001 From 1f4f4d389e5485f4fa642a225a2d8c58ca330208 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 20:08:59 -0400 Subject: [PATCH 21/29] Tweaked various plant/flower textures --- .../biomesoplenty/textures/blocks/algae.png | Bin 311 -> 844 bytes .../biomesoplenty/textures/blocks/cactus.png | Bin 372 -> 590 bytes .../biomesoplenty/textures/blocks/cattail.png | Bin 315 -> 593 bytes .../textures/blocks/cattailbottom.png | Bin 297 -> 528 bytes .../textures/blocks/cattailtop.png | Bin 329 -> 649 bytes .../biomesoplenty/textures/blocks/cosmos.png | Bin 320 -> 582 bytes .../biomesoplenty/textures/blocks/daffodil.png | Bin 316 -> 603 bytes .../biomesoplenty/textures/blocks/dandelion.png | Bin 248 -> 507 bytes .../biomesoplenty/textures/blocks/deadbloom.png | Bin 326 -> 583 bytes .../textures/blocks/glowflower.png | Bin 303 -> 582 bytes .../biomesoplenty/textures/blocks/hibiscus.png | Bin 351 -> 768 bytes .../biomesoplenty/textures/blocks/hydrangea.png | Bin 307 -> 718 bytes .../textures/blocks/item_cattail.png | Bin 325 -> 597 bytes .../textures/blocks/item_sunflower.png | Bin 340 -> 702 bytes .../textures/blocks/lilyflower.png | Bin 291 -> 665 bytes .../textures/blocks/lilyofthevalley.png | Bin 461 -> 496 bytes .../biomesoplenty/textures/blocks/poisonivy.png | Bin 398 -> 579 bytes .../textures/blocks/sunflowerbottom.png | Bin 290 -> 580 bytes .../textures/blocks/sunflowertop.png | Bin 360 -> 804 bytes .../textures/blocks/swampflower.png | Bin 385 -> 647 bytes .../biomesoplenty/textures/blocks/violet.png | Bin 281 -> 584 bytes .../textures/blocks/wildflower.png | Bin 304 -> 594 bytes 22 files changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/assets/biomesoplenty/textures/blocks/algae.png b/resources/assets/biomesoplenty/textures/blocks/algae.png index 84d1590f0d847bdf137922d1f9acb243c8dc7f88..85f1f9c9edd69611fb4d0ca5a3a0cae286507899 100644 GIT binary patch delta 767 zcmV2NV5o$2&8nJ;~&~ zd*6Hao_p^Z#+X1KW3r+$(JKxu7v7tWcd#Pcj`hQW)Ddkmh5tXNoteZQzJz&0T6Q>Zs$^q6<<=~e{Cr&}w53qZ9$d@7z+^vg}5rNO= zbN1#^8hRy&cDsOrHV<)_$gpDIIi4l7Iefj`fz?`s;-w~(YheuD_mDLLP7^1lCW)h; znXS|)Ge?}KrxcdS&*AcKAJ1Rk!|C}pVo54Vm3dZaP?Kc4EiTfOO{E2a$! z`1#~9o*s1Z^5cEvs)11g2Oh=C!s#3E`@N2>l|$GYte{{ABN(+PmfIy9z3E~9#Rf9P z07StZFUuFh;7BAY)uf1S0Fh|tH8+b&O}3FCjdV6N^!shZqO*`VQcN~Ei)Tk&m_`(` zS7Amyjzn$-lYYgXu7hm)wiAed6D1Z-+(fgHL#-Scmr!3yLhuMI61k2~C!6^8eHXf! zM7`w-i|0Lzldts4k(g)#s+Xw>jVQ0%Ql%MtC8k#b*co)N|Eh!I9|N47J%L^gL7pJ7 z5wubis!XFJX0g;*AIv|guq@5|^hY0C`)ktc6j6-(_L%7)9LSaE-9C>uFFh`SFA zl&X~cnqQ=j2hiR0Qtrde=jbgoLKr`lHtFK%mUn7NbbEpjxj81nPDmFNBXq6Cb xp=2rx$dtmcR?=gNgq8Ko$WGC??Nv}c>_0>V9vW2ib{GHv002ovPDHLkV1fZQY5)KL delta 230 zcmVP*tfU{aIRTf8lsOd^k@RnhkQV_q}kN3(p1( z?1kQ>`SHB2xZF-9AW;ShWf1nvg%H!_GCYE=utUlw>(2C4V15DA(&n^P?} gNO_&uY>p}y;`b4sD6$8NJ^Lf+lc1^urmspX_W<7DU*%a#ua=DxoYuspm zG^}m6+p?$pPNyTj{1B?Z4OOO%22n1Tjol=%TCGZ~3KWCKA$asmCiAXf5bRD%A}!^s z?}jI!0$L7?XV$#CP={VBl_Zt~zs96nx)yO*+Kk667K?U({NR5D?)8>Rc@zDmJiQT9 ztJS0{6)@rR`GlBxd_?>894`+Ka2!W}a$MxNZ^b$`@o#-O8O5Ju52~XX_itYR_}@?Y@jhIYZK6wfzaj(6xtWI)*p5h_b$Vd%;lyNx zdknur>NfP=dwS@9t+wlbV`Jn0C0?`DJB#|)~3c>&Y4#EKyC`y2lQz3sbNAp5A0005aNklcK>fOX9^u4<>rh#Dn~VNByX(7{Bvvw+ zp{KgLs^_5s)M~X#uh;YX4+eulrPXSA;r#h}N;oU<^>IPi<%Nbwzv$hcFi(NE+lC^j z)9HU$nSlIUOE{TpG#aH2Sgo|bUqGYLu*~n?CCiknxY!EQV?9NU74M+oWi>+2oh)@S zb3?w~@7fAwXmnN%QZ?$4;z-z!JLq~RM#Z2_L59TR`~t@?7uY(lgy^N4BNT#4Cf)8O z=%JQm1%eDf?o%^O@Qh>tiC5cE+6+r`V8DM5$d!mop`f|y>&Ha_ptNXL@ECuCm^$P_ zK{q?kcd&~AkLM)+VrNX3B+|sXkC2RxuynH(x>$4L~C zzeIUyX3*sqmb{nTtr#JP1JcjT@G=NJM8F;X5eun96++yLrf6E0ugPy zv$0HLSvQ~YI+%g4nV8^^PL!${K7k2p5D00000NkvXX Hu0mjfGgS6Y delta 235 zcmV&Y4#EKyC`y2lQz3sbNAp5A0004uNkl+SF$BM>8`uHQm+KOX&Ce!OTMCb$;!NFkQ*y7c?k*xl4=qnfnSc^|P zwt9cpay$%&L(fcB9zh_oEDI~Q8&-O5n^ex8Ra_-l;eOL7<`)DCkfbxQa9KAL#2B2` zcPGcf+hl*htGypMM)(h)O#H7RRz?8=jMfP!VMh67*HF{z z_1r9(+4wwiZ(<|CFrIThHpYds>=m42MLd6I{o{c)nk}KEJdP(r-~}GQA)$k8sD^x; z7n$+VmfC^GL)41nKU1BO5%d*Lf(ICk5*}(|Y5{IY)6~h5n|2TbZB7yT5sT3@M u%Ze)YsLK0=$f^VcBvoS%hLKWbX5j}^j%*Q^k@A250000n7LG80r-cdp-&>jm2 zrUT!_qd+0x1Gr~S|2Du2`Vn|eGaf?^Ctt!o!NbXwLk}k3ohXe$JGkdt-N$wUSf_3z T^r1h(HF7JrMya5|mF&(jTonB8tS z+U+)L5NoxXDbNe6)yfDm0OH=OD64EX8wsjWr_;F?`1|KfP;m9@m|c~?r}eaaSx-qh z6A~qkaZr16QRSUofb-84?MD^w%!TFTZCnb^d=x;f+wJC9Ea=72Qk=@Y__#JB-%4rO zd@(`-MBwgVet(>Ih!N=Wb!%2ivjI`|0T3bbCNZi+l&04iMBtXDjIq)ux$$w~hN**mnw6MqHVeQ@31W3MO zj7fA;0w9iTCz*#h4&I4!q$2GGcBTb$DzbWU{!+Xf%;$?bj1j8L$iuApX=xLr$6J%q zpAYJ8!-Xh`-i_zX<3G0kAmf+l;Y)#IxZ%7*3t>SgDt6Ib96Q1ygwYLmj0)l4Zb~;I vkc=FpwI)Ef3nMyUw7VVYvt~8+ zMkcq@V2|_8$|XH-6_sEROOD%Rb*H>lRH71q#{0|Y6G*Qz5@WAPZ!ZB@9M)0e`F8>i ztj57ugKk%W8B#|)~3c>&Y4#EKyC`y2lQz3sbNAp5A0005PNkl}2!c%-f56_tf3Ok1K=2DJ`~a~_o5Vaf?_`sV zITPmQ##|WY&g>i7H9YPCdbofw+b>-EfiGMR`y z7z}^Ju2!o{;96%KNbGjIG#n14*ao(9Y#R?qG7J=IpkA+2GMOYjuIq}{xJtQPo;#=0 zsi0wIojbbTp7lo*-R_F!yZxDaF-oJ+kUScVMk4KY+aSY62fyd*JbXJ~&L0Yha-_L3 z0@_tW0U+T;!2EH{K@f23CCguD0T&7ds?~pLCI_4>6=4*-j(a>Fr|-)h=JzB1Jl$k; z1V4zjN2M?fkl$e$5hNZgdI_F7TKn>ln7^N!^e!>@NkuQi&5tXdkF1 zFgqwtKP~_e(`CYDu5bVWSfx^-L?R(Y{?nQO_`Yv)bd9lW!a=E2TKNikww^uSxOZa3 zp)qiPVmxG=I*Qtk<4`OX6M%F&EnpghU}Wf}qGGWq8td(O9tC-i*RJLqWHK3v;UVS0 wtTG6(|1_YdQYm@W$q|DObfaX1 z)|{mA|Nk0;|Nk@fA%chR^qpuOpfIL73;`Ghfr|l(V9lpIrAT+d zD0^0O!%=kwz$g0oO@HK~y+TRa41I13?h2K<1VY$j=CZ z9{dAAyt$#G;)4E$APTOa;)bFZ!CSyfK)ncFqHzgsM3U%`eUi+S^J=JOCh$@<)%9M# zuAU)gHfXh40_3)BQ@h=!TCGN&=SBL$Fob5aDG`KlgQC%BNH3y3yRJ*7L3dFB2mfc&X?r_%`* z_8+*jenWt>mL@*Vkh^i~F9jqO0!#v6cjE>GpXhDgMaX6oADD}Iz_2uj^|y&V_Q?!4 zAJc~nq7G6;;KYysoXz?6Z{gP!k;mbGEq)!}WwGqn*bcsY`+v4H-Z6&MIv?(y+Vs&HG6f#{;mwM`?HjgE4e>$gLT}P2&j?*uW;rv&51;U z-c$GdaBR-*k$00000NkvXX Hu0mjf)Xnzs delta 228 zcmVS;07*QqmpJZaD}cnG(o%D`>M|a9!MY%DxS<}O|OXKtlN88StR`W~j=M;)#O@mqXnpY8AN zEXNE61L^g8T&HO&zVA!7+vOhE+VebGIxL~n>2Mu};er2O++?#^mazk3D1^1eK@bFg zKMK$dKsrFsK+KXY4zN#>-)mchB=-(HX(_Q=aE~{ha8@i)eT&ECMj8p#4r9b_eLO!%=kwzhZFfjCTp#T5?bV)=(R5(xVjv)@fAPfNe zgsFXSkJ)b!SOkzDK=FWvx0KLOgJGST*qJsYcLjdF4kFTAb<|o}%sKOHt?5G|sb%jy zt#T=a=c9B#|)~3c>&Y4#EKyC`y2lQz3sbNAp5A0005QNklR76w|7m7+Z zZK11f+~)zw(K9%gn|=o_GjlU%X3m{2rc$Yxd_HeVrIG<4r&uhSa=C0{_wYCM3x$F) zp-_Lw5aDoGED?*v%;DKzs80j}0m=3I{U#U;iWNj65xHQ3&*w9_<6lCgzqWM_S|;zE z{FZwUNLH{2B^?2*hY28Uw(!7z`+)lYy)(A| zU$pu#>8|mJ?D(&17VzIQs`G#Qq>cZ#?7d37A#1jt{XccV{{P-F-Tx=g+xuT$K?AJ$ z)a6%%4LN+~F%W8JPN@801m+cxRGn^kwzhZF-P-4Hvj+u!bwCyR5(v%Q#nfmQ4pTZ z$p+G-^RH=TB4SK59;Yc`w0p$8C0?RJ}{)2S%b5r7VWJQxhb-s|;$ ztlw}r6fQ@%+qFR&;CY_NifAPYsX#w`-xscz0B8ex1gl-Swo08&#|8knRgJ*kN}~Q~ z$9{~*W8t9WR)rnM5m`z7v_d37h1P(~{eEAZlgT8-uP&JCweZH1I>#>0jaxV$O$J!O zDhy@zs-a*A7fCh6HKNiw>-2Gv_~X!jvZNbr%f1mmIh{^Z_U4*RW|QcVzwe3+ zJCglcBtRD>9*;{lOJ}E?N~O#i-}C78z_`2{MD_p&dIFc-#%M# tD3#pmE>j`T*vj+JPN`901m=XT5R Y0X(8}m`lZ!fB*mh07*qoM6N<$f@Y~>WdHyG diff --git a/resources/assets/biomesoplenty/textures/blocks/hibiscus.png b/resources/assets/biomesoplenty/textures/blocks/hibiscus.png index 03afac84c18a5ac9415236a5e8fbf31a9fa5af17..50b7959351ac3af6c66dd4549b7d90a660150e28 100644 GIT binary patch delta 684 zcmV;d0#p6p0)PgPJPN-601m$aI0aKAkwz$g0(?nCK~y+TRZ>Y$Q&AK?om<*k$_$EV zT)HzcaRDtUgwS*W-8iMF`z&Aba_>FwJKz1zJ%{vqJ(XZI8cCGZd&n1=TV7e<-3dvOiW5CQd9A3L?S|8b=L6tceqjy>fzG9!^`~a=GZpiwbIb zVgx&5t{|7oX%3p7SztO#sJu$ZXS2vnPoqAiLv4aYn3K5_7TX8+HJymqLW-fC6<}cj zNF;z%3cseN&~(27jrVM@SS-SKhRe!-X&BLq&4Ul@_?^jMv$GTVjS%+2VdMq|u;%ed zYxz1_-t+2ZKN|DbDyG1(n1; zl1^wS9h6Ss=j0?XIx63fu`&FanE@gZ6o!U?r6n+jxy=vN`Or|BJi}?FjOAtQ&CZHl zcEx)vF3P#~mPv+);dZ-a)zI>PTy2r@4B^0Kg`6N%Tp*bZ7OK8sfWzS+=cTd^uo_$8 z0pXR&w#NjX4gQY5u0_LLE9!2Wua2HygZJPN@801m+cxRGn^kwz$g0NY7KK~y+Ttx(Ak!Y~kX3B0I;7Bb^9 zn4yxqs3sq%B2Van2UQqry)tsL{LqYMkF2!oq`#n)l8#q|;+J`Q@3@Y)R-B>3VhIKSiY%snTZI# ztDE?6RGT0IO!z}V%}LBLhQLP}Z4G_oH*^DyRLnSF%{e56WHhtpoIchUQV>DA*uDS& N002ovPDHLkV1he+beI4D diff --git a/resources/assets/biomesoplenty/textures/blocks/hydrangea.png b/resources/assets/biomesoplenty/textures/blocks/hydrangea.png index 7a4b1e9f0ed6da2e6df09635d7b6da855c9db73b..ac32cf5c363e25d927ab8a9b92f673584dee6548 100644 GIT binary patch delta 643 zcmV-}0(||m0?q}HB#|)~3c>&Y4#EKyC`y2lQz3sbNAp5A0006?NklGPlW}#_B3q+d~ znOH$)WI4=Cv#(F{9KA1k;Jo+Td(L^zbMCpX0w7u{l~gX56FVM{o99}y*{q62qvl@6 zN@9O9nKT^>HIvCKTA7qcB*czHB66+@g@P&;i*iVybUH0Il}vOceIAR&Oh0u|!a~)c zsZ>f<4MZgiGSBDpN(;ln`r9$3|9Ae zJkla3WA-Nfl%=6}0_)E9;K;~tw7vL)j<^4?w(CA>f@3&7GKIrK)51jONp)Td(VB;U zNif?u@q9*B?vIYnVAaW6*w;6S)g3{w4UUi?f;&4 z{6N#dcWk}-2wh_-@RId=FafBI{ok8Xf8yZdDXc%&iOVIOOisgkz$pL#002ovPDHLkV1kZ0FH!&i delta 227 zcmV<90383$1+xN>Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wA%8G1^m3s9005#% zL_t(IPo<8_4Z=VSM7IP^ltd#OsDd*$iXlCuic~-oh7r8PvFt@FERFn~x7*C@FQvl~ zrNa@W!x8P9BremEE=mA~>-;p;%E<3afCBUB{#YTZfhbBqG-9S#E&&Y4#EKyC`y2lQz3sbNAp5A0005eNkl26@ zc4dFF*_7FARwk2)V;`@lwVO)E-k*;NIL307y5WL&tJSJ5`P zb8{#QLsiUw5cP1UqnMY$=y<(7Mf;J_?@oU;`+UpR`u<@c*1ztfrHLLL?2HZ5im#V- z$Zky0(?ybVX#A@Hs5y4L)Dm%VU|=^uJqaJR&J8eaFndhT5VS!aI358%xX?a7L;ztF z2CsOy7_>QAo21)#Kx=|g^ZEP_1JHA&{R{%woe6SRc(8zgMhze$aJm4xJC?`zLep_f zAA7{$ovY)l0YJu=0*)U58zf|euEi0iE)1Xn04N}TD41q|?*K{AZ=UUEwL2Ev)D|5i z6h$GUK_lFOcK9Bc2A-;(*CWVlh=*{-Vw!<$|?A9mPF@+08Rr4*$e`B!$8Je3&kd6KEW_hPqh3G(g0&4^U+;`VE{-W zNCSus(+JZ{R2aZC!BT97iGeVB7=QqZ0m!ytqmgZf0Tcs30HhG+3YcaXAFKckU^M`y v7{83a%aKvsxs2r`WhPz)d+|7QRI5dV(5?>BV900000NkvXXu0mjfFgjg# diff --git a/resources/assets/biomesoplenty/textures/blocks/item_sunflower.png b/resources/assets/biomesoplenty/textures/blocks/item_sunflower.png index 4e2a98e3662e198eef36993a3cc4a47f2745e6f1..8e2b6d2ca48d50a03d5f74cab4f2d4b89d586343 100644 GIT binary patch delta 624 zcmV-$0+0RF0=@;1JPN@801m+cxRGn^kwzhZF-P-4Hvj+vI!Q!9R5(vnQcG-3VGtdv z9*xkZN`<9FB%+iE6@EbkAsP!IsgNjbRlFCpBv=r_t|GCKRHy|_SYT;|s7EBymY+?3 z3Hjgo-|yp|x#nsYb7$^+XU@!b=95aLA^_A%DTEgM5#;hq63YwFD zTrTGoWHK4ozdw#-GAYH+r;&Wy<)obR?-xOAsZ^4DKCd{&8d!o>_;d>J9}*0oN95&Z zHH`KEL#>kkc+!EmIBP7~Y*v{#zDM+}7vUG1(7k&#j%;6!u_tT5X{@+hE=wQ~a0x7F zTI4>Q(1P}DO?ce12Ynqrv~64r|HBo3E{XpV*wFA2iA1DWEUG9Nxd43G3;%!*UAtD{ z{+S&(+uDqC`+RuUw-orgAH$xAtkll2SZspu zTF8J}&~yBm2L;hrTQD}b6~p~4T0Ey?3No*EIuQ4|iA2IB;21i-^TWM1bXMbk_p|k= zYoCNa&o|)5qh=)xJY9?0!-V}8QmSHdoyGqgD7d*a9|iNMzydsanVh zyfw0r0MmkI>uk6ts5!vU&5g&HdF!B&m9KIB%_>l=nqGl3jdKL4yXtzH5wW=jX0`>| z-0Onbmj$&~1WWGKBOZ@y-iqy8+3SZo*a5FYB8sR4|AY&LLKD_!&Ga+An4Z9BG%E9s zO~ax)v(R{BGWd8{Wa~Ebwm>ri6Os3B?4GUBE$d`6qGb{e*{GHYb3^i4Uiav_Rqi^CTHa$CpJR*#gpyJos%RH`OS36CD09_ zSc9mxx1NF%)c8JV{XDmd)p~z3R7!Z*t(3YX@H)YUU)Pg7&ii&rx5$O_Q)RlZHH7eP zc-&|Y4QGu%(+mW+aS6lvg23wp7#Bm*0D=rt>;26DXk@iLYVU6bu)HNK(VoH5>luB- z36>lPZ?%LXf~;IXt;Y!j0ZV^QLJ{C*1ZRDLaLKF}fd4O$^ab}1z;ulfyl?;j002ov JPDHLkV1gn~abf@f diff --git a/resources/assets/biomesoplenty/textures/blocks/lilyflower.png b/resources/assets/biomesoplenty/textures/blocks/lilyflower.png index 07eec7ac4dd744134ea54418392d749565d92368..0306097a9f89692738e90eace9d8758ad7f29bc3 100644 GIT binary patch delta 587 zcmV-R0<`_30+|JnJPN)501mzZ>O!%=kwzhZF-P-4Hvj+v6-h)vR5(vPlE-dSQ4ogb z>3BFKR!G?)HV6dHN z?_(J&RsZT7OXSoH2zBLJNAG~xY&Nq(xn;G6r+9G{wX56sOCbP&@&+U9+)>qN4^0+$ z1PxRkZ|;&R^rZt17p6rq*XOqc9zDVFXbRAP6K;!^HMK)hoBepmbdxM2pv)Qyj zFf3MP5WI{?jXw*la7RTZS5uxkfSHSbt=DTY`U#5sp`r*@wgO|l*;li_H4SmM+iA*N z{1w7R10dW1zYZrfL>lj+Y1ymPyJoFcOBX-@U;{L81{8HzVW>m^$)l9nS*O#n)oNwc zYE>H<4u>`xjRf3ow{5XlXw`lkkH`9V{G5ttoKB~9JRWuL^?E8=E|(hed_EU{$!4>$ zZnrCv?RIOP=b6}O28{><1%ZpGgXQe~xg#ICNje(H@y_}o5(=B(1MF}(yr}sZ2)j3D zU)-Ni%=s#KqYfn~QUX*G_(s}k*X}gf|IMFYxz}$$xzlg!PD69PeFbqU} zJ1$7e0VwGihMtZYN)BMhpCgz&!Fm)jG}I|xBum~^ZHiOLo%%Ij9Qc5GA zrpcntL{UmHR38m5h%t^jX37Dv?=6}+XET8F_11~|!>QBb?C*+I0W<{>2EWAI8;Mpu zfcbGcAif-T7FF{rz~Ug-Z59oqkC_e8o3Jj?K7P8I{Ps6~`rDv|7b>K!T|3`lW&i*H M07*qoM6N<$f{S`tc>n+a diff --git a/resources/assets/biomesoplenty/textures/blocks/lilyofthevalley.png b/resources/assets/biomesoplenty/textures/blocks/lilyofthevalley.png index 6635ee1e6e7849a5b689b419d043fe866e7ecc96..e9a22ae0920a9e8ba9b28e4d8be98e7b59e30a18 100644 GIT binary patch delta 409 zcmV;K0cQTq1MmZoJPN-601m$aI0aKAkwz(hY)M2xR5(waQrk+yKos1hZQA-E3W6Wu zgW`oE)H{V%t-WZfRz*du6a=rR6s`D|{eeIlC=CQko^tFQlbDLo=)hrTmvbhwvk^f= zA`z~ikR-`v|3EUCbXiDv4x-U0mxmzt@S9s7ilX=;m#->e4`3gQ#h8c2SYt$-J{4$x zqB+X@^Oq70&E@bmM_BR2>fI*Q-YNtqsEfuf_Y63ZWtl4&8bmM%p3cwkdez()#}C^y z`7tieo{N0O@YK97tJfLIR2KaP>cgcXy)!K~_EO)&Kq8UwlZG;c`u7&KcU5#c9cs7R zWZO3DAbk+8pHZ%_vmydoEzPs_K4$@c!!Y<2utLDHEJB&4`Q-w4hl7KgEG-vi$#ER9 zR$ic^`z;m-0s^g8iwEJ150Nr5fORy0GYJda<>WC>x#|+n^?E(5)a`b|i6E3zc8Z%J zpzAtwP1C{&tQ6-6&k~Qv-IG580{Br7;K0)ig%F=SbFWJ4>|M4100001(|k#g9~WT zT5Ex=$2kiGLBQWIVxKCAI^P`*4sNPow9=TPD2l{-dy$Urw^%?00;(Vv(Pi`i)}^yF z$ph|w@>r)@cbWH%Sj+-XvRIww#Sj>=n8j*yp72{7$4M%G1Oj*{XrTO+`4Hk0%q*_z T@jSB@00000NkvXXu0mjf0A;I) diff --git a/resources/assets/biomesoplenty/textures/blocks/poisonivy.png b/resources/assets/biomesoplenty/textures/blocks/poisonivy.png index 385ab819ceb3bc4a4d80bcc10813e05097bad1d3..901950be685259d596ba1b1dd9a481794db91708 100644 GIT binary patch delta 500 zcmV<}XpCl68@Ap<04HEbJ-9gUL?PP>3$K%oQ@o+d;zMX)@f2S3VbU20TvTL5t=inr| zSDa2Kv5pO)C(lmwo6V-V{Vlv+uku~bNEX$lmQ&GREEX6H1~4ZxKYxq=Nl=GG_5jiC zb`gz6QK?kSt@BVRnT=$bPN$M!$7;2ILa9_jI2=Yco5grM{+F{{E`RlBG8w2GqFSvY zole8!@gNq9q19@cX3a1xGMuh#`%^n1M? za=9F8wVHI~jTDPTnTpbd;O}3^uI$45cez{$1OkXeB4{)kNG6k@ROYdmB#ygP%ct%4 q`wNJm zu&yhrs)FZvNYfO3-~Z{E=lLgL)A>*6J&Gb&mIc>!m6dy)+c92(ZQIDQ4D`)h*L5^a zgD?!$CZ=gBeH=$MEC>RXUjqnl)ig~FAsos#ppCBUFbspr^E_9F$zuRlEz9!q&JB2g z(QzE`0>c0E%wqsyF^*&PaE4)kR=5c%Z>0^s$-Vz^_|DnPA@s}my9dDM3$GXdUj~Q$ Q^Z)<=07*qoM6N<$f)$jJfB*mh diff --git a/resources/assets/biomesoplenty/textures/blocks/sunflowerbottom.png b/resources/assets/biomesoplenty/textures/blocks/sunflowerbottom.png index 93282efa04950785e20e3f3d96697987eb99beeb..12ad15c744b02e83438500c99e7398ef16e79a18 100644 GIT binary patch delta 504 zcmVlK6B#|)~3c>&Y4#EKyC`y2lQz3sbNAp5A0005NNkl?>&bW(23I3`C4TMBd5g$Yl#Vy1w5|Wqv%-Q#?ykA|bnd`&pTU}j!`qXko zRTF47n+ELsPtpAMaqai}w(oR0_VqoG;c%EZtkr7aaP9Y`E+0%qrpn6GxP8GWp|sm= zgCBolw^}W;7k-JZ9Hw>dRuq4)*9&nTn{cGhMXS}S0F-_Fo6-3@(aaaoa=Dy{b=ZOw zm-XRVbmLDfJ9{ZQ_YHR(Ow3>~2sX8nZntZaJ$J~slsXg5eHG2_!~~5-!_EPB+%~CR zNWcpej=a}jQbyth1}JnJ1W8^EeD$xy-j-uZK>!s=(%XdAlf3`m^Zj^MqPqPjWi?vcned0B{A^3=f^yI-L(~ z^!R(nB-@k^F_d$>4k6LJ%e@8dq~nUx-zk0fLY*#?N%}XA+A7l#{w$;zCqqb5i-4 u-S|@ON|ZhJr?Y~t9%Z!fW5V_^R9*o|3ysM!XDo~W0000q8_G)8>6j)-!!-Q_3&4v;YQ}(mOc1Y&;A~nGar171> za449CMKkmdHB;igGZ=)>OMk%HI)4>p8?YTz(c@carjUDR2FDA$sAn)7!pjA3VUe0Z z_;Z1RIp!|Nnj1snU@O5UX@$qqg zS-V`W!2ZZ7Z3yJ}d_JYTUawKa4GdY}@puCJ+T8JSi^6EV6#eZyAmh~3ltHQ-4u`UL zl*xgiV4x06n6Q=u{k6dRqj0`H2uD{1SnPJYMLFkEKt@R(J|RH9cQtUot;ENcb@rjNR*_n#>9&ZpgUJoc)F_uh(TiM zoBeuws^RZF41d=S3|x!G?vzz%J6#M*K?3%qM&aATBmtoUo6V+lAVFeJa%sIg@#(G^ zhjQZ3V#!5i)*3X|W}`08jIzvFjJ3wY^C}be=gB}{L7)ZNL%Z0o{aHG?E=41MKXEyZ zj-sFHaBorI%cDowBxfWufhWO+0X7pS(Aum1xHQBMa zQn?icNh{EI)y#K+pKZzb`XCX!JJuS0@>ajxPXGbXzYEr;D3oTzpm5_#47X^KHD;du zdXl20L+qCp_#r!6Sa?RM`6Wt!65So!L~{T2c#Pa$FRZ~u3f~`XlAr_P0s$CQ5`H!a zqjxrl%->H_K}BQ?DOR#as~1;=g3{><9WekRF3uIy&-damQ@dam&nncOzQ#UppF-%~ z06TM+oS!2j+cp3gdVgW{TtX3mvWITOVCjWmdEVS-%e0w2`yVG~1t zR38F>m>;LTn^{B17x&PZa0KIh?P8et2dLQL=4N@+Kb|}->Ja>an)wj*B?**c7BXbc z41#%iOKH)k5CUlA&F^&p$N@#5l+dg}kIFfiQPrSTL#PEM0Mr6Cs!3@UDnyR}o!OHx e)YJhjmOdYd!4jAoa83XK002ovPDHK)LSTY`%6gRm diff --git a/resources/assets/biomesoplenty/textures/blocks/swampflower.png b/resources/assets/biomesoplenty/textures/blocks/swampflower.png index 722d14056c98308e8b770ef26226507ee53697d5..1c9ccf2424a9d9667f3754ab70968fe9ba0a8b98 100644 GIT binary patch delta 572 zcmV-C0>k}*1BV5WB#|)~3c>&Y4#EKyC`y2lQz3sbNAp5A00065Nkl<-!RUBVb1q`zjNmNe&4R9kV>WGt?RlL4u`c^EGBD(OeQ0HJW~h;gDqww8jZ@M zpbUS~>9m$iCWRBXL<(M^LLd;3#}97;7v3+#SP1Oy&arOCbNnk#l^HSreJ#YgVG*1q}~{0~@%SIB=2 zJ%_n}DTf?XZDSOrg&}0KSYjB63bYG4l>ItSybmUdKWO)@)s7Q9QUp+-{lsG~q`z zbEX%?xjtuMgV$4-stV_|^{zPP9b+Ut;LY%sx?lDqH&M2AefSSOdzF?tLb6l<0000< KMNUMnLSTaZV+mFO delta 306 zcmV-20nPr01%U&QBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wA%8G1^m3s9008hw zL_t(IPh%Jb!yd@BtotunxAMP4`QrajA>x5_6<`}As+M9HA{Jf$ zA7qd~P#IhfBnGljE`PZlA|@1G4Hf{=AU?W5GVWR!27?Sl5f_fA0dqjklDBdP2OL-e z2-FiT;ff`ymthqL+XBK;@y%e(FatqiAcY{deCv9!;YuBwz-nRQD2hNpz^@pr0E9t& zm`xx}iAJPN=701m(bYSxJfkwzhZF-P-4Hvj+u#7RU!R5(v%Qd=v8Q55}} zAK@J-kI3ak7$Jlimnlu;Qb=+O4~R%4_ekMUBof85H^0GyzcACh%zeI@S*)#nI*o_* z?e*=w&t7})a~uGId_HeDkxV8H&tx)U)9JMFkw>FZ$I0b##u<;t#imjzvDs`^K(0l9 z2-kH@{9iB5!7VbrJv=F&}JR~ZxRXPf>Kk|&z$@gFS_g3uJsrcvcT})$p z@ZLF@ctcgG7mXD?SP$NSs)6fy*b66Q=Fz*gUk+z)_(>FdFK4h5d_Y}!8@|3)vD9~t zfvY)OFMMEk=uvW6jMh{-9DhYcaU)u52Qb%tjFy!E#=YB^?K(okybqg!Ta*=KRZB-R zod?jDYOd#C>;>Q78>lR4!gTvS*j4jVKk8?@MV$iPDnC9yr=%klmXBV|>fjX?{b%MN v;oBNT&14%o)`D2>zW{SQ9*^X^uIu~&N%qS01YgB300000NkvXXu0mjfI{fI! delta 200 zcmX@XGLvb74c9>i2EK!gJ0@noo#>`mZ(#7HXdwdw!&FZf#}EturF|QDn;isL_REwz zyg9OS;)%PBs!ZP>Tu^ikI4fR~#;;#>SWSC^+y7a=?=E&ZqPe7G!X-y9c1>Ai#-u&+ z#SMG&Ejtpcl%_m&Y4#EKyC`y2lQz3sbNAp5A0005bNklNPHk(zdQmN<(0)c?K+xp^aM;D{456?$fgF+}2VrtS9^x43!qtPhh^ag%o;(*@uO)m!tf+U=eP?2PwKpX^MJXskw02;7S6h&|zpdwcsq8+(Jg85XG zW)cPocW4vn+a delta 224 zcmcb_vVm!W3KwH>kh>GZx^prwCn`#F9cEzQJIr`Ie?`hfH^q7bgD*u385kJmd%8G= zSokOZ`2XMDRbsV*CKw-7U~qc$yC1LncmH|WP!t4kVGf@5^5~FO? z%kx31foDS|n=Rua9tO+VO3V%oNz4xG9QYjs6izZ|2(t>LGU(lQY*1m|AlYQ_z@C{w Ym2cWnjRPvnfNo{*boFyt=akR{0ASrzY5)KL From 7284b731651bedfb0257db5e0a2be5bb622123fa Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 21:41:03 -0400 Subject: [PATCH 22/29] More texture tweaks. Renamed Aloe to Bromeliad. --- common/biomesoplenty/api/BlockReferences.java | 3 ++- common/biomesoplenty/blocks/BlockBOPFlower.java | 2 +- .../biomesoplenty/blocks/BlockBOPFlower2.java | 2 +- .../biomesoplenty/configuration/BOPBiomes.java | 2 +- .../integration/ThaumcraftIntegration.java | 2 +- .../itemblocks/ItemBlockFlower.java | 2 +- .../itemblocks/ItemBlockFlower2.java | 2 +- resources/assets/biomesoplenty/lang/de_DE.xml | 2 +- resources/assets/biomesoplenty/lang/en_US.xml | 3 ++- resources/assets/biomesoplenty/lang/fr_CA.xml | 2 +- resources/assets/biomesoplenty/lang/fr_FR.xml | 2 +- resources/assets/biomesoplenty/lang/it_IT.xml | 8 ++++---- resources/assets/biomesoplenty/lang/nl_NL.xml | 2 +- resources/assets/biomesoplenty/lang/pl_PL.xml | 2 +- resources/assets/biomesoplenty/lang/ru_RU.xml | 2 +- .../textures/blocks/{aloe.png => bromeliad.png} | Bin .../biomesoplenty/textures/blocks/lavender.png | Bin 0 -> 655 bytes .../textures/blocks/wildcarrot.png | Bin 491 -> 519 bytes .../textures/blocks/wildflower.png | Bin 594 -> 404 bytes .../textures/items/saladveggie.png | Bin 365 -> 351 bytes .../textures/items/wildcarrots.png | Bin 465 -> 470 bytes 21 files changed, 20 insertions(+), 18 deletions(-) rename resources/assets/biomesoplenty/textures/blocks/{aloe.png => bromeliad.png} (100%) create mode 100644 resources/assets/biomesoplenty/textures/blocks/lavender.png diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index 32c73e59f..e41df5df0 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -178,13 +178,14 @@ public class BlockReferences { anenome (Blocks.flowers, 9), lilyflower (Blocks.flowers, 10), rainbowflower (Blocks.flowers, 11), - aloe (Blocks.flowers, 12), + bromeliad (Blocks.flowers, 12), sunflower (Blocks.flowers, 13), dandelion (Blocks.flowers, 15), hibiscus (Blocks.flowers2, 0), lilyofthevalley (Blocks.flowers2, 1), burningblossom (Blocks.flowers2, 2), + lavender (Blocks.flowers2, 2), ; public Optional block; diff --git a/common/biomesoplenty/blocks/BlockBOPFlower.java b/common/biomesoplenty/blocks/BlockBOPFlower.java index 189c79999..a8cc729ea 100644 --- a/common/biomesoplenty/blocks/BlockBOPFlower.java +++ b/common/biomesoplenty/blocks/BlockBOPFlower.java @@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPFlower extends BlockFlower { - private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; + private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"}; private Icon[] textures; private static final int SUNFLOWERTOP = 14; diff --git a/common/biomesoplenty/blocks/BlockBOPFlower2.java b/common/biomesoplenty/blocks/BlockBOPFlower2.java index b08cdfdb9..00e9701c8 100644 --- a/common/biomesoplenty/blocks/BlockBOPFlower2.java +++ b/common/biomesoplenty/blocks/BlockBOPFlower2.java @@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPFlower2 extends BlockFlower { - private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"}; + private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"}; private Icon[] textures; protected BlockBOPFlower2(int blockID, Material material) diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index 7243567f1..f960e09e2 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -206,7 +206,7 @@ public class BOPBiomes { Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfigurationIDs.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.05F)); Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfigurationIDs.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.5F, 1.3F)); - Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.05F).setMinMaxHeight(0.2F, 0.4F)); + Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.4F).setMinMaxHeight(0.2F, 0.4F)); Biomes.field = Optional.of((new BiomeGenField(BOPConfigurationIDs.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); Biomes.fieldForest = Optional.of((new BiomeGenFieldForest(BOPConfigurationIDs.fieldForestID)).setColor(9286496).setBiomeName("Forested Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.4F)); diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java index c26fd82cc..a27c35e5c 100644 --- a/common/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/common/biomesoplenty/integration/ThaumcraftIntegration.java @@ -217,7 +217,7 @@ public class ThaumcraftIntegration { ThaumcraftApi.registerObjectTag(getBID("cosmos"), getBMeta("cosmos"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("dandelion"), getBMeta("dandelion"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("daffodil"), getBMeta("daffodil"), (new AspectList()).add(Aspect.PLANT, 4)); - ThaumcraftApi.registerObjectTag(getBID("aloe"), getBMeta("aloe"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.PLANT, 4)); + ThaumcraftApi.registerObjectTag(getBID("bromeliad"), getBMeta("bromeliad"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("lilyflower"), getBMeta("lilyflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.WATER, 1)); ThaumcraftApi.registerObjectTag(getBID("rainbowflower"), getBMeta("rainbowflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1).add(Aspect.MAGIC, 1)); diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower.java b/common/biomesoplenty/itemblocks/ItemBlockFlower.java index 8aafd9cf6..3810b866e 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockFlower.java +++ b/common/biomesoplenty/itemblocks/ItemBlockFlower.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockFlower extends ItemBlock { - private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; + private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"}; @SideOnly(Side.CLIENT) private Icon[] textures; private static final int SUNFLOWERTOP = 14; diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java index 0f28c8e45..426466fa6 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java +++ b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockFlower2 extends ItemBlock { - private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"}; + private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"}; @SideOnly(Side.CLIENT) private Icon[] textures; diff --git a/resources/assets/biomesoplenty/lang/de_DE.xml b/resources/assets/biomesoplenty/lang/de_DE.xml index cf2f07242..b482a2b00 100644 --- a/resources/assets/biomesoplenty/lang/de_DE.xml +++ b/resources/assets/biomesoplenty/lang/de_DE.xml @@ -49,7 +49,7 @@ Weißes Windröschen Wasserlilie Chromablume - Aloe + Aloe Sonnenblume Sonnenblume Weißer Löwenzahn diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index 21f8c3b09..4b3718936 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -49,7 +49,7 @@ White Anemone Waterlily Chromaflora - Aloe + Bromeliad Sunflower Sunflower White Dandelion @@ -57,6 +57,7 @@ Pink Hibiscus Lily of the Valley Burning Blossom + Lavender Algae Short Grass diff --git a/resources/assets/biomesoplenty/lang/fr_CA.xml b/resources/assets/biomesoplenty/lang/fr_CA.xml index 8c362f121..39ba24ab0 100644 --- a/resources/assets/biomesoplenty/lang/fr_CA.xml +++ b/resources/assets/biomesoplenty/lang/fr_CA.xml @@ -45,7 +45,7 @@ Violette Anémone Fleur de Nénuphar - Aloé + Aloé Tornesol Tornesol Pissenlit diff --git a/resources/assets/biomesoplenty/lang/fr_FR.xml b/resources/assets/biomesoplenty/lang/fr_FR.xml index 0951f26de..755ae6724 100644 --- a/resources/assets/biomesoplenty/lang/fr_FR.xml +++ b/resources/assets/biomesoplenty/lang/fr_FR.xml @@ -45,7 +45,7 @@ Violette Anémone Fleur de Nénuphar - Aloé + Aloé Tornesol Tornesol Pissenlit diff --git a/resources/assets/biomesoplenty/lang/it_IT.xml b/resources/assets/biomesoplenty/lang/it_IT.xml index 60637a8be..e00e22e65 100644 --- a/resources/assets/biomesoplenty/lang/it_IT.xml +++ b/resources/assets/biomesoplenty/lang/it_IT.xml @@ -49,7 +49,7 @@ Anemone Bianca Ninfea Chromaflora - Aloe + Aloe Girasole Girasole Dente di Leone Bianco @@ -338,7 +338,7 @@ Verga Venerabile Manico della Verga Venerabile Corpo della Verga Venerabile - Sommit della Verga Venerabile + Sommit� della Verga Venerabile Verga Venerabile Esaurita Manipolatore d'Anima @@ -370,8 +370,8 @@ Acqua Primaverile - Un portale per la Terra Promessa apparto nel cielo, sopra di te. - Un portale per l'Overworld apparto nel cielo, sopra di te. + Un portale per la Terra Promessa � apparto nel cielo, sopra di te. + Un portale per l'Overworld � apparto nel cielo, sopra di te. Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/nl_NL.xml b/resources/assets/biomesoplenty/lang/nl_NL.xml index eaea03209..30cd49d79 100644 --- a/resources/assets/biomesoplenty/lang/nl_NL.xml +++ b/resources/assets/biomesoplenty/lang/nl_NL.xml @@ -45,7 +45,7 @@ Violet Anemoon Waterlely - Aloë + Aloë Zonnebloem Zonnebloem Paardebloem diff --git a/resources/assets/biomesoplenty/lang/pl_PL.xml b/resources/assets/biomesoplenty/lang/pl_PL.xml index 524eb0922..7d52aa26a 100644 --- a/resources/assets/biomesoplenty/lang/pl_PL.xml +++ b/resources/assets/biomesoplenty/lang/pl_PL.xml @@ -50,7 +50,7 @@ Zawilec Lilia wodna Chromaflora - Aloes + Aloes Słonecznik Słonecznik Dmuchawiec diff --git a/resources/assets/biomesoplenty/lang/ru_RU.xml b/resources/assets/biomesoplenty/lang/ru_RU.xml index da8dd206b..4a6663876 100644 --- a/resources/assets/biomesoplenty/lang/ru_RU.xml +++ b/resources/assets/biomesoplenty/lang/ru_RU.xml @@ -49,7 +49,7 @@ Белый анемон Кувшинка Радужный цветок - Алоэ + Алоэ Подсолнечник Подсолнечник Белый одуванчик diff --git a/resources/assets/biomesoplenty/textures/blocks/aloe.png b/resources/assets/biomesoplenty/textures/blocks/bromeliad.png similarity index 100% rename from resources/assets/biomesoplenty/textures/blocks/aloe.png rename to resources/assets/biomesoplenty/textures/blocks/bromeliad.png diff --git a/resources/assets/biomesoplenty/textures/blocks/lavender.png b/resources/assets/biomesoplenty/textures/blocks/lavender.png new file mode 100644 index 0000000000000000000000000000000000000000..b9679f644eab65889c491b51f168c94bc545ca75 GIT binary patch literal 655 zcmV;A0&x9_P)N2bPDNB8 zb~7$DE-^7j^FlWO00Ik1L_t(IPo+@rPm)m-=Ffny&C*;sz{o%pa45BYIEW2x5ypsq zVy-fWiQs*4rXyVXwobDmUadnRx5w%Hhr7b)K6-y^(xIuqM zuG)YMSDYgl@=WuM9hrl$ME3Fd=p6?eov8!d^oDzii;qn@#R(b$bvS2Dplj5|f-zJN zYuv==!((=hqtU(hJH=vx`Rrb}vxfwsIov4ZN5CIotpsjorH=^|IkB5)eik5fmqCyc1`??PkmZq3}DG{btq p_;0a_reM7w(x?47Y7jY{?iXsUGqS$`@{<4n002ovPDHLkV1lCCFM0p~ literal 0 HcmV?d00001 diff --git a/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png b/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png index b26bb0e6cbada557463688e6bd1c7fd99e5d590a..8618c7428f6645198e3e0bb5278042c54d6f7bb1 100644 GIT binary patch delta 440 zcmV;p0Z0Dp1BV2VJPN-601m$aI0aKAkwzhZF-P-4Hvj+ugGod|R5(v#$hNO%xK{t4 zY|M~v-Og~o;y>9KuK}-SV;4up4FCWCrwC&eBn4v?Bn4v?Bn5+sn9UJD3RMDK3>P2F zc(nT~m`*#F2d0t5-kO%7mx z1#!zm{)f!*2P?EJu>^~O=%6`K3^vs^|9yJh{@XW#3<(5lwl1+{02|=i?G3gCWB^Dr z$aWCzG0EdU$Tkq)w#F80AV?#`C4meeaj*d(hGn4*gGP|XeeIj|iKop22H6gxnHB;y0Br-ucNf$^phmD9 z&=9aVEFm#h15JwsD)56~uq!}LgtEbkftG;ytl6xHgamfMRG&y_@ZVTp z@&DY}#s7;6y#H&fDgQS!QUUXu>SO-Ph>L*J!2kdM833>ADYx~loksuw002n`MNUMn GLSTZ*$GFM> diff --git a/resources/assets/biomesoplenty/textures/blocks/wildflower.png b/resources/assets/biomesoplenty/textures/blocks/wildflower.png index adc0dbd997b49573f319dba8bac7a067c60641f6..15b2a83df9305fb390e2606e6215c35f29dd6a26 100644 GIT binary patch delta 316 zcmV-C0mJ^%1e61iJPN@801m+cxRGn^kwz(h5J^NqR5(v#pbOZL{pdfGNjg}U`QZN{ zuRH%IdL1R-kj;5d|A)l!|DWQ2j5I?w!YyW2ko&6tw zlO_(<*fmqK(Ac`aVT4UDGZ1ALOb{R%iZC^*c$tYe1l(UkR>Z zS>g@iHG^ynjTiVIo5MhwjUWIEhc4%R|BIVMNjCrl)@MBgYxE80_z%L1YJ2|w6yFo184?`J_unsq6RZg*mLf?45lO=TK^T+_v$I~m=kpa5aVaU2d3L?RJR^msh%&#jnr zzw=Fx6R&iWdhewCO{w_-lHm9Ixw~NRWRTo$x4K?^<3LP|oKmUOod8?~x0|07PewQ} z7!0cPfk}p8@Hc^UuU4yn4)Bovp{L1z56Z+}D7igMC~%e;r>Ug?g~MTv0X4*%i;vvIZ5zL(1i{;s;migZZDWm}B$r>$Y%i@6E z^-V7a34$b?k5G|hopywOxwAqU{{LTY|Nnm<=l{!Dy#IqOIl&mD7OD*aK!Pv~aw^D1uR|B4dyjK^Vk_YC{De378=u40AFJdQ#pVC5O40xMNdf==Pn7=u|6uul=5*%&jQ))O8H#WiATP@F z|K+Zv|39DX{QvG?)_Q-Cb7zGz{Qtk){{R0z&i|LQc>f1ma)L2PEmRuwR80KUc#;X|yV78%ahKWO! j5e6^~Bx@XMfPn!3d}N0va@^0N00000NkvXXu0mjfOoNA8 diff --git a/resources/assets/biomesoplenty/textures/items/wildcarrots.png b/resources/assets/biomesoplenty/textures/items/wildcarrots.png index 6f4437103b1998a4d40bc41a6997ecc9308a56b9..ef4227ce57b5c034549198c2d6160fb4a76de5c7 100644 GIT binary patch delta 371 zcmV-(0gV391J(nOJPM`&01l=Bhuo=ekw!FsF-P-4Hvj+uKS@MER5(v#@LV_rj&T8# zYUBSF&bIrno~MqgnURr^;n4oM42|V~ ziT^?P=B4fbkM5ocX2T2txd3DkR@?jAbHSQH8fQ-~1LG6>7W|((xe9Iw2+R1${FnBT z{;!d*fiMJQJ4g}8#=f>Zum+H35DhX2B%YlZ@IOB(0L4~GPf3IUFc%Ls`dV|~t^jEUu|cjNXaKT85Dn7| zqCsNq)u{{wT>w%DqhT5e834`(FawY=vSA?2>z8(c#nAyV`3NfjX@uY@3;>NH6MLbE R^S}TA002ovPDHLkV1i1>py~hs delta 366 zcmV-!0g?XJ1JMJJJPN1)01l`DBUR;*kw!FsFfjCTp#T5@I!Q!9R5(v#@LV_rj&T8= zYR>;qCMLkA5eAI+8Bk_`(=3Po%moYxL!yw_gaF9-CaVqqgJ_UJ+DkP4Go+DVfKHdz ze}!h*{~+3WjRn{saF`I|3g&d?|MIhBz|M!cf@coLe+FdlfB+*SBg3Kna~T@T6aRyM z@Xbrx{~z5w6U>Gg0&)S!Ags3cx95U2gEY>bTn5G`_AU57cXAcn5D;ecXZ+6)0MuLr z#4tlZwu2ObZ0u{x18V?j2GJmcK;qen0sr%p0#I%BK{5d50%Xk~+d-N^G)OZ@4ORd$ z0Oks0%^)_&1t4#M3^;deJ;R|Cs3v4tfNVftYYyBMAk82)$Q1+)KvoE%VVXfSNUXg& zm4ToOKnh_rOd}x!z}Wz105V2445WGe(k`$#Iv^$=VFe(K5Ilte04<6KAAi0rLjV8( M07*qoM6N<$f*!P$w*UYD From e3d49e1698cdf653ced42409dd15fe35bf77091f Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 22:07:20 -0400 Subject: [PATCH 23/29] Added Lavender Fields biome --- common/biomesoplenty/api/Biomes.java | 1 + .../biomes/BiomeDecoratorBOP.java | 12 +++ .../biomes/BiomeGenLavenderFields.java | 73 ++++++++++++++++++ .../configuration/BOPBiomes.java | 13 ++++ .../configfile/BOPConfigurationBiomeGen.java | 2 + .../configfile/BOPConfigurationIDs.java | 2 + common/biomesoplenty/world/WorldTypeBOP.java | 4 + .../textures/blocks/lavender.png | Bin 655 -> 658 bytes 8 files changed, 107 insertions(+) create mode 100644 common/biomesoplenty/biomes/BiomeGenLavenderFields.java diff --git a/common/biomesoplenty/api/Biomes.java b/common/biomesoplenty/api/Biomes.java index 796934e4c..f0a7259d9 100644 --- a/common/biomesoplenty/api/Biomes.java +++ b/common/biomesoplenty/api/Biomes.java @@ -51,6 +51,7 @@ public class Biomes public static Optional hotSprings = Optional.absent(); public static Optional icyHills = Optional.absent(); public static Optional jadeCliffs = Optional.absent(); + public static Optional lavenderFields = Optional.absent(); public static Optional lushDesert = Optional.absent(); public static Optional lushSwamp = Optional.absent(); public static Optional mangrove = Optional.absent(); diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index 3a576ea0c..789f43bf6 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -222,6 +222,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator public WorldGenerator hibiscusGen; public WorldGenerator lilyOfTheValleyGen; public WorldGenerator burningBlossomGen; + public WorldGenerator lavenderGen; public WorldGenerator boneSpineGen; public WorldGenerator boneSpine2Gen; @@ -310,6 +311,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator public int hibiscusPerChunk; public int lilyOfTheValleysPerChunk; public int burningBlossomsPerChunk; + public int lavenderPerChunk; public int boneSpinesPerChunk; public int boneSpines2PerChunk; @@ -462,6 +464,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator hibiscusGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 0); lilyOfTheValleyGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 1); burningBlossomGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 2); + lavenderGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 3); lilyflowerGen = new WorldGenLilyflower(); deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2); hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4); @@ -590,6 +593,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator hibiscusPerChunk = 0; lilyOfTheValleysPerChunk = 0; burningBlossomsPerChunk = 0; + lavenderPerChunk = 0; generateLakes = true; generateAsh = false; generateMycelium = false; @@ -1134,6 +1138,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator var5 = chunk_Z + randomGenerator.nextInt(16) + 8; burningBlossomGen.generate(currentWorld, randomGenerator, var3, var4, var5); } + + for (var2 = 0; var2 < lavenderPerChunk; ++var2) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(256); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + lavenderGen.generate(currentWorld, randomGenerator, var3, var4, var5); + } for (var2 = 0; var2 < hydrangeasPerChunk; ++var2) { diff --git a/common/biomesoplenty/biomes/BiomeGenLavenderFields.java b/common/biomesoplenty/biomes/BiomeGenLavenderFields.java new file mode 100644 index 000000000..cedb91a67 --- /dev/null +++ b/common/biomesoplenty/biomes/BiomeGenLavenderFields.java @@ -0,0 +1,73 @@ +package biomesoplenty.biomes; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.Blocks; +import biomesoplenty.worldgen.tree.WorldGenJacaranda; + +public class BiomeGenLavenderFields extends BiomeGenBase +{ + private BiomeDecoratorBOP customBiomeDecorator; + + public BiomeGenLavenderFields(int par1) + { + super(par1); + theBiomeDecorator = new BiomeDecoratorBOP(this); + customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; + customBiomeDecorator.treesPerChunk = 1; + customBiomeDecorator.flowersPerChunk = -999; + customBiomeDecorator.grassPerChunk = 20; + customBiomeDecorator.lavenderPerChunk = 999; + customBiomeDecorator.generatePumpkins = true; + } + + /** + * Gets a WorldGen appropriate for this biome. + */ + @Override + public WorldGenerator getRandomWorldGenForTrees(Random par1Random) + { + return par1Random.nextInt(3) == 0 ? this.worldGeneratorBigTree : new WorldGenJacaranda(false); + } + + /** + * Provides the basic grass color based on the biome temperature and rainfall + */ + @Override + public int getBiomeGrassColor() + { + return 10601325; + } + + @Override + public int getBiomeFoliageColor() + { + return 10601325; + } + + @Override + public void decorate(World par1World, Random par2Random, int par3, int par4) + { + super.decorate(par1World, par2Random, par3, par4); + int var5 = 12 + par2Random.nextInt(6); + + for (int var6 = 0; var6 < var5; ++var6) + { + int var7 = par3 + par2Random.nextInt(16); + int var8 = par2Random.nextInt(28) + 4; + int var9 = par4 + par2Random.nextInt(16); + int var10 = par1World.getBlockId(var7, var8, var9); + + if (var10 == Block.stone.blockID) + { + par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); + } + } + } +} diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index f960e09e2..3016e9bc9 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -49,6 +49,7 @@ import biomesoplenty.biomes.BiomeGenHighland; import biomesoplenty.biomes.BiomeGenHotSprings; import biomesoplenty.biomes.BiomeGenIcyHills; import biomesoplenty.biomes.BiomeGenJadeCliffs; +import biomesoplenty.biomes.BiomeGenLavenderFields; import biomesoplenty.biomes.BiomeGenLushDesert; import biomesoplenty.biomes.BiomeGenLushSwamp; import biomesoplenty.biomes.BiomeGenMangrove; @@ -220,6 +221,7 @@ public class BOPBiomes { Biomes.hotSprings = Optional.of((new BiomeGenHotSprings(BOPConfigurationIDs.hotSpringsID)).setColor(10486015).setBiomeName("Hot Springs").setMinMaxHeight(0.2F, 0.5F).setTemperatureRainfall(0.5F, 0.7F)); Biomes.icyHills = Optional.of((new BiomeGenIcyHills(BOPConfigurationIDs.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.8F)); Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfigurationIDs.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.5F, 1.5F)); + Biomes.lavenderFields = Optional.of((new BiomeGenLavenderFields(BOPConfigurationIDs.lavenderFieldsID)).setColor(9286496).setBiomeName("Lavender Fields").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfigurationIDs.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.2F).setMinMaxHeight(0.2F, 0.9F)); Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfigurationIDs.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.3F).setTemperatureRainfall(0.7F, 1.0F)); Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfigurationIDs.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); @@ -358,6 +360,7 @@ public class BOPBiomes { BiomeDictionary.registerBiomeType(Biomes.hotSprings.get(), Type.HILLS, Type.FOREST, Type.WATER); BiomeDictionary.registerBiomeType(Biomes.icyHills.get(), Type.FROZEN, Type.HILLS); BiomeDictionary.registerBiomeType(Biomes.jadeCliffs.get(), Type.FOREST, Type.MOUNTAIN); + BiomeDictionary.registerBiomeType(Biomes.lavenderFields.get(), Type.PLAINS); BiomeDictionary.registerBiomeType(Biomes.lushDesert.get(), Type.DESERT, Type.FOREST); BiomeDictionary.registerBiomeType(Biomes.lushSwamp.get(), Type.SWAMP, Type.WATER); BiomeDictionary.registerBiomeType(Biomes.mangrove.get(), Type.WATER, Type.FOREST); @@ -482,6 +485,7 @@ public class BOPBiomes { addSpawnBiome(Biomes.heathland); addSpawnBiome(Biomes.highland); addSpawnBiome(Biomes.jadeCliffs); + addSpawnBiome(Biomes.lavenderFields); addSpawnBiome(Biomes.lushDesert); addSpawnBiome(Biomes.lushSwamp); addSpawnBiome(Biomes.mangrove); @@ -600,6 +604,7 @@ public class BOPBiomes { addStrongholdBiome(Biomes.hotSprings); addStrongholdBiome(Biomes.icyHills); addStrongholdBiome(Biomes.jadeCliffs); + addStrongholdBiome(Biomes.lavenderFields); addStrongholdBiome(Biomes.lushDesert); addStrongholdBiome(Biomes.lushSwamp); addStrongholdBiome(Biomes.mangrove); @@ -794,6 +799,10 @@ public class BOPBiomes { if (BOPConfigurationBiomeGen.jadeCliffsGen) { registerBiome(Biomes.jadeCliffs); } + + if (BOPConfigurationBiomeGen.lavenderFieldsGen) { + registerBiome(Biomes.lavenderFields); + } if (BOPConfigurationBiomeGen.lushDesertGen) { registerBiome(Biomes.lushDesert); @@ -1187,6 +1196,10 @@ public class BOPBiomes { if (BOPConfigurationBiomeGen.jadeCliffsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.jadeCliffs); } + + if (BOPConfigurationBiomeGen.lavenderFieldsGen) { + addBiomeToWorldTypes(getWorldTypes(), Biomes.lavenderFields); + } if (BOPConfigurationBiomeGen.lushDesertGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.lushDesert); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java index c3ca1accb..7a0e39c84 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java @@ -46,6 +46,7 @@ public class BOPConfigurationBiomeGen public static boolean hotSpringsGen; public static boolean icyHillsGen; public static boolean jadeCliffsGen; + public static boolean lavenderFieldsGen; public static boolean lushDesertGen; public static boolean lushSwampGen; public static boolean mangroveGen; @@ -156,6 +157,7 @@ public class BOPConfigurationBiomeGen hotSpringsGen = config.get("Biomes To Generate", "HotSprings", true).getBoolean(false); icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false); jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false); + lavenderFieldsGen = config.get("Biomes To Generate", "LavenderFields", true).getBoolean(false); lushDesertGen = config.get("Biomes To Generate", "LushDesert", true).getBoolean(false); lushSwampGen = config.get("Biomes To Generate", "LushSwamp", true).getBoolean(false); mangroveGen = config.get("Biomes To Generate", "Mangrove", true).getBoolean(false); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java index d90c0c41e..42dd36d2f 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java @@ -198,6 +198,7 @@ public class BOPConfigurationIDs public static int hotSpringsID; public static int icyHillsID; public static int jadeCliffsID; + public static int lavenderFieldsID; public static int lushDesertID; public static int lushSwampID; public static int mangroveID; @@ -471,6 +472,7 @@ public class BOPConfigurationIDs //23-79 ExtraBiomesXL + lavenderFieldsID = config.get("Biome IDs", "Lavender Fields ID", 31).getInt(); tropicsMountainID = config.get("Biome IDs", "Tropics Mountain (Sub-Biome) ID", 32).getInt(); autumnHillsID = config.get("Biome IDs", "Autumn Hills ID", 33).getInt(); overgrownGreensID = config.get("Biome IDs", "Overgrown Greens ID", 34).getInt(); diff --git a/common/biomesoplenty/world/WorldTypeBOP.java b/common/biomesoplenty/world/WorldTypeBOP.java index 00ff49ea9..d078c354b 100644 --- a/common/biomesoplenty/world/WorldTypeBOP.java +++ b/common/biomesoplenty/world/WorldTypeBOP.java @@ -158,6 +158,10 @@ public class WorldTypeBOP extends WorldType { addNewBiome(Biomes.jadeCliffs); } + if (BOPConfigurationBiomeGen.lavenderFieldsGen == true) + { + addNewBiome(Biomes.lavenderFields); + } if (BOPConfigurationBiomeGen.lushDesertGen == true) { addNewBiome(Biomes.lushDesert); diff --git a/resources/assets/biomesoplenty/textures/blocks/lavender.png b/resources/assets/biomesoplenty/textures/blocks/lavender.png index b9679f644eab65889c491b51f168c94bc545ca75..da85dc159c7d3d38cec0eaa55de12967e58a6af2 100644 GIT binary patch delta 572 zcmV-C0>k}}1(F4jJPN=701m(bYSxJfkwz(h4oO5oR5(wiQ0-0=K@{B==>PUTj9M^& zgtlpw*3vbllBQ7Ft#vI{ut-H(={F!K8b8;71Sn`oltQq^D2a(NL86I?kze`@KEW~f zlAWcd|GdeWnRD*FXYPz-u~_~KO+_7=vV&&&Q8X0^4?>&xSowvy-j@v~>*|LFE)Il$ z#rQTSr{ya4X8zz+>MP!65AdkB&iZPyj(X-NH07|4z>C>zmMT3f*h+uLO8h-1?_Suz zQt%U|e5=ft6E$q5e&d}2JdGGnm28#A7YY+Qt ztlbaPP#t^28XFLbo+WH1eqdwx3q~A&Gq@9af%V8fW`k?Ysiy2*hUVWz-me)GP^j&B zPEc{Os{+yzr;Et-JOl0Jg(x><+82@aJmI=aZ8@$JL5-7M4YAfN2FGn|RFD^-v}B;> zT|5OfXWWn3V5qZX7*N6GjsmVb=K01%!3BS;jnApuKA21ML%7y_I zIQxzxYMnr`?B)hv*ouK0Ha-teof8_3K7KF2Tm%t0(u$$tSx)FUA3fE;N2a|Pxawr> zV%A|yKqHeFhHNlP;l&(3A9W z`iQZN4fen>oC%%~2Ju@C^r@XEf{V}vPrp?p3G``4`M;VZNzz|vtwn{xX;H8M0000< KMNUMnLSTY!>k?T2 delta 569 zcmV-90>=H41&;-gJPN`901mb$eQ0fMZY^7FZY|db{ZpPg zhu)X&;#<#l?!D)Eo^$TGS7$I7{wr#dYRJ)5)Z+h+nk2=;&@w*ew=vbTAT(JVS`>1B z?LbkuxWeMNzlhD5pLjF)74MQ;c-*tbyfUm{P5J>jTJcfvqSxzndEZOCjc;OMu*BlM zQzgs>*D-eT73XuYGTvuCVSQp7Pb1Z*@$w?Pilv+1Pz--Y&NI(q{P;9h2DW}bV+Yx; zB6E-W%FI3JEkn7jFvkrjvfZ;-j(tae>DmUadnRx z5w%Hhr7b)K6-y^(xIuqMuG)YMSDYgl@=WuM9hrl$ME3Fd=p6?eov8!d^oDzXii?j; zI>iYZ0(CfNO`vPk#)2_a4{O}S=fh)mjib@M_dCU6g8A%TxU+`@p*h?rjC^ From f750b9d4453cd3e98b6691a21029ef452ef07d22 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 22:45:21 -0400 Subject: [PATCH 24/29] Added a way to grow tiny cacti and cattails with bonemeal --- .../handlers/BonemealHandler.java | 28 ++++++++++ .../worldgen/WorldGenCattailBonemeal.java | 54 +++++++++++++++++++ .../worldgen/WorldGenDesertCactus.java | 54 +++++++------------ 3 files changed, 100 insertions(+), 36 deletions(-) create mode 100644 common/biomesoplenty/worldgen/WorldGenCattailBonemeal.java diff --git a/common/biomesoplenty/handlers/BonemealHandler.java b/common/biomesoplenty/handlers/BonemealHandler.java index 0e837e493..c3357cc55 100644 --- a/common/biomesoplenty/handlers/BonemealHandler.java +++ b/common/biomesoplenty/handlers/BonemealHandler.java @@ -7,8 +7,10 @@ import net.minecraftforge.event.entity.player.BonemealEvent; import biomesoplenty.api.Blocks; import biomesoplenty.blocks.BlockBOPColorizedSapling; import biomesoplenty.blocks.BlockBOPSapling; +import biomesoplenty.worldgen.WorldGenDesertCactus; import biomesoplenty.worldgen.WorldGenGiantFlowerRed; import biomesoplenty.worldgen.WorldGenGiantFlowerYellow; +import biomesoplenty.worldgen.WorldGenCattailBonemeal; import biomesoplenty.worldgen.WorldGenKelp; public class BonemealHandler @@ -79,6 +81,32 @@ public class BonemealHandler } } } + else if (event.ID == Blocks.plants.get().blockID && event.world.getBlockMetadata(event.X, event.Y, event.Z) == 12) + { + event.setResult(Result.ALLOW); + + if (!event.world.isRemote) + { + if (event.world.rand.nextFloat() < 0.45D) + { + WorldGenDesertCactus worldgendesertcactus = new WorldGenDesertCactus(); + worldgendesertcactus.generate(event.world, event.world.rand, event.X, event.Y, event.Z); + } + } + } + else if (event.ID == Blocks.plants.get().blockID && event.world.getBlockMetadata(event.X, event.Y, event.Z) == 7) + { + event.setResult(Result.ALLOW); + + if (!event.world.isRemote) + { + if (event.world.rand.nextFloat() < 0.45D) + { + WorldGenCattailBonemeal worldgencattailbonemeal = new WorldGenCattailBonemeal(Blocks.plants.get().blockID, 9); + worldgencattailbonemeal.generate(event.world, event.world.rand, event.X, event.Y, event.Z); + } + } + } else if (event.ID == Block.plantRed.blockID) { event.setResult(Result.ALLOW); diff --git a/common/biomesoplenty/worldgen/WorldGenCattailBonemeal.java b/common/biomesoplenty/worldgen/WorldGenCattailBonemeal.java new file mode 100644 index 000000000..e7a7b1916 --- /dev/null +++ b/common/biomesoplenty/worldgen/WorldGenCattailBonemeal.java @@ -0,0 +1,54 @@ +package biomesoplenty.worldgen; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.Blocks; + +public class WorldGenCattailBonemeal extends WorldGenerator +{ + /** Stores ID for WorldGenHighCattail */ + private int highCattailID; + private int highCattailMetadata; + + public WorldGenCattailBonemeal(int par1, int par2) + { + highCattailID = par1; + highCattailMetadata = par2; + } + + @Override + public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + { + int var11; + + for (boolean var6 = false; ((var11 = par1World.getBlockId(par3, par4, par5)) == 0 || var11 == Block.leaves.blockID) && par4 > 0; --par4) + { + ; + } + + for (int var7 = 0; var7 < 128; ++var7) + { + int var8 = par3; + int var9 = par4; + int var10 = par5; + + int var999 = par1World.getBlockId(par3, par4, par5); + int var998 = par1World.getBlockMetadata(par3, par4, par5); + + if (var999 == Blocks.plants.get().blockID && var998 == 7 && Block.blocksList[highCattailID].canBlockStay(par1World, var8, var9, var10)) + { + if (par1World.getBlockMaterial(var8 - 1, var9 - 1, var10) == Material.water ? true : (par1World.getBlockMaterial(var8 + 1, var9 - 1, var10) == Material.water ? true : (par1World.getBlockMaterial(var8, var9 - 1, var10 - 1) == Material.water ? true : par1World.getBlockMaterial(var8, var9 - 1, var10 + 1) == Material.water))) + { + par1World.setBlock(var8, var9, var10, Blocks.plants.get().blockID, 10, 2); + par1World.setBlock(var8, var9 + 1, var10, Blocks.plants.get().blockID, 9, 2); + } + } + } + + return true; + } +} diff --git a/common/biomesoplenty/worldgen/WorldGenDesertCactus.java b/common/biomesoplenty/worldgen/WorldGenDesertCactus.java index 344d616eb..c4ed86d09 100644 --- a/common/biomesoplenty/worldgen/WorldGenDesertCactus.java +++ b/common/biomesoplenty/worldgen/WorldGenDesertCactus.java @@ -2,49 +2,31 @@ package biomesoplenty.worldgen; import java.util.Random; +import biomesoplenty.api.Blocks; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.api.Blocks; public class WorldGenDesertCactus extends WorldGenerator { - @Override - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) - { - for (int var6 = 0; var6 < 10; ++var6) - { - int var7 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8); - int var8 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4); - int var9 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8); + public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + { + int var999 = par1World.getBlockId(par3, par4, par5); + int var998 = par1World.getBlockMetadata(par3, par4, par5); - if (par1World.isAirBlock(var7, var8, var9)) - { - if (!par1World.isAirBlock(var7 - 1, var8 - 1, var9)) - { - if (!par1World.isAirBlock(var7 + 1, var8 - 1, var9)) - { - if (!par1World.isAirBlock(var7, var8 - 1, var9 - 1)) - { - if (!par1World.isAirBlock(var7, var8 - 1, var9 + 1)) - { - int var10 = 2 + par2Random.nextInt(par2Random.nextInt(2) + 2); + if (var999 == Blocks.plants.get().blockID && var998 == 12) + { + int l1 = 1 + par2Random.nextInt(par2Random.nextInt(3) + 1); - for (int var11 = 0; var11 < var10; ++var11) - { - if (Blocks.plants.get().canBlockStay(par1World, var7, var8 + var11, var9)) - { - par1World.setBlock(var7, var8 - 1, var9, Block.sand.blockID); - par1World.setBlock(var7, var8 + var11, var9, Block.cactus.blockID); - } - } - } - } - } - } - } - } + for (int i2 = 0; i2 < l1; ++i2) + { + if (Block.cactus.canBlockStay(par1World, par3, par4 + i2, par5)) + { + par1World.setBlock(par3, par4 + i2, par5, Block.cactus.blockID, 0, 2); + } + } + } - return true; - } + return true; + } } From 38bf0e4edfc746be171958887bbe33b5dca92f3b Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 22:47:13 -0400 Subject: [PATCH 25/29] Fixed some cacti stuff --- common/biomesoplenty/biomes/BiomeGenLushDesert.java | 1 - common/biomesoplenty/biomes/BiomeGenOutback.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/common/biomesoplenty/biomes/BiomeGenLushDesert.java b/common/biomesoplenty/biomes/BiomeGenLushDesert.java index e340c36f6..2a5afeae6 100644 --- a/common/biomesoplenty/biomes/BiomeGenLushDesert.java +++ b/common/biomesoplenty/biomes/BiomeGenLushDesert.java @@ -31,7 +31,6 @@ public class BiomeGenLushDesert extends BiomeGenBase customBiomeDecorator.deadBushPerChunk = 2; customBiomeDecorator.purpleFlowersPerChunk = 5; customBiomeDecorator.desertGrassPerChunk = 10; - customBiomeDecorator.desertCactiPerChunk = 10; customBiomeDecorator.cactiPerChunk = 20; customBiomeDecorator.tinyCactiPerChunk = 5; customBiomeDecorator.waterLakesPerChunk = 5; diff --git a/common/biomesoplenty/biomes/BiomeGenOutback.java b/common/biomesoplenty/biomes/BiomeGenOutback.java index 103443015..89f5708ac 100644 --- a/common/biomesoplenty/biomes/BiomeGenOutback.java +++ b/common/biomesoplenty/biomes/BiomeGenOutback.java @@ -27,6 +27,7 @@ public class BiomeGenOutback extends BiomeGenBase customBiomeDecorator.outbackPerChunk = 10; customBiomeDecorator.deadBushPerChunk = 7; customBiomeDecorator.tinyCactiPerChunk = 2; + customBiomeDecorator.cactiPerChunk = 4; customBiomeDecorator.bushesPerChunk = 5; customBiomeDecorator.generatePumpkins = false; } From f602c905b12bee3222f8079c427bfa118d71f645 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 22:52:43 -0400 Subject: [PATCH 26/29] Tweaked lavender texture --- .../biomesoplenty/textures/blocks/lavender.png | Bin 658 -> 671 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/assets/biomesoplenty/textures/blocks/lavender.png b/resources/assets/biomesoplenty/textures/blocks/lavender.png index da85dc159c7d3d38cec0eaa55de12967e58a6af2..080fce0f2fa7d7c9e6b7a2b3af94d7b644edcb9e 100644 GIT binary patch delta 585 zcmV-P0=E5<1)l|wJPN-601m$aI0aKAkwz(h8%ab#R5(wiQ145VQ51gn2kiUyG0KW4 zmdq@F&}P{d={EPv&C-l9U!C){p{?47Hqy;jk|oj4H!@MDg-}k>MPv{}U{Mf6eyYEr zzu>8J?7gpxee1w;?|q*0oO92;lG$wjFH{sYsPZZ*>Dy6JB;4&@!n^zrOoX48HCc#% zua|LgAWX$pIC&#bz{dD5yhwh=tIQ_uhfA!_B}yozzeAO`d<0%hCXW#Ca%e;O}OBdd6M@e2x(4U9SGIhk@zVkNPO4=Et$ zD6n?#T#>aq9Yqu_ud&7r2szI*mXvRQSRDF@Vdpq*bw9&G^b>A&%`+#@HSY}6&|8d# zRDA-9xNVdZWKJ~aL7LK(!-(%OXjif=T#&X+A>(<-zW$>l>=QwSSG_8F8!~Y9Sh!I( z@C0&w8i4^TPeH|L_XBP)cx+5>K!yQ(7MGlpd}F&}#c}^WKA%lC!eB5+!9N~o0 zf{RK2TP{gts6Dw8J#|;mkvPl+Hg^?Tq82`%8LAT+jUGwanTsG|Z`*^=;2}l4R7H5a>B}&u+o# zqF}s6Xd<*EeVjI;x6cBrV+W2joZ2NC`1`BjXg?sh2&2)+LZeH+jXk~E1(F4jJPN=701m(bYSxJfkwz(h4oO5oR5(wiQ0-0=K@{B==>PUTj9M^& zgtlpw*3vbllBQ7Ft#vI{ut-H(={F!K8b8;71Sn`oltQq^D2a(NL86I?kze`@KEW~f zlAWcd|GdeWnRD*FXYPz-u~_~KO+_7=vV&&&Q8X0^4?>&xSowvy-j@v~>*|LFE)Il$ z#rQTSr{ya4X8zz+>MP!65AdkB&iZPyj(X-NH07|4z>C>zmMT3f*h+uLO8h-1?_Suz zQt%U|e5=ft6E$q5e&d}2JdGGnm28#A7YY+Qt ztlbaPP#t^28XFLbo+WH1eqdwx3q~A&Gq@9af%V8fW`k?Ysiy2*hUVWz-me)GP^j&B zPEc{Os{+yzr;Et-JOl0Jg(x><+82@aJmI=aZ8@$JL5-7M4YAfN2FGn|RFD^-v}B;> zT|5OfXWWn3V5qZX7*N6GjsmVb=K01%!3BS;jnApuKA21ML%7y_I zIQxzxYMnr`?B)hv*ouK0Ha-teof8_3K7KF2Tm%t0(u$$tSx)FUA3fE;N2a|Pxawr> zV%A|yKqHeFhHNlP;l&(3A9W z`iQZN4fen>oC%%~2Ju@C^r@XEf{V}vPrp?p3G``4`M;VZNzz|vtwn{xX;H8M0000< KMNUMnLSTZDs}gAd From 9eed71de31f1db6525ae7ea9c9a292ac52a529c1 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 23:26:23 -0400 Subject: [PATCH 27/29] Made burning blossoms, deathblooms, and thorns hurt you if you don't break them using shears --- .../biomesoplenty/blocks/BlockBOPFlower.java | 34 +++++++++++++++++ .../biomesoplenty/blocks/BlockBOPFlower2.java | 37 +++++++++++++++++++ .../biomesoplenty/blocks/BlockBOPPlant.java | 21 +++++++++++ 3 files changed, 92 insertions(+) diff --git a/common/biomesoplenty/blocks/BlockBOPFlower.java b/common/biomesoplenty/blocks/BlockBOPFlower.java index a8cc729ea..6db746edd 100644 --- a/common/biomesoplenty/blocks/BlockBOPFlower.java +++ b/common/biomesoplenty/blocks/BlockBOPFlower.java @@ -10,6 +10,8 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -284,6 +286,38 @@ public class BlockBOPFlower extends BlockFlower return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z)); } } + + @Override + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) + { + super.harvestBlock(world, player, x, y, z, meta); + + ItemStack equippedItem = player.getCurrentEquippedItem(); + + if (equippedItem != null) + { + if (equippedItem.itemID != Item.shears.itemID) + { + if (meta == 2) + { + if (!world.isRemote) + { + player.addPotionEffect(new PotionEffect(Potion.wither.id, 300)); + } + } + } + } + else + { + if (meta == 2) + { + if (!world.isRemote) + { + player.addPotionEffect(new PotionEffect(Potion.wither.id, 300)); + } + } + } + } @Override public boolean isBlockReplaceable(World world, int x, int y, int z) diff --git a/common/biomesoplenty/blocks/BlockBOPFlower2.java b/common/biomesoplenty/blocks/BlockBOPFlower2.java index 00e9701c8..089557a17 100644 --- a/common/biomesoplenty/blocks/BlockBOPFlower2.java +++ b/common/biomesoplenty/blocks/BlockBOPFlower2.java @@ -8,6 +8,9 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; @@ -84,6 +87,40 @@ public class BlockBOPFlower2 extends BlockFlower break; } } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) + { + if (world.getBlockMetadata(x, y, z) == 2) { + entity.setFire(1); + } + } + + @Override + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) + { + super.harvestBlock(world, player, x, y, z, meta); + + ItemStack equippedItem = player.getCurrentEquippedItem(); + + if (equippedItem != null) + { + if (equippedItem.itemID != Item.shears.itemID) + { + if (meta == 2) + { + player.setFire(5); + } + } + } + else + { + if (meta == 2) + { + player.setFire(5); + } + } + } /** * A randomly called display update to be able to add particles or other items for display diff --git a/common/biomesoplenty/blocks/BlockBOPPlant.java b/common/biomesoplenty/blocks/BlockBOPPlant.java index 38defdcf7..90f819436 100644 --- a/common/biomesoplenty/blocks/BlockBOPPlant.java +++ b/common/biomesoplenty/blocks/BlockBOPPlant.java @@ -12,6 +12,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -348,6 +349,26 @@ public class BlockBOPPlant extends BlockFlower implements IShearable { player.addPotionEffect(new PotionEffect(Potion.wither.id, 250, 1)); } + + ItemStack equippedItem = player.getCurrentEquippedItem(); + + if (equippedItem != null) + { + if (equippedItem.itemID != Item.shears.itemID) + { + if (meta == 5) + { + player.attackEntityFrom(DamageSource.cactus, 2); + } + } + } + else + { + if (meta == 5) + { + player.attackEntityFrom(DamageSource.cactus, 2); + } + } } @Override From 73d904ae91f27aaa7ec3f278a6fed727c2c1cd80 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Fri, 20 Sep 2013 00:21:28 -0400 Subject: [PATCH 28/29] Added Goldenrods and Bluebells --- common/biomesoplenty/api/BlockReferences.java | 4 ++- .../biomes/BiomeDecoratorBOP.java | 24 ++++++++++++++++++ .../biomesoplenty/biomes/BiomeGenPrairie.java | 3 ++- .../biomes/BiomeGenSpruceWoods.java | 1 + .../biomesoplenty/blocks/BlockBOPFlower2.java | 2 +- .../integration/ThaumcraftIntegration.java | 3 +++ .../itemblocks/ItemBlockFlower2.java | 2 +- .../worldgen/tree/WorldGenTaiga3.java | 2 +- .../worldgen/tree/WorldGenTaiga4.java | 2 +- resources/assets/biomesoplenty/lang/en_US.xml | 2 ++ .../textures/blocks/bluebells.png | Bin 0 -> 473 bytes .../textures/blocks/goldenrod.png | Bin 0 -> 646 bytes .../textures/blocks/swampflower.png | Bin 647 -> 651 bytes 13 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 resources/assets/biomesoplenty/textures/blocks/bluebells.png create mode 100644 resources/assets/biomesoplenty/textures/blocks/goldenrod.png diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index e41df5df0..ac119eacb 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -185,7 +185,9 @@ public class BlockReferences { hibiscus (Blocks.flowers2, 0), lilyofthevalley (Blocks.flowers2, 1), burningblossom (Blocks.flowers2, 2), - lavender (Blocks.flowers2, 2), + lavender (Blocks.flowers2, 3), + goldenrod (Blocks.flowers2, 4), + bluebells (Blocks.flowers2, 5), ; public Optional block; diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index 789f43bf6..e0c9b09eb 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -223,6 +223,8 @@ public class BiomeDecoratorBOP extends BiomeDecorator public WorldGenerator lilyOfTheValleyGen; public WorldGenerator burningBlossomGen; public WorldGenerator lavenderGen; + public WorldGenerator goldenrodGen; + public WorldGenerator bluebellGen; public WorldGenerator boneSpineGen; public WorldGenerator boneSpine2Gen; @@ -312,6 +314,8 @@ public class BiomeDecoratorBOP extends BiomeDecorator public int lilyOfTheValleysPerChunk; public int burningBlossomsPerChunk; public int lavenderPerChunk; + public int goldenrodsPerChunk; + public int bluebellsPerChunk; public int boneSpinesPerChunk; public int boneSpines2PerChunk; @@ -465,6 +469,8 @@ public class BiomeDecoratorBOP extends BiomeDecorator lilyOfTheValleyGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 1); burningBlossomGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 2); lavenderGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 3); + goldenrodGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 4); + bluebellGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 5); lilyflowerGen = new WorldGenLilyflower(); deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2); hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4); @@ -594,6 +600,8 @@ public class BiomeDecoratorBOP extends BiomeDecorator lilyOfTheValleysPerChunk = 0; burningBlossomsPerChunk = 0; lavenderPerChunk = 0; + goldenrodsPerChunk = 0; + bluebellsPerChunk = 0; generateLakes = true; generateAsh = false; generateMycelium = false; @@ -1146,6 +1154,22 @@ public class BiomeDecoratorBOP extends BiomeDecorator var5 = chunk_Z + randomGenerator.nextInt(16) + 8; lavenderGen.generate(currentWorld, randomGenerator, var3, var4, var5); } + + for (var2 = 0; var2 < goldenrodsPerChunk; ++var2) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(256); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + goldenrodGen.generate(currentWorld, randomGenerator, var3, var4, var5); + } + + for (var2 = 0; var2 < bluebellsPerChunk; ++var2) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(256); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + bluebellGen.generate(currentWorld, randomGenerator, var3, var4, var5); + } for (var2 = 0; var2 < hydrangeasPerChunk; ++var2) { diff --git a/common/biomesoplenty/biomes/BiomeGenPrairie.java b/common/biomesoplenty/biomes/BiomeGenPrairie.java index 5d847931a..2b3491744 100644 --- a/common/biomesoplenty/biomes/BiomeGenPrairie.java +++ b/common/biomesoplenty/biomes/BiomeGenPrairie.java @@ -23,7 +23,8 @@ public class BiomeGenPrairie extends BiomeGenBase customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; customBiomeDecorator.treesPerChunk = 1; customBiomeDecorator.grassPerChunk = 999; - customBiomeDecorator.whiteFlowersPerChunk = 45; + customBiomeDecorator.whiteFlowersPerChunk = 20; + customBiomeDecorator.goldenrodsPerChunk = 40; customBiomeDecorator.portobellosPerChunk = 2; customBiomeDecorator.berryBushesPerChunk = 2; customBiomeDecorator.carrotsPerChunk = 1; diff --git a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java index bdf113111..cbff7ac01 100644 --- a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java @@ -28,6 +28,7 @@ public class BiomeGenSpruceWoods extends BiomeGenBase customBiomeDecorator.poisonIvyPerChunk = 1; customBiomeDecorator.berryBushesPerChunk = 3; customBiomeDecorator.carrotsPerChunk = 1; + customBiomeDecorator.bluebellsPerChunk = 100; } /** diff --git a/common/biomesoplenty/blocks/BlockBOPFlower2.java b/common/biomesoplenty/blocks/BlockBOPFlower2.java index 089557a17..08a392975 100644 --- a/common/biomesoplenty/blocks/BlockBOPFlower2.java +++ b/common/biomesoplenty/blocks/BlockBOPFlower2.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPFlower2 extends BlockFlower { - private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"}; + private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells"}; private Icon[] textures; protected BlockBOPFlower2(int blockID, Material material) diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java index a27c35e5c..9ac620f3f 100644 --- a/common/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/common/biomesoplenty/integration/ThaumcraftIntegration.java @@ -226,6 +226,9 @@ public class ThaumcraftIntegration { ThaumcraftApi.registerObjectTag(getBID("hibiscus"), getBMeta("hibiscus"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("lilyofthevalley"), getBMeta("lilyofthevalley"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.POISON, 1)); ThaumcraftApi.registerObjectTag(getBID("burningblossom"), getBMeta("burningblossom"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.FIRE, 2)); + ThaumcraftApi.registerObjectTag(getBID("lavender"), getBMeta("lavender"), (new AspectList()).add(Aspect.PLANT, 4)); + ThaumcraftApi.registerObjectTag(getBID("goldenrod"), getBMeta("goldenrod"), (new AspectList()).add(Aspect.PLANT, 4)); + ThaumcraftApi.registerObjectTag(getBID("bluebells"), getBMeta("bluebells"), (new AspectList()).add(Aspect.PLANT, 4)); } diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java index 426466fa6..9bf57957b 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java +++ b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockFlower2 extends ItemBlock { - private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"}; + private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells"}; @SideOnly(Side.CLIENT) private Icon[] textures; diff --git a/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java index 5b158728f..e27446de7 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java @@ -20,7 +20,7 @@ public class WorldGenTaiga3 extends WorldGenerator int var6 = var2.nextInt(10) + 35; int var7 = var2.nextInt(5) + 10; int var8 = var6 - var7; - int var9 = 4; + int var9 = 3; boolean var10 = true; if (var4 >= 1 && var4 + var6 + 1 <= 256) diff --git a/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java index d75b17484..0d148768b 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java @@ -20,7 +20,7 @@ public class WorldGenTaiga4 extends WorldGenerator int var6 = var2.nextInt(15) + 20; int var7 = var2.nextInt(3) + 5; int var8 = var6 - var7; - int var9 = 2 + var2.nextInt(3); + int var9 = 2 + var2.nextInt(2); boolean var10 = true; if (var4 >= 1 && var4 + var6 + 1 <= 256) diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index 4b3718936..487823e5f 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -58,6 +58,8 @@ Lily of the Valley Burning Blossom Lavender + Goldenrod + Bluebells Algae Short Grass diff --git a/resources/assets/biomesoplenty/textures/blocks/bluebells.png b/resources/assets/biomesoplenty/textures/blocks/bluebells.png new file mode 100644 index 0000000000000000000000000000000000000000..66cbf117f850e6e738af9c639d9b7e597f0d353e GIT binary patch literal 473 zcmV;~0Ve*5P)N2bPDNB8 zb~7$DE-^7j^FlWO00C7=L_t(IPwi0KNj?pf4vpQLvBAL4moGAl_f~uyaMn@exm#S8TN2bPDNB8 zb~7$DE-^7j^FlWO00II@L_t(IPi<07Y)oMky-S2dgheexMOlzEEyGxfG{laL1{G-{ zY15&JRf(iYEd^oIus|XR7B;pPLTHebl0J(L&D6}8nM^YO^XB*X&VBiw`RU@!xxeST z_s)}iJ}&?inM_7Gm&++P8VzwAN7>f6uB%+FRwb26i8{q%(Qmebu~Z;qo;U3I%b$j4Rt_i)=RQO;D*+l&NUPZ7xh= z1fgP<^{k z87tG^n#{%HaleiS^^J5o?OpiW5q!M07WH=lG~OQo7LVfh(_X+i2K(>$(;8?a55%P1 zv-GAP#LtIY@%L4)V&jPSSSNggw;(Uv+YI~|!k?GBkbd2dCSp25($Ys--)lYn{aM2h`HPA@axHT@cVEc^qBH?5nsRtf{%KHqn{YvgV6Ou zI1>us^W6<5YxgA#{UEI59R*UW@8TD4FCWD07*qoM6N<$f^Lo_E&u=k literal 0 HcmV?d00001 diff --git a/resources/assets/biomesoplenty/textures/blocks/swampflower.png b/resources/assets/biomesoplenty/textures/blocks/swampflower.png index 1c9ccf2424a9d9667f3754ab70968fe9ba0a8b98..dea98a029967021e364e1b819f3ca1ea447935af 100644 GIT binary patch delta 565 zcmV-50?Pe|1&alcJPN@801m+cxRGn^kwz(h2T4RhR5(vvQ)z1xQ52o*dyG!Hq%>)p zOwu%llvXP>7Hp+bm(mucsJIYB6f6iX_(A=ksGwHds0i8*wX{?y_{AT1oO364n9hOW zo%i0o=bd|RVklCnl&qOd#t4VQMl2SSy&{{<${Ftz!CZ%n|X6dmRY(TMC6jUFLw|D&oHrP=K})iG&0&n4E}2 zB5o36v?N{SjvH^s*=>a;c}vu35mGKy{MP7zPR73P!}_v^((6rhuf#DE4>U8E%ZUh` zkkfkM?JpFL&)`UF3VoApRKMY5f z>Kba_{^0QShZ1By-vH}ptrQtJTX&PSSK$jCj9!{@&yC*BQ}91f`Mit%W2fwY7k1^6 zjjG>nqp~ys(=?6p`nH@?xYn6Q&uj&9m$iCWRA! zw?qnFp+X=KkjD>i0vFyd#N+W6b4>i^-UPz^kwT$Ri#edVGVz}YXuw#BL_!K!Oin~1 z5m&?-)slM485iD(bJ_|@xQ8+#P&|uA@JokTqR@I~Qb zEh!4k3z(0mQ2+MNNmc%OgX&}h#l2rpv!EGyvhh)bca}EY7Oah9F*e^Efj=@WHva+L z$JfvoKS`1P{yW$|d!@;}>6$BcXEpH_)x}5dzSh3_8T=1ehgZlAJ%_n}DTf??RBdAv zrG+76vsuk-{*-+hSJv&>jF%vbwowb^#xQcPn<8#o-jWm#<_Ew+^8D^O?vK0x-<^{W zVXY203Ho0>l_GLZKQZ$TG^{O+$X>@n1=eg`W>Gx2Lfmed`!wN4HFKsH#koFbVT0FG zn5qirwe_wz<{e`_;LY%sx?lDjBR5gDb$$2`J$sdwIzqBk00000NkvXXu0mjfAYBHn From 9088ae05858aa8f4876298073784a84c73fab3df Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Fri, 20 Sep 2013 00:27:13 -0400 Subject: [PATCH 29/29] Adding crafting recipes for the new flowers --- common/biomesoplenty/configuration/BOPCrafting.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/biomesoplenty/configuration/BOPCrafting.java b/common/biomesoplenty/configuration/BOPCrafting.java index c125f54be..f1777200c 100644 --- a/common/biomesoplenty/configuration/BOPCrafting.java +++ b/common/biomesoplenty/configuration/BOPCrafting.java @@ -35,6 +35,13 @@ public class BOPCrafting GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 5), new Object[] {new ItemStack(Blocks.flowers.get(),1,8)}); GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 10), new Object[] {new ItemStack(Blocks.mushrooms.get(),1,3)}); GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 8), new Object[] {new ItemStack(Items.miscItems.get(), 1, 1)}); + + GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 9), new Object[] {new ItemStack(Blocks.flowers2.get(),1,0)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 8), new Object[] {new ItemStack(Blocks.flowers2.get(),1,1)}); + GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 14), new Object[] {new ItemStack(Blocks.flowers2.get(),1,2)}); + GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 5), new Object[] {new ItemStack(Blocks.flowers2.get(),1,3)}); + GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 11), new Object[] {new ItemStack(Blocks.flowers2.get(),1,4)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 5), new Object[] {new ItemStack(Blocks.flowers2.get(),1,5)}); GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 5), new Object[] {new ItemStack(Blocks.mushrooms.get(),1,2)}); GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 6), new Object[] {new ItemStack(Blocks.plants.get(),1,7)});