From 25c4b00360fd6448f2c8283051434271f05b1735 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 7 Jul 2018 06:33:58 +1000 Subject: $ More work on Australia and Villages. --- .../australia/gen/gt/WorldGen_Australia_Ores.java | 3 +- .../gen/gt/WorldGen_GT_Australia_Base.java | 44 +++++++++++----------- .../gen/gt/WorldGen_GT_Australia_Ore_Layer.java | 20 +++++----- 3 files changed, 34 insertions(+), 33 deletions(-) (limited to 'src/Java/gtPlusPlus/australia/gen/gt') diff --git a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java b/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java index aaa7dcb3f5..71ef94e58b 100644 --- a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java +++ b/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java @@ -303,7 +303,8 @@ public class WorldGen_Australia_Ores { static long ID = 0; public static void generateValidOreVeins(){ - validOreveins.put(ID++, BaseVein);/* + //validOreveins.put(ID++, BaseVein); + /* validOreveins.put(ID++, Vein1); validOreveins.put(ID++, Vein2); validOreveins.put(ID++, Vein3); diff --git a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java b/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java index 41c1816481..c451090303 100644 --- a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java +++ b/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java @@ -104,17 +104,17 @@ public class WorldGen_GT_Australia_Base implements IWorldGenerator { private synchronized void generateEverglades(Random aRandom, int aX, int aZ, World aWorld, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { - Logger.WORLD("Trying to Generate Dimension."); + Logger.WARNING("Trying to Generate Dimension."); synchronized (listLock) { - Logger.WORLD("Locked List addition."); + Logger.WARNING("Locked List addition."); if (WorldGen_GT_Australia_Base.mList.add(new WorldGenContainer(new XSTR(Math.abs(aRandom.nextInt()) + 1), aX, aZ, Dimension_Australia.DIMID, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName))){ - Logger.WORLD("Locked List addition. Success."); + Logger.WARNING("Locked List addition. Success."); } else { - Logger.WORLD("Locked List addition. Fail."); + Logger.WARNING("Locked List addition. Fail."); } if (debugWorldGen) GT_Log.out.println("ADD WorldSeed:" + aWorld.getSeed() + " DimId" + aWorld.provider.dimensionId @@ -122,9 +122,9 @@ public class WorldGen_GT_Australia_Base implements IWorldGenerator { } if (!this.mIsGenerating) { - Logger.WORLD("Is not generating."); + Logger.WARNING("Is not generating."); this.mIsGenerating = true; - Logger.WORLD("Setting Generation to true."); + Logger.WARNING("Setting Generation to true."); int mList_sS = WorldGen_GT_Australia_Base.mList.size(); mList_sS = Math.min(mList_sS, 3); // Run a maximum of 3 chunks at a // time through worldgen. Extra @@ -136,13 +136,13 @@ public class WorldGen_GT_Australia_Base implements IWorldGenerator { + " chunk x:" + toRun.mX + " z:" + toRun.mZ + " SIZE: " + WorldGen_GT_Australia_Base.mList.size() + " i: " + i); synchronized (listLock) { - Logger.WORLD("Locked List Removal."); + Logger.WARNING("Locked List Removal."); WorldGen_GT_Australia_Base.mList.remove(0); } toRun.run(); } this.mIsGenerating = false; - Logger.WORLD("Is Generating now set to false.."); + Logger.WARNING("Is Generating now set to false.."); } } @@ -245,14 +245,14 @@ public class WorldGen_GT_Australia_Base implements IWorldGenerator { + this.mWorld.getSeed()); } - Logger.INFO("[World Generation Debug] !validOreveins.containsKey(oreveinSeed) | oreveinSeed: "+oreveinSeed); + Logger.WARNING("[World Generation Debug] !validOreveins.containsKey(oreveinSeed) | oreveinSeed: "+oreveinSeed); // Search for a valid orevein for this dimension if (!validOreveins.containsKey(oreveinSeed)) { - Logger.INFO("[World Generation Debug] oreveinPercentageRoll < oreveinPercentage? "+((oreveinPercentageRoll < oreveinPercentage))); - Logger.INFO("[World Generation Debug] WorldGen_GT_Ore_Layer.sWeight > 0? "+(WorldGen_GT_Australia_Ore_Layer.sWeight > 0)); - Logger.INFO("[World Generation Debug] WorldGen_GT_Ore_Layer.sList.size() > 0? "+(WorldGen_GT_Australia_Ore_Layer.sList.size() > 0)); + Logger.WARNING("[World Generation Debug] oreveinPercentageRoll < oreveinPercentage? "+((oreveinPercentageRoll < oreveinPercentage))); + Logger.WARNING("[World Generation Debug] WorldGen_GT_Ore_Layer.sWeight > 0? "+(WorldGen_GT_Australia_Ore_Layer.sWeight > 0)); + Logger.WARNING("[World Generation Debug] WorldGen_GT_Ore_Layer.sList.size() > 0? "+(WorldGen_GT_Australia_Ore_Layer.sList.size() > 0)); if ((oreveinPercentageRoll < oreveinPercentage) && (WorldGen_GT_Australia_Ore_Layer.sWeight > 0) && (WorldGen_GT_Australia_Ore_Layer.sList.size() > 0)) { int placementAttempts = 0; @@ -260,14 +260,14 @@ public class WorldGen_GT_Australia_Base implements IWorldGenerator { int i; for (i = 0; (i < oreveinAttempts) && (!oreveinFound) && (placementAttempts < oreveinMaxPlacementAttempts); i++) { - Logger.INFO("[World Generation Debug] i: "+i); - Logger.INFO("[World Generation Debug] placementAttempts: "+placementAttempts); - Logger.INFO("[World Generation Debug] oreveinAttempts: "+oreveinAttempts); - Logger.INFO("[World Generation Debug] (placementAttempts < oreveinMaxPlacementAttempts): "+(placementAttempts < oreveinMaxPlacementAttempts)); - Logger.INFO("[World Generation Debug] oreveinFound: "+oreveinFound); + Logger.WARNING("[World Generation Debug] i: "+i); + Logger.WARNING("[World Generation Debug] placementAttempts: "+placementAttempts); + Logger.WARNING("[World Generation Debug] oreveinAttempts: "+oreveinAttempts); + Logger.WARNING("[World Generation Debug] (placementAttempts < oreveinMaxPlacementAttempts): "+(placementAttempts < oreveinMaxPlacementAttempts)); + Logger.WARNING("[World Generation Debug] oreveinFound: "+oreveinFound); int tRandomWeight = oreveinRNG.nextInt(WorldGen_GT_Australia_Ore_Layer.sWeight); for (WorldGen_GT_Australia_Ore_Layer tWorldGen : WorldGen_GT_Australia_Ore_Layer.sList) { - Logger.INFO("[World Generation Debug] Iterating sList - Size: "+WorldGen_GT_Australia_Ore_Layer.sList.size()); + Logger.WARNING("[World Generation Debug] Iterating sList - Size: "+WorldGen_GT_Australia_Ore_Layer.sList.size()); tRandomWeight -= (tWorldGen).mWeight; if (tRandomWeight <= 0) { try { @@ -292,18 +292,18 @@ public class WorldGen_GT_Australia_Base implements IWorldGenerator { + placementAttempts + " dimensionName=" + tDimensionName); validOreveins.put(oreveinSeed, tWorldGen); oreveinFound = true; - Logger.INFO("[World Generation Debug] ORE_PLACED"); + Logger.WARNING("[World Generation Debug] ORE_PLACED"); break; case WorldGen_GT_Australia_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER: placementAttempts++; - Logger.INFO("[World Generation Debug] NO_ORE_IN_BOTTOM_LAYER | Attempts: "+placementAttempts); + Logger.WARNING("[World Generation Debug] NO_ORE_IN_BOTTOM_LAYER | Attempts: "+placementAttempts); // SHould do retry in this case // until out of chances break; case WorldGen_GT_Australia_Ore_Layer.NO_OVERLAP: // Orevein didn't reach this chunk, // can't add it yet to the hash - Logger.INFO("[World Generation Debug] NO_OVERLAP"); + Logger.WARNING("[World Generation Debug] NO_OVERLAP"); if (debugWorldGen) GT_Log.out.println( " Added far oreveinSeed=" + oreveinSeed + " " + ( tWorldGen).mWorldGenName + @@ -323,7 +323,7 @@ public class WorldGen_GT_Australia_Base implements IWorldGenerator { " dimensionName=" + tDimensionName ); // SHould do retry in this case until out of chances - Logger.INFO("[World Generation Debug] NO_OVERLAP_AIR_BLOCK"); + Logger.WARNING("[World Generation Debug] NO_OVERLAP_AIR_BLOCK"); placementAttempts++; break; } diff --git a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java b/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java index 4011d2ce48..bbaa7ef008 100644 --- a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java +++ b/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java @@ -88,7 +88,7 @@ extends WorldGen_GT_Australia { public WorldGen_GT_Australia_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize, boolean aOverworld, boolean aNether, boolean aEnd, boolean GC_UNUSED1, boolean GC_UNUSED2, boolean GC_UNUSED3, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { super(aName, sList, aDefault); - Logger.WORLD("Creating Ore Layer Object"); + Logger.WARNING("Creating Ore Layer Object"); this.mOverworld = GTplusplus_Australia.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld); this.mNether = GTplusplus_Australia.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether); this.mEnd = GTplusplus_Australia.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd); @@ -145,7 +145,7 @@ extends WorldGen_GT_Australia { this.mSecondaryMeta = this.mSecondary.getOreBlock(1); this.mBetweenMeta = this.mBetween.getOreBlock(1); this.mSporadicMeta = this.mSporadic.getOreBlock(1); - Logger.WORLD("[Vein Generator] An Ore in a Vein had defaulted back to a default value, so they have now been reset to correct values."); + Logger.WARNING("[Vein Generator] An Ore in a Vein had defaulted back to a default value, so they have now been reset to correct values."); } if( mWorldGenName.equals("vein0") ) { @@ -153,7 +153,7 @@ extends WorldGen_GT_Australia { " NoOresInVein-vein0" ); // This is a special empty orevein - Logger.WORLD("[World Generation Debug] Special Empty Vein placed."); + Logger.WARNING("[World Generation Debug] Special Empty Vein placed."); return ORE_PLACED; } if (aDimensionType != Dimension_Australia.DIMID) { @@ -164,7 +164,7 @@ extends WorldGen_GT_Australia { ); } */ - Logger.WORLD("[World Generation Debug] Wrong dimension."); + Logger.WARNING("[World Generation Debug] Wrong dimension."); return WRONG_DIMENSION; } if (!this.mRestrictBiome.equals("None") && !(this.mRestrictBiome.equals(aBiome))) { @@ -254,7 +254,7 @@ extends WorldGen_GT_Australia { ); return NO_ORE_IN_BOTTOM_LAYER; // Exit early, didn't place anything in the bottom layer }*/ - Logger.WORLD("[World Generation Debug] Trying to set Ores?"); + Logger.WARNING("[World Generation Debug] Trying to set Ores?"); for (level = tMinY; level < (tMinY-1+3); level++) { for (int tX = wX; tX < eX; tX++) { int placeX = Math.max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX))/localDensity); @@ -390,7 +390,7 @@ extends WorldGen_GT_Australia { 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); + Logger.WARNING("[World Generation Debug] Set "+f.mDefaultLocalName+" Ore at X: "+aX+" | Y: "+aY+" | Z: "+aZ); return true; } } @@ -405,7 +405,7 @@ extends WorldGen_GT_Australia { 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); + Logger.WARNING("[World Generation Debug] Set "+f.mDefaultLocalName+" Ore at X: "+aX+" | Y: "+aY+" | Z: "+aZ); return true; } } @@ -420,7 +420,7 @@ extends WorldGen_GT_Australia { 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); + Logger.WARNING("[World Generation Debug] Set "+f.mDefaultLocalName+" Ore at X: "+aX+" | Y: "+aY+" | Z: "+aZ); return true; } } @@ -435,7 +435,7 @@ extends WorldGen_GT_Australia { 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); + Logger.WARNING("[World Generation Debug] Set "+f.mDefaultLocalName+" Ore at X: "+aX+" | Y: "+aY+" | Z: "+aZ); return true; } } @@ -460,7 +460,7 @@ extends WorldGen_GT_Australia { tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sandstone)) { if (aWorld.setBlock(aX, aY, aZ, tOreBlock, 0, 3)){ - Logger.WORLD("[World Generation Debug] Set "+tOreBlock.getLocalizedName()+" at X: "+aX+" | Y: "+aY+" | Z: "+aZ); + Logger.WARNING("[World Generation Debug] Set "+tOreBlock.getLocalizedName()+" at X: "+aX+" | Y: "+aY+" | Z: "+aZ); return true; } } -- cgit