Remove extract_soul damage type

stal111 · Oct 23, 2024 · 88d5d86 · 88d5d86
1 parent 6058f5a
commit 88d5d86
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 77 deletions.
diff --git a/neoforge/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/neoforge/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,5 +1,4 @@
-// 1.21.1	2024-09-27T23:00:18.0773385	Registries
-f1e418416a78d87e82c17856eccf814072cc38f5 data/forbidden_arcanus/damage_type/extract_soul.json
+// 1.21.1	2024-10-23T12:07:12.8253636	Registries
 94ac5c9945617db040611ba809c52fa6bd6581cf data/forbidden_arcanus/enchantment/soul_looting.json
 c58d326e3ebc53e4813a5753575c033eeb5cc909 data/forbidden_arcanus/forbidden_arcanus/enhancer/definition/artisan_relic.json
 4852b696f02e7470be56e62e97c6106737bd808b data/forbidden_arcanus/forbidden_arcanus/enhancer/definition/crescent_moon.json

diff --git a/neoforge/src/generated/resources/.cache/20e25a9d21cf458d8acbca04545a8f09f3b6a106 b/neoforge/src/generated/resources/.cache/20e25a9d21cf458d8acbca04545a8f09f3b6a106
diff --git a/neoforge/src/generated/resources/data/forbidden_arcanus/damage_type/extract_soul.json b/neoforge/src/generated/resources/data/forbidden_arcanus/damage_type/extract_soul.json
diff --git a/neoforge/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json b/neoforge/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json
diff --git a/neoforge/src/main/java/com/stal111/forbidden_arcanus/common/entity/lostsoul/LostSoul.java b/neoforge/src/main/java/com/stal111/forbidden_arcanus/common/entity/lostsoul/LostSoul.java
@@ -7,7 +7,6 @@
 import com.stal111.forbidden_arcanus.core.init.ModItems;
 import com.stal111.forbidden_arcanus.core.init.ModMemoryModules;
 import com.stal111.forbidden_arcanus.core.init.other.ModActivities;
-import com.stal111.forbidden_arcanus.data.ModDamageTypes;
 import com.stal111.forbidden_arcanus.util.ModTags;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.DustParticleOptions;
@@ -319,8 +318,6 @@ public void setExtracting() {
     public void extractTick(Player player) {
         this.extractCounter = EXTRACT_STUNNED_TIME;
 
-        this.hurt(this.level().damageSources().source(ModDamageTypes.EXTRACT_SOUL), EXTRACT_DAMAGE);
-
         if (this.isDeadOrDying()) {
             this.level().addFreshEntity(new ItemEntity(this.level(), this.getX(), this.getY(), this.getZ(), this.getSoulItem()));
         }

diff --git a/neoforge/src/main/java/com/stal111/forbidden_arcanus/core/registry/ModRegistryCollector.java b/neoforge/src/main/java/com/stal111/forbidden_arcanus/core/registry/ModRegistryCollector.java
@@ -8,7 +8,6 @@
 import com.stal111.forbidden_arcanus.core.init.*;
 import com.stal111.forbidden_arcanus.core.init.other.*;
 import com.stal111.forbidden_arcanus.core.init.world.*;
-import com.stal111.forbidden_arcanus.data.ModDamageTypes;
 import com.stal111.forbidden_arcanus.data.ModEnchantments;
 import com.stal111.forbidden_arcanus.data.ModItemModifiers;
 import com.stal111.forbidden_arcanus.data.enhancer.ModEnhancerDefinitions;
@@ -80,7 +79,6 @@ protected void collectHelpers() {
         this.addDatapackHelper(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ModBiomeModifiers::new);
         this.addDatapackHelper(FARegistries.RITUAL, ModRituals::new);
         this.addDatapackHelper(FARegistries.ENHANCER_DEFINITION, ModEnhancerDefinitions::new);
-        this.addDatapackHelper(Registries.DAMAGE_TYPE, ModDamageTypes::new);
         this.addDatapackHelper(Registries.ENCHANTMENT, ModEnchantments::new);
         this.addDatapackHelper(FARegistries.KNOWLEDGE, ModKnowledge::new);
         this.addDatapackHelper(FARegistries.CONSTELLATION, ModConstellations::new);

diff --git a/neoforge/src/main/java/com/stal111/forbidden_arcanus/data/DataGenerators.java b/neoforge/src/main/java/com/stal111/forbidden_arcanus/data/DataGenerators.java
@@ -63,7 +63,6 @@ public static void gatherData(GatherDataEvent event) {
         generator.addProvider(event.includeServer(), new ModEnchantmentTagsProvider(context, fileHelper));
         generator.addProvider(event.includeServer(), new ModEntityTypeTagsProvider(context, fileHelper));
         generator.addProvider(event.includeServer(), new ModBiomeTagsProvider(context, fileHelper));
-        generator.addProvider(event.includeServer(), new ModDamageTypeTagsProvider(context, fileHelper));
 
         generator.addProvider(event.includeServer(), new LootTableProvider(output, Set.of(), List.of(
                 new LootTableProvider.SubProviderEntry(ModBlockLootTables::new, LootContextParamSets.BLOCK),

diff --git a/neoforge/src/main/java/com/stal111/forbidden_arcanus/data/ModDamageTypes.java b/neoforge/src/main/java/com/stal111/forbidden_arcanus/data/ModDamageTypes.java
diff --git a/...c/main/java/com/stal111/forbidden_arcanus/data/server/tags/ModDamageTypeTagsProvider.java b/...c/main/java/com/stal111/forbidden_arcanus/data/server/tags/ModDamageTypeTagsProvider.java