Răsfoiți Sursa

Update to Minecraft 1.16.1

Lortseam 5 ani în urmă
părinte
comite
11a0a74b1b

+ 3 - 1
build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.2.7-SNAPSHOT'
+	id 'fabric-loom' version '0.4-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -16,6 +16,8 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
+	//TODO: Not required actually, but game will crash without it because Cloth Config uses bad version
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	modApi "me.shedaniel.cloth:config-2:${project.cloth_config_version}"
 
 	compileOnly "org.projectlombok:lombok:${project.lombok_version}"

+ 5 - 4
gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.15.2
-	yarn_mappings=1.15.2+build.15
-	loader_version=0.8.2+build.194
+	minecraft_version=1.16.1
+	yarn_mappings=1.16.1+build.20
+	loader_version=0.8.9+build.203
 
 # Mod Properties
 	mod_version = 0.2.0
@@ -13,5 +13,6 @@ org.gradle.jvmargs=-Xmx1G
 	archives_base_name = completeconfig
 
 # Dependencies
-	cloth_config_version=2.11.2
+	fabric_version=0.14.1+build.372-1.16
+	cloth_config_version=4.5.6
 	lombok_version=1.18.12

+ 4 - 3
src/main/java/me/lortseam/completeconfig/ConfigManager.java

@@ -26,6 +26,7 @@ import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import me.shedaniel.clothconfig2.impl.builders.SubCategoryBuilder;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.TranslatableText;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.*;
@@ -267,10 +268,10 @@ public class ConfigManager {
     public Screen getConfigScreen(Screen parentScreen) {
         ConfigBuilder builder = guiBuilder.get();
         builder.setParentScreen(parentScreen)
-                .setTitle(buildTranslationKey("title"))
+                .setTitle(new TranslatableText(buildTranslationKey("title")))
                 .setSavingRunnable(this::save);
         config.forEach((categoryID, category) -> {
-            me.shedaniel.clothconfig2.api.ConfigCategory configCategory = builder.getOrCreateCategory(buildTranslationKey(categoryID));
+            me.shedaniel.clothconfig2.api.ConfigCategory configCategory = builder.getOrCreateCategory(new TranslatableText(buildTranslationKey(categoryID)));
             for (AbstractConfigListEntry entry : buildCollection(categoryID, category)) {
                 configCategory.addEntry(entry);
             }
@@ -286,7 +287,7 @@ public class ConfigManager {
         });
         collection.getCollections().forEach((subcategoryID, c) -> {
             String id = joinIDs(parentID, subcategoryID);
-            SubCategoryBuilder subBuilder = ConfigEntryBuilder.create().startSubCategory(buildTranslationKey(id));
+            SubCategoryBuilder subBuilder = ConfigEntryBuilder.create().startSubCategory(new TranslatableText(buildTranslationKey(id)));
             subBuilder.addAll(buildCollection(id, c));
             list.add(subBuilder.build());
         });

+ 13 - 12
src/main/java/me/lortseam/completeconfig/gui/GuiRegistry.java

@@ -4,6 +4,7 @@ import com.google.common.base.CaseFormat;
 import me.lortseam.completeconfig.entry.Entry;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.text.TranslatableText;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.Iterator;
@@ -37,7 +38,7 @@ public class GuiRegistry {
     private void registerDefaultProviders() {
         registerProvider((GuiProvider<Boolean>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startBooleanToggle(translationKey, value)
+                .startBooleanToggle(new TranslatableText(translationKey), value)
                 .setDefaultValue(defaultValue)
                 .setSaveConsumer(saveConsumer)
                 .build(),
@@ -45,7 +46,7 @@ public class GuiRegistry {
         );
         registerProvider((GuiProvider<Integer>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startIntField(translationKey, value)
+                .startIntField(new TranslatableText(translationKey), value)
                 .setDefaultValue(defaultValue)
                 .setSaveConsumer(saveConsumer)
                 .build(),
@@ -53,7 +54,7 @@ public class GuiRegistry {
         );
         registerBoundedProvider((GuiProvider<Integer>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startIntSlider(translationKey, value, extras.getBounds().getMin(), extras.getBounds().getMax())
+                .startIntSlider(new TranslatableText(translationKey), value, extras.getBounds().getMin(), extras.getBounds().getMax())
                 .setDefaultValue(defaultValue)
                 .setSaveConsumer(saveConsumer)
                 .build(),
@@ -61,7 +62,7 @@ public class GuiRegistry {
         );
         registerProvider((GuiProvider<Long>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startLongField(translationKey, value)
+                .startLongField(new TranslatableText(translationKey), value)
                 .setDefaultValue(defaultValue)
                 .setSaveConsumer(saveConsumer)
                 .build(),
@@ -69,7 +70,7 @@ public class GuiRegistry {
         );
         registerBoundedProvider((GuiProvider<Long>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startLongSlider(translationKey, value, extras.getBounds().getMin(), extras.getBounds().getMax())
+                .startLongSlider(new TranslatableText(translationKey), value, extras.getBounds().getMin(), extras.getBounds().getMax())
                 .setDefaultValue(defaultValue)
                 .setSaveConsumer(saveConsumer)
                 .build(),
@@ -77,7 +78,7 @@ public class GuiRegistry {
         );
         registerProvider((GuiProvider<Float>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startFloatField(translationKey, value)
+                .startFloatField(new TranslatableText(translationKey), value)
                 .setDefaultValue(defaultValue)
                 .setSaveConsumer(saveConsumer)
                 .build(),
@@ -85,7 +86,7 @@ public class GuiRegistry {
         );
         registerBoundedProvider((GuiProvider<Float>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startFloatField(translationKey, value)
+                .startFloatField(new TranslatableText(translationKey), value)
                 .setDefaultValue(defaultValue)
                 .setMin(extras.getBounds().getMin())
                 .setMax(extras.getBounds().getMax())
@@ -95,7 +96,7 @@ public class GuiRegistry {
         );
         registerProvider((GuiProvider<Double>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startDoubleField(translationKey, value)
+                .startDoubleField(new TranslatableText(translationKey), value)
                 .setDefaultValue(defaultValue)
                 .setSaveConsumer(saveConsumer)
                 .build(),
@@ -103,7 +104,7 @@ public class GuiRegistry {
         );
         registerBoundedProvider((GuiProvider<Double>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startDoubleField(translationKey, value)
+                .startDoubleField(new TranslatableText(translationKey), value)
                 .setDefaultValue(defaultValue)
                 .setMin(extras.getBounds().getMin())
                 .setMax(extras.getBounds().getMax())
@@ -113,7 +114,7 @@ public class GuiRegistry {
         );
         registerProvider((GuiProvider<String>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startStrField(translationKey, value)
+                .startStrField(new TranslatableText(translationKey), value)
                 .setDefaultValue(defaultValue)
                 .setSaveConsumer(saveConsumer)
                 .build(),
@@ -121,9 +122,9 @@ public class GuiRegistry {
         );
         registerProvider((GuiProvider<? extends Enum>) (translationKey, field, value, defaultValue, extras, saveConsumer) -> ConfigEntryBuilder
                 .create()
-                .startEnumSelector(translationKey, (Class<Enum>) field.getType(), value)
+                .startEnumSelector(new TranslatableText(translationKey), (Class<Enum>) field.getType(), value)
                 .setDefaultValue(defaultValue)
-                .setEnumNameProvider(e -> I18n.translate(translationKey + "." + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, e.name())))
+                .setEnumNameProvider(e -> new TranslatableText(translationKey + "." + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, e.name())))
                 .setSaveConsumer(saveConsumer)
                 .build(),
                 (field, extras) -> Enum.class.isAssignableFrom(field.getType())

+ 1 - 1
src/main/resources/fabric.mod.json

@@ -19,7 +19,7 @@
   "environment": "client",
 
   "depends": {
-    "minecraft": "1.15.x",
+    "minecraft": "1.16.x",
     "fabricloader": ">=0.7.4",
     "cloth-config2": "*"
   }