rest of the malum compat for now except for

the stuff that would need art ... or everything to do with auric embers
f-raZ0R · Oct 14, 2024 · 092241a · 092241a
1 parent 459f43c
commit 092241a
Show file tree

Hide file tree

Showing 41 changed files with 1,128 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -94,6 +94,7 @@ dependencies {
 	modCompileOnly("com.unascribed:ears-api:${project.ears_version}")
 	modCompileOnly("maven.modrinth:create-fabric:${project.create_version}") { transitive = false }
 	modCompileOnly("maven.modrinth:neepmeat:${project.neepmeat_version}") { transitive = false }
+	modCompileOnly("maven.modrinth:lodestonelib:${project.lodestone_version}") { transitive = false}
 	modCompileOnly("maven.modrinth:malum:${project.malum_version}") { transitive = false}
 	// modCompileOnly("maven.modrinth:enchantment-descriptions:${project.enchantment_descriptions_version}")
 	modCompileOnly("maven.modrinth:travelersbackpack:${project.travelers_backpack_version}")

diff --git a/gradle.properties b/gradle.properties
@@ -59,6 +59,8 @@ create_version=0.5.1-f-build.1417+mc1.20.1
 neepmeat_version=0.6.2-beta+1.20.1
 # https://modrinth.com/mod/malum
 malum_version=1.20.1-1.6.3.0b-fabric
+# https://modrinth.com/mod/lodestonelib
+lodestone_version=1.20.1-1.6.2.3f
 port_lib_version = 2.3.4+1.20.1
 port_lib_modules = lazy_registration
 # https://modrinth.com/mod/exclusions-lib

diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/CloversFavorEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/CloversFavorEnchantment.java
@@ -1,10 +1,17 @@
 package de.dafuqs.spectrum.enchantments;
 
+import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem;
+import com.sammy.malum.registry.common.item.EnchantmentRegistry;
 import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
 import de.dafuqs.spectrum.helpers.*;
 import de.dafuqs.spectrum.registries.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.entity.*;
+import net.minecraft.item.ArmorItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ToolItem;
+import net.minecraft.item.TridentItem;
 import net.minecraft.util.*;
 
 public class CloversFavorEnchantment extends SpectrumEnchantment {
@@ -37,10 +44,23 @@ public int getMaxPower(int level) {
 	public int getMaxLevel() {
 		return SpectrumCommon.CONFIG.CloversFavorMaxLevel;
 	}
+
+	@Override
+	public boolean isAcceptableItem(ItemStack stack) {
+		var item = stack.getItem();
+		if(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) &&
+				item instanceof MalumScytheItem)
+		{
+			return true;
+		}
+
+		return super.isAcceptableItem(stack);
+	}
 
 	@Override
 	public boolean canAccept(Enchantment other) {
-		return super.canAccept(other) && other != Enchantments.LOOTING;
+		return super.canAccept(other) && other != Enchantments.LOOTING &&
+				!(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && other == EnchantmentRegistry.SPIRIT_PLUNDER.get());
 	}
 
 }
diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/ExuberanceEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/ExuberanceEnchantment.java
@@ -1,6 +1,8 @@
 package de.dafuqs.spectrum.enchantments;
 
+import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem;
 import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
 import de.dafuqs.spectrum.items.tools.*;
 import de.dafuqs.spectrum.registries.*;
 import net.minecraft.enchantment.*;
@@ -45,7 +47,8 @@ public int getMaxLevel() {
 
 	@Override
 	public boolean isAcceptableItem(ItemStack stack) {
-		return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || EnchantmentTarget.DIGGER.isAcceptableItem(stack.getItem()) || stack.getItem() instanceof SpectrumFishingRodItem;
+		return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || EnchantmentTarget.DIGGER.isAcceptableItem(stack.getItem()) || stack.getItem() instanceof SpectrumFishingRodItem ||
+				(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem);
 	}
 
 }
diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/FirstStrikeEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/FirstStrikeEnchantment.java
@@ -1,6 +1,8 @@
 package de.dafuqs.spectrum.enchantments;
 
+import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem;
 import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
 import net.minecraft.enchantment.*;
 import net.minecraft.entity.*;
 import net.minecraft.item.*;
@@ -29,7 +31,8 @@ public int getMaxLevel() {
 
 	@Override
 	public boolean isAcceptableItem(ItemStack stack) {
-		return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem;
+		return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem ||
+				(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem);
 	}
 
 }
diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/ImprovedCriticalEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/ImprovedCriticalEnchantment.java
@@ -1,6 +1,9 @@
 package de.dafuqs.spectrum.enchantments;
 
+import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem;
+import com.sammy.malum.registry.common.item.EnchantmentRegistry;
 import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
 import net.minecraft.enchantment.*;
 import net.minecraft.entity.*;
 import net.minecraft.item.*;
@@ -38,12 +41,14 @@ public int getMaxLevel() {
 
 	@Override
 	public boolean canAccept(Enchantment other) {
-		return other != Enchantments.SHARPNESS && super.canAccept(other);
+		return other != Enchantments.SHARPNESS && !(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && other == EnchantmentRegistry.HAUNTED.get())
+		&& super.canAccept(other);
 	}
 
 	@Override
 	public boolean isAcceptableItem(ItemStack stack) {
-		return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem;
+		return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem ||
+				(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem);
 	}
 
 }

diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/InventoryInsertionEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/InventoryInsertionEnchantment.java
@@ -1,5 +1,7 @@
 package de.dafuqs.spectrum.enchantments;
 
+import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem;
+import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
 import de.dafuqs.spectrum.items.tools.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.entity.*;
@@ -42,7 +44,8 @@ public boolean isAcceptableItem(ItemStack stack) {
 				|| EnchantmentTarget.BOW.isAcceptableItem(item)
 				|| EnchantmentTarget.CROSSBOW.isAcceptableItem(item)
 				|| stack.getItem() instanceof ShearsItem
-				|| stack.getItem() instanceof SpectrumFishingRodItem;
+				|| stack.getItem() instanceof SpectrumFishingRodItem
+				|| (SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem);
 	}
 
 }
diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/TightGripEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/TightGripEnchantment.java
@@ -1,8 +1,12 @@
 package de.dafuqs.spectrum.enchantments;
 
+import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem;
+import com.sammy.malum.registry.common.item.EnchantmentRegistry;
 import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
 import net.minecraft.enchantment.*;
 import net.minecraft.entity.*;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.*;
 
 public class TightGripEnchantment extends SpectrumEnchantment {
@@ -26,5 +30,22 @@ public int getMaxLevel() {
 		return SpectrumCommon.CONFIG.TightGripMaxLevel;
 	}
 
+	@Override
+	public boolean isAcceptableItem(ItemStack stack) {
+		var item = stack.getItem();
+		if(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) &&
+				item instanceof MalumScytheItem)
+		{
+			return true;
+		}
+
+		return super.isAcceptableItem(stack);
+	}
+	@Override
+	public boolean canAccept(Enchantment other) {
+		return super.canAccept(other) &&
+				!(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && other == EnchantmentRegistry.REBOUND.get());
+	}
+
 }
 
diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/TreasureHunterEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/TreasureHunterEnchantment.java
@@ -1,6 +1,9 @@
 package de.dafuqs.spectrum.enchantments;
 
+import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem;
+import com.sammy.malum.registry.common.item.EnchantmentRegistry;
 import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
 import de.dafuqs.spectrum.registries.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.entity.*;
@@ -56,12 +59,14 @@ public int getMaxLevel() {
 
 	@Override
 	public boolean canAccept(Enchantment other) {
-		return super.canAccept(other) && other != Enchantments.LOOTING;
+		return super.canAccept(other) && other != Enchantments.LOOTING &&
+				!(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && other == EnchantmentRegistry.SPIRIT_PLUNDER.get());
 	}
 
 	@Override
 	public boolean isAcceptableItem(ItemStack stack) {
-		return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || stack.isIn(ItemTags.AXES);
+		return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || stack.isIn(ItemTags.AXES) ||
+				(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem);
 	}
 
 }
diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json
@@ -4100,7 +4100,7 @@
   "enchantment.spectrum.razing.desc": "Higher mining speed the harder a block is to break",
   "enchantment.spectrum.resonance": "Resonance",
   "enchantment.spectrum.resonance.desc": "Uses gentle vibrations to allow some blocks to either drop themselves or preserve special properties",
-  "enchantment.spectrum.serendipity_reel": "Serendipity_reel",
+  "enchantment.spectrum.serendipity_reel": "Serendipity Reel",
   "enchantment.spectrum.serendipity_reel.desc": "Chance to reel in double loot",
   "enchantment.spectrum.sniper": "Sniping",
   "enchantment.spectrum.sniper.desc": "Increased projectile speed",
@@ -5062,6 +5062,7 @@
   "spectrum.rei.potion_workshop_reacting.botania.mana_powder": "• +25% duration\n• 15% chance to add last effect",
   "spectrum.rei.potion_workshop_reacting.botania.pixie_dust": "• creates Lingering Potions & Tipped Arrows\n• -25% potency",
   "spectrum.rei.potion_workshop_reacting.hexcasting.charged_amethyst": "\n• +15-120s duration. Sometimes more, sometimes less",
+  "spectrum.rei.potion_workshop_reacting.malum.void_salts": "• +200% duration\n• -2 yield",
   "spectrum.rei.potion_workshop_reacting.minecraft.dragon_breath": "• Creates Lingering Potions - also requires Gunpowder as reagent\n• Allows you to create Tipped Arrows, if you supply Arrows instead of Bottles",
   "spectrum.rei.potion_workshop_reacting.minecraft.glowstone_dust": "• +1 potency",
   "spectrum.rei.potion_workshop_reacting.minecraft.gunpowder": "• creates Splash Potions",

diff --git a/src/main/resources/data/spectrum/advancements/mod_integration/malum/haunted.json b/src/main/resources/data/spectrum/advancements/mod_integration/malum/haunted.json
@@ -0,0 +1,32 @@
+{
+  "criteria": {
+    "built_enchanting_structure": {
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": { "advancement_identifier": "spectrum:midgame/build_enchanting_structure" }
+    },
+    "obtain_umbral": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:umbral_spirit"
+            ]
+          }
+        ]
+      }
+    },
+    "collected_storm_stone": {
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": { "advancement_identifier": "spectrum:midgame/collect_storm_stone" }
+    }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "malum"
+      ]
+    }
+  ]
+}
diff --git a/src/main/resources/data/spectrum/advancements/mod_integration/malum/replenishing.json b/src/main/resources/data/spectrum/advancements/mod_integration/malum/replenishing.json
@@ -0,0 +1,32 @@
+{
+  "criteria": {
+    "built_enchanting_structure": {
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": { "advancement_identifier": "spectrum:midgame/build_enchanting_structure" }
+    },
+    "obtain_umbral": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:umbral_spirit"
+            ]
+          }
+        ]
+      }
+    },
+    "collected_neolith": {
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": { "advancement_identifier": "spectrum:midgame/collect_neolith" }
+    }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "malum"
+      ]
+    }
+  ]
+}
diff --git a/...sources/data/spectrum/advancements/mod_integration/malum/understand_color_and_spirit.json b/...sources/data/spectrum/advancements/mod_integration/malum/understand_color_and_spirit.json
@@ -0,0 +1,30 @@
+{
+  "criteria": {
+    "understand_color": {
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
+        "advancement_identifier": "spectrum:lategame/collect_grayscale_pigments"
+      }
+    },
+    "understand_spirit": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:umbral_spirit"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "malum"
+      ]
+    }
+  ]
+}
diff --git a/src/main/resources/data/spectrum/advancements/mod_integration/malum/visited_well.json b/src/main/resources/data/spectrum/advancements/mod_integration/malum/visited_well.json
@@ -0,0 +1,28 @@
+{
+  "criteria": {
+    "found_well": {
+      "trigger": "minecraft:location",
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "structure": "malum:weeping_well"
+              }
+            }
+          }
+        ]
+      }
+    }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "malum"
+      ]
+    }
+  ]
+}
diff --git a/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json b/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json
@@ -1,20 +1,37 @@
 {
   "criteria": {
     "placed_pedestal": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:place_pedestal"
       }
     },
     "collected_ender_eye": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_vanilla/ender_eye"
       }
     },
+    "collected_warp_flux": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:warp_flux"
+            ]
+          }
+        ]
+      }
+    },
     "gotten_radiating_ender": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": { "advancement_identifier": "spectrum:get_radiating_ender" }
     }
-  }
+  },
+  "requirements": [
+    [ "placed_pedestal" ],
+    [ "collected_ender_eye", "collected_warp_flux" ],
+    [ "gotten_radiating_ender" ]
+  ]
 }