aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Recommended.txt2
-rw-r--r--build.gradle2
-rw-r--r--src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java13
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java2
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java15
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java6
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang3
-rw-r--r--src/resources/mcmod.info2
8 files changed, 13 insertions, 32 deletions
diff --git a/Recommended.txt b/Recommended.txt
index 1958ef9e30..efcd78b51b 100644
--- a/Recommended.txt
+++ b/Recommended.txt
@@ -1 +1 @@
-1.7.0-prerelease \ No newline at end of file
+1.7.0-prerelease-2 \ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 31c9f847b2..4379bc26d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
archivesBaseName = "GT-PlusPlus"
-version = "1.7.0-prerelease"
+version = "1.7.0-prerelease-2"
minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
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.
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index fb21108045..477d72d103 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -32,7 +32,8 @@ item.itemFuelRod_Uranium.name=Uranium Fuel Rod
item.itemFuelRod_Plutonium.name=Plutonium Fuel Rod
//Entities
-entity.miscutils.constructStaballoy.name=Staballoy Construct
+entity.constructStaballoy.name=Staballoy Construct
+entity.sickBlaze.name=Infected Zealot
//Tile Entities
tile.blockToolBuilder.name=GregTech Tool Constructor
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 87be3f0a5a..dc5294f813 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
"description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)",
"credits": "",
"logoFile": "",
- "version": "1.7.0-release",
+ "version": "1.7.0-prerelease-2",
"mcversion": "1.7.10",
"url": "https://github.com/draknyte1/GTplusplus/wiki",
"updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",
generated by cgit (git 2.46.0) at 2025-03-09 05:34:57 +0000