fixed datapacks

Author: SoLegendary

TODO.txt

@@ -19,7 +19,10 @@ HEROES (in order of priority)
     - equipment
 
 [✔] Updated the base Minecraft version to 1.20.1
-    - Moving forward,
+    - Moving forward, 1.19.2 is no longer supported
+    - Servers can't load worlds that were created before the worldgen datapack was integrated into the mod
+        - To resolve this, just delete the datapacks folder in that world
+        - To load them in single
 
 [✔] Added a new cheatcode: thebeastofcaerbannog
     - Not even Ghasts are safe from it :smiling_devil:
@@ -31,27 +34,27 @@ Bugfixes
 
 [❌] gui scale not working?
 
-[❌] Recreate tutorial world in 1.20.1
+[✔] Recreate tutorial world in 1.20.1
 [🟡] Fixed camera centering on the tutorial world
 [✔] Mounted piglins don't heal from nether terrain
-[🟡] Anchors are now saved correctly on server restart
+[✔] Anchors are now saved correctly on server restart
 
 Quality of Life
 ---------------
-[🟡] Added commands to send resources to allies:
+[✔] 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
+[✔] 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
 [🟡] Dripstone is now mineable by workers, worth 1 ore each
 
-[❌] language updates
+[✔] language updates
 
 Balancing
 ---------

build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
 
-version = '1.1.3a-1.20.1-beta'
+version = '1.1.4'
 group = 'com.solegendary.reignofnether' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'reignofnether'
 

src/main/java/com/solegendary/reignofnether/ReignOfNether.java

@@ -46,7 +46,7 @@
 public class ReignOfNether {
     public static final Logger LOGGER = LogManager.getLogger();
     public static final String MOD_ID = "reignofnether";
-    public static final String VERSION_STRING = "1.1.3a-1.20.1-beta";
+    public static final String VERSION_STRING = "1.1.4";
 
     // Fields from ClientReset
     public static final Field handshakeField;

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

@@ -347,9 +347,9 @@ public static int trySendingResources(CommandContext<CommandSourceStack> context
                     resourceName == ResourceName.ORE ? -amount : 0
             ));
             addSubtractResources(new Resources(receivingPlayerName,
-                    resourceName == ResourceName.FOOD ? -amount : 0,
-                    resourceName == ResourceName.WOOD ? -amount : 0,
-                    resourceName == ResourceName.ORE ? -amount : 0
+                    resourceName == ResourceName.FOOD ? amount : 0,
+                    resourceName == ResourceName.WOOD ? amount : 0,
+                    resourceName == ResourceName.ORE ? amount : 0
             ));
             switch (resourceName) {
                 case FOOD -> {

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

@@ -294,8 +294,9 @@ else if (ResourceSources.getBlockResourceName(getGatherTarget(), mob.level()) ==
                         gatherTicksLeft = DEFAULT_MAX_GATHER_TICKS;
                         ResourceName resourceName = ResourceSources.getBlockResourceName(this.data.gatherTarget, mob.level());
 
-                        boolean isLogBlock = isLogBlock(this.mob.level().getBlockState(data.gatherTarget));
-                        boolean isFallingLogBlock = isFallingLogBlock(this.mob.level().getBlockState(data.gatherTarget));
+                        BlockState bs = this.mob.level().getBlockState(data.gatherTarget);
+                        boolean isLogBlock = isLogBlock(bs);
+                        boolean isFallingLogBlock = isFallingLogBlock(bs);
                         if (isLogBlock)
                             ResourcesServerEvents.fellAdjacentLogs(data.gatherTarget, new ArrayList<>(), this.mob.level());
 
@@ -304,7 +305,7 @@ else if (ResourceSources.getBlockResourceName(getGatherTarget(), mob.level()) ==
                             expName = ResourceName.FOOD;
                         else if (ResourceSources.getBlockResourceName(getGatherTarget(), mob.level()) == ResourceName.WOOD && (isLogBlock || isFallingLogBlock))
                             expName = ResourceName.WOOD;
-                        else if (ResourceSources.getBlockResourceName(getGatherTarget(), mob.level()) == ResourceName.ORE)
+                        else if (ResourceSources.getBlockResourceName(getGatherTarget(), mob.level()) == ResourceName.ORE && bs.getBlock() != Blocks.POINTED_DRIPSTONE)
                             expName = ResourceName.ORE;
 
                         if (mob.level().destroyBlock(data.gatherTarget, false)) {

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

@@ -10,6 +10,7 @@
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.unit.units.piglins.GhastUnit;
 import com.solegendary.reignofnether.util.Faction;
+import com.solegendary.reignofnether.util.MyMath;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.syncher.EntityDataAccessor;
@@ -148,8 +149,16 @@ public static AttributeSupplier.Builder createAttributes() {
     @Override
     protected float getJumpPower() {
         float jumpPower = super.getJumpPower();
-        if (getTarget() instanceof GhastUnit && distanceTo(getTarget()) < 12)
+
+        Vec3 xz1 = new Vec3(getX(), 0, getZ());
+        Vec3 xz2 = null;
+        if (getTarget() != null) {
+            xz2 = new Vec3(getTarget().getX(), 0, getTarget().getZ());
+        }
+
+        if (xz2 != null && getTarget().getY() - getY() > 6 && xz1.distanceTo(xz2) < 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;