From 53d8e8bc919df1c1643b66e0587a133148ea3e77 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Sun, 17 May 2026 22:56:00 +0700 Subject: [PATCH] feat: fluid filter implemented --- .gitignore | 21 + build.gradle | 157 +++++++ gradle.properties | 44 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 +++++++++++ gradlew.bat | 92 +++++ settings.gradle | 11 + .../1303bb866fd69e15e40bfd8effefb5b3125895f3 | 2 + .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 3 + .../c97d1a5b507a316151c0d5bb9bd83992072490f4 | 2 + .../e269aafd0d18b2be89807338da6e3f69e464bbfe | 2 + .../resources/assets/effmeks/lang/en_us.json | 6 + .../resources/assets/effmeks/lang/ru_ru.json | 6 + .../effmeks/models/item/fluid_filter.json | 3 + .../advancement/recipes/tools/rec_fct1.json | 32 ++ .../data/effmeks/recipe/rec_fct1.json | 27 ++ .../nuark/mcmod/effectivemekanisms/EffMeks.kt | 114 +++++ .../block/FluidFilterBlock.kt | 72 ++++ .../effectivemekanisms/block/ModBlocks.kt | 17 + .../blockentity/FluidFilterBlockEntity.kt | 159 +++++++ .../blockentity/ModBlockEntities.kt | 18 + .../capabilities/ModCapabilities.kt | 34 ++ .../datagen/ModItemModelProvider.kt | 13 + .../datagen/ModLanguageProviders.kt | 32 ++ .../datagen/ModRecipeProvider.kt | 28 ++ .../mcmod/effectivemekanisms/item/ModItems.kt | 13 + .../menu/FluidFilterMenu.kt | 112 +++++ .../effectivemekanisms/menu/ModMenuTypes.kt | 20 + .../network/FluidFilterOverclockPacket.kt | 35 ++ .../network/FluidFilterSyncPacket.kt | 44 ++ .../screen/FluidFilterScreen.kt | 336 +++++++++++++++ .../mcmod/effectivemekanisms/tags/ModTags.kt | 18 + .../utils/FilterFluidConversion.kt | 20 + .../effmeks/blockstates/fluid_filter.json | 7 + .../effmeks/models/block/fluid_filter.json | 388 ++++++++++++++++++ .../effmeks/textures/block/fluid_filter.png | Bin 0 -> 861 bytes .../effmeks/textures/gui/fluid_filter.png | Bin 0 -> 1317 bytes .../templates/META-INF/neoforge.mods.toml | 79 ++++ 39 files changed, 2223 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/generated/resources/.cache/1303bb866fd69e15e40bfd8effefb5b3125895f3 create mode 100644 src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e create mode 100644 src/generated/resources/.cache/c97d1a5b507a316151c0d5bb9bd83992072490f4 create mode 100644 src/generated/resources/.cache/e269aafd0d18b2be89807338da6e3f69e464bbfe create mode 100644 src/generated/resources/assets/effmeks/lang/en_us.json create mode 100644 src/generated/resources/assets/effmeks/lang/ru_ru.json create mode 100644 src/generated/resources/assets/effmeks/models/item/fluid_filter.json create mode 100644 src/generated/resources/data/effmeks/advancement/recipes/tools/rec_fct1.json create mode 100644 src/generated/resources/data/effmeks/recipe/rec_fct1.json create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/EffMeks.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/block/FluidFilterBlock.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/block/ModBlocks.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/blockentity/FluidFilterBlockEntity.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/blockentity/ModBlockEntities.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/capabilities/ModCapabilities.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModItemModelProvider.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModLanguageProviders.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModRecipeProvider.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/item/ModItems.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/menu/FluidFilterMenu.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/menu/ModMenuTypes.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/network/FluidFilterOverclockPacket.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/network/FluidFilterSyncPacket.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/screen/FluidFilterScreen.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/tags/ModTags.kt create mode 100644 src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/utils/FilterFluidConversion.kt create mode 100644 src/main/resources/assets/effmeks/blockstates/fluid_filter.json create mode 100644 src/main/resources/assets/effmeks/models/block/fluid_filter.json create mode 100644 src/main/resources/assets/effmeks/textures/block/fluid_filter.png create mode 100644 src/main/resources/assets/effmeks/textures/gui/fluid_filter.png create mode 100644 src/main/templates/META-INF/neoforge.mods.toml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9e4b940 --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +# MacOS DS_Store files +.DS_Store + +# Gradle cache folder +.gradle + +# Gradle build folder +build + +# IntelliJ +out/ +.idea +*.iml +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# Common working directory +run diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..523ce1d --- /dev/null +++ b/build.gradle @@ -0,0 +1,157 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'idea' + id 'net.neoforged.moddev' version '2.0.141' + id 'org.jetbrains.kotlin.jvm' version '2.3.0' +} + +version = mod_version +group = mod_group_id + +repositories { + mavenLocal() + maven { + name = 'Kotlin for Forge' + url = 'https://thedarkcolour.github.io/KotlinForForge/' + content { includeGroup "thedarkcolour" } + } + + maven { + // for Patchouli and JEI + name "blamejared" + url "https://maven.blamejared.com/" + content { + includeGroup "vazkii.patchouli" + includeGroup "vazkii.psi" + includeGroup "mezz.jei" + } + } + maven { + name = 'Modrinth' + url = 'https://api.modrinth.com/maven' + content { + includeGroup 'maven.modrinth' + } + } + exclusiveContent { + forRepository { + maven { + url "https://cursemaven.com" + } + } + filter { + includeGroup "curse.maven" + } + } +} + +base { + archivesName = mod_id +} + +java.toolchain.languageVersion = JavaLanguageVersion.of(21) +kotlin.jvmToolchain(21) + +neoForge { + version = project.neo_version + + parchment { + mappingsVersion = project.parchment_mappings_version + minecraftVersion = project.parchment_minecraft_version + } + + runs { + client { + client() + + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + server { + server() + programArgument '--nogui' + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + gameTestServer { + type = "gameTestServer" + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + data { + data() + + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } + + configureEach { + systemProperty 'forge.logging.markers', 'REGISTRIES' + + logLevel = org.slf4j.event.Level.DEBUG + } + } + + mods { + "${mod_id}" { + sourceSet(sourceSets.main) + } + } +} + +sourceSets.main.resources { srcDir 'src/generated/resources' } + + +dependencies { + implementation 'thedarkcolour:kotlinforforge-neoforge:5.11.0' + + implementation "curse.maven:mekanism-268560:7904058" + + compileOnly "mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}" + compileOnly "mezz.jei:jei-${jei_mc_version}-neoforge-api:${jei_version}" + runtimeOnly "mezz.jei:jei-${jei_mc_version}-neoforge:${jei_version}" + + runtimeOnly("curse.maven:ftb-library-forge-404465:7746959") + runtimeOnly("curse.maven:architectury-api-419699:5786327") +} + +var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) { + var replaceProperties = [minecraft_version : minecraft_version, + minecraft_version_range: minecraft_version_range, + neo_version : neo_version, + neo_version_range : neo_version_range, + loader_version_range : loader_version_range, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + mod_authors : mod_authors, + mod_description : mod_description] + inputs.properties replaceProperties + expand replaceProperties + from "src/main/templates" + into "build/generated/sources/modMetadata" +} + +sourceSets.main.resources.srcDir generateModMetadata +neoForge.ideSyncTask generateModMetadata + +publishing { + publications { + register('mavenJava', MavenPublication) { + from components.java + } + } + repositories { + maven { + url "file://${project.projectDir}/repo" + } + } +} + +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..bbea637 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,44 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +org.gradle.jvmargs=-Xmx2G +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true +## Environment Properties +# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge +# The Minecraft version must agree with the Neo version to get a valid artifact +minecraft_version=1.21.1 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.21.1,1.22) +# The Neo version must agree with the Minecraft version to get a valid artifact +neo_version=21.1.219 +# The Neo version range can use any version of Neo as bounds +neo_version_range=[21,) +# The loader version range can only use the major version of FML as bounds +loader_version_range=[5.3,) +parchment_minecraft_version=1.21.11 +parchment_mappings_version=2025.12.21-nightly-SNAPSHOT +## Mod Properties +# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} +# Must match the String constant located in the main mod class annotated with @Mod. +mod_id=effmeks +# The human-readable display name for the mod. +mod_name=EffectiveMekanisms +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=All Rights Reserved +# The mod version. See https://semver.org/ +mod_version=1.0.0 +# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. +# This should match the base package used for the mod sources. +# See https://maven.apache.org/guides/mini/guide-naming-conventions.html +mod_group_id=xyz.nuark.mcmod +# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. +mod_authors=nuark +# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. +mod_description=Effective Mekanism machines, when you really want to save your tps + +jei_version=19.25.0.323 +jei_mc_version=1.21.1 +patchouli_version=1.21-87 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 zcma&N1CXTcmMvW9vTb(Rwr$&4wr$(C?dmSu>@vG-+vuvg^_??!{yS%8zW-#zn-LkA z5&1^$^{lnmUON?}LBF8_K|(?T0Ra(xUH{($5eN!MR#ZihR#HxkUPe+_R8Cn`RRs(P z_^*#_XlXmGv7!4;*Y%p4nw?{bNp@UZHv1?Um8r6)Fei3p@ClJn0ECfg1hkeuUU@Or zDaPa;U3fE=3L}DooL;8f;P0ipPt0Z~9P0)lbStMS)ag54=uL9ia-Lm3nh|@(Y?B`; zx_#arJIpXH!U{fbCbI^17}6Ri*H<>OLR%c|^mh8+)*h~K8Z!9)DPf zR2h?lbDZQ`p9P;&DQ4F0sur@TMa!Y}S8irn(%d-gi0*WxxCSk*A?3lGh=gcYN?FGl z7D=Js!i~0=u3rox^eO3i@$0=n{K1lPNU zwmfjRVmLOCRfe=seV&P*1Iq=^i`502keY8Uy-WNPwVNNtJFx?IwAyRPZo2Wo1+S(xF37LJZ~%i)kpFQ3Fw=mXfd@>%+)RpYQLnr}B~~zoof(JVm^^&f zxKV^+3D3$A1G;qh4gPVjhrC8e(VYUHv#dy^)(RoUFM?o%W-EHxufuWf(l*@-l+7vt z=l`qmR56K~F|v<^Pd*p~1_y^P0P^aPC##d8+HqX4IR1gu+7w#~TBFphJxF)T$2WEa zxa?H&6=Qe7d(#tha?_1uQys2KtHQ{)Qco)qwGjrdNL7thd^G5i8Os)CHqc>iOidS} z%nFEDdm=GXBw=yXe1W-ShHHFb?Cc70+$W~z_+}nAoHFYI1MV1wZegw*0y^tC*s%3h zhD3tN8b=Gv&rj}!SUM6|ajSPp*58KR7MPpI{oAJCtY~JECm)*m_x>AZEu>DFgUcby z1Qaw8lU4jZpQ_$;*7RME+gq1KySGG#Wql>aL~k9tLrSO()LWn*q&YxHEuzmwd1?aAtI zBJ>P=&$=l1efe1CDU;`Fd+_;&wI07?V0aAIgc(!{a z0Jg6Y=inXc3^n!U0Atk`iCFIQooHqcWhO(qrieUOW8X(x?(RD}iYDLMjSwffH2~tB z)oDgNBLB^AJBM1M^c5HdRx6fBfka`(LD-qrlh5jqH~);#nw|iyp)()xVYak3;Ybik z0j`(+69aK*B>)e_p%=wu8XC&9e{AO4c~O1U`5X9}?0mrd*m$_EUek{R?DNSh(=br# z#Q61gBzEpmy`$pA*6!87 zSDD+=@fTY7<4A?GLqpA?Pb2z$pbCc4B4zL{BeZ?F-8`s$?>*lXXtn*NC61>|*w7J* z$?!iB{6R-0=KFmyp1nnEmLsA-H0a6l+1uaH^g%c(p{iT&YFrbQ$&PRb8Up#X3@Zsk zD^^&LK~111%cqlP%!_gFNa^dTYT?rhkGl}5=fL{a`UViaXWI$k-UcHJwmaH1s=S$4 z%4)PdWJX;hh5UoK?6aWoyLxX&NhNRqKam7tcOkLh{%j3K^4Mgx1@i|Pi&}<^5>hs5 zm8?uOS>%)NzT(%PjVPGa?X%`N2TQCKbeH2l;cTnHiHppPSJ<7y-yEIiC!P*ikl&!B z%+?>VttCOQM@ShFguHVjxX^?mHX^hSaO_;pnyh^v9EumqSZTi+#f&_Vaija0Q-e*| z7ulQj6Fs*bbmsWp{`auM04gGwsYYdNNZcg|ph0OgD>7O}Asn7^Z=eI>`$2*v78;sj-}oMoEj&@)9+ycEOo92xSyY344^ z11Hb8^kdOvbf^GNAK++bYioknrpdN>+u8R?JxG=!2Kd9r=YWCOJYXYuM0cOq^FhEd zBg2puKy__7VT3-r*dG4c62Wgxi52EMCQ`bKgf*#*ou(D4-ZN$+mg&7$u!! z-^+Z%;-3IDwqZ|K=ah85OLwkO zKxNBh+4QHh)u9D?MFtpbl)us}9+V!D%w9jfAMYEb>%$A;u)rrI zuBudh;5PN}_6J_}l55P3l_)&RMlH{m!)ai-i$g)&*M`eN$XQMw{v^r@-125^RRCF0 z^2>|DxhQw(mtNEI2Kj(;KblC7x=JlK$@78`O~>V!`|1Lm-^JR$-5pUANAnb(5}B}JGjBsliK4& zk6y(;$e&h)lh2)L=bvZKbvh@>vLlreBdH8No2>$#%_Wp1U0N7Ank!6$dFSi#xzh|( zRi{Uw%-4W!{IXZ)fWx@XX6;&(m_F%c6~X8hx=BN1&q}*( zoaNjWabE{oUPb!Bt$eyd#$5j9rItB-h*5JiNi(v^e|XKAj*8(k<5-2$&ZBR5fF|JA z9&m4fbzNQnAU}r8ab>fFV%J0z5awe#UZ|bz?Ur)U9bCIKWEzi2%A+5CLqh?}K4JHi z4vtM;+uPsVz{Lfr;78W78gC;z*yTch~4YkLr&m-7%-xc ztw6Mh2d>_iO*$Rd8(-Cr1_V8EO1f*^@wRoSozS) zy1UoC@pruAaC8Z_7~_w4Q6n*&B0AjOmMWa;sIav&gu z|J5&|{=a@vR!~k-OjKEgPFCzcJ>#A1uL&7xTDn;{XBdeM}V=l3B8fE1--DHjSaxoSjNKEM9|U9#m2<3>n{Iuo`r3UZp;>GkT2YBNAh|b z^jTq-hJp(ebZh#Lk8hVBP%qXwv-@vbvoREX$TqRGTgEi$%_F9tZES@z8Bx}$#5eeG zk^UsLBH{bc2VBW)*EdS({yw=?qmevwi?BL6*=12k9zM5gJv1>y#ML4!)iiPzVaH9% zgSImetD@dam~e>{LvVh!phhzpW+iFvWpGT#CVE5TQ40n%F|p(sP5mXxna+Ev7PDwA zamaV4m*^~*xV+&p;W749xhb_X=$|LD;FHuB&JL5?*Y2-oIT(wYY2;73<^#46S~Gx| z^cez%V7x$81}UWqS13Gz80379Rj;6~WdiXWOSsdmzY39L;Hg3MH43o*y8ibNBBH`(av4|u;YPq%{R;IuYow<+GEsf@R?=@tT@!}?#>zIIn0CoyV!hq3mw zHj>OOjfJM3F{RG#6ujzo?y32m^tgSXf@v=J$ELdJ+=5j|=F-~hP$G&}tDZsZE?5rX ztGj`!S>)CFmdkccxM9eGIcGnS2AfK#gXwj%esuIBNJQP1WV~b~+D7PJTmWGTSDrR` zEAu4B8l>NPuhsk5a`rReSya2nfV1EK01+G!x8aBdTs3Io$u5!6n6KX%uv@DxAp3F@{4UYg4SWJtQ-W~0MDb|j-$lwVn znAm*Pl!?Ps&3wO=R115RWKb*JKoexo*)uhhHBncEDMSVa_PyA>k{Zm2(wMQ(5NM3# z)jkza|GoWEQo4^s*wE(gHz?Xsg4`}HUAcs42cM1-qq_=+=!Gk^y710j=66(cSWqUe zklbm8+zB_syQv5A2rj!Vbw8;|$@C!vfNmNV!yJIWDQ>{+2x zKjuFX`~~HKG~^6h5FntRpnnHt=D&rq0>IJ9#F0eM)Y-)GpRjiN7gkA8wvnG#K=q{q z9dBn8_~wm4J<3J_vl|9H{7q6u2A!cW{bp#r*-f{gOV^e=8S{nc1DxMHFwuM$;aVI^ zz6A*}m8N-&x8;aunp1w7_vtB*pa+OYBw=TMc6QK=mbA-|Cf* zvyh8D4LRJImooUaSb7t*fVfih<97Gf@VE0|z>NcBwBQze);Rh!k3K_sfunToZY;f2 z^HmC4KjHRVg+eKYj;PRN^|E0>Gj_zagfRbrki68I^#~6-HaHg3BUW%+clM1xQEdPYt_g<2K+z!$>*$9nQ>; zf9Bei{?zY^-e{q_*|W#2rJG`2fy@{%6u0i_VEWTq$*(ZN37|8lFFFt)nCG({r!q#9 z5VK_kkSJ3?zOH)OezMT{!YkCuSSn!K#-Rhl$uUM(bq*jY? zi1xbMVthJ`E>d>(f3)~fozjg^@eheMF6<)I`oeJYx4*+M&%c9VArn(OM-wp%M<-`x z7sLP1&3^%Nld9Dhm@$3f2}87!quhI@nwd@3~fZl_3LYW-B?Ia>ui`ELg z&Qfe!7m6ze=mZ`Ia9$z|ARSw|IdMpooY4YiPN8K z4B(ts3p%2i(Td=tgEHX z0UQ_>URBtG+-?0E;E7Ld^dyZ;jjw0}XZ(}-QzC6+NN=40oDb2^v!L1g9xRvE#@IBR zO!b-2N7wVfLV;mhEaXQ9XAU+>=XVA6f&T4Z-@AX!leJ8obP^P^wP0aICND?~w&NykJ#54x3_@r7IDMdRNy4Hh;h*!u(Ol(#0bJdwEo$5437-UBjQ+j=Ic>Q2z` zJNDf0yO6@mr6y1#n3)s(W|$iE_i8r@Gd@!DWDqZ7J&~gAm1#~maIGJ1sls^gxL9LLG_NhU!pTGty!TbhzQnu)I*S^54U6Yu%ZeCg`R>Q zhBv$n5j0v%O_j{QYWG!R9W?5_b&67KB$t}&e2LdMvd(PxN6Ir!H4>PNlerpBL>Zvyy!yw z-SOo8caEpDt(}|gKPBd$qND5#a5nju^O>V&;f890?yEOfkSG^HQVmEbM3Ugzu+UtH zC(INPDdraBN?P%kE;*Ae%Wto&sgw(crfZ#Qy(<4nk;S|hD3j{IQRI6Yq|f^basLY; z-HB&Je%Gg}Jt@={_C{L$!RM;$$|iD6vu#3w?v?*;&()uB|I-XqEKqZPS!reW9JkLewLb!70T7n`i!gNtb1%vN- zySZj{8-1>6E%H&=V}LM#xmt`J3XQoaD|@XygXjdZ1+P77-=;=eYpoEQ01B@L*a(uW zrZeZz?HJsw_4g0vhUgkg@VF8<-X$B8pOqCuWAl28uB|@r`19DTUQQsb^pfqB6QtiT z*`_UZ`fT}vtUY#%sq2{rchyfu*pCg;uec2$-$N_xgjZcoumE5vSI{+s@iLWoz^Mf; zuI8kDP{!XY6OP~q5}%1&L}CtfH^N<3o4L@J@zg1-mt{9L`s^z$Vgb|mr{@WiwAqKg zp#t-lhrU>F8o0s1q_9y`gQNf~Vb!F%70f}$>i7o4ho$`uciNf=xgJ>&!gSt0g;M>*x4-`U)ysFW&Vs^Vk6m%?iuWU+o&m(2Jm26Y(3%TL; zA7T)BP{WS!&xmxNw%J=$MPfn(9*^*TV;$JwRy8Zl*yUZi8jWYF>==j~&S|Xinsb%c z2?B+kpet*muEW7@AzjBA^wAJBY8i|#C{WtO_or&Nj2{=6JTTX05}|H>N2B|Wf!*3_ z7hW*j6p3TvpghEc6-wufFiY!%-GvOx*bZrhZu+7?iSrZL5q9}igiF^*R3%DE4aCHZ zqu>xS8LkW+Auv%z-<1Xs92u23R$nk@Pk}MU5!gT|c7vGlEA%G^2th&Q*zfg%-D^=f z&J_}jskj|Q;73NP4<4k*Y%pXPU2Thoqr+5uH1yEYM|VtBPW6lXaetokD0u z9qVek6Q&wk)tFbQ8(^HGf3Wp16gKmr>G;#G(HRBx?F`9AIRboK+;OfHaLJ(P>IP0w zyTbTkx_THEOs%Q&aPrxbZrJlio+hCC_HK<4%f3ZoSAyG7Dn`=X=&h@m*|UYO-4Hq0 z-Bq&+Ie!S##4A6OGoC~>ZW`Y5J)*ouaFl_e9GA*VSL!O_@xGiBw!AF}1{tB)z(w%c zS1Hmrb9OC8>0a_$BzeiN?rkPLc9%&;1CZW*4}CDDNr2gcl_3z+WC15&H1Zc2{o~i) z)LLW=WQ{?ricmC`G1GfJ0Yp4Dy~Ba;j6ZV4r{8xRs`13{dD!xXmr^Aga|C=iSmor% z8hi|pTXH)5Yf&v~exp3o+sY4B^^b*eYkkCYl*T{*=-0HniSA_1F53eCb{x~1k3*`W zr~};p1A`k{1DV9=UPnLDgz{aJH=-LQo<5%+Em!DNN252xwIf*wF_zS^!(XSm(9eoj z=*dXG&n0>)_)N5oc6v!>-bd(2ragD8O=M|wGW z!xJQS<)u70m&6OmrF0WSsr@I%T*c#Qo#Ha4d3COcX+9}hM5!7JIGF>7<~C(Ear^Sn zm^ZFkV6~Ula6+8S?oOROOA6$C&q&dp`>oR-2Ym3(HT@O7Sd5c~+kjrmM)YmgPH*tL zX+znN>`tv;5eOfX?h{AuX^LK~V#gPCu=)Tigtq9&?7Xh$qN|%A$?V*v=&-2F$zTUv z`C#WyIrChS5|Kgm_GeudCFf;)!WH7FI60j^0o#65o6`w*S7R@)88n$1nrgU(oU0M9 zx+EuMkC>(4j1;m6NoGqEkpJYJ?vc|B zOlwT3t&UgL!pX_P*6g36`ZXQ; z9~Cv}ANFnJGp(;ZhS(@FT;3e)0)Kp;h^x;$*xZn*k0U6-&FwI=uOGaODdrsp-!K$Ac32^c{+FhI-HkYd5v=`PGsg%6I`4d9Jy)uW0y%) zm&j^9WBAp*P8#kGJUhB!L?a%h$hJgQrx!6KCB_TRo%9{t0J7KW8!o1B!NC)VGLM5! zpZy5Jc{`r{1e(jd%jsG7k%I+m#CGS*BPA65ZVW~fLYw0dA-H_}O zrkGFL&P1PG9p2(%QiEWm6x;U-U&I#;Em$nx-_I^wtgw3xUPVVu zqSuKnx&dIT-XT+T10p;yjo1Y)z(x1fb8Dzfn8e yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ada876e --- /dev/null +++ b/settings.gradle @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + maven { url = 'https://maven.neoforged.net/releases' } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} diff --git a/src/generated/resources/.cache/1303bb866fd69e15e40bfd8effefb5b3125895f3 b/src/generated/resources/.cache/1303bb866fd69e15e40bfd8effefb5b3125895f3 new file mode 100644 index 0000000..df4e540 --- /dev/null +++ b/src/generated/resources/.cache/1303bb866fd69e15e40bfd8effefb5b3125895f3 @@ -0,0 +1,2 @@ +// 1.21.1 2026-05-17T14:12:39.0216262 Item Models: effmeks +8476e8e89257ef1bfcd9f568099f069a86522360 assets/effmeks/models/item/fluid_filter.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e new file mode 100644 index 0000000..f7d13b6 --- /dev/null +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -0,0 +1,3 @@ +// 1.21.1 2026-05-17T22:53:43.7145767 Recipes +c9ee48071b50617af2ec250deadd7bff323b8d78 data/effmeks/advancement/recipes/tools/rec_fct1.json +1ad62af4d88b8110dc39d966c289b1ff3d585397 data/effmeks/recipe/rec_fct1.json diff --git a/src/generated/resources/.cache/c97d1a5b507a316151c0d5bb9bd83992072490f4 b/src/generated/resources/.cache/c97d1a5b507a316151c0d5bb9bd83992072490f4 new file mode 100644 index 0000000..45cd6f2 --- /dev/null +++ b/src/generated/resources/.cache/c97d1a5b507a316151c0d5bb9bd83992072490f4 @@ -0,0 +1,2 @@ +// 1.21.1 2026-05-17T22:37:23.9653189 Languages: en_us for mod: effmeks +9b4d5b6a375bca8cb2f716c84981d5764fa820fc assets/effmeks/lang/en_us.json diff --git a/src/generated/resources/.cache/e269aafd0d18b2be89807338da6e3f69e464bbfe b/src/generated/resources/.cache/e269aafd0d18b2be89807338da6e3f69e464bbfe new file mode 100644 index 0000000..a6e5233 --- /dev/null +++ b/src/generated/resources/.cache/e269aafd0d18b2be89807338da6e3f69e464bbfe @@ -0,0 +1,2 @@ +// 1.21.1 2026-05-17T22:37:24.0183182 Languages: ru_ru for mod: effmeks +b430721f5d5170ca82c0af7ea851ab1c7c9bc91d assets/effmeks/lang/ru_ru.json diff --git a/src/generated/resources/assets/effmeks/lang/en_us.json b/src/generated/resources/assets/effmeks/lang/en_us.json new file mode 100644 index 0000000..0ee477d --- /dev/null +++ b/src/generated/resources/assets/effmeks/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "block.effmeks.fluid_filter": "Fluid filter", + "tooltip.fluid.amount.format": "%s / %s mB of ", + "tooltip.fluid.empty": "Empty", + "tooltip.machine.overclock.tier": "Overclock tier: %s" +} \ No newline at end of file diff --git a/src/generated/resources/assets/effmeks/lang/ru_ru.json b/src/generated/resources/assets/effmeks/lang/ru_ru.json new file mode 100644 index 0000000..41b4056 --- /dev/null +++ b/src/generated/resources/assets/effmeks/lang/ru_ru.json @@ -0,0 +1,6 @@ +{ + "block.effmeks.fluid_filter": "Жидкостный фильтр", + "tooltip.fluid.amount.format": "%s / %s мБ ", + "tooltip.fluid.empty": "Пусто", + "tooltip.machine.overclock.tier": "Уровень разгона: %s" +} \ No newline at end of file diff --git a/src/generated/resources/assets/effmeks/models/item/fluid_filter.json b/src/generated/resources/assets/effmeks/models/item/fluid_filter.json new file mode 100644 index 0000000..84d00aa --- /dev/null +++ b/src/generated/resources/assets/effmeks/models/item/fluid_filter.json @@ -0,0 +1,3 @@ +{ + "parent": "effmeks:block/fluid_filter" +} \ No newline at end of file diff --git a/src/generated/resources/data/effmeks/advancement/recipes/tools/rec_fct1.json b/src/generated/resources/data/effmeks/advancement/recipes/tools/rec_fct1.json new file mode 100644 index 0000000..87800b5 --- /dev/null +++ b/src/generated/resources/data/effmeks/advancement/recipes/tools/rec_fct1.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_block": { + "conditions": { + "items": [ + { + "items": "mekanism:electric_pump" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "effmeks:rec_fct1" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_iron_block" + ] + ], + "rewards": { + "recipes": [ + "effmeks:rec_fct1" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/effmeks/recipe/rec_fct1.json b/src/generated/resources/data/effmeks/recipe/rec_fct1.json new file mode 100644 index 0000000..d2ecba1 --- /dev/null +++ b/src/generated/resources/data/effmeks/recipe/rec_fct1.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "C": { + "item": "mekanism:ultimate_control_circuit" + }, + "F": { + "item": "mekanism:upgrade_filter" + }, + "P": { + "item": "mekanism:electric_pump" + }, + "T": { + "item": "mekanism:ultimate_fluid_tank" + } + }, + "pattern": [ + "CTC", + "FPF", + "CTC" + ], + "result": { + "count": 1, + "id": "effmeks:fluid_filter" + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/EffMeks.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/EffMeks.kt new file mode 100644 index 0000000..bb2b86a --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/EffMeks.kt @@ -0,0 +1,114 @@ +package xyz.nuark.mcmod.effectivemekanisms + +import xyz.nuark.mcmod.effectivemekanisms.block.ModBlocks +import net.minecraft.client.Minecraft +import net.minecraft.resources.ResourceLocation +import net.minecraft.world.item.CreativeModeTabs +import net.neoforged.bus.api.SubscribeEvent +import net.neoforged.fml.common.EventBusSubscriber +import net.neoforged.fml.common.Mod +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent +import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent +import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent +import net.neoforged.neoforge.data.event.GatherDataEvent +import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent +import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent +import org.apache.logging.log4j.Level +import org.apache.logging.log4j.LogManager +import org.apache.logging.log4j.Logger +import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS +import thedarkcolour.kotlinforforge.neoforge.forge.runForDist +import xyz.nuark.mcmod.effectivemekanisms.blockentity.ModBlockEntities +import xyz.nuark.mcmod.effectivemekanisms.datagen.ModItemModelProvider +import xyz.nuark.mcmod.effectivemekanisms.datagen.ModLanguageProviders +import xyz.nuark.mcmod.effectivemekanisms.datagen.ModRecipeProvider +import xyz.nuark.mcmod.effectivemekanisms.item.ModItems +import xyz.nuark.mcmod.effectivemekanisms.menu.ModMenuTypes +import xyz.nuark.mcmod.effectivemekanisms.network.FluidFilterOverclockPacket +import xyz.nuark.mcmod.effectivemekanisms.network.FluidFilterSyncPacket +import xyz.nuark.mcmod.effectivemekanisms.screen.FluidFilterScreen + +@Mod(EffMeks.ID) +@EventBusSubscriber +object EffMeks { + const val ID = "effmeks" + + val LOGGER: Logger = LogManager.getLogger(ID) + + init { + LOGGER.log(Level.INFO, "Hello world!") + + ModBlocks.REGISTRY.register(MOD_BUS) + ModBlockEntities.REGISTRY.register(MOD_BUS) + ModItems.REGISTRY.register(MOD_BUS) + ModMenuTypes.register(MOD_BUS) + + + val obj = runForDist( + clientTarget = { + MOD_BUS.addListener(::onClientSetup) + Minecraft.getInstance() + }, + serverTarget = { + MOD_BUS.addListener(::onServerSetup) + "test" + }) + + println(obj) + } + + private fun onClientSetup(event: FMLClientSetupEvent) { + LOGGER.log(Level.INFO, "Initializing client...") + } + + private fun onServerSetup(event: FMLDedicatedServerSetupEvent) { + LOGGER.log(Level.INFO, "Server starting...") + } + + @SubscribeEvent + fun buildContents(event: BuildCreativeModeTabContentsEvent) { + if (event.tabKey === CreativeModeTabs.FUNCTIONAL_BLOCKS) { + event.accept(ModItems.FLUID_FILTER_BLOCK.get()) + } + } + + @SubscribeEvent + fun registerScreens(event: RegisterMenuScreensEvent) { + event.register(ModMenuTypes.FLUID_FILTER.get(), ::FluidFilterScreen) + } + + @SubscribeEvent + fun registerPayloads(event: RegisterPayloadHandlersEvent) { + event.registrar(ID).playToServer( + FluidFilterOverclockPacket.TYPE, + FluidFilterOverclockPacket.STREAM_CODEC, + FluidFilterOverclockPacket::handle + ) + + event.registrar(ID).playToClient( + FluidFilterSyncPacket.TYPE, + FluidFilterSyncPacket.STREAM_CODEC, + FluidFilterSyncPacket::handle + ) + } + + @SubscribeEvent + fun gatherData(event: GatherDataEvent) { + val existingFileHelper = event.existingFileHelper + val generator = event.generator + val output = generator.packOutput + val lookupProvider = event.lookupProvider + + generator.addProvider( + event.includeClient(), + ModItemModelProvider(output, existingFileHelper) + ) + ModLanguageProviders.provideProviders(generator, event.includeClient()) + generator.addProvider( + event.includeServer(), + ModRecipeProvider(output, lookupProvider) + ) + } + + fun resource(name: String): ResourceLocation = ResourceLocation.fromNamespaceAndPath(ID, name) +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/block/FluidFilterBlock.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/block/FluidFilterBlock.kt new file mode 100644 index 0000000..9282881 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/block/FluidFilterBlock.kt @@ -0,0 +1,72 @@ +package xyz.nuark.mcmod.effectivemekanisms.block + +import com.mojang.serialization.MapCodec +import net.minecraft.core.BlockPos +import net.minecraft.server.level.ServerPlayer +import net.minecraft.world.InteractionResult +import net.minecraft.world.entity.player.Player +import net.minecraft.world.level.BlockGetter +import net.minecraft.world.level.Level +import net.minecraft.world.level.block.BaseEntityBlock +import net.minecraft.world.level.block.RenderShape +import net.minecraft.world.level.block.entity.BlockEntity +import net.minecraft.world.level.block.entity.BlockEntityTicker +import net.minecraft.world.level.block.entity.BlockEntityType +import net.minecraft.world.level.block.state.BlockState +import net.minecraft.world.phys.BlockHitResult +import net.minecraft.world.phys.shapes.CollisionContext +import net.minecraft.world.phys.shapes.Shapes +import net.minecraft.world.phys.shapes.VoxelShape +import xyz.nuark.mcmod.effectivemekanisms.blockentity.FluidFilterBlockEntity +import xyz.nuark.mcmod.effectivemekanisms.blockentity.ModBlockEntities +import java.util.stream.Stream + +class FluidFilterBlock(properties: Properties) : BaseEntityBlock(properties) { + override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity = + FluidFilterBlockEntity(pos, state) + + override fun codec(): MapCodec = simpleCodec(::FluidFilterBlock) + + override fun getRenderShape(state: BlockState): RenderShape = RenderShape.MODEL + + override fun useWithoutItem( + state: BlockState, + level: Level, + pos: BlockPos, + player: Player, + hitResult: BlockHitResult + ): InteractionResult { + if (level.isClientSide) return InteractionResult.SUCCESS + val be = level.getBlockEntity(pos) as? FluidFilterBlockEntity + ?: return InteractionResult.PASS + if (player is ServerPlayer) { + player.openMenu(be) { buf -> buf.writeBlockPos(pos) } + } + return InteractionResult.CONSUME + } + + override fun getTicker( + level: Level, state: BlockState, type: BlockEntityType + ): BlockEntityTicker? = + createTickerHelper(type, ModBlockEntities.FLUID_FILTER.get(), FluidFilterBlockEntity::tick) + + override fun getShape( + state: BlockState, level: BlockGetter, pos: BlockPos, context: CollisionContext + ): VoxelShape = SHAPE + + override fun getCollisionShape( + state: BlockState, level: BlockGetter, pos: BlockPos, context: CollisionContext + ): VoxelShape = SHAPE + + companion object { + val SHAPE: VoxelShape = Stream.of( + box(2.0, 2.0, 2.0, 14.0, 14.0, 14.0), + box(4.0, 14.0, 4.0, 12.0, 16.0, 12.0), + box(3.0, 0.0, 3.0, 13.0, 2.0, 13.0), + box(14.0, 5.0, 5.0, 16.0, 11.0, 11.0), + box(5.0, 5.0, 0.0, 11.0, 11.0, 2.0), + box(0.0, 5.0, 5.0, 2.0, 11.0, 11.0), + box(5.0, 5.0, 14.0, 11.0, 11.0, 16.0) + ).reduce { v1, v2 -> Shapes.or(v1, v2) }.get() + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/block/ModBlocks.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/block/ModBlocks.kt new file mode 100644 index 0000000..e7b2048 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/block/ModBlocks.kt @@ -0,0 +1,17 @@ +package xyz.nuark.mcmod.effectivemekanisms.block + +import xyz.nuark.mcmod.effectivemekanisms.EffMeks +import net.minecraft.world.level.block.Blocks +import net.minecraft.world.level.block.state.BlockBehaviour +import net.neoforged.neoforge.registries.DeferredBlock +import net.neoforged.neoforge.registries.DeferredRegister + +import thedarkcolour.kotlinforforge.neoforge.forge.getValue + +object ModBlocks { + val REGISTRY = DeferredRegister.createBlocks(EffMeks.ID) + + val FLUID_FILTER: DeferredBlock = REGISTRY.register("fluid_filter") { -> + FluidFilterBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK)) + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/blockentity/FluidFilterBlockEntity.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/blockentity/FluidFilterBlockEntity.kt new file mode 100644 index 0000000..9d9b06f --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/blockentity/FluidFilterBlockEntity.kt @@ -0,0 +1,159 @@ +package xyz.nuark.mcmod.effectivemekanisms.blockentity + +import net.minecraft.core.BlockPos +import net.minecraft.core.HolderLookup +import net.minecraft.nbt.CompoundTag +import net.minecraft.network.chat.Component +import net.minecraft.world.MenuProvider +import net.minecraft.world.entity.player.Inventory +import net.minecraft.world.entity.player.Player +import net.minecraft.world.inventory.AbstractContainerMenu +import net.minecraft.world.inventory.ContainerData +import net.minecraft.world.level.Level +import net.minecraft.world.level.block.entity.BlockEntity +import net.minecraft.world.level.block.state.BlockState +import net.neoforged.neoforge.energy.EnergyStorage +import net.neoforged.neoforge.fluids.FluidStack +import net.neoforged.neoforge.fluids.capability.IFluidHandler +import net.neoforged.neoforge.fluids.capability.templates.FluidTank +import xyz.nuark.mcmod.effectivemekanisms.menu.FluidFilterMenu +import xyz.nuark.mcmod.effectivemekanisms.utils.FilterFluidConversion +import kotlin.math.pow +import kotlin.math.roundToInt + +class FluidFilterBlockEntity(pos: BlockPos, state: BlockState) : + BlockEntity(ModBlockEntities.FLUID_FILTER.get(), pos, state), MenuProvider { + + var ticksUntilOperation = TICKS_PER_OPERATION + + var overclockTier: Int = 0 + set(value) { + field = value.coerceIn(0, MAX_OVERCLOCK_TIER) + setChanged() + } + + val overclockMultiplier: Int + get() = 1 shl overclockTier + + val energyCostMultiplier: Double + get() = 2.5.pow(overclockTier.toDouble()) + + val energyUsageThisTick: Int + get() = (ENERGY_USAGE_PER_TICK * energyCostMultiplier).roundToInt() + + val energyStorage = object : EnergyStorage(ENERGY_CAPACITY) { + override fun receiveEnergy(maxReceive: Int, simulate: Boolean): Int { + val received = super.receiveEnergy(maxReceive, simulate) + if (received > 0 && !simulate) setChanged() + return received + } + } + + val inputTank = object : FluidTank(FLUID_CAPACITY, { fluidStack -> + FilterFluidConversion.filterConversions.any { fluidStack.`is`(it.from) } + }) { + override fun onContentsChanged() { + setChanged() + } + } + + val outputTank = object : FluidTank(FLUID_CAPACITY, { fluidStack -> + FilterFluidConversion.filterConversions.any { fluidStack.`is`(it.to) } + }) { + override fun onContentsChanged() { + setChanged() + } + } + + private fun processConversion(): Boolean { + val conversion = canProcess(inputTank.fluid) ?: return false + + energyStorage.extractEnergy(energyUsageThisTick, false) + inputTank.drain(conversion.consume, IFluidHandler.FluidAction.EXECUTE) + outputTank.fill(FluidStack(conversion.to, conversion.produce), IFluidHandler.FluidAction.EXECUTE) + setChanged() + return true + } + + private fun canProcess(input: FluidStack): FilterFluidConversion.ConversionRate? { + if (energyStorage.energyStored < energyUsageThisTick) return null + + val base = FilterFluidConversion.filterConversions + .firstOrNull { input.`is`(it.from) } ?: return null + + val mult = overclockMultiplier + val conversion = FilterFluidConversion.ConversionRate( + base.from, base.to, + base.consume * TICKS_PER_OPERATION * mult, + base.produce * TICKS_PER_OPERATION * mult + ) + + if (inputTank.fluidAmount < conversion.consume) return null + + val outputTarget = FluidStack(conversion.to, conversion.produce) + if (outputTank.fill(outputTarget, IFluidHandler.FluidAction.SIMULATE) == 0) return null + if (outputTank.space < conversion.produce) return null + + return conversion + } + + override fun getDisplayName(): Component = + Component.translatable("block.effectivemekanisms.fluid_filter") + + override fun createMenu(containerId: Int, playerInventory: Inventory, player: Player): AbstractContainerMenu = + FluidFilterMenu(containerId, playerInventory, this, buildContainerData()) + + private fun buildContainerData() = object : ContainerData { + override fun get(index: Int): Int = when (index) { + FluidFilterMenu.SLOT_ENERGY -> energyStorage.energyStored + FluidFilterMenu.SLOT_ENERGY_MAX -> energyStorage.maxEnergyStored + FluidFilterMenu.SLOT_INPUT_FLUID -> inputTank.fluidAmount + FluidFilterMenu.SLOT_OUTPUT_FLUID -> outputTank.fluidAmount + FluidFilterMenu.SLOT_FLUID_CAP -> FLUID_CAPACITY + FluidFilterMenu.SLOT_OVERCLOCK -> overclockTier + FluidFilterMenu.SLOT_PROGRESS -> ticksUntilOperation + else -> 0 + } + + override fun set(index: Int, value: Int) { + // Client can only update overclock tier, so only that handled here + if (index == FluidFilterMenu.SLOT_OVERCLOCK) overclockTier = value + } + + override fun getCount() = FluidFilterMenu.DATA_SLOT_COUNT + } + + override fun saveAdditional(tag: CompoundTag, registries: HolderLookup.Provider) { + super.saveAdditional(tag, registries) + tag.put("Energy", energyStorage.serializeNBT(registries)) + tag.put("InputTank", inputTank.writeToNBT(registries, CompoundTag())) + tag.put("OutputTank", outputTank.writeToNBT(registries, CompoundTag())) + tag.putInt("OverclockTier", overclockTier) + } + + override fun loadAdditional(tag: CompoundTag, registries: HolderLookup.Provider) { + super.loadAdditional(tag, registries) + energyStorage.deserializeNBT(registries, tag.get("Energy")!!) + inputTank.readFromNBT(registries, tag.getCompound("InputTank")) + outputTank.readFromNBT(registries, tag.getCompound("OutputTank")) + overclockTier = tag.getInt("OverclockTier") + } + + companion object { + const val ENERGY_CAPACITY = 1_000_000_000 + const val FLUID_CAPACITY = 400_000_000 + const val ENERGY_USAGE_PER_TICK = 2_000 + const val TICKS_PER_OPERATION = 20 + + const val MAX_OVERCLOCK_TIER = 12 + + fun tick(level: Level, pos: BlockPos, state: BlockState, be: FluidFilterBlockEntity) { + if (level.isClientSide) return + if (be.ticksUntilOperation > 0) { + be.ticksUntilOperation--; return + } + be.ticksUntilOperation = TICKS_PER_OPERATION + be.processConversion() + } + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/blockentity/ModBlockEntities.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/blockentity/ModBlockEntities.kt new file mode 100644 index 0000000..07e170b --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/blockentity/ModBlockEntities.kt @@ -0,0 +1,18 @@ +package xyz.nuark.mcmod.effectivemekanisms.blockentity + +import net.minecraft.core.registries.BuiltInRegistries +import net.minecraft.world.level.block.entity.BlockEntityType +import net.neoforged.neoforge.registries.DeferredHolder +import net.neoforged.neoforge.registries.DeferredRegister +import xyz.nuark.mcmod.effectivemekanisms.EffMeks +import xyz.nuark.mcmod.effectivemekanisms.block.ModBlocks + +import thedarkcolour.kotlinforforge.neoforge.forge.getValue + +object ModBlockEntities { + val REGISTRY = DeferredRegister.create(BuiltInRegistries.BLOCK_ENTITY_TYPE, EffMeks.ID) + + val FLUID_FILTER: DeferredHolder, BlockEntityType> = REGISTRY.register("fluid_filter") { -> + BlockEntityType.Builder.of(::FluidFilterBlockEntity, ModBlocks.FLUID_FILTER.get()).build(null) + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/capabilities/ModCapabilities.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/capabilities/ModCapabilities.kt new file mode 100644 index 0000000..6f89375 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/capabilities/ModCapabilities.kt @@ -0,0 +1,34 @@ +package xyz.nuark.mcmod.effectivemekanisms.capabilities + +import net.minecraft.core.Direction +import net.neoforged.bus.api.SubscribeEvent +import net.neoforged.fml.common.EventBusSubscriber +import net.neoforged.neoforge.capabilities.Capabilities +import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent +import xyz.nuark.mcmod.effectivemekanisms.blockentity.ModBlockEntities + +@EventBusSubscriber +object ModCapabilities { + @SubscribeEvent + fun registerCapabilities(event: RegisterCapabilitiesEvent) { + ModBlockEntities.FLUID_FILTER.get().let { + event.registerBlockEntity( + Capabilities.EnergyStorage.BLOCK, + it + ) { blockEntity, direction -> + blockEntity.energyStorage + } + + event.registerBlockEntity( + Capabilities.FluidHandler.BLOCK, + it + ) { blockEntity, direction -> + when (direction) { + Direction.DOWN -> blockEntity.outputTank + Direction.UP -> blockEntity.inputTank + else -> blockEntity.inputTank + } + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModItemModelProvider.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModItemModelProvider.kt new file mode 100644 index 0000000..3874f21 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModItemModelProvider.kt @@ -0,0 +1,13 @@ +package xyz.nuark.mcmod.effectivemekanisms.datagen + +import net.minecraft.data.PackOutput +import net.neoforged.neoforge.client.model.generators.ItemModelProvider +import net.neoforged.neoforge.common.data.ExistingFileHelper +import xyz.nuark.mcmod.effectivemekanisms.EffMeks +import xyz.nuark.mcmod.effectivemekanisms.block.ModBlocks + +class ModItemModelProvider(output: PackOutput, existingFileHelper: ExistingFileHelper) : ItemModelProvider(output, EffMeks.ID, existingFileHelper) { + override fun registerModels() { + simpleBlockItem(ModBlocks.FLUID_FILTER.get()) + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModLanguageProviders.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModLanguageProviders.kt new file mode 100644 index 0000000..6842745 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModLanguageProviders.kt @@ -0,0 +1,32 @@ +package xyz.nuark.mcmod.effectivemekanisms.datagen + +import net.minecraft.data.DataGenerator +import net.minecraft.data.PackOutput +import net.neoforged.neoforge.common.data.LanguageProvider +import xyz.nuark.mcmod.effectivemekanisms.EffMeks +import xyz.nuark.mcmod.effectivemekanisms.item.ModItems + +object ModLanguageProviders { + class ModRuRuLanguageProvider(output: PackOutput) : LanguageProvider(output, EffMeks.ID, "ru_ru") { + override fun addTranslations() { + add(ModItems.FLUID_FILTER_BLOCK.get(), "Жидкостный фильтр") + add("tooltip.fluid.empty", "Пусто") + add("tooltip.fluid.amount.format", "%s / %s мБ ") + add("tooltip.machine.overclock.tier", "Уровень разгона: %s") + } + } + + class ModEnUsLanguageProvider(output: PackOutput) : LanguageProvider(output, EffMeks.ID, "en_us") { + override fun addTranslations() { + add(ModItems.FLUID_FILTER_BLOCK.get(), "Fluid filter") + add("tooltip.fluid.empty", "Empty") + add("tooltip.fluid.amount.format", "%s / %s mB of ") + add("tooltip.machine.overclock.tier", "Overclock tier: %s") + } + } + + fun provideProviders(generator: DataGenerator, shouldRun: Boolean) { + generator.addProvider(shouldRun, ModRuRuLanguageProvider(generator.packOutput)) + generator.addProvider(shouldRun, ModEnUsLanguageProvider(generator.packOutput)) + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModRecipeProvider.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModRecipeProvider.kt new file mode 100644 index 0000000..f21644e --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/datagen/ModRecipeProvider.kt @@ -0,0 +1,28 @@ +package xyz.nuark.mcmod.effectivemekanisms.datagen + +import mekanism.common.registries.MekanismBlocks +import mekanism.common.registries.MekanismItems +import net.minecraft.core.HolderLookup +import net.minecraft.data.PackOutput +import net.minecraft.data.recipes.RecipeCategory +import net.minecraft.data.recipes.RecipeOutput +import net.minecraft.data.recipes.RecipeProvider +import net.minecraft.data.recipes.ShapedRecipeBuilder +import xyz.nuark.mcmod.effectivemekanisms.EffMeks +import xyz.nuark.mcmod.effectivemekanisms.item.ModItems +import java.util.concurrent.CompletableFuture + +class ModRecipeProvider(output: PackOutput, registries: CompletableFuture) : RecipeProvider(output, registries) { + override fun buildRecipes(recipeOutput: RecipeOutput) { + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.FLUID_FILTER_BLOCK.get()) + .pattern("CTC") + .pattern("FPF") + .pattern("CTC") + .define('T', MekanismBlocks.ULTIMATE_FLUID_TANK) + .define('P', MekanismBlocks.ELECTRIC_PUMP) + .define('F', MekanismItems.FILTER_UPGRADE) + .define('C', MekanismItems.ULTIMATE_CONTROL_CIRCUIT) + .unlockedBy("has_iron_block", has(MekanismBlocks.ELECTRIC_PUMP)) + .save(recipeOutput, EffMeks.resource("rec_fct1")) + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/item/ModItems.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/item/ModItems.kt new file mode 100644 index 0000000..bda095d --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/item/ModItems.kt @@ -0,0 +1,13 @@ +package xyz.nuark.mcmod.effectivemekanisms.item + +import net.minecraft.world.item.BlockItem +import net.neoforged.neoforge.registries.DeferredItem +import net.neoforged.neoforge.registries.DeferredRegister +import xyz.nuark.mcmod.effectivemekanisms.EffMeks +import xyz.nuark.mcmod.effectivemekanisms.block.ModBlocks + +object ModItems { + val REGISTRY = DeferredRegister.createItems(EffMeks.ID) + + val FLUID_FILTER_BLOCK: DeferredItem = REGISTRY.registerSimpleBlockItem(ModBlocks.FLUID_FILTER) +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/menu/FluidFilterMenu.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/menu/FluidFilterMenu.kt new file mode 100644 index 0000000..ede34cb --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/menu/FluidFilterMenu.kt @@ -0,0 +1,112 @@ +package xyz.nuark.mcmod.effectivemekanisms.menu + +import net.minecraft.network.FriendlyByteBuf +import net.minecraft.server.level.ServerPlayer +import net.minecraft.world.entity.player.Inventory +import net.minecraft.world.entity.player.Player +import net.minecraft.world.inventory.AbstractContainerMenu +import net.minecraft.world.inventory.ContainerData +import net.minecraft.world.inventory.SimpleContainerData +import net.minecraft.world.item.ItemStack +import net.neoforged.neoforge.fluids.FluidStack +import net.neoforged.neoforge.network.PacketDistributor +import xyz.nuark.mcmod.effectivemekanisms.blockentity.FluidFilterBlockEntity +import xyz.nuark.mcmod.effectivemekanisms.network.FluidFilterSyncPacket + +class FluidFilterMenu( + containerId: Int, + private val inventory: Inventory, + val blockEntity: FluidFilterBlockEntity, + private val data: ContainerData +) : AbstractContainerMenu(ModMenuTypes.FLUID_FILTER.get(), containerId) { + + constructor(containerId: Int, inventory: Inventory, extraData: FriendlyByteBuf) : this( + containerId, + inventory, + inventory.player.level().getBlockEntity(extraData.readBlockPos()) as FluidFilterBlockEntity, + SimpleContainerData(DATA_SLOT_COUNT) + ) + + init { + checkContainerDataCount(data, DATA_SLOT_COUNT) + addDataSlots(data) + } + + companion object { + const val DATA_SLOT_COUNT = 11 + + const val SLOT_ENERGY = 0 // energyStored + const val SLOT_ENERGY_MAX = 1 // maxEnergy + const val SLOT_INPUT_FLUID = 2 // inputAmount + const val SLOT_OUTPUT_FLUID = 3 // outputAmount + const val SLOT_FLUID_CAP = 4 // fluidCapacity + const val SLOT_OVERCLOCK = 5 // overclock tier + const val SLOT_PROGRESS = 6 // overclock tier + } + + val energyStored: Int get() = data.get(SLOT_ENERGY) + val energyCapacity: Int get() = data.get(SLOT_ENERGY_MAX) + val inputFluidAmount: Int get() = data.get(SLOT_INPUT_FLUID) + val outputFluidAmount: Int get() = data.get(SLOT_OUTPUT_FLUID) + val fluidCapacity: Int get() = data.get(SLOT_FLUID_CAP) + val overclockTier: Int get() = data.get(SLOT_OVERCLOCK) + val ticksUntilOperation: Int get() = data.get(SLOT_PROGRESS) + + val inputFluidStack get() = blockEntity.inputTank.fluid + val outputFluidStack get() = blockEntity.outputTank.fluid + + private var lastInputFluid: FluidStack = FluidStack.EMPTY + private var lastOutputFluid: FluidStack = FluidStack.EMPTY + + val processingProgress: Float + get() { + val total = FluidFilterBlockEntity.TICKS_PER_OPERATION + val remaining = ticksUntilOperation.coerceIn(0, total) + return 1f - remaining.toFloat() / total.toFloat() + } + + override fun broadcastChanges() { + if (blockEntity.level?.isClientSide == false) { + data.set(SLOT_ENERGY, blockEntity.energyStorage.energyStored) + data.set(SLOT_ENERGY_MAX, blockEntity.energyStorage.maxEnergyStored) + data.set(SLOT_INPUT_FLUID, blockEntity.inputTank.fluidAmount) + data.set(SLOT_OUTPUT_FLUID, blockEntity.outputTank.fluidAmount) + data.set(SLOT_FLUID_CAP, FluidFilterBlockEntity.FLUID_CAPACITY) + data.set(SLOT_OVERCLOCK, blockEntity.overclockTier) + data.set(SLOT_PROGRESS, blockEntity.ticksUntilOperation) + + val input = blockEntity.inputTank.fluid + val output = blockEntity.outputTank.fluid + if (!FluidStack.isSameFluidSameComponents(input, lastInputFluid) || + !FluidStack.isSameFluidSameComponents(output, lastOutputFluid) + ) { + lastInputFluid = input.copy() + lastOutputFluid = output.copy() + + PacketDistributor.sendToPlayer( + inventory.player as ServerPlayer, + FluidFilterSyncPacket(blockEntity.blockPos, input, output) + ) + } + } + super.broadcastChanges() + } + + override fun quickMoveStack( + p0: Player, + p1: Int + ): ItemStack = ItemStack.EMPTY // We are not moving any items + + + fun setOverclockTier(tier: Int) { + blockEntity.overclockTier = tier.coerceIn(0, FluidFilterBlockEntity.MAX_OVERCLOCK_TIER) + blockEntity.setChanged() + } + + override fun stillValid(player: Player): Boolean = + player.distanceToSqr( + blockEntity.blockPos.x + 0.5, + blockEntity.blockPos.y + 0.5, + blockEntity.blockPos.z + 0.5 + ) < 64.0 +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/menu/ModMenuTypes.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/menu/ModMenuTypes.kt new file mode 100644 index 0000000..9ceee66 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/menu/ModMenuTypes.kt @@ -0,0 +1,20 @@ +package xyz.nuark.mcmod.effectivemekanisms.menu + +import net.minecraft.core.registries.Registries +import net.minecraft.world.inventory.MenuType +import net.neoforged.bus.api.IEventBus +import net.neoforged.neoforge.common.extensions.IMenuTypeExtension +import net.neoforged.neoforge.registries.DeferredHolder +import net.neoforged.neoforge.registries.DeferredRegister +import xyz.nuark.mcmod.effectivemekanisms.EffMeks + +object ModMenuTypes { + private val MENU_TYPES: DeferredRegister> = + DeferredRegister.create(Registries.MENU, EffMeks.ID) + + val FLUID_FILTER: DeferredHolder, MenuType> = MENU_TYPES.register("fluid_filter") { -> + IMenuTypeExtension.create(::FluidFilterMenu) + } + + fun register(eventBus: IEventBus) = MENU_TYPES.register(eventBus) +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/network/FluidFilterOverclockPacket.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/network/FluidFilterOverclockPacket.kt new file mode 100644 index 0000000..f713ca3 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/network/FluidFilterOverclockPacket.kt @@ -0,0 +1,35 @@ +package xyz.nuark.mcmod.effectivemekanisms.network + +import net.minecraft.network.FriendlyByteBuf +import net.minecraft.network.codec.StreamCodec +import net.minecraft.network.protocol.common.custom.CustomPacketPayload +import net.minecraft.resources.ResourceLocation +import net.minecraft.server.level.ServerPlayer +import net.neoforged.neoforge.network.handling.IPayloadContext +import xyz.nuark.mcmod.effectivemekanisms.EffMeks +import xyz.nuark.mcmod.effectivemekanisms.menu.FluidFilterMenu + +data class FluidFilterOverclockPacket(val tier: Int) : CustomPacketPayload { + + override fun type(): CustomPacketPayload.Type = TYPE + + companion object { + val TYPE = CustomPacketPayload.Type( + ResourceLocation.fromNamespaceAndPath(EffMeks.ID, "fluid_filter_overclock") + ) + + val STREAM_CODEC: StreamCodec = + StreamCodec.of( + { buf, pkt -> buf.writeVarInt(pkt.tier) }, + { buf -> FluidFilterOverclockPacket(buf.readVarInt()) } + ) + + fun handle(packet: FluidFilterOverclockPacket, context: IPayloadContext) { + context.enqueueWork { + val player = context.player() as? ServerPlayer ?: return@enqueueWork + val menu = player.containerMenu as? FluidFilterMenu ?: return@enqueueWork + menu.setOverclockTier(packet.tier) + } + } + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/network/FluidFilterSyncPacket.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/network/FluidFilterSyncPacket.kt new file mode 100644 index 0000000..d6b8d03 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/network/FluidFilterSyncPacket.kt @@ -0,0 +1,44 @@ +package xyz.nuark.mcmod.effectivemekanisms.network + +import net.minecraft.client.Minecraft +import net.minecraft.core.BlockPos +import net.minecraft.network.RegistryFriendlyByteBuf +import net.minecraft.network.codec.StreamCodec +import net.minecraft.network.protocol.common.custom.CustomPacketPayload +import net.minecraft.resources.ResourceLocation +import net.neoforged.neoforge.fluids.FluidStack +import net.neoforged.neoforge.network.handling.IPayloadContext +import xyz.nuark.mcmod.effectivemekanisms.EffMeks +import xyz.nuark.mcmod.effectivemekanisms.blockentity.FluidFilterBlockEntity + +class FluidFilterSyncPacket( + val pos: BlockPos, + val inputFluid: FluidStack, + val outputFluid: FluidStack +) : CustomPacketPayload { + + override fun type(): CustomPacketPayload.Type = TYPE + + companion object { + val TYPE = CustomPacketPayload.Type( + ResourceLocation.fromNamespaceAndPath(EffMeks.ID, "fluid_filter_sync") + ) + + val STREAM_CODEC: StreamCodec = + StreamCodec.composite( + BlockPos.STREAM_CODEC, FluidFilterSyncPacket::pos, + FluidStack.STREAM_CODEC, FluidFilterSyncPacket::inputFluid, + FluidStack.STREAM_CODEC, FluidFilterSyncPacket::outputFluid, + ::FluidFilterSyncPacket + ) + + fun handle(packet: FluidFilterSyncPacket, context: IPayloadContext) { + context.enqueueWork { + val level = Minecraft.getInstance().level ?: return@enqueueWork + val be = level.getBlockEntity(packet.pos) as? FluidFilterBlockEntity ?: return@enqueueWork + be.inputTank.fluid = packet.inputFluid + be.outputTank.fluid = packet.outputFluid + } + } + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/screen/FluidFilterScreen.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/screen/FluidFilterScreen.kt new file mode 100644 index 0000000..3ad8c5a --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/screen/FluidFilterScreen.kt @@ -0,0 +1,336 @@ +package xyz.nuark.mcmod.effectivemekanisms.screen + +import net.minecraft.client.gui.GuiGraphics +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen +import net.minecraft.network.chat.Component +import net.minecraft.resources.ResourceLocation +import net.minecraft.world.entity.player.Inventory +import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions +import net.neoforged.neoforge.fluids.FluidStack +import net.neoforged.neoforge.network.PacketDistributor +import xyz.nuark.mcmod.effectivemekanisms.EffMeks +import xyz.nuark.mcmod.effectivemekanisms.menu.FluidFilterMenu +import xyz.nuark.mcmod.effectivemekanisms.network.FluidFilterOverclockPacket +import kotlin.math.pow +import kotlin.math.roundToInt + +class FluidFilterScreen( + menu: FluidFilterMenu, + inventory: Inventory, + @Suppress("unused") title: Component +) : AbstractContainerScreen(menu, inventory, Component.translatable("block.effmeks.fluid_filter")) { + companion object { + val GUI_TEXTURE: ResourceLocation = ResourceLocation.fromNamespaceAndPath( + EffMeks.ID, "textures/gui/fluid_filter.png" + ) + + const val BG_WIDTH = 195 + const val BG_HEIGHT = 159 + + const val ROW1_Y = 27 // top of all main-row widgets + + // Energy bar + const val ENERGY_X = 7 + const val ENERGY_W = 12 + const val ENERGY_H = 80 + + // Input tank + const val INPUT_X = 28 + const val TANK_W = 32 + const val TANK_H = 80 + + // Progress arrow (centred between tanks) + const val ARROW_X = 70 + const val ARROW_Y = ROW1_Y + (TANK_H - 16) / 2 // vertically centred + const val ARROW_W = 24 + const val ARROW_H = 16 + + // Output tank + const val OUTPUT_X = 104 + + // Overclock row + const val OC_LABEL_Y = 122 + const val OC_Y = 132 + const val OC_GAP = 8 + const val OC_START_X = 8 + + const val TIER_COUNT = 12 + + const val COL_PANEL_BORDER = 0xFF45475A.toInt() + const val COL_TANK_EMPTY = 0xFF11111B.toInt() + const val COL_ARROW_EMPTY = 0xFF313244.toInt() + const val COL_ARROW_FILL = 0xFF89DCEB.toInt() + const val COL_TEXT = 0xFFCDD6F4.toInt() + const val COL_TEXT_DIM = 0xFF6C7086.toInt() + const val COL_SEPARATOR = 0xFF45475A.toInt() + } + + private var hoveredOcBtn = -1 + + override fun init() { + super.init() + imageWidth = BG_WIDTH + imageHeight = BG_HEIGHT + titleLabelX = BG_WIDTH / 2 + titleLabelY = 6 + } + + override fun render(graphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) { + renderBackground(graphics, mouseX, mouseY, partialTick) + super.render(graphics, mouseX, mouseY, partialTick) + renderTooltip(graphics, mouseX, mouseY) + } + + override fun renderBg(graphics: GuiGraphics, partialTick: Float, mouseX: Int, mouseY: Int) { + val x = leftPos + val y = topPos + + drawBackground(graphics, x, y) + + graphics.drawString(font, "En.", x + ENERGY_X, y + ROW1_Y - 9, COL_TEXT_DIM, false) + graphics.drawString(font, "Input", x + INPUT_X, y + ROW1_Y - 9, COL_TEXT_DIM, false) + graphics.drawString(font, "Output", x + OUTPUT_X, y + ROW1_Y - 9, COL_TEXT_DIM, false) + + drawEnergyBar(graphics, x + ENERGY_X, y + ROW1_Y, menu.energyStored, menu.energyCapacity) + + drawFluidTank( + graphics, + x + INPUT_X, + y + ROW1_Y, + menu.inputFluidAmount, + menu.fluidCapacity, + menu.inputFluidStack + ) + + drawProgressArrow(graphics, x + ARROW_X, y + ARROW_Y, menu.processingProgress) + + drawFluidTank( + graphics, + x + OUTPUT_X, + y + ROW1_Y, + menu.outputFluidAmount, + menu.fluidCapacity, + menu.outputFluidStack + ) + + graphics.fill(x + 4, y + OC_LABEL_Y - 4, x + BG_WIDTH - 4, y + OC_LABEL_Y - 3, COL_SEPARATOR) + + graphics.drawString(font, "Overclock", x + OC_START_X, y + OC_LABEL_Y, COL_TEXT_DIM, false) + for (i in 0 until TIER_COUNT) { + val bx = x + OC_START_X + i * (OC_GAP + 8) + val by = y + OC_Y + 5 + + val isActive = i == menu.overclockTier + val hovered = i == hoveredOcBtn + + SliderSectorButton.draw( + graphics, bx, by, isActive, hovered + ) + } + + val tier = menu.overclockTier + val outMult = 1 shl tier + val eMult = energyCostMultiplier(tier) + val statsLine = "I/O ×$outMult | Energy ×${String.format("%.1f", eMult)}" + graphics.drawString(font, statsLine, x + OC_START_X, y + OC_Y + 13, COL_TEXT_DIM, false) + } + + override fun renderTooltip(graphics: GuiGraphics, mouseX: Int, mouseY: Int) { + val x = leftPos + val y = topPos + + // Energy bar + if (isHovering(ENERGY_X, ROW1_Y, ENERGY_W, ENERGY_H, mouseX.toDouble(), mouseY.toDouble())) { + graphics.renderTooltip( + font, Component.literal( + "${fmtLarge(menu.energyStored)} / ${fmtLarge(menu.energyCapacity)} FE" + ), mouseX, mouseY + ) + return + } + + // Input tank + if (isHovering(INPUT_X, ROW1_Y, TANK_W, TANK_H, mouseX.toDouble(), mouseY.toDouble())) { + val fs = menu.inputFluidStack + val name = if (fs.isEmpty) Component.translatable("tooltip.fluid.empty") else fs.hoverName + graphics.renderTooltip( + font, Component.translatable( + "tooltip.fluid.amount.format", fmtLarge(menu.inputFluidAmount), fmtLarge(menu.fluidCapacity) + ).append(name), mouseX, mouseY + ) + return + } + + // Output tank + if (isHovering(OUTPUT_X, ROW1_Y, TANK_W, TANK_H, mouseX.toDouble(), mouseY.toDouble())) { + val fs = menu.outputFluidStack + val name = if (fs.isEmpty) Component.translatable("tooltip.fluid.empty") else fs.hoverName + graphics.renderTooltip( + font, Component.translatable( + "tooltip.fluid.amount.format", fmtLarge(menu.outputFluidAmount), fmtLarge(menu.fluidCapacity) + ).append(name), mouseX, mouseY + ) + return + } + + // Overclock buttons + for (i in 0 until TIER_COUNT) { + val bx = OC_START_X + i * (OC_GAP + 8) + val by = OC_Y + 5 + if (isHovering(bx, by, 8, 8, mouseX.toDouble(), mouseY.toDouble())) { + graphics.renderTooltip( + font, + Component.translatable("tooltip.machine.overclock.tier", (i + 1).toString()), + mouseX, + mouseY + ) + return + } + } + } + + override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean { + for (i in 0 until TIER_COUNT) { + val bx = OC_START_X + i * (OC_GAP + 8) + val by = OC_Y + 5 + if (isHovering(bx, by, 8, 8, mouseX, mouseY)) { + PacketDistributor.sendToServer(FluidFilterOverclockPacket(i)) + return true + } + } + return super.mouseClicked(mouseX, mouseY, button) + } + + override fun mouseMoved(mouseX: Double, mouseY: Double) { + hoveredOcBtn = (0 until TIER_COUNT).firstOrNull { i -> + val bx = OC_START_X + i * (OC_GAP + 8) + val by = OC_Y + 5 + isHovering(bx, by, 8, 8, mouseX, mouseY) + } ?: -1 + super.mouseMoved(mouseX, mouseY) + } + + override fun renderLabels(graphics: GuiGraphics, mouseX: Int, mouseY: Int) { + val tw = font.width(title) + graphics.drawString(font, title, (imageWidth - tw) / 2, titleLabelY, COL_TEXT, false) + } + + private fun drawBackground(graphics: GuiGraphics, x: Int, y: Int) { + graphics.blit(GUI_TEXTURE, x, y, 0, 0, BG_WIDTH, BG_HEIGHT) + } + + private fun drawEnergyBar(graphics: GuiGraphics, x: Int, y: Int, stored: Int, capacity: Int) { + val filledH = (ENERGY_H * stored.toLong() / capacity.coerceAtLeast(1)).toInt().coerceIn(0, ENERGY_H) + val srcY = 0 + (ENERGY_H - filledH) + graphics.blit( + GUI_TEXTURE, + x, y + ENERGY_H - filledH, + 195, srcY, + ENERGY_W, filledH + ) + } + + private fun drawFluidTank( + graphics: GuiGraphics, x: Int, y: Int, + amount: Int, capacity: Int, fluid: FluidStack + ) { + graphics.fill(x, y, x + TANK_W, y + TANK_H, COL_TANK_EMPTY) + + // Fluid fill + if (amount > 0 && capacity > 0) { + val colour = getFluidColor(fluid) + val filled = (TANK_H * amount.toLong() / capacity).toInt().coerceIn(0, TANK_H) + graphics.fill(x, y + TANK_H - filled, x + TANK_W, y + TANK_H, colour) + // Highlight shimmer at fill line + graphics.fill(x, y + TANK_H - filled, x + TANK_W, y + TANK_H - filled + 1, 0x55FFFFFF) + } + + border(graphics, x, y, TANK_W, TANK_H, COL_PANEL_BORDER) + + val pct = if (capacity > 0) (amount * 100L / capacity).toInt() else 0 + graphics.drawString(font, "$pct%", x + 4, y + TANK_H + 2, COL_TEXT_DIM, false) + } + + private fun drawProgressArrow(graphics: GuiGraphics, x: Int, y: Int, progress: Float) { + // Empty arrow body + graphics.fill(x, y, x + ARROW_W, y + ARROW_H, COL_ARROW_EMPTY) + + // Filled portion + val filledW = (ARROW_W * progress).roundToInt().coerceIn(0, ARROW_W) + if (filledW > 0) { + graphics.fill(x, y, x + filledW, y + ARROW_H, COL_ARROW_FILL) + } + + border(graphics, x, y, ARROW_W, ARROW_H, COL_PANEL_BORDER) + } + + private fun energyCostMultiplier(tier: Int): Double = 2.5.pow(tier.toDouble()) + + private fun getFluidColor(fluid: FluidStack): Int { + if (fluid.isEmpty) return COL_TANK_EMPTY + return try { + IClientFluidTypeExtensions.of(fluid.fluid).tintColor or 0xFF000000.toInt() + } catch (_: Exception) { + 0xFF3A7CC0.toInt() + } + } + + private fun fmtLarge(v: Int): String = when { + v >= 1_000_000_000 -> "${v / 1_000_000_000}B" + v >= 1_000_000 -> "${v / 1_000_000}M" + v >= 1_000 -> "${v / 1_000}k" + else -> v.toString() + } + + private fun border(graphics: GuiGraphics, x: Int, y: Int, w: Int, h: Int, col: Int) { + graphics.fill(x, y, x + w, y + 1, col) + graphics.fill(x, y + h - 1, x + w, y + h, col) + graphics.fill(x, y + 1, x + 1, y + h - 1, col) + graphics.fill(x + w - 1, y + 1, x + w, y + h - 1, col) + } + + object SliderSectorButton { + private const val NORMAL_U = 207 + private const val NORMAL_V = 0 + private const val NORMAL_SIZE = 4 + + private const val HOVERED_U = 211 + private const val HOVERED_V = 0 + private const val HOVERED_SIZE = 6 + + private const val ACTIVE_U = 217 + private const val ACTIVE_V = 0 + private const val ACTIVE_SIZE = 8 + + fun draw(graphics: GuiGraphics, x: Int, y: Int, selected: Boolean, hovered: Boolean) { + if (selected) { + graphics.blit( + GUI_TEXTURE, + x - ACTIVE_SIZE / 2, y - ACTIVE_SIZE / 2, + ACTIVE_U, ACTIVE_V, + ACTIVE_SIZE, ACTIVE_SIZE + ) + } else if (hovered) { + graphics.blit( + GUI_TEXTURE, + x - HOVERED_SIZE / 2, + y - HOVERED_SIZE / 2, + HOVERED_U, + HOVERED_V, + HOVERED_SIZE, + HOVERED_SIZE + ) + } else { + graphics.blit( + GUI_TEXTURE, + x - NORMAL_SIZE / 2, + y - NORMAL_SIZE / 2, + NORMAL_U, + NORMAL_V, + NORMAL_SIZE, + NORMAL_SIZE + ) + } + } + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/tags/ModTags.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/tags/ModTags.kt new file mode 100644 index 0000000..2f4f147 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/tags/ModTags.kt @@ -0,0 +1,18 @@ +package xyz.nuark.mcmod.effectivemekanisms.tags + +import net.minecraft.resources.ResourceLocation +import net.minecraft.tags.FluidTags +import net.minecraft.tags.TagKey +import net.minecraft.world.level.material.Fluid + + +object ModTags { + object Fluids { + val BRINE = commonTag("brine") + val LITHIUM = commonTag("lithium") + + private fun commonTag(name: String): TagKey { + return FluidTags.create(ResourceLocation.fromNamespaceAndPath("c", name)) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/utils/FilterFluidConversion.kt b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/utils/FilterFluidConversion.kt new file mode 100644 index 0000000..d86b156 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/effectivemekanisms/utils/FilterFluidConversion.kt @@ -0,0 +1,20 @@ +package xyz.nuark.mcmod.effectivemekanisms.utils + +import mekanism.common.registries.MekanismFluids +import net.minecraft.tags.TagKey +import net.minecraft.world.level.material.Fluid +import net.neoforged.neoforge.common.Tags +import net.neoforged.neoforge.fluids.BaseFlowingFluid + +object FilterFluidConversion { + data class ConversionRate( + val from: TagKey, + val to: BaseFlowingFluid.Source, + val consume: Int, + val produce: Int + ) + + val filterConversions = listOf( + ConversionRate(Tags.Fluids.WATER, MekanismFluids.HEAVY_WATER.get(), 6400, 1), // actually, 0.0156%, buuuuut.... + ) +} \ No newline at end of file diff --git a/src/main/resources/assets/effmeks/blockstates/fluid_filter.json b/src/main/resources/assets/effmeks/blockstates/fluid_filter.json new file mode 100644 index 0000000..0c0d0f7 --- /dev/null +++ b/src/main/resources/assets/effmeks/blockstates/fluid_filter.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "effmeks:block/fluid_filter" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/effmeks/models/block/fluid_filter.json b/src/main/resources/assets/effmeks/models/block/fluid_filter.json new file mode 100644 index 0000000..820a76d --- /dev/null +++ b/src/main/resources/assets/effmeks/models/block/fluid_filter.json @@ -0,0 +1,388 @@ +{ + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "0": "effmeks:block/fluid_filter", + "particle": "effmeks:block/fluid_filter" + }, + "elements": [ + { + "name": "body", + "from": [2, 2, 2], + "to": [14, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 2, 2]}, + "faces": { + "north": {"uv": [0, 0, 3, 3], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#0"}, + "up": {"uv": [6, 3, 3, 0], "texture": "#0"}, + "down": {"uv": [6, 0, 3, 3], "texture": "#0"} + } + }, + { + "name": "fluid_in", + "from": [4, 14, 4], + "to": [12, 16, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 4]}, + "faces": { + "north": {"uv": [1.5, 4.5, 3, 5], "texture": "#0"}, + "east": {"uv": [1.5, 5, 3, 5.5], "texture": "#0"}, + "south": {"uv": [1.5, 4.5, 3, 5], "texture": "#0"}, + "west": {"uv": [1.5, 5, 3, 5.5], "texture": "#0"}, + "up": {"uv": [0, 4.5, 1.5, 6], "texture": "#0"}, + "down": {"uv": [0.25, 4.75, 1.25, 5.75], "texture": "#0"} + } + }, + { + "name": "fluid_out", + "from": [3, 0, 3], + "to": [13, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 3]}, + "faces": { + "north": {"uv": [1.5, 8, 3, 8.5], "texture": "#0"}, + "east": {"uv": [1.5, 7.5, 3, 8], "texture": "#0"}, + "south": {"uv": [1.5, 8, 3, 8.5], "texture": "#0"}, + "west": {"uv": [1.5, 7.5, 3, 8], "texture": "#0"}, + "up": {"uv": [3, 3, 6, 6], "texture": "#0"}, + "down": {"uv": [0, 7.5, 1.5, 9], "texture": "#0"} + } + }, + { + "name": "energyIn", + "from": [5, 5, 1], + "to": [11, 11, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 1]}, + "faces": { + "north": {"uv": [0.25, 6.25, 1.25, 7.25], "texture": "#0"}, + "east": {"uv": [1, 6.25, 1.25, 7.25], "texture": "#0"}, + "south": {"uv": [0.25, 6.25, 1.25, 7.25], "texture": "#0"}, + "west": {"uv": [0.25, 6.25, 0.5, 7.25], "texture": "#0"}, + "up": {"uv": [0.25, 6.25, 1.25, 6.5], "texture": "#0"}, + "down": {"uv": [0.25, 7, 1.25, 7.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [5, 5, 0], + "to": [11, 6, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 0]}, + "faces": { + "north": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "east": {"uv": [0, 7.25, 0.25, 7.5], "texture": "#0"}, + "south": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "west": {"uv": [1.25, 7.25, 1.5, 7.5], "texture": "#0"}, + "up": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "down": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [5, 10, 0], + "to": [11, 11, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 10, 0]}, + "faces": { + "north": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "east": {"uv": [0, 6, 0.25, 6.25], "texture": "#0"}, + "south": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "west": {"uv": [1.25, 6, 1.5, 6.25], "texture": "#0"}, + "up": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "down": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [10, 6, 0], + "to": [11, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 6, 0]}, + "faces": { + "north": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "east": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "south": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "west": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "up": {"uv": [0, 7.25, 0.25, 7.5], "texture": "#0"}, + "down": {"uv": [0, 6, 0.25, 6.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [5, 6, 0], + "to": [6, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 6, 0]}, + "faces": { + "north": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "east": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "south": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "west": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "up": {"uv": [1.25, 7.25, 1.5, 7.5], "texture": "#0"}, + "down": {"uv": [1.25, 6, 1.5, 6.25], "texture": "#0"} + } + }, + { + "name": "energyIn", + "from": [5, 5, 14], + "to": [11, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 14]}, + "faces": { + "north": {"uv": [0.25, 6.25, 1.25, 7.25], "texture": "#0"}, + "east": {"uv": [1, 6.25, 1.25, 7.25], "texture": "#0"}, + "south": {"uv": [0.25, 6.25, 1.25, 7.25], "texture": "#0"}, + "west": {"uv": [0.25, 6.25, 0.5, 7.25], "texture": "#0"}, + "up": {"uv": [0.25, 6.25, 1.25, 6.5], "texture": "#0"}, + "down": {"uv": [0.25, 7, 1.25, 7.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [5, 5, 15], + "to": [11, 6, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 15]}, + "faces": { + "north": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "east": {"uv": [0, 7.25, 0.25, 7.5], "texture": "#0"}, + "south": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "west": {"uv": [1.25, 7.25, 1.5, 7.5], "texture": "#0"}, + "up": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "down": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [5, 10, 15], + "to": [11, 11, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 10, 15]}, + "faces": { + "north": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "east": {"uv": [0, 6, 0.25, 6.25], "texture": "#0"}, + "south": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "west": {"uv": [1.25, 6, 1.5, 6.25], "texture": "#0"}, + "up": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "down": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [10, 6, 15], + "to": [11, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 6, 15]}, + "faces": { + "north": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "east": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "south": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "west": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "up": {"uv": [0, 7.25, 0.25, 7.5], "texture": "#0"}, + "down": {"uv": [0, 6, 0.25, 6.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [5, 6, 15], + "to": [6, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 6, 15]}, + "faces": { + "north": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "east": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "south": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "west": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "up": {"uv": [1.25, 7.25, 1.5, 7.5], "texture": "#0"}, + "down": {"uv": [1.25, 6, 1.5, 6.25], "texture": "#0"} + } + }, + { + "name": "energyIn", + "from": [1, 5, 5], + "to": [2, 11, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 5]}, + "faces": { + "north": {"uv": [0.25, 6.25, 0.5, 7.25], "texture": "#0"}, + "east": {"uv": [0.25, 6.25, 1.25, 7.25], "texture": "#0"}, + "south": {"uv": [1, 6.25, 1.25, 7.25], "texture": "#0"}, + "west": {"uv": [0.25, 6.25, 1.25, 7.25], "texture": "#0"}, + "up": {"uv": [0.25, 6.25, 1.25, 6.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0.25, 7, 1.25, 7.25], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 5, 5], + "to": [1, 6, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 5, 5]}, + "faces": { + "north": {"uv": [1.25, 7.25, 1.5, 7.5], "texture": "#0"}, + "east": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "south": {"uv": [0, 7.25, 0.25, 7.5], "texture": "#0"}, + "west": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "up": {"uv": [0, 6, 1.5, 6.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 6, 1.5, 6.25], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 10, 5], + "to": [1, 11, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 5]}, + "faces": { + "north": {"uv": [1.25, 6, 1.5, 6.25], "texture": "#0"}, + "east": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "south": {"uv": [0, 6, 0.25, 6.25], "texture": "#0"}, + "west": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "up": {"uv": [0, 7.25, 1.5, 7.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 7.25, 1.5, 7.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 6, 10], + "to": [1, 10, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 6, 10]}, + "faces": { + "north": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "east": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "south": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "west": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "up": {"uv": [0, 7.25, 0.25, 7.5], "texture": "#0"}, + "down": {"uv": [0, 6, 0.25, 6.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 6, 5], + "to": [1, 10, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 6, 5]}, + "faces": { + "north": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "east": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "south": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "west": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "up": {"uv": [1.25, 7.25, 1.5, 7.5], "texture": "#0"}, + "down": {"uv": [1.25, 6, 1.5, 6.25], "texture": "#0"} + } + }, + { + "name": "energyIn", + "from": [14, 5, 5], + "to": [15, 11, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 5, 5]}, + "faces": { + "north": {"uv": [0.25, 6.25, 0.5, 7.25], "texture": "#0"}, + "east": {"uv": [0.25, 6.25, 1.25, 7.25], "texture": "#0"}, + "south": {"uv": [1, 6.25, 1.25, 7.25], "texture": "#0"}, + "west": {"uv": [0.25, 6.25, 1.25, 7.25], "texture": "#0"}, + "up": {"uv": [0.25, 6.25, 1.25, 6.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0.25, 7, 1.25, 7.25], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15, 5, 5], + "to": [16, 6, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 5, 5]}, + "faces": { + "north": {"uv": [1.25, 7.25, 1.5, 7.5], "texture": "#0"}, + "east": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "south": {"uv": [0, 7.25, 0.25, 7.5], "texture": "#0"}, + "west": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "up": {"uv": [0, 6, 1.5, 6.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 6, 1.5, 6.25], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15, 10, 5], + "to": [16, 11, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 10, 5]}, + "faces": { + "north": {"uv": [1.25, 6, 1.5, 6.25], "texture": "#0"}, + "east": {"uv": [0, 6, 1.5, 6.25], "texture": "#0"}, + "south": {"uv": [0, 6, 0.25, 6.25], "texture": "#0"}, + "west": {"uv": [0, 7.25, 1.5, 7.5], "texture": "#0"}, + "up": {"uv": [0, 7.25, 1.5, 7.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 7.25, 1.5, 7.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15, 6, 10], + "to": [16, 10, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 6, 10]}, + "faces": { + "north": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "east": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "south": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "west": {"uv": [0, 6.25, 0.25, 7.25], "texture": "#0"}, + "up": {"uv": [0, 7.25, 0.25, 7.5], "texture": "#0"}, + "down": {"uv": [0, 6, 0.25, 6.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15, 6, 5], + "to": [16, 10, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 6, 5]}, + "faces": { + "north": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "east": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "south": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "west": {"uv": [1.25, 6.25, 1.5, 7.25], "texture": "#0"}, + "up": {"uv": [1.25, 7.25, 1.5, 7.5], "texture": "#0"}, + "down": {"uv": [1.25, 6, 1.5, 6.25], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "scale": [0.6, 0.6, 0.6] + }, + "thirdperson_lefthand": { + "scale": [0.6, 0.6, 0.6] + }, + "firstperson_righthand": { + "scale": [0.6, 0.6, 0.6] + }, + "ground": { + "translation": [0, 5, 0], + "scale": [0.75, 0.75, 0.75] + }, + "gui": { + "rotation": [22.5, 45, 0], + "scale": [0.75, 0.75, 0.75] + }, + "head": { + "scale": [1.5, 1.5, 1.5] + } + }, + "groups": [ + 0, + 1, + 2, + { + "name": "energyIn", + "origin": [14, 5, 5], + "scope": 0, + "color": 0, + "children": [3, 4, 5, 6, 7] + }, + { + "name": "energyIn", + "origin": [14, 5, 5], + "scope": 0, + "color": 0, + "children": [8, 9, 10, 11, 12] + }, + { + "name": "energyIn", + "origin": [14, 5, 5], + "scope": 0, + "color": 0, + "children": [13, 14, 15, 16, 17] + }, + { + "name": "energyIn", + "origin": [14, 5, 5], + "scope": 0, + "color": 0, + "children": [18, 19, 20, 21, 22] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/effmeks/textures/block/fluid_filter.png b/src/main/resources/assets/effmeks/textures/block/fluid_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..10fc4750e7eb207ce9e3c9468a5c90ed10a683c1 GIT binary patch literal 861 zcmV-j1ETziP)anv%b57I}z{&GF{u7|OP&dNW z>pG2H1<2)c{FTs&s23Mk0VtV7Ak;lP1<;+i!_QR!a|W0*0BE{1z#;4)y(7-pL7H=- zP$*!faPs_){0tz1^@KxaCF0dA4ZGrKW#&`#gFVvFcDM>)C)#P;v%#kt$hk^H!T#JyJ-`7n?7Up^y#_az^TsGR^r zwxy*7ZEbA`1OjMnZ3T&Pac=~v%O@bBb^;Jt#u#kdhGki(R4Uv7_oruZ_U1E)sGR`h zfO5HvQmMp)#w1EMo3-3RI{}DnVow;4hmT>XuM^2j$GHP^BkIM6#rhcTTpNIhp&!@n z;Jd4~h+Z41I?saLn-Dni2%-2mg0U33FT6l;={MFNP4cmbsuK08n-N*@79dfUMo;3; z+XO`P+DO%T?f~%?AW=4+8N<564)}acMl%pG8jad+A^QV<&u5{Y4cIsJ4X1xDpnv8&PR-3@ zac&vuLp$)aC-NWqosd{xt!GAL#anT2a;ZGY(L#V~wuYIH1vrs6ULCpj$^}`4|VtDyCb$ae!_emE~g`Agh>e`NjdNcXX}w{{;X5 n|No^CTm1k400v1!K~w_(y6G98nJx)(00000NkvXXu0mjfkO`5d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/effmeks/textures/gui/fluid_filter.png b/src/main/resources/assets/effmeks/textures/gui/fluid_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..04a56de84c590f212af89bda5bd879be9ce31be8 GIT binary patch literal 1317 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911Mq|EA!Lm*ypkh>GZx^prwfgF}}M_)$< zhK>E)e-c@NeDwgI5LZ|CC>OWL<=wxQb^Vl+)BC@Q!O+OX%PXtK>h1sC#)5*5BIeA<#j-76LC@Xw+rH1|tupytTWmYe@7BHz4*mQh7W3_M4Ri{29{Ddc zODy30S?AlYS=%Iaavj)&xlF32nMXHXm9KRZIWCyo{i5JFt9R->q6&i?4SjK1UdgTL=>KNG~XZMi?U#BP7?JIswzEaw>C=5d%a zGQ}%SsACgNKkhBtH_y$uU%c@^%V!3lI7d!w!)FF2X@LvRZ!iJfD#_x;5@*k!@w`!} zv0uI6z-y+LvCCZET*yc(Yh;ucI$T}ghit9zNR)9f7?QH=Rq4)=wOsu))sf4Gxj%S2{IpcsmVkf-t9OBp?mC^TG2 z7HFuF;c&RD=E!jCL?eUAS_Y;He}*cdgefcw#J@6|15?1vuQ02$Hpg)|cxyi1y4IY5am89OrhsT& zmId3QI2>}f3N+lxQe@bA)rlc%bt}V_Fm8$!ocj7pe&dOTB`T6p1;FBn!PC{xWt~$( F699K+`6B=T literal 0 HcmV?d00001 diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..6768375 --- /dev/null +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -0,0 +1,79 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader = "kotlinforforge" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the the FML version. This is currently 47. +loaderVersion = "${loader_version_range}" #mandatory +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license = "${mod_license}" +# A URL to refer people to when problems occur with this mod +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId = "${mod_id}" #mandatory +# The version number of the mod +version = "${mod_version}" #mandatory +# A display name for the mod +displayName = "${mod_name}" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforge.net/docs/misc/updatechecker/ +#updateJSONURL="https://change.me.example.invalid/updates.json" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +#logoFile="effmeks.png" #optional +# A text field displayed in the mod UI +#credits="" #optional +# A text field displayed in the mod UI +authors = "${mod_authors}" #optional + +# The description text for the mod (multi line!) (#mandatory) +description = '''${mod_description}''' + +# The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded. +#[[mixins]] +#config="${mod_id}.mixins.json" + +# The [[accessTransformers]] block allows you to declare where your AT file is. +# If this block is omitted, a fallback attempt will be made to load an AT from META-INF/accesstransformer.cfg +#[[accessTransformers]] +#file="META-INF/accesstransformer.cfg" + +# The coremods config file path is not configurable and is always loaded from META-INF/coremods.json + +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies."${mod_id}"]] #optional +# the modid of the dependency +modId = "neoforge" #mandatory +# The type of the dependency. Can be one of "required", "optional", "incompatible" or "discouraged" (case insensitive). +# 'required' requires the mod to exist, 'optional' does not +# 'incompatible' will prevent the game from loading when the mod exists, and 'discouraged' will show a warning +type = "required" #mandatory +# Optional field describing why the dependency is required or why it is incompatible +# reason="..." +# The version range of the dependency +versionRange = "${neo_version_range}" #mandatory +# An ordering relationship for the dependency. +# BEFORE - This mod is loaded BEFORE the dependency +# AFTER - This mod is loaded AFTER the dependency +ordering = "NONE" +# Side this dependency is applied on - BOTH, CLIENT, or SERVER +side = "BOTH" +# Here's another dependency +[[dependencies."${mod_id}"]] +modId = "minecraft" +type = "required" +# This version range declares a minimum of the current minecraft version up to but not including the next major version +versionRange = "${minecraft_version_range}" +ordering = "NONE" +side = "BOTH" + +# Features are specific properties of the game environment, that you may want to declare you require. This example declares +# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't +# stop your mod loading on the server for example. +#[features."${mod_id}"] +#openGLVersion="[3.2,)"