fixed rabbit movement

Author: SoLegendary

TODO.txt

@@ -28,13 +28,13 @@ Bugfixes
 --------
 [❌] Prevent superflat worlds generating regular worlds after a certain range
 [❌] Kicked for sending too many packets when spam clicking large army (rate-limit in server.properties?)
-[❌] groundYlevel not working if you're already below it?
+
 [❌] gui scale not working?
 
 [❌] Recreate tutorial world in 1.20.1
 [🟡] Fixed camera centering on the tutorial world
-[🟡] Mounted piglins don't heal from nether terrain
-[🟡] Anchors not saving properly?
+[✔] Mounted piglins don't heal from nether terrain
+[🟡] Anchors are now saved correctly on server restart
 
 Quality of Life
 ---------------
@@ -48,8 +48,10 @@ Quality of Life
 [🟡] 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
+[✔] Healing Fountains now heal 1% of hp per second instead of a flat rate, up to a maximum of 1hp/s
+[🟡] Dripstone is now mineable by workers, worth 1 ore each
 
+[❌] language updates
 
 Balancing
 ---------

TODO_backlog.txt

@@ -10,6 +10,8 @@ Features
 
 [❌] Add basic controls for non-rts units (so you can control modded units)
 
+[❌] Config to allow changing resource block values, including modded blocks
+
 
 Bugfixes
 --------

src/main/java/com/solegendary/reignofnether/orthoview/OrthoviewClientEvents.java

@@ -120,8 +120,8 @@ public static boolean shouldHideLeaves() {
 
     public static void setMinOrthoviewY(double value) {
         minOrthoviewY = value;
-        if (MC.level != null && MC.player != null && MC.player.getY() < value) {
-            MC.player.move(MoverType.SELF, new Vec3(0, minOrthoviewY - MC.player.getY(), 0));
+        if (MC.level != null && MC.player != null && MC.player.getY() < value + 15) {
+            MC.player.move(MoverType.SELF, new Vec3(0, minOrthoviewY - MC.player.getY() + 15, 0));
         }
     }
 
@@ -157,7 +157,7 @@ public static void updateOrthoviewY() {
             int avgHeight = count > 0 ? sumHeights / count : playerPos.getY();
 
             // Update ORTHOVIEW values based on the average height
-            orthoviewPlayerBaseY = Math.max(avgHeight + 40, minOrthoviewY);
+            orthoviewPlayerBaseY = Math.max(avgHeight + 30, minOrthoviewY);
             orthoviewPlayerMaxY = avgHeight + 100;
         }
     }

src/main/java/com/solegendary/reignofnether/player/PlayerServerEvents.java

@@ -487,20 +487,8 @@ public static void startRTSBot(String name, Vec3 pos, Faction faction) {
         }
     }
 
-    // commands for ops to give resources
     @SubscribeEvent
     public static void onPlayerChat(ServerChatEvent evt) {
-        /*
-        if (evt.getMessage().getString().equals("test spiders")) {
-            UnitServerEvents.convertAllToUnit(
-                    evt.getPlayer().getName().getString(),
-                    evt.getPlayer().getLevel(),
-                    (LivingEntity entity) ->
-                            entity instanceof SpiderUnit sUnit &&
-                                    sUnit.getOwnerName().equals(evt.getPlayer().getName().getString()),
-                    EntityRegistrar.POISON_SPIDER_UNIT.get()
-            );
-        }*/
         if (evt.getPlayer().hasPermissions(4)) {
             String msg = evt.getMessage().getString();
             String[] words = msg.split(" ");

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

@@ -353,6 +353,13 @@ public static List<ItemStack> getFoodItemsFromAnimal(Animal animal) {
                     1,
                     ResourceName.ORE
             ),
+            new ResourceSource("Dripstone",
+                    List.of(Blocks.POINTED_DRIPSTONE),
+                    List.of(Items.POINTED_DRIPSTONE),
+                    20,
+                    1,
+                    ResourceName.ORE
+            ),
             new ResourceSource("Tier 1 Nether Ores",
                     List.of(Blocks.NETHER_QUARTZ_ORE),
                     List.of(Items.QUARTZ),

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

@@ -297,17 +297,17 @@ public static void onRegisterCommand(RegisterCommandsEvent evt) {
 
         evt.getDispatcher().register(Commands.literal("sendfood")
             .then(Commands.argument("player", EntityArgument.player())
-            .then(Commands.argument("amount", IntegerArgumentType.integer(0, Integer.MAX_VALUE))
+            .then(Commands.argument("amount", IntegerArgumentType.integer(1, Integer.MAX_VALUE))
             .executes((command) -> trySendingResources(command, ResourceName.FOOD)))));
 
         evt.getDispatcher().register(Commands.literal("sendwood")
             .then(Commands.argument("player", EntityArgument.player())
-            .then(Commands.argument("amount", IntegerArgumentType.integer(0, Integer.MAX_VALUE))
+            .then(Commands.argument("amount", IntegerArgumentType.integer(1, Integer.MAX_VALUE))
             .executes((command) -> trySendingResources(command, ResourceName.WOOD)))));
 
         evt.getDispatcher().register(Commands.literal("sendore")
             .then(Commands.argument("player", EntityArgument.player())
-            .then(Commands.argument("amount", IntegerArgumentType.integer(0, Integer.MAX_VALUE))
+            .then(Commands.argument("amount", IntegerArgumentType.integer(1, Integer.MAX_VALUE))
             .executes((command) -> trySendingResources(command, ResourceName.ORE)))));
     }
 

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

@@ -8,9 +8,9 @@
 import com.solegendary.reignofnether.research.ResearchServerEvents;
 import com.solegendary.reignofnether.resources.*;
 import com.solegendary.reignofnether.unit.TargetResourcesSave;
-import com.solegendary.reignofnether.unit.packets.UnitSyncClientboundPacket;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
+import com.solegendary.reignofnether.unit.packets.UnitSyncClientboundPacket;
 import com.solegendary.reignofnether.unit.units.villagers.VillagerUnit;
 import com.solegendary.reignofnether.unit.units.villagers.VillagerUnitProfession;
 import com.solegendary.reignofnether.util.MiscUtil;
@@ -21,7 +21,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.phys.AABB;
 
 import javax.annotation.Nullable;
@@ -320,7 +319,7 @@ else if (expName == ResourceName.ORE)
                             }
 
                             // replace workers' mine ores with cobble to prevent creating potholes
-                            if (data.targetResourceSource.resourceName == ResourceName.ORE) {
+                            if (data.targetResourceSource.resourceName == ResourceName.ORE && bsTarget.getBlock() != Blocks.POINTED_DRIPSTONE) {
                                 BlockState replaceBs;
                                 if (BuildingUtils.isInNetherRange(mob.level().isClientSide(), data.gatherTarget))
                                     replaceBs = BlockRegistrar.WALKABLE_MAGMA_BLOCK.get().defaultBlockState();

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

@@ -30,6 +30,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.ServerLevelAccessor;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
@@ -146,10 +147,18 @@ public static AttributeSupplier.Builder createAttributes() {
 
     @Override
     protected float getJumpPower() {
+        float jumpPower = super.getJumpPower();
         if (getTarget() instanceof GhastUnit && distanceTo(getTarget()) < 12)
-            return super.getJumpPower() * 4;
+            return jumpPower * 4;
+        else if (jumpPower > 0.1f && jumpPower < 0.3f) {
+            // prevents getting stuck jumping on the spot when pushed flush against a block
+            double x = (random.nextDouble() - 0.5f) / 0.5f;
+            double z = (random.nextDouble() - 0.5f) / 0.5f;
+            move(MoverType.SELF, new Vec3(x, 0, z));
+            return jumpPower * 3;
+        }
         else
-            return super.getJumpPower() * 2;
+            return jumpPower * 2;
     }
 
     @Override

src/main/resources/META-INF/accesstransformer.cfg

@@ -86,4 +86,9 @@ public net.minecraft.world.entity.Entity m_20272_
 
 protected net.minecraft.world.entity.ExperienceOrb f_20771_
 public net.minecraft.world.entity.ExperienceOrb f_147072_
-protected net.minecraft.world.entity.ExperienceOrb m_147103_()V
+protected net.minecraft.world.entity.ExperienceOrb m_147103_()V
+
+
+
+
+

src/main/resources/assets/reignofnether/lang/en_us.json

@@ -646,7 +646,7 @@
     "server.resources.reignofnether.sent_ore": "You gave %d ore to %d!",
     "server.resources.reignofnether.received_ore": "You received %d ore from %d!",
     "server.resources.reignofnether.not_allies": "You can only send resources to allies",
-    "server.resources.reignofnether.sending_to_self": "You can't send resources to yourself'",
+    "server.resources.reignofnether.sending_to_self": "You can't send resources to yourself",
 
     "research.reignofnether.upgrade_completed": "Upgrade completed: %s",
     "research.reignofnether.advanced_portals": "Advanced Portals",