From 1727da5888a2dd4e889b1d67e2d2abdfbd2dba71 Mon Sep 17 00:00:00 2001 From: TexTrue <3140846162@qq.com> Date: Thu, 18 Jan 2024 18:39:38 +0800 Subject: [PATCH] fix icon missing, update mafglib to `0.1.8` --- CHANGELOG.md | 4 ++-- build.gradle | 4 ++-- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/fi/dy/masa/litematica/Litematica.java | 6 +++--- .../assets/{litematica => forgematica}/icon.png | Bin .../{litematica => forgematica}/lang/en_us.json | 0 .../{litematica => forgematica}/lang/ru_ru.json | 0 .../{litematica => forgematica}/lang/zh_cn.json | 0 .../textures/gui/gui_widgets.png | Bin .../textures/xcf/gui_widgets.xcf | Bin ...tematica.mixins.json => forgematica.mixins.json} | 0 12 files changed, 10 insertions(+), 10 deletions(-) rename src/main/resources/assets/{litematica => forgematica}/icon.png (100%) rename src/main/resources/assets/{litematica => forgematica}/lang/en_us.json (100%) rename src/main/resources/assets/{litematica => forgematica}/lang/ru_ru.json (100%) rename src/main/resources/assets/{litematica => forgematica}/lang/zh_cn.json (100%) rename src/main/resources/assets/{litematica => forgematica}/textures/gui/gui_widgets.png (100%) rename src/main/resources/assets/{litematica => forgematica}/textures/xcf/gui_widgets.xcf (100%) rename src/main/resources/{litematica.mixins.json => forgematica.mixins.json} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a246806..d6b2048 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ ## Change -- update mafglib to `0.1.7` -- change modid to `forgematica` \ No newline at end of file +- fix icon missing +- update mafglib to `0.1.8` \ No newline at end of file diff --git a/build.gradle b/build.gradle index 76f7324..caa794b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "dev.architectury.loom" version "1.2-SNAPSHOT" + id "dev.architectury.loom" version "1.4-SNAPSHOT" id "maven-publish" id 'com.modrinth.minotaur' version '2.+' id 'net.darkhax.curseforgegradle' version '1.+' @@ -14,7 +14,7 @@ group = project.maven_group loom { forge { mixinConfigs = [ - "litematica.mixins.json" + "forgematica.mixins.json" ] } } diff --git a/gradle.properties b/gradle.properties index e8ad771..971c94e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,14 +12,14 @@ loom.platform=forge yarn_mappings=1.18.2+build.4 # Mod Properties - mod_version=0.1.7 + mod_version=0.1.8 maven_group=org.thinkingstudio archives_base_name=Forgematica mod_id=forgematica mod_author=ThinkingStudio # Dependencies - malilib_version=0.1.7-mc1.18.2 + malilib_version=0.1.8-mc1.18.2 # Publish Properties modrinth_id=dCKRaeBC diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59bc51a..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/fi/dy/masa/litematica/Litematica.java b/src/main/java/fi/dy/masa/litematica/Litematica.java index 4424086..4e70788 100644 --- a/src/main/java/fi/dy/masa/litematica/Litematica.java +++ b/src/main/java/fi/dy/masa/litematica/Litematica.java @@ -1,7 +1,7 @@ package fi.dy.masa.litematica; import fi.dy.masa.litematica.gui.GuiConfigs; -import fi.dy.masa.malilib.compat.forge.ForgePlatformCompat; +import fi.dy.masa.malilib.compat.forge.ForgePlatformUtils; import fi.dy.masa.malilib.event.InitializationHandler; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.common.Mod; @@ -21,9 +21,9 @@ public Litematica() { } public void onInitializeClient(FMLClientSetupEvent event) { - ForgePlatformCompat.getInstance().getModClientExtensionPoint(); + ForgePlatformUtils.getInstance().getClientModIgnoredServerOnly(); InitializationHandler.getInstance().registerInitializationHandler(new InitHandler()); - ForgePlatformCompat.getInstance().getMod(Reference.MOD_ID).registerModConfigScreen((screen) -> { + ForgePlatformUtils.getInstance().getMod(Reference.MOD_ID).registerModConfigScreen((screen) -> { GuiConfigs gui = new GuiConfigs(); gui.setParent(screen); return gui; diff --git a/src/main/resources/assets/litematica/icon.png b/src/main/resources/assets/forgematica/icon.png similarity index 100% rename from src/main/resources/assets/litematica/icon.png rename to src/main/resources/assets/forgematica/icon.png diff --git a/src/main/resources/assets/litematica/lang/en_us.json b/src/main/resources/assets/forgematica/lang/en_us.json similarity index 100% rename from src/main/resources/assets/litematica/lang/en_us.json rename to src/main/resources/assets/forgematica/lang/en_us.json diff --git a/src/main/resources/assets/litematica/lang/ru_ru.json b/src/main/resources/assets/forgematica/lang/ru_ru.json similarity index 100% rename from src/main/resources/assets/litematica/lang/ru_ru.json rename to src/main/resources/assets/forgematica/lang/ru_ru.json diff --git a/src/main/resources/assets/litematica/lang/zh_cn.json b/src/main/resources/assets/forgematica/lang/zh_cn.json similarity index 100% rename from src/main/resources/assets/litematica/lang/zh_cn.json rename to src/main/resources/assets/forgematica/lang/zh_cn.json diff --git a/src/main/resources/assets/litematica/textures/gui/gui_widgets.png b/src/main/resources/assets/forgematica/textures/gui/gui_widgets.png similarity index 100% rename from src/main/resources/assets/litematica/textures/gui/gui_widgets.png rename to src/main/resources/assets/forgematica/textures/gui/gui_widgets.png diff --git a/src/main/resources/assets/litematica/textures/xcf/gui_widgets.xcf b/src/main/resources/assets/forgematica/textures/xcf/gui_widgets.xcf similarity index 100% rename from src/main/resources/assets/litematica/textures/xcf/gui_widgets.xcf rename to src/main/resources/assets/forgematica/textures/xcf/gui_widgets.xcf diff --git a/src/main/resources/litematica.mixins.json b/src/main/resources/forgematica.mixins.json similarity index 100% rename from src/main/resources/litematica.mixins.json rename to src/main/resources/forgematica.mixins.json