Final merge resolutions

build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle'
-version = '1.18.2-1.3.5'
+version = '1.18.2-1.3.6'
 group = 'com.cannolicatfish' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'rankine'
 
@@ -160,9 +160,6 @@ dependencies {
     compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}")
 
-    compileOnly fg.deobf("com.klikli_dev:modonomicon:${modonomicon_mc_version}-${modonomicon_version}:api")
-    runtimeOnly fg.deobf("com.klikli_dev:modonomicon:${modonomicon_mc_version}-${modonomicon_version}")
-
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..

src/generated/resources/assets/rankine/blockstates/neptunium_alloy_ladder.json

@@ -0,0 +1,64 @@
+{
+  "variants": {
+    "facing=north,style=1": {
+      "model": "rankine:block/neptunium_alloy_ladder1"
+    },
+    "facing=south,style=1": {
+      "model": "rankine:block/neptunium_alloy_ladder1",
+      "y": 180
+    },
+    "facing=west,style=1": {
+      "model": "rankine:block/neptunium_alloy_ladder1",
+      "y": 270
+    },
+    "facing=east,style=1": {
+      "model": "rankine:block/neptunium_alloy_ladder1",
+      "y": 90
+    },
+    "facing=north,style=2": {
+      "model": "rankine:block/neptunium_alloy_ladder2"
+    },
+    "facing=south,style=2": {
+      "model": "rankine:block/neptunium_alloy_ladder2",
+      "y": 180
+    },
+    "facing=west,style=2": {
+      "model": "rankine:block/neptunium_alloy_ladder2",
+      "y": 270
+    },
+    "facing=east,style=2": {
+      "model": "rankine:block/neptunium_alloy_ladder2",
+      "y": 90
+    },
+    "facing=north,style=3": {
+      "model": "rankine:block/neptunium_alloy_ladder3"
+    },
+    "facing=south,style=3": {
+      "model": "rankine:block/neptunium_alloy_ladder3",
+      "y": 180
+    },
+    "facing=west,style=3": {
+      "model": "rankine:block/neptunium_alloy_ladder3",
+      "y": 270
+    },
+    "facing=east,style=3": {
+      "model": "rankine:block/neptunium_alloy_ladder3",
+      "y": 90
+    },
+    "facing=north,style=4": {
+      "model": "rankine:block/neptunium_alloy_ladder4"
+    },
+    "facing=south,style=4": {
+      "model": "rankine:block/neptunium_alloy_ladder4",
+      "y": 180
+    },
+    "facing=west,style=4": {
+      "model": "rankine:block/neptunium_alloy_ladder4",
+      "y": 270
+    },
+    "facing=east,style=4": {
+      "model": "rankine:block/neptunium_alloy_ladder4",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_ladder1.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rankine:block/template_metal_ladder1"
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_ladder2.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rankine:block/template_metal_ladder2"
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_ladder3.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rankine:block/template_metal_ladder3"
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_ladder4.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rankine:block/template_metal_ladder4"
+}

src/generated/resources/assets/rankine/models/item/neptunium_alloy_ladder.json

@@ -0,0 +1,26 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "rankine:block/metal_ladder1"
+  },
+  "overrides": [
+    {
+      "predicate": {
+        "rankine:building_mode": 2.0
+      },
+      "model": "rankine:item/neptunium_alloy_ladder2"
+    },
+    {
+      "predicate": {
+        "rankine:building_mode": 3.0
+      },
+      "model": "rankine:item/neptunium_alloy_ladder3"
+    },
+    {
+      "predicate": {
+        "rankine:building_mode": 4.0
+      },
+      "model": "rankine:item/neptunium_alloy_ladder4"
+    }
+  ]
+}

src/generated/resources/assets/rankine/models/item/neptunium_alloy_ladder2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "rankine:block/metal_ladder2"
+  }
+}

src/generated/resources/assets/rankine/models/item/neptunium_alloy_ladder3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "rankine:block/metal_ladder3"
+  }
+}

src/generated/resources/assets/rankine/models/item/neptunium_alloy_ladder4.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "rankine:block/metal_ladder4"
+  }
+}

src/generated/resources/data/minecraft/tags/blocks/climbable.json

@@ -22,6 +22,7 @@
     "rankine:galinstan_ladder",
     "rankine:osmiridium_ladder",
     "rankine:sodium_potassium_alloy_ladder",
+    "rankine:neptunium_alloy_ladder",
     "rankine:amalgam_ladder",
     "rankine:ender_amalgam_ladder",
     "rankine:rose_gold_ladder",

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -1533,6 +1533,7 @@
     "rankine:galinstan_ladder",
     "rankine:osmiridium_ladder",
     "rankine:sodium_potassium_alloy_ladder",
+    "rankine:neptunium_alloy_ladder",
     "rankine:amalgam_ladder",
     "rankine:ender_amalgam_ladder",
     "rankine:rose_gold_ladder",

src/generated/resources/data/rankine/advancements/recipes/rankine_world/neptunium_alloy_ladder.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "rankine:neptunium_alloy_ladder"
+    ]
+  },
+  "criteria": {
+    "has_ingredient": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "rankine:neptunium_alloy_ingot"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "rankine:neptunium_alloy_ladder"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_ingredient",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/rankine/advancements/story/craft_wooden_hammer.json

@@ -13,7 +13,7 @@
     },
     "frame": "task",
     "show_toast": true,
-    "announce_to_chat": true,
+    "announce_to_chat": false,
     "hidden": false
   },
   "criteria": {

src/generated/resources/data/rankine/advancements/story/crushing_heads.json

@@ -0,0 +1,89 @@
+{
+  "parent": "rankine:story/craft_alloy_hammer",
+  "display": {
+    "icon": {
+      "item": "rankine:iron_tier_crushing_head"
+    },
+    "title": {
+      "translate": "rankine.advancements.story.crushing_heads.title"
+    },
+    "description": {
+      "translate": "rankine.advancements.story.crushing_heads.description"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "wood_tier_crushing_head": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "rankine:wood_tier_crushing_head"
+            ]
+          }
+        ]
+      }
+    },
+    "stone_tier_crushing_head": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "rankine:stone_tier_crushing_head"
+            ]
+          }
+        ]
+      }
+    },
+    "iron_tier_crushing_head": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "rankine:iron_tier_crushing_head"
+            ]
+          }
+        ]
+      }
+    },
+    "diamond_tier_crushing_head": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "rankine:diamond_tier_crushing_head"
+            ]
+          }
+        ]
+      }
+    },
+    "netherite_tier_crushing_head": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "rankine:netherite_tier_crushing_head"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "wood_tier_crushing_head",
+      "stone_tier_crushing_head",
+      "iron_tier_crushing_head",
+      "diamond_tier_crushing_head",
+      "netherite_tier_crushing_head"
+    ]
+  ]
+}

src/generated/resources/data/rankine/loot_tables/blocks/neptunium_alloy_ladder.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "rankine:neptunium_alloy_ladder"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/rankine/recipes/neptunium_alloy_ladder.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "group": "rankine:ladders",
+  "pattern": [
+    "# #",
+    "###",
+    "# #"
+  ],
+  "key": {
+    "#": {
+      "item": "rankine:neptunium_alloy_ingot"
+    }
+  },
+  "result": {
+    "item": "rankine:neptunium_alloy_ladder",
+    "count": 8
+  }
+}

src/main/java/com/cannolicatfish/rankine/advancements/HasEnchantmentPredicate.java

@@ -73,12 +73,14 @@ public boolean matches(ItemStack stack) {
             for (Enchantment enchant : this.enchantments) {
                 if (EnchantmentHelper.getItemEnchantmentLevel(enchant, stack) <= 0) return false;
             }
+            return true;
         } else if (this.items != null && this.items.contains(stack.getItem())) {
             for (Enchantment enchant : this.enchantments) {
                 if (EnchantmentHelper.getItemEnchantmentLevel(enchant, stack) <= 0) return false;
             }
+            return true;
         }
-        return true;
+        return false;
     }
 
     public static ItemPredicate fromJson(@Nullable JsonElement p_45052_) {