properly remove tuinity

This commit is contained in:
Ben Kerllenevich
2021-06-14 17:32:55 -04:00
parent 6c12392439
commit 23b935c3a2
183 changed files with 413 additions and 1110 deletions

View File

@@ -5,23 +5,23 @@ Subject: [PATCH] Giants AI settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 89852779fd9cfd19058afe40feb0cf14ca8d2896..611a2c34c80462826564705eb5a079bd6fdda4e1 100644
index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..b260a6409aa8c3f5a0605e4b25b5525dffebe8da 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -228,7 +228,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
public double D;
public double E;
public double F;
- public float G; public final float getStepHeight() { return this.G; } // Tuinity - OBFHELPER
- public float G;
+ public float G; public final float getStepHeight() { return this.G; } public void setStepHeight(float stepHeight) { this.G = stepHeight; } // Tuinity - OBFHELPER // Purpur - OBFHELPER
public boolean noclip;
public float I;
protected final Random random;
diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
index 7ba59ff9a7ed39bf69c46973a85f874c43134dc1..46e9a232ca5df81cafd4c3fc6af43b933c95d04f 100644
index 6c024a5fdd290e5eb219e677e28718d663b72f25..5c047d7f44087adef39bcb56c121f8859748ce42 100644
--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
+++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
@@ -1021,6 +1021,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1015,6 +1015,7 @@ public abstract class EntityInsentient extends EntityLiving {
return f;
}
@@ -29,7 +29,7 @@ index 7ba59ff9a7ed39bf69c46973a85f874c43134dc1..46e9a232ca5df81cafd4c3fc6af43b93
protected void a(DifficultyDamageScaler difficultydamagescaler) {
if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
int i = this.random.nextInt(2);
@@ -1128,6 +1129,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1122,6 +1123,7 @@ public abstract class EntityInsentient extends EntityLiving {
}
}
@@ -38,7 +38,7 @@ index 7ba59ff9a7ed39bf69c46973a85f874c43134dc1..46e9a232ca5df81cafd4c3fc6af43b93
float f = difficultydamagescaler.d();
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 7d0bb706fb106709432c3fae8758d2cea1d14db8..032b1a519de56583990fe47a216665ce71cf93ab 100644
index b3f04847af8fc7211f5432ad851de03ebbdc1c11..13f74514d0012a3dfb880f049e35ff8fc28cd89e 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -260,6 +260,7 @@ public abstract class EntityLiving extends Entity {