Merge pull request #1 from anhgelus/refactor/1.21

[Refactor] Change mod version to 1.21

4 files changed, 274 insertions, 41 deletions

diff --git a/src/main/resources/data/minecraft/loot_table/gameplay/piglin_bartering.json b/src/main/resources/data/minecraft/loot_table/gameplay/piglin_bartering.json
new file mode 100644
index 0000000..09f15e8
--- /dev/null
+++ b/src/main/resources/data/minecraft/loot_table/gameplay/piglin_bartering.json
@@ -0,0 +1,239 @@
+{

+  "type": "minecraft:barter",

+  "pools": [

+    {

+      "rolls": 1,

+      "entries": [

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:book",

+          "weight": 5,

+          "functions": [

+            {

+              "function": "minecraft:enchant_randomly",

+              "options": "minecraft:soul_speed"

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:iron_boots",

+          "weight": 8,

+          "functions": [

+            {

+              "function": "minecraft:enchant_randomly",

+              "options": "minecraft:soul_speed"

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:potion",

+          "weight": 10,

+          "functions": [

+            {

+              "function": "minecraft:set_potion",

+              "id": "minecraft:fire_resistance"

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:splash_potion",

+          "weight": 10,

+          "functions": [

+            {

+              "function": "minecraft:set_potion",

+              "id": "minecraft:fire_resistance"

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:iron_nugget",

+          "weight": 10,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 9,

+                "max": 36

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:quartz",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 8,

+                "max": 16

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:glowstone_dust",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 5,

+                "max": 12

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:magma_cream",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 2,

+                "max": 6

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:ender_pearl",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 4,

+                "max": 8

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:string",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 8,

+                "max": 24

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:fire_charge",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 1,

+                "max": 5

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:gravel",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 8,

+                "max": 16

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:leather",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 4,

+                "max": 10

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:nether_brick",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 4,

+                "max": 16

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:obsidian",

+          "weight": 40

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:crying_obsidian",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 1,

+                "max": 3

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:soul_sand",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 4,

+                "max": 16

+              }

+            }

+          ]

+        }

+      ]

+    }

+  ]

+}

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 5ade821..b097ea1 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,33 +1,30 @@
-{
-	"schemaVersion": 1,
-	"id": "manhunt",
-	"version": "${version}",
-	"name": "Manhunt",
-	"description": "Best Manhunt Minecraft mod.",
-	"authors": [
-		"Anhgelus Morhtuuzh"
-	],
-	"contact": {
-		"sources": "https://github.com/anhgelus/manhunt-mod"
-	},
-	"license": "AGPL-3.0",
-	"icon": "assets/manhunt/icon.png",
-	"environment": "server",
-	"entrypoints": {
-		"main": [
-			"world.anhgelus.manhunt.Manhunt"
-		]
-	},
-	"mixins": [
-		"manhunt.mixins.json"
-	],
-	"depends": {
-		"fabricloader": ">=0.15.11",
-		"minecraft": "~1.16.1",
-		"java": ">=17",
-		"fabric": "*"
-	},
-	"suggests": {
-		"difficultydeathscaler": "*"
-	}
+{

+	"schemaVersion": 1,

+	"id": "manhunt",

+	"version": "${version}",

+	"name": "Manhunt",

+	"description": "Best Manhunt Minecraft mod.",

+	"authors": [

+		"Anhgelus Morhtuuzh"

+	],

+	"contact": {

+		"sources": "https://github.com/anhgelus/manhunt-mod"

+	},

+	"license": "AGPL-3.0",

+	"icon": "assets/manhunt/icon.png",

+	"environment": "server",

+	"entrypoints": {

+		"main": [

+			"world.anhgelus.manhunt.Manhunt"

+		]

+	},

+	"depends": {

+		"fabricloader": ">=0.15.11",

+		"minecraft": "~1.21",

+		"java": ">=21",

+		"fabric": "*"

+	},

+	"suggests": {

+		"difficultydeathscaler": "*"

+	}

 }
\ No newline at end of file
diff --git a/src/main/resources/manhunt.mixins.json b/src/main/resources/manhunt.mixins.json
deleted file mode 100644
index 4fcff5b..0000000
--- a/src/main/resources/manhunt.mixins.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"required": true,
-	"package": "world.anhgelus.manhunt.mixin",
-	"compatibilityLevel": "JAVA_17",
-	"mixins": [],
-	"injectors": {
-		"defaultRequire": 1
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
new file mode 100644
index 0000000..ffe0b8e
--- /dev/null
+++ b/src/main/resources/pack.mcmeta
@@ -0,0 +1,6 @@
+{

+  "pack": {

+    "pack_format": 48,

+    "description": "isACompass"

+  }

+}
\ No newline at end of file