update to 1.21 + the great balancing

.gitattributes

@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+

.github/workflows/build.yml

@@ -4,7 +4,7 @@
 # against bad commits.
 
 name: build
-on: [ pull_request, push ]
+on: [pull_request, push]
 
 jobs:
   build:

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.7-SNAPSHOT'
     id 'io.github.ladysnake.chenille' version '0.13.1'
 }
 
@@ -59,9 +59,7 @@ dependencies {
 
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
 
-//    modCompileOnly("com.github.apace100:apoli:${apoli_version}") {
-//        exclude(group: "*")
-//    }
+//    modCompileOnly "io.github.apace100:apoli:${apoli_version}"
     modLocalImplementation "maven.modrinth:sodium:${sodium_version}"
 //    modCompileOnly "maven.modrinth:spectrum:${spectrum_version}"
 

gradle.properties

@@ -2,26 +2,25 @@
 org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 # Fabric Properties
-minecraft_version = 1.20.6
-yarn_mappings = 1.20.6+build.3
-loader_version = 0.15.11
+minecraft_version = 1.21.1
+yarn_mappings = 1.21.1+build.3
+loader_version = 0.16.5
 # Mod Properties
-mod_version = 1.20.6-r7
+mod_version = todo
 maven_group = moriyashiine
 archives_base_name = enchancement
 # Dependencies
-cardinal_components_version = 6.0.0
-midnightlib_version = 1.5.5-fabric
-fabric_version = 0.99.0+1.20.6
+cardinal_components_version = 6.1.1
+midnightlib_version = 1.6.3-fabric
+fabric_version = 0.105.0+1.21.1
 tooltipfix_version = 1.1.1-1.20
-apoli_version = 2.9.0
-sodium_version = mc1.20.6-0.5.8
-spectrum_version = 1.7.8
-mod_menu_version = 10.0.0-beta.1
+apoli_version = 2.12.0-alpha.9+mc.1.21.x
+sodium_version = mc1.21-0.5.11
+mod_menu_version = 11.0.2
 # Chenille
 modrinth_id = 6hN1V6wJ
 curseforge_id = 598056
-curseforge_versions = 1.20.6
+curseforge_versions = 1.21; 1.21.1
 cf_requirements = fabric-api
 cf_embeddeds = cardinal-components-api; midnightlib; tooltipfix
 release_type = release

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

@@ -1,10 +1,10 @@
 pluginManagement {
-    repositories {
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
-        mavenCentral()
-        gradlePluginPortal()
-    }
+	repositories {
+		maven {
+			name = 'Fabric'
+			url = 'https://maven.fabricmc.net/'
+		}
+		mavenCentral()
+		gradlePluginPortal()
+	}
 }

src/main/generated/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json

@@ -1,9 +1,24 @@
 {
   "values": [
-	"enchancement:strafe",
-	"enchancement:dash",
-	"enchancement:slide",
-	"enchancement:buoy",
-	"enchancement:gale"
+	{
+	  "id": "enchancement:strafe",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:dash",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:gale",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:slide",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:buoy",
+	  "required": false
+	}
   ]
 }

src/main/generated/data/c/tags/enchantment/entity_defense_enhancements.json

@@ -1,8 +1,20 @@
 {
   "values": [
-	"enchancement:veil",
-	"enchancement:amphibious",
-	"enchancement:wardenspine",
-	"enchancement:bouncy"
+	{
+	  "id": "enchancement:veil",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:amphibious",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:wardenspine",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:bouncy",
+	  "required": false
+	}
   ]
 }

src/main/generated/data/c/tags/enchantment/entity_speed_enhancements.json

@@ -1,6 +1,12 @@
 {
   "values": [
-	"enchancement:adrenaline",
-	"enchancement:buoy"
+	{
+	  "id": "enchancement:adrenaline",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:buoy",
+	  "required": false
+	}
   ]
 }

src/main/generated/data/c/tags/enchantment/increase_entity_drops.json

@@ -1,5 +1,8 @@
 {
   "values": [
-	"enchancement:scooping"
+	{
+	  "id": "enchancement:scooping",
+	  "required": false
+	}
   ]
 }

src/main/generated/data/c/tags/enchantment/weapon_damage_enhancements.json

@@ -1,7 +1,16 @@
 {
   "values": [
-	"enchancement:berserk",
-	"enchancement:delay",
-	"enchancement:scooping"
+	{
+	  "id": "enchancement:berserk",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:delay",
+	  "required": false
+	},
+	{
+	  "id": "enchancement:scooping",
+	  "required": false
+	}
   ]
 }

src/main/generated/data/enchancement/enchantment/adrenaline.json

@@ -0,0 +1,44 @@
+{
+  "anvil_cost": 2,
+  "description": {
+	"translate": "enchantment.enchancement.adrenaline"
+  },
+  "effects": {
+	"enchancement:rage": {
+	  "damage_dealt_modifier": {
+		"type": "minecraft:add",
+		"value": 0.0
+	  },
+	  "damage_taken_modifier": {
+		"type": "minecraft:add",
+		"value": {
+		  "type": "minecraft:linear",
+		  "base": 0.014285714,
+		  "per_level_above_first": 0.014285714
+		}
+	  },
+	  "movement_speed_modifier": {
+		"type": "minecraft:add",
+		"value": {
+		  "type": "minecraft:linear",
+		  "base": 0.028571429,
+		  "per_level_above_first": 0.028571429
+		}
+	  }
+	}
+  },
+  "max_cost": {
+	"base": 20,
+	"per_level_above_first": 6
+  },
+  "max_level": 2,
+  "min_cost": {
+	"base": 5,
+	"per_level_above_first": 6
+  },
+  "slots": [
+	"chest"
+  ],
+  "supported_items": "#minecraft:enchantable/chest_armor",
+  "weight": 5
+}

src/main/generated/data/enchancement/enchantment/amphibious.json

@@ -0,0 +1,89 @@
+{
+  "anvil_cost": 2,
+  "description": {
+	"translate": "enchantment.enchancement.amphibious"
+  },
+  "effects": {
+	"enchancement:extend_water_time": {},
+	"enchancement:extended_water_spin_attack": {},
+	"minecraft:attributes": [
+	  {
+		"amount": {
+		  "type": "minecraft:linear",
+		  "base": -0.25,
+		  "per_level_above_first": -0.25
+		},
+		"attribute": "minecraft:generic.burning_time",
+		"id": "enchancement:enchantment.amphibious",
+		"operation": "add_multiplied_base"
+	  },
+	  {
+		"amount": {
+		  "type": "minecraft:linear",
+		  "base": 1.5,
+		  "per_level_above_first": 1.5
+		},
+		"attribute": "minecraft:generic.oxygen_bonus",
+		"id": "enchancement:enchantment.amphibious",
+		"operation": "add_value"
+	  },
+	  {
+		"amount": {
+		  "type": "minecraft:linear",
+		  "base": 2.0,
+		  "per_level_above_first": 2.0
+		},
+		"attribute": "minecraft:player.submerged_mining_speed",
+		"id": "enchancement:enchantment.amphibious",
+		"operation": "add_multiplied_total"
+	  },
+	  {
+		"amount": {
+		  "type": "minecraft:linear",
+		  "base": 0.5,
+		  "per_level_above_first": 0.5
+		},
+		"attribute": "minecraft:generic.water_movement_efficiency",
+		"id": "enchancement:enchantment.amphibious",
+		"operation": "add_value"
+	  }
+	],
+	"minecraft:tick": [
+	  {
+		"effect": {
+		  "type": "enchancement:extinguish"
+		},
+		"requirements": {
+		  "condition": "enchancement:has_extended_water_time"
+		}
+	  },
+	  {
+		"effect": {
+		  "type": "enchancement:set_extended_water_time",
+		  "duration": {
+			"type": "minecraft:linear",
+			"base": 5.0,
+			"per_level_above_first": 3.0
+		  }
+		},
+		"requirements": {
+		  "condition": "enchancement:wet"
+		}
+	  }
+	]
+  },
+  "max_cost": {
+	"base": 20,
+	"per_level_above_first": 6
+  },
+  "max_level": 2,
+  "min_cost": {
+	"base": 5,
+	"per_level_above_first": 6
+  },
+  "slots": [
+	"chest"
+  ],
+  "supported_items": "#minecraft:enchantable/chest_armor",
+  "weight": 5
+}