From 826ab1cf3a01dadae2a5d5a204fa557f7134eac6 Mon Sep 17 00:00:00 2001 From: Giovanni Harting Date: Mon, 5 Dec 2016 20:34:02 +0100 Subject: [1.2] Material rework (#60) * Developement tests for nbt data in traits * Lot of trait changes and better balancing * Traits reworked a bit, new traits added. * First correction of NBT Data in Trait (Soulbound). Is shown twice. Still needs corrections. * Few fixes in traits and new trait "catcher" * Small fix, needs workaround * fixed some catch issues * Fixed Catcher and Reviving Traits, new Trait: Souleater. Updated build.gradle for new TiC Version. * Splitted SoulEater to get the bad touch to an extra trait "Cursed". Added method for using nbt more easily. Changed declaration names of fluids * Some minor changes in Traits, Registry and Utils. * Iron_nugget is replaced with oreDict Item when not loaded via TAIGA. * Beginning of new material integration. Lot of names changed, lot more work to do here. Many null pointer exceptions and no changes of values up to now. * Some Small changes in names, registry and recipes * Some weird stuff I don't remember :D * fixed some things I missed while merging * Rollback to something * More Stuff * fixed some merging stuff * Fixed some misspelled names. Actually working with lots of restrictions. * Rearranged alloys, tried to add blocks / ingots for non-tinker-materials, but they won't work. * Again tried to fix the melting issue, but non-tinker materials still are not able to be casted as a block, ingot or nugget... * Fixed integration of materials without tools. * changed IMC to direct lib calls * removed more IMC, removed redundant code * some reformatting * Alloy integration reworked, needs to be balanced. * updated deps, renamed some func's, added duplicate material check * some more renaming * some reformatting, fixed wrong import, fixed string cmp's * Added images for blocks, ingots, nuggets and dust. Json changes do not work yet. * some reformatting * Removed old json files. Placeholder needed. * Fixed block json, items not working yet. * Fixed my own derp (missing json files) * Reduced materials to ensure unique traits for most of them. Still 30 though, but reduced by 20 more :'( RIP * Changed some generator stuff, not working properly right now! * rewrote offset generation, added some debug command, fixed some stuff * fixed on-surface-generation, made dependencies more flexible * reverted gen-weight back to its normal value * Meteor generator implemented. * fixed generating on ground * optimized a thing * Replaced Uru with Osram, replaced Meteorite with Uru, added Meteorite again for Hull-Material and late game alloy. * Some changes in generation of ores, not ready yet. * Added Cobble Meteorite. Added debug command. Implemented rest of ore generation. Some minor fixes left for generation including balancing. * Some changes for ore generation. Added 2 separate Generic Blocks for meteorite and their cobble variant. * some cleanup in Generator class, added meteor world save handler * Added Textures. Added blockstates and item models. Fixed fluid rendering. * renamed world save data file to be little more specific, removed a unused method * some preps for the upcoming release * First attempt of well balancing material stats. Renamed TiberiumX to Triberium. * Final changes... ready for beta testing * Added missing alloys. * Corrected balancing of ore generation. Still WIP * removed some last debug out * one last reformat --- .../com/sosnitzka/taiga/TAIGAConfiguration.java | 39 ++-------------------- 1 file changed, 2 insertions(+), 37 deletions(-) (limited to 'src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java') diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java index 4c1c630..b6e5990 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java @@ -17,14 +17,11 @@ public class TAIGAConfiguration { public static final String CATEGORY_NAME_ORE_GEN = "category_ore_gen"; public static final String CATEGORY_NAME_ORE_VAL = "category_ore_val"; - public static double oreFactorGeneral; public static double speedFactorGeneral; public static double attackFactorGeneral; public static double durabilityFactorGeneral; public static double ironFactor; - public static double slagironFactor; - public static double slaggoldFactor; public static double titaniteFactor; public static double adamantiteFactor; public static double arcaniteFactor; @@ -45,9 +42,6 @@ public class TAIGAConfiguration { public static double rottengroundFactor; public static double ligniteFactor; - - public static boolean slagIronGen; - public static boolean slagGoldGen; public static boolean ironGen; private static Configuration config = null; @@ -83,7 +77,7 @@ public class TAIGAConfiguration { config.load(); } - /** + /* * Declaration of general ore generation values:
* Activation of additional ores (iron/gold)
* Ore generation chance multiplier @@ -104,9 +98,6 @@ public class TAIGAConfiguration { ironSwitch.setComment("Switch ore on/off"); ironSwitch.setLanguageKey("gui.taiga_configuration.gen_iron"); - Property oreFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Ore factor", RESFAC_DEFAULT_VALUE, - "General multiplier for all TAIGA ores at once", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - oreFactorGeneralProp.setLanguageKey("gui.taiga_configuration.ore_multiplier"); Property durabilityFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Durability factor", RESFAC_DEFAULT_VALUE, "General multiplier for all TAIGA materials", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); durabilityFactorGeneralProp.setLanguageKey("gui.taiga_configuration.durability_multiplier"); @@ -124,25 +115,18 @@ public class TAIGAConfiguration { propOrderGeneral.add(ironSwitch.getName()); propOrderGeneral.add(slagIronSwitch.getName()); propOrderGeneral.add(slagGoldSwitch.getName()); - propOrderGeneral.add(oreFactorGeneralProp.getName()); propOrderGeneral.add(durabilityFactorGeneralProp.getName()); propOrderGeneral.add(speedFactorGeneralProp.getName()); propOrderGeneral.add(attackFactorGeneralProp.getName()); config.setCategoryPropertyOrder(CATEGORY_NAME_GENERAL, propOrderGeneral); - /** + /* * Declaration of specific ore generation values:
* Generation chance multiplier */ Property ironFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Iron factor", RESFAC_DEFAULT_VALUE, "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); ironFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); - Property slagironFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Slagiorn factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - slagironFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); - Property slaggoldFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Slaggold factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - slaggoldFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); Property titaniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Titanite factor", RESFAC_DEFAULT_VALUE, "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); titaniteFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); @@ -204,8 +188,6 @@ public class TAIGAConfiguration { List propOrderOreGen = new ArrayList(); propOrderOreGen.add(ironFactorProp.getName()); - propOrderOreGen.add(slagironFactorProp.getName()); - propOrderOreGen.add(slaggoldFactorProp.getName()); propOrderOreGen.add(ligniteFactorProp.getName()); propOrderOreGen.add(basaltFactorProp.getName()); propOrderOreGen.add(rottengroundFactorProp.getName()); @@ -233,10 +215,6 @@ public class TAIGAConfiguration { if (readFieldsFromConfig) { - oreFactorGeneral = oreFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE); - if (oreFactorGeneral > RESFAC_MAX_VALUE || oreFactorGeneral < RESFAC_MIN_VALUE) { - oreFactorGeneral = RESFAC_DEFAULT_VALUE; - } durabilityFactorGeneral = durabilityFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE); if (durabilityFactorGeneral > RESFAC_MAX_VALUE || durabilityFactorGeneral < RESFAC_MIN_VALUE) { durabilityFactorGeneral = RESFAC_DEFAULT_VALUE; @@ -250,20 +228,10 @@ public class TAIGAConfiguration { attackFactorGeneral = RESFAC_DEFAULT_VALUE; } ironGen = ironSwitch.getBoolean(GENERATION_DEFAULT_VALUE); - slagIronGen = slagIronSwitch.getBoolean(GENERATION_DEFAULT_VALUE); - slagGoldGen = slagGoldSwitch.getBoolean(GENERATION_DEFAULT_VALUE); ironFactor = ironFactorProp.getDouble(RESFAC_DEFAULT_VALUE); if (ironFactor > RESFAC_MAX_VALUE || ironFactor < RESFAC_MIN_VALUE) { ironFactor = RESFAC_DEFAULT_VALUE; } - slagironFactor = slagironFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (slagironFactor > RESFAC_MAX_VALUE || slagironFactor < RESFAC_MIN_VALUE) { - slagironFactor = RESFAC_DEFAULT_VALUE; - } - slaggoldFactor = slaggoldFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (slaggoldFactor > RESFAC_MAX_VALUE || slaggoldFactor < RESFAC_MIN_VALUE) { - slaggoldFactor = RESFAC_DEFAULT_VALUE; - } titaniteFactor = titaniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE); if (titaniteFactor > RESFAC_MAX_VALUE || titaniteFactor < RESFAC_MIN_VALUE) { titaniteFactor = RESFAC_DEFAULT_VALUE; @@ -343,9 +311,6 @@ public class TAIGAConfiguration { } ironSwitch.set(ironGen); - slagIronSwitch.set(slagIronGen); - slagGoldSwitch.set(slagGoldGen); - oreFactorGeneralProp.set(oreFactorGeneral); durabilityFactorGeneralProp.set(durabilityFactorGeneral); speedFactorGeneralProp.set(speedFactorGeneral); attackFactorGeneralProp.set(attackFactorGeneral); -- cgit v1.2.3