Added a DDContext class for use with Difficulty Modifiers. For now, i…

…t only contains an optional entity class variable. Added Map for Difficulty Modifiers in DDVault

src/main/java/com/arazadaz/dd/api/DDContext.java

@@ -0,0 +1,16 @@
+package com.arazadaz.dd.api;
+
+import net.minecraft.world.entity.LivingEntity;
+
+import javax.annotation.Nullable;
+
+public class DDContext {
+
+
+    public LivingEntity entity;
+
+    public DDContext(@Nullable LivingEntity entity){
+        this.entity = entity;
+    }
+
+}

src/main/java/com/arazadaz/dd/api/DifficultyCalculator.java

@@ -8,6 +8,8 @@
 import com.arazadaz.dd.api.Modes.*;
 import net.minecraft.world.phys.Vec3;
 
+import javax.swing.text.html.Option;
+import java.util.Optional;
 import java.util.function.Predicate;
 
 public class DifficultyCalculator {
@@ -18,7 +20,7 @@ public static double getDifficultyHere(LivingEntity entity, DifficultyType type,
         Vec3 pos = entity.position();
         Level level = entity.level();
 
-        return getDifficultyHere(pos, level, type, rMode);
+        return getOriginDifficultyHere(pos, level, type, rMode, "default", Optional.of(entity));
 
     }
 
@@ -27,13 +29,13 @@ public static double getDifficultyHere(Vec3 pos, Level level, DifficultyType typ
 
         //Needs to be able to gather origins from all worlds and world-specific origins
 
-        return getOriginDifficultyHere(pos, level, type, rMode, "default"); //default is applied to user-defined origins/spawn automatically. Mods defined origins can apply it too and should unless they have a reason to omit it.
+        return getOriginDifficultyHere(pos, level, type, rMode, "default", Optional.empty()); //default is applied to user-defined origins/spawn automatically. Mods defined origins can apply it too and should unless they have a reason to omit it.
 
     }
 
     public static double getWorldSpawnDifficultyHere(Vec3 pos, Level level, DifficultyType type, RadiusMode rMode){ //Calculates from spawn origin(returning 0 if disabled)
 
-        return getOriginDifficultyHere(pos, level, type, rMode, "spawn");
+        return getOriginDifficultyHere(pos, level, type, rMode, "spawn", Optional.empty());
 
     }
 
@@ -42,20 +44,20 @@ public static double getWorldSpawnDifficultyHere(Vec3 pos, Level level, Difficul
 
 
     //Primary getter
-    public static double getOriginDifficultyHere(Vec3 pos, Level level, DifficultyType type, RadiusMode rMode, String originTag){ //Calculates from nearest origin point of specific type
+    public static double getOriginDifficultyHere(Vec3 pos, Level level, DifficultyType type, RadiusMode rMode, String originTag, Optional<LivingEntity> entity){ //Calculates from nearest origin point of specific type
 
         String levelID = level.toString(); //Will have to debug this to see what value is given.
 
         Origin originPoint = OriginManager.getNearestOrigin(levelID, originTag, pos);
 
-        return originPoint.getDifficultyHere(pos, type, rMode);
+        return originPoint.getDifficultyHere(pos, type, rMode, new DDContext(entity.orElse(null)));
 
     }
 
 
 
     //Precise control of difficulty with modifiers
-    public static void addDifficultyModifier(Predicate predicateCondition, DifficultyType type, RadiusMode rMode, ModifierMode modMode){ //Will register to DDvault
+    public static void addDifficultyModifier(Predicate<DDContext> predicateCondition, DifficultyType type, RadiusMode rMode, ModifierMode modMode){ //Will register to DDvault
 
         switch(modMode){
 

src/main/java/com/arazadaz/dd/api/origins/Origin.java

@@ -1,5 +1,6 @@
 package com.arazadaz.dd.api.origins;
 
+import com.arazadaz.dd.api.DDContext;
 import com.arazadaz.dd.api.Modes.*;
 import net.minecraft.world.phys.Vec3;
 
@@ -48,7 +49,7 @@ public Origin(Vec3 pos, String[] formulas, String[] tags, double range, boolean
 
 
     //Bulk of logic goes here
-    public double getDifficultyHere(Vec3 pos, DifficultyType type, RadiusMode rMode){
+    public double getDifficultyHere(Vec3 pos, DifficultyType type, RadiusMode rMode, DDContext context){
 
         switch(rMode){
 

src/main/java/com/arazadaz/dd/core/DDVault.java

@@ -1,8 +1,11 @@
 package com.arazadaz.dd.core;
 
+import com.arazadaz.dd.api.Modes.DifficultyType;
 import com.arazadaz.dd.api.origins.OriginID;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.function.Predicate;
 
 //Keeps track of internally defined origins such as user ones or the spawn origin. Mostly used for disabling them if the Origin Manager instructs it.
 //Keeps track of difficulty modifiers
@@ -13,5 +16,7 @@ public class DDVault {
     public static ArrayList<OriginID> userOrigins = new ArrayList<>();
     public static OriginID spawnOrigin;
 
+    public static HashMap<DifficultyType, ArrayList<Predicate> > difficultyModifiers;
+
 
 }