diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java index 568b080..e53f73e 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java @@ -94,7 +94,7 @@ public class TAIGAConfiguration { final int IRON_DEFAULT = 20; final int TIBERIUM_DEFAULT = 15; - final int PROMETHEUM_DEFAULT = 25; + final int PROMETHEUM_DEFAULT = 18; final int VALYRIUM_DEFAULT = 10; final int DILITHIUM_DEFAULT = 12; final int OSRAM_DEFAULT = 1; @@ -104,7 +104,7 @@ public class TAIGAConfiguration { final int KARMESINE_DEFAULT = 8; final int JAUXUM_DEFAULT = 8; final int OVIUM_DEFAULT = 8; - final int VIBRANIUM_DEFAULT = 10; + final int VIBRANIUM_DEFAULT = 8; final int URU_DEFAULT = 1; final int AURORIUM_DEFAULT = 10; final int PALLADIUM_DEFAULT = 10; diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java index 03d87f7..f19af34 100644 --- a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java +++ b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java @@ -19,9 +19,9 @@ import static com.sosnitzka.taiga.TAIGAConfiguration.*; @SuppressWarnings("unchecked") public class WorldGen implements IWorldGenerator { private void nether(Random random, int x, int z, World world) { - Generator.generateOre(tiberiumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, TIBERIUM_VAL, 0, 128, 10, 35); - Generator.generateOre(prometheumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 128, 2, 4); - Generator.generateOre(valyriumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 32, 2, 4); + Generator.generateOre(tiberiumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, TIBERIUM_VAL, 32, 128, 10, 35); + Generator.generateOre(prometheumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 32, 2, 4); + Generator.generateOre(valyriumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 128, 2, 4); Generator.generateOre(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, OSRAM_VAL, 0, 64, 15); } @@ -34,7 +34,7 @@ public class WorldGen implements IWorldGenerator { Generator.generateOreStoneVariant(jauxumOre.getDefaultState(), BlockStone.EnumType.GRANITE, random, x, z, world, JAUXUM_VAL); Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, VIBRANIUM_VAL, 100, 0, 64, 2, 6, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT)); Generator.generateOre(dilithiumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, DILITHIUM_VAL, 100, 0, 64, 2, 8, newArrayList(Biomes.DESERT, Biomes.DESERT_HILLS, Biomes.MUTATED_DESERT, Biomes.OCEAN, Biomes.DEEP_OCEAN, Biomes.FROZEN_OCEAN, Biomes.BEACH)); - Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 1, 25, 0, 128, 1, 5, null); + Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 1, 15, 0, 128, 1, 5, null); if (ironGen) { Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, IRON_VAL, 0, 32, 2, 8); } diff --git a/src/main/resources/assets/taiga/book/en_US/ore/aurorium.json b/src/main/resources/assets/taiga/book/en_US/ore/aurorium.json new file mode 100644 index 0000000..8bf5ba0 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/aurorium.json @@ -0,0 +1,18 @@ +{ + "title": "Aurorium", + "r": 239, + "g": 174, + "b": 148, + "input": { + "id": "taiga:aurorium_ore" + }, + "description": [ + { + "text": "Aurorium ore isn't very common in the end, but you can find a lot if you are patient enough. With some twists and turns it will maybe get some more unique features later." + } + ], + "informations": [ + "Level: Cobalt", + "Uncommon" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ore/duranite.json b/src/main/resources/assets/taiga/book/en_US/ore/duranite.json new file mode 100644 index 0000000..599d342 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/duranite.json @@ -0,0 +1,19 @@ +{ + "title": "Duranite", + "r": 172, + "g": 221, + "b": 235, + "input": { + "id": "taiga:duranite_ore" + }, + "description": [ + { + "text": "A long time ago, meteorites fell from the sky. The friction heat and the pressure formed duranite ore inside the meteorites. Its natural form is very hard and you need some time to break that ore." + } + ], + "informations": [ + "Level: Duranite", + "Very rare", + "Found in meteorites" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ore/jauxum.json b/src/main/resources/assets/taiga/book/en_US/ore/jauxum.json new file mode 100644 index 0000000..eb61024 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/jauxum.json @@ -0,0 +1,18 @@ +{ + "title": "Jauxum", + "r": 104, + "g": 198, + "b": 99, + "input": { + "id": "taiga:jauxum_ore" + }, + "description": [ + { + "text": "Jauxum is one of the three etherical ores. You can find it in natural granite veins. For using karmesine in alloys you need to bind it with karmesine and ovium." + } + ], + "informations": [ + "Level: Cobalt", + "Appears in granite" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ore/karmesine.json b/src/main/resources/assets/taiga/book/en_US/ore/karmesine.json new file mode 100644 index 0000000..e25e01e --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/karmesine.json @@ -0,0 +1,18 @@ +{ + "title": "Karmesine", + "r": 235, + "g": 72, + "b": 74, + "input": { + "id": "taiga:karmesine_ore" + }, + "description": [ + { + "text": "Karmesine is one of the three etherical ores. You can find it in natural andesite veins. For using karmesine in alloys you need to bind it with jauxum and ovium." + } + ], + "informations": [ + "Level: Cobalt", + "Appears in andensite" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ore/ovium.json b/src/main/resources/assets/taiga/book/en_US/ore/ovium.json new file mode 100644 index 0000000..4404776 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/ovium.json @@ -0,0 +1,18 @@ +{ + "title": "Ovium", + "r": 125, + "g": 119, + "b": 195, + "input": { + "id": "taiga:karmesine_ore" + }, + "description": [ + { + "text": "Ovium is one of the three etherical ores. You can find it in natural diorite veins. For using karmesine in alloys you need to bind it with jauxum and karmesine." + } + ], + "informations": [ + "Level: Cobalt", + "Appears in diorite" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ore/palladium.json b/src/main/resources/assets/taiga/book/en_US/ore/palladium.json new file mode 100644 index 0000000..6edb702 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/palladium.json @@ -0,0 +1,19 @@ +{ + "title": "Palladium", + "r": 238, + "g": 135, + "b": 54, + "input": { + "id": "taiga:palladium_ore" + }, + "description": [ + { + "text": "Palladium is a crystalline ore found in the end. It glows caused by its natural radioactivity and is able to hurt you if you take it up (next taiga versions...)." + } + ], + "informations": [ + "Level: Duranite", + "Dangerously radioactive", + "Glows in the Dark" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ore/prometheum.json b/src/main/resources/assets/taiga/book/en_US/ore/prometheum.json new file mode 100644 index 0000000..19bcddd --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/prometheum.json @@ -0,0 +1,20 @@ +{ + "title": "Prometheum", + "r": 55, + "g": 44, + "b": 73, + "input": { + "id": "taiga:prometheum_ore" + }, + "description": [ + { + "text": "Some scientists believe that prometheum ore emerges naturally, caused by heavy pressure and heat it has to absorb in the depth of the nether. It is kind of glowing and has a radioactive decay." + } + ], + "informations": [ + "Level: Duranite", + "Has a natural decay", + "Glows in the dark", + "dY: ~16" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ore/tiberium.json b/src/main/resources/assets/taiga/book/en_US/ore/tiberium.json new file mode 100644 index 0000000..6e209d8 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/tiberium.json @@ -0,0 +1,19 @@ +{ + "title": "Tiberium", + "r": 212, + "g": 255, + "b": 0, + "input": { + "id": "taiga:tiberium_ore" + }, + "description": [ + { + "text": "If you explore the nether, you often will discover tiberium ore. Be careful when you try to break the ores. Tiberium crystals are unstable, full of energy, and can cause heavy explosions." + } + ], + "informations": [ + "Level: Stone", + "Explosive", + "Drops crystals" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ore/valyrium.json b/src/main/resources/assets/taiga/book/en_US/ore/valyrium.json new file mode 100644 index 0000000..3aacc7c --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/valyrium.json @@ -0,0 +1,19 @@ +{ + "title": "Valyrium", + "r": 232, + "g": 92, + "b": 49, + "input": { + "id": "taiga:valyrium_ore" + }, + "description": [ + { + "text": "The old valyrian people were the first who discovered this unique kind of metal which they called valyrium. It is very rare and hard to find in the surroundings of the nether." + } + ], + "informations": [ + "Level: Valyrium", + "Very rare", + "Y: 0 - 128" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ore/vibranium.json b/src/main/resources/assets/taiga/book/en_US/ore/vibranium.json new file mode 100644 index 0000000..4f78768 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ore/vibranium.json @@ -0,0 +1,20 @@ +{ + "title": "Vibranium", + "r": 186, + "g": 210, + "b": 217, + "input": { + "id": "taiga:vibranium_ore" + }, + "description": [ + { + "text": "It's the most rarest ore you are able to find. Some people say, you can find more of it it Deserts and Extreme Hill Biomes. Breaking it will cause more damage than usually expected." + } + ], + "informations": [ + "Level: Vibranium", + "Super rare", + "More often in Deserts and Extreme Hills", + "Vibrating" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ores/basalt.json b/src/main/resources/assets/taiga/book/en_US/ores/basalt.json deleted file mode 100644 index a03c632..0000000 --- a/src/main/resources/assets/taiga/book/en_US/ores/basalt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "title": "Basalt", - "text1": [ - { - "text": "TAIGA adds various new blocks and ores. To get higher tiers, stats and traits you need to alloy them." - } - ], - "text2": [ - { - "text": "On the next Pages you will learn where to get these new materials and what you need to know else." - } - ], - "image": { - "file": "taiga:textures/book/ores.png" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ores/firstwords.json b/src/main/resources/assets/taiga/book/en_US/taiga/firstwords.json similarity index 100% rename from src/main/resources/assets/taiga/book/en_US/ores/firstwords.json rename to src/main/resources/assets/taiga/book/en_US/taiga/firstwords.json diff --git a/src/main/resources/assets/taiga/book/en_US/ores/intro.json b/src/main/resources/assets/taiga/book/en_US/taiga/intro.json similarity index 100% rename from src/main/resources/assets/taiga/book/en_US/ores/intro.json rename to src/main/resources/assets/taiga/book/en_US/taiga/intro.json diff --git a/src/main/resources/assets/taiga/book/sections/intro.json b/src/main/resources/assets/taiga/book/sections/intro.json index 00ec060..36ffa00 100644 --- a/src/main/resources/assets/taiga/book/sections/intro.json +++ b/src/main/resources/assets/taiga/book/sections/intro.json @@ -2,12 +2,37 @@ { "name": "intro", "type": "image with text below", - "data": "ores/intro.json" + "data": "taiga/intro.json" }, { "name": "firstwords", "type": "image with text below", - "data": "ores/firstwords.json" + "data": "taiga/firstwords.json" + }, + { + "name": "aurorium", + "type": "taigaore", + "data": "ore/aurorium.json" + }, + { + "name": "basalt", + "type": "taigaore", + "data": "ore/basalt.json" + }, + { + "name": "duranite", + "type": "taigaore", + "data": "ore/duranite.json" + }, + { + "name": "jauxum", + "type": "taigaore", + "data": "ore/jauxum.json" + }, + { + "name": "karmesine", + "type": "taigaore", + "data": "ore/karmesine.json" }, { "name": "meteorite", @@ -20,8 +45,33 @@ "data": "ore/obsidiorite.json" }, { - "name": "basalt", + "name": "ovium", "type": "taigaore", - "data": "ore/basalt.json" + "data": "ore/ovium.json" + }, + { + "name": "palladium", + "type": "taigaore", + "data": "ore/palladium.json" + }, + { + "name": "prometheum", + "type": "taigaore", + "data": "ore/prometheum.json" + }, + { + "name": "tiberium", + "type": "taigaore", + "data": "ore/tiberium.json" + }, + { + "name": "valyrium", + "type": "taigaore", + "data": "ore/valyrium.json" + }, + { + "name": "vibranium", + "type": "taigaore", + "data": "ore/vibranium.json" } ] \ No newline at end of file