From 283b7ba17675c53b1e306f977b0dcbb1d9c37f71 Mon Sep 17 00:00:00 2001 From: JFronny Date: Wed, 17 Nov 2021 16:02:37 +0100 Subject: [PATCH] Port to 1.18 and include ModMenu icon, closes #17 --- build.gradle | 14 +++++++------- gradle.properties | 10 +++++----- .../gitlab/jfronny/respackopts/Respackopts.java | 4 ++++ .../respackopts/integration/FrexCompat.java | 9 +++------ .../modmenu/textures/gui/configure_button.png | Bin 0 -> 4257 bytes 5 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/assets/modmenu/textures/gui/configure_button.png diff --git a/build.gradle b/build.gradle index ceba3d7..0909893 100644 --- a/build.gradle +++ b/build.gradle @@ -3,14 +3,12 @@ apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle" repositories { maven { url = "https://maven.terraformersmc.com/releases/"; name = "ModMenu" } maven { url = "https://maven.shedaniel.me/"; name = "Cloth Config" } - //maven { url = "https://maven.dblsaiko.net/"; name = "Canvas" } maven { name = "vram" url = "https://maven.vram.io/" } - //maven { url = 'https://server.bbkr.space/artifactory/libs-release'; name = "Required for canvas" } + maven { url = 'https://server.bbkr.space/artifactory/libs-release'; name = "Required for canvas" } maven { url = "https://minecraft.curseforge.com/api/maven"; name = "CurseForge (for canvas)" } - maven { url = "https://jitpack.io"; name = "jitpack (for StarScript)" } maven { url "https://oskarstrom.net/maven" content { @@ -21,6 +19,7 @@ repositories { url "https://gitlab.com/api/v4/projects/25805200/packages/maven" } mavenCentral() + maven { url = "https://jitpack.io"; name = "jitpack (for StarScript)" } } dependencies { @@ -29,20 +28,21 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}") - modImplementation("com.terraformersmc:modmenu:2.0.5") + modImplementation("com.terraformersmc:modmenu:3.0.0") include modImplementation("com.github.MeteorDevelopment:starscript:0.1.5") - modApi("me.shedaniel.cloth:cloth-config-fabric:5.0.38") - modCompileOnly "io.vram:frex-fabric-mc117:6.0.145" + modApi("me.shedaniel.cloth:cloth-config-fabric:6.0.42") + modCompileOnly "io.vram:frex-fabric-mc118:+" include modImplementation("io.gitlab.jfronny.libjf:libjf-data-manipulation-v0:${project.jfapi_version}") { exclude(group: "net.fabricmc.fabric-api") } include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}") include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}") + modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}") testImplementation('org.junit.jupiter:junit-jupiter:5.8.1') //Canvas for FREX testing - //modRuntime("grondag:canvas-mc117-1.17:+") { + //modRuntimeOnly("io.vram:canvas-fabric-mc118:+") { // exclude(group: "me.shedaniel.cloth") //} diff --git a/gradle.properties b/gradle.properties index c1831c5..bb8a53a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version=1.17.1 -yarn_mappings=build.63 +minecraft_version=1.18-pre2 +yarn_mappings=build.2 loader_version=0.12.5 # Mod Properties -mod_version=2.8.2 +mod_version=2.8.3 maven_group=io.gitlab.jfronny archives_base_name=respackopts # Dependencies -fabric_version=0.42.1+1.17 -jfapi_version=2.1.3 +fabric_version=0.42.5+1.18 +jfapi_version=2.1.4-410670846 modrinth_id=TiF5QWZY modrinth_required_dependencies=3CD6YUw1 diff --git a/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java index a0db5a9..8db2f58 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java @@ -2,6 +2,7 @@ package io.gitlab.jfronny.respackopts; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import io.gitlab.jfronny.respackopts.integration.FrexCompat; import io.gitlab.jfronny.respackopts.model.*; import io.gitlab.jfronny.respackopts.model.condition.Condition; import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode; @@ -133,6 +134,9 @@ public class Respackopts implements ClientModInitializer { FileFilterEventImpl.init(); if (CONFIG.debugCommands) RpoCommand.register(); + if (FabricLoader.getInstance().isModLoaded("frex")) { + FrexCompat.onInitializeFrex(); + } } public static void save() { diff --git a/src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java b/src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java index 0f02e87..bcbe545 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java @@ -1,13 +1,11 @@ package io.gitlab.jfronny.respackopts.integration; -import grondag.frex.FrexInitializer; import io.gitlab.jfronny.respackopts.Respackopts; import io.vram.frex.api.config.ShaderConfig; -public class FrexCompat implements FrexInitializer { - boolean initial = true; - @Override - public void onInitalizeFrex() { +public class FrexCompat { + private static boolean initial = true; + public static void onInitializeFrex() { ShaderConfig.registerShaderConfigSupplier(Respackopts.RPO_SHADER_ID, Respackopts::getShaderImportSource); Respackopts.LOGGER.info("enabled frex/canvas support"); Respackopts.SAVE_ACTIONS.add(() -> { @@ -21,5 +19,4 @@ public class FrexCompat implements FrexInitializer { } }); } - } diff --git a/src/main/resources/assets/modmenu/textures/gui/configure_button.png b/src/main/resources/assets/modmenu/textures/gui/configure_button.png new file mode 100644 index 0000000000000000000000000000000000000000..244a03ccca83bec0bb30ee7840ec950514fd6a6f GIT binary patch literal 4257 zcmd5=dr%X19uJyY^+W~E^F?(DMOy79`^;wdKpu$*Y6LNJB6`%#?r$NIWaB0fz)mHU zYv-J+tsQ5yV6i={wxjiE)l<=));_K{LcOz|H`-J2!Hs%o9q@WuwfEb+J`YBWDfP>&c* z!^R03&8VvmTamBGI*$`%m!218JJ46TJdj$WNz176@IpE8A$CyeaHs38??0$R9Adg| z5pBh+9y2I&cZ z=aAiqipbmL3SYVoN*YqZ<%z<&y|^#Y~Q9yecwUG| zldm{nLi5hPsH#*VL}X}|B6tQzjesUlfKxPTVgwc?X@)Y95{@w>tESC;&JmO>sGk=) z-5XBJY`!#n<#f#a=|ZO&)Qp4>p=9qDOAzb;!)Xx}7#KSwO^GN=k|tCV30{(L+-PFR zK3GB2kcftd>k`a4F4v*zRvngNAy^TW2MMMb#|vutNY@E!=mSv~e(ZRF=Lcou@Opn4 zfS?b_hY)wKEcyJr0MlqejXkp@Iq4OFIxm)WiakB}K+=qKSva z9Yt~&@i@iZ0HLNvV>C1$Mch3aegpeSB!Pe%c~mr-Oekfi7}O-N0A(>dY$rU0+iCtW z^3#C&46aXy3RxtN`W;CIRqqHmQ}&&XLW_P>?1Bv})Q1c|Zc(9oOQ<5{s5LG)%W)5E zMuSW%INWh?=!lLXk%3{bWky{u|G$HWTIGX^_nFuukKi^yy^QWZ;7xP~1KhAlC~$ug z>p%k<&CsQJmMmM@neGkcb3}aXZ&s$DGmB4^Chr}Ub>o8%>N2#SGt=*RGN!kV-qShq z8?*GML;F6PFnivKW25JNn)Kb7%?r0~o8N)9o>;!SF7?G##b;wSecRjH8#89in7DV@ z&Re(k?VFjAu_tcXOYt2Y9f#Z6^7bA$@H@fL-r30)m6ZH34moz?#)_SnPoG}$+10C8 zU#T5GethTc+g!<}rluTwd3pIw?Ubog8($qa;a}ITdFfJ0Vq#)_b8~Y`YwL1D zj5haXS6A2m%q2^f@Pd%+l;u}mJa~4QEF0cC|1ujFXr z=Da{m{_Ci{!#1u;Ea>TqA8XV89rI^5<#{d_KQ-Gs!lWebw)r-HKO^<$NsD4H{$gJD zrMlO36Pgp_V$ZGX@&~SL+Z8VYkg_H%dG4L!Tbh$_54VC^j8E>_rWyHsaq;qNNr%Xs zmX?;Wv)i}6Hw`g7xw)aI{loK3C!dR%nDj<`N_Q)BbLdc4Tip-;{9b#YCOaYKwWed1 zL(Qq%r=2^I&@gvd_lRvHs&3Xxu|+F`FIyUF7v-1f1G`gw^zR#*j=h@c$}iKM`%6N@ z@T%T=cglO+BigSIDbFvm9@-WH`BlP%vbq0GzL&bOp<(rg4I73ZKYkp}m(z}RbmVx( z)O=i$xcJlJ^!x?Zw|Bjn+0xe5mb?1HT`#il~Nyx_aFYuEY%d#6sBG8+1scRIJnd=faaOrO;x5t+#FbzMCl-QB;ncG8e% zr!2UXRk+}zVY=IEuHttV=I63X+?Gq&`r5C*YH$DiRI;8(`sCffnMuTc6|9v;E4IC*7p2UGwODo?lv9S68PJK)wga{|FEa?HD5MB#=X^; mF#7hY!-4Y|fk484o@g6Yxc;8SJyZP?A#c`v%Z}`2b^iqs^wAdp literal 0 HcmV?d00001