Renamed dimensionalMobModifiers -> globalMobModifiers

zoom-packers · Jul 17, 2024 · 9f24f16 · 9f24f16
1 parent da4c674
commit 9f24f16
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/harmonised/pmmo/config/codecs/LocationData.java b/src/main/java/harmonised/pmmo/config/codecs/LocationData.java
@@ -27,7 +27,7 @@ public record LocationData(
 		Map<ResourceLocation, Integer> negative,
 		List<ResourceLocation> veinBlacklist,
 		Map<String, Integer> travelReq,
-		List<MobModifier> dimensionalMobModifiers,
+		List<MobModifier> globalMobModifiers,
 		Map<ResourceLocation, Map<String, Double>> mobModifiers) implements DataSource<LocationData>{
 
 	public LocationData() {this(
@@ -82,7 +82,7 @@ public void setPositiveEffects(Map<ResourceLocation, Integer> pos) {
 			Codec.unboundedMap(ResourceLocation.CODEC, Codec.INT).optionalFieldOf("negative_effect").forGetter(ld -> Optional.of(ld.negative())),
 			Codec.list(ResourceLocation.CODEC).optionalFieldOf("vein_blacklist").forGetter(ld -> Optional.of(ld.veinBlacklist())),
 			Codec.unboundedMap(Codec.STRING, Codec.INT).optionalFieldOf("travel_req").forGetter(ld -> Optional.of(ld.travelReq())),
-			Codec.list(MobModifier.CODEC).optionalFieldOf("dimensional_mob_modifiers").forGetter(ld -> Optional.of(ld.dimensionalMobModifiers())),
+			Codec.list(MobModifier.CODEC).optionalFieldOf("global_mob_modifiers").forGetter(ld -> Optional.of(ld.globalMobModifiers())),
 			Codec.unboundedMap(ResourceLocation.CODEC, CodecTypes.DOUBLE_CODEC).optionalFieldOf("mob_modifier").forGetter(ld -> Optional.of(ld.mobModifiers()))
 			).apply(instance, (override, tags, bonus, pos, neg, vein, req, dimMobScaling, mobs) ->
 				new LocationData(
@@ -105,7 +105,7 @@ public LocationData combine(LocationData two) {
 		Map<ResourceLocation, Integer> negative = new HashMap<>();
 		List<ResourceLocation> veinBlacklist = new ArrayList<>();
 		Map<String, Integer> travelReq = new HashMap<>();
-		List<MobModifier> dimensionalMobModifiers = new ArrayList<>();
+		List<MobModifier> globalMobModifiers = new ArrayList<>();
 		Map<ResourceLocation, Map<String, Double>> mobModifiers = new HashMap<>();
 
 		BiConsumer<LocationData, LocationData> bothOrNeither = (o, t) -> {
@@ -133,10 +133,10 @@ public LocationData combine(LocationData two) {
 			});		
 			travelReq.putAll(o.travelReq());
 			t.travelReq().forEach((key, value) -> travelReq.merge(key, value, (o1, n1) -> o1 > n1 ? o1 : n1));
-			dimensionalMobModifiers.addAll(o.dimensionalMobModifiers());
-			t.dimensionalMobModifiers().forEach((am) -> {
-				if (!dimensionalMobModifiers.contains(am))
-					dimensionalMobModifiers.add(am);
+			globalMobModifiers.addAll(o.globalMobModifiers());
+			t.globalMobModifiers().forEach((am) -> {
+				if (!globalMobModifiers.contains(am))
+					globalMobModifiers.add(am);
 			});
 			mobModifiers.putAll(o.mobModifiers());
 			t.mobModifiers().forEach((key, value) -> {
@@ -155,13 +155,13 @@ public LocationData combine(LocationData two) {
 			negative.putAll(o.negative().isEmpty() ? t.negative() : o.negative());
 			veinBlacklist.addAll(o.veinBlacklist().isEmpty() ? t.veinBlacklist(): o.veinBlacklist());
 			travelReq.putAll(o.travelReq().isEmpty() ? t.travelReq() : o.travelReq());
-			dimensionalMobModifiers.addAll(o.dimensionalMobModifiers().isEmpty() ? t.dimensionalMobModifiers() : o.dimensionalMobModifiers());
+			globalMobModifiers.addAll(o.globalMobModifiers().isEmpty() ? t.globalMobModifiers() : o.globalMobModifiers());
 			mobModifiers.putAll(o.mobModifiers().isEmpty() ? t.mobModifiers() : o.mobModifiers());
 		}, 
 		bothOrNeither,
 		bothOrNeither);
 
-		return new LocationData(this.override() || two.override(), tagValues, bonusMap, positive, negative, veinBlacklist, travelReq, dimensionalMobModifiers, mobModifiers);
+		return new LocationData(this.override() || two.override(), tagValues, bonusMap, positive, negative, veinBlacklist, travelReq, globalMobModifiers, mobModifiers);
 	}
 
 	@Override

diff --git a/src/main/java/harmonised/pmmo/config/writers/PackGenerator.java b/src/main/java/harmonised/pmmo/config/writers/PackGenerator.java
@@ -216,7 +216,7 @@ private enum Category {
 						new HashMap<>(),
 						applyDefaults ? existing.veinBlacklist() : new ArrayList<>(),
 						applyDefaults ? existing.travelReq() : new HashMap<>(),
-						applyDefaults ? existing.dimensionalMobModifiers() : new ArrayList<>(),
+						applyDefaults ? existing.globalMobModifiers() : new ArrayList<>(),
 						applyDefaults ? existing.mobModifiers() : new HashMap<>());
 				JsonObject raw = LocationData.CODEC.encodeStart(JsonOps.INSTANCE, data).result().get().getAsJsonObject();
 				raw.remove("positive_effect");
@@ -232,7 +232,7 @@ private enum Category {
 					applyDefaults ? existing.negative() : new HashMap<>(),
 					applyDefaults ? existing.veinBlacklist() : new ArrayList<>(),
 					applyDefaults ? existing.travelReq() : new HashMap<>(),
-					applyDefaults ? existing.dimensionalMobModifiers() : new ArrayList<>(),
+					applyDefaults ? existing.globalMobModifiers() : new ArrayList<>(),
 					applyDefaults ? existing.mobModifiers() : new HashMap<>());
 			JsonObject raw = LocationData.CODEC.encodeStart(JsonOps.INSTANCE, data).result().get().getAsJsonObject();
 			return gson.toJson(raw);}),

diff --git a/src/main/java/harmonised/pmmo/features/mobscaling/MobAttributeHandler.java b/src/main/java/harmonised/pmmo/features/mobscaling/MobAttributeHandler.java
@@ -79,7 +79,7 @@ private static void handle(LivingEntity entity, ServerLevel level, Vec3 spawnPos
 
 		var dimMods = dimData.mobModifiers().getOrDefault(RegistryUtil.getId(entity), new HashMap<>());
 		var bioMods = bioData.mobModifiers().getOrDefault(RegistryUtil.getId(entity), new HashMap<>());
-		var dimModsCustom = dimData.dimensionalMobModifiers();
+		var dimModsCustom = dimData.globalMobModifiers();
 		var multipliers = Config.MOB_SCALING.get();
 		final float bossMultiplier = entity.getType().is(Tags.EntityTypes.BOSSES) ? Config.BOSS_SCALING_RATIO.get().floatValue() : 1f;