From 063790c220a73f566135108dfaf41e136e547071 Mon Sep 17 00:00:00 2001 From: TexTrue <65154269+TexBlock@users.noreply.github.com> Date: Mon, 29 Jan 2024 18:54:11 +0800 Subject: [PATCH] update mafglib version to `0.1.9` --- CHANGELOG.md | 2 +- README.md | 11 +++++++++++ build.gradle | 4 ++-- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/fi/dy/masa/itemscroller/ItemScroller.java | 6 +++--- .../assets/{itemscroller => rocknroller}/icon.png | Bin .../{itemscroller => rocknroller}/lang/en_us.json | 0 .../textures/gui/gui_widgets.png | Bin .../textures/xcf/gui_widgets.xcf | Bin ...scroller.mixins.json => rocknroller.mixins.json} | 0 11 files changed, 20 insertions(+), 9 deletions(-) rename src/main/resources/assets/{itemscroller => rocknroller}/icon.png (100%) rename src/main/resources/assets/{itemscroller => rocknroller}/lang/en_us.json (100%) rename src/main/resources/assets/{itemscroller => rocknroller}/textures/gui/gui_widgets.png (100%) rename src/main/resources/assets/{itemscroller => rocknroller}/textures/xcf/gui_widgets.xcf (100%) rename src/main/resources/{itemscroller.mixins.json => rocknroller.mixins.json} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fe63d2..d8fcfab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,2 @@ ## Change -- change modid to `rocknroller` \ No newline at end of file +- update mafglib version to `0.1.9` \ No newline at end of file diff --git a/README.md b/README.md index 6bb210d..6725668 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,17 @@ Item Scroller unofficial forge port. +**Require [MaFgLib](https://github.com/ThinkingStudios/MaLiLib-Forge).** + +forge + + +modrinth + + +curseforge + + Rock'n Roller is a Minecraft mod that adds various diff --git a/build.gradle b/build.gradle index 544e9c5..eb5a60b 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 = [ - "itemscroller.mixins.json" + "rocknroller.mixins.json" ] } } diff --git a/gradle.properties b/gradle.properties index 156297b..8c60933 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ loom.platform=forge yarn_mappings=1.20.1+build.9 # Mod Properties - mod_version=0.1.1 + mod_version=0.1.2 maven_group=org.thinkingstudio.rocknroller archives_base_name=RocknRoller mod_id=rocknroller @@ -21,4 +21,4 @@ loom.platform=forge curseforge_id=916852 # Dependencies - malilib_version=0.1.3-mc1.20.1 \ No newline at end of file + malilib_version=0.1.7-mc1.20.1 \ No newline at end of file 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/itemscroller/ItemScroller.java b/src/main/java/fi/dy/masa/itemscroller/ItemScroller.java index aee4cdf..a23527f 100644 --- a/src/main/java/fi/dy/masa/itemscroller/ItemScroller.java +++ b/src/main/java/fi/dy/masa/itemscroller/ItemScroller.java @@ -1,7 +1,7 @@ package fi.dy.masa.itemscroller; import fi.dy.masa.itemscroller.gui.GuiConfigs; -import fi.dy.masa.malilib.compat.forge.ForgePlatformCompat; +import fi.dy.masa.malilib.compat.forge.ForgePlatformUtils; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @@ -21,10 +21,10 @@ public ItemScroller() { } 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/itemscroller/icon.png b/src/main/resources/assets/rocknroller/icon.png similarity index 100% rename from src/main/resources/assets/itemscroller/icon.png rename to src/main/resources/assets/rocknroller/icon.png diff --git a/src/main/resources/assets/itemscroller/lang/en_us.json b/src/main/resources/assets/rocknroller/lang/en_us.json similarity index 100% rename from src/main/resources/assets/itemscroller/lang/en_us.json rename to src/main/resources/assets/rocknroller/lang/en_us.json diff --git a/src/main/resources/assets/itemscroller/textures/gui/gui_widgets.png b/src/main/resources/assets/rocknroller/textures/gui/gui_widgets.png similarity index 100% rename from src/main/resources/assets/itemscroller/textures/gui/gui_widgets.png rename to src/main/resources/assets/rocknroller/textures/gui/gui_widgets.png diff --git a/src/main/resources/assets/itemscroller/textures/xcf/gui_widgets.xcf b/src/main/resources/assets/rocknroller/textures/xcf/gui_widgets.xcf similarity index 100% rename from src/main/resources/assets/itemscroller/textures/xcf/gui_widgets.xcf rename to src/main/resources/assets/rocknroller/textures/xcf/gui_widgets.xcf diff --git a/src/main/resources/itemscroller.mixins.json b/src/main/resources/rocknroller.mixins.json similarity index 100% rename from src/main/resources/itemscroller.mixins.json rename to src/main/resources/rocknroller.mixins.json