From 9f24f1687056a505ac6c658ba589d4f250aedfbe Mon Sep 17 00:00:00 2001 From: Emanuel-Andrei Paius Date: Wed, 17 Jul 2024 22:54:53 +0300 Subject: [PATCH] Renamed dimensionalMobModifiers -> globalMobModifiers --- .../pmmo/config/codecs/LocationData.java | 18 +++++++++--------- .../pmmo/config/writers/PackGenerator.java | 4 ++-- .../mobscaling/MobAttributeHandler.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/harmonised/pmmo/config/codecs/LocationData.java b/src/main/java/harmonised/pmmo/config/codecs/LocationData.java index aab1fe61..c13a8bea 100644 --- 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 negative, List veinBlacklist, Map travelReq, - List dimensionalMobModifiers, + List globalMobModifiers, Map> mobModifiers) implements DataSource{ public LocationData() {this( @@ -82,7 +82,7 @@ public void setPositiveEffects(Map 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 negative = new HashMap<>(); List veinBlacklist = new ArrayList<>(); Map travelReq = new HashMap<>(); - List dimensionalMobModifiers = new ArrayList<>(); + List globalMobModifiers = new ArrayList<>(); Map> mobModifiers = new HashMap<>(); BiConsumer 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 index 106648e8..7917dfc4 100644 --- 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 index 7feb9ba9..fe047e7c 100644 --- 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;