Merge branch 'player_controller' of https://github.com/gnembon/fabric-carpet into player_controller

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=1.14.4-pre4
+	minecraft_version=1.14.4-pre5
-	yarn_mappings=1.14.4-pre4+build.1
+	yarn_mappings=1.14.4-pre5+build.1
 	loader_version=0.4.8+build.155
 
 # Mod Properties

src/main/java/carpet/mixins/Entity_horseFixMixin.java

@@ -0,0 +1,35 @@
+package carpet.mixins;
+
+import carpet.settings.CarpetSettings;
+import net.minecraft.client.network.packet.EntityPositionS2CPacket;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Entity.class)
+public abstract class Entity_horseFixMixin
+{
+    @Shadow private Entity vehicle;
+
+    @Shadow public abstract World getEntityWorld();
+
+    @Inject(method = "stopRiding", at = @At("HEAD"))
+    private void resetNavigation(CallbackInfo ci)
+    {
+        if (vehicle != null && vehicle instanceof MobEntity && CarpetSettings.horseWanderingFix)
+        {
+            ((MobEntity) vehicle).getNavigation().stop();
+            if (!getEntityWorld().isClient)
+            {
+                ((ServerWorld) getEntityWorld()).method_14178().sendToNearbyPlayers((Entity)(Object)this, new EntityPositionS2CPacket(vehicle));
+            }
+        }
+    }
+
+}

src/main/java/carpet/script/Expression.java

@@ -506,6 +506,14 @@ public class Expression implements Cloneable
                 {
                     throw new ExpressionException(e, token, "Your math is wrong, "+exc.getMessage());
                 }
+                catch (ExitStatement exit)
+                {
+                    throw exit;
+                }
+                catch (Exception exc)
+                {
+                    throw new ExpressionException(e, token, "Error while evaluating expression: "+exc.getMessage());
+                }
             }
         });
     }
@@ -532,6 +540,14 @@ public class Expression implements Cloneable
                 {
                     throw new ExpressionException(e, t, "Your math is wrong, "+exc.getMessage());
                 }
+                catch (ExitStatement exit)
+                {
+                    throw exit;
+                }
+                catch (Exception exc)
+                {
+                    throw new ExpressionException(e, t, "Error while evaluating expression: "+exc.getMessage());
+                }
             }
         });
     }
@@ -557,6 +573,14 @@ public class Expression implements Cloneable
                 {
                     throw new ExpressionException(e, token, "Your math is wrong, "+exc.getMessage());
                 }
+                catch (ExitStatement exit)
+                {
+                    throw exit;
+                }
+                catch (Exception exc)
+                {
+                    throw new ExpressionException(e, token, "Error while evaluating expression: "+exc.getMessage());
+                }
             }
         });
     }
@@ -663,6 +687,14 @@ public class Expression implements Cloneable
                 {
                     throw new ExpressionException(e, t, "Your math is wrong, "+exc.getMessage());
                 }
+                catch (ExitStatement exit)
+                {
+                    throw exit;
+                }
+                catch (Exception exc)
+                {
+                    throw new ExpressionException(e, t, "Error while evaluating expression: "+exc.getMessage());
+                }
             }
         });
     }
@@ -725,7 +757,7 @@ public class Expression implements Cloneable
                 {
                     retVal = returnStatement.retval;
                 }
-                catch (ThrowStatement throwStatement)
+                catch (ThrowStatement throwStatement) // might not be really necessary
                 {
                     retVal = throwStatement.retval;
                     rethrow = true;
@@ -738,6 +770,14 @@ public class Expression implements Cloneable
                 {
                     throw new ExpressionException(function_context, t, "Your math is wrong, "+exc.getMessage());
                 }
+                catch (ExitStatement exit)
+                {
+                    throw exit;
+                }
+                catch (Exception exc)
+                {
+                    throw new ExpressionException(e, t, "Error while evaluating expression: "+exc.getMessage());
+                }
                 for (String global: globals)
                 {
                     LazyValue lv = newFrame.getVariable(global);

src/main/java/carpet/script/Fluff.java

@@ -108,6 +108,18 @@ public abstract class Fluff
             {
                 throw new ExpressionException(e, t, exc.getMessage());
             }
+            catch (ArithmeticException exc)
+            {
+                throw new ExpressionException(e, t, "Your math is wrong, "+exc.getMessage());
+            }
+            catch (Expression.ExitStatement exit)
+            {
+                throw exit;
+            }
+            catch (Exception exc)
+            {
+                throw new ExpressionException(e, t, "Error while evaluating expression: "+exc.getMessage());
+            }
         }
     }
 
@@ -154,6 +166,14 @@ public abstract class Fluff
             {
                 throw new ExpressionException(e, t, "Your math is wrong, "+exc.getMessage());
             }
+            catch (Expression.ExitStatement exit)
+            {
+                throw exit;
+            }
+            catch (Exception exc)
+            {
+                throw new ExpressionException(e, t, "Error while evaluating expression: "+exc.getMessage());
+            }
         }
     }
 
@@ -182,6 +202,14 @@ public abstract class Fluff
             {
                 throw new ExpressionException(e, t, "Your math is wrong, "+exc.getMessage());
             }
+            catch (Expression.ExitStatement exit)
+            {
+                throw exit;
+            }
+            catch (Exception exc)
+            {
+                throw new ExpressionException(e, t, "Error while evaluating expression: "+exc.getMessage());
+            }
         }
 
         @Override

src/main/java/carpet/settings/CarpetSettings.java

@@ -401,4 +401,11 @@ public class CarpetSettings
 
     @Rule(desc = "Spawning requires much less CPU and Memory", category = OPTIMIZATION)
     public static boolean lagFreeSpawning = false;
+
+    @Rule(
+            desc = "Prevents horses and other mobs to wander into the distance after dismounting",
+            extra = "Fixes issues with various Joergens wandering off and disappearing client-side",
+            category = BUGFIX
+    )
+    public static boolean horseWanderingFix = false;
 }

src/main/resources/carpet.mixins.json

@@ -81,6 +81,8 @@
     "Entity_portalSuffocationMixin",
     "PortalForcer_portalSuffocationMixin",
 
+    "Entity_horseFixMixin",
+
     "HopperBlockEntityMixin",
     "ContainerMixin",
     "ClientConnectionMixin",