update to 1.18

Author: tuxinal

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          16    # Minimum supported by Minecraft
+          17
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-latest]

build.gradle

@@ -1,10 +1,11 @@
 plugins {
-	id 'fabric-loom' version '0.9-SNAPSHOT'
+	id 'fabric-loom' version '0.10-SNAPSHOT'
 	id 'maven-publish'
+	id "io.github.juuxel.loom-quiltflower-mini" version "1.1.0"
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -46,8 +47,7 @@ tasks.withType(JavaCompile).configureEach {
 	// If Javadoc is generated, this must be specified in that task too.
 	it.options.encoding = "UTF-8"
 
-	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 16
+	it.options.release = 17
 }
 java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
@@ -64,17 +64,15 @@ jar {
 	}
 }
 
+quiltflower {
+    addToRuntimeClasspath.set(true)
+}
+
 // configure the maven publication
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
-			// add all the jars that should be included when publishing to maven
-			artifact(remapJar) {
-				builtBy remapJar
-			}
-			artifact(sourcesJar) {
-				builtBy remapSourcesJar
-			}
+			from components.java
 		}
 	}
 

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.17.1
-	yarn_mappings=1.17.1+build.39
-	loader_version=0.11.6
+	minecraft_version=1.18
+	yarn_mappings=1.18+build.1
+	loader_version=0.12.8
 
 # Mod Properties
 	mod_version = 1.1.0
 	maven_group = xyz.tuxinal
 	archives_base_name = girlbossed
 
 # Dependencies
-	fabric_version=0.39.2+1.17
+	fabric_version=0.43.1+1.18

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -4,6 +4,12 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+
+        maven {
+            name = "Cotton"
+            url = uri("https://server.bbkr.space/artifactory/libs-release/")
+        } 
+        
         gradlePluginPortal()
     }
 }

src/main/java/xyz/tuxinal/girlbossed/utils/DeathMessageHandler.java

@@ -10,10 +10,9 @@
 import net.minecraft.text.Text;
 
 public class DeathMessageHandler {
-    private static HashMap<String, String> entityDeathConfig = ConfigParser.getEntityDeathConfig();
-    private static HashMap<String, String> otherDeathConfig = ConfigParser.getOtherDeathConfig();
-
     public static Text getDeathMessage(DamageTracker damageTracker) {
+        HashMap<String, String> otherDeathConfig = ConfigParser.getOtherDeathConfig();
+        HashMap<String, String> entityDeathConfig = ConfigParser.getEntityDeathConfig();
         DamageSource damageSource = damageTracker.getMostRecentDamage().getDamageSource();
         ServerPlayerEntity player = (ServerPlayerEntity) damageTracker.getEntity();
         if (damageSource instanceof EntityDamageSource) {

src/main/java/xyz/tuxinal/girlbossed/utils/ReplacableText.java

@@ -1,5 +1,8 @@
 package xyz.tuxinal.girlbossed.utils;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
+
 import net.minecraft.text.StringVisitable;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.text.TranslationException;
@@ -16,14 +19,13 @@ public ReplacableText(String string) {
 
     @Override
     protected void updateTranslations() {
-        this.translations.clear();
+        String string = this.getKey();
         try {
-            // we are using the key as our string
-            // so getKey doesn't make much sense
-            this.setTranslation(this.getKey());
+            Builder<StringVisitable> builder = ImmutableList.builder();
+            this.forEachPart(string, builder::add);
+            this.translations = builder.build();
         } catch (TranslationException var4) {
-            this.translations.clear();
-            this.translations.add(StringVisitable.plain(this.getKey()));
+            this.translations = ImmutableList.of(StringVisitable.plain(string));
         }
     }
 }

src/main/resources/fabric.mod.json

@@ -22,7 +22,7 @@
     "depends": {
         "fabricloader": ">=0.11.3",
         "fabric": "*",
-        "minecraft": "1.17.x",
-        "java": ">=16"
+        "minecraft": "1.18.x",
+        "java": ">=17"
     }
 }

src/main/resources/girlbossed.accesswidener

@@ -1,4 +1,4 @@
 accessWidener   v1      named
 extendable      method  net/minecraft/text/TranslatableText updateTranslations  ()V
-extendable      method  net/minecraft/text/TranslatableText setTranslation      (Ljava/lang/String;)V
+accessible      method  net/minecraft/text/TranslatableText forEachPart         (Ljava/lang/String;Ljava/util/function/Consumer;)V
 accessible      field   net/minecraft/text/TranslatableText translations        Ljava/util/List;