Skip to content

Commit

Permalink
Renamed AttributeModifier -> MobModifier
Browse files Browse the repository at this point in the history
  • Loading branch information
Pandaismyname1 committed Jul 17, 2024
1 parent e91a741 commit da4c674
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
19 changes: 0 additions & 19 deletions src/main/java/harmonised/pmmo/config/codecs/AttributeModifier.java

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/java/harmonised/pmmo/config/codecs/LocationData.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public record LocationData(
Map<ResourceLocation, Integer> negative,
List<ResourceLocation> veinBlacklist,
Map<String, Integer> travelReq,
List<AttributeModifier> dimensionalMobModifiers,
List<MobModifier> dimensionalMobModifiers,
Map<ResourceLocation, Map<String, Double>> mobModifiers) implements DataSource<LocationData>{

public LocationData() {this(
Expand Down Expand Up @@ -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(AttributeModifier.CODEC).optionalFieldOf("dimensional_mob_modifiers").forGetter(ld -> Optional.of(ld.dimensionalMobModifiers())),
Codec.list(MobModifier.CODEC).optionalFieldOf("dimensional_mob_modifiers").forGetter(ld -> Optional.of(ld.dimensionalMobModifiers())),
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(
Expand All @@ -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<AttributeModifier> dimensionalMobModifiers = new ArrayList<>();
List<MobModifier> dimensionalMobModifiers = new ArrayList<>();
Map<ResourceLocation, Map<String, Double>> mobModifiers = new HashMap<>();

BiConsumer<LocationData, LocationData> bothOrNeither = (o, t) -> {
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/harmonised/pmmo/config/codecs/MobModifier.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package harmonised.pmmo.config.codecs;

import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;

public record MobModifier(
String attribute,
double amount,
String operation
){

public static final Codec<MobModifier> CODEC = RecordCodecBuilder.create(instance ->
instance.group(
Codec.STRING.fieldOf( "attribute" ).forGetter( MobModifier::attribute),
Codec.DOUBLE.fieldOf( "amount" ).forGetter( MobModifier::amount ),
Codec.STRING.fieldOf( "operation" ).forGetter( MobModifier::operation )
).apply( instance, MobModifier::new )
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import harmonised.pmmo.config.Config;
import harmonised.pmmo.config.codecs.LocationData;
import harmonised.pmmo.config.codecs.MobModifier;
import harmonised.pmmo.core.Core;
import harmonised.pmmo.util.MsLoggy;
import harmonised.pmmo.util.Reference;
Expand All @@ -19,7 +20,6 @@
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.targeting.TargetingConditions;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.common.Tags;
Expand Down Expand Up @@ -88,7 +88,7 @@ private static void handle(LivingEntity entity, ServerLevel level, Vec3 spawnPos
.map(ResourceLocation::new)
.collect(Collectors.toSet());

for (harmonised.pmmo.config.codecs.AttributeModifier att : dimModsCustom) {
for (MobModifier att : dimModsCustom) {
var attributeLocation = new ResourceLocation(att.attribute());
var attribute = ForgeRegistries.ATTRIBUTES.getValue(attributeLocation);
if (attribute == null) continue;
Expand Down

0 comments on commit da4c674

Please sign in to comment.