updated to mc 1.21

Globox1997 · Jun 23, 2024 · 0f2d95a · 0f2d95a
1 parent 1f89c58
commit 0f2d95a
Show file tree

Hide file tree

Showing 77 changed files with 1,388 additions and 1,418 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          21,    # Current Java LTS & minimum supported by Minecraft
+          21    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-2022]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,4 +3,4 @@
 ### Fixed:
 - 
 ### Changed:
-- Updated to mc 1.20.6
+- Updated to mc 1.21
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,6 @@ repositories {
 	maven { url "https://maven.shedaniel.me/" }
 	maven { url "https://jitpack.io" }
 	maven { url "https://maven.terraformersmc.com/" }
-	maven { url "https://maven.jamieswhiteshirt.com/libs-release/" }
 	maven { url "https://cursemaven.com" }
 	maven { url = uri("https://ueaj.dev/maven") }
 	maven { url "https://api.modrinth.com/maven" }
@@ -23,10 +22,6 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	// Reach Entity Attributes 
-	modCompileOnly ("com.jamieswhiteshirt:reach-entity-attributes:${project.reach_attributes_version}") {
-		exclude(group: "net.fabricmc.fabric-api")
-	}
 	// Config
 	modImplementation ("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
     	exclude(group: "net.fabricmc.fabric-api")

diff --git a/gradle.properties b/gradle.properties
@@ -3,19 +3,18 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.20.6
-	yarn_mappings=1.20.6+build.1
+	minecraft_version=1.21
+	yarn_mappings=1.21+build.2
 	loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 1.1.1
+	mod_version = 1.4.8
 	maven_group = net.medievalweapons
 	archives_base_name = medievalweapons
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.98.0+1.20.6
-	cloth_config_version=14.0.126
-	mod_menu_version=10.0.0-beta.1
-	reach_attributes_version=2.5.0
-	brrp_version=1.0.3-mc1.20.6-fabric
+	fabric_version=0.100.3+1.21
+	cloth_config_version=15.0.127
+	mod_menu_version=11.0.0
+	brrp_version=1.0.3-mc1.21-fabric
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,5 +1,5 @@
 jdk:
-  - openjdk17
+  - openjdk21
 before_install:
-  - sdk install java 17.0.3-tem
-  - sdk use java 17.0.3-tem
+  - sdk install java 21.0.0-tem
+  - sdk use java 21.0.0-tem
diff --git a/src/main/java/net/medievalweapons/MedievalMain.java b/src/main/java/net/medievalweapons/MedievalMain.java
@@ -11,8 +11,8 @@ public class MedievalMain implements ModInitializer {
     // Thanks for the awesome series
     // Check it out here: https://youtu.be/yCNUP2NAt-A
 
-    public static final Identifier ID(String path) {
-        return new Identifier("medievalweapons", path);
+    public static final Identifier id(String path) {
+        return Identifier.of("medievalweapons", path);
     }
 
     @Override

diff --git a/src/main/java/net/medievalweapons/compat/CompatEntities.java b/src/main/java/net/medievalweapons/compat/CompatEntities.java
@@ -63,12 +63,12 @@ public static void loadEntities() {
             THALLASIUM_FRANCISCA = EntityInit.register("thallasium_francisca", EntityInit.create_Francisca(CompatItems.THALLASIUM_FRANCISCA_ITEM));
             THALLASIUM_JAVELIN = EntityInit.register("thallasium_javelin", EntityInit.create_Javelin(CompatItems.THALLASIUM_JAVELIN_ITEM));
 
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("terminite_francisca"), TERMINITE_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("terminite_javelin"), TERMINITE_JAVELIN);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("aeternium_francisca"), AETERNIUM_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("aeternium_javelin"), AETERNIUM_JAVELIN);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("thallasium_francisca"), THALLASIUM_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("thallasium_javelin"), THALLASIUM_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("terminite_francisca"), TERMINITE_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("terminite_javelin"), TERMINITE_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("aeternium_francisca"), AETERNIUM_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("aeternium_javelin"), AETERNIUM_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("thallasium_francisca"), THALLASIUM_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("thallasium_javelin"), THALLASIUM_JAVELIN);
         }
         if (CompatItems.isBetterNetherLoaded) {
             NETHER_RUBY_FRANCISCA = EntityInit.register("nether_ruby_francisca", EntityInit.create_Francisca(CompatItems.NETHER_RUBY_FRANCISCA_ITEM));
@@ -78,69 +78,69 @@ public static void loadEntities() {
             CINCINNASITE_DIAMOND_FRANCISCA = EntityInit.register("cincinnasite_diamond_francisca", EntityInit.create_Francisca(CompatItems.CINCINNASITE_DIAMOND_FRANCISCA_ITEM));
             CINCINNASITE_DIAMOND_JAVELIN = EntityInit.register("cincinnasite_diamond_javelin", EntityInit.create_Javelin(CompatItems.CINCINNASITE_DIAMOND_JAVELIN_ITEM));
 
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("nether_ruby_francisca"), NETHER_RUBY_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("nether_ruby_javelin"), NETHER_RUBY_JAVELIN);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("cincinnasite_francisca"), CINCINNASITE_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("cincinnasite_javelin"), CINCINNASITE_JAVELIN);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("cincinnasite_diamond_javelin"), CINCINNASITE_DIAMOND_JAVELIN);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("cincinnasite_diamond_francisca"), CINCINNASITE_DIAMOND_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("nether_ruby_francisca"), NETHER_RUBY_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("nether_ruby_javelin"), NETHER_RUBY_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("cincinnasite_francisca"), CINCINNASITE_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("cincinnasite_javelin"), CINCINNASITE_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("cincinnasite_diamond_javelin"), CINCINNASITE_DIAMOND_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("cincinnasite_diamond_francisca"), CINCINNASITE_DIAMOND_FRANCISCA);
         }
         if (CompatItems.isDragonLootLoaded) {
             DRAGON_JAVELIN = EntityInit.register("dragon_javelin", EntityInit.create_Javelin(CompatItems.DRAGON_JAVELIN_ITEM));
             DRAGON_FRANCISCA = EntityInit.register("dragon_francisca", EntityInit.create_Francisca(CompatItems.DRAGON_FRANCISCA_ITEM));
 
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("dragon_francisca"), DRAGON_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("dragon_javelin"), DRAGON_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("dragon_francisca"), DRAGON_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("dragon_javelin"), DRAGON_JAVELIN);
         }
         if (CompatItems.isMythicMetalsLoaded) {
             ADAMANTITE_JAVELIN = EntityInit.register("adamantite_javelin", EntityInit.create_Javelin(CompatItems.ADAMANTITE_JAVELIN_ITEM));
             ADAMANTITE_FRANCISCA = EntityInit.register("adamantite_francisca", EntityInit.create_Francisca(CompatItems.ADAMANTITE_FRANCISCA_ITEM));
 
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("adamantite_francisca"), ADAMANTITE_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("adamantite_javelin"), ADAMANTITE_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("adamantite_francisca"), ADAMANTITE_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("adamantite_javelin"), ADAMANTITE_JAVELIN);
         }
         if (CompatItems.isParadiseLostLoaded) {
             OLVITE_JAVELIN = EntityInit.register("olvite_javelin", EntityInit.create_Javelin(CompatItems.OLVITE_JAVELIN_ITEM));
             OLVITE_FRANCISCA = EntityInit.register("olvite_francisca", EntityInit.create_Francisca(CompatItems.OLVITE_FRANCISCA_ITEM));
 
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("olvite_francisca"), OLVITE_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("olvite_javelin"), OLVITE_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("olvite_francisca"), OLVITE_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("olvite_javelin"), OLVITE_JAVELIN);
         }
         if (CompatItems.isBYGLoaded) {
             PENDORITE_JAVELIN = EntityInit.register("pendorite_javelin", EntityInit.create_Javelin(CompatItems.PENDORITE_JAVELIN_ITEM));
             PENDORITE_FRANCISCA = EntityInit.register("pendorite_francisca", EntityInit.create_Francisca(CompatItems.PENDORITE_FRANCISCA_ITEM));
 
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("pendorite_francisca"), PENDORITE_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("pendorite_javelin"), PENDORITE_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("pendorite_francisca"), PENDORITE_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("pendorite_javelin"), PENDORITE_JAVELIN);
         }
         if (CompatItems.isAdditionalAdditionsLoaded) {
             ROSE_GOLD_JAVELIN = EntityInit.register("rose_gold_javelin", EntityInit.create_Javelin(CompatItems.ROSE_GOLD_JAVELIN_ITEM));
             ROSE_GOLD_FRANCISCA = EntityInit.register("rose_gold_francisca", EntityInit.create_Francisca(CompatItems.ROSE_GOLD_FRANCISCA_ITEM));
             GILDED_NETHERITE_JAVELIN = EntityInit.register("gilded_netherite_javelin", EntityInit.create_Javelin(CompatItems.GILDED_NETHERITE_JAVELIN_ITEM));
             GILDED_NETHERITE_FRANCISCA = EntityInit.register("gilded_netherite_francisca", EntityInit.create_Francisca(CompatItems.GILDED_NETHERITE_FRANCISCA_ITEM));
 
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("rose_gold_francisca"), ROSE_GOLD_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("rose_gold_javelin"), ROSE_GOLD_JAVELIN);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("gilded_netherite_francisca"), GILDED_NETHERITE_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("gilded_netherite_javelin"), GILDED_NETHERITE_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("rose_gold_francisca"), ROSE_GOLD_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("rose_gold_javelin"), ROSE_GOLD_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("gilded_netherite_francisca"), GILDED_NETHERITE_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("gilded_netherite_javelin"), GILDED_NETHERITE_JAVELIN);
         }
         if (CompatItems.isMythicUpgradesLoaded) {
             RUBY_NETHERITE_JAVELIN = EntityInit.register("ruby_netherite_javelin", EntityInit.create_Javelin(CompatItems.RUBY_NETHERITE_JAVELIN_ITEM));
             RUBY_NETHERITE_FRANCISCA = EntityInit.register("ruby_netherite_francisca", EntityInit.create_Francisca(CompatItems.RUBY_NETHERITE_FRANCISCA_ITEM));
             SAPPHIRE_NETHERITE_JAVELIN = EntityInit.register("sapphire_netherite_javelin", EntityInit.create_Javelin(CompatItems.SAPPHIRE_NETHERITE_JAVELIN_ITEM));
             SAPPHIRE_NETHERITE_FRANCISCA = EntityInit.register("sapphire_netherite_francisca", EntityInit.create_Francisca(CompatItems.SAPPHIRE_NETHERITE_FRANCISCA_ITEM));
 
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("ruby_netherite_francisca"), RUBY_NETHERITE_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("ruby_netherite_javelin"), RUBY_NETHERITE_JAVELIN);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("sapphire_netherite_francisca"), SAPPHIRE_NETHERITE_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("sapphire_netherite_javelin"), SAPPHIRE_NETHERITE_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("ruby_netherite_francisca"), RUBY_NETHERITE_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("ruby_netherite_javelin"), RUBY_NETHERITE_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("sapphire_netherite_francisca"), SAPPHIRE_NETHERITE_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("sapphire_netherite_javelin"), SAPPHIRE_NETHERITE_JAVELIN);
         }
         if (CompatItems.isDeeperDarkerLoaded) {
             WARDEN_JAVELIN = EntityInit.register("warden_javelin", EntityInit.create_Javelin(CompatItems.WARDEN_JAVELIN_ITEM));
             WARDEN_FRANCISCA = EntityInit.register("warden_francisca", EntityInit.create_Francisca(CompatItems.WARDEN_FRANCISCA_ITEM));
 
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("warden_francisca"), WARDEN_FRANCISCA);
-            EntityInit.ENTITY_TYPES.put(MedievalMain.ID("warden_javelin"), WARDEN_JAVELIN);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("warden_francisca"), WARDEN_FRANCISCA);
+            EntityInit.ENTITY_TYPES.put(MedievalMain.id("warden_javelin"), WARDEN_JAVELIN);
         }
     }
 }