Add relative number provider

Author: ErrorCraft

src/main/java/errorcraft/entitymodifiers/entity/modifier/Deserialisers.java

@@ -1,6 +1,7 @@
 package errorcraft.entitymodifiers.entity.modifier;
 
 import com.google.gson.GsonBuilder;
+import errorcraft.entitymodifiers.util.RelativeNumberProvider;
 import errorcraft.entitymodifiers.world.position.provider.PositionProvider;
 import errorcraft.entitymodifiers.world.position.provider.PositionProviderTypes;
 import net.minecraft.loot.context.LootContext;
@@ -18,6 +19,7 @@ public static GsonBuilder createEntityModifierSerialiser() {
 			.registerTypeHierarchyAdapter(LootNumberProvider.class, LootNumberProviderTypes.createGsonSerializer())
 			.registerTypeHierarchyAdapter(LootScoreProvider.class, LootScoreProviderTypes.createGsonSerializer())
 			.registerTypeHierarchyAdapter(LootContext.EntityTarget.class, new LootContext.EntityTarget.Serializer())
-			.registerTypeHierarchyAdapter(PositionProvider.class, PositionProviderTypes.createGsonAdapter());
+			.registerTypeHierarchyAdapter(PositionProvider.class, PositionProviderTypes.createGsonAdapter())
+			.registerTypeHierarchyAdapter(RelativeNumberProvider.class, new RelativeNumberProvider.Serialiser());
 	}
 }

src/main/java/errorcraft/entitymodifiers/util/RelativeNumberProvider.java

@@ -0,0 +1,62 @@
+package errorcraft.entitymodifiers.util;
+
+import com.google.gson.*;
+import net.minecraft.loot.context.LootContext;
+import net.minecraft.loot.provider.number.ConstantLootNumberProvider;
+import net.minecraft.loot.provider.number.LootNumberProvider;
+import net.minecraft.util.JsonHelper;
+
+import java.lang.reflect.Type;
+
+public class RelativeNumberProvider {
+    private final LootNumberProvider value;
+    private final boolean relative;
+
+    public RelativeNumberProvider(LootNumberProvider value, boolean relative) {
+        this.value = value;
+        this.relative = relative;
+    }
+
+    public double getDouble(double currentValue, LootContext context) {
+        if (this.relative) {
+            return currentValue + this.value.nextFloat(context);
+        }
+        return this.value.nextFloat(context);
+    }
+
+    public float getFloat(float currentValue, LootContext context) {
+        if (this.relative) {
+            return currentValue + this.value.nextFloat(context);
+        }
+        return this.value.nextFloat(context);
+    }
+
+    public int getInt(int currentValue, LootContext context) {
+        if (this.relative) {
+            return currentValue + this.value.nextInt(context);
+        }
+        return this.value.nextInt(context);
+    }
+
+    public static class Serialiser implements JsonDeserializer<RelativeNumberProvider>, JsonSerializer<RelativeNumberProvider> {
+        @Override
+        public RelativeNumberProvider deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException {
+            if (json.isJsonPrimitive()) {
+                return new RelativeNumberProvider(ConstantLootNumberProvider.create(json.getAsFloat()), false);
+            }
+
+            JsonObject jsonObject = JsonHelper.asObject(json, "value");
+            LootNumberProvider value = JsonHelper.deserialize(jsonObject, "value", context, LootNumberProvider.class);
+            boolean relative = JsonHelper.getBoolean(jsonObject, "relative", false);
+            return new RelativeNumberProvider(value, relative);
+        }
+
+        @Override
+        public JsonElement serialize(RelativeNumberProvider object, Type type, JsonSerializationContext context) {
+            JsonObject json = new JsonObject();
+            json.add("value", context.serialize(object.value));
+            json.addProperty("relative", object.relative);
+            return json;
+        }
+    }
+}

src/main/java/errorcraft/entitymodifiers/world/position/provider/providers/WorldPositionProvider.java

@@ -3,21 +3,21 @@
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
+import errorcraft.entitymodifiers.util.RelativeNumberProvider;
 import errorcraft.entitymodifiers.world.position.provider.PositionProvider;
 import errorcraft.entitymodifiers.world.position.provider.PositionProviderType;
 import errorcraft.entitymodifiers.world.position.provider.PositionProviderTypes;
 import net.minecraft.loot.context.LootContext;
-import net.minecraft.loot.provider.number.LootNumberProvider;
 import net.minecraft.util.JsonHelper;
 import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
 
 public class WorldPositionProvider implements PositionProvider {
-    private final LootNumberProvider x;
-    private final LootNumberProvider y;
-    private final LootNumberProvider z;
+    private final RelativeNumberProvider x;
+    private final RelativeNumberProvider y;
+    private final RelativeNumberProvider z;
 
-    public WorldPositionProvider(LootNumberProvider x, LootNumberProvider y, LootNumberProvider z) {
+    public WorldPositionProvider(RelativeNumberProvider x, RelativeNumberProvider y, RelativeNumberProvider z) {
         this.x = x;
         this.y = y;
         this.z = z;
@@ -29,9 +29,9 @@ public PositionProviderType getType() {
 
     @Override
     public Vec3d getPosition(Vec3d currentPosition, Vec2f rotation, LootContext lootContext) {
-        double newX = this.x.nextFloat(lootContext);
-        double newY = this.y.nextFloat(lootContext);
-        double newZ = this.z.nextFloat(lootContext);
+        double newX = this.x.getDouble(currentPosition.getX(), lootContext);
+        double newY = this.y.getDouble(currentPosition.getY(), lootContext);
+        double newZ = this.z.getDouble(currentPosition.getZ(), lootContext);
         return new Vec3d(newX, newY, newZ);
     }
 
@@ -45,9 +45,9 @@ public void toJson(JsonObject json, WorldPositionProvider object, JsonSerializat
 
         @Override
         public WorldPositionProvider fromJson(JsonObject json, JsonDeserializationContext context) {
-            LootNumberProvider x = JsonHelper.deserialize(json, "x", context, LootNumberProvider.class);
-            LootNumberProvider y = JsonHelper.deserialize(json, "y", context, LootNumberProvider.class);
-            LootNumberProvider z = JsonHelper.deserialize(json, "z", context, LootNumberProvider.class);
+            RelativeNumberProvider x = JsonHelper.deserialize(json, "x", context, RelativeNumberProvider.class);
+            RelativeNumberProvider y = JsonHelper.deserialize(json, "y", context, RelativeNumberProvider.class);
+            RelativeNumberProvider z = JsonHelper.deserialize(json, "z", context, RelativeNumberProvider.class);
             return new WorldPositionProvider(x, y, z);
         }
     }