From 0815b934e97917f664e02ea8d683baee07f793ca Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Tue, 30 Jan 2018 06:00:37 +1000 Subject: ^ Version bump to 1.7.0pre2 % Toned down Staballoy Construct explosion. % Changed ore Density during generation in Toxic Everglades. % Updated en_US.lang. --- .../core/entity/monster/EntityStaballoyConstruct.java | 13 +++---------- src/Java/gtPlusPlus/core/lib/CORE.java | 2 +- .../core/world/darkworld/gen/gt/WorldGen_GT_Base.java | 15 +-------------- .../world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java | 6 +++--- 4 files changed, 8 insertions(+), 28 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java index cd7878273f..92fdcb578a 100644 --- a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java +++ b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java @@ -249,19 +249,12 @@ public class EntityStaballoyConstruct extends EntityIronGolem { @Override public boolean isPlayerCreated() { - return (this.dataWatcher.getWatchableObjectByte(16) & 1) != 0; + return false; } @Override public void setPlayerCreated(boolean p_70849_1_) { - byte b0 = this.dataWatcher.getWatchableObjectByte(16); - - if (p_70849_1_) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 1))); - } - else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -2))); - } + } /** @@ -488,7 +481,7 @@ public class EntityStaballoyConstruct extends EntityIronGolem { /* float f = 12.0F; this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, f, true);*/ - final float f = 16F; + final float f = 6.5F; ExplosionHandler explode = new ExplosionHandler(); explode.createExplosion(this.worldObj, this, this.posX, this.posY, this.posZ, f, true, true); diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 4abc95dadb..1b5a63a475 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -47,7 +47,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.7.0-release"; + public static final String VERSION = "1.7.0-prerelease-2"; public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); 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 65184b6f35..36efed40ef 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 @@ -63,7 +63,6 @@ public class WorldGen_GT_Base implements IWorldGenerator { // private static boolean gcAsteroids = true; public WorldGen_GT_Base() { - GameRegistry.registerWorldGenerator(this, 7735); if (debugWorldGen) { GT_Log.out.println("GTPP_Worldgenerator created"); } @@ -101,18 +100,6 @@ public class WorldGen_GT_Base implements IWorldGenerator { } } - private void generateEnd(World world, Random random, int x, int z) { - // ... - } - - private void generateSurface(World world, Random random, int x, int z) { - // ... - } - - private void generateNether(World world, Random random, int x, int z) { - // ... - } - private synchronized void generateDarkWorld(Random aRandom, int aX, int aZ, World aWorld, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { Logger.WORLD("Trying to Generate Dimension."); @@ -396,7 +383,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // 32, instead of 64 } else { - oreveinMaxSize = 24; + oreveinMaxSize = 48; } int wXbox = this.mX - (oreveinMaxSize / 16); 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 03606b28e8..1252d4bc89 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 @@ -75,8 +75,8 @@ extends WorldGen_GT { //this.mMoon = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Moon", aMoon); //this.mMars = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Mars", aMars); //this.mAsteroid = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Asteroid", aAsteroid); - this.mMinY = ((short) HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY)); - short mMaxY = ((short) HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY)); + this.mMinY = 5; + short mMaxY = 14; if (mMaxY < (this.mMinY + 7)) { GT_Log.out.println( "Oremix " + this.mWorldGenName + @@ -186,7 +186,7 @@ extends WorldGen_GT { return NO_OVERLAP; } // Adjust the density down the more chunks we are away from the oreseed. The 5 chunks surrounding the seed should always be max density due to truncation of Math.sqrt(). - int localDensity = Math.max(1, this.mDensity / ((int)Math.sqrt(2 + Math.pow(aChunkX/16 - aSeedX/16, 2) + Math.pow(aChunkZ/16 - aSeedZ/16, 2))) ); + int localDensity = (Math.max(1, this.mDensity / ((int)Math.sqrt(2 + Math.pow(aChunkX/16 - aSeedX/16, 2) + Math.pow(aChunkZ/16 - aSeedZ/16, 2))))/2); // To allow for early exit due to no ore placed in the bottom layer (probably because we are in the sky), unroll 1 pass through the loop // Now we do bottom-level-first oregen, and work our way upwards. -- cgit