Update to 1.19-pre1

Ladysnake · May 21, 2022 · 49327be · 49327be
1 parent c8f9ba7
commit 49327be
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
     modLocalRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
-    modCompileOnly modLocalRuntime("maven.modrinth:iris:${project.iris_version}")
+    modCompileOnly ("maven.modrinth:iris:${project.iris_version}")
 
     compileOnly "org.jetbrains:annotations:${jb_annotations_version}"
     compileOnly "com.google.code.findbugs:jsr305:${findbugs_version}"

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+------------------------------------------------------
+Version 1.8.0
+------------------------------------------------------
+Updated to MC 1.19
+
 ------------------------------------------------------
 Version 1.7.2
 ------------------------------------------------------

diff --git a/gradle.properties b/gradle.properties
@@ -3,17 +3,14 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.18.2
-yarn_mappings=1.18.2+build.1
-loader_version=0.13.3
-
+minecraft_version=1.19-pre1
+yarn_mappings=1.19-pre1+build.1
+loader_version=0.14.5
 #Fabric api
-fabric_version=0.47.8+1.18.2
-
-quilt_mappings=1
+fabric_version=0.52.4+1.19
 
 # Mod Properties
-mod_version = 1.7.2
+mod_version = 1.8.0
 owners = Ladysnake
 maven_group = io.github.ladysnake
 archives_base_name = satin
@@ -22,15 +19,15 @@ archives_base_name = satin
 findbugs_version = 3.0.2
 jb_annotations_version = 18.0.0
 apiguardian_version = 1.0.0
-modmenu_version = 3.0.0
+modmenu_version = 4.0.0-beta.4
 iris_version = mc1.18.1-1.1.3
 
 #Publishing
 display_name = Satin
 license_header = LGPL
 gpl_version = 3
 curseforge_id = 385463
-curseforge_versions = 1.18-Snapshot; 1.18; 1.18.1
+curseforge_versions = 1.19-Snapshot
 cf_requirements = fabric-api
 release_type = release
 changelog_base_url = https://github.com/Ladysnake/Satin/blob
diff --git a/src/main/java/ladysnake/satin/impl/ValidatingShaderLoader.java b/src/main/java/ladysnake/satin/impl/ValidatingShaderLoader.java
@@ -111,11 +111,12 @@ public int loadShader(ResourceManager resourceManager, @Nullable Identifier vert
      *
      * @param fileLocation the path to the file to read
      * @return a string with the content of the file
+     * @throws java.io.FileNotFoundException if the designated shader file does not exist
      */
     private String fromFile(ResourceManager resourceManager, Identifier fileLocation) throws IOException {
         StringBuilder source = new StringBuilder();
 
-        try (InputStream in = resourceManager.getResource(fileLocation).getInputStream();
+        try (InputStream in = resourceManager.getResourceOrThrow(fileLocation).getInputStream();
              BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
             String line;
             while ((line = reader.readLine()) != null) {

diff --git a/src/testmod/java/ladysnake/satintestcore/item/DebugItem.java b/src/testmod/java/ladysnake/satintestcore/item/DebugItem.java
@@ -20,7 +20,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.text.TranslatableText;
+import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
@@ -46,7 +46,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity player, Hand h
         if (player.isSneaking() && !world.isClient) {
             if (this.callbacks.size() > 1) {
                 debugMode = (debugMode + 1) % this.callbacks.size();
-                player.sendMessage(new TranslatableText("Switched mode to %s", debugMode), true);
+                player.sendMessage(Text.translatable("Switched mode to %s", debugMode), true);
             }
         } else {
             this.callbacks.get(debugMode).use(world, player, hand);

diff --git a/src/testmod/resources/fabric.mod.json b/src/testmod/resources/fabric.mod.json
@@ -5,7 +5,7 @@
 
   "name": "Satin Test Core",
   "description": "Core features for all test mods",
-  "licence": "LGPL-3.0-or-later",
+  "license": "LGPL-3.0-or-later",
   "authors": [
     "Pyrofab"
   ],