diff options
Diffstat (limited to 'src/Java')
4 files changed, 44 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 30db0d41c8..4abc95dadb 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -33,7 +33,7 @@ public class CORE { //Math Related public static final float PI = (float) Math.PI; - public static volatile Random RANDOM = CSPRNG_DO_NOT_USE.generate(new XSTR()); + public static volatile Random RANDOM = new XSTR(); //Env. Variables public static Configuration Config; diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java index f3f72f86bb..313d1059ca 100644 --- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java +++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java @@ -22,7 +22,7 @@ public class MathUtils { * @see java.util.Random#nextInt(int) */ - final static Random rand = CSPRNG_DO_NOT_USE.generate(CORE.RANDOM); + final static Random rand = CORE.RANDOM; public static int randInt(final int min, final int max) { // nextInt is normally exclusive of the top value, diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java index 51685b8ad3..65184b6f35 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java @@ -95,7 +95,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { break; } else { - //generateDarkWorld(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider); + generateDarkWorld(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider); break; } } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java index 5fbb07a570..03606b28e8 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java @@ -5,6 +5,8 @@ import static gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_GT_Base.debugWorld import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; import java.util.Random; import gregtech.api.enums.Materials; @@ -311,20 +313,39 @@ extends WorldGen_GT { // Something (at least the bottom layer must have 1 block) must have been placed, return true return ORE_PLACED; } - + + private String fString = "unset", ore1String = "unset", ore2String = "unset", ore3String = "unset", ore4String = "unset"; + Map<Materials, String> gtOreMap = new HashMap<Materials, String>(); + @SuppressWarnings("deprecation") public boolean setOreBlock(World aWorld, int aX, int aY, int aZ, Block aMetaData, boolean isSmallOre, boolean air) { if (!air) { aY = Math.min(aWorld.getActualHeight(), Math.max(aY, 1)); - } - + } + //Set GT ORE - if (aMetaData instanceof GT_Block_Ores){ + if (aMetaData instanceof GT_Block_Ores){ + if (ore1String.equals("unset")) { + ore1String = Utils.sanitizeString(this.mPrimary.getLocalizedName().toLowerCase()); + } + if (ore2String.equals("unset")) { + ore2String = Utils.sanitizeString(this.mSecondaryMeta.getLocalizedName().toLowerCase()); + } + if (ore3String.equals("unset")) { + ore3String = Utils.sanitizeString(this.mBetweenMeta.getLocalizedName().toLowerCase()); + } + if (ore4String.equals("unset")) { + ore4String = Utils.sanitizeString(this.mSporadicMeta.getLocalizedName().toLowerCase()); + } if (this.mPrimaryMeta == aMetaData){ for (Materials f : Materials.values()){ - if (Utils.sanitizeString(f.name().toLowerCase()).contains(Utils.sanitizeString(this.mPrimary.getLocalizedName().toLowerCase()))){ + if (!gtOreMap.containsKey(f)) { + gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase())); + } + fString = gtOreMap.get(f); + if (fString.contains(ore1String)){ int r = f.mMetaItemSubID; if (setOreBlock(aWorld, aX, aY, aZ, r, false)){ Logger.WORLD("[World Generation Debug] Set "+f.mDefaultLocalName+" Ore at X: "+aX+" | Y: "+aY+" | Z: "+aZ); @@ -335,7 +356,11 @@ extends WorldGen_GT { } if (this.mSecondaryMeta == aMetaData){ for (Materials f : Materials.values()){ - if (Utils.sanitizeString(f.name().toLowerCase()).contains(Utils.sanitizeString(this.mSecondary.getLocalizedName().toLowerCase()))){ + if (!gtOreMap.containsKey(f)) { + gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase())); + } + fString = gtOreMap.get(f); + if (fString.contains(ore2String)){ int r = f.mMetaItemSubID; if (setOreBlock(aWorld, aX, aY, aZ, r, false)){ Logger.WORLD("[World Generation Debug] Set "+f.mDefaultLocalName+" Ore at X: "+aX+" | Y: "+aY+" | Z: "+aZ); @@ -346,7 +371,11 @@ extends WorldGen_GT { } if (this.mBetweenMeta == aMetaData){ for (Materials f : Materials.values()){ - if (Utils.sanitizeString(f.name().toLowerCase()).contains(Utils.sanitizeString(this.mBetween.getLocalizedName().toLowerCase()))){ + if (!gtOreMap.containsKey(f)) { + gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase())); + } + fString = gtOreMap.get(f); + if (fString.contains(ore3String)){ int r = f.mMetaItemSubID; if (setOreBlock(aWorld, aX, aY, aZ, r, false)){ Logger.WORLD("[World Generation Debug] Set "+f.mDefaultLocalName+" Ore at X: "+aX+" | Y: "+aY+" | Z: "+aZ); @@ -357,7 +386,11 @@ extends WorldGen_GT { } if (this.mSporadicMeta == aMetaData){ for (Materials f : Materials.values()){ - if (Utils.sanitizeString(f.name().toLowerCase()).contains(Utils.sanitizeString(this.mSporadic.getLocalizedName().toLowerCase()))){ + if (!gtOreMap.containsKey(f)) { + gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase())); + } + fString = gtOreMap.get(f); + if (fString.contains(ore4String)){ int r = f.mMetaItemSubID; if (setOreBlock(aWorld, aX, aY, aZ, r, false)){ Logger.WORLD("[World Generation Debug] Set "+f.mDefaultLocalName+" Ore at X: "+aX+" | Y: "+aY+" | Z: "+aZ); @@ -377,7 +410,6 @@ extends WorldGen_GT { tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sand) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt) || - tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockTopLayer) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockSecondLayer) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockMainFiller) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockSecondaryFiller) || |