killer rabbit

Author: SoLegendary

TODO.txt

@@ -18,9 +18,11 @@ HEROES (in order of priority)
     - mana?
     - equipment
 
+[✔] Updated the base Minecraft version to 1.20.1
+    - Moving forward,
 
-[❌] April fools mob ;)
-    - Add plus jump power when targeting a ghast
+[✔] Added a new cheatcode: thebeastofcaerbannog
+    - Not even Ghasts are safe from it :smiling_devil:
 
 Bugfixes
 --------
@@ -30,21 +32,23 @@ Bugfixes
 [❌] gui scale not working?
 
 [❌] Recreate tutorial world in 1.20.1
-[🟡] tutorial camera centering is off
+[🟡] Fixed camera centering on the tutorial world
 [🟡] Mounted piglins don't heal from nether terrain
-
-[❌] cursor off in server but not on singleplayer?
-
+[❌] Anchors not saving properly?
 
 Quality of Life
 ---------------
-[🟡] Add commands to send resources
-[❌] Ravagers that are mounted no longer aggro automatically onto buildings
-    - This prevents them hurting themselves from the splash damage
-[🟡] Button to toggle spider climbing
-[🟡] Slimes and magma cubes no longer clip into log blocks, but are just slowed down
+[🟡] Added commands to send resources to allies:
+    /sendfood <playername> <amount>
+    /sendwood <playername> <amount>
+    /sendore <playername> <amount>
+
+[🟡] Ravagers that are mounted no longer automatically aggro onto buildings
+    - This prevents them hurting themselves from their own splash damage
+[🟡] Spiders now have a button to toggle whether they climb on walls or not
+[🟡] Slimes and magma cubes can now no-clip through log and leaf blocks
 [✔] Turn cheats on by default for sandbox mode
-
+[🟡] Healing Fountains now heal 1% of hp per second instead of a flat rate, up to a maximum of 1hp/s
 
 
 Balancing

src/main/java/com/solegendary/reignofnether/building/buildings/neutral/HealingFountain.java

@@ -87,9 +87,13 @@ public void tick(Level tickLevel) {
                 LivingEntity.class,
                 this.level);
 
-        for (LivingEntity le : nearbyEntities)
-            if (isBuilt && tickAgeAfterBuilt % 100 == 0) // only 1hp/4s
-                le.addEffect(new MobEffectInstance(MobEffects.REGENERATION, 100, 0));
+        for (LivingEntity le : nearbyEntities) {
+            if (isBuilt && tickAgeAfterBuilt % 20 == 0)  {
+                // this actually isn't enough to cause a healing tick, but is just for effects
+                le.addEffect(new MobEffectInstance(MobEffects.REGENERATION, 20, 0));
+                le.heal(Math.min(1, le.getMaxHealth() / 100));
+            }
+        }
 
         // spawn random healing particle
         if (!waterBlocks.isEmpty() && isBuilt) {

src/main/java/com/solegendary/reignofnether/resources/ResourcesServerEvents.java

@@ -295,17 +295,17 @@ public static void fellAdjacentLogs(BlockPos bp, ArrayList<BlockPos> bpsExcluded
     @SubscribeEvent
     public static void onRegisterCommand(RegisterCommandsEvent evt) {
 
-        evt.getDispatcher().register(Commands.literal("send-food")
+        evt.getDispatcher().register(Commands.literal("sendfood")
             .then(Commands.argument("player", EntityArgument.player())
             .then(Commands.argument("amount", IntegerArgumentType.integer(0, Integer.MAX_VALUE))
             .executes((command) -> trySendingResources(command, ResourceName.FOOD)))));
 
-        evt.getDispatcher().register(Commands.literal("send-wood")
+        evt.getDispatcher().register(Commands.literal("sendwood")
             .then(Commands.argument("player", EntityArgument.player())
             .then(Commands.argument("amount", IntegerArgumentType.integer(0, Integer.MAX_VALUE))
             .executes((command) -> trySendingResources(command, ResourceName.WOOD)))));
 
-        evt.getDispatcher().register(Commands.literal("send-ore")
+        evt.getDispatcher().register(Commands.literal("sendore")
             .then(Commands.argument("player", EntityArgument.player())
             .then(Commands.argument("amount", IntegerArgumentType.integer(0, Integer.MAX_VALUE))
             .executes((command) -> trySendingResources(command, ResourceName.ORE)))));

src/main/java/com/solegendary/reignofnether/unit/goals/AbstractMeleeAttackUnitGoal.java

@@ -126,6 +126,10 @@ else if (distSqr < 64)
         }
     }
 
+    public void checkAndPerformAttackIgnoreDist(LivingEntity target) {
+        checkAndPerformAttack(target, 0);
+    }
+
     protected void checkAndPerformAttack(LivingEntity target, double distSqr) {
         double d = this.getAttackReachSqr(target);
         if (distSqr <= d && this.ticksUntilNextAttack <= 0) {

src/main/java/com/solegendary/reignofnether/unit/interfaces/AttackerUnit.java

@@ -6,6 +6,7 @@
 import com.solegendary.reignofnether.unit.Relationship;
 import com.solegendary.reignofnether.unit.UnitServerEvents;
 import com.solegendary.reignofnether.unit.goals.*;
+import com.solegendary.reignofnether.unit.units.villagers.RavagerUnit;
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.MyMath;
 import net.minecraft.core.BlockPos;
@@ -213,7 +214,7 @@ public default void attackClosestEnemy(ServerLevel level) {
             setUnitAttackTarget(entity);
             return;
         }
-        if (canAttackBuildings()) {
+        if (canAttackBuildings() && !(this instanceof RavagerUnit && ((LivingEntity) this).isVehicle())) {
             Building closestBuilding = MiscUtil.findClosestAttackableBuilding((Mob) this, aggroRange, level);
             if (closestBuilding != null) {
                 ((Unit) this).getMoveGoal().stopMoving();

src/main/java/com/solegendary/reignofnether/unit/units/neutral/KillerRabbitUnit.java

@@ -8,6 +8,7 @@
 import com.solegendary.reignofnether.unit.goals.*;
 import com.solegendary.reignofnether.unit.interfaces.AttackerUnit;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.unit.units.piglins.GhastUnit;
 import com.solegendary.reignofnether.util.Faction;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
@@ -145,7 +146,10 @@ public static AttributeSupplier.Builder createAttributes() {
 
     @Override
     protected float getJumpPower() {
-        return super.getJumpPower() * 2;
+        if (getTarget() instanceof GhastUnit && distanceTo(getTarget()) < 12)
+            return super.getJumpPower() * 4;
+        else
+            return super.getJumpPower() * 2;
     }
 
     @Override
@@ -156,6 +160,23 @@ public Variant getVariant() {
     @Override // immune to fall damage
     protected void checkFallDamage(double pY, boolean pOnGround, BlockState pState, BlockPos pPos) { }
 
+    @Override
+    public void push(Entity pEntity) {
+        super.push(pEntity);
+        LivingEntity target = this.getTargetGoal().getTarget();
+        if (target == pEntity) {
+            this.attackGoal.checkAndPerformAttackIgnoreDist(target);
+        }
+    }
+
+    @Override
+    public void setSpeedModifier(double pSpeedModifier) {
+        if (pSpeedModifier >= 0.1f) {
+            pSpeedModifier = 2.0f;
+        }
+        super.setSpeedModifier(pSpeedModifier);
+    }
+
     @Override
     public boolean doHurtTarget(Entity pEntity) {
         this.playSound(SoundEvents.RABBIT_ATTACK, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F);