From f6521cdddfe97de499ed385c82f39e8e2e9bbbb3 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Sat, 17 Dec 2016 13:28:08 +0100 Subject: [PATCH] Reimplemented different ore-types for Grantie, Diorite, Andensite. Added material, items and other stuff for each ore. Oregen rebalanced. Fixed Generator for Oregen. --- src/main/java/com/sosnitzka/taiga/Alloys.java | 9 +- src/main/java/com/sosnitzka/taiga/Blocks.java | 5 ++ src/main/java/com/sosnitzka/taiga/Fluids.java | 3 + src/main/java/com/sosnitzka/taiga/Items.java | 12 +++ .../com/sosnitzka/taiga/MaterialTraits.java | 5 +- src/main/java/com/sosnitzka/taiga/TAIGA.java | 2 +- .../sosnitzka/taiga/TAIGAConfiguration.java | 39 ++++++++- .../com/sosnitzka/taiga/util/Generator.java | 80 +++++++++++------- .../com/sosnitzka/taiga/world/WorldGen.java | 25 +++--- .../assets/taiga/blockstates/fluid_block.json | 21 +++++ ...sinediorite_ore.json => jauxum_block.json} | 2 +- ...mesinegranite_ore.json => jauxum_ore.json} | 2 +- ...ineandensite_ore.json => ovium_block.json} | 2 +- .../assets/taiga/blockstates/ovium_ore.json | 18 ++++ .../taiga/blockstates/terrax_block.json | 18 ++++ .../taiga/textures/blocks/ore/karmesine.png | Bin 16346 -> 16413 bytes .../blocks/ore/karmesineandensite.png | Bin 16346 -> 0 bytes .../textures/blocks/ore/karmesinediorite.png | Bin 16328 -> 0 bytes .../textures/blocks/ore/karmesinegranite.png | Bin 16278 -> 0 bytes 19 files changed, 187 insertions(+), 56 deletions(-) rename src/main/resources/assets/taiga/blockstates/{karmesinediorite_ore.json => jauxum_block.json} (82%) rename src/main/resources/assets/taiga/blockstates/{karmesinegranite_ore.json => jauxum_ore.json} (82%) rename src/main/resources/assets/taiga/blockstates/{karmesineandensite_ore.json => ovium_block.json} (81%) create mode 100644 src/main/resources/assets/taiga/blockstates/ovium_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/terrax_block.json delete mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png diff --git a/src/main/java/com/sosnitzka/taiga/Alloys.java b/src/main/java/com/sosnitzka/taiga/Alloys.java index 1b0b9df..75b46b1 100644 --- a/src/main/java/com/sosnitzka/taiga/Alloys.java +++ b/src/main/java/com/sosnitzka/taiga/Alloys.java @@ -13,25 +13,26 @@ public class Alloys { * Registers alloying in the smeltery */ public static void register() { + registerTinkerAlloy(new FluidStack(terraxFluid, 2), new FluidStack(karmesineFluid, 1), new FluidStack(oviumFluid, 1), new FluidStack(jauxumFluid, 1)); registerTinkerAlloy(new FluidStack(triberiumFluid, 1), new FluidStack(tiberiumFluid, 5), new FluidStack(basaltFluid, 1)); registerTinkerAlloy(new FluidStack(fractumFluid, 2), new FluidStack(triberiumFluid, 3), new FluidStack(TinkerFluids.obsidian, 3), new FluidStack(abyssumFluid, 1)); registerTinkerAlloy(new FluidStack(violiumFluid, 2), new FluidStack(auroriumFluid, 3), new FluidStack(TinkerFluids.ardite, 2)); registerTinkerAlloy(new FluidStack(proxiiFluid, 3), new FluidStack(prometheumFluid, 3), new FluidStack(palladiumFluid, 3), new FluidStack(eezoFluid, 1)); - registerTinkerAlloy(new FluidStack(tritoniteFluid, 2), new FluidStack(TinkerFluids.cobalt, 3), new FluidStack(karmesineFluid, 2)); - registerTinkerAlloy(new FluidStack(ignitzFluid, 2), new FluidStack(TinkerFluids.ardite, 2), new FluidStack(karmesineFluid, 2), new FluidStack(osramFluid, 1)); + registerTinkerAlloy(new FluidStack(tritoniteFluid, 2), new FluidStack(TinkerFluids.cobalt, 3), new FluidStack(terraxFluid, 2)); + registerTinkerAlloy(new FluidStack(ignitzFluid, 2), new FluidStack(TinkerFluids.ardite, 2), new FluidStack(terraxFluid, 2), new FluidStack(osramFluid, 1)); registerTinkerAlloy(new FluidStack(imperomiteFluid, 2), new FluidStack(duraniteFluid, 3), new FluidStack(prometheumFluid, 1), new FluidStack(abyssumFluid, 1)); registerTinkerAlloy(new FluidStack(solariumFluid, 2), new FluidStack(valyriumFluid, 2), new FluidStack(uruFluid, 2), new FluidStack(nucleumFluid, 1)); registerTinkerAlloy(new FluidStack(adamantFluid, 3), new FluidStack(vibraniumFluid, 1), new FluidStack(solariumFluid, 1), new FluidStack(ioxFluid, 3)); registerTinkerAlloy(new FluidStack(nihiliteFluid, 1), new FluidStack(vibraniumFluid, 1), new FluidStack(solariumFluid, 1)); registerTinkerAlloy(new FluidStack(seismumFluid, 4), new FluidStack(TinkerFluids.obsidian, 4), new FluidStack(triberiumFluid, 2), new FluidStack(eezoFluid, 1)); - registerTinkerAlloy(new FluidStack(astriumFluid, 2), new FluidStack(karmesineFluid, 3), new FluidStack(auroriumFluid, 2)); + registerTinkerAlloy(new FluidStack(astriumFluid, 2), new FluidStack(terraxFluid, 3), new FluidStack(auroriumFluid, 2)); registerTinkerAlloy(new FluidStack(niobFluid, 3), new FluidStack(palladiumFluid, 3), new FluidStack(duraniteFluid, 1), new FluidStack(osramFluid, 1)); registerTinkerAlloy(new FluidStack(yrdeenFluid, 3), new FluidStack(uruFluid, 3), new FluidStack(valyriumFluid, 3), new FluidStack(osramFluid, 1)); registerTinkerAlloy(new FluidStack(yrdeenFluid, 3), new FluidStack(uruFluid, 3), new FluidStack(valyriumFluid, 3), new FluidStack(eezoFluid, 1)); registerTinkerAlloy(new FluidStack(yrdeenFluid, 3), new FluidStack(uruFluid, 3), new FluidStack(valyriumFluid, 3), new FluidStack(abyssumFluid, 1)); registerTinkerAlloy(new FluidStack(ioxFluid, 1), new FluidStack(eezoFluid, 2), new FluidStack(abyssumFluid, 2), new FluidStack(osramFluid, 2), new FluidStack(obsidioriteFluid, 9)); registerTinkerAlloy(new FluidStack(ioxFluid, 1), new FluidStack(eezoFluid, 2), new FluidStack(abyssumFluid, 2), new FluidStack(osramFluid, 2), new FluidStack(meteoriteFluid, 9), new FluidStack(TinkerFluids.obsidian, 9)); - registerTinkerAlloy(new FluidStack(lumixFluid, 1), new FluidStack(palladiumFluid, 1), new FluidStack(karmesineFluid, 1)); + registerTinkerAlloy(new FluidStack(lumixFluid, 1), new FluidStack(palladiumFluid, 1), new FluidStack(terraxFluid, 1)); registerTinkerAlloy(new FluidStack(obsidioriteFluid, 1), new FluidStack(meteoriteFluid, 1), new FluidStack(TinkerFluids.obsidian, 1)); registerTinkerAlloy(new FluidStack(nucleumFluid, 3), new FluidStack(proxiiFluid, 3), new FluidStack(abyssumFluid, 1), new FluidStack(osramFluid, 1)); registerTinkerAlloy(new FluidStack(nucleumFluid, 3), new FluidStack(imperomiteFluid, 3), new FluidStack(osramFluid, 1), new FluidStack(eezoFluid, 1)); diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java index 582d5ce..c35c702 100644 --- a/src/main/java/com/sosnitzka/taiga/Blocks.java +++ b/src/main/java/com/sosnitzka/taiga/Blocks.java @@ -31,6 +31,8 @@ public class Blocks { public static Block valyriumOre = new BasicBlock("valyrium_ore", Material.ROCK, 60.0f, 50f, VALYRIUM, PREFIX_ORE); public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 60f, VIBRANIUM, PREFIX_ORE); public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 10f, COBALT, PREFIX_ORE); + public static Block oviumOre = new BasicBlock("ovium_ore", Material.ROCK, 13.0f, 10f, COBALT, PREFIX_ORE); + public static Block jauxumOre = new BasicBlock("jauxum_ore", Material.ROCK, 13.0f, 10f, COBALT, PREFIX_ORE); public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 15f, DURANITE, 0.4f, PREFIX_ORE); public static Block uruOre = new BasicBlock("uru_ore", Material.ROCK, 25.0f, 15f, VALYRIUM, PREFIX_ORE); public static Block osramOre = new BasicBlock("osram_ore", Material.ROCK, 45.0f, 35.0f, COBALT, PREFIX_ORE); @@ -45,12 +47,15 @@ public class Blocks { public static Block valyriumBlock = new BasicBlock("valyrium_block", Material.ROCK, 70.0f, 70f, VALYRIUM, PREFIX_BLOCK); public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 80.0f, 80f, VIBRANIUM, PREFIX_BLOCK); public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); + public static Block oviumBlock = new BasicBlock("ovium_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); + public static Block jauxumBlock = new BasicBlock("jauxum_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 20f, DURANITE, 0.5f, PREFIX_BLOCK); public static Block uruBlock = new BasicBlock("uru_block", Material.ROCK, 25.0f, 20f, VALYRIUM, PREFIX_BLOCK); public static Block osramBlock = new BasicBlock("osram_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); public static Block abyssumBlock = new BasicBlock("abyssum_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); public static Block eezoBlock = new BasicBlock("eezo_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); + public static Block terraxBlock = new BasicBlock("terrax_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); public static Block triberiumBlock = new BasicBlock("triberium_block", Material.ROCK, 30.0f, 15f, OBSIDIAN, 1f, PREFIX_BLOCK); public static Block fractumBlock = new BasicBlock("fractum_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK); public static Block violiumBlock = new BasicBlock("violium_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK); diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java index 8ecd85e..90219ad 100644 --- a/src/main/java/com/sosnitzka/taiga/Fluids.java +++ b/src/main/java/com/sosnitzka/taiga/Fluids.java @@ -21,6 +21,9 @@ public class Fluids { public static BasicTinkerFluid valyriumFluid = new BasicTinkerFluid("valyrium_fluid", 0xFFe85c31, 1915, 10, 10000); public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFbad2d9, 3050, 10, 10000); public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine_fluid", 0xFFeb484a, 750, 10, 9000); + public static BasicTinkerFluid jauxumFluid = new BasicTinkerFluid("jauxum_fluid", 0xFF68c663, 750, 10, 9000); + public static BasicTinkerFluid oviumFluid = new BasicTinkerFluid("ovium_fluid", 0xFF7d77c3, 750, 10, 9000); + public static BasicTinkerFluid terraxFluid = new BasicTinkerFluid("terrax_fluid", 0xFFa5978e, 850, 10, 9000); public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium_fluid", 0xFFee8736, 690, 10, 10000); public static BasicTinkerFluid uruFluid = new BasicTinkerFluid("uru_fluid", 0xFFbfb9f0, 1200, 10, 10000); public static BasicTinkerFluid osramFluid = new BasicTinkerFluid("osram_fluid", 0xFFffbc90, 800, 10, 4000); diff --git a/src/main/java/com/sosnitzka/taiga/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java index 0df15a2..be68acc 100644 --- a/src/main/java/com/sosnitzka/taiga/Items.java +++ b/src/main/java/com/sosnitzka/taiga/Items.java @@ -45,6 +45,18 @@ public class Items { public static Item karmesineDust = new BasicItem("karmesine_dust", PREFIX_DUST); public static Item karmesineNugget = new BasicItem("karmesine_nugget", PREFIX_NUGGET); + public static Item oviumIngot = new BasicItem("ovium_ingot", PREFIX_INGOT); + public static Item oviumDust = new BasicItem("ovium_dust", PREFIX_DUST); + public static Item oviumNugget = new BasicItem("ovium_nugget", PREFIX_NUGGET); + + public static Item jauxumIngot = new BasicItem("jauxum_ingot", PREFIX_INGOT); + public static Item jauxumDust = new BasicItem("jauxum_dust", PREFIX_DUST); + public static Item jauxumNugget = new BasicItem("jauxum_nugget", PREFIX_NUGGET); + + public static Item terraxIngot = new BasicItem("terrax_ingot", PREFIX_INGOT); + public static Item terraxDust = new BasicItem("terrax_dust", PREFIX_DUST); + public static Item terraxNugget = new BasicItem("terrax_nugget", PREFIX_NUGGET); + public static Item palladiumIngot = new BasicItem("palladium_ingot", PREFIX_INGOT); public static Item palladiumDust = new BasicItem("palladium_dust", PREFIX_DUST); public static Item palladiumNugget = new BasicItem("palladium_nugget", PREFIX_NUGGET); diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index 6e4ece4..b8674ac 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -67,7 +67,7 @@ public class MaterialTraits { public static Material duranite = new Material("duranite", TextFormatting.YELLOW).addTrait(analysing); public static Material valyrium = new Material("valyrium", TextFormatting.DARK_GRAY).addTrait(congenial); public static Material vibranium = new Material("vibranium", TextFormatting.GRAY).addTrait(resonance, MaterialTypes.HANDLE).addTrait(heroic, MaterialTypes.HEAD); - public static Material karmesine = new Material("karmesine", TextFormatting.RED).addTrait(slaughtering); + public static Material terrax = new Material("terrax", TextFormatting.DARK_GRAY).addTrait(slaughtering); public static Material palladium = new Material("palladium", TextFormatting.GOLD).addTrait(dark).addTrait(cursed); public static Material uru = new Material("uru", TextFormatting.DARK_RED).addTrait(diffuse); public static Material basalt = new Material("basalt", TextFormatting.WHITE).addTrait(softy); @@ -98,5 +98,8 @@ public class MaterialTraits { public static Material osram = new Material("osram", TextFormatting.GOLD); public static Material abyssum = new Material("abyssum", TextFormatting.GOLD); public static Material iox = new Material("iox", TextFormatting.RED); + public static Material ovium = new Material("ovium", TextFormatting.BLUE); + public static Material jauxum = new Material("jauxum", TextFormatting.YELLOW); + public static Material karmesine = new Material("karmesine", TextFormatting.RED); } diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index 3a29255..10d2224 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -90,7 +90,7 @@ public class TAIGA { integrateMaterial("Duranite", duranite, duraniteFluid, 1550, 3.2f, 3.2f, 1.16f, 100, 100, DURANITE, 0.3f, 1.4f, 2); integrateMaterial("Valyrium", valyrium, valyriumFluid, 1111, 5.37f, 4.8f, 1.30f, 100, 100, VALYRIUM, 1.1f, 1.2f, 4); integrateMaterial("Vibranium", vibranium, vibraniumFluid, 1235, 7.62f, 8.1f, 1.3f, 100, 100, VIBRANIUM, 1.1f, 1.8f, 4); - integrateMaterial("Karmesine", karmesine, karmesineFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true); + integrateMaterial("Karmesine", karmesine, terraxFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true); integrateMaterial("Palladium", palladium, palladiumFluid, 797, 4.35f, 6.8f, 1.3f, 130, -50, DURANITE, .5f, .2f, 3); integrateMaterial("Uru", uru, uruFluid, 877, 2f, 8.2f, 1.5f, -50, 175, VALYRIUM, 1.3f, 0.8f, 6); integrateMaterial("Eezo", eezo, eezoFluid, 50, 14f, 3.5f, .1f, 10, 10, COBALT, shitty, true, false); diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java index c8575ca..8216e00 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java @@ -20,6 +20,23 @@ public class TAIGAConfiguration { public static boolean ironGen; public static boolean endGen; + public static boolean tiberiumGen; + public static boolean prometheumGen; + public static boolean valyriumGen; + public static boolean osramGen; + public static boolean duraniteGen; + public static boolean basaltGen; + public static boolean eezoGen; + public static boolean karmesineGen; + public static boolean oviumGen; + public static boolean jauxumGen; + public static boolean vibraniumGen; + public static boolean uruGen; + public static boolean auroriumGen; + public static boolean palladiumGen; + public static boolean abyssumGen; + + public static int IRON_VAL; public static int TIBERIUM_VAL; public static int PROMETHEUM_VAL; @@ -29,6 +46,8 @@ public class TAIGAConfiguration { public static int BASALT_VAL; public static int EEZO_VAL; public static int KARMESINE_VAL; + public static int OVIUM_VAL; + public static int JAUXUM_VAL; public static int VIBRANIUM_VAL; public static int URU_VAL; public static int AURORIUM_VAL; @@ -80,7 +99,9 @@ public class TAIGAConfiguration { final int DURANITE_DEFAULT = 1; final int BASALT_DEFAULT = 10; final int EEZO_DEFAULT = 3; - final int KARMESINE_DEFAULT = 15; + final int KARMESINE_DEFAULT = 8; + final int JAUXUM_DEFAULT = 8; + final int OVIUM_DEFAULT = 8; final int VIBRANIUM_DEFAULT = 10; final int URU_DEFAULT = 1; final int AURORIUM_DEFAULT = 10; @@ -139,6 +160,10 @@ public class TAIGAConfiguration { vibraniumValueProp.setLanguageKey("gui.taiga_configuration.vibranium_multiplier"); Property karmesineValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Karmesine", KARMESINE_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); karmesineValueProp.setLanguageKey("gui.taiga_configuration.karmesine_multiplier"); + Property oviumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Ovium", OVIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + oviumValueProp.setLanguageKey("gui.taiga_configuration.ovium_multiplier"); + Property jauxumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Jauxum", JAUXUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + jauxumValueProp.setLanguageKey("gui.taiga_configuration.jauxum_multiplier"); Property palladiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Palladium", PALLADIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); palladiumValueProp.setLanguageKey("gui.taiga_configuration.palladium_multiplier"); Property uruValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Uru", URU_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); @@ -161,6 +186,8 @@ public class TAIGAConfiguration { propOrderOreGen.add(valyriumValueProp.getName()); propOrderOreGen.add(vibraniumValueProp.getName()); propOrderOreGen.add(karmesineValueProp.getName()); + propOrderOreGen.add(oviumValueProp.getName()); + propOrderOreGen.add(jauxumValueProp.getName()); propOrderOreGen.add(palladiumValueProp.getName()); propOrderOreGen.add(uruValueProp.getName()); propOrderOreGen.add(osramValueProp.getName()); @@ -208,6 +235,14 @@ public class TAIGAConfiguration { if (KARMESINE_VAL > RESFAC_MAX_VALUE || KARMESINE_VAL < RESFAC_MIN_VALUE) { KARMESINE_VAL = KARMESINE_DEFAULT; } + OVIUM_VAL = oviumValueProp.getInt(OVIUM_DEFAULT); + if (OVIUM_VAL > RESFAC_MAX_VALUE || OVIUM_VAL < RESFAC_MIN_VALUE) { + OVIUM_VAL = KARMESINE_DEFAULT; + } + JAUXUM_VAL = jauxumValueProp.getInt(OVIUM_DEFAULT); + if (JAUXUM_VAL > RESFAC_MAX_VALUE || JAUXUM_VAL < RESFAC_MIN_VALUE) { + JAUXUM_VAL = JAUXUM_DEFAULT; + } VIBRANIUM_VAL = vibraniumValueProp.getInt(VIBRANIUM_DEFAULT); if (VIBRANIUM_VAL > RESFAC_MAX_VALUE || VIBRANIUM_VAL < RESFAC_MIN_VALUE) { VIBRANIUM_VAL = VIBRANIUM_DEFAULT; @@ -240,6 +275,8 @@ public class TAIGAConfiguration { basaltValueProp.set(BASALT_VAL); eezoValueProp.set(EEZO_VAL); karmesineValueProp.set(KARMESINE_VAL); + oviumValueProp.set(OVIUM_VAL); + jauxumValueProp.set(JAUXUM_VAL); vibraniumValueProp.set(VIBRANIUM_VAL); uruValueProp.set(URU_VAL); auroriumValueProp.set(AURORIUM_VAL); diff --git a/src/main/java/com/sosnitzka/taiga/util/Generator.java b/src/main/java/com/sosnitzka/taiga/util/Generator.java index 2bf7cc5..dc1cbd2 100644 --- a/src/main/java/com/sosnitzka/taiga/util/Generator.java +++ b/src/main/java/com/sosnitzka/taiga/util/Generator.java @@ -20,43 +20,43 @@ import java.util.List; import java.util.Random; import java.util.Set; +import static com.google.common.collect.Lists.newArrayList; import static com.sosnitzka.taiga.util.Utils.nextInt; public class Generator { - public static void generateOre(IBlockState state, IBlockState replace, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) { - generateOre(state, replace, null, null, random, chunkX, chunkZ, world, chance, minY, maxY, minSize, maxSize, null); + public static void generateOre(IBlockState newState, IBlockState oldState, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY, int minSize, int maxSize) { + generateOre(newState, oldState, null, null, random, chunkX, chunkZ, world, count, 100, minY, maxY, minSize, maxSize, null); } - public static void generateOre(IBlockState oldState, IBlockState newState, IProperty property, Comparable comparable, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) { - generateOre(oldState, newState, property, comparable, random, chunkX, chunkZ, world, chance, minY, maxY, minSize, maxSize, null); + public static void generateOre(IBlockState newState, IBlockState oldState, Random random, int chunkX, int chunkZ, World world, int count, int chance, int minY, int maxY, int minSize, int maxSize, List biome) { + generateOre(newState, oldState, null, null, random, chunkX, chunkZ, world, count, chance, minY, maxY, minSize, maxSize, biome); } - public static void generateOre(IBlockState oldState, IBlockState newState, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize, List biome) { - generateOre(oldState, newState, null, null, random, chunkX, chunkZ, world, chance, minY, maxY, minSize, maxSize, null); - } - - public static void generateOre(IBlockState oldState, IBlockState newState, IProperty property, Comparable comparable, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize, List biome) { + public static void generateOre(IBlockState newState, IBlockState oldState, IProperty property, Comparable comparable, Random random, int chunkX, int chunkZ, World world, int count, int chance, int minY, int maxY, int minSize, int maxSize, List biome) { int size = minSize + random.nextInt(maxSize - minSize); int height = maxY - minY; - for (int i = 0; i < chance; i++) { - int posX = chunkX + random.nextInt(16); - int posY = random.nextInt(height) + minY; - int posZ = chunkZ + random.nextInt(16); - BlockPos cPos = new BlockPos(posX, posY, posZ); - if (biome == null || biome.contains(world.getBiome(cPos))) { - new WorldGenMinable(oldState, size, StateMatcher.forState(newState, property, comparable)).generate(world, random, new BlockPos(posX, posY, posZ)); + for (int i = 0; i < count; i++) { + if (0.01f * chance >= random.nextFloat()) { + int posX = chunkX + random.nextInt(16); + int posY = random.nextInt(height) + minY; + int posZ = chunkZ + random.nextInt(16); + BlockPos cPos = new BlockPos(posX, posY, posZ); + if (biome == null || biome.contains(world.getBiome(cPos))) { + new WorldGenMinable(newState, size, StateMatcher.forState(oldState, property, comparable)).generate(world, random, new BlockPos(posX, posY, posZ)); + } } + } } - public static void generateOreDescending(List replaceBlockList, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY, int chance) { + public static void generateOre(List replaceBlockList, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY, int chance) { if (random.nextFloat() < (float) (0.01 * chance)) - generateOreDescendingTopLayer(replaceBlockList, replacementBlock, random, chunkX, chunkZ, world, count, minY, maxY); + generateOreDescending(replaceBlockList, replacementBlock, random, chunkX, chunkZ, world, count, minY, maxY); } - public static void generateOreDescendingTopLayer(List replaceBlockList, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY) { + public static void generateOreDescending(List replaceBlockList, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY) { for (int i = 0; i < count; i++) { int posX = chunkX + random.nextInt(16); int posZ = chunkZ + random.nextInt(16); @@ -74,29 +74,45 @@ public class Generator { } } - public static void generateOreDescending(IBlockState oldState, IBlockState newState, IProperty property, List comparable, Random random, int chunkX, int chunkZ, World world, int count) { - for (int i = 0; i < count; i++) { + public static void generateOreStoneVariant(IBlockState newState, BlockStone.EnumType type, Random random, int chunkX, int chunkZ, World world, int count) { + List list = newArrayList(type); + for (int i = 0; i < count; i += 2) { int posX = chunkX + random.nextInt(16); int posZ = chunkZ + random.nextInt(16); - BlockPos cPos = new BlockPos(posX, random.nextInt(64) + 16, posZ); + BlockPos cPos = new BlockPos(posX, random.nextInt(64) + 32, posZ); IBlockState state = world.getBlockState(cPos); - if (state.getBlock().equals(oldState.getBlock())) { - if (comparable.contains(state.getValue(property))) { - System.out.println("Yes, a variant"); + if (state.getBlock().equals(Blocks.STONE.getDefaultState().getBlock())) { + if (list.contains(state.getValue(BlockStone.VARIANT))) { world.setBlockState(cPos, newState); } } else { - while (cPos.getY() > 4) { + while (cPos.getY() >= 0) { cPos = cPos.down(); - if (state.getBlock().equals(oldState.getBlock())) { - if (comparable.contains(state.getValue(property))) { - System.out.println("Yes!! a variant"); + state = world.getBlockState(cPos); + if (state.getBlock().equals(Blocks.STONE.getDefaultState().getBlock())) { + if (list.contains(state.getValue(BlockStone.VARIANT))) { world.setBlockState(cPos, newState); - continue; + break; + } + } + } + } + cPos = new BlockPos(posX, random.nextInt(32), posZ); + state = world.getBlockState(cPos); + if (state.getBlock().equals(Blocks.STONE.getDefaultState().getBlock())) { + if (list.contains(state.getValue(BlockStone.VARIANT))) { + world.setBlockState(cPos, newState); + } + } else { + while (cPos.getY() <= 96) { + cPos = cPos.up(); + state = world.getBlockState(cPos); + if (state.getBlock().equals(Blocks.STONE.getDefaultState().getBlock())) { + if (list.contains(state.getValue(BlockStone.VARIANT))) { + world.setBlockState(cPos, newState); + break; } } - if (random.nextBoolean()) - i--; } } } diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java index 790c951..bd5c614 100644 --- a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java +++ b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java @@ -9,6 +9,7 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.fml.common.IWorldGenerator; +import slimeknights.tconstruct.gadgets.block.BlockStoneTorch; import java.util.Random; @@ -19,35 +20,31 @@ import static com.sosnitzka.taiga.TAIGAConfiguration.*; @SuppressWarnings("unchecked") public class WorldGen implements IWorldGenerator { private void nether(Random random, int x, int z, World world) { - System.out.println("TIBERIUM_VAL: " + TIBERIUM_VAL); - System.out.println("PROMETHEUM_VAL: " + PROMETHEUM_VAL); - System.out.println("VALYRIUM_VAL: " + VALYRIUM_VAL); - System.out.println("OSRAM_VAL: " + OSRAM_VAL); Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), tiberiumOre.getDefaultState(), random, x, z, world, TIBERIUM_VAL, 0, 128, 10, 35); Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), prometheumOre.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 128, 2, 4); Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), valyriumOre.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 32, 2, 4); - Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, OSRAM_VAL, 0, 64, 15); + Generator.generateOre(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, OSRAM_VAL, 0, 64, 15); } private void world(Random random, int x, int z, World world) { Generator.generateMeteor(duraniteOre.getDefaultState(), blockMeteorite.getDefaultState(), random, x, z, world, DURANITE_VAL, 6, 16, 112); - Generator.generateOreDescendingTopLayer(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), basaltBlock.getDefaultState(), random, x, z, world, BASALT_VAL, 0, 64); - Generator.generateOreDescendingTopLayer(newArrayList(Blocks.BEDROCK.getDefaultState()), eezoOre.getDefaultState(), random, x, z, world, EEZO_VAL, 0, 10); - - Generator.generateOreDescending(Blocks.STONE.getDefaultState(), karmesineOre.getDefaultState(), BlockStone.VARIANT, newArrayList(BlockStone.EnumType.DIORITE, BlockStone.EnumType.GRANITE, BlockStone.EnumType.ANDESITE), random, x, z, world, KARMESINE_VAL); - - Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, VIBRANIUM_VAL, 0, 64, 2, 12, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT)); - Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 1, 0, 128, 1, 3, null); + Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), basaltBlock.getDefaultState(), random, x, z, world, BASALT_VAL, 0, 64); + Generator.generateOreDescending(newArrayList(Blocks.BEDROCK.getDefaultState()), eezoOre.getDefaultState(), random, x, z, world, EEZO_VAL, 0, 10); + Generator.generateOreStoneVariant(karmesineOre.getDefaultState(), BlockStone.EnumType.ANDESITE, random, x, z, world, KARMESINE_VAL); + Generator.generateOreStoneVariant(oviumOre.getDefaultState(), BlockStone.EnumType.DIORITE, random, x, z, world, OVIUM_VAL); + 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, 9, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT)); + Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 1, 25, 0, 128, 1, 5, null); if (ironGen) { - Generator.generateOre(Blocks.STONE.getDefaultState(), Blocks.IRON_ORE.getDefaultState(), random, x, z, world, IRON_VAL + 2000, 0, 32, 2, 8); + Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, IRON_VAL, 0, 32, 2, 8); } } private void end(Random random, int x, int z, World world) { Generator.generateCube(true, uruOre.getDefaultState(), blockObsidiorite.getDefaultState(), random, x, z, world, URU_VAL, 2, 0, 96, 3); if (endGen) - Generator.generateOre(Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), null, null, random, x, z, world, 1, 3, 64, 3, 8, null); + Generator.generateOre(Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), null, null, random, x, z, world, 1, 100, 3, 64, 3, 8, null); Generator.generateOre(Blocks.END_STONE.getDefaultState(), auroriumOre.getDefaultState(), random, x, z, world, AURORIUM_VAL, 32, 48, 2, 4); Generator.generateOre(Blocks.END_STONE.getDefaultState(), palladiumOre.getDefaultState(), random, x, z, world, PALLADIUM_VAL, 48, 64, 2, 4); Generator.generateOreBottom(Blocks.END_STONE.getDefaultState(), abyssumOre.getDefaultState(), random, x, z, world, ABYSSUM_VAL, 4, 64); diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json index 20fbe16..70510af 100644 --- a/src/main/resources/assets/taiga/blockstates/fluid_block.json +++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json @@ -88,6 +88,27 @@ } } ], + "jaxum_fluid": [ + { + "custom": { + "fluid": "jaxum_fluid" + } + } + ], + "ovium_fluid": [ + { + "custom": { + "fluid": "ovium_fluid" + } + } + ], + "terrax_fluid": [ + { + "custom": { + "fluid": "terrax_fluid" + } + } + ], "palladium_fluid": [ { "custom": { diff --git a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json b/src/main/resources/assets/taiga/blockstates/jauxum_block.json similarity index 82% rename from src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json rename to src/main/resources/assets/taiga/blockstates/jauxum_block.json index 07ba243..6df85dc 100644 --- a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json +++ b/src/main/resources/assets/taiga/blockstates/jauxum_block.json @@ -3,7 +3,7 @@ "defaults": { "model": "minecraft:cube_all", "textures": { - "all": "taiga:blocks/ore/karmesinediorite" + "all": "taiga:blocks/block/jauxum" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json b/src/main/resources/assets/taiga/blockstates/jauxum_ore.json similarity index 82% rename from src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json rename to src/main/resources/assets/taiga/blockstates/jauxum_ore.json index 534c33e..846b091 100644 --- a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json +++ b/src/main/resources/assets/taiga/blockstates/jauxum_ore.json @@ -3,7 +3,7 @@ "defaults": { "model": "minecraft:cube_all", "textures": { - "all": "taiga:blocks/ore/karmesinegranite" + "all": "taiga:blocks/ore/jauxum" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json b/src/main/resources/assets/taiga/blockstates/ovium_block.json similarity index 81% rename from src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json rename to src/main/resources/assets/taiga/blockstates/ovium_block.json index bd66801..4052bcc 100644 --- a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json +++ b/src/main/resources/assets/taiga/blockstates/ovium_block.json @@ -3,7 +3,7 @@ "defaults": { "model": "minecraft:cube_all", "textures": { - "all": "taiga:blocks/ore/karmesineandensite" + "all": "taiga:blocks/block/ovium" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/taiga/blockstates/ovium_ore.json b/src/main/resources/assets/taiga/blockstates/ovium_ore.json new file mode 100644 index 0000000..1c36838 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/ovium_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/ovium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/terrax_block.json b/src/main/resources/assets/taiga/blockstates/terrax_block.json new file mode 100644 index 0000000..5bd661d --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/terrax_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/terrax" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png index 7e4d7c229123a9c452c5664e56ff823955a47e1b..811c9f0cc149651e53c7ee03f4be860834f68ad2 100644 GIT binary patch delta 979 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 diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png deleted file mode 100644 index 4f14e7ac879b5c1ea5a878e0f927f2a48e2553a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16328 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 T|0nc7JLf%J{an^LB{Ts5<=q^T