From 2d5acbbf45962d983d3a05b753ffcac6fd899486 Mon Sep 17 00:00:00 2001 From: coolGi2007 Date: Fri, 17 Dec 2021 08:52:46 +0000 Subject: [PATCH] Updated to 1.18.1 but also works on 1.18 --- Readme.md | 10 +++++----- .../seibel/lod/common/wrappers/config/ConfigGui.java | 2 +- fabric/src/main/resources/fabric.mod.json | 4 ++-- forge/src/main/resources/META-INF/mods.toml | 2 +- gradle.properties | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Readme.md b/Readme.md index e1a18d2c8..8427cf48a 100644 --- a/Readme.md +++ b/Readme.md @@ -9,13 +9,13 @@ If you want to see a quick demo, check out a video covering the mod here: ![Minecraft Level Of Detail (LOD) mod - Alpha 1.5](https://i.ytimg.com/vi_webp/H2tnvEVbO1c/mqdefault.webp) -Forge version: 38.0.14\ -Fabric version: 0.12.6\ -Fabric API version: 0.43.1+1.18 +Forge version: 39.0.5\ +Fabric version: 0.12.12\ +Fabric API version: 0.44.0+1.18 Notes:\ This version has been confirmed to work in Eclipse and Retail Minecraft.\ -(Retail running forge version 1.18-38.0.14 and fabric version 1.18-0.12.6) +(Retail running forge version 1.18.1-39.0.5 and fabric version 1.18-0.12.12) ## source code installation @@ -48,7 +48,7 @@ https://fabricmc.net/wiki/tutorial:setup 3. The compiled jar file will be in the folder `fabric/build/libs/` and `forge/build/libs/` **If in terminal:** -1. `git clone -b 1.18 --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git` +1. `git clone -b 1.18.X --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git` 2. `cd minecraft-lod-mod` 3. `./gradlew build` 4. The build should be in `fabric/build/libs/` and `forge/build/libs/` diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java index 115d57f30..2deeea9d2 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java @@ -152,7 +152,7 @@ public abstract class ConfigGui { } public static final Map> configClass = new HashMap<>(); -// public static List nestedClasses = new ArrayList<>(); + // public static List nestedClasses = new ArrayList<>(); private static Path path; public static void init(String modid, Class config) { diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 76bbee98b..c9461a657 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -38,9 +38,9 @@ "accessWidener" : "lod.accesswidener", "depends": { - "fabricloader": ">=0.12.6", + "fabricloader": "*", "fabric": "*", - "minecraft": "1.18", + "minecraft": "1.18.x", "java": ">=17" }, "suggests": { diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 9bcdf11ff..8338a71fc 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,6 +1,6 @@ modLoader="javafml" #//mandatory -loaderVersion="[37,)" # // mandatory. This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="[38,39)" # // mandatory. This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. license="GNU GPLv3" issueTrackerURL="https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues" diff --git a/gradle.properties b/gradle.properties index bc735486b..4d67e8810 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ org.gradle.jvmargs=-Xmx2048M -minecraft_version=1.18 +minecraft_version=1.18.1 archives_base_name=DistantHorizons mod_version=1.5.4a maven_group=com.seibel.lod toml_version=0.7.2 -fabric_loader_version=0.12.6 -fabric_api_version=0.43.1+1.18 +fabric_loader_version=0.12.12 +fabric_api_version=0.44.0+1.18 modmenu_version=3.0.0 -forge_version=38.0.14 \ No newline at end of file +forge_version=39.0.5 \ No newline at end of file