From 9fd452386ba511fdb1d272ff4b4b56ffa82c951d Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:31:44 -0400
Subject: [PATCH 01/38] set up development environment for my windows machine
---
.idea/compiler.xml | 1 -
.idea/runConfigurations/runClient.xml | 25 ++++++++++++-------------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 68d9a25..837aa13 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,7 +7,6 @@
-
diff --git a/.idea/runConfigurations/runClient.xml b/.idea/runConfigurations/runClient.xml
index bd1560e..4c6aedc 100644
--- a/.idea/runConfigurations/runClient.xml
+++ b/.idea/runConfigurations/runClient.xml
@@ -1,18 +1,17 @@
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
\ No newline at end of file
From 0b3a2d39af9b3e40f128d919098467792ed8177a Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Wed, 28 Aug 2024 18:12:58 -0400
Subject: [PATCH 02/38] progress
---
.idea/compiler.xml | 1 +
.idea/modules/DifficultRaids.test.iml | 9 ++--
.idea/runConfigurations/runClient.xml | 4 +-
build.gradle | 8 ++--
.../commands/AdvanceRaidWaveCommand.java | 4 +-
.../commands/DumpRaidWavesCommand.java | 4 +-
.../commands/FreezeRaidersCommand.java | 4 +-
.../commands/PrintRaidersCommand.java | 4 +-
.../commands/SetRaidDifficultyCommand.java | 10 ++--
.../commands/ToggleInsanityModeCommand.java | 4 +-
.../difficultraids/config/RaiderConfigs.java | 9 ++--
.../DifficultyRaiderEntries.java | 2 +-
.../effects/WindCurseEffect.java | 9 +++-
.../difficultraids/entity/DREntityEvents.java | 9 ++--
.../entities/component/AshenadoObject.java | 33 ++++++++-----
.../component/FrostSnowballEntity.java | 2 +-
.../component/ShamanDebuffBulletEntity.java | 14 +++---
.../component/VoldonFamiliarEntity.java | 4 +-
.../entities/component/WindColumnObject.java | 7 +--
.../entities/core/AbstractEvokerVariant.java | 10 ++--
.../entities/elite/ModurEliteEntity.java | 28 +++++------
.../entities/elite/NuaosEliteEntity.java | 16 ++++---
.../entities/elite/VoldonEliteEntity.java | 28 +++++------
.../entities/elite/XydraxEliteEntity.java | 33 ++++++-------
.../raider/AshenmancerIllagerEntity.java | 23 ++++-----
.../raider/AssassinIllagerEntity.java | 4 +-
.../entities/raider/ElectroIllagerEntity.java | 12 ++---
.../entities/raider/FrostIllagerEntity.java | 14 +++---
.../raider/NecromancerIllagerEntity.java | 21 +++++----
.../entities/raider/ShamanIllagerEntity.java | 15 +++---
.../events/DRForgeBusEvents.java | 6 +--
.../difficultraids/items/GMArmorItem.java | 12 +++--
.../mixins/LivingEntityMixin.java | 47 ++++++++++---------
.../difficultraids/mixins/RaidMixin.java | 15 +++---
.../mixins/raider/AbstractIllagerMixin.java | 2 +-
.../mixins/raider/EvokerFangsMixin.java | 2 +-
.../setup/DifficultRaidsConfig.java | 3 +-
.../setup/DifficultRaidsItems.java | 13 ++---
38 files changed, 249 insertions(+), 196 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 837aa13..83da87a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,6 +7,7 @@
+
diff --git a/.idea/modules/DifficultRaids.test.iml b/.idea/modules/DifficultRaids.test.iml
index c51be96..2947d65 100644
--- a/.idea/modules/DifficultRaids.test.iml
+++ b/.idea/modules/DifficultRaids.test.iml
@@ -8,14 +8,15 @@
MIXIN
MCP
+ 1
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/runClient.xml b/.idea/runConfigurations/runClient.xml
index 4c6aedc..af0bb3f 100644
--- a/.idea/runConfigurations/runClient.xml
+++ b/.idea/runConfigurations/runClient.xml
@@ -2,11 +2,11 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 77d4514..b6654bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,14 +31,14 @@ apply plugin: 'org.spongepowered.mixin'
version = '2.0-beta.11'
group = 'com.calculusmaster.difficultraids'
-archivesBaseName = 'difficultraids-1.19.2'
+archivesBaseName = 'difficultraids-1.20.1'
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
minecraft {
- //mappings channel: 'official', version: '1.19.2'
- mappings channel: 'parchment', version: '2022.11.27-1.19.2'
+ //mappings channel: 'official', version: '1.20.1'
+ mappings channel: 'parchment', version: '2023.09.03-1.20.1'
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
@@ -145,7 +145,7 @@ repositories {
dependencies {
//Minecraft
- minecraft 'net.minecraftforge:forge:1.19.2-43.2.0'
+ minecraft 'net.minecraftforge:forge:1.20.1-47.3.7'
// Apply Mixin AP
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
diff --git a/src/main/java/com/calculusmaster/difficultraids/commands/AdvanceRaidWaveCommand.java b/src/main/java/com/calculusmaster/difficultraids/commands/AdvanceRaidWaveCommand.java
index f787f86..7da5057 100644
--- a/src/main/java/com/calculusmaster/difficultraids/commands/AdvanceRaidWaveCommand.java
+++ b/src/main/java/com/calculusmaster/difficultraids/commands/AdvanceRaidWaveCommand.java
@@ -30,7 +30,7 @@ public static void register(CommandDispatcher dispatcher)
})
.executes(css -> {
ServerPlayer player = css.getSource().getPlayerOrException();
- ServerLevel level = player.getLevel();
+ ServerLevel level = player.serverLevel();
Raid raid = level.getRaidAt(player.blockPosition());
if(raid == null) css.getSource().sendFailure(Component.literal("You must be near a Raid to use this command!"));
@@ -39,7 +39,7 @@ public static void register(CommandDispatcher dispatcher)
List alive = raid.getAllRaiders().stream().filter(LivingEntity::isAlive).toList();
alive.forEach(LivingEntity::kill);
- css.getSource().sendSuccess(Component.literal("Wave successfully cleared!"), true);
+ css.getSource().sendSuccess(() -> Component.literal("Wave successfully cleared!"), true);
}
return 1;
diff --git a/src/main/java/com/calculusmaster/difficultraids/commands/DumpRaidWavesCommand.java b/src/main/java/com/calculusmaster/difficultraids/commands/DumpRaidWavesCommand.java
index 9d598aa..41ef9e7 100644
--- a/src/main/java/com/calculusmaster/difficultraids/commands/DumpRaidWavesCommand.java
+++ b/src/main/java/com/calculusmaster/difficultraids/commands/DumpRaidWavesCommand.java
@@ -9,6 +9,8 @@
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component;
+import java.util.function.Supplier;
+
public class DumpRaidWavesCommand
{
public static void register(CommandDispatcher dispatcher)
@@ -27,7 +29,7 @@ public static void register(CommandDispatcher dispatcher)
RaidEnemyRegistry.printWaveData(LogUtils.getLogger());
- css.getSource().sendSuccess(Component.literal("Dumped Raid Wave Data into the console!"), true);
+ css.getSource().sendSuccess(() -> Component.literal("Dumped Raid Wave Data into the console!"), true);
return 1;
});
diff --git a/src/main/java/com/calculusmaster/difficultraids/commands/FreezeRaidersCommand.java b/src/main/java/com/calculusmaster/difficultraids/commands/FreezeRaidersCommand.java
index 9d9e530..1933a1f 100644
--- a/src/main/java/com/calculusmaster/difficultraids/commands/FreezeRaidersCommand.java
+++ b/src/main/java/com/calculusmaster/difficultraids/commands/FreezeRaidersCommand.java
@@ -31,7 +31,7 @@ public static void register(CommandDispatcher dispatcher)
})
.executes(css -> {
ServerPlayer player = css.getSource().getPlayerOrException();
- ServerLevel level = player.getLevel();
+ ServerLevel level = player.serverLevel();
Raid raid = level.getRaidAt(player.blockPosition());
if(raid == null) css.getSource().sendFailure(Component.literal("You must be near a Raid to use this command!"));
@@ -44,7 +44,7 @@ public static void register(CommandDispatcher dispatcher)
r.lookAt(css.getSource().getAnchor(), new Vec3(player.getX() - r.getX(), player.getY() - r.getY(), player.getZ() - r.getZ()));
r.setNoAi(true);
});
- css.getSource().sendSuccess(Component.literal(alive.size() + " raiders frozen!"), true);
+ css.getSource().sendSuccess(() -> Component.literal(alive.size() + " raiders frozen!"), true);
}
return 1;
diff --git a/src/main/java/com/calculusmaster/difficultraids/commands/PrintRaidersCommand.java b/src/main/java/com/calculusmaster/difficultraids/commands/PrintRaidersCommand.java
index 71f08cc..b4363b2 100644
--- a/src/main/java/com/calculusmaster/difficultraids/commands/PrintRaidersCommand.java
+++ b/src/main/java/com/calculusmaster/difficultraids/commands/PrintRaidersCommand.java
@@ -34,7 +34,7 @@ public static void register(CommandDispatcher dispatcher)
})
.executes(css -> {
ServerPlayer player = css.getSource().getPlayerOrException();
- ServerLevel level = player.getLevel();
+ ServerLevel level = player.serverLevel();
Raid raid = level.getRaidAt(player.blockPosition());
if(raid == null) css.getSource().sendFailure(Component.literal("You must be near a Raid to use this command!"));
@@ -50,7 +50,7 @@ public static void register(CommandDispatcher dispatcher)
String raiderList = "Raiders Currently Alive:\n" + s;
String totalRaiders = "Total Raiders Alive: " + raiderTypeCounts.values().stream().mapToInt(i -> i).sum();
- css.getSource().sendSuccess(Component.literal(raiderList + "\n" + totalRaiders), true);
+ css.getSource().sendSuccess(() -> Component.literal(raiderList + "\n" + totalRaiders), true);
}
return 1;
diff --git a/src/main/java/com/calculusmaster/difficultraids/commands/SetRaidDifficultyCommand.java b/src/main/java/com/calculusmaster/difficultraids/commands/SetRaidDifficultyCommand.java
index ce8f6fa..24d39b5 100644
--- a/src/main/java/com/calculusmaster/difficultraids/commands/SetRaidDifficultyCommand.java
+++ b/src/main/java/com/calculusmaster/difficultraids/commands/SetRaidDifficultyCommand.java
@@ -21,7 +21,7 @@ public static void register(CommandDispatcher dispatcher)
// dr_raiddifficulty get
literalArgumentBuilder.then(Commands.literal("get").executes(css -> {
ServerPlayer player = css.getSource().getPlayerOrException();
- Raid raid = player.getLevel().getRaidAt(player.blockPosition());
+ Raid raid = player.serverLevel().getRaidAt(player.blockPosition());
if(raid == null)
{
@@ -31,10 +31,10 @@ public static void register(CommandDispatcher dispatcher)
{
int level = player.getEffect(MobEffects.BAD_OMEN).getAmplifier() + 1;
- css.getSource().sendSuccess(Component.literal("Entering a Village will initiate a " + RaidDifficulty.get(level).getFormattedName() + " Raid with your current Bad Omen level."), false);
+ css.getSource().sendSuccess(() -> Component.literal("Entering a Village will initiate a " + RaidDifficulty.get(level).getFormattedName() + " Raid with your current Bad Omen level."), false);
}
}
- else css.getSource().sendSuccess(Component.literal("You're currently in a " + RaidDifficulty.get(raid.getBadOmenLevel()).getFormattedName() + " Raid."), false);
+ else css.getSource().sendSuccess(() -> Component.literal("You're currently in a " + RaidDifficulty.get(raid.getBadOmenLevel()).getFormattedName() + " Raid."), false);
return 1;
}));
@@ -56,14 +56,14 @@ public static void register(CommandDispatcher dispatcher)
css.getSource().getPlayerOrException().addEffect(new MobEffectInstance(MobEffects.BAD_OMEN, 100000, level - 1));
- css.getSource().sendSuccess(Component.literal("Entering a Village will initiate a " + difficulty.getFormattedName() + " Raid."), false);
+ css.getSource().sendSuccess(() -> Component.literal("Entering a Village will initiate a " + difficulty.getFormattedName() + " Raid."), false);
return 1;
})));
}
// dr_raiddifficulty info
literalArgumentBuilder.then(Commands.literal("info").executes(css -> {
- css.getSource().sendSuccess(Component.literal("To select a Raid Difficulty, obtain higher levels of Bad Omen. Level 1 spawns a Default Vanilla Raid, and higher levels spawn tougher Raids added by DifficultRaids (2: Hero, 3: Legend, 4: Master, 5: Grandmaster)."), false);
+ css.getSource().sendSuccess(() -> Component.literal("To select a Raid Difficulty, obtain higher levels of Bad Omen. Level 1 spawns a Default Vanilla Raid, and higher levels spawn tougher Raids added by DifficultRaids (2: Hero, 3: Legend, 4: Master, 5: Grandmaster)."), false);
return 1;
}));
diff --git a/src/main/java/com/calculusmaster/difficultraids/commands/ToggleInsanityModeCommand.java b/src/main/java/com/calculusmaster/difficultraids/commands/ToggleInsanityModeCommand.java
index 66ad623..6164639 100644
--- a/src/main/java/com/calculusmaster/difficultraids/commands/ToggleInsanityModeCommand.java
+++ b/src/main/java/com/calculusmaster/difficultraids/commands/ToggleInsanityModeCommand.java
@@ -29,7 +29,7 @@ public static void register(CommandDispatcher dispatcher)
})
.executes(css -> {
ServerPlayer player = css.getSource().getPlayerOrException();
- ServerLevel level = player.getLevel();
+ ServerLevel level = player.serverLevel();
Raid raid = level.getRaidAt(player.blockPosition());
boolean current = DifficultRaidsConfig.INSANITY_MODE.get();
@@ -40,7 +40,7 @@ public static void register(CommandDispatcher dispatcher)
if(raid != null) result.append(Component.literal(" (This change will apply on the next wave of the current Raid.)"));
- css.getSource().sendSuccess(result, true);
+ css.getSource().sendSuccess(() -> result, true);
return 1;
});
diff --git a/src/main/java/com/calculusmaster/difficultraids/config/RaiderConfigs.java b/src/main/java/com/calculusmaster/difficultraids/config/RaiderConfigs.java
index d42fa9a..68d159b 100644
--- a/src/main/java/com/calculusmaster/difficultraids/config/RaiderConfigs.java
+++ b/src/main/java/com/calculusmaster/difficultraids/config/RaiderConfigs.java
@@ -2,6 +2,7 @@
import com.calculusmaster.difficultraids.raids.RaidDifficulty;
import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
@@ -476,10 +477,10 @@ public void initialize()
public static class Necromancer extends RaiderConfig
{
- public static final TagKey> TAG_MINION_TYPES_HERO = TagKey.create(Registry.ENTITY_TYPE_REGISTRY, new ResourceLocation("difficultraids:necromancer/minion_types_hero"));
- public static final TagKey> TAG_MINION_TYPES_LEGEND = TagKey.create(Registry.ENTITY_TYPE_REGISTRY, new ResourceLocation("difficultraids:necromancer/minion_types_legend"));
- public static final TagKey> TAG_MINION_TYPES_MASTER = TagKey.create(Registry.ENTITY_TYPE_REGISTRY, new ResourceLocation("difficultraids:necromancer/minion_types_master"));
- public static final TagKey> TAG_MINION_TYPES_GRANDMASTER = TagKey.create(Registry.ENTITY_TYPE_REGISTRY, new ResourceLocation("difficultraids:necromancer/minion_types_grandmaster"));
+ public static final TagKey> TAG_MINION_TYPES_HERO = TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation("difficultraids:necromancer/minion_types_hero"));
+ public static final TagKey> TAG_MINION_TYPES_LEGEND = TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation("difficultraids:necromancer/minion_types_legend"));
+ public static final TagKey> TAG_MINION_TYPES_MASTER = TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation("difficultraids:necromancer/minion_types_master"));
+ public static final TagKey> TAG_MINION_TYPES_GRANDMASTER = TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation("difficultraids:necromancer/minion_types_grandmaster"));
public static final TagKey- TAG_HELMETS_HERO = ItemTags.create(new ResourceLocation("difficultraids:necromancer/helmets_hero"));
public static final TagKey
- TAG_HELMETS_LEGEND = ItemTags.create(new ResourceLocation("difficultraids:necromancer/helmets_legend"));
diff --git a/src/main/java/com/calculusmaster/difficultraids/data/raiderentries/DifficultyRaiderEntries.java b/src/main/java/com/calculusmaster/difficultraids/data/raiderentries/DifficultyRaiderEntries.java
index c57b45a..c119f0e 100644
--- a/src/main/java/com/calculusmaster/difficultraids/data/raiderentries/DifficultyRaiderEntries.java
+++ b/src/main/java/com/calculusmaster/difficultraids/data/raiderentries/DifficultyRaiderEntries.java
@@ -21,7 +21,7 @@ private static DataResult parseRaidDifficulty(String difficultyS
try
{ return DataResult.success(RaidDifficulty.valueOf(difficultyString.toUpperCase())); }
catch(IllegalArgumentException e)
- { return DataResult.error("Invalid Raid Difficulty: " + difficultyString); }
+ { return DataResult.error(() -> "Invalid Raid Difficulty: " + difficultyString); }
}
private final RaidDifficulty raidDifficulty; public RaidDifficulty getRaidDifficulty() { return this.raidDifficulty; }
diff --git a/src/main/java/com/calculusmaster/difficultraids/effects/WindCurseEffect.java b/src/main/java/com/calculusmaster/difficultraids/effects/WindCurseEffect.java
index b736bbe..993712e 100644
--- a/src/main/java/com/calculusmaster/difficultraids/effects/WindCurseEffect.java
+++ b/src/main/java/com/calculusmaster/difficultraids/effects/WindCurseEffect.java
@@ -1,6 +1,12 @@
package com.calculusmaster.difficultraids.effects;
+import net.minecraft.core.Holder;
+import net.minecraft.core.Holder.*;
+import net.minecraft.resources.ResourceKey;
import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.damagesource.DamageSources;
+import net.minecraft.world.damagesource.DamageType;
+import net.minecraft.world.damagesource.DamageTypes;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectCategory;
import net.minecraft.world.entity.LivingEntity;
@@ -38,7 +44,8 @@ public void applyEffectTick(LivingEntity pLivingEntity, int pAmplifier)
float damage = 1.25F * pAmplifier;
pLivingEntity.push(dX * modifier, dY, dZ * modifier);
- pLivingEntity.hurt(DamageSource.MAGIC, damage);
+ DamageSource damage_source = pLivingEntity.damageSources().magic();
+ pLivingEntity.hurt(damage_source, damage);
}
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/DREntityEvents.java b/src/main/java/com/calculusmaster/difficultraids/entity/DREntityEvents.java
index bf4614a..09613bf 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/DREntityEvents.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/DREntityEvents.java
@@ -10,6 +10,7 @@
import com.calculusmaster.difficultraids.setup.DifficultRaidsEnchantments;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
+import net.minecraft.tags.DamageTypeTags;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
@@ -85,12 +86,12 @@ public static void onEntityDamaged(LivingDamageEvent event)
float reduction = (equipped / (float)max) * maxReduction;
event.setAmount(event.getAmount() * (1.0F - reduction));
- target.getLevel().playSound(null, target, SoundEvents.GLASS_PLACE, SoundSource.PLAYERS, 2.5F, 0.7F);
+ target.level().playSound(null, target, SoundEvents.GLASS_PLACE, SoundSource.PLAYERS, 2.5F, 0.7F);
}
}
//Projectile Evasion
- if(event.getSource().isProjectile() && !event.getSource().isBypassArmor())
+ if(event.getSource().is(DamageTypeTags.IS_PROJECTILE) && !event.getSource().is(DamageTypeTags.BYPASSES_ARMOR))
{
int projectileEvasionLevel = event.getEntity().getItemBySlot(EquipmentSlot.FEET).getEnchantmentLevel(DifficultRaidsEnchantments.PROJECTILE_EVASION.get());
@@ -158,7 +159,7 @@ public static void onLivingHurt(LivingHurtEvent event)
if(random.nextFloat() < chance)
{
event.setAmount(event.getAmount() * multiplier);
- living.getLevel().playSound(null, living, SoundEvents.GLASS_BREAK, SoundSource.HOSTILE, 4.25F, 0.65F);
+ living.level().playSound(null, living, SoundEvents.GLASS_BREAK, SoundSource.HOSTILE, 4.25F, 0.65F);
}
}
}
@@ -175,7 +176,7 @@ public static void onLivingHurt(LivingHurtEvent event)
};
float damage = event.getAmount() * shieldedPercent;
- List nearbyTanks = raider.getLevel()
+ List nearbyTanks = raider.level()
.getNearbyEntities(TankIllagerEntity.class, TargetingConditions.DEFAULT, raider, raider.getBoundingBox().inflate(4.0D))
.stream()
.filter(tank -> tank.getHealth() > damage)
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/AshenadoObject.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/AshenadoObject.java
index 5009202..7f72f28 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/AshenadoObject.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/AshenadoObject.java
@@ -3,6 +3,7 @@
import com.calculusmaster.difficultraids.entity.entities.raider.AshenmancerIllagerEntity;
import com.calculusmaster.difficultraids.raids.RaidDifficulty;
import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
import net.minecraft.core.particles.BlockParticleOption;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
@@ -27,7 +28,7 @@ public class AshenadoObject
private final ServerLevel level;
private final RaidDifficulty raidDifficulty;
- private Vec3 center;
+ private Vec3i center;
private int life;
private AABB coreArea;
@@ -35,10 +36,10 @@ public class AshenadoObject
private List particlePositions;
private boolean firstTick;
- public AshenadoObject(AshenmancerIllagerEntity owner, RaidDifficulty raidDifficulty, Vec3 center, int life)
+ public AshenadoObject(AshenmancerIllagerEntity owner, RaidDifficulty raidDifficulty, Vec3i center, int life)
{
this.owner = owner;
- this.level = (ServerLevel)owner.getLevel();
+ this.level = (ServerLevel)owner.level();
this.raidDifficulty = raidDifficulty;
this.center = center;
this.life = life;
@@ -51,10 +52,11 @@ public AshenadoObject(AshenmancerIllagerEntity owner, RaidDifficulty raidDifficu
public AshenadoObject(AshenmancerIllagerEntity owner, CompoundTag tag)
{
this.owner = owner;
- this.level = (ServerLevel)owner.getLevel();
+ this.level = (ServerLevel)owner.level();
this.raidDifficulty = RaidDifficulty.valueOf(tag.getString("AshenadoRaidDifficulty"));
- this.center = new Vec3(tag.getDouble("AshenadoCenterX"), tag.getDouble("AshenadoCenterY"), tag.getDouble("AshenadoCenterZ"));
+ Vec3 center = new Vec3(tag.getDouble("AshenadoCenterX"), tag.getDouble("AshenadoCenterY"), tag.getDouble("AshenadoCenterZ"));
+ this.center = new Vec3i((int) center.x, (int) center.y, (int) center.z);
this.life = tag.getInt("AshenadoLife");
this.firstTick = true;
@@ -65,9 +67,9 @@ public AshenadoObject(AshenmancerIllagerEntity owner, CompoundTag tag)
public void save(CompoundTag tag)
{
tag.putString("AshenadoRaidDifficulty", this.raidDifficulty.toString());
- tag.putDouble("AshenadoCenterX", this.center.x());
- tag.putDouble("AshenadoCenterY", this.center.y());
- tag.putDouble("AshenadoCenterZ", this.center.z());
+ tag.putDouble("AshenadoCenterX", this.center.getX());
+ tag.putDouble("AshenadoCenterY", this.center.getY());
+ tag.putDouble("AshenadoCenterZ", this.center.getZ());
tag.putInt("AshenadoLife", this.life);
}
@@ -78,11 +80,11 @@ private void generateArea()
this.coreArea = new AABB(new BlockPos(this.center))
.inflate(radius * 0.5, 0, radius * 0.5)
- .setMaxY(this.center.y() + height);
+ .setMaxY(this.center.getY() + height);
this.fullArea = new AABB(new BlockPos(this.center))
.inflate(radius, 0, radius)
- .setMaxY(this.center.y() + height);
+ .setMaxY(this.center.getY() + height);
this.particlePositions = new ArrayList<>();
for(float y = 0; y < height; y += 0.25)
@@ -115,7 +117,10 @@ public void tick()
if(!this.firstTick && this.life % 100 == 0)
{
- this.center = this.center.add(5 - this.level.random.nextInt(11), 0, 5 - this.level.random.nextInt(11));
+// this.center = this.center.add(5 - this.level.random.nextInt(11), 0, 5 - this.level.random.nextInt(11));
+ this.center = new Vec3i(this.center.getX() + 5 - this.level.random.nextInt(11),
+ this.center.getY(),
+ this.center.getZ() + 5 - this.level.random.nextInt(11));
this.generateArea();
}
@@ -146,7 +151,9 @@ private void applyEffects()
this.level
.getEntitiesOfClass(LivingEntity.class, this.coreArea, validTarget)
- .forEach(l -> l.hurt(DamageSource.mobAttack(this.owner).bypassArmor().bypassEnchantments().bypassMagic(), 2.0F));
+ // this damage is supposed to bypass armor, enchantments, and magic.
+ // but idk how to make that happen. so for now it will do none of those things
+ .forEach(l -> l.hurt(l.damageSources().mobAttack(this.owner), 2.0F));
}
public boolean isComplete()
@@ -154,7 +161,7 @@ public boolean isComplete()
return this.life == 0;
}
- public Vec3 getCenter()
+ public Vec3i getCenter()
{
return this.center;
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/FrostSnowballEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/FrostSnowballEntity.java
index e4680af..42a1e43 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/FrostSnowballEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/FrostSnowballEntity.java
@@ -33,7 +33,7 @@ protected void onHitEntity(EntityHitResult pResult)
//Blaze stuff is handled by the super call
if(!(entity instanceof Blaze) && !(entity instanceof Raider))
{
- entity.hurt(DamageSource.thrown(this, this.getOwner()), this.damage);
+ entity.hurt(this.damageSources().thrown(this, this.getOwner()), this.damage);
}
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/ShamanDebuffBulletEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/ShamanDebuffBulletEntity.java
index c1c0f18..0a0abef 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/ShamanDebuffBulletEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/ShamanDebuffBulletEntity.java
@@ -60,7 +60,7 @@ protected void onHitEntity(EntityHitResult pResult)
{
if(this.getOwner() instanceof LivingEntity owner && pResult.getEntity() instanceof LivingEntity hitEntity && !(hitEntity instanceof Raider))
{
- boolean hitSuccess = hitEntity.hurt(DamageSource.indirectMobAttack(this, owner), 3.0F);
+ boolean hitSuccess = hitEntity.hurt(this.damageSources().mobAttack(owner), 3.0F);
if(hitSuccess) this.doEnchantDamageEffects(owner, this);
this.getModifiedDebuffs(hitSuccess ? 1.0 : 0.5).forEach(d -> hitEntity.addEffect(d, this));
@@ -73,16 +73,16 @@ protected void onHitBlock(BlockHitResult p_37343_)
BlockPos pos = p_37343_.getBlockPos();
AABB applyRange = new AABB(pos).inflate(2.0);
- if(this.level.isClientSide)
+ if(this.level().isClientSide)
{
- this.level.addParticle(ParticleTypes.ASH, pos.getX(), pos.getY(), pos.getZ(), 0.0D, 0.2D, 0.0D);
+ this.level().addParticle(ParticleTypes.ASH, pos.getX(), pos.getY(), pos.getZ(), 0.0D, 0.2D, 0.0D);
}
List targets = new ArrayList<>();
- targets.addAll(this.level.getEntitiesOfClass(Player.class, applyRange));
- targets.addAll(this.level.getEntitiesOfClass(IronGolem.class, applyRange));
- targets.addAll(this.level.getEntitiesOfClass(AbstractVillager.class, applyRange));
- if(Compat.GUARD_VILLAGERS.isLoaded()) targets.addAll(this.level.getEntitiesOfClass(Guard.class, applyRange));
+ targets.addAll(this.level().getEntitiesOfClass(Player.class, applyRange));
+ targets.addAll(this.level().getEntitiesOfClass(IronGolem.class, applyRange));
+ targets.addAll(this.level().getEntitiesOfClass(AbstractVillager.class, applyRange));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) targets.addAll(this.level().getEntitiesOfClass(Guard.class, applyRange));
List debuffs = this.getModifiedDebuffs(0.75);
targets.forEach(living -> debuffs.forEach(living::addEffect));
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/VoldonFamiliarEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/VoldonFamiliarEntity.java
index df6cca1..7f9e7fa 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/VoldonFamiliarEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/VoldonFamiliarEntity.java
@@ -86,7 +86,7 @@ public void readAdditionalSaveData(CompoundTag pCompound)
{
super.readAdditionalSaveData(pCompound);
- this.voldon = pCompound.getInt("VoldonID") == -1 ? null : (VoldonEliteEntity)this.level.getEntity(pCompound.getInt("VoldonID"));
+ this.voldon = pCompound.getInt("VoldonID") == -1 ? null : (VoldonEliteEntity)this.level().getEntity(pCompound.getInt("VoldonID"));
}
@Override
@@ -139,7 +139,7 @@ protected void customServerAiStep()
if(this.voldon == null || this.voldon.isDeadOrDying())
{
- this.hurt(DamageSource.STARVE, this.getHealth() + 1.0F);
+ this.hurt(this.damageSources().starve(), this.getHealth() + 1.0F);
return;
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/WindColumnObject.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/WindColumnObject.java
index 5108565..9158754 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/WindColumnObject.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/WindColumnObject.java
@@ -12,6 +12,7 @@
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
import java.util.Random;
@@ -31,7 +32,7 @@ public class WindColumnObject
public WindColumnObject(XydraxEliteEntity owner, BlockPos startPos, int life)
{
this.owner = owner;
- this.level = (ServerLevel)owner.getLevel();
+ this.level = (ServerLevel)owner.level();
this.position = startPos;
this.life = life;
@@ -114,8 +115,8 @@ private void spawnParticles()
{
for(int i = 0; i < this.height; i += 3)
{
- BlockPos particlePos = this.position.offset(0.5, i, 0.5);
- this.level.sendParticles(new BlockParticleOption(ParticleTypes.FALLING_DUST, Blocks.WHITE_WOOL.defaultBlockState()), particlePos.getX(), particlePos.getY(), particlePos.getZ(), 1, 0.15, 0, 0.15, 2.0);
+ Vec3 particlePos = new Vec3(this.position.getX() + 0.5, this.position.getY() + i, this.position.getZ() + 0.5);
+ this.level.sendParticles(new BlockParticleOption(ParticleTypes.FALLING_DUST, Blocks.WHITE_WOOL.defaultBlockState()), particlePos.x(), particlePos.y(), particlePos.z(), 1, 0.15, 0, 0.15, 2.0);
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/core/AbstractEvokerVariant.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/core/AbstractEvokerVariant.java
index 9afe899..fab80c3 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/core/AbstractEvokerVariant.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/core/AbstractEvokerVariant.java
@@ -63,7 +63,7 @@ public IllagerArmPose getArmPose()
public boolean isCastingSpell()
{
- if(this.level.isClientSide) return this.entityData.get(SPELL_DATA) > 0;
+ if(this.level().isClientSide) return this.entityData.get(SPELL_DATA) > 0;
else return this.spellTicks > 0;
}
@@ -75,7 +75,7 @@ public void setSpellType(SpellType spellType)
protected SpellType getSpellType()
{
- return !this.level.isClientSide ? this.activeSpell : SpellType.getFromID(this.entityData.get(SPELL_DATA));
+ return !this.level().isClientSide ? this.activeSpell : SpellType.getFromID(this.entityData.get(SPELL_DATA));
}
@Override
@@ -96,7 +96,7 @@ public void tick()
{
super.tick();
- if(this.level.isClientSide && this.isCastingSpell() && this.spawnDefaultSpellcastingParticles())
+ if(this.level().isClientSide && this.isCastingSpell() && this.spawnDefaultSpellcastingParticles())
{
SpellType spellType = this.getSpellType();
double d0 = spellType.spellColor[0];
@@ -105,8 +105,8 @@ public void tick()
float f = this.yBodyRot * ((float)Math.PI / 180F) + Mth.cos((float)this.tickCount * 0.6662F) * 0.25F;
float f1 = Mth.cos(f);
float f2 = Mth.sin(f);
- this.level.addParticle(ParticleTypes.ENTITY_EFFECT, this.getX() + (double)f1 * 0.6D, this.getY() + 1.8D, this.getZ() + (double)f2 * 0.6D, d0, d1, d2);
- this.level.addParticle(ParticleTypes.ENTITY_EFFECT, this.getX() - (double)f1 * 0.6D, this.getY() + 1.8D, this.getZ() - (double)f2 * 0.6D, d0, d1, d2);
+ this.level().addParticle(ParticleTypes.ENTITY_EFFECT, this.getX() + (double)f1 * 0.6D, this.getY() + 1.8D, this.getZ() + (double)f2 * 0.6D, d0, d1, d2);
+ this.level().addParticle(ParticleTypes.ENTITY_EFFECT, this.getX() - (double)f1 * 0.6D, this.getY() + 1.8D, this.getZ() - (double)f2 * 0.6D, d0, d1, d2);
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/ModurEliteEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/ModurEliteEntity.java
index 2073beb..e86a8b1 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/ModurEliteEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/ModurEliteEntity.java
@@ -128,9 +128,9 @@ public void die(DamageSource pCause)
{
super.die(pCause);
- this.spawnCustomBolt(this.blockPosition().offset(0, 0.2, 0), 15.0F);
+ this.spawnCustomBolt(this.blockPosition(), 15.0F);
- if(!this.level.isClientSide && this.level.isThundering()) ((ServerLevel)ModurEliteEntity.this.level).setWeatherParameters(6000, 0, false, false);
+ if(!this.level().isClientSide && this.level().isThundering()) ((ServerLevel)ModurEliteEntity.this.level()).setWeatherParameters(6000, 0, false, false);
}
@Override
@@ -194,15 +194,15 @@ public boolean isStormActive()
private void spawnCustomBolt(BlockPos spawn, float damage)
{
- LightningBolt bolt = EntityType.LIGHTNING_BOLT.create(this.level); if(bolt == null) return;
+ LightningBolt bolt = EntityType.LIGHTNING_BOLT.create(this.level()); if(bolt == null) return;
- if(this.level.isThundering()) damage *= 1.25F;
+ if(this.level().isThundering()) damage *= 1.25F;
bolt.setCustomName(Component.literal(DifficultRaidsUtil.ELECTRO_ILLAGER_CUSTOM_BOLT_TAG));
bolt.setDamage(damage);
bolt.moveTo(spawn, 0.0F, 0.0F);
- this.level.addFreshEntity(bolt);
+ this.level().addFreshEntity(bolt);
}
@Override
@@ -222,7 +222,7 @@ public void tick()
int strikeZ = this.random.nextInt((int)this.stormAABB.minZ, (int)(this.stormAABB.maxZ + 1));
BlockPos strikePos = new BlockPos(strikeX, strikeY, strikeZ);
- int tries = 0; while(!this.level.getBlockState(strikePos).isAir() && tries++ < 20) strikePos = strikePos.above(1);
+ int tries = 0; while(!this.level().getBlockState(strikePos).isAir() && tries++ < 20) strikePos = strikePos.above(1);
ModurEliteEntity.this.spawnCustomBolt(strikePos, cfg.stormStrikeDamage);
}
@@ -234,7 +234,7 @@ public void tick()
if(this.chargedBoltWarmup > 0)
{
//Sounds
- if(this.chargedBoltWarmup % 30 == 0) this.level.playLocalSound(this.chargedBoltPos.getX(), this.chargedBoltPos.getY(), this.chargedBoltPos.getZ(),
+ if(this.chargedBoltWarmup % 30 == 0) this.level().playLocalSound(this.chargedBoltPos.getX(), this.chargedBoltPos.getY(), this.chargedBoltPos.getZ(),
SoundEvents.EVOKER_PREPARE_SUMMON, SoundSource.HOSTILE, 2.0F, 0.7F, false);
//Particles
@@ -247,7 +247,7 @@ public void tick()
this.chargedBoltPos.offset(1, i, 0),
this.chargedBoltPos.offset(0, i, 1),
this.chargedBoltPos.offset(1, i, 1)
- ).forEach(pos -> ((ServerLevel)this.level).sendParticles(new BlockParticleOption(ParticleTypes.FALLING_DUST, Blocks.WHITE_WOOL.defaultBlockState()), pos.getX(), pos.getY(), pos.getZ(), 2, 0.15, 0, 0.15, 2.0));
+ ).forEach(pos -> ((ServerLevel)this.level()).sendParticles(new BlockParticleOption(ParticleTypes.FALLING_DUST, Blocks.WHITE_WOOL.defaultBlockState()), pos.getX(), pos.getY(), pos.getZ(), 2, 0.15, 0, 0.15, 2.0));
}
//Logic
@@ -293,8 +293,8 @@ protected void castSpell()
{
ModurEliteEntity modur = ModurEliteEntity.this;
- Vec3 v = ModurEliteEntity.this.getLookAngle();
- modur.homingBoltPos = modur.blockPosition().offset(v.x, 0, v.z);
+// Vec3 v = ModurEliteEntity.this.getLookAngle();
+ modur.homingBoltPos = modur.blockPosition();
modur.homingBoltTicks = modur.config().modur.homingBoltTime;
}
@@ -399,7 +399,7 @@ protected void castSpell()
if(!this.targetPos.equals(BlockPos.ZERO))
{
for(int i = 0; i < 3; i++)
- ModurEliteEntity.this.spawnCustomBolt(this.targetPos.offset(0.5 - Math.random(), 0, 0.5 - Math.random()),
+ ModurEliteEntity.this.spawnCustomBolt(this.targetPos,
ModurEliteEntity.this.config().modur.zapBoltDamage);
}
}
@@ -478,7 +478,7 @@ protected void castSpell()
@Override
public boolean canUse()
{
- return super.canUse() && ModurEliteEntity.this.level.isThundering() && !ModurEliteEntity.this.isInExtendedSpellState();
+ return super.canUse() && ModurEliteEntity.this.level().isThundering() && !ModurEliteEntity.this.isInExtendedSpellState();
}
@Override
@@ -520,13 +520,13 @@ private ModurSummonThunderSpellGoal() {}
@Override
protected void castSpell()
{
- ((ServerLevel)ModurEliteEntity.this.level).setWeatherParameters(0, 20 * 60 * 5, true, true);
+ ((ServerLevel)ModurEliteEntity.this.level()).setWeatherParameters(0, 20 * 60 * 5, true, true);
}
@Override
public boolean canUse()
{
- return !ModurEliteEntity.this.level.getLevelData().isThundering();
+ return !ModurEliteEntity.this.level().getLevelData().isThundering();
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/NuaosEliteEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/NuaosEliteEntity.java
index de1050a..39cfc7a 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/NuaosEliteEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/NuaosEliteEntity.java
@@ -8,6 +8,8 @@
import com.calculusmaster.difficultraids.util.Compat;
import com.calculusmaster.difficultraids.util.DifficultRaidsUtil;
import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.Vec3;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
@@ -210,8 +212,10 @@ public void tick()
if(charge == ChargeState.HIGH_CHARGE || charge == ChargeState.MAX_CHARGE)
for(int i = 0; i < 3; i++)
{
- BlockPos particlePos = new BlockPos(this.getEyePosition()).offset(0.25 + 0.4 - this.random.nextFloat() * 0.8, 0.25 + this.random.nextFloat() * 0.1,0.25 + 0.4 - this.random.nextFloat() * 0.8);
- this.level.addParticle(ParticleTypes.CAMPFIRE_COSY_SMOKE, particlePos.getX(), particlePos.getY(), particlePos.getZ(), 0.05, 0.2, 0.05);
+ Vec3 eye_pos = new Vec3(this.getEyePosition().x, (int)this.getEyePosition().y, (int)this.getEyePosition().z);
+ Vec3 particle_pos = new Vec3(eye_pos.x() + 0.25 + 0.4 - this.random.nextFloat() * 0.8, eye_pos.y() + 0.25 + this.random.nextFloat() * 0.1, eye_pos.z() + 0.25 + 0.4 - this.random.nextFloat() * 0.8);
+// BlockPos particlePos = new BlockPos(eye_pos).offset(0.25 + 0.4 - this.random.nextFloat() * 0.8, 0.25 + this.random.nextFloat() * 0.1,0.25 + 0.4 - this.random.nextFloat() * 0.8);
+ this.level().addParticle(ParticleTypes.CAMPFIRE_COSY_SMOKE, particle_pos.x(), particle_pos.y(), particle_pos.z(), 0.05, 0.2, 0.05);
}
}
}
@@ -246,7 +250,7 @@ protected void customServerAiStep()
double shockwaveRadius = rd.config().nuaos.shockwaveRadius;
AABB shockwaveAABB = new AABB(this.blockPosition()).inflate(shockwaveRadius);
- List targets = this.level.getEntitiesOfClass(LivingEntity.class, shockwaveAABB, entity -> canReceiveDamage.stream().anyMatch(type -> entity.getType().equals(type)));
+ List targets = this.level().getEntitiesOfClass(LivingEntity.class, shockwaveAABB, entity -> canReceiveDamage.stream().anyMatch(type -> entity.getType().equals(type)));
if(!targets.isEmpty())
{
@@ -265,7 +269,7 @@ protected void customServerAiStep()
damage = Math.max(falloffDamage, minDamage);
}
- t.hurt(DamageSource.mobAttack(this), damage);
+ t.hurt(this.damageSources().mobAttack(this), damage);
}
}
}
@@ -276,13 +280,13 @@ protected void customServerAiStep()
int strengthAmplifier = rd.config().nuaos.buffAuraStrengthLevel;
- this.level.getEntitiesOfClass(Raider.class, auraRadius, r -> DifficultRaidsUtil.STANDARD_RAIDERS.contains(r.getType())).forEach(raider ->
+ this.level().getEntitiesOfClass(Raider.class, auraRadius, r -> DifficultRaidsUtil.STANDARD_RAIDERS.contains(r.getType())).forEach(raider ->
{
if(!raider.hasEffect(MobEffects.DAMAGE_BOOST))
raider.addEffect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, 20 * 10, strengthAmplifier, false, true));
});
- this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.SPLASH_POTION_BREAK, SoundSource.HOSTILE, 3.0F, 1.0F, false);
+ this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.SPLASH_POTION_BREAK, SoundSource.HOSTILE, 3.0F, 1.0F, false);
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/VoldonEliteEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/VoldonEliteEntity.java
index c26b0b8..27dfef4 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/VoldonEliteEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/VoldonEliteEntity.java
@@ -94,7 +94,7 @@ public void readAdditionalSaveData(CompoundTag pCompound)
{
super.readAdditionalSaveData(pCompound);
- for(int ID : pCompound.getIntArray("FamiliarIDs")) if(this.level.getEntity(ID) instanceof LivingEntity familiar) this.familiars.add(familiar);
+ for(int ID : pCompound.getIntArray("FamiliarIDs")) if(this.level().getEntity(ID) instanceof LivingEntity familiar) this.familiars.add(familiar);
this.checkFamiliars = pCompound.getBoolean("CheckFamiliars");
this.familiarTag = pCompound.getString("FamiliarTag");
@@ -168,10 +168,10 @@ public void die(DamageSource pCause)
{
BlockPos spawnPos = pos.offset(5 - this.random.nextInt(1, 10), 1, 5 - this.random.nextInt(1, 10));
- Monster zombie = EntityType.ZOMBIE.create(this.level);
+ Monster zombie = EntityType.ZOMBIE.create(this.level());
zombie.moveTo(spawnPos, this.getYHeadRot(), this.getXRot());
- zombie.targetSelector.removeAllGoals();
+ zombie.targetSelector.removeAllGoals(goal -> (true));
zombie.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(zombie, Villager.class, true));
zombie.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(zombie, Player.class, true));
zombie.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(zombie, IronGolem.class, true));
@@ -179,7 +179,7 @@ public void die(DamageSource pCause)
if(pCause.getEntity() instanceof LivingEntity living) zombie.setTarget(living);
- this.level.addFreshEntity(zombie);
+ this.level().addFreshEntity(zombie);
}
}
@@ -187,9 +187,9 @@ public void die(DamageSource pCause)
public void tick()
{
super.tick();
- if(!this.level.isClientSide) this.familiars.removeIf(LivingEntity::isDeadOrDying);
+ if(!this.level().isClientSide) this.familiars.removeIf(LivingEntity::isDeadOrDying);
- if(this.checkFamiliars && this.level instanceof ServerLevel serverLevel)
+ if(this.checkFamiliars && this.level() instanceof ServerLevel serverLevel)
{
this.familiars.addAll(serverLevel.getEntitiesOfClass(VoldonFamiliarEntity.class, this.getBoundingBox().inflate(FAMILIAR_CHECK_RADIUS), e -> e.getTags().contains(this.familiarTag)));
@@ -216,7 +216,7 @@ public void performRangedAttack(LivingEntity pTarget, float pDistanceFactor)
for(int i = 0; i < count; i++)
{
- SmallFireball fireball = new SmallFireball(this.level, this, this.random.triangle(d1, 2.297D * d4), d2, this.random.triangle(d3, 2.297D * d4))
+ SmallFireball fireball = new SmallFireball(this.level(), this, this.random.triangle(d1, 2.297D * d4), d2, this.random.triangle(d3, 2.297D * d4))
{
@Override
protected void onHitEntity(EntityHitResult pResult)
@@ -227,10 +227,10 @@ protected void onHitEntity(EntityHitResult pResult)
};
fireball.setPos(fireball.getX(), this.getY(0.5D) + 0.5D, fireball.getZ());
- this.level.addFreshEntity(fireball);
+ this.level().addFreshEntity(fireball);
}
- this.level.addParticle(ParticleTypes.SMALL_FLAME, this.getX(), this.getEyeY() + 0.4, this.getZ(), 0.2, 0.0, 0.3);
+ this.level().addParticle(ParticleTypes.SMALL_FLAME, this.getX(), this.getEyeY() + 0.4, this.getZ(), 0.2, 0.0, 0.3);
}
private class VoldonCastSpellGoal extends SpellcastingIllagerCastSpellGoal
@@ -273,7 +273,7 @@ protected void castSpell()
f.addEffect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, effectDuration / 4, 1, false, false));
});
- sacrifice.hurt(DamageSource.STARVE, sacrifice.getHealth() + 1.0F);
+ sacrifice.hurt(sacrifice.damageSources().starve(), sacrifice.getHealth() + 1.0F);
}
}
@@ -334,8 +334,8 @@ protected void castSpell()
VoldonEliteEntity.this.getLookControl().setLookAt(target);
double yOffset = 0.3;
- BlockPos targetPos = target.blockPosition().offset(0, yOffset, 0);
- BlockPos thisPos = VoldonEliteEntity.this.blockPosition().offset(0, yOffset, 0);
+ BlockPos targetPos = target.blockPosition();
+ BlockPos thisPos = VoldonEliteEntity.this.blockPosition();
VoldonEliteEntity.this.teleportToWithTicket(targetPos.getX(), targetPos.getY(), targetPos.getZ());
target.teleportToWithTicket(thisPos.getX(), thisPos.getY(), thisPos.getZ());
@@ -397,14 +397,14 @@ protected void castSpell()
Supplier familiarPos = () -> sourcePos.offset(VoldonEliteEntity.this.random.nextInt(2, 10), VoldonEliteEntity.this.random.nextInt(2, 4), VoldonEliteEntity.this.random.nextInt(2, 10));
for(int i = 0; i < familiarCount; i++)
{
- Monster familiar = new VoldonFamiliarEntity(VoldonEliteEntity.this.level, VoldonEliteEntity.this);
+ Monster familiar = new VoldonFamiliarEntity(VoldonEliteEntity.this.level(), VoldonEliteEntity.this);
familiar.moveTo(familiarPos.get(), 0.0F, 0.0F);
familiar.setOnGround(true);
familiar.addTag(VoldonEliteEntity.this.familiarTag);
familiar.addEffect(new MobEffectInstance(MobEffects.GLOWING, 10000, 1, false, false));
- VoldonEliteEntity.this.level.addFreshEntity(familiar);
+ VoldonEliteEntity.this.level().addFreshEntity(familiar);
VoldonEliteEntity.this.familiars.add(familiar);
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/XydraxEliteEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/XydraxEliteEntity.java
index 6e0af9f..2ac6f39 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/XydraxEliteEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/XydraxEliteEntity.java
@@ -8,6 +8,7 @@
import com.calculusmaster.difficultraids.setup.DifficultRaidsEffects;
import com.calculusmaster.difficultraids.util.Compat;
import net.minecraft.core.BlockPos;
+import net.minecraft.core.Position;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
@@ -162,10 +163,10 @@ public void tick()
{
//Slow Descent
Vec3 deltaMove = this.getDeltaMovement();
- if(!this.isVortexActive() && !this.isOnGround() && deltaMove.y() < 0) this.setDeltaMovement(deltaMove.multiply(1.0D, 0.55D, 1.0D));
+ if(!this.isVortexActive() && !this.onGround() && deltaMove.y() < 0) this.setDeltaMovement(deltaMove.multiply(1.0D, 0.55D, 1.0D));
//Healing Checks
- if(this.isOnGround()) this.isHealing = false;
+ if(this.onGround()) this.isHealing = false;
else if(this.random.nextBoolean())
{
float currentHealth = this.getHealth();
@@ -192,21 +193,21 @@ else if(this.random.nextBoolean())
//Extremely slow descent
Vec3 deltaMove = this.getDeltaMovement();
- if(!this.isOnGround() && deltaMove.y() < 0) this.setDeltaMovement(deltaMove.multiply(1.0D, 0.1D, 1.0D));
+ if(!this.onGround() && deltaMove.y() < 0) this.setDeltaMovement(deltaMove.multiply(1.0D, 0.1D, 1.0D));
//Particles
for(int i = this.vortexFloor.getY(); i < this.blockPosition().getY(); i++)
{
- BlockPos pos = new BlockPos(this.vortexFloor.getX() + 0.5, i, this.vortexFloor.getZ() + 0.5);
- ((ServerLevel)this.level).sendParticles(ParticleTypes.FALLING_OBSIDIAN_TEAR, pos.getX(), pos.getY(), pos.getZ(), 1, 0.05, 0, 0.05, 1.0);
+ Vec3 pos = new Vec3(this.vortexFloor.getX() + 0.5, i, this.vortexFloor.getZ() + 0.5);
+ ((ServerLevel)this.level()).sendParticles(ParticleTypes.FALLING_OBSIDIAN_TEAR, pos.x(), pos.y(), pos.z(), 1, 0.05, 0, 0.05, 1.0);
}
//Vortex Pull
if(this.vortexTicks % cfg.xydrax.vortexPullInterval == 0)
{
this.getVortexTargets().forEach(e -> {
- BlockPos targetPos = e.blockPosition().offset(0.5, 0, 0.5);
- Vec3 targetVector = new Vec3(this.vortexFloor.getX() - targetPos.getX(), this.vortexFloor.getY() - targetPos.getY(), this.vortexFloor.getZ() - targetPos.getZ()).normalize();
+ Vec3 targetPos = new Vec3(e.position().x() + 0.5, e.position().y(), e.position().z() + 0.5);
+ Vec3 targetVector = new Vec3(this.vortexFloor.getX() - targetPos.x(), this.vortexFloor.getY() - targetPos.y(), this.vortexFloor.getZ() - targetPos.z()).normalize();
double force = cfg.xydrax.vortexForce;
@@ -234,7 +235,7 @@ else if(this.random.nextBoolean())
damage *= cfg.xydrax.vortexDamageMultiplier;
- if(damage != 0.0F) e.hurt(DamageSource.mobAttack(this), (float)damage);
+ if(damage != 0.0F) e.hurt(this.damageSources().mobAttack(this), (float)damage);
});
}
}
@@ -295,7 +296,7 @@ private void createVortexAABB()
private void summonWindColumns()
{
- BlockPos center = new BlockPos(this.blockPosition()).offset(0, 0.05, 0);
+ BlockPos center = new BlockPos(this.blockPosition());
RaidDifficulty raidDifficulty = this.isInDifficultRaid() ? this.getRaidDifficulty() : RaidDifficulty.DEFAULT;
@@ -357,7 +358,7 @@ private void summonWindColumns()
private List getVortexTargets()
{
- return this.level.getEntitiesOfClass(LivingEntity.class, this.vortexAABB, e ->
+ return this.level().getEntitiesOfClass(LivingEntity.class, this.vortexAABB, e ->
{
if(e.isAlliedTo(this)) return false;
else if(e instanceof Player player) return !player.isCreative() && !player.isSpectator();
@@ -404,8 +405,8 @@ private XydraxVortexSpellGoal() {}
private boolean isEntityNearby()
{
XydraxEliteEntity xydrax = XydraxEliteEntity.this;
- AABB search = new AABB(xydrax.blockPosition().offset(0.5, 1.0, 0.5)).inflate(10.0);
- return !xydrax.level.getEntitiesOfClass(LivingEntity.class, search, e -> !e.isAlliedTo(XydraxEliteEntity.this)).isEmpty();
+ AABB search = new AABB(xydrax.blockPosition().offset(0, 1, 0)).inflate(10.0);
+ return !xydrax.level().getEntitiesOfClass(LivingEntity.class, search, e -> !e.isAlliedTo(XydraxEliteEntity.this)).isEmpty();
}
@Override
@@ -414,7 +415,7 @@ protected void castSpell()
XydraxEliteEntity xydrax = XydraxEliteEntity.this;
//Set up vortex bounds
- xydrax.vortexFloor = XydraxEliteEntity.this.blockPosition().offset(0.5, -0.05, 0.5);
+ xydrax.vortexFloor = XydraxEliteEntity.this.blockPosition();
xydrax.createVortexAABB();
//Push Xydrax into air
@@ -480,7 +481,7 @@ protected void castSpell()
@Override
public boolean canUse()
{
- return super.canUse() && !XydraxEliteEntity.this.isInExtendedSpellState() && XydraxEliteEntity.this.isOnGround();
+ return super.canUse() && !XydraxEliteEntity.this.isInExtendedSpellState() && XydraxEliteEntity.this.onGround();
}
@Override
@@ -585,7 +586,7 @@ protected void castSpell()
for(int i = 0; i < 12; i++)
{
- Arrow arrow = new Arrow(XydraxEliteEntity.this.level, XydraxEliteEntity.this)
+ Arrow arrow = new Arrow(XydraxEliteEntity.this.level(), XydraxEliteEntity.this)
{
@Override
protected void onHitBlock(BlockHitResult p_36755_) { super.onHitBlock(p_36755_); this.discard(); }
@@ -612,7 +613,7 @@ protected void onHitEntity(EntityHitResult pResult)
double distanceY = Math.sqrt(targetX * targetX + targetZ * targetZ) * (double)0.2F;
arrow.shoot(targetX, targetArrowY + distanceY, targetZ, 1.5F, 25.0F);
- XydraxEliteEntity.this.level.addFreshEntity(arrow);
+ XydraxEliteEntity.this.level().addFreshEntity(arrow);
}
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AshenmancerIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AshenmancerIllagerEntity.java
index 6e03fae..a1c9c13 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AshenmancerIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AshenmancerIllagerEntity.java
@@ -6,6 +6,7 @@
import com.calculusmaster.difficultraids.raids.RaidDifficulty;
import com.calculusmaster.difficultraids.util.Compat;
import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
@@ -149,7 +150,7 @@ public boolean canSpawnMinion()
public void setMinionTargets(WitherSkeleton minion)
{
- minion.targetSelector.removeAllGoals();
+ minion.targetSelector.removeAllGoals(goal -> (true));
minion.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(minion, Player.class, true));
minion.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(minion, IronGolem.class, true));
minion.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(minion, AbstractVillager.class, true));
@@ -184,7 +185,7 @@ protected void customServerAiStep()
//Loading
if(this.checkMinions)
{
- this.minions.addAll(this.level.getEntitiesOfClass(WitherSkeleton.class, this.getBoundingBox().inflate(SUMMON_CHECK_RADIUS), e -> e.getTags().contains(this.minionTag)));
+ this.minions.addAll(this.level().getEntitiesOfClass(WitherSkeleton.class, this.getBoundingBox().inflate(SUMMON_CHECK_RADIUS), e -> e.getTags().contains(this.minionTag)));
this.checkMinions = this.tickCount <= 100 && this.minions.isEmpty();
@@ -205,7 +206,7 @@ protected void customServerAiStep()
if(this.tickCount % 40 == 0 && ws.getHealth() < ws.getMaxHealth() * 0.75 && ws.distanceTo(this) <= 3.0)
{
ws.heal(1.0F);
- ((ServerLevel)this.level).sendParticles(ParticleTypes.HAPPY_VILLAGER, ws.getX(), ws.getEyeY() + 0.25, ws.getZ(), 3, this.random.nextFloat() / 2, this.random.nextFloat() / 2, this.random.nextFloat() / 2, 0.4);
+ ((ServerLevel)this.level()).sendParticles(ParticleTypes.HAPPY_VILLAGER, ws.getX(), ws.getEyeY() + 0.25, ws.getZ(), 3, this.random.nextFloat() / 2, this.random.nextFloat() / 2, this.random.nextFloat() / 2, 0.4);
}
}
}
@@ -251,7 +252,7 @@ protected void customServerAiStep()
Predicate validTarget = e -> !(e instanceof Raider) && !e.isAlliedTo(this) && !(e instanceof WitherSkeleton);
- WitherSkull witherSkull = new WitherSkull(this.level, this, dX, dY, dZ)
+ WitherSkull witherSkull = new WitherSkull(this.level(), this, dX, dY, dZ)
{
@Override
protected void onHitEntity(EntityHitResult pResult)
@@ -265,7 +266,7 @@ protected void onHitEntity(EntityHitResult pResult)
witherSkull.setOwner(this);
witherSkull.setPos(aX, aY, aZ);
- this.level.addFreshEntity(witherSkull);
+ this.level().addFreshEntity(witherSkull);
this.turretCount--;
}
@@ -275,7 +276,7 @@ protected void onHitEntity(EntityHitResult pResult)
if(this.ticksNoTarget >= 40 && this.turretCount > 0) this.turretCount = 0;
//Particles
- if(this.tickCount % 5 == 0 && this.level instanceof ServerLevel serverLevel) for(int i = 0; i < 4; i++)
+ if(this.tickCount % 5 == 0 && this.level() instanceof ServerLevel serverLevel) for(int i = 0; i < 4; i++)
serverLevel.sendParticles(ParticleTypes.SMOKE, this.getX() + (0.25 - this.random.nextFloat() * 0.5), this.getEyeY(), this.getZ() + (0.25 - this.random.nextFloat() * 0.5), 1, 0, 0, 0, 0.2);
}
else if(this.isTurretActive() && this.turretCount == 0) this.setTurretActive(false);
@@ -338,7 +339,7 @@ private AshenmancerSummonMinionsSpellGoal() {}
protected void castSpell()
{
LivingEntity target = AshenmancerIllagerEntity.this.getTarget();
- ServerLevel level = (ServerLevel) AshenmancerIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel) AshenmancerIllagerEntity.this.level();
if(target != null)
{
@@ -437,7 +438,7 @@ private AshenmancerShootSkullsSpellGoal() {}
protected void castSpell()
{
LivingEntity target = AshenmancerIllagerEntity.this.getTarget();
- ServerLevel level = (ServerLevel)AshenmancerIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)AshenmancerIllagerEntity.this.level();
AshenmancerIllagerEntity ashenmancer = AshenmancerIllagerEntity.this;
List pool = new ArrayList<>(List.of(WitherSkullType.values()));
@@ -510,7 +511,7 @@ protected void onHitEntity(EntityHitResult pResult)
if(ashenmancer.ashenado != null)
{
- Vec3 dir = new Vec3(pResult.getEntity().getX() - ashenmancer.ashenado.getCenter().x(), pResult.getEntity().getY() - ashenmancer.ashenado.getCenter().y(), pResult.getEntity().getZ() - ashenmancer.ashenado.getCenter().z()).normalize();
+ Vec3 dir = new Vec3(pResult.getEntity().getX() - ashenmancer.ashenado.getCenter().getX(), pResult.getEntity().getY() - ashenmancer.ashenado.getCenter().getY(), pResult.getEntity().getZ() - ashenmancer.ashenado.getCenter().getZ()).normalize();
final float force = type == WitherSkullType.PUSHER ? ashenmancer.config().ashenmancer.pusherSkullForce : 1.25F;
pResult.getEntity().push(dir.x() * force, dir.y() * force, dir.z() * force);
@@ -644,10 +645,10 @@ protected void castSpell()
{
BlockPos targetCenter = target.blockPosition().offset(-3 + ashenmancer.random.nextInt(7), 0, -3 + ashenmancer.random.nextInt(7));
Vec3 center = Vec3.atCenterOf(targetCenter).subtract(0, -0.5, 0);
-
+ Vec3i center_int = new Vec3i((int)center.x, (int)center.y, (int)center.z);
ashenmancer.ashenado = new AshenadoObject(ashenmancer,
ashenmancer.isInDifficultRaid() ? ashenmancer.getRaidDifficulty() : RaidDifficulty.DEFAULT,
- center,
+ center_int,
ashenmancer.config().ashenmancer.ashenadoDuration
);
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AssassinIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AssassinIllagerEntity.java
index 84558d2..69ba8f3 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AssassinIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AssassinIllagerEntity.java
@@ -4,6 +4,7 @@
import com.calculusmaster.difficultraids.setup.DifficultRaidsEnchantments;
import com.calculusmaster.difficultraids.util.Compat;
import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.DifficultyInstance;
import net.minecraft.world.InteractionHand;
@@ -97,7 +98,8 @@ public void aiStep()
{
if(this.distanceTo(target) > 8 && this.canTeleport() && this.random.nextFloat() < 0.25F)
{
- BlockPos targetPos = new BlockPos(target.getEyePosition()).offset(this.random.nextInt(5) - 2, 0, this.random.nextInt(5) - 2);
+ Vec3i eye_pos = new Vec3i((int)target.getEyePosition().x, (int)target.getEyePosition().y, (int)target.getEyePosition().z);
+ BlockPos targetPos = new BlockPos(eye_pos).offset(this.random.nextInt(5) - 2, 0, this.random.nextInt(5) - 2);
this.randomTeleport(targetPos.getX(), targetPos.getY(), targetPos.getZ(), true);
this.teleportCooldown = this.config().assassin.teleportCooldown;
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ElectroIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ElectroIllagerEntity.java
index 2eda23b..c567a3d 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ElectroIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ElectroIllagerEntity.java
@@ -74,13 +74,13 @@ public void tick()
{
super.tick();
- if(this.level.isClientSide && this.isCastingSpell())
+ if(this.level().isClientSide && this.isCastingSpell())
{
SpellType spellType = this.getSpellType();
double d0 = spellType.getColor(0), d1 = spellType.getColor(1), d2 = spellType.getColor(2);
float f = this.yBodyRot * ((float)Math.PI / 180F) + Mth.cos((float)this.tickCount * 0.6662F) * 0.25F;
- this.level.addParticle(ParticleTypes.ELECTRIC_SPARK, this.getX() + Math.cos(f) * 0.6D, this.getY() + 1.8D, this.getZ() + Math.sin(f) * 0.6D, d0, d1, d2);
- this.level.addParticle(ParticleTypes.ELECTRIC_SPARK, this.getX() - Math.cos(f) * 0.6D, this.getY() + 1.8D, this.getZ() - Math.sin(f) * 0.6D, d0, d1, d2);
+ this.level().addParticle(ParticleTypes.ELECTRIC_SPARK, this.getX() + Math.cos(f) * 0.6D, this.getY() + 1.8D, this.getZ() + Math.sin(f) * 0.6D, d0, d1, d2);
+ this.level().addParticle(ParticleTypes.ELECTRIC_SPARK, this.getX() - Math.cos(f) * 0.6D, this.getY() + 1.8D, this.getZ() - Math.sin(f) * 0.6D, d0, d1, d2);
}
}
@@ -110,7 +110,7 @@ private ElectroIllagerConcentratedLightningBoltSpellGoal() {}
protected void castSpell()
{
LivingEntity target = ElectroIllagerEntity.this.getTarget();
- ServerLevel level = (ServerLevel)ElectroIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)ElectroIllagerEntity.this.level();
boolean rain = level.isRainingAt(ElectroIllagerEntity.this.blockPosition());
boolean thunder = level.isThundering();
@@ -179,7 +179,7 @@ private ElectroIllagerSummonLightningSpellGoal() {}
protected void castSpell()
{
LivingEntity target = ElectroIllagerEntity.this.getTarget();
- ServerLevel level = (ServerLevel)ElectroIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)ElectroIllagerEntity.this.level();
boolean rain = level.isRainingAt(ElectroIllagerEntity.this.blockPosition());
boolean thunder = level.isThundering();
@@ -249,7 +249,7 @@ private ElectroIllagerRingLightningSpellGoal() {}
protected void castSpell()
{
LivingEntity target = ElectroIllagerEntity.this.getTarget();
- ServerLevel level = (ServerLevel)ElectroIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)ElectroIllagerEntity.this.level();
boolean thunder = level.isThundering();
if(target != null)
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/FrostIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/FrostIllagerEntity.java
index b4ff224..6395d73 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/FrostIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/FrostIllagerEntity.java
@@ -7,7 +7,9 @@
import net.minecraft.nbt.CompoundTag;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
+import net.minecraft.tags.DamageTypeTags;
import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.damagesource.DamageTypes;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EntityType;
@@ -69,7 +71,7 @@ public void applyRaidBuffs(int p_37844_, boolean p_37845_)
@Override
public boolean hurt(DamageSource pSource, float pAmount)
{
- return super.hurt(pSource, pSource.isProjectile() ? pAmount * 2 : pAmount);
+ return super.hurt(pSource, pSource.is(DamageTypeTags.IS_PROJECTILE) ? pAmount * 2 : pAmount);
}
@Override
@@ -98,7 +100,7 @@ public void tick()
{
final AABB aabb = this.getBoundingBox().inflate(this.config().frostmage.slownessAuraRadius);
- this.level.getEntitiesOfClass(LivingEntity.class, aabb, e -> !e.isAlliedTo(this) && !e.hasEffect(MobEffects.MOVEMENT_SLOWDOWN) && (!(e instanceof Player p) || !p.isSpectator() && !p.isCreative())).forEach(e -> e.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 20 * 5, 3)));
+ this.level().getEntitiesOfClass(LivingEntity.class, aabb, e -> !e.isAlliedTo(this) && !e.hasEffect(MobEffects.MOVEMENT_SLOWDOWN) && (!(e instanceof Player p) || !p.isSpectator() && !p.isCreative())).forEach(e -> e.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 20 * 5, 3)));
}
//Barrage
@@ -117,7 +119,7 @@ public void tick()
for(int i = 0; i < size; i++)
{
- FrostSnowballEntity snowball = DifficultRaidsEntityTypes.FROST_SNOWBALL.get().create(this.level);
+ FrostSnowballEntity snowball = DifficultRaidsEntityTypes.FROST_SNOWBALL.get().create(this.level());
snowball.setOwner(this);
snowball.setPos(this.getEyePosition().x(), this.getEyePosition().y() - 0.2, this.getEyePosition().z());
snowball.setDamage(this.config().frostmage.barrageSnowballDamage);
@@ -128,7 +130,7 @@ public void tick()
double targetSnowballY = targetY - snowball.getY();
snowball.shoot(targetX, targetSnowballY + distanceY, targetZ, 1.6F, 14.0F);
- this.level.addFreshEntity(snowball);
+ this.level().addFreshEntity(snowball);
}
this.playSound(SoundEvents.SNOW_GOLEM_SHOOT, 1.0F, 0.4F / (this.random.nextFloat() * 0.4F + 0.8F));
@@ -167,7 +169,7 @@ protected void castSpell()
for(int i = 0; i < size; i++)
{
- FrostSnowballEntity snowball = DifficultRaidsEntityTypes.FROST_SNOWBALL.get().create(FrostIllagerEntity.this.level);
+ FrostSnowballEntity snowball = DifficultRaidsEntityTypes.FROST_SNOWBALL.get().create(FrostIllagerEntity.this.level());
snowball.setOwner(FrostIllagerEntity.this);
snowball.setPos(FrostIllagerEntity.this.getEyePosition().x(), FrostIllagerEntity.this.getEyePosition().y() - 0.2, FrostIllagerEntity.this.getEyePosition().z());
snowball.setDamage(damage);
@@ -179,7 +181,7 @@ protected void castSpell()
double distanceY = Math.sqrt(targetX * targetX + targetZ * targetZ) * (double)0.2F;
snowball.shoot(targetX, targetSnowballY + distanceY, targetZ, 1.6F, 3.0F);
- FrostIllagerEntity.this.level.addFreshEntity(snowball);
+ FrostIllagerEntity.this.level().addFreshEntity(snowball);
}
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java
index a79941d..396a065 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java
@@ -4,6 +4,7 @@
import com.calculusmaster.difficultraids.entity.entities.core.AbstractEvokerVariant;
import com.calculusmaster.difficultraids.util.Compat;
import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.network.syncher.EntityDataSerializers;
@@ -148,7 +149,7 @@ public void removeMinionCharge()
public void setMinionTargets(Mob minion)
{
- minion.targetSelector.removeAllGoals();
+ minion.targetSelector.removeAllGoals((goal) -> true);
minion.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(minion, Player.class, true));
minion.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(minion, IronGolem.class, true));
minion.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(minion, AbstractVillager.class, true));
@@ -224,7 +225,7 @@ public void tick()
super.tick();
//Loading
- if(this.level instanceof ServerLevel serverLevel)
+ if(this.level() instanceof ServerLevel serverLevel)
{
if(this.checkMinions)
{
@@ -266,7 +267,7 @@ private NecromancerSummonMinionsSpellGoal() {}
protected void castSpell()
{
LivingEntity target = NecromancerIllagerEntity.this.getTarget();
- ServerLevel level = (ServerLevel)NecromancerIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)NecromancerIllagerEntity.this.level();
if(target != null)
{
@@ -357,7 +358,7 @@ private NecromancerSummonHordeSpellGoal() {}
protected void castSpell()
{
LivingEntity target = NecromancerIllagerEntity.this.getTarget();
- ServerLevel level = (ServerLevel)NecromancerIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)NecromancerIllagerEntity.this.level();
if(target != null)
{
@@ -448,7 +449,7 @@ private NecromancerBuryTargetGoal() {}
protected void castSpell()
{
LivingEntity target = NecromancerIllagerEntity.this.getTarget();
- ServerLevel level = (ServerLevel)NecromancerIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)NecromancerIllagerEntity.this.level();
boolean raid = NecromancerIllagerEntity.this.isInRaid();
if(target != null)
@@ -459,11 +460,12 @@ protected void castSpell()
//Bury Logic
target.playSound(SoundEvents.DROWNED_AMBIENT_WATER, 5.0F, 0.75F);
- int buryDistance = 2 + Mth.ceil(target.getBbHeight()) * (target.isOnGround() ? 1 : 2);
+ int buryDistance = 2 + Mth.ceil(target.getBbHeight()) * (target.onGround() ? 1 : 2);
target.moveTo(target.getBlockX(), target.getBlockY() - buryDistance, target.getBlockZ());
- if(!level.getBlockState(new BlockPos(target.getEyePosition())).isAir() && target instanceof AbstractVillager villager)
+ Vec3i eye_pos = new Vec3i((int)target.getEyePosition().x, (int)target.getEyePosition().y, (int)target.getEyePosition().z);
+ if(!level.getBlockState(new BlockPos(eye_pos)).isAir() && target instanceof AbstractVillager villager)
villager.addEffect(new MobEffectInstance(MobEffects.GLOWING, 200, 1));
}
}
@@ -471,9 +473,10 @@ protected void castSpell()
@Override
public boolean canUse()
{
- Level level = NecromancerIllagerEntity.this.getLevel();
+ Level level = NecromancerIllagerEntity.this.level();
LivingEntity target = NecromancerIllagerEntity.this.getTarget();
- return super.canUse() && level.getBlockState(new BlockPos(target.getEyePosition())).isAir() && Math.pow(NecromancerIllagerEntity.this.blockPosition().distSqr(target.blockPosition()), 0.5) < 4;
+ Vec3i eye_pos = new Vec3i((int)target.getEyePosition().x, (int)target.getEyePosition().y, (int)target.getEyePosition().z);
+ return super.canUse() && level.getBlockState(new BlockPos(eye_pos)).isAir() && Math.pow(NecromancerIllagerEntity.this.blockPosition().distSqr(target.blockPosition()), 0.5) < 4;
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ShamanIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ShamanIllagerEntity.java
index 1fe12ae..aecbd30 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ShamanIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ShamanIllagerEntity.java
@@ -4,6 +4,7 @@
import com.calculusmaster.difficultraids.entity.entities.core.AbstractEvokerVariant;
import com.calculusmaster.difficultraids.util.Compat;
import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
@@ -65,7 +66,7 @@ protected void registerGoals()
private List getNearbyRaiders(double distance)
{
- return this.level.getNearbyEntities(
+ return this.level().getNearbyEntities(
Raider.class,
TargetingConditions.forNonCombat().range(distance),
this,
@@ -75,7 +76,7 @@ private List getNearbyRaiders(double distance)
private Raider getNearestRaider()
{
- return this.getCurrentRaid() == null ? null : this.level.getNearestEntity(
+ return this.getCurrentRaid() == null ? null : this.level().getNearestEntity(
Raider.class,
TargetingConditions.forNonCombat().ignoreLineOfSight(),
this,
@@ -193,7 +194,7 @@ private ShamanDebuffSpellGoal() {}
@Override
protected void castSpell()
{
- ServerLevel level = (ServerLevel)ShamanIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)ShamanIllagerEntity.this.level();
LivingEntity target = ShamanIllagerEntity.this.getTarget();
Random random = new Random();
@@ -231,7 +232,9 @@ protected void castSpell()
projectile.loadDebuff(new MobEffectInstance(effect, duration, amplifier));
});
- projectile.moveTo(new BlockPos(ShamanIllagerEntity.this.getEyePosition()).offset(0.0, ShamanIllagerEntity.this.getEyeHeight() + 1, 0.0), 0.0F, 0.0F);
+ ShamanIllagerEntity shaman = ShamanIllagerEntity.this;
+ Vec3i eye_pos = new Vec3i((int)shaman.getEyePosition().x, (int)shaman.getEyePosition().y, (int)shaman.getEyePosition().z);
+ projectile.moveTo(new BlockPos(eye_pos).offset(0, (int) ShamanIllagerEntity.this.getEyeHeight() + 1, 0), 0.0F, 0.0F);
level.addFreshEntity(projectile);
ShamanIllagerEntity.this.playSound(SoundEvents.SHULKER_SHOOT, 2.0F, 1.0F);
}
@@ -280,7 +283,7 @@ public boolean canUse()
@Override
protected void castSpell()
{
- ServerLevel level = (ServerLevel)ShamanIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)ShamanIllagerEntity.this.level();
AABB buffAABB = new AABB(ShamanIllagerEntity.this.blockPosition()).inflate(ShamanIllagerEntity.this.config().shaman.allyBuffRadius);
@@ -344,7 +347,7 @@ public boolean canUse()
@Override
protected void castSpell()
{
- ServerLevel level = (ServerLevel)ShamanIllagerEntity.this.getLevel();
+ ServerLevel level = (ServerLevel)ShamanIllagerEntity.this.level();
AABB buffAABB = new AABB(ShamanIllagerEntity.this.blockPosition()).inflate(ShamanIllagerEntity.this.config().shaman.allyBuffRadius);
diff --git a/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java b/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java
index 9981356..d4576af 100644
--- a/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java
+++ b/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java
@@ -65,7 +65,7 @@ public static void onRegisterCommands(RegisterCommandsEvent event)
@SubscribeEvent
public static void onSoundPlayedAtPosition(PlayLevelSoundEvent.AtPosition event)
{
- BlockPos pos = new BlockPos(event.getPosition().x(), event.getPosition().y(), event.getPosition().z());
+ BlockPos pos = new BlockPos((int)event.getPosition().x(), (int)event.getPosition().y(), (int)event.getPosition().z());
if(event.getSource().equals(SoundSource.WEATHER) && (event.getLevel() instanceof ServerLevel sl && sl.getRaidAt(pos) != null))
{
if(event.getSound().equals(SoundEvents.LIGHTNING_BOLT_THUNDER)) event.setNewVolume(event.getOriginalVolume() / 100);
@@ -180,7 +180,7 @@ public static void onEntityHitByLightning(EntityStruckByLightningEvent event)
@SubscribeEvent
public static void onLivingDeath(LivingDeathEvent event)
{
- if(event.getEntity() instanceof Raider raider && raider.getLevel() instanceof ServerLevel serverLevel)
+ if(event.getEntity() instanceof Raider raider && raider.level() instanceof ServerLevel serverLevel)
{
Optional.ofNullable(serverLevel.getNearestEntity(
NecromancerIllagerEntity.class,
@@ -205,7 +205,7 @@ public static void onMobGriefing(EntityMobGriefingEvent event)
@SubscribeEvent
public static void onLivingHurt(LivingHurtEvent event)
{
- if(event.getSource().equals(DamageSource.WITHER)
+ if(event.getSource().equals(event.getSource().getEntity().damageSources().wither())
&& event.getSource().getEntity() instanceof AshenmancerIllagerEntity ashenmancer
&& ashenmancer.isInDifficultRaid()
)
diff --git a/src/main/java/com/calculusmaster/difficultraids/items/GMArmorItem.java b/src/main/java/com/calculusmaster/difficultraids/items/GMArmorItem.java
index b9f54ff..7b05c63 100644
--- a/src/main/java/com/calculusmaster/difficultraids/items/GMArmorItem.java
+++ b/src/main/java/com/calculusmaster/difficultraids/items/GMArmorItem.java
@@ -13,15 +13,21 @@
public class GMArmorItem extends ArmorItem
{
- private static final Properties DEFAULT_PROPERTIES = new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_COMBAT).rarity(Rarity.EPIC).fireResistant();
+ private static final Properties DEFAULT_PROPERTIES = new Item.Properties().stacksTo(1).rarity(Rarity.EPIC).fireResistant();
- public GMArmorItem(EquipmentSlot pSlot)
+ public GMArmorItem(ArmorItem.Type pSlot)
{
+// ArmorItem.Type[] types = {Type.HELMET, Type.CHESTPLATE, Type.LEGGINGS, Type.BOOTS};
+// for(ArmorItem.Type type: types) {
+// if (pSlot.equals(type.getSlot())) {
+// super(ArmorMaterials.NETHERITE, type, DEFAULT_PROPERTIES);
+// }
+// }
super(ArmorMaterials.NETHERITE, pSlot, DEFAULT_PROPERTIES);
}
@Override
- public void onArmorTick(ItemStack stack, Level level, Player player)
+ public void onInventoryTick(ItemStack stack, Level level, Player player, int slotIndex, int selectedIndex)
{
if(this.hasFullSet(player))
{
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/LivingEntityMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/LivingEntityMixin.java
index bd44dbc..6b9dbf2 100644
--- a/src/main/java/com/calculusmaster/difficultraids/mixins/LivingEntityMixin.java
+++ b/src/main/java/com/calculusmaster/difficultraids/mixins/LivingEntityMixin.java
@@ -2,7 +2,10 @@
import com.calculusmaster.difficultraids.setup.DifficultRaidsItems;
import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.tags.DamageTypeTags;
import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.damagesource.DamageTypes;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
@@ -57,7 +60,7 @@ private void difficultraids_checkTotemImmunities(MobEffectInstance pEffectInstan
@Inject(at = @At("HEAD"), method = "checkTotemDeathProtection", cancellable = true)
private void difficultraids_useCustomTotem(DamageSource damageSource, CallbackInfoReturnable callback)
{
- if(damageSource.isBypassInvul()) callback.setReturnValue(false);
+ if(damageSource.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) callback.setReturnValue(false);
final Item totemInvisibility = DifficultRaidsItems.TOTEM_OF_INVISIBILITY.get();
final Item totemLightning = DifficultRaidsItems.TOTEM_OF_LIGHTNING.get();
@@ -102,7 +105,7 @@ private void difficultraids_useCustomTotem(DamageSource damageSource, CallbackIn
{
this.addEffect(new MobEffectInstance(MobEffects.INVISIBILITY, 600, 1));
- this.level
+ this.level()
.getEntitiesOfClass(Monster.class, new AABB(this.blockPosition()).inflate(5.0D))
.stream()
.filter(Monster::isAlive)
@@ -112,23 +115,23 @@ private void difficultraids_useCustomTotem(DamageSource damageSource, CallbackIn
//Totem of Lightning
if(totem.is(totemLightning))
{
- this.level
+ this.level()
.getEntitiesOfClass(Monster.class, new AABB(this.blockPosition()).inflate(6.0D))
.stream()
.filter(Monster::isAlive)
.map(Entity::blockPosition)
.forEach(pos -> {
- LightningBolt bolt = EntityType.LIGHTNING_BOLT.create(this.level);
+ LightningBolt bolt = EntityType.LIGHTNING_BOLT.create(this.level());
bolt.setDamage(this.random.nextFloat() * 5.0F);
bolt.moveTo(pos, 0.0F, 0.0F);
- this.level.addFreshEntity(bolt);
+ this.level().addFreshEntity(bolt);
});
}
//Totem of Poison
if(totem.is(totemPoison))
{
- this.level
+ this.level()
.getEntitiesOfClass(Monster.class, new AABB(this.blockPosition()).inflate(5.0D))
.stream()
.filter(Monster::isAlive)
@@ -153,23 +156,23 @@ private void difficultraids_useCustomTotem(DamageSource damageSource, CallbackIn
if(totem.is(totemDestiny))
{
if(damageSource.getEntity() instanceof LivingEntity attacker)
- attacker.hurt(DamageSource.MAGIC, attacker.getHealth() + 1.0F);
+ attacker.hurt(attacker.damageSources().magic(), attacker.getHealth() + 1.0F);
- this.level.getEntitiesOfClass(Monster.class, new AABB(this.blockPosition()).inflate(10.0D))
+ this.level().getEntitiesOfClass(Monster.class, new AABB(this.blockPosition()).inflate(10.0D))
.stream()
.filter(Monster::isAlive)
.forEach(m -> {
double distance = Math.pow(m.blockPosition().distSqr(this.blockPosition()), 0.5);
float damage = (float)(Math.max(0.1F, 6.0F - (distance / 2.0F)));
- m.hurt(DamageSource.MAGIC, damage);
+ m.hurt(m.damageSources().magic(), damage);
});
}
//Totem of Levitation
if(totem.is(totemLevitation))
{
- this.level
+ this.level()
.getEntitiesOfClass(Monster.class, new AABB(this.blockPosition()).inflate(6.0D))
.stream()
.filter(Monster::isAlive)
@@ -187,8 +190,8 @@ private void difficultraids_useCustomTotem(DamageSource damageSource, CallbackIn
BlockPos offset1 = this.blockPosition().offset(this.random.nextInt(2, 6), 2, this.random.nextInt(2, 6));
BlockPos offset2 = this.blockPosition().offset(this.random.nextInt(2, 6) * -1, 2, this.random.nextInt(2, 6) * -1);
- IronGolem golem1 = EntityType.IRON_GOLEM.create(this.level);
- IronGolem golem2 = EntityType.IRON_GOLEM.create(this.level);
+ IronGolem golem1 = EntityType.IRON_GOLEM.create(this.level());
+ IronGolem golem2 = EntityType.IRON_GOLEM.create(this.level());
golem1.moveTo(offset1, 0.0F, 0.0F);
golem2.moveTo(offset2, 0.0F, 0.0F);
@@ -201,14 +204,14 @@ private void difficultraids_useCustomTotem(DamageSource damageSource, CallbackIn
golem2.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(golem2, attacker.getClass(), true));
}
- this.level.addFreshEntity(golem1);
- this.level.addFreshEntity(golem2);
+ this.level().addFreshEntity(golem1);
+ this.level().addFreshEntity(golem2);
}
//Totem of Freezing
if(totem.is(totemFreezing))
{
- this.level
+ this.level()
.getEntitiesOfClass(Monster.class, new AABB(this.blockPosition()).inflate(6.0D))
.stream()
.filter(Monster::isAlive)
@@ -222,12 +225,13 @@ private void difficultraids_useCustomTotem(DamageSource damageSource, CallbackIn
//Totem of Teleportation
if(totem.is(totemTeleportation))
{
- BlockPos current = new BlockPos(this.getEyePosition());
+ Vec3i eye_pos = new Vec3i((int) this.getEyePosition().x, (int) this.getEyePosition().y, (int) this.getEyePosition().z);
+ BlockPos current = new BlockPos(eye_pos);
BlockPos target;
int tries = 0;
int maxTries = 10;
- Predicate isInvalidPos = pos -> this.level.getBlockState(pos).isAir() || this.level.getBlockState(pos.offset(0, this.getEyeHeight(), 0)).isAir();
+ Predicate isInvalidPos = pos -> this.level().getBlockState(pos).isAir() || this.level().getBlockState(pos.offset(0, (int)this.getEyeHeight(), 0)).isAir();
do
{
int x = (this.random.nextInt(2) == 0 ? 1 : -1) * this.random.nextInt(5, 16);
@@ -250,7 +254,8 @@ private void difficultraids_useCustomTotem(DamageSource damageSource, CallbackIn
//Totem of Fireballs
if(totem.is(totemFireball))
{
- BlockPos source = new BlockPos(this.getEyePosition());
+ Vec3i eye_pos = new Vec3i((int) this.getEyePosition().x, (int) this.getEyePosition().y, (int) this.getEyePosition().z);
+ BlockPos source = new BlockPos(eye_pos);
Stream.of(
new Vec3(1, 0.33, 0),
new Vec3(1, 0.33, 1),
@@ -261,16 +266,16 @@ private void difficultraids_useCustomTotem(DamageSource damageSource, CallbackIn
new Vec3(-1, 0.33, 1),
new Vec3(1, 0.33, -1)
).forEach(v -> {
- Fireball fireball = EntityType.FIREBALL.create(this.level);
+ Fireball fireball = EntityType.FIREBALL.create(this.level());
fireball.moveTo(source, 0.0F, 0.0F);
fireball.shoot(v.x, v.y, v.z, this.random.nextFloat() * 6 + 2.0F, 2.0F);
- this.level.addFreshEntity(fireball);
+ this.level().addFreshEntity(fireball);
});
this.addEffect(new MobEffectInstance(MobEffects.SLOW_FALLING, 100, 1));
}
- this.level.broadcastEntityEvent(this, (byte)35);
+ this.level().broadcastEntityEvent(this, (byte)35);
callback.setReturnValue(true);
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java
index 0930749..6996b8c 100644
--- a/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java
+++ b/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java
@@ -29,6 +29,8 @@
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.LootDataResolver;
+import net.minecraft.world.level.storage.loot.LootParams;
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
@@ -234,7 +236,7 @@ public void difficultraids_grantRewards(CallbackInfo callbackInfo)
{
LOGGER.info("DifficultRaids: Generating " + raidDifficulty.getFormattedName() + " Raid Loot!");
- LootTable valuablesLT = this.level.getServer().getLootTables().get(switch(raidDifficulty)
+ LootTable valuablesLT = this.level.getServer().getLootData().getLootTable(switch(raidDifficulty)
{
case DEFAULT, HERO -> RaidLoot.HERO_VALUABLES;
case LEGEND -> RaidLoot.LEGEND_VALUABLES;
@@ -242,7 +244,7 @@ public void difficultraids_grantRewards(CallbackInfo callbackInfo)
case GRANDMASTER -> RaidLoot.GRANDMASTER_VALUABLES;
});
- LootTable magicLT = this.level.getServer().getLootTables().get(switch(raidDifficulty)
+ LootTable magicLT = this.level.getServer().getLootData().getLootTable(switch(raidDifficulty)
{
case DEFAULT, HERO -> RaidLoot.HERO_MAGIC;
case LEGEND -> RaidLoot.LEGEND_MAGIC;
@@ -296,12 +298,13 @@ public void difficultraids_grantRewards(CallbackInfo callbackInfo)
BlockEntity blockEntity = this.level.getExistingBlockEntity(pos);
if(blockEntity instanceof Container container)
{
- LootContext context = new LootContext.Builder(this.level)
- .withLuck(this.level.getDifficulty() == Difficulty.HARD ? 1.0F : 0.0F)
- .withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(pos))
+ LootParams params = new LootParams.Builder(this.level).withLuck(this.level.getDifficulty() == Difficulty.HARD ? 1.0F : 0.0F)
.create(LootContextParamSets.CHEST);
+// .hasParam(LootContextParams.ORIGIN, Vec3.atCenterOf(pos)))
- table.fill(container, context);
+// .create(table.getLootTableId());
+
+ table.fill(container, params, random.nextLong());
container.setChanged();
}
else LOGGER.warn("Could not find container for " + type + " Raid Loot at {" + pos.getX() + ", " + pos.getY() + ", " + pos.getZ() + "}!");
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/raider/AbstractIllagerMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/raider/AbstractIllagerMixin.java
index d26ae32..b0e5903 100644
--- a/src/main/java/com/calculusmaster/difficultraids/mixins/raider/AbstractIllagerMixin.java
+++ b/src/main/java/com/calculusmaster/difficultraids/mixins/raider/AbstractIllagerMixin.java
@@ -140,7 +140,7 @@ else if(basicMagic)
}
//General Easy/Hard Modifiers
- Difficulty difficulty = this.level.getDifficulty();
+ Difficulty difficulty = this.level().getDifficulty();
if(difficulty.equals(Difficulty.EASY) || difficulty.equals(Difficulty.HARD))
armor.addPermanentModifier(new AttributeModifier(TAG_RAIDER_DIFFICULTY_ARMOR_MODIFIER, difficulty.equals(Difficulty.EASY) ? 0.9 : 1.1, AttributeModifier.Operation.MULTIPLY_TOTAL));
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/raider/EvokerFangsMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/raider/EvokerFangsMixin.java
index 39fdbda..0124feb 100644
--- a/src/main/java/com/calculusmaster/difficultraids/mixins/raider/EvokerFangsMixin.java
+++ b/src/main/java/com/calculusmaster/difficultraids/mixins/raider/EvokerFangsMixin.java
@@ -39,7 +39,7 @@ private void difficultRaids_dealDamageTo(LivingEntity pTarget, CallbackInfo call
float damage = rd.config().evoker.evokerFangDamage;
- pTarget.hurt(DamageSource.indirectMagic(this, owner), damage);
+ pTarget.hurt(pTarget.damageSources().indirectMagic(this, owner), damage);
callback.cancel();
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
index 2a6d50e..038601c 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
@@ -8,6 +8,7 @@
import com.calculusmaster.difficultraids.util.DifficultRaidsUtil;
import com.mojang.logging.LogUtils;
import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.entity.EntityType;
@@ -48,7 +49,7 @@ public class DifficultRaidsConfig
public static RaidDifficultyConfig DEFAULT, HERO, LEGEND, MASTER, GRANDMASTER;
//Misc Tags
- public static TagKey> WINDS_CURSE_IMMUNE = TagKey.create(Registry.ENTITY_TYPE_REGISTRY, new ResourceLocation("difficultraids:winds_curse_immune"));
+ public static TagKey> WINDS_CURSE_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation("difficultraids:winds_curse_immune"));
public static void initializeConfigs()
{
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java
index 37f1a7e..957fdcb 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java
@@ -6,6 +6,7 @@
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.Mob;
+import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Rarity;
@@ -21,7 +22,7 @@ public class DifficultRaidsItems
{
public static final DeferredRegister
- ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, DifficultRaids.MODID);
- private static final Supplier DEFAULT_TOTEM_PROPERTIES = () -> new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_COMBAT).rarity(Rarity.UNCOMMON).fireResistant();
+ private static final Supplier DEFAULT_TOTEM_PROPERTIES = () -> new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).fireResistant();
//Totems
@@ -64,16 +65,16 @@ public class DifficultRaidsItems
//Armor
public static final RegistryObject
- GRANDMASTER_HELMET =
- ITEMS.register("grandmaster_helmet", () -> new GMArmorItem(EquipmentSlot.HEAD));
+ ITEMS.register("grandmaster_helmet", () -> new GMArmorItem(ArmorItem.Type.HELMET));
public static final RegistryObject
- GRANDMASTER_CHESTPLATE =
- ITEMS.register("grandmaster_chestplate", () -> new GMArmorItem(EquipmentSlot.CHEST));
+ ITEMS.register("grandmaster_chestplate", () -> new GMArmorItem(ArmorItem.Type.CHESTPLATE));
public static final RegistryObject
- GRANDMASTER_LEGGINGS =
- ITEMS.register("grandmaster_leggings", () -> new GMArmorItem(EquipmentSlot.LEGS));
+ ITEMS.register("grandmaster_leggings", () -> new GMArmorItem(ArmorItem.Type.LEGGINGS));
public static final RegistryObject
- GRANDMASTER_BOOTS =
- ITEMS.register("grandmaster_boots", () -> new GMArmorItem(EquipmentSlot.FEET));
+ ITEMS.register("grandmaster_boots", () -> new GMArmorItem(ArmorItem.Type.BOOTS));
//Spawn Eggs
public static final RegistryObject
- SPAWN_EGG_WARRIOR_ILLAGER =
@@ -105,7 +106,7 @@ public class DifficultRaidsItems
private static RegistryObject
- registerSpawnEgg(String name, RegistryObject> entityType, int highlight)
{
- return ITEMS.register(name + "_spawn_egg", () -> new ForgeSpawnEggItem(entityType, 0x565B5C, highlight, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+ return ITEMS.register(name + "_spawn_egg", () -> new ForgeSpawnEggItem(entityType, 0x565B5C, highlight, new Item.Properties()));
}
From 1f49cefe33933a7f3bbc5779ffe68767865c5f67 Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Thu, 29 Aug 2024 13:18:35 -0400
Subject: [PATCH 03/38] mod runs in 1.20.1 now, now time for making sure it's
stable
---
.idea/runConfigurations/runClient.xml | 2 +-
build.gradle | 1 +
difficultraids.mixin.json | 45 ++++++++++++++++++++
src/main/resources/META-INF/mods.toml | 2 +-
src/main/resources/difficultraids.mixin.json | 9 ++--
5 files changed, 53 insertions(+), 6 deletions(-)
create mode 100644 difficultraids.mixin.json
diff --git a/.idea/runConfigurations/runClient.xml b/.idea/runConfigurations/runClient.xml
index af0bb3f..dd88770 100644
--- a/.idea/runConfigurations/runClient.xml
+++ b/.idea/runConfigurations/runClient.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/build.gradle b/build.gradle
index b6654bc..d8db9a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ buildscript {
//Mixins
classpath 'org.spongepowered:mixingradle:0.7+'
+
}
}
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
diff --git a/difficultraids.mixin.json b/difficultraids.mixin.json
new file mode 100644
index 0000000..b9e9054
--- /dev/null
+++ b/difficultraids.mixin.json
@@ -0,0 +1,45 @@
+{
+ "required": true,
+ "minVersion": "0.8",
+ "package": "com.calculusmaster.difficultraids.mixins",
+ "compatibilityLevel": "JAVA_17",
+ "refmap": "difficultraids.refmap.json",
+ "mixins": [
+ "BellBlockEntityMixin",
+ "LivingEntityMixin",
+ "RaidMixin",
+ "VillagerMixin",
+ "compat.ArcherMixin",
+ "compat.ClownagerMixin",
+ "compat.ExecutionerMixin",
+ "compat.FreakagerMixin",
+ "compat.GuardMixin",
+ "compat.HunterIllagerMixin",
+ "compat.LegionerMixin",
+ "compat.LightningCallerMixin",
+ "compat.MagispellerMixin",
+ "compat.MountaineerMixin",
+ "compat.RedstoneGolemMixin",
+ "compat.RoyalGuardMixin",
+ "compat.SkirmisherMixin",
+ "compat.SpiritcallerMixin",
+ "compat.VindicatorWithShieldMixin",
+ "raider.AbstractIllagerMixin",
+ "raider.EvokerFangsMixin",
+ "raider.LightningBoltMixin",
+ "raider.PillagerMixin",
+ "raider.RavagerMixin",
+ "raider.VexMixin",
+ "raider.VindicatorMixin",
+ "raider.illusioner.IllusionerBlindnessSpellGoalMixin",
+ "raider.illusioner.IllusionerMirrorSpellGoalMixin"
+ ],
+ "injectors": {
+ "defaultRequire": 1
+ },
+ "client": [
+ "WitherSkullRendererMixin",
+ "raider.PillagerRendererMixin"
+ ],
+ "server": []
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 974ec88..59786f4 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -51,6 +51,6 @@ Are you up for the challenge?
modId="minecraft"
mandatory=true
# This version range declares a minimum of the current minecraft version up to but not including the next major version
- versionRange="[1.19.2,1.20)"
+ versionRange="[1.20.1,1.20.2)"
ordering="NONE"
side="BOTH"
diff --git a/src/main/resources/difficultraids.mixin.json b/src/main/resources/difficultraids.mixin.json
index e403171..71d1cc6 100644
--- a/src/main/resources/difficultraids.mixin.json
+++ b/src/main/resources/difficultraids.mixin.json
@@ -1,5 +1,6 @@
{
"required": true,
+ "minVersion": "0.8",
"package": "com.calculusmaster.difficultraids.mixins",
"compatibilityLevel": "JAVA_17",
"refmap": "difficultraids.refmap.json",
@@ -33,12 +34,12 @@
"raider.illusioner.IllusionerBlindnessSpellGoalMixin",
"raider.illusioner.IllusionerMirrorSpellGoalMixin"
],
- "injectors": {
- "defaultRequire": 1
- },
"client": [
"WitherSkullRendererMixin",
"raider.PillagerRendererMixin"
],
- "minVersion": "0.8"
+ "server": [],
+ "injectors": {
+ "defaultRequire": 1
+ }
}
\ No newline at end of file
From 69b166b0e90ef0c26680b6af50519656ebb1a932 Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Fri, 30 Aug 2024 08:41:44 -0400
Subject: [PATCH 04/38] seems stable now
---
.idea/runConfigurations/runData.xml | 8 ++++----
.idea/runConfigurations/runGameTestServer.xml | 8 ++++----
.idea/runConfigurations/runServer.xml | 8 ++++----
.../entity/DifficultRaidsEntityTypes.java | 2 +-
.../entity/entities/component/AshenadoObject.java | 4 ++--
.../entities/component/ShamanDebuffBulletEntity.java | 2 +-
.../entity/entities/core/AbstractIllagerVariant.java | 7 +++++++
.../entities/raider/NecromancerIllagerEntity.java | 12 ++++++++----
.../difficultraids/events/DRForgeBusEvents.java | 3 +++
9 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/.idea/runConfigurations/runData.xml b/.idea/runConfigurations/runData.xml
index 40dc35e..b2a7adc 100644
--- a/.idea/runConfigurations/runData.xml
+++ b/.idea/runConfigurations/runData.xml
@@ -2,13 +2,13 @@
-
-
+
+
-
-
+
+
diff --git a/.idea/runConfigurations/runGameTestServer.xml b/.idea/runConfigurations/runGameTestServer.xml
index 9a54efd..9c89336 100644
--- a/.idea/runConfigurations/runGameTestServer.xml
+++ b/.idea/runConfigurations/runGameTestServer.xml
@@ -2,13 +2,13 @@
-
-
+
+
-
-
+
+
diff --git a/.idea/runConfigurations/runServer.xml b/.idea/runConfigurations/runServer.xml
index e97a2db..6432b00 100644
--- a/.idea/runConfigurations/runServer.xml
+++ b/.idea/runConfigurations/runServer.xml
@@ -2,13 +2,13 @@
-
-
+
+
-
-
+
+
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/DifficultRaidsEntityTypes.java b/src/main/java/com/calculusmaster/difficultraids/entity/DifficultRaidsEntityTypes.java
index 8c42143..77297a7 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/DifficultRaidsEntityTypes.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/DifficultRaidsEntityTypes.java
@@ -80,7 +80,7 @@ private static RegistryObject> registe
{
return ENTITY_TYPES.register(registryName,
() -> EntityType.Builder.of(entityFactory, MobCategory.MONSTER)
- .sized(0.6F, 1.95F).clientTrackingRange(8).fireImmune()
+ .sized(0.6F, 1.95F).clientTrackingRange(8)
.build(new ResourceLocation(DifficultRaids.MODID, registryName).toString())
);
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/AshenadoObject.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/AshenadoObject.java
index 7f72f28..de3ab54 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/AshenadoObject.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/AshenadoObject.java
@@ -149,11 +149,11 @@ private void applyEffects()
l.addEffect(new MobEffectInstance(MobEffects.WITHER, 20 * 7, 1, false, false));
});
+
this.level
.getEntitiesOfClass(LivingEntity.class, this.coreArea, validTarget)
// this damage is supposed to bypass armor, enchantments, and magic.
- // but idk how to make that happen. so for now it will do none of those things
- .forEach(l -> l.hurt(l.damageSources().mobAttack(this.owner), 2.0F));
+ .forEach(l -> l.hurt(l.damageSources().indirectMagic(this.owner, l), 2.0F));
}
public boolean isComplete()
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/ShamanDebuffBulletEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/ShamanDebuffBulletEntity.java
index 0a0abef..700bd71 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/ShamanDebuffBulletEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/component/ShamanDebuffBulletEntity.java
@@ -60,7 +60,7 @@ protected void onHitEntity(EntityHitResult pResult)
{
if(this.getOwner() instanceof LivingEntity owner && pResult.getEntity() instanceof LivingEntity hitEntity && !(hitEntity instanceof Raider))
{
- boolean hitSuccess = hitEntity.hurt(this.damageSources().mobAttack(owner), 3.0F);
+ boolean hitSuccess = hitEntity.hurt(this.damageSources().indirectMagic(owner, hitEntity), 3.0F);
if(hitSuccess) this.doEnchantDamageEffects(owner, this);
this.getModifiedDebuffs(hitSuccess ? 1.0 : 0.5).forEach(d -> hitEntity.addEffect(d, this));
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/core/AbstractIllagerVariant.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/core/AbstractIllagerVariant.java
index cddbdc4..2f1a478 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/core/AbstractIllagerVariant.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/core/AbstractIllagerVariant.java
@@ -2,13 +2,19 @@
import com.calculusmaster.difficultraids.config.RaidDifficultyConfig;
import com.calculusmaster.difficultraids.raids.RaidDifficulty;
+import com.calculusmaster.difficultraids.util.Compat;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.MobType;
+import net.minecraft.world.entity.animal.IronGolem;
import net.minecraft.world.entity.monster.AbstractIllager;
import net.minecraft.world.entity.raid.Raider;
import net.minecraft.world.level.Level;
+import tallestegg.guardvillagers.entities.Guard;
public abstract class AbstractIllagerVariant extends AbstractIllager
{
@@ -52,4 +58,5 @@ public boolean isInDifficultRaid()
{
return this.isInRaid() && !this.getRaidDifficulty().isDefault();
}
+
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java
index 396a065..0f6cd0e 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java
@@ -473,10 +473,14 @@ protected void castSpell()
@Override
public boolean canUse()
{
- Level level = NecromancerIllagerEntity.this.level();
- LivingEntity target = NecromancerIllagerEntity.this.getTarget();
- Vec3i eye_pos = new Vec3i((int)target.getEyePosition().x, (int)target.getEyePosition().y, (int)target.getEyePosition().z);
- return super.canUse() && level.getBlockState(new BlockPos(eye_pos)).isAir() && Math.pow(NecromancerIllagerEntity.this.blockPosition().distSqr(target.blockPosition()), 0.5) < 4;
+ try {
+ Level level = NecromancerIllagerEntity.this.level();
+ LivingEntity target = NecromancerIllagerEntity.this.getTarget();
+ Vec3i eye_pos = new Vec3i((int) target.getEyePosition().x, (int) target.getEyePosition().y, (int) target.getEyePosition().z);
+ return super.canUse() && level.getBlockState(new BlockPos(eye_pos)).isAir() && Math.pow(NecromancerIllagerEntity.this.blockPosition().distSqr(target.blockPosition()), 0.5) < 4;
+ } catch (Exception e) {
+ return false;
+ }
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java b/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java
index d4576af..f663ff3 100644
--- a/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java
+++ b/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java
@@ -205,6 +205,9 @@ public static void onMobGriefing(EntityMobGriefingEvent event)
@SubscribeEvent
public static void onLivingHurt(LivingHurtEvent event)
{
+ if (event.getSource().getEntity() == null){
+ return;
+ }
if(event.getSource().equals(event.getSource().getEntity().damageSources().wither())
&& event.getSource().getEntity() instanceof AshenmancerIllagerEntity ashenmancer
&& ashenmancer.isInDifficultRaid()
From ce61b9f3a28103c48a83502da5a93effd2d813ef Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Sat, 31 Aug 2024 10:41:17 -0400
Subject: [PATCH 05/38] added items to creative inventory
---
.../difficultraids/DifficultRaids.java | 1 +
.../events/DREntityAttributeRegistry.java | 11 ++++
.../events/DRForgeBusEvents.java | 9 +++
.../difficultraids/mixins/RaidMixin.java | 9 ++-
.../setup/DifficultRaidsItems.java | 61 +++++++++++++++++--
.../entities/ashenmancer_illager.json | 21 +++++++
6 files changed, 106 insertions(+), 6 deletions(-)
create mode 100644 src/main/resources/data/difficultraids/loot_tables/entities/ashenmancer_illager.json
diff --git a/src/main/java/com/calculusmaster/difficultraids/DifficultRaids.java b/src/main/java/com/calculusmaster/difficultraids/DifficultRaids.java
index 133a5ba..1f541a1 100644
--- a/src/main/java/com/calculusmaster/difficultraids/DifficultRaids.java
+++ b/src/main/java/com/calculusmaster/difficultraids/DifficultRaids.java
@@ -33,6 +33,7 @@ public DifficultRaids()
IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
DifficultRaidsItems.register(eventBus);
+ eventBus.addListener(DifficultRaidsItems::buildContents);
DifficultRaidsConfig.register();
diff --git a/src/main/java/com/calculusmaster/difficultraids/events/DREntityAttributeRegistry.java b/src/main/java/com/calculusmaster/difficultraids/events/DREntityAttributeRegistry.java
index 0de03dd..186094b 100644
--- a/src/main/java/com/calculusmaster/difficultraids/events/DREntityAttributeRegistry.java
+++ b/src/main/java/com/calculusmaster/difficultraids/events/DREntityAttributeRegistry.java
@@ -2,14 +2,21 @@
import com.calculusmaster.difficultraids.DifficultRaids;
import com.calculusmaster.difficultraids.entity.DifficultRaidsEntityTypes;
+import com.calculusmaster.difficultraids.setup.DifficultRaidsItems;
+import com.mojang.logging.LogUtils;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.item.CreativeModeTabs;
+import net.minecraft.world.item.Item;
+import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
import net.minecraftforge.event.entity.EntityAttributeModificationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.registries.RegistryObject;
+import org.slf4j.Logger;
import java.util.List;
import java.util.function.Supplier;
@@ -159,4 +166,8 @@ public static void onEntityAttributeModification(EntityAttributeModificationEven
event.add(type, Attributes.ARMOR_TOUGHNESS);
});
}
+
+
+
+
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java b/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java
index f663ff3..4626707 100644
--- a/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java
+++ b/src/main/java/com/calculusmaster/difficultraids/events/DRForgeBusEvents.java
@@ -13,8 +13,10 @@
import com.calculusmaster.difficultraids.setup.DifficultRaidsConfig;
import com.calculusmaster.difficultraids.setup.DifficultRaidsEffects;
import com.calculusmaster.difficultraids.setup.DifficultRaidsEnchantments;
+import com.calculusmaster.difficultraids.setup.DifficultRaidsItems;
import com.calculusmaster.difficultraids.util.Compat;
import com.calculusmaster.difficultraids.util.DifficultRaidsUtil;
+import com.mojang.logging.LogUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
@@ -30,7 +32,10 @@
import net.minecraft.world.entity.ai.targeting.TargetingConditions;
import net.minecraft.world.entity.npc.AbstractVillager;
import net.minecraft.world.entity.raid.Raider;
+import net.minecraft.world.item.CreativeModeTabs;
+import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
import net.minecraftforge.event.PlayLevelSoundEvent;
import net.minecraftforge.event.RegisterCommandsEvent;
import net.minecraftforge.event.entity.EntityJoinLevelEvent;
@@ -44,6 +49,8 @@
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
+import org.slf4j.Logger;
import tallestegg.guardvillagers.entities.Guard;
import java.util.Optional;
@@ -214,4 +221,6 @@ public static void onLivingHurt(LivingHurtEvent event)
)
event.setAmount(ashenmancer.config().ashenmancer.witherSkullWitherTickDamage);
}
+
+
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java
index 6996b8c..7818f5b 100644
--- a/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java
+++ b/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java
@@ -58,6 +58,7 @@ public abstract class RaidMixin
{
private int players;
private AABB validRaidArea;
+ private int totalSpawned;
@Mutable @Shadow @Final private int numGroups;
@Shadow private int groupsSpawned;
@@ -286,10 +287,12 @@ public void difficultraids_grantRewards(CallbackInfo callbackInfo)
//Find suitable spawn location
BlockPos pos = new BlockPos(
randomizer.apply(this.center.getX()),
- this.center.getY() + 5,
+ this.center.getY(),
randomizer.apply(this.center.getZ())
);
- while(!this.level.getBlockState(pos).isAir()) pos = pos.offset(randomizer.apply(pos.getX()), 1, randomizer.apply(pos.getZ()));
+ while(!this.level.getBlockState(pos).isAir()) pos = pos.offset(0, 1, 0);
+
+
//Spawn chest
this.level.setBlock(pos, Blocks.CHEST.defaultBlockState(), 2);
@@ -298,7 +301,9 @@ public void difficultraids_grantRewards(CallbackInfo callbackInfo)
BlockEntity blockEntity = this.level.getExistingBlockEntity(pos);
if(blockEntity instanceof Container container)
{
+
LootParams params = new LootParams.Builder(this.level).withLuck(this.level.getDifficulty() == Difficulty.HARD ? 1.0F : 0.0F)
+ .withParameter(LootContextParams.ORIGIN, pos.getCenter())
.create(LootContextParamSets.CHEST);
// .hasParam(LootContextParams.ORIGIN, Vec3.atCenterOf(pos)))
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java
index 957fdcb..2f42c8c 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java
@@ -3,19 +3,22 @@
import com.calculusmaster.difficultraids.DifficultRaids;
import com.calculusmaster.difficultraids.entity.DifficultRaidsEntityTypes;
import com.calculusmaster.difficultraids.items.GMArmorItem;
+import com.mojang.logging.LogUtils;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.Mob;
-import net.minecraft.world.item.ArmorItem;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.Rarity;
+import net.minecraft.world.item.*;
import net.minecraftforge.common.ForgeSpawnEggItem;
+import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
+import org.slf4j.Logger;
+import java.util.Arrays;
+import java.util.List;
import java.util.function.Supplier;
public class DifficultRaidsItems
@@ -109,9 +112,59 @@ private static RegistryObject
- registerSpawnEgg(String name
return ITEMS.register(name + "_spawn_egg", () -> new ForgeSpawnEggItem(entityType, 0x565B5C, highlight, new Item.Properties()));
}
+ public static final List> SPAWN_EGGS = Arrays.asList(
+ SPAWN_EGG_ASHENMANCER_ILLAGER,
+ SPAWN_EGG_ASSASSIN_ILLAGER,
+ SPAWN_EGG_DART_ILLAGER,
+ SPAWN_EGG_ELECTRO_ILLAGER,
+ SPAWN_EGG_FROST_ILLAGER,
+ SPAWN_EGG_NECROMANCER_ILLAGER,
+ SPAWN_EGG_SHAMAN_ILLAGER,
+ SPAWN_EGG_TANK_ILLAGER,
+ SPAWN_EGG_WARRIOR_ILLAGER
+ );
+
+ public static final List> ARMOR = Arrays.asList(
+ GRANDMASTER_HELMET, GRANDMASTER_CHESTPLATE, GRANDMASTER_LEGGINGS, GRANDMASTER_BOOTS
+ );
+
+ public static final List> TOTEMS = Arrays.asList(
+ TOTEM_OF_PERSISTENCE,
+ TOTEM_OF_DESTINY,
+ TOTEM_OF_FIREBALLS,
+ TOTEM_OF_FREEZING,
+ TOTEM_OF_LEVITATION,
+ TOTEM_OF_LIGHTNING,
+ TOTEM_OF_POISON,
+ TOTEM_OF_PROTECTION,
+ TOTEM_OF_SPEED,
+ TOTEM_OF_INVISIBILITY,
+ TOTEM_OF_VENGEANCE
+ );
+
+
public static void register(IEventBus eventBus)
{
ITEMS.register(eventBus);
}
+
+ private static final Logger LOGGER = LogUtils.getLogger();
+
+ public static void buildContents(BuildCreativeModeTabContentsEvent event) {
+ // Add to ingredients tab
+ if (event.getTabKey() == CreativeModeTabs.SPAWN_EGGS) {
+ for (RegistryObject
- item : DifficultRaidsItems.SPAWN_EGGS) {
+ event.accept(item);
+ }
+ }
+ if (event.getTabKey() == CreativeModeTabs.COMBAT) {
+ for (RegistryObject
- item : DifficultRaidsItems.ARMOR) {
+ event.accept(item);
+ }
+ for (RegistryObject
- item : DifficultRaidsItems.TOTEMS) {
+ event.accept(item);
+ }
+ }
+ }
}
diff --git a/src/main/resources/data/difficultraids/loot_tables/entities/ashenmancer_illager.json b/src/main/resources/data/difficultraids/loot_tables/entities/ashenmancer_illager.json
new file mode 100644
index 0000000..f759711
--- /dev/null
+++ b/src/main/resources/data/difficultraids/loot_tables/entities/ashenmancer_illager.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:entity",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "weight": 1,
+ "name": "difficultraids:invisibility_totem"
+ },
+ {
+ "type": "minecraft:item",
+ "weight": 1,
+ "name": "difficultraids:speed_totem"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ]
+}
\ No newline at end of file
From 3dc9bd0cce9990999b2a961022039a0227006424 Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Sat, 31 Aug 2024 12:38:35 -0400
Subject: [PATCH 06/38] updated mod compatibility
---
build.gradle | 45 +++++-----
.../mixins/compat/ClownagerMixin.java | 0
.../mixins/compat/ExecutionerMixin.java | 0
.../mixins/compat/FreakagerMixin.java | 0
.../mixins/compat/LightningCallerMixin.java | 0
.../mixins/compat/MagispellerMixin.java | 0
.../mixins/compat/MountaineerMixin.java | 0
.../mixins/compat/RedstoneGolemMixin.java | 0
.../mixins/compat/RoyalGuardMixin.java | 0
.../mixins/compat/SpiritcallerMixin.java | 0
.../compat/VindicatorWithShieldMixin.java | 1 +
difficultraids.mixin.json | 45 ----------
.../mixins/compat/HunterIllagerMixin.java | 6 +-
.../raids/RaidEnemyRegistry.java | 8 +-
.../difficultraids/util/Compat.java | 10 +--
.../util/DifficultRaidsUtil.java | 88 +++++++++----------
16 files changed, 81 insertions(+), 122 deletions(-)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/ClownagerMixin.java (100%)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/ExecutionerMixin.java (100%)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/FreakagerMixin.java (100%)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/LightningCallerMixin.java (100%)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/MagispellerMixin.java (100%)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/MountaineerMixin.java (100%)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/RedstoneGolemMixin.java (100%)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/RoyalGuardMixin.java (100%)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/SpiritcallerMixin.java (100%)
rename {src/main/java/com/calculusmaster/difficultraids => deprecated}/mixins/compat/VindicatorWithShieldMixin.java (99%)
delete mode 100644 difficultraids.mixin.json
diff --git a/build.gradle b/build.gradle
index d8db9a4..3419d72 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,47 +163,50 @@ dependencies {
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
- //Guard Villagers 1.5.2
- implementation fg.deobf("curse.maven:guardvillagers-360203:3970122")
+ //Guard Villagers 1.6.7
+ implementation fg.deobf("curse.maven:guardvillagers-360203:5619709")
- //Hunter Illager 6.0.2
- implementation fg.deobf("curse.maven:hunterillager-318857:4034397")
+ //Villager Recruits 1.12.1
+ implementation fg.deobf("curse.maven:recruits-523860:5680361")
- //Enchant with Mob 6.4.1
- compileOnly fg.deobf("curse.maven:enchantwithmob-391187:4026539")
+ //Hunter Illager 11.5.0
+ implementation fg.deobf("curse.maven:hunterillager-318857:5580223")
+
+ //Enchant with Mob 12.0.1
+ compileOnly fg.deobf("curse.maven:enchantwithmob-913523:5676281")
//Illage & Spillage 1.2.4
- implementation fg.deobf("curse.maven:illage-and-spillage-576368:4263798")
+// implementation fg.deobf("curse.maven:illage-and-spillage-576368:4263798")
//It Takes a Pillage 1.0.3
- implementation fg.deobf("curse.maven:it-takes-a-pillage-635843:4388334")
+ implementation fg.deobf("curse.maven:it-takes-a-pillage-635843:4981343")
//Savage and Ravage 5.0.4
- implementation fg.deobf("curse.maven:savage-and-ravage-381736:4429231")
+// implementation fg.deobf("curse.maven:savage-and-ravage-381736:4429231")
//Dungeons Mobs 4.0.8 + GeckoLib 3.1.40 + Dungeons Libraries 3.0.10
- implementation fg.deobf("curse.maven:dungeons-mobs-428883:4501524")
- implementation fg.deobf("curse.maven:geckolib-388172:4407241")
- implementation fg.deobf("curse.maven:dungeons-libraries-550941:4496767")
+// implementation fg.deobf("curse.maven:dungeons-mobs-428883:4501524")
+// implementation fg.deobf("curse.maven:geckolib-388172:4407241")
+// implementation fg.deobf("curse.maven:dungeons-libraries-550941:4496767")
//Leo's Illagers
- implementation fg.deobf("curse.maven:leos-illagers-812954:4370803")
+// implementation fg.deobf("curse.maven:leos-illagers-812954:4370803")
//Pyrologer & Friends
- implementation fg.deobf("curse.maven:pyrologer-and-friends-573099:4433602")
+// implementation fg.deobf("curse.maven:pyrologer-and-friends-573099:4433602")
- //L Ender's Cataclysm
- implementation fg.deobf("curse.maven:l_ender-s-cataclysm-551586:4654770")
+ //L Ender's Cataclysm 1.99.6
+ implementation fg.deobf("curse.maven:l_ender-s-cataclysm-551586:5474791")
//Mob Entity Path Visualizer 1.1.0-release.6
- runtimeOnly fg.deobf("curse.maven:mob-entity-path-visualizer-590716:4063117")
+// runtimeOnly fg.deobf("curse.maven:mob-entity-path-visualizer-590716:4063117")
- //Enchantment Descriptions 13.0.3 + Bookshelf 16.1.5
- runtimeOnly fg.deobf("curse.maven:enchantmentdescriptions-250419:3955030")
- runtimeOnly fg.deobf("curse.maven:bookshelf-228525:3964325")
+ //Enchantment Descriptions 17.1.18 + Bookshelf 20.2.13
+ runtimeOnly fg.deobf("curse.maven:enchantmentdescriptions-250419:5598368")
+ runtimeOnly fg.deobf("curse.maven:bookshelf-228525:5423987")
//ToroHealth Damage Indicators 1.19.2 1.0.0
- runtimeOnly fg.deobf("curse.maven:torohealth-damage-indicators-245733:3895068")
+// runtimeOnly fg.deobf("curse.maven:torohealth-damage-indicators-245733:3895068")
}
mixin {
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/ClownagerMixin.java b/deprecated/mixins/compat/ClownagerMixin.java
similarity index 100%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/ClownagerMixin.java
rename to deprecated/mixins/compat/ClownagerMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/ExecutionerMixin.java b/deprecated/mixins/compat/ExecutionerMixin.java
similarity index 100%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/ExecutionerMixin.java
rename to deprecated/mixins/compat/ExecutionerMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/FreakagerMixin.java b/deprecated/mixins/compat/FreakagerMixin.java
similarity index 100%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/FreakagerMixin.java
rename to deprecated/mixins/compat/FreakagerMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/LightningCallerMixin.java b/deprecated/mixins/compat/LightningCallerMixin.java
similarity index 100%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/LightningCallerMixin.java
rename to deprecated/mixins/compat/LightningCallerMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/MagispellerMixin.java b/deprecated/mixins/compat/MagispellerMixin.java
similarity index 100%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/MagispellerMixin.java
rename to deprecated/mixins/compat/MagispellerMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/MountaineerMixin.java b/deprecated/mixins/compat/MountaineerMixin.java
similarity index 100%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/MountaineerMixin.java
rename to deprecated/mixins/compat/MountaineerMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/RedstoneGolemMixin.java b/deprecated/mixins/compat/RedstoneGolemMixin.java
similarity index 100%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/RedstoneGolemMixin.java
rename to deprecated/mixins/compat/RedstoneGolemMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/RoyalGuardMixin.java b/deprecated/mixins/compat/RoyalGuardMixin.java
similarity index 100%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/RoyalGuardMixin.java
rename to deprecated/mixins/compat/RoyalGuardMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/SpiritcallerMixin.java b/deprecated/mixins/compat/SpiritcallerMixin.java
similarity index 100%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/SpiritcallerMixin.java
rename to deprecated/mixins/compat/SpiritcallerMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/VindicatorWithShieldMixin.java b/deprecated/mixins/compat/VindicatorWithShieldMixin.java
similarity index 99%
rename from src/main/java/com/calculusmaster/difficultraids/mixins/compat/VindicatorWithShieldMixin.java
rename to deprecated/mixins/compat/VindicatorWithShieldMixin.java
index 5a1da7c..a6a75da 100644
--- a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/VindicatorWithShieldMixin.java
+++ b/deprecated/mixins/compat/VindicatorWithShieldMixin.java
@@ -16,6 +16,7 @@
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
@Mixin(VindicatorWithShield.class)
public abstract class VindicatorWithShieldMixin extends AbstractIllager
{
diff --git a/difficultraids.mixin.json b/difficultraids.mixin.json
deleted file mode 100644
index b9e9054..0000000
--- a/difficultraids.mixin.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "required": true,
- "minVersion": "0.8",
- "package": "com.calculusmaster.difficultraids.mixins",
- "compatibilityLevel": "JAVA_17",
- "refmap": "difficultraids.refmap.json",
- "mixins": [
- "BellBlockEntityMixin",
- "LivingEntityMixin",
- "RaidMixin",
- "VillagerMixin",
- "compat.ArcherMixin",
- "compat.ClownagerMixin",
- "compat.ExecutionerMixin",
- "compat.FreakagerMixin",
- "compat.GuardMixin",
- "compat.HunterIllagerMixin",
- "compat.LegionerMixin",
- "compat.LightningCallerMixin",
- "compat.MagispellerMixin",
- "compat.MountaineerMixin",
- "compat.RedstoneGolemMixin",
- "compat.RoyalGuardMixin",
- "compat.SkirmisherMixin",
- "compat.SpiritcallerMixin",
- "compat.VindicatorWithShieldMixin",
- "raider.AbstractIllagerMixin",
- "raider.EvokerFangsMixin",
- "raider.LightningBoltMixin",
- "raider.PillagerMixin",
- "raider.RavagerMixin",
- "raider.VexMixin",
- "raider.VindicatorMixin",
- "raider.illusioner.IllusionerBlindnessSpellGoalMixin",
- "raider.illusioner.IllusionerMirrorSpellGoalMixin"
- ],
- "injectors": {
- "defaultRequire": 1
- },
- "client": [
- "WitherSkullRendererMixin",
- "raider.PillagerRendererMixin"
- ],
- "server": []
-}
\ No newline at end of file
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/HunterIllagerMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/compat/HunterIllagerMixin.java
index 13c27a4..1c6a8f5 100644
--- a/src/main/java/com/calculusmaster/difficultraids/mixins/compat/HunterIllagerMixin.java
+++ b/src/main/java/com/calculusmaster/difficultraids/mixins/compat/HunterIllagerMixin.java
@@ -1,7 +1,7 @@
package com.calculusmaster.difficultraids.mixins.compat;
-import baguchan.hunterillager.entity.HunterIllagerEntity;
-import baguchan.hunterillager.init.HunterItems;
+import baguchan.hunters_return.entity.Hunter;
+import baguchan.hunters_return.init.HunterItems;
import com.calculusmaster.difficultraids.config.RaidDifficultyConfig;
import com.calculusmaster.difficultraids.raids.RaidDifficulty;
import com.calculusmaster.difficultraids.util.Compat;
@@ -22,7 +22,7 @@
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-@Mixin(HunterIllagerEntity.class)
+@Mixin(Hunter.class)
public abstract class HunterIllagerMixin extends AbstractIllager
{
@Shadow @Final private SimpleContainer inventory;
diff --git a/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java b/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
index 78f6682..954eba7 100644
--- a/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
+++ b/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
@@ -4,9 +4,9 @@
import com.calculusmaster.difficultraids.data.raiderentries.RaiderEntriesHolder;
import com.calculusmaster.difficultraids.setup.DifficultRaidsConfig;
import com.calculusmaster.difficultraids.util.Compat;
-import com.infamous.dungeons_mobs.mod.ModEntityTypes;
+//import com.infamous.dungeons_mobs.mod.ModEntityTypes;
import com.mojang.logging.LogUtils;
-import com.teamabnormals.savage_and_ravage.core.registry.SREntityTypes;
+//import com.teamabnormals.savage_and_ravage.core.registry.SREntityTypes;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.raid.Raid;
@@ -134,8 +134,8 @@ public static void registerRaiders()
RaidEnemyRegistry.createRaiderType(VOLDON, VOLDON_ELITE.get());
//Compatibility
- if(Compat.SAVAGE_AND_RAVAGE.isLoaded()) RaidEnemyRegistry.createRaiderType(ICEOLOGER_SR, SREntityTypes.ICEOLOGER.get());
- if(Compat.DUNGEONS_MOBS.isLoaded()) RaidEnemyRegistry.createRaiderType(ILLUSIONER_DM, ModEntityTypes.ILLUSIONER.get());
+// if(Compat.SAVAGE_AND_RAVAGE.isLoaded()) RaidEnemyRegistry.createRaiderType(ICEOLOGER_SR, SREntityTypes.ICEOLOGER.get());
+// if(Compat.DUNGEONS_MOBS.isLoaded()) RaidEnemyRegistry.createRaiderType(ILLUSIONER_DM, ModEntityTypes.ILLUSIONER.get());
}
public static void compileWaveData(final Map data)
diff --git a/src/main/java/com/calculusmaster/difficultraids/util/Compat.java b/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
index 5da50cc..5d20c43 100644
--- a/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
+++ b/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
@@ -6,14 +6,14 @@ public enum Compat
{
GUARD_VILLAGERS("guardvillagers"),
HUNTER_ILLAGER("hunterillager"),
- ENCHANT_WITH_MOB("enchantwithmob"),
+// ENCHANT_WITH_MOB("enchantwithmob"),
IT_TAKES_A_PILLAGE("takesapillage"),
ILLAGE_AND_SPILLAGE("illageandspillage"),
- SAVAGE_AND_RAVAGE("savage_and_ravage"),
- DUNGEONS_MOBS("dungeons_mobs"),
+// SAVAGE_AND_RAVAGE("savage_and_ravage"),
+// DUNGEONS_MOBS("dungeons_mobs"),
ILLAGER_REVOLUTION("illagerrevolutionmod"),
- LEOS_ILLAGERS("leosillagers")
-
+ LEOS_ILLAGERS("leosillagers"),
+ RECRUITS("recruits")
;
private final String modid;
diff --git a/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java b/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
index 06ae452..e815214 100644
--- a/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
+++ b/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
@@ -1,11 +1,11 @@
package com.calculusmaster.difficultraids.util;
import baguchan.enchantwithmob.registry.ModEntities;
-import baguchan.hunterillager.init.HunterEntityRegistry;
-import cn.leolezury.leosillagers.init.EntityInit;
+import baguchan.hunters_return.init.HunterEntityRegistry;
+//import cn.leolezury.leosillagers.init.EntityInit;
import com.calculusmaster.difficultraids.entity.DifficultRaidsEntityTypes;
import com.izofar.takesapillage.init.ModEntityTypes;
-import com.teamabnormals.savage_and_ravage.core.registry.SREntityTypes;
+//import com.teamabnormals.savage_and_ravage.core.registry.SREntityTypes;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType;
import net.minecraftforge.registries.ForgeRegistries;
@@ -36,7 +36,7 @@ public static void registerArmorModifierRaiderLists()
//Mod Compat
if(Compat.HUNTER_ILLAGER.isLoaded()) STANDARD_RAIDERS.add(HunterEntityRegistry.HUNTERILLAGER.get());
- if(Compat.ENCHANT_WITH_MOB.isLoaded()) ADVANCED_MAGIC_RAIDERS.add(ModEntities.ENCHANTER.get());
+// if(Compat.ENCHANT_WITH_MOB.isLoaded()) ADVANCED_MAGIC_RAIDERS.add(ModEntities.ENCHANTER.get());
if(Compat.IT_TAKES_A_PILLAGE.isLoaded())
{
@@ -44,41 +44,41 @@ public static void registerArmorModifierRaiderLists()
ADVANCED_RAIDERS.add(ModEntityTypes.LEGIONER.get());
}
- if(Compat.ILLAGE_AND_SPILLAGE.isLoaded()) //Skipping: Absorber, Magispeller/Freakager/Spiritcaller/Boss Randomizer
- {
- STANDARD_RAIDERS.addAll(List.of(
- com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Preserver.get(),
- com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Igniter.get()
- ));
- ADVANCED_RAIDERS.addAll(List.of(
- com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Twittollager.get(),
- com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Crocofang.get()
- ));
- }
+// if(Compat.ILLAGE_AND_SPILLAGE.isLoaded()) //Skipping: Absorber, Magispeller/Freakager/Spiritcaller/Boss Randomizer
+// {
+// STANDARD_RAIDERS.addAll(List.of(
+// com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Preserver.get(),
+// com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Igniter.get()
+// ));
+// ADVANCED_RAIDERS.addAll(List.of(
+// com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Twittollager.get(),
+// com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Crocofang.get()
+// ));
+// }
- if(Compat.SAVAGE_AND_RAVAGE.isLoaded())
- {
- ADVANCED_RAIDERS.add(SREntityTypes.EXECUTIONER.get());
- BASIC_MAGIC_RAIDERS.addAll(List.of(SREntityTypes.GRIEFER.get(), SREntityTypes.TRICKSTER.get()));
- ADVANCED_MAGIC_RAIDERS.add(SREntityTypes.ICEOLOGER.get());
- }
+// if(Compat.SAVAGE_AND_RAVAGE.isLoaded())
+// {
+// ADVANCED_RAIDERS.add(SREntityTypes.EXECUTIONER.get());
+// BASIC_MAGIC_RAIDERS.addAll(List.of(SREntityTypes.GRIEFER.get(), SREntityTypes.TRICKSTER.get()));
+// ADVANCED_MAGIC_RAIDERS.add(SREntityTypes.ICEOLOGER.get());
+// }
- if(Compat.DUNGEONS_MOBS.isLoaded()) //Skipping: Squall Golem, Redstone Golem
- {
- STANDARD_RAIDERS.add(com.infamous.dungeons_mobs.mod.ModEntityTypes.MOUNTAINEER.get());
- ADVANCED_RAIDERS.addAll(List.of(
- com.infamous.dungeons_mobs.mod.ModEntityTypes.ROYAL_GUARD.get(),
- com.infamous.dungeons_mobs.mod.ModEntityTypes.ILLUSIONER.get()
- ));
- BASIC_MAGIC_RAIDERS.addAll(List.of(
- com.infamous.dungeons_mobs.mod.ModEntityTypes.MAGE.get(),
- com.infamous.dungeons_mobs.mod.ModEntityTypes.ICEOLOGER.get()
- ));
- ADVANCED_MAGIC_RAIDERS.addAll(List.of(
- com.infamous.dungeons_mobs.mod.ModEntityTypes.GEOMANCER.get(),
- com.infamous.dungeons_mobs.mod.ModEntityTypes.WINDCALLER.get()
- ));
- }
+// if(Compat.DUNGEONS_MOBS.isLoaded()) //Skipping: Squall Golem, Redstone Golem
+// {
+// STANDARD_RAIDERS.add(com.infamous.dungeons_mobs.mod.ModEntityTypes.MOUNTAINEER.get());
+// ADVANCED_RAIDERS.addAll(List.of(
+// com.infamous.dungeons_mobs.mod.ModEntityTypes.ROYAL_GUARD.get(),
+// com.infamous.dungeons_mobs.mod.ModEntityTypes.ILLUSIONER.get()
+// ));
+// BASIC_MAGIC_RAIDERS.addAll(List.of(
+// com.infamous.dungeons_mobs.mod.ModEntityTypes.MAGE.get(),
+// com.infamous.dungeons_mobs.mod.ModEntityTypes.ICEOLOGER.get()
+// ));
+// ADVANCED_MAGIC_RAIDERS.addAll(List.of(
+// com.infamous.dungeons_mobs.mod.ModEntityTypes.GEOMANCER.get(),
+// com.infamous.dungeons_mobs.mod.ModEntityTypes.WINDCALLER.get()
+// ));
+// }
if(Compat.ILLAGER_REVOLUTION.isLoaded())
{
@@ -87,12 +87,12 @@ public static void registerArmorModifierRaiderLists()
ADVANCED_RAIDERS.add(ForgeRegistries.ENTITY_TYPES.getValue(new ResourceLocation("illagerrevolutionmod", "blade_knight")));
}
- if(Compat.LEOS_ILLAGERS.isLoaded()) //Skipped: Lightningcaller, Clownager
- {
- STANDARD_RAIDERS.addAll(List.of(EntityInit.VINDICATOR_WITH_SHIELD.get(), EntityInit.TROUBLEMAKER.get()));
- ADVANCED_RAIDERS.add(EntityInit.CONFUSER.get());
- BASIC_MAGIC_RAIDERS.addAll(List.of(EntityInit.SNOWOLAGER.get(), EntityInit.NECROMANCER.get()));
- ADVANCED_MAGIC_RAIDERS.addAll(List.of(EntityInit.METEORITE_CALLER.get(), EntityInit.SUMMONER.get()));
- }
+// if(Compat.LEOS_ILLAGERS.isLoaded()) //Skipped: Lightningcaller, Clownager
+// {
+// STANDARD_RAIDERS.addAll(List.of(EntityInit.VINDICATOR_WITH_SHIELD.get(), EntityInit.TROUBLEMAKER.get()));
+// ADVANCED_RAIDERS.add(EntityInit.CONFUSER.get());
+// BASIC_MAGIC_RAIDERS.addAll(List.of(EntityInit.SNOWOLAGER.get(), EntityInit.NECROMANCER.get()));
+// ADVANCED_MAGIC_RAIDERS.addAll(List.of(EntityInit.METEORITE_CALLER.get(), EntityInit.SUMMONER.get()));
+// }
}
}
From bb4dde54946d1a18534a4f6bc4c316da297a6be1 Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Sat, 31 Aug 2024 14:43:58 -0400
Subject: [PATCH 07/38] added better compatibility with recruits, workers and
villager guards
---
build.gradle | 3 +++
.../entity/entities/elite/ModurEliteEntity.java | 11 +++++++++--
.../entity/entities/elite/NuaosEliteEntity.java | 5 ++++-
.../entity/entities/elite/VoldonEliteEntity.java | 11 +++++++++--
.../entity/entities/elite/XydraxEliteEntity.java | 11 +++++++++--
.../entities/raider/AshenmancerIllagerEntity.java | 6 +++++-
.../entity/entities/raider/AssassinIllagerEntity.java | 5 ++++-
.../entity/entities/raider/DartIllagerEntity.java | 6 +++++-
.../entity/entities/raider/ElectroIllagerEntity.java | 8 +++++++-
.../entity/entities/raider/FrostIllagerEntity.java | 8 +++++++-
.../entities/raider/NecromancerIllagerEntity.java | 8 +++++++-
.../entity/entities/raider/ShamanIllagerEntity.java | 8 +++++++-
.../entity/entities/raider/TankIllagerEntity.java | 7 +++++++
.../entity/entities/raider/WarriorIllagerEntity.java | 8 +++++++-
.../calculusmaster/difficultraids/util/Compat.java | 3 ++-
15 files changed, 92 insertions(+), 16 deletions(-)
diff --git a/build.gradle b/build.gradle
index 3419d72..9b7e834 100644
--- a/build.gradle
+++ b/build.gradle
@@ -169,6 +169,9 @@ dependencies {
//Villager Recruits 1.12.1
implementation fg.deobf("curse.maven:recruits-523860:5680361")
+ //Villager Workers 1.7.8
+ implementation fg.deobf("curse.maven:workers-567450:5314033")
+
//Hunter Illager 11.5.0
implementation fg.deobf("curse.maven:hunterillager-318857:5580223")
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/ModurEliteEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/ModurEliteEntity.java
index e86a8b1..6e19896 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/ModurEliteEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/ModurEliteEntity.java
@@ -5,6 +5,8 @@
import com.calculusmaster.difficultraids.setup.DifficultRaidsConfig;
import com.calculusmaster.difficultraids.util.Compat;
import com.calculusmaster.difficultraids.util.DifficultRaidsUtil;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.BlockParticleOption;
import net.minecraft.core.particles.ParticleTypes;
@@ -84,6 +86,9 @@ protected void registerGoals()
this.goalSelector.addGoal(3, new ModurHomingBoltSpellGoal());
this.goalSelector.addGoal(4, new ModurLightningZapSpellGoal());
this.goalSelector.addGoal(5, new AvoidEntityGoal<>(this, Player.class, 4.0F, 0.6D, 0.75D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 4.0F, 0.7D, 0.75D));
+ if(Compat.RECRUITS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, AbstractRecruitEntity.class, 4.0F, 0.7D, 0.75D));
+
this.goalSelector.addGoal(6, new RangedAttackGoal(this, 0.7F, 130, 12.0F));
this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.5D));
@@ -92,10 +97,12 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
- this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, Guard.class, true)));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true)));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
+ this.targetSelector.addGoal(4, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(4, (new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true)).setUnseenMemoryTicks(300));
- if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 6.0F, 0.6D, 0.75D));
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/NuaosEliteEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/NuaosEliteEntity.java
index 39cfc7a..e10ef9c 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/NuaosEliteEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/NuaosEliteEntity.java
@@ -7,6 +7,7 @@
import com.calculusmaster.difficultraids.setup.DifficultRaidsEnchantments;
import com.calculusmaster.difficultraids.util.Compat;
import com.calculusmaster.difficultraids.util.DifficultRaidsUtil;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.world.phys.Vec3;
@@ -82,8 +83,10 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
- this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, Guard.class, true)));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true)));
+ this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true));
this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 3.0F, 1.0F));
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/VoldonEliteEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/VoldonEliteEntity.java
index 27dfef4..88690d4 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/VoldonEliteEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/VoldonEliteEntity.java
@@ -4,6 +4,8 @@
import com.calculusmaster.difficultraids.entity.entities.core.AbstractEvokerVariant;
import com.calculusmaster.difficultraids.setup.DifficultRaidsConfig;
import com.calculusmaster.difficultraids.util.Compat;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
@@ -72,6 +74,9 @@ protected void registerGoals()
this.goalSelector.addGoal(1, new VoldonCastSpellGoal());
this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Player.class, 4.0F, 0.6D, 0.75D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 4.0F, 0.7D, 0.75D));
+ if(Compat.RECRUITS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, AbstractRecruitEntity.class, 4.0F, 0.7D, 0.75D));
+
this.goalSelector.addGoal(3, new VoldonSummonFamiliarsSpellGoal());
this.goalSelector.addGoal(4, new VoldonTeleportFamiliarSpellGoal());
this.goalSelector.addGoal(4, new VoldonSacrificeFamiliarSpellGoal());
@@ -83,10 +88,12 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
- this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, Guard.class, true)));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true)));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
+ this.targetSelector.addGoal(4, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
- if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.7D, 1.0D));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(4, (new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true)).setUnseenMemoryTicks(300));
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/XydraxEliteEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/XydraxEliteEntity.java
index 2ac6f39..424592e 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/XydraxEliteEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/elite/XydraxEliteEntity.java
@@ -7,6 +7,8 @@
import com.calculusmaster.difficultraids.setup.DifficultRaidsConfig;
import com.calculusmaster.difficultraids.setup.DifficultRaidsEffects;
import com.calculusmaster.difficultraids.util.Compat;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Position;
import net.minecraft.core.particles.ParticleTypes;
@@ -72,6 +74,9 @@ protected void registerGoals()
this.goalSelector.addGoal(1, new XydraxCastSpellGoal());
this.goalSelector.addGoal(2, new XydraxAvoidEntityGoal( 4.0F, 0.7D, 0.8D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 4.0F, 0.7D, 0.8D));
+ if(Compat.RECRUITS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, AbstractRecruitEntity.class, 4.0F, 0.7D, 0.8D));
+
this.goalSelector.addGoal(3, new XydraxVortexSpellGoal());
this.goalSelector.addGoal(3, new XydraxWindColumnSpellGoal());
this.goalSelector.addGoal(4, new XydraxBarrageSpellGoal());
@@ -83,10 +88,12 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
- this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, Guard.class, true)));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true)));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
+ this.targetSelector.addGoal(4, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
- if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.7D, 1.0D));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(4, (new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true)).setUnseenMemoryTicks(300));
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AshenmancerIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AshenmancerIllagerEntity.java
index a1c9c13..846e48c 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AshenmancerIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AshenmancerIllagerEntity.java
@@ -5,6 +5,8 @@
import com.calculusmaster.difficultraids.entity.entities.core.AbstractEvokerVariant;
import com.calculusmaster.difficultraids.raids.RaidDifficulty;
import com.calculusmaster.difficultraids.util.Compat;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.core.particles.ParticleTypes;
@@ -85,6 +87,7 @@ protected void registerGoals()
this.goalSelector.addGoal(1, new AshenmancerCastSpellGoal());
this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Player.class, 6.0F, 0.6D, 1.0D));
if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 6.0F, 0.7D, 1.0D));
+ if(Compat.RECRUITS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, AbstractRecruitEntity.class, 6.0F, 0.7D, 1.0D));
this.goalSelector.addGoal(3, new AshenmancerSummonMinionsSpellGoal());
//TODO: Ashenado Rework this.goalSelector.addGoal(4, new AshenmancerAshenadoSpellGoal());
this.goalSelector.addGoal(5, new AshenmancerWitherSkullTurretSpellGoal());
@@ -97,9 +100,10 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Guard.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true)).setUnseenMemoryTicks(300));
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
-
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true)).setUnseenMemoryTicks(300));
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AssassinIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AssassinIllagerEntity.java
index 69ba8f3..d80d49e 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AssassinIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/AssassinIllagerEntity.java
@@ -3,6 +3,8 @@
import com.calculusmaster.difficultraids.entity.entities.core.AbstractPillagerVariant;
import com.calculusmaster.difficultraids.setup.DifficultRaidsEnchantments;
import com.calculusmaster.difficultraids.util.Compat;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.nbt.CompoundTag;
@@ -53,13 +55,14 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true));
this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Cow.class, true));
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Sheep.class, true));
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Pig.class, true));
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Chicken.class, true));
if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(8, new NearestAttackableTargetGoal<>(this, Guard.class, true));
-
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(8, new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true));
this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.9D));
this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 3.0F, 1.0F));
this.goalSelector.addGoal(10, new LookAtPlayerGoal(this, Mob.class, 8.0F));
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/DartIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/DartIllagerEntity.java
index 2683440..9ce22e1 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/DartIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/DartIllagerEntity.java
@@ -1,7 +1,9 @@
package com.calculusmaster.difficultraids.entity.entities.raider;
import com.calculusmaster.difficultraids.entity.entities.core.AbstractVindicatorVariant;
+import com.calculusmaster.difficultraids.util.Compat;
import com.calculusmaster.difficultraids.util.DifficultRaidsUtil;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.DifficultyInstance;
@@ -29,6 +31,7 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.ServerLevelAccessor;
import org.jetbrains.annotations.Nullable;
+import tallestegg.guardvillagers.entities.Guard;
public class DartIllagerEntity extends AbstractVindicatorVariant
{
@@ -57,7 +60,8 @@ protected void registerGoals()
this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Sheep.class, true));
this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Pig.class, true));
this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Chicken.class, true));
-
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Guard.class, true));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true));
this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.9D));
this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 3.0F, 1.0F));
this.goalSelector.addGoal(10, new LookAtPlayerGoal(this, Mob.class, 8.0F));
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ElectroIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ElectroIllagerEntity.java
index c567a3d..86f8458 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ElectroIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ElectroIllagerEntity.java
@@ -4,6 +4,8 @@
import com.calculusmaster.difficultraids.raids.RaidDifficulty;
import com.calculusmaster.difficultraids.util.Compat;
import com.calculusmaster.difficultraids.util.DifficultRaidsUtil;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.network.chat.Component;
@@ -48,6 +50,8 @@ protected void registerGoals()
this.goalSelector.addGoal(0, new FloatGoal(this));
this.goalSelector.addGoal(1, new ElectroIllagerCastingSpellGoal());
this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Player.class, 8.0F, 0.6D, 1.0D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.6D, 1.0D));
+ if(Compat.RECRUITS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, AbstractRecruitEntity.class, 8.0F, 0.6D, 1.0D));
this.goalSelector.addGoal(3, new ElectroIllagerSummonLightningSpellGoal());
this.goalSelector.addGoal(3, new ElectroIllagerConcentratedLightningBoltSpellGoal());
this.goalSelector.addGoal(3, new ElectroIllagerRingLightningSpellGoal());
@@ -58,9 +62,11 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true)).setUnseenMemoryTicks(300));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
- if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.7D, 1.0D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, Guard.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true)).setUnseenMemoryTicks(300));
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/FrostIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/FrostIllagerEntity.java
index 6395d73..f6f4e24 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/FrostIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/FrostIllagerEntity.java
@@ -4,6 +4,8 @@
import com.calculusmaster.difficultraids.entity.entities.component.FrostSnowballEntity;
import com.calculusmaster.difficultraids.entity.entities.core.AbstractEvokerVariant;
import com.calculusmaster.difficultraids.util.Compat;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
@@ -47,6 +49,8 @@ protected void registerGoals()
this.goalSelector.addGoal(0, new FloatGoal(this));
this.goalSelector.addGoal(1, new FrostIllagerCastSpell());
this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Player.class, 8.0F, 0.6D, 1.0D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.6D, 1.0D));
+ if(Compat.RECRUITS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, AbstractRecruitEntity.class, 8.0F, 0.6D, 1.0D));
this.goalSelector.addGoal(4, new FrostIllagerFreezeSpellGoal());
this.goalSelector.addGoal(4, new FrostIllagerBarrageSpellGoal());
this.goalSelector.addGoal(5, new FrostIllagerSnowballBlastSpellGoal());
@@ -57,9 +61,11 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true)).setUnseenMemoryTicks(300));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
- if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.7D, 1.0D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, Guard.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true)).setUnseenMemoryTicks(300));
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java
index 0f6cd0e..acf546d 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/NecromancerIllagerEntity.java
@@ -3,6 +3,8 @@
import com.calculusmaster.difficultraids.config.RaiderConfigs;
import com.calculusmaster.difficultraids.entity.entities.core.AbstractEvokerVariant;
import com.calculusmaster.difficultraids.util.Compat;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.nbt.CompoundTag;
@@ -74,6 +76,8 @@ protected void registerGoals()
this.goalSelector.addGoal(0, new FloatGoal(this));
this.goalSelector.addGoal(1, new NecromancerCastSpellGoal());
this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Player.class, 8.0F, 0.6D, 1.0D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.6D, 1.0D));
+ if(Compat.RECRUITS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, AbstractRecruitEntity.class, 8.0F, 0.6D, 1.0D));
this.goalSelector.addGoal(4, new NecromancerSummonMinionsSpellGoal());
this.goalSelector.addGoal(4, new NecromancerBuryTargetGoal());
this.goalSelector.addGoal(5, new NecromancerSummonHordeSpellGoal());
@@ -84,9 +88,11 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true)).setUnseenMemoryTicks(300));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
- if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.7D, 1.0D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, Guard.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true)).setUnseenMemoryTicks(300));
}
@Override
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ShamanIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ShamanIllagerEntity.java
index aecbd30..6b06248 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ShamanIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/ShamanIllagerEntity.java
@@ -3,6 +3,8 @@
import com.calculusmaster.difficultraids.entity.entities.component.ShamanDebuffBulletEntity;
import com.calculusmaster.difficultraids.entity.entities.core.AbstractEvokerVariant;
import com.calculusmaster.difficultraids.util.Compat;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.server.level.ServerLevel;
@@ -47,6 +49,8 @@ protected void registerGoals()
this.goalSelector.addGoal(0, new FloatGoal(this));
this.goalSelector.addGoal(1, new ShamanCastSpellGoal());
this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Player.class, 8.0F, 0.6D, 1.0D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.6D, 1.0D));
+ if(Compat.RECRUITS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, AbstractRecruitEntity.class, 8.0F, 0.6D, 1.0D));
this.goalSelector.addGoal(3, new ShamanMoveToRaidersGoal());
this.goalSelector.addGoal(4, new ShamanAttackBoostSpellGoal());
this.goalSelector.addGoal(4, new ShamanDefenseBoostSpellGoal());
@@ -59,9 +63,11 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true)).setUnseenMemoryTicks(300));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
- if(Compat.GUARD_VILLAGERS.isLoaded()) this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Guard.class, 8.0F, 0.7D, 1.0D));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, Guard.class, true)).setUnseenMemoryTicks(300));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true)).setUnseenMemoryTicks(300));
}
private List getNearbyRaiders(double distance)
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/TankIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/TankIllagerEntity.java
index abdf1e5..4d724bf 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/TankIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/TankIllagerEntity.java
@@ -1,6 +1,9 @@
package com.calculusmaster.difficultraids.entity.entities.raider;
import com.calculusmaster.difficultraids.entity.entities.core.AbstractVindicatorVariant;
+import com.calculusmaster.difficultraids.util.Compat;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.DifficultyInstance;
import net.minecraft.world.InteractionHand;
@@ -27,6 +30,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
+import tallestegg.guardvillagers.entities.Guard;
public class TankIllagerEntity extends AbstractVindicatorVariant
{
@@ -52,7 +56,10 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Guard.class, true));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true));
this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 3.0F, 1.0F));
diff --git a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/WarriorIllagerEntity.java b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/WarriorIllagerEntity.java
index 9b2014a..aeb7da5 100644
--- a/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/WarriorIllagerEntity.java
+++ b/src/main/java/com/calculusmaster/difficultraids/entity/entities/raider/WarriorIllagerEntity.java
@@ -4,6 +4,9 @@
import com.calculusmaster.difficultraids.entity.entities.core.AbstractVindicatorVariant;
import com.calculusmaster.difficultraids.raids.RaidDifficulty;
import com.calculusmaster.difficultraids.setup.DifficultRaidsEnchantments;
+import com.calculusmaster.difficultraids.util.Compat;
+import com.talhanation.recruits.entities.AbstractRecruitEntity;
+import com.talhanation.workers.entities.AbstractWorkerEntity;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.DifficultyInstance;
import net.minecraft.world.InteractionHand;
@@ -25,6 +28,7 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.ServerLevelAccessor;
import org.jetbrains.annotations.Nullable;
+import tallestegg.guardvillagers.entities.Guard;
public class WarriorIllagerEntity extends AbstractVindicatorVariant
{
@@ -46,8 +50,10 @@ protected void registerGoals()
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true));
+ if(Compat.WORKERS.isLoaded()) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractWorkerEntity.class, true));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
-
+ if(Compat.GUARD_VILLAGERS.isLoaded()) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Guard.class, true));
+ if(Compat.RECRUITS.isLoaded()) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractRecruitEntity.class, true));
this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 3.0F, 1.0F));
this.goalSelector.addGoal(10, new LookAtPlayerGoal(this, Mob.class, 8.0F));
diff --git a/src/main/java/com/calculusmaster/difficultraids/util/Compat.java b/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
index 5d20c43..d45178b 100644
--- a/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
+++ b/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
@@ -13,7 +13,8 @@ public enum Compat
// DUNGEONS_MOBS("dungeons_mobs"),
ILLAGER_REVOLUTION("illagerrevolutionmod"),
LEOS_ILLAGERS("leosillagers"),
- RECRUITS("recruits")
+ RECRUITS("recruits"),
+ WORKERS("workers")
;
private final String modid;
From 1cdfb093c8c2de47fcb529e2222d783d9a949995 Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Sat, 31 Aug 2024 15:45:03 -0400
Subject: [PATCH 08/38] added drops for ashenmancer
---
.../setup/DifficultRaidsItems.java | 3 +-
.../entities/ashenmancer_illager.json | 48 ++++++++++++++++++-
2 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java
index 2f42c8c..5bebcac 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsItems.java
@@ -139,7 +139,8 @@ private static RegistryObject
- registerSpawnEgg(String name
TOTEM_OF_PROTECTION,
TOTEM_OF_SPEED,
TOTEM_OF_INVISIBILITY,
- TOTEM_OF_VENGEANCE
+ TOTEM_OF_VENGEANCE,
+ TOTEM_OF_TELEPORTATION
);
diff --git a/src/main/resources/data/difficultraids/loot_tables/entities/ashenmancer_illager.json b/src/main/resources/data/difficultraids/loot_tables/entities/ashenmancer_illager.json
index f759711..021cbbc 100644
--- a/src/main/resources/data/difficultraids/loot_tables/entities/ashenmancer_illager.json
+++ b/src/main/resources/data/difficultraids/loot_tables/entities/ashenmancer_illager.json
@@ -4,15 +4,59 @@
{
"bonus_rolls": 0.0,
"entries": [
+ {
+ "type": "minecraft:item",
+ "weight": 2,
+ "name": "difficultraids:poison_totem"
+ },
{
"type": "minecraft:item",
"weight": 1,
- "name": "difficultraids:invisibility_totem"
+ "name": "difficultraids:persistence_totem"
+ },
+ {
+ "type": "minecraft:item",
+ "weight": 2,
+ "name": "difficultraids:levitation_totem"
},
{
"type": "minecraft:item",
"weight": 1,
- "name": "difficultraids:speed_totem"
+ "name": "difficultraids:destiny_totem"
+ }
+ ],
+ "rolls": 2.0
+ },
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:killed_by_player"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "count": {
+ "type": "minecraft:uniform",
+ "max": 1.0,
+ "min": 0.0
+ },
+ "function": "minecraft:set_count"
+ },
+ {
+ "count": {
+ "type": "minecraft:uniform",
+ "max": 1.0,
+ "min": 0.0
+ },
+ "function": "minecraft:looting_enchant"
+ }
+ ],
+ "name": "minecraft:emerald"
}
],
"rolls": 1.0
From d9dd6c8f67db0126be2ecbbe7f56abfbaa5b4bce Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Sat, 31 Aug 2024 15:49:00 -0400
Subject: [PATCH 09/38] removed dropped mod compatibility from configs
---
.../setup/DifficultRaidsConfig.java | 78 +++++++++----------
1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
index 038601c..4ec25a7 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
@@ -166,31 +166,31 @@ public static void register()
ENABLED_RAIDERS.put(RaidEnemyRegistry.ARCHER, GENERAL.define("enableArchers", true));
ENABLED_RAIDERS.put(RaidEnemyRegistry.SKIRMISHER, GENERAL.define("enableSkirmishers", true));
ENABLED_RAIDERS.put(RaidEnemyRegistry.LEGIONER, GENERAL.define("enableLegioners", true));
- GENERAL.pop().push("Requires Illage & Spillage");
- ENABLED_RAIDERS.put(RaidEnemyRegistry.IGNITER, GENERAL.define("enableIgniters", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.TWITTOLLAGER, GENERAL.define("enableTwittollagers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.PRESERVER, GENERAL.define("enablePreservers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.ABSORBER, GENERAL.define("enableAbsorbers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.CROCOFANG, GENERAL.define("enableCrocofangs", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.MAGISPELLER, GENERAL.define("enableMagispellers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.SPIRITCALLER, GENERAL.define("enableSpiritcallers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.FREAKAGER, GENERAL.define("enableFreakagers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.BOSS_RANDOMIZER, GENERAL.define("enableBossRandomizers", true));
- GENERAL.pop().push("Requires Savage and Ravage");
- ENABLED_RAIDERS.put(RaidEnemyRegistry.GRIEFER, GENERAL.define("enableGriefers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.EXECUTIONER, GENERAL.define("enableExecutioners", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.TRICKSTER, GENERAL.define("enableTricksters", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.ICEOLOGER_SR, GENERAL.define("enableSavageRavageIceologers", true));
- GENERAL.pop().push("Requires Dungeon Mobs");
- ENABLED_RAIDERS.put(RaidEnemyRegistry.MOUNTAINEER, GENERAL.define("enableMountaineers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.ROYAL_GUARD, GENERAL.define("enableRoyalGuards", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.GEOMANCER, GENERAL.define("enableGeomancers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.ILLUSIONER_DM, GENERAL.define("enableDungeonMobsIllusioners", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.MAGE, GENERAL.define("enableMages", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.ICEOLOGER_DM, GENERAL.define("enableDungeonMobsIceologers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.WINDCALLER, GENERAL.define("enableWindcallers", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.SQUALL_GOLEM, GENERAL.define("enableSquallGolems", true));
- ENABLED_RAIDERS.put(RaidEnemyRegistry.REDSTONE_GOLEM, GENERAL.define("enableRedstoneGolems", true));
+// GENERAL.pop().push("Requires Illage & Spillage");
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.IGNITER, GENERAL.define("enableIgniters", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.TWITTOLLAGER, GENERAL.define("enableTwittollagers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.PRESERVER, GENERAL.define("enablePreservers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.ABSORBER, GENERAL.define("enableAbsorbers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.CROCOFANG, GENERAL.define("enableCrocofangs", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.MAGISPELLER, GENERAL.define("enableMagispellers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.SPIRITCALLER, GENERAL.define("enableSpiritcallers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.FREAKAGER, GENERAL.define("enableFreakagers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.BOSS_RANDOMIZER, GENERAL.define("enableBossRandomizers", true));
+// GENERAL.pop().push("Requires Savage and Ravage");
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.GRIEFER, GENERAL.define("enableGriefers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.EXECUTIONER, GENERAL.define("enableExecutioners", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.TRICKSTER, GENERAL.define("enableTricksters", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.ICEOLOGER_SR, GENERAL.define("enableSavageRavageIceologers", true));
+// GENERAL.pop().push("Requires Dungeon Mobs");
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.MOUNTAINEER, GENERAL.define("enableMountaineers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.ROYAL_GUARD, GENERAL.define("enableRoyalGuards", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.GEOMANCER, GENERAL.define("enableGeomancers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.ILLUSIONER_DM, GENERAL.define("enableDungeonMobsIllusioners", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.MAGE, GENERAL.define("enableMages", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.ICEOLOGER_DM, GENERAL.define("enableDungeonMobsIceologers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.WINDCALLER, GENERAL.define("enableWindcallers", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.SQUALL_GOLEM, GENERAL.define("enableSquallGolems", true));
+// ENABLED_RAIDERS.put(RaidEnemyRegistry.REDSTONE_GOLEM, GENERAL.define("enableRedstoneGolems", true));
GENERAL.pop();
GENERAL.pop();
@@ -331,24 +331,24 @@ public static void register()
spec.pop();
//Executioner
- spec.comment("REQUIRES 'Savage and Ravage'").push("Executioner Settings");
- config.executioner = new RaiderConfigs.Executioner(rd, spec);
- spec.pop();
+// spec.comment("REQUIRES 'Savage and Ravage'").push("Executioner Settings");
+// config.executioner = new RaiderConfigs.Executioner(rd, spec);
+// spec.pop();
//Mountaineer
- spec.comment("REQUIRES 'Dungeon Mobs'").push("Mountaineer Settings");
- config.mountaineer = new RaiderConfigs.Mountaineer(rd, spec);
- spec.pop();
-
- //Royal Guard
- spec.comment("REQUIRES 'Dungeon Mobs'").push("Royal Guard Settings");
- config.royalguard = new RaiderConfigs.RoyalGuard(rd, spec);
- spec.pop();
+// spec.comment("REQUIRES 'Dungeon Mobs'").push("Mountaineer Settings");
+// config.mountaineer = new RaiderConfigs.Mountaineer(rd, spec);
+// spec.pop();
+//
+// //Royal Guard
+// spec.comment("REQUIRES 'Dungeon Mobs'").push("Royal Guard Settings");
+// config.royalguard = new RaiderConfigs.RoyalGuard(rd, spec);
+// spec.pop();
//Vindicator With Shield
- spec.comment("REQUIRES 'Leo's Illagers'").push("Vindicator With Shield Settings");
- config.vindicatorWithShield = new RaiderConfigs.VindicatorWithShield(rd, spec);
- spec.pop();
+// spec.comment("REQUIRES 'Leo's Illagers'").push("Vindicator With Shield Settings");
+// config.vindicatorWithShield = new RaiderConfigs.VindicatorWithShield(rd, spec);
+// spec.pop();
spec.pop();
From ab41626d3379df95a0f5711eee11e18e3d082a3b Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Sun, 1 Sep 2024 08:13:42 -0400
Subject: [PATCH 10/38] added display insanity mode config option
---
build.gradle | 7 ++--
.../difficultraids/DifficultRaids.java | 2 +-
.../config/RaidDifficultyConfig.java | 8 ++---
.../difficultraids/mixins/RaidMixin.java | 2 +-
.../setup/DifficultRaidsConfig.java | 8 +++++
.../setup/DifficultRaidsEnchantments.java | 34 ++++++++++++++-----
src/main/resources/difficultraids.mixin.json | 10 ------
7 files changed, 45 insertions(+), 26 deletions(-)
diff --git a/build.gradle b/build.gradle
index 9b7e834..c7a25f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -172,8 +172,9 @@ dependencies {
//Villager Workers 1.7.8
implementation fg.deobf("curse.maven:workers-567450:5314033")
- //Hunter Illager 11.5.0
+ //Hunter Illager 11.5.0 & Bagus Lib 5.2.3
implementation fg.deobf("curse.maven:hunterillager-318857:5580223")
+ implementation fg.deobf("curse.maven:baguslib-866533:5662323")
//Enchant with Mob 12.0.1
compileOnly fg.deobf("curse.maven:enchantwithmob-913523:5676281")
@@ -198,8 +199,10 @@ dependencies {
//Pyrologer & Friends
// implementation fg.deobf("curse.maven:pyrologer-and-friends-573099:4433602")
- //L Ender's Cataclysm 1.99.6
+ //L Ender's Cataclysm 1.99.6 & Lionfish API 1.9
implementation fg.deobf("curse.maven:l_ender-s-cataclysm-551586:5474791")
+ implementation fg.deobf("curse.maven:lionfish-api-1001614:5363774")
+ implementation fg.deobf("curse.maven:curios-api-309927:5680164")
//Mob Entity Path Visualizer 1.1.0-release.6
// runtimeOnly fg.deobf("curse.maven:mob-entity-path-visualizer-590716:4063117")
diff --git a/src/main/java/com/calculusmaster/difficultraids/DifficultRaids.java b/src/main/java/com/calculusmaster/difficultraids/DifficultRaids.java
index 1f541a1..1846782 100644
--- a/src/main/java/com/calculusmaster/difficultraids/DifficultRaids.java
+++ b/src/main/java/com/calculusmaster/difficultraids/DifficultRaids.java
@@ -11,6 +11,7 @@
import com.mojang.logging.LogUtils;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.AddReloadListenerEvent;
+import net.minecraftforge.eventbus.EventBus;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -38,7 +39,6 @@ public DifficultRaids()
DifficultRaidsConfig.register();
DifficultRaidsEntityTypes.register(eventBus);
-
DifficultRaidsEnchantments.register(eventBus);
DifficultRaidsEffects.register(eventBus);
diff --git a/src/main/java/com/calculusmaster/difficultraids/config/RaidDifficultyConfig.java b/src/main/java/com/calculusmaster/difficultraids/config/RaidDifficultyConfig.java
index e009666..62686ef 100644
--- a/src/main/java/com/calculusmaster/difficultraids/config/RaidDifficultyConfig.java
+++ b/src/main/java/com/calculusmaster/difficultraids/config/RaidDifficultyConfig.java
@@ -68,9 +68,9 @@ public void init()
this.archer.initialize();
this.skirmisher.initialize();
this.legioner.initialize();
- this.executioner.initialize();
- this.mountaineer.initialize();
- this.royalguard.initialize();
- this.vindicatorWithShield.initialize();
+// this.executioner.initialize();
+// this.mountaineer.initialize();
+// this.royalguard.initialize();
+// this.vindicatorWithShield.initialize();
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java
index 7818f5b..8cecbed 100644
--- a/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java
+++ b/src/main/java/com/calculusmaster/difficultraids/mixins/RaidMixin.java
@@ -124,7 +124,7 @@ private void difficultraids_addDifficultyToEventBar(CallbackInfo callback)
MutableComponent current = Component.literal(this.raidEvent.getName().getString());
MutableComponent additions = Component.empty();
- if(DifficultRaidsConfig.INSANITY_MODE.get()) additions.append(Component.literal("Insane ").withStyle(ChatFormatting.RED));
+ if(DifficultRaidsConfig.INSANITY_MODE.get() && DifficultRaidsConfig.DISPLAY_INSANITY_MODE.get()) additions.append(Component.literal("Insane ").withStyle(ChatFormatting.RED));
additions.append(raidDifficulty.getFormattedName() + " ");
MutableComponent wave = DifficultRaidsConfig.SHOW_WAVE_INFORMATION.get() ? Component.literal(" (Wave " + this.getGroupsSpawned() + " of " + this.numGroups + ")").withStyle(ChatFormatting.GRAY) : Component.empty();
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
index 4ec25a7..5d8e643 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
@@ -43,6 +43,7 @@ public class DifficultRaidsConfig
public static ForgeConfigSpec.BooleanValue INSANITY_MODE;
public static ForgeConfigSpec.DoubleValue INSANITY_COUNT_MULTIPLIER;
+ public static ForgeConfigSpec.BooleanValue DISPLAY_INSANITY_MODE;
public static Map ENABLED_RAIDERS = new HashMap<>();
@@ -136,9 +137,13 @@ public static void register()
.comment("The multiplier for the number of raiders spawned in Insanity mode.")
.comment("This gets applied on top of whatever difficulty a Raid is at. This will not apply to Default Raids.")
.defineInRange("insanityCountMultiplier", 3.0, 1.0, Double.MAX_VALUE);
+ DISPLAY_INSANITY_MODE = GENERAL
+ .comment("Toggles whether or not to display 'Insane' on the raid")
+ .define("displayInsanityMode", true);
GENERAL.pop();
+
GENERAL.comment("Customize which Raiders will show up in Raids. By default, all raiders are enabled.")
.push("Enabled Raiders");
@@ -195,6 +200,7 @@ public static void register()
GENERAL.pop();
+
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, GENERAL.build(), DifficultRaids.MODID + "/general.toml");
//Raid Difficulty Configs
@@ -362,6 +368,8 @@ public static void register()
case MASTER -> MASTER = config;
case GRANDMASTER -> GRANDMASTER = config;
}
+
+
}
}
}
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsEnchantments.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsEnchantments.java
index 7738bd5..10a0de0 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsEnchantments.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsEnchantments.java
@@ -1,6 +1,9 @@
package com.calculusmaster.difficultraids.setup;
import com.calculusmaster.difficultraids.DifficultRaids;
+import com.calculusmaster.difficultraids.setup.DifficultRaidsConfig;
+import java.util.HashMap;
+import java.util.*;
import com.calculusmaster.difficultraids.enchantments.*;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.enchantment.Enchantment;
@@ -14,16 +17,31 @@ public class DifficultRaidsEnchantments
{
public static final DeferredRegister ENCHANTMENTS = DeferredRegister.create(ForgeRegistries.ENCHANTMENTS, DifficultRaids.MODID);
- public static RegistryObject RAIDERS_BANE = ENCHANTMENTS.register("raiders_bane", () -> new RaidersBaneEnchantment(Enchantment.Rarity.UNCOMMON, EnchantmentCategory.WEAPON, EquipmentSlot.MAINHAND));
- public static RegistryObject INVISIBILITY = ENCHANTMENTS.register("invisibility", () -> new InvisibilityEnchantment(Enchantment.Rarity.UNCOMMON, EnchantmentCategory.ARMOR_CHEST, EquipmentSlot.CHEST));
- public static RegistryObject CRITICAL_STRIKE = ENCHANTMENTS.register("critical_strike", () -> new CriticalStrikeEnchantment(Enchantment.Rarity.RARE, EnchantmentCategory.WEAPON, EquipmentSlot.MAINHAND));
- public static RegistryObject CRITICAL_BURST = ENCHANTMENTS.register("critical_burst", () -> new CriticalBurstEnchantment(Enchantment.Rarity.RARE, EnchantmentCategory.WEAPON, EquipmentSlot.MAINHAND));
- public static RegistryObject CRITICAL_RESISTANCE = ENCHANTMENTS.register("critical_resistance", () -> new CriticalResistanceEnchantment(Enchantment.Rarity.RARE, EnchantmentCategory.ARMOR, EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.LEGS, EquipmentSlot.FEET));
- public static RegistryObject LIGHTNING_RESISTANCE = ENCHANTMENTS.register("lightning_resistance", () -> new LightningResistanceEnchantment(Enchantment.Rarity.UNCOMMON, EnchantmentCategory.ARMOR_HEAD, EquipmentSlot.HEAD));
- public static RegistryObject PROJECTILE_EVASION = ENCHANTMENTS.register("projectile_evasion", () -> new ProjectileEvasionEnchantment(Enchantment.Rarity.UNCOMMON, EnchantmentCategory.ARMOR_FEET, EquipmentSlot.FEET));
+ public static RegistryObject RAIDERS_BANE;
+ public static RegistryObject INVISIBILITY;
+ public static RegistryObject CRITICAL_STRIKE;
+ public static RegistryObject CRITICAL_BURST;
+ public static RegistryObject CRITICAL_RESISTANCE;
+ public static RegistryObject LIGHTNING_RESISTANCE;
+ public static RegistryObject PROJECTILE_EVASION;
- public static void register(IEventBus eventBus)
+ public static synchronized void register(IEventBus eventBus)
{
+ RAIDERS_BANE = ENCHANTMENTS.register("raiders_bane", () -> new RaidersBaneEnchantment(Enchantment.Rarity.UNCOMMON, EnchantmentCategory.WEAPON, EquipmentSlot.MAINHAND));
+
+ INVISIBILITY = ENCHANTMENTS.register("invisibility", () -> new InvisibilityEnchantment(Enchantment.Rarity.UNCOMMON, EnchantmentCategory.ARMOR_CHEST, EquipmentSlot.CHEST));
+
+ CRITICAL_STRIKE = ENCHANTMENTS.register("critical_strike", () -> new CriticalStrikeEnchantment(Enchantment.Rarity.RARE, EnchantmentCategory.WEAPON, EquipmentSlot.MAINHAND));
+
+ CRITICAL_BURST = ENCHANTMENTS.register("critical_burst", () -> new CriticalBurstEnchantment(Enchantment.Rarity.RARE, EnchantmentCategory.WEAPON, EquipmentSlot.MAINHAND));
+
+ CRITICAL_RESISTANCE = ENCHANTMENTS.register("critical_resistance", () -> new CriticalResistanceEnchantment(Enchantment.Rarity.RARE, EnchantmentCategory.ARMOR, EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.LEGS, EquipmentSlot.FEET));
+
+ LIGHTNING_RESISTANCE = ENCHANTMENTS.register("lightning_resistance", () -> new LightningResistanceEnchantment(Enchantment.Rarity.UNCOMMON, EnchantmentCategory.ARMOR_HEAD, EquipmentSlot.HEAD));
+
+ PROJECTILE_EVASION = ENCHANTMENTS.register("projectile_evasion", () -> new ProjectileEvasionEnchantment(Enchantment.Rarity.UNCOMMON, EnchantmentCategory.ARMOR_FEET, EquipmentSlot.FEET));
+
ENCHANTMENTS.register(eventBus);
}
+
}
diff --git a/src/main/resources/difficultraids.mixin.json b/src/main/resources/difficultraids.mixin.json
index 71d1cc6..56bcb2f 100644
--- a/src/main/resources/difficultraids.mixin.json
+++ b/src/main/resources/difficultraids.mixin.json
@@ -10,20 +10,10 @@
"RaidMixin",
"VillagerMixin",
"compat.ArcherMixin",
- "compat.ClownagerMixin",
- "compat.ExecutionerMixin",
- "compat.FreakagerMixin",
"compat.GuardMixin",
"compat.HunterIllagerMixin",
"compat.LegionerMixin",
- "compat.LightningCallerMixin",
- "compat.MagispellerMixin",
- "compat.MountaineerMixin",
- "compat.RedstoneGolemMixin",
- "compat.RoyalGuardMixin",
"compat.SkirmisherMixin",
- "compat.SpiritcallerMixin",
- "compat.VindicatorWithShieldMixin",
"raider.AbstractIllagerMixin",
"raider.EvokerFangsMixin",
"raider.LightningBoltMixin",
From ed96ac634de3cc7047457e6047b0d08914de1d6c Mon Sep 17 00:00:00 2001
From: Ldawsonm <82904040+Ldawsonm@users.noreply.github.com>
Date: Sun, 1 Sep 2024 10:06:22 -0400
Subject: [PATCH 11/38] updated mod version and added texture for wind effect
---
build.gradle | 2 +-
.../textures/mob_effect/winds_curse.png | Bin 0 -> 867 bytes
2 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 src/main/resources/assets/difficultraids/textures/mob_effect/winds_curse.png
diff --git a/build.gradle b/build.gradle
index c7a25f4..d45dd89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ apply plugin: 'org.parchmentmc.librarian.forgegradle'
apply plugin: 'org.spongepowered.mixin'
-version = '2.0-beta.11'
+version = '2.0-beta.12'
group = 'com.calculusmaster.difficultraids'
archivesBaseName = 'difficultraids-1.20.1'
diff --git a/src/main/resources/assets/difficultraids/textures/mob_effect/winds_curse.png b/src/main/resources/assets/difficultraids/textures/mob_effect/winds_curse.png
new file mode 100644
index 0000000000000000000000000000000000000000..832e71c909fedfb797ad44c10ccd90476fb62305
GIT binary patch
literal 867
zcmV-p1DyPcP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T9YYke|fg)lE5uzdl75oeB$U#RPIOw3G{(_D==%Ay{go2J8h-ehl
zs5O%K0AJW>G)llHC~B_WuC*~DDs;n_`#5{Av(7pDM*b592!k}RpTK9n=eUOB;rd!I
zDFA-<_Vxzq>go)HSe7N*+uPQ}#6$vPp8&7c8~iX>^cHx48@L{>zaSE9X=yP^OH0MJ
zZJ}6ob#*~QLxXR5c{zlfILH>@CqMHrh(5r3Ci&^4sHjNJ&(CFcc2;7sm|R_5No8fF
z(ca$9x*x!#2n&AX?c-iHH#hy0laoyF(!urhwJaQ7+G=!lb!kE_m(wNP+}v;ixxc@cot+)stEWLBwa+9>Xwzj58E|*ISC{kWtE~BHP*5TpdKGOELwzjO((^G9s
z9>(3>oz`<{?*W%)vIxtQ`ucixgI=+QhK6{&M;tTMCufW7fn*4~lT)3nNzy1LV@wA=?MLq)x(Zz2Nq5wA%@d1#a
t&^z!v9y=Croc{<<^C<8EqyX~7`Uk;IO#Zsu)l&cf002ovPDHLkV1gJ4m#hE)
literal 0
HcmV?d00001
From 2038848eeb6a9c77ac17e242bf548284f6c0945c Mon Sep 17 00:00:00 2001
From: Groupix05
Date: Mon, 9 Dec 2024 23:15:50 +0100
Subject: [PATCH 12/38] Added back compatibility for Illage and Spillage
re-added compatibility for Illage and Spillage: Respillaged
Added compatibility for the Engineer illager from Respillaged
---
build.gradle | 7 +++---
.../mixins/compat/FreakagerMixin.java | 0
.../mixins/compat/MagispellerMixin.java | 0
.../mixins/compat/SpiritcallerMixin.java | 0
.../raids/RaidEnemyRegistry.java | 7 +++++-
.../setup/DifficultRaidsConfig.java | 21 +++++++++--------
.../util/DifficultRaidsUtil.java | 23 ++++++++++---------
src/main/resources/META-INF/mods.toml | 2 +-
src/main/resources/difficultraids.mixin.json | 3 +++
src/main/resources/pack.mcmeta | 4 ++--
10 files changed, 39 insertions(+), 28 deletions(-)
rename {deprecated => src/main/java/com/calculusmaster/difficultraids}/mixins/compat/FreakagerMixin.java (100%)
rename {deprecated => src/main/java/com/calculusmaster/difficultraids}/mixins/compat/MagispellerMixin.java (100%)
rename {deprecated => src/main/java/com/calculusmaster/difficultraids}/mixins/compat/SpiritcallerMixin.java (100%)
diff --git a/build.gradle b/build.gradle
index d45dd89..3f9b4a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ apply plugin: 'org.parchmentmc.librarian.forgegradle'
apply plugin: 'org.spongepowered.mixin'
-version = '2.0-beta.12'
+version = '2.0-beta.13'
group = 'com.calculusmaster.difficultraids'
archivesBaseName = 'difficultraids-1.20.1'
@@ -179,8 +179,8 @@ dependencies {
//Enchant with Mob 12.0.1
compileOnly fg.deobf("curse.maven:enchantwithmob-913523:5676281")
- //Illage & Spillage 1.2.4
-// implementation fg.deobf("curse.maven:illage-and-spillage-576368:4263798")
+ //Illage & Spillage: Respillaged 1.2.2
+ implementation fg.deobf("curse.maven:illage-and-spillage-finally-ported-1079714:5871923")
//It Takes a Pillage 1.0.3
implementation fg.deobf("curse.maven:it-takes-a-pillage-635843:4981343")
@@ -213,6 +213,7 @@ dependencies {
//ToroHealth Damage Indicators 1.19.2 1.0.0
// runtimeOnly fg.deobf("curse.maven:torohealth-damage-indicators-245733:3895068")
+
}
mixin {
diff --git a/deprecated/mixins/compat/FreakagerMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/compat/FreakagerMixin.java
similarity index 100%
rename from deprecated/mixins/compat/FreakagerMixin.java
rename to src/main/java/com/calculusmaster/difficultraids/mixins/compat/FreakagerMixin.java
diff --git a/deprecated/mixins/compat/MagispellerMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/compat/MagispellerMixin.java
similarity index 100%
rename from deprecated/mixins/compat/MagispellerMixin.java
rename to src/main/java/com/calculusmaster/difficultraids/mixins/compat/MagispellerMixin.java
diff --git a/deprecated/mixins/compat/SpiritcallerMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/compat/SpiritcallerMixin.java
similarity index 100%
rename from deprecated/mixins/compat/SpiritcallerMixin.java
rename to src/main/java/com/calculusmaster/difficultraids/mixins/compat/SpiritcallerMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java b/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
index 954eba7..6ae1f2e 100644
--- a/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
+++ b/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
@@ -65,6 +65,7 @@ public class RaidEnemyRegistry
public static final String PRESERVER = "entity.illageandspillage.preserver";
public static final String ABSORBER = "entity.illageandspillage.absorber";
public static final String CROCOFANG = "entity.illageandspillage.crocofang";
+ public static final String ENGINEER = "entity.illageandspillage.engineer";
public static final String MAGISPELLER = "entity.illageandspillage.magispeller";
public static final String SPIRITCALLER = "entity.illageandspillage.spiritcaller";
public static final String FREAKAGER = "entity.illageandspillage.freakager";
@@ -211,6 +212,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 1, 0, 1, 2, 1, 3, 4)
.withRaider(ABSORBER, 0, 0, 1, 0, 1, 0, 0, 2)
.withRaider(CROCOFANG, 0, 0, 1, 1, 2, 3, 1, 3)
+ .withRaider(ENGINEER, 0, 0, 1, 2, 2, 2, 2, 4)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -270,6 +272,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 1, 1, 2, 2, 2, 4, 4)
.withRaider(ABSORBER, 0, 0, 1, 1, 2, 0, 1, 2)
.withRaider(CROCOFANG, 0, 1, 2, 1, 2, 3, 2, 4)
+ .withRaider(ENGINEER, 0, 0, 1, 2, 3, 3, 2, 4)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -330,6 +333,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 2, 2, 2, 2, 2, 4, 4)
.withRaider(ABSORBER, 0, 1, 1, 1, 2, 1, 1, 3)
.withRaider(CROCOFANG, 0, 2, 2, 3, 2, 4, 2, 5)
+ .withRaider(ENGINEER, 0, 1, 2, 3, 3, 3, 4, 6)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -392,10 +396,11 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 2, 2, 2, 2, 2, 4, 4)
.withRaider(ABSORBER, 0, 1, 1, 1, 2, 1, 1, 3)
.withRaider(CROCOFANG, 0, 2, 2, 3, 2, 4, 2, 5)
+ .withRaider(ENGINEER, 0, 2, 3, 4, 5, 4, 5, 7)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
- .withRaider(BOSS_RANDOMIZER, 0, 1, 1, 1, 1, 1, 1, 1)
+ .withRaider(BOSS_RANDOMIZER, 0, 0, 1, 1, 1, 2, 3, 2)
.withRaider(GRIEFER, 0, 2, 3, 2, 3, 3, 3, 4)
.withRaider(EXECUTIONER, 0, 2, 2, 2, 3, 2, 3, 4)
.withRaider(TRICKSTER, 0, 1, 2, 1, 2, 2, 2, 3)
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
index 5d8e643..623a83b 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
@@ -171,16 +171,17 @@ public static void register()
ENABLED_RAIDERS.put(RaidEnemyRegistry.ARCHER, GENERAL.define("enableArchers", true));
ENABLED_RAIDERS.put(RaidEnemyRegistry.SKIRMISHER, GENERAL.define("enableSkirmishers", true));
ENABLED_RAIDERS.put(RaidEnemyRegistry.LEGIONER, GENERAL.define("enableLegioners", true));
-// GENERAL.pop().push("Requires Illage & Spillage");
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.IGNITER, GENERAL.define("enableIgniters", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.TWITTOLLAGER, GENERAL.define("enableTwittollagers", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.PRESERVER, GENERAL.define("enablePreservers", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.ABSORBER, GENERAL.define("enableAbsorbers", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.CROCOFANG, GENERAL.define("enableCrocofangs", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.MAGISPELLER, GENERAL.define("enableMagispellers", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.SPIRITCALLER, GENERAL.define("enableSpiritcallers", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.FREAKAGER, GENERAL.define("enableFreakagers", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.BOSS_RANDOMIZER, GENERAL.define("enableBossRandomizers", true));
+ GENERAL.pop().push("Requires Illage & Spillage");
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.IGNITER, GENERAL.define("enableIgniters", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.TWITTOLLAGER, GENERAL.define("enableTwittollagers", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.PRESERVER, GENERAL.define("enablePreservers", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.ABSORBER, GENERAL.define("enableAbsorbers", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.CROCOFANG, GENERAL.define("enableCrocofangs", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.ENGINEER, GENERAL.define("enableEngineers", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.MAGISPELLER, GENERAL.define("enableMagispellers", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.SPIRITCALLER, GENERAL.define("enableSpiritcallers", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.FREAKAGER, GENERAL.define("enableFreakagers", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.BOSS_RANDOMIZER, GENERAL.define("enableBossRandomizers", true));
// GENERAL.pop().push("Requires Savage and Ravage");
// ENABLED_RAIDERS.put(RaidEnemyRegistry.GRIEFER, GENERAL.define("enableGriefers", true));
// ENABLED_RAIDERS.put(RaidEnemyRegistry.EXECUTIONER, GENERAL.define("enableExecutioners", true));
diff --git a/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java b/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
index e815214..a7b7e4d 100644
--- a/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
+++ b/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
@@ -44,17 +44,18 @@ public static void registerArmorModifierRaiderLists()
ADVANCED_RAIDERS.add(ModEntityTypes.LEGIONER.get());
}
-// if(Compat.ILLAGE_AND_SPILLAGE.isLoaded()) //Skipping: Absorber, Magispeller/Freakager/Spiritcaller/Boss Randomizer
-// {
-// STANDARD_RAIDERS.addAll(List.of(
-// com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Preserver.get(),
-// com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Igniter.get()
-// ));
-// ADVANCED_RAIDERS.addAll(List.of(
-// com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Twittollager.get(),
-// com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Crocofang.get()
-// ));
-// }
+ if(Compat.ILLAGE_AND_SPILLAGE.isLoaded()) //Skipping: Absorber, Magispeller/Freakager/Spiritcaller/Boss Randomizer
+ {
+ STANDARD_RAIDERS.addAll(List.of(
+ com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Preserver.get(),
+ com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Igniter.get()
+ ));
+ ADVANCED_RAIDERS.addAll(List.of(
+ com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Twittollager.get(),
+ com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Crocofang.get(),
+ com.yellowbrossproductions.illageandspillage.init.ModEntityTypes.Engineer.get()
+ ));
+ }
// if(Compat.SAVAGE_AND_RAVAGE.isLoaded())
// {
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 59786f4..7c59bc2 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -41,7 +41,7 @@ Are you up for the challenge?
# Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory
# The version range of the dependency
- versionRange="[40,)" #mandatory
+ versionRange="[47,)" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER
diff --git a/src/main/resources/difficultraids.mixin.json b/src/main/resources/difficultraids.mixin.json
index 56bcb2f..c17d2c8 100644
--- a/src/main/resources/difficultraids.mixin.json
+++ b/src/main/resources/difficultraids.mixin.json
@@ -10,10 +10,13 @@
"RaidMixin",
"VillagerMixin",
"compat.ArcherMixin",
+ "compat.FreakagerMixin",
"compat.GuardMixin",
"compat.HunterIllagerMixin",
"compat.LegionerMixin",
+ "compat.MagispellerMixin",
"compat.SkirmisherMixin",
+ "compat.SpiritcallerMixin",
"raider.AbstractIllagerMixin",
"raider.EvokerFangsMixin",
"raider.LightningBoltMixin",
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
index 993f908..8ab8938 100644
--- a/src/main/resources/pack.mcmeta
+++ b/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
{
"pack": {
"description": "DifficultRaids Resources",
- "pack_format": 9
+ "pack_format": 15
}
-}
\ No newline at end of file
+}
From c59eba4269b6025d4eb276aecb326be6c46fd1d0 Mon Sep 17 00:00:00 2001
From: Groupix05
Date: Tue, 14 Jan 2025 15:45:55 +0100
Subject: [PATCH 13/38] Added back compatibility for Savage & Ravage
- Added back compatibility for Savage & Ravage
- Tweaked Engineer spawns
Those changes should also be server-side only, I didnt test it. That mean :
SERVER:beta14 CLIENT:beta12
should work.
/!\ if you are CalculusMaster, please change the mod.toml
---
build.gradle | 7 +--
gradle.properties | 4 +-
.../config/RaidDifficultyConfig.java | 2 +-
.../mixins/compat/ExecutionerMixin.java | 0
.../raids/RaidEnemyRegistry.java | 12 ++---
.../setup/DifficultRaidsConfig.java | 16 +++---
.../difficultraids/util/Compat.java | 4 +-
.../util/DifficultRaidsUtil.java | 16 +++---
src/main/resources/META-INF/mods.toml | 50 +++++--------------
src/main/resources/difficultraids.mixin.json | 3 +-
10 files changed, 45 insertions(+), 69 deletions(-)
rename {deprecated => src/main/java/com/calculusmaster/difficultraids}/mixins/compat/ExecutionerMixin.java (100%)
diff --git a/build.gradle b/build.gradle
index 3f9b4a0..1347cc6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ apply plugin: 'org.parchmentmc.librarian.forgegradle'
apply plugin: 'org.spongepowered.mixin'
-version = '2.0-beta.13'
+version = '2.0-beta.14'
group = 'com.calculusmaster.difficultraids'
archivesBaseName = 'difficultraids-1.20.1'
@@ -185,8 +185,9 @@ dependencies {
//It Takes a Pillage 1.0.3
implementation fg.deobf("curse.maven:it-takes-a-pillage-635843:4981343")
- //Savage and Ravage 5.0.4
-// implementation fg.deobf("curse.maven:savage-and-ravage-381736:4429231")
+ //Savage and Ravage 6.0.0
+ implementation fg.deobf("curse.maven:savage-and-ravage-381736:6040963")
+ implementation fg.deobf("curse.maven:blueprint-382216:5292242")
//Dungeons Mobs 4.0.8 + GeckoLib 3.1.40 + Dungeons Libraries 3.0.10
// implementation fg.deobf("curse.maven:dungeons-mobs-428883:4501524")
diff --git a/gradle.properties b/gradle.properties
index 878bf1f..29b2ac4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,2 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
\ No newline at end of file
+org.gradle.daemon=false
diff --git a/src/main/java/com/calculusmaster/difficultraids/config/RaidDifficultyConfig.java b/src/main/java/com/calculusmaster/difficultraids/config/RaidDifficultyConfig.java
index 62686ef..8f772e6 100644
--- a/src/main/java/com/calculusmaster/difficultraids/config/RaidDifficultyConfig.java
+++ b/src/main/java/com/calculusmaster/difficultraids/config/RaidDifficultyConfig.java
@@ -68,7 +68,7 @@ public void init()
this.archer.initialize();
this.skirmisher.initialize();
this.legioner.initialize();
-// this.executioner.initialize();
+ this.executioner.initialize();
// this.mountaineer.initialize();
// this.royalguard.initialize();
// this.vindicatorWithShield.initialize();
diff --git a/deprecated/mixins/compat/ExecutionerMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/compat/ExecutionerMixin.java
similarity index 100%
rename from deprecated/mixins/compat/ExecutionerMixin.java
rename to src/main/java/com/calculusmaster/difficultraids/mixins/compat/ExecutionerMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java b/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
index 6ae1f2e..4cdb814 100644
--- a/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
+++ b/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
@@ -6,7 +6,7 @@
import com.calculusmaster.difficultraids.util.Compat;
//import com.infamous.dungeons_mobs.mod.ModEntityTypes;
import com.mojang.logging.LogUtils;
-//import com.teamabnormals.savage_and_ravage.core.registry.SREntityTypes;
+import com.teamabnormals.savage_and_ravage.core.registry.SREntityTypes;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.raid.Raid;
@@ -135,7 +135,7 @@ public static void registerRaiders()
RaidEnemyRegistry.createRaiderType(VOLDON, VOLDON_ELITE.get());
//Compatibility
-// if(Compat.SAVAGE_AND_RAVAGE.isLoaded()) RaidEnemyRegistry.createRaiderType(ICEOLOGER_SR, SREntityTypes.ICEOLOGER.get());
+ if(Compat.SAVAGE_AND_RAVAGE.isLoaded()) RaidEnemyRegistry.createRaiderType(ICEOLOGER_SR, SREntityTypes.ICEOLOGER.get());
// if(Compat.DUNGEONS_MOBS.isLoaded()) RaidEnemyRegistry.createRaiderType(ILLUSIONER_DM, ModEntityTypes.ILLUSIONER.get());
}
@@ -212,7 +212,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 1, 0, 1, 2, 1, 3, 4)
.withRaider(ABSORBER, 0, 0, 1, 0, 1, 0, 0, 2)
.withRaider(CROCOFANG, 0, 0, 1, 1, 2, 3, 1, 3)
- .withRaider(ENGINEER, 0, 0, 1, 2, 2, 2, 2, 4)
+ .withRaider(ENGINEER, 0, 0, 0, 1, 0, 1, 1, 2)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -272,7 +272,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 1, 1, 2, 2, 2, 4, 4)
.withRaider(ABSORBER, 0, 0, 1, 1, 2, 0, 1, 2)
.withRaider(CROCOFANG, 0, 1, 2, 1, 2, 3, 2, 4)
- .withRaider(ENGINEER, 0, 0, 1, 2, 3, 3, 2, 4)
+ .withRaider(ENGINEER, 0, 0, 1, 1, 1, 1, 1, 2)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -333,7 +333,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 2, 2, 2, 2, 2, 4, 4)
.withRaider(ABSORBER, 0, 1, 1, 1, 2, 1, 1, 3)
.withRaider(CROCOFANG, 0, 2, 2, 3, 2, 4, 2, 5)
- .withRaider(ENGINEER, 0, 1, 2, 3, 3, 3, 4, 6)
+ .withRaider(ENGINEER, 0, 1, 1, 0, 2, 1, 1, 2)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -396,7 +396,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 2, 2, 2, 2, 2, 4, 4)
.withRaider(ABSORBER, 0, 1, 1, 1, 2, 1, 1, 3)
.withRaider(CROCOFANG, 0, 2, 2, 3, 2, 4, 2, 5)
- .withRaider(ENGINEER, 0, 2, 3, 4, 5, 4, 5, 7)
+ .withRaider(ENGINEER, 0, 1, 2, 2, 1, 2, 3, 3)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
index 623a83b..c41c105 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
@@ -182,11 +182,11 @@ public static void register()
ENABLED_RAIDERS.put(RaidEnemyRegistry.SPIRITCALLER, GENERAL.define("enableSpiritcallers", true));
ENABLED_RAIDERS.put(RaidEnemyRegistry.FREAKAGER, GENERAL.define("enableFreakagers", true));
ENABLED_RAIDERS.put(RaidEnemyRegistry.BOSS_RANDOMIZER, GENERAL.define("enableBossRandomizers", true));
-// GENERAL.pop().push("Requires Savage and Ravage");
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.GRIEFER, GENERAL.define("enableGriefers", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.EXECUTIONER, GENERAL.define("enableExecutioners", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.TRICKSTER, GENERAL.define("enableTricksters", true));
-// ENABLED_RAIDERS.put(RaidEnemyRegistry.ICEOLOGER_SR, GENERAL.define("enableSavageRavageIceologers", true));
+ GENERAL.pop().push("Requires Savage and Ravage");
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.GRIEFER, GENERAL.define("enableGriefers", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.EXECUTIONER, GENERAL.define("enableExecutioners", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.TRICKSTER, GENERAL.define("enableTricksters", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.ICEOLOGER_SR, GENERAL.define("enableSavageRavageIceologers", true));
// GENERAL.pop().push("Requires Dungeon Mobs");
// ENABLED_RAIDERS.put(RaidEnemyRegistry.MOUNTAINEER, GENERAL.define("enableMountaineers", true));
// ENABLED_RAIDERS.put(RaidEnemyRegistry.ROYAL_GUARD, GENERAL.define("enableRoyalGuards", true));
@@ -338,9 +338,9 @@ public static void register()
spec.pop();
//Executioner
-// spec.comment("REQUIRES 'Savage and Ravage'").push("Executioner Settings");
-// config.executioner = new RaiderConfigs.Executioner(rd, spec);
-// spec.pop();
+ spec.comment("REQUIRES 'Savage and Ravage'").push("Executioner Settings");
+ config.executioner = new RaiderConfigs.Executioner(rd, spec);
+ spec.pop();
//Mountaineer
// spec.comment("REQUIRES 'Dungeon Mobs'").push("Mountaineer Settings");
diff --git a/src/main/java/com/calculusmaster/difficultraids/util/Compat.java b/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
index d45178b..cf77f16 100644
--- a/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
+++ b/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
@@ -6,10 +6,10 @@ public enum Compat
{
GUARD_VILLAGERS("guardvillagers"),
HUNTER_ILLAGER("hunterillager"),
-// ENCHANT_WITH_MOB("enchantwithmob"),
+ ENCHANT_WITH_MOB("enchantwithmob"),
IT_TAKES_A_PILLAGE("takesapillage"),
ILLAGE_AND_SPILLAGE("illageandspillage"),
-// SAVAGE_AND_RAVAGE("savage_and_ravage"),
+ SAVAGE_AND_RAVAGE("savage_and_ravage"),
// DUNGEONS_MOBS("dungeons_mobs"),
ILLAGER_REVOLUTION("illagerrevolutionmod"),
LEOS_ILLAGERS("leosillagers"),
diff --git a/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java b/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
index a7b7e4d..3b91047 100644
--- a/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
+++ b/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
@@ -5,7 +5,7 @@
//import cn.leolezury.leosillagers.init.EntityInit;
import com.calculusmaster.difficultraids.entity.DifficultRaidsEntityTypes;
import com.izofar.takesapillage.init.ModEntityTypes;
-//import com.teamabnormals.savage_and_ravage.core.registry.SREntityTypes;
+import com.teamabnormals.savage_and_ravage.core.registry.SREntityTypes;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType;
import net.minecraftforge.registries.ForgeRegistries;
@@ -36,7 +36,7 @@ public static void registerArmorModifierRaiderLists()
//Mod Compat
if(Compat.HUNTER_ILLAGER.isLoaded()) STANDARD_RAIDERS.add(HunterEntityRegistry.HUNTERILLAGER.get());
-// if(Compat.ENCHANT_WITH_MOB.isLoaded()) ADVANCED_MAGIC_RAIDERS.add(ModEntities.ENCHANTER.get());
+ if(Compat.ENCHANT_WITH_MOB.isLoaded()) ADVANCED_MAGIC_RAIDERS.add(ModEntities.ENCHANTER.get());
if(Compat.IT_TAKES_A_PILLAGE.isLoaded())
{
@@ -57,12 +57,12 @@ public static void registerArmorModifierRaiderLists()
));
}
-// if(Compat.SAVAGE_AND_RAVAGE.isLoaded())
-// {
-// ADVANCED_RAIDERS.add(SREntityTypes.EXECUTIONER.get());
-// BASIC_MAGIC_RAIDERS.addAll(List.of(SREntityTypes.GRIEFER.get(), SREntityTypes.TRICKSTER.get()));
-// ADVANCED_MAGIC_RAIDERS.add(SREntityTypes.ICEOLOGER.get());
-// }
+ if(Compat.SAVAGE_AND_RAVAGE.isLoaded())
+ {
+ ADVANCED_RAIDERS.add(SREntityTypes.EXECUTIONER.get());
+ BASIC_MAGIC_RAIDERS.addAll(List.of(SREntityTypes.GRIEFER.get(), SREntityTypes.TRICKSTER.get()));
+ ADVANCED_MAGIC_RAIDERS.add(SREntityTypes.ICEOLOGER.get());
+ }
// if(Compat.DUNGEONS_MOBS.isLoaded()) //Skipping: Squall Golem, Redstone Golem
// {
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 7c59bc2..9f6726b 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,56 +1,32 @@
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[40,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
-# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
+modLoader="javafml"
+loaderVersion="[47,)"
license="All rights reserved"
-# A URL to refer people to when problems occur with this mod
-#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
-# A list of mods - how many allowed here is determined by the individual mod loader
+
[[mods]] #mandatory
-# The modid of the mod
-modId="difficultraids" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
-# see the associated build.gradle script for how to populate this completely automatically during a build
-version="${file.jarVersion}" #mandatory
- # A display name for the mod
-displayName="Difficult Raids" #mandatory
-# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
-#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
-# A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL="https://www.curseforge.com/minecraft/mc-mods/difficult-raids" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
+modId="difficultraids"
+version="${file.jarVersion}"
+displayName="Difficult Raids"
+displayURL="https://www.curseforge.com/minecraft/mc-mods/difficult-raids-stronghold-survival-edition" #optional
logoFile="logo.png" #optional
-# A text field displayed in the mod UI
-credits="See CurseForge page for a list of all texture artists!" #optional
-# A text field displayed in the mod UI
+credits="LDawsonM2012 for the 1.20.1 port. See CurseForge page for a list of all texture artists!" #optional
authors="CalculusMaster" #optional
-# The description text for the mod (multi line!) (#mandatory)
description='''
Do you like Raids? Do you think they're too easy?
Difficult Raids adds higher difficulty options for Raids as well as new Illagers to challenge you.
Higher difficulty raids offer greater rewards.
Are you up for the challenge?
'''
-# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
+
[[dependencies.difficultraids]] #optional
- # the modid of the dependency
- modId="forge" #mandatory
- # Does this dependency have to exist - if not, ordering below must be specified
- mandatory=true #mandatory
- # The version range of the dependency
- versionRange="[47,)" #mandatory
- # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
+ modId="forge"
+ mandatory=true
+ versionRange="[47,)"
ordering="NONE"
- # Side this dependency is applied on - BOTH, CLIENT or SERVER
side="BOTH"
-# Here's another dependency
+
[[dependencies.difficultraids]]
modId="minecraft"
mandatory=true
-# This version range declares a minimum of the current minecraft version up to but not including the next major version
versionRange="[1.20.1,1.20.2)"
ordering="NONE"
side="BOTH"
diff --git a/src/main/resources/difficultraids.mixin.json b/src/main/resources/difficultraids.mixin.json
index c17d2c8..4d0346d 100644
--- a/src/main/resources/difficultraids.mixin.json
+++ b/src/main/resources/difficultraids.mixin.json
@@ -10,6 +10,7 @@
"RaidMixin",
"VillagerMixin",
"compat.ArcherMixin",
+ "compat.ExecutionerMixin",
"compat.FreakagerMixin",
"compat.GuardMixin",
"compat.HunterIllagerMixin",
@@ -35,4 +36,4 @@
"injectors": {
"defaultRequire": 1
}
-}
\ No newline at end of file
+}
From 8882d65bca03b0d898f5ccd7f462078fd0eef891 Mon Sep 17 00:00:00 2001
From: Groupix05
Date: Sat, 15 Mar 2025 01:56:46 +0100
Subject: [PATCH 14/38] Added Compatibility for Leo's Illager
---
.idea/gradle.xml | 3 +-
.idea/modules/DifficultRaids.test.iml | 10 ++---
build.gradle | 39 ++++++++++++++-----
.../mixins/compat/ClownagerMixin.java | 0
.../mixins/compat/LightningCallerMixin.java | 0
.../compat/VindicatorWithShieldMixin.java | 0
.../raids/RaidEnemyRegistry.java | 15 +++++--
.../setup/DifficultRaidsConfig.java | 18 +++++++--
.../difficultraids/util/Compat.java | 3 +-
.../util/DifficultRaidsUtil.java | 21 ++++++----
src/main/resources/difficultraids.mixin.json | 3 ++
11 files changed, 78 insertions(+), 34 deletions(-)
rename {deprecated => src/main/java/com/calculusmaster/difficultraids}/mixins/compat/ClownagerMixin.java (100%)
rename {deprecated => src/main/java/com/calculusmaster/difficultraids}/mixins/compat/LightningCallerMixin.java (100%)
rename {deprecated => src/main/java/com/calculusmaster/difficultraids}/mixins/compat/VindicatorWithShieldMixin.java (100%)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a519cf7..f2c1963 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,9 +4,8 @@
-
-
-
-
-
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1347cc6..6cc935d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -189,13 +189,15 @@ dependencies {
implementation fg.deobf("curse.maven:savage-and-ravage-381736:6040963")
implementation fg.deobf("curse.maven:blueprint-382216:5292242")
- //Dungeons Mobs 4.0.8 + GeckoLib 3.1.40 + Dungeons Libraries 3.0.10
+ //Dungeons Mobs 4.0.8 + Dungeons Libraries 3.0.10
// implementation fg.deobf("curse.maven:dungeons-mobs-428883:4501524")
-// implementation fg.deobf("curse.maven:geckolib-388172:4407241")
// implementation fg.deobf("curse.maven:dungeons-libraries-550941:4496767")
- //Leo's Illagers
-// implementation fg.deobf("curse.maven:leos-illagers-812954:4370803")
+ //GeckoLib 4.7 (required for Dungeons Mobs, Illager Revolution and Illager Additions)
+ implementation fg.deobf("curse.maven:geckolib-388172:6027567")
+
+ //Leo's Illagers 1.1.2
+ implementation fg.deobf("curse.maven:leos-illagers-812954:6206843")
//Pyrologer & Friends
// implementation fg.deobf("curse.maven:pyrologer-and-friends-573099:4433602")
@@ -205,15 +207,34 @@ dependencies {
implementation fg.deobf("curse.maven:lionfish-api-1001614:5363774")
implementation fg.deobf("curse.maven:curios-api-309927:5680164")
- //Mob Entity Path Visualizer 1.1.0-release.6
-// runtimeOnly fg.deobf("curse.maven:mob-entity-path-visualizer-590716:4063117")
-
//Enchantment Descriptions 17.1.18 + Bookshelf 20.2.13
runtimeOnly fg.deobf("curse.maven:enchantmentdescriptions-250419:5598368")
runtimeOnly fg.deobf("curse.maven:bookshelf-228525:5423987")
- //ToroHealth Damage Indicators 1.19.2 1.0.0
-// runtimeOnly fg.deobf("curse.maven:torohealth-damage-indicators-245733:3895068")
+ //Raided 0.1.4
+ implementation fg.deobf("curse.maven:raided-580942:5128249")
+
+ //Illager Revolution 1.4
+ implementation fg.deobf("curse.maven:illager-revolution-841586:5185405")
+
+ //Illager Additions 0.1.0-beta
+ implementation fg.deobf("curse.maven:illager-additions-682835:5643823")
+
+ //Friends&Foes
+ implementation fg.deobf("curse.maven:friends-and-foes-forge-602059:6283388")
+
+ //The Conjurer 1.1.6 + StructureGel 2.16.2
+ implementation fg.deobf("curse.maven:the-conjurer-377798:4733239")
+ implementation fg.deobf("curse.maven:structure-gel-api-378802:5278429")
+
+ //Brazier 1.1.6 + Architectury 9.2.14 + Cloth Config 11.1.136
+ implementation fg.deobf("curse.maven:brazier-402616:4702302")
+ implementation fg.deobf("curse.maven:architectury-api-419699:5137938")
+ implementation fg.deobf("curse.maven:cloth-config-348521:5729105")
+
+ //Utilities
+ runtimeOnly fg.deobf("curse.maven:jade-324717:6271651") //Jade 11.13.1
+// runtimeOnly fg.deobf("curse.maven:mob-entity-path-visualizer-590716:4063117") //Mob Entity Path Visualizer 1.1.0-release.6
}
diff --git a/deprecated/mixins/compat/ClownagerMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/compat/ClownagerMixin.java
similarity index 100%
rename from deprecated/mixins/compat/ClownagerMixin.java
rename to src/main/java/com/calculusmaster/difficultraids/mixins/compat/ClownagerMixin.java
diff --git a/deprecated/mixins/compat/LightningCallerMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/compat/LightningCallerMixin.java
similarity index 100%
rename from deprecated/mixins/compat/LightningCallerMixin.java
rename to src/main/java/com/calculusmaster/difficultraids/mixins/compat/LightningCallerMixin.java
diff --git a/deprecated/mixins/compat/VindicatorWithShieldMixin.java b/src/main/java/com/calculusmaster/difficultraids/mixins/compat/VindicatorWithShieldMixin.java
similarity index 100%
rename from deprecated/mixins/compat/VindicatorWithShieldMixin.java
rename to src/main/java/com/calculusmaster/difficultraids/mixins/compat/VindicatorWithShieldMixin.java
diff --git a/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java b/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
index 4cdb814..0520a6f 100644
--- a/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
+++ b/src/main/java/com/calculusmaster/difficultraids/raids/RaidEnemyRegistry.java
@@ -104,6 +104,9 @@ public class RaidEnemyRegistry
public static final String SUMMONER = "entity.leosillagers.summoner";
public static final String TROUBLEMAKER = "entity.leosillagers.troublemaker";
+ //The Conjurer
+ public static final String CONJURER = "entity.conjurer_illager.conjurer";
+
private static final int[] BLANK = new int[]{0, 0, 0, 0, 0, 0, 0, 0};
public static boolean isRaiderTypeEnabled(String raiderType)
@@ -212,7 +215,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 1, 0, 1, 2, 1, 3, 4)
.withRaider(ABSORBER, 0, 0, 1, 0, 1, 0, 0, 2)
.withRaider(CROCOFANG, 0, 0, 1, 1, 2, 3, 1, 3)
- .withRaider(ENGINEER, 0, 0, 0, 1, 0, 1, 1, 2)
+ .withRaider(ENGINEER, 0, 0, 0, 1, 0, 1, 1, 1)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -242,6 +245,7 @@ public static void registerWaves()
.withRaider(NECROMANCER_LEO, 0, 0, 0, 0, 0, 1, 0, 1)
.withRaider(SUMMONER, 0, 0, 0, 0, 0, 1, 0, 1)
.withRaider(TROUBLEMAKER, 0, 1, 0, 1, 1, 1, 0, 1)
+ .withRaider(CONJURER, 0, 0, 0, 0, 0, 0, 0, 0)
.withEliteWave(5, NUAOS_ELITE.get())
.withEliteWave(7, NUAOS_ELITE.get(), VOLDON_ELITE.get())
.registerDefault();
@@ -272,7 +276,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 1, 1, 2, 2, 2, 4, 4)
.withRaider(ABSORBER, 0, 0, 1, 1, 2, 0, 1, 2)
.withRaider(CROCOFANG, 0, 1, 2, 1, 2, 3, 2, 4)
- .withRaider(ENGINEER, 0, 0, 1, 1, 1, 1, 1, 2)
+ .withRaider(ENGINEER, 0, 0, 1, 1, 0, 1, 1, 2)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -302,6 +306,7 @@ public static void registerWaves()
.withRaider(NECROMANCER_LEO, 0, 0, 1, 1, 0, 1, 0, 2)
.withRaider(SUMMONER, 0, 0, 0, 1, 1, 1, 2, 1)
.withRaider(TROUBLEMAKER, 0, 1, 1, 2, 2, 1, 1, 1)
+ .withRaider(CONJURER, 0, 0, 0, 1, 0, 0, 0, 0)
.withEliteWave(3, NUAOS_ELITE.get(), VOLDON_ELITE.get())
.withEliteWave(5, VOLDON_ELITE.get(), XYDRAX_ELITE.get(), MODUR_ELITE.get())
.withEliteWave(7, NUAOS_ELITE.get(), VOLDON_ELITE.get(), XYDRAX_ELITE.get(), MODUR_ELITE.get())
@@ -333,7 +338,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 2, 2, 2, 2, 2, 4, 4)
.withRaider(ABSORBER, 0, 1, 1, 1, 2, 1, 1, 3)
.withRaider(CROCOFANG, 0, 2, 2, 3, 2, 4, 2, 5)
- .withRaider(ENGINEER, 0, 1, 1, 0, 2, 1, 1, 2)
+ .withRaider(ENGINEER, 0, 1, 1, 0, 1, 1, 1, 2)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -363,6 +368,7 @@ public static void registerWaves()
.withRaider(NECROMANCER_LEO, 0, 1, 1, 1, 1, 1, 1, 2)
.withRaider(SUMMONER, 0, 1, 1, 1, 2, 2, 2, 2)
.withRaider(TROUBLEMAKER, 0, 3, 2, 3, 2, 3, 2, 3)
+ .withRaider(CONJURER, 0, 0, 0, 1, 1, 0, 0, 1)
.withEliteWave(1, NUAOS_ELITE.get(), VOLDON_ELITE.get())
.withEliteWave(3, NUAOS_ELITE.get(), VOLDON_ELITE.get(), XYDRAX_ELITE.get(), MODUR_ELITE.get())
.withEliteWave(5, XYDRAX_ELITE.get(), MODUR_ELITE.get())
@@ -396,7 +402,7 @@ public static void registerWaves()
.withRaider(PRESERVER, 0, 2, 2, 2, 2, 2, 4, 4)
.withRaider(ABSORBER, 0, 1, 1, 1, 2, 1, 1, 3)
.withRaider(CROCOFANG, 0, 2, 2, 3, 2, 4, 2, 5)
- .withRaider(ENGINEER, 0, 1, 2, 2, 1, 2, 3, 3)
+ .withRaider(ENGINEER, 0, 1, 1, 2, 0, 1, 2, 2)
.withRaider(MAGISPELLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(SPIRITCALLER, 0, 0, 0, 0, 0, 0, 0, 0)
.withRaider(FREAKAGER, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -426,6 +432,7 @@ public static void registerWaves()
.withRaider(NECROMANCER_LEO, 0, 1, 1, 1, 1, 1, 1, 2)
.withRaider(SUMMONER, 0, 1, 1, 1, 2, 3, 2, 2)
.withRaider(TROUBLEMAKER, 0, 3, 2, 3, 2, 3, 2, 3)
+ .withRaider(CONJURER, 0, 5, 1, 1, 0, 1, 1, 2)
.withEliteWave(1, NUAOS_ELITE.get(), VOLDON_ELITE.get(), XYDRAX_ELITE.get(), MODUR_ELITE.get())
.withEliteWave(2, NUAOS_ELITE.get(), VOLDON_ELITE.get(), XYDRAX_ELITE.get(), MODUR_ELITE.get())
.withEliteWave(3, NUAOS_ELITE.get(), VOLDON_ELITE.get(), XYDRAX_ELITE.get(), MODUR_ELITE.get())
diff --git a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
index c41c105..d82f1cd 100644
--- a/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
+++ b/src/main/java/com/calculusmaster/difficultraids/setup/DifficultRaidsConfig.java
@@ -187,6 +187,18 @@ public static void register()
ENABLED_RAIDERS.put(RaidEnemyRegistry.EXECUTIONER, GENERAL.define("enableExecutioners", true));
ENABLED_RAIDERS.put(RaidEnemyRegistry.TRICKSTER, GENERAL.define("enableTricksters", true));
ENABLED_RAIDERS.put(RaidEnemyRegistry.ICEOLOGER_SR, GENERAL.define("enableSavageRavageIceologers", true));
+ GENERAL.pop().push("Requires Leo's Illagers");
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.SHIELD_VINDICATOR, GENERAL.define("enableShieldVindicator", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.LIGHTNINGCALLER, GENERAL.define("enableLightningCaller", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.CLOWNAGER, GENERAL.define("enableClownager", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.CONFUSER, GENERAL.define("enableConfuser", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.METEORITE_CALLER, GENERAL.define("enableMeteoriteCaller", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.SNOWOLAGER, GENERAL.define("enableSnowolager", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.NECROMANCER_LEO, GENERAL.define("enableNecromancerLeo", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.SUMMONER, GENERAL.define("enableSummoner", true));
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.TROUBLEMAKER, GENERAL.define("enableTroublemaker", true));
+ GENERAL.pop().push("Requires The Conjurer");
+ ENABLED_RAIDERS.put(RaidEnemyRegistry.CONJURER, GENERAL.define("enableConjurer", true));
// GENERAL.pop().push("Requires Dungeon Mobs");
// ENABLED_RAIDERS.put(RaidEnemyRegistry.MOUNTAINEER, GENERAL.define("enableMountaineers", true));
// ENABLED_RAIDERS.put(RaidEnemyRegistry.ROYAL_GUARD, GENERAL.define("enableRoyalGuards", true));
@@ -353,9 +365,9 @@ public static void register()
// spec.pop();
//Vindicator With Shield
-// spec.comment("REQUIRES 'Leo's Illagers'").push("Vindicator With Shield Settings");
-// config.vindicatorWithShield = new RaiderConfigs.VindicatorWithShield(rd, spec);
-// spec.pop();
+ spec.comment("REQUIRES 'Leo's Illagers'").push("Vindicator With Shield Settings");
+ config.vindicatorWithShield = new RaiderConfigs.VindicatorWithShield(rd, spec);
+ spec.pop();
spec.pop();
diff --git a/src/main/java/com/calculusmaster/difficultraids/util/Compat.java b/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
index cf77f16..2d05810 100644
--- a/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
+++ b/src/main/java/com/calculusmaster/difficultraids/util/Compat.java
@@ -14,7 +14,8 @@ public enum Compat
ILLAGER_REVOLUTION("illagerrevolutionmod"),
LEOS_ILLAGERS("leosillagers"),
RECRUITS("recruits"),
- WORKERS("workers")
+ WORKERS("workers"),
+ CONJURER("conjurer_illager")
;
private final String modid;
diff --git a/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java b/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
index 3b91047..f719a2e 100644
--- a/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
+++ b/src/main/java/com/calculusmaster/difficultraids/util/DifficultRaidsUtil.java
@@ -2,7 +2,8 @@
import baguchan.enchantwithmob.registry.ModEntities;
import baguchan.hunters_return.init.HunterEntityRegistry;
-//import cn.leolezury.leosillagers.init.EntityInit;
+import cn.leolezury.leosillagers.init.EntityInit;
+import com.legacy.conjurer_illager.registry.IllagerEntityTypes;
import com.calculusmaster.difficultraids.entity.DifficultRaidsEntityTypes;
import com.izofar.takesapillage.init.ModEntityTypes;
import com.teamabnormals.savage_and_ravage.core.registry.SREntityTypes;
@@ -88,12 +89,16 @@ public static void registerArmorModifierRaiderLists()
ADVANCED_RAIDERS.add(ForgeRegistries.ENTITY_TYPES.getValue(new ResourceLocation("illagerrevolutionmod", "blade_knight")));
}
-// if(Compat.LEOS_ILLAGERS.isLoaded()) //Skipped: Lightningcaller, Clownager
-// {
-// STANDARD_RAIDERS.addAll(List.of(EntityInit.VINDICATOR_WITH_SHIELD.get(), EntityInit.TROUBLEMAKER.get()));
-// ADVANCED_RAIDERS.add(EntityInit.CONFUSER.get());
-// BASIC_MAGIC_RAIDERS.addAll(List.of(EntityInit.SNOWOLAGER.get(), EntityInit.NECROMANCER.get()));
-// ADVANCED_MAGIC_RAIDERS.addAll(List.of(EntityInit.METEORITE_CALLER.get(), EntityInit.SUMMONER.get()));
-// }
+ if(Compat.LEOS_ILLAGERS.isLoaded()) //Skipped: Lightningcaller, Clownager
+ {
+ STANDARD_RAIDERS.addAll(List.of(EntityInit.VINDICATOR_WITH_SHIELD.get(), EntityInit.TROUBLEMAKER.get()));
+ ADVANCED_RAIDERS.add(EntityInit.CONFUSER.get());
+ BASIC_MAGIC_RAIDERS.addAll(List.of(EntityInit.SNOWOLAGER.get(), EntityInit.NECROMANCER.get()));
+ ADVANCED_MAGIC_RAIDERS.addAll(List.of(EntityInit.METEORITE_CALLER.get(), EntityInit.SUMMONER.get()));
+ }
+ if(Compat.CONJURER.isLoaded())
+ {
+ STANDARD_RAIDERS.add(IllagerEntityTypes.CONJURER);
+ }
}
}
diff --git a/src/main/resources/difficultraids.mixin.json b/src/main/resources/difficultraids.mixin.json
index 4d0346d..f694e7c 100644
--- a/src/main/resources/difficultraids.mixin.json
+++ b/src/main/resources/difficultraids.mixin.json
@@ -10,14 +10,17 @@
"RaidMixin",
"VillagerMixin",
"compat.ArcherMixin",
+ "compat.ClownagerMixin",
"compat.ExecutionerMixin",
"compat.FreakagerMixin",
"compat.GuardMixin",
"compat.HunterIllagerMixin",
"compat.LegionerMixin",
+ "compat.LightningCallerMixin",
"compat.MagispellerMixin",
"compat.SkirmisherMixin",
"compat.SpiritcallerMixin",
+ "compat.VindicatorWithShieldMixin",
"raider.AbstractIllagerMixin",
"raider.EvokerFangsMixin",
"raider.LightningBoltMixin",
From 91e7a8e1f29e49205c616dae96294aa4b90f5755 Mon Sep 17 00:00:00 2001
From: Groupix05
Date: Mon, 26 May 2025 20:48:50 +0200
Subject: [PATCH 15/38] Changed icon
---
src/main/resources/logo.png | Bin 241285 -> 264535 bytes
src/main/resources/pack.mcmeta | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png
index 94d9797c131365e8c33b38237017b063d1ce3007..359aa77d1db1e74b9a9ac1a15487711f89505774 100644
GIT binary patch
literal 264535
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