save stuff here

This commit is contained in:
Ben Kerllenevich
2023-06-09 00:01:03 -04:00
parent 0b3c94c72d
commit 8768f54932
159 changed files with 4276 additions and 3663 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Summoner API
diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
index 39dfe26b37fc980080e7e0e7bdc82a94f00b0c33..b4e41bdca75fad328fe2936860e832f5221a6c31 100644
index 1ffb8e1c386fc85796432281ac407a935169b186..c2817324ff57860ea2628dc4ac8e78b76cf67a5a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
@@ -60,6 +60,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
@@ -17,7 +17,7 @@ index 39dfe26b37fc980080e7e0e7bdc82a94f00b0c33..b4e41bdca75fad328fe2936860e832f5
public IronGolem(EntityType<? extends IronGolem> type, Level world) {
super(type, world);
@@ -93,6 +94,15 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
return this.level.purpurConfig.ironGolemTakeDamageFromWater;
return this.level().purpurConfig.ironGolemTakeDamageFromWater;
}
+ @Nullable
@@ -31,7 +31,7 @@ index 39dfe26b37fc980080e7e0e7bdc82a94f00b0c33..b4e41bdca75fad328fe2936860e832f5
+
@Override
protected void registerGoals() {
if (level.purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
@@ -170,6 +180,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
public void addAdditionalSaveData(CompoundTag nbt) {
super.addAdditionalSaveData(nbt);
@@ -49,7 +49,7 @@ index 39dfe26b37fc980080e7e0e7bdc82a94f00b0c33..b4e41bdca75fad328fe2936860e832f5
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
index cfdc9b1341bafc9c92a520b1793add877336a8a3..6fee0d553c837addd3f6b15cb960b93fdb216dfd 100644
index 2acd9fdd1b311f00cc5fae7d879427ededdeecec..e33364beff36e255989520d5d076729c9c8ed1fe 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
@@ -49,6 +49,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -61,7 +61,7 @@ index cfdc9b1341bafc9c92a520b1793add877336a8a3..6fee0d553c837addd3f6b15cb960b93f
public SnowGolem(EntityType<? extends SnowGolem> type, Level world) {
super(type, world);
@@ -76,6 +77,15 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.snowGolemMaxHealth);
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.snowGolemMaxHealth);
}
+ @Nullable
@@ -93,7 +93,7 @@ index cfdc9b1341bafc9c92a520b1793add877336a8a3..6fee0d553c837addd3f6b15cb960b93f
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index c9b27c1479e09c65533f173546d6692e77df46da..06166210a162e5a40610910c320b391551301bf6 100644
index faa77256f116d2b9c9ad931238d10a994c63c484..7fc5562ef55809d864392f05599c2380b32f1fdd 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -84,6 +84,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -105,7 +105,7 @@ index c9b27c1479e09c65533f173546d6692e77df46da..06166210a162e5a40610910c320b3915
// Paper start
private boolean canPortal = false;
@@ -122,6 +123,15 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
return this.level.purpurConfig.witherTakeDamageFromWater;
return this.level().purpurConfig.witherTakeDamageFromWater;
}
+ @Nullable