diff --git a/.gitignore b/.gitignore index a1a036d4c..764894d0e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,7 @@ classes/ *.launch **/src/generated/ -Merged/ \ No newline at end of file +Merged/ + +# file from notepad++ +*.bak diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76c5e84d1..41f46ec6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,12 @@ # use Eclipse's JDK image: gradle:eclipse-temurin +# all stages need to be defined here +stages: + - gradleSetup + - build + - merge + variables: # Disable the Gradle daemon for Continuous Integration servers as correctness # is usually a priority over speed in CI environments. Using a fresh @@ -17,30 +23,89 @@ before_script: - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env + + # first stage +# This prevents us from re-downloading Gradle every stage +gradleSetup: + stage: gradleSetup + script: ./gradlew --build-cache --gradle-user-home cache/ check + # build using Java 17 + image: eclipse-temurin:17 + cache: + key: + files: + - gradle/wrapper/gradle-wrapper.properties + policy: push + paths: + - cache/ + + + +# second stage build: stage: build - script: ./gradlew build + script: ./gradlew build --gradle-user-home cache/ # build using Java 17 image: eclipse-temurin:17 cache: key: "$CI_COMMIT_REF_NAME" - policy: push + policy: pull-push paths: + - .architectury-transformer + - .gradle + - build + - common/.gradle + - common/build + - core/.gradle + - core/build + - fabric/.gradle + - fabric/src/generated + - forge/.gradle + - forge/src/generated - build - .gradle - - . + - cache/ artifacts: + name: "NightlyBuild-$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" paths: # relative to the root directory - fabric/build/libs - forge/build/libs + exclude: + - fabric/build/libs/*-dev.jar + - fabric/build/libs/*-dev-shadow.jar + - fabric/build/libs/*-sources-dev.jar + - fabric/build/libs/*-sources.jar + - forge/build/libs/*-dev.jar + - forge/build/libs/*-dev-shadow.jar + - forge/build/libs/*-sources-dev.jar + - forge/build/libs/*-sources.jar reports: - # To ensure we've access to this file in the next stage + # To ensure we've access to these files in the next stage dotenv: generate_jars.env +# third stage +merge: + stage: merge + script: ./gradlew merge --gradle-user-home cache/ + # build using Java 17 + image: eclipse-temurin:17 + cache: + key: "$CI_COMMIT_REF_NAME" + policy: pull-push + paths: + - build + - .gradle + - cache/ + artifacts: + name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" + paths: + # relative to the root directory + - Merged -## second stage + +## forth stage #deploy: # stage: deploy # image: registry.gitlab.com/gitlab-org/release-cli:latest diff --git a/Readme.md b/Readme.md index 15526fd5c..49653d2c5 100644 --- a/Readme.md +++ b/Readme.md @@ -81,3 +81,6 @@ Run the Forge client (for debugging): `./gradlew forge:runClient` XZ for Java (data compression)\ https://tukaani.org/xz/java.html + +DHJarMerger (To merge multiple mod versions into one jar)\ +https://github.com/Ran-helo/DHJarMerger diff --git a/_IDE files/Eclipse Auto Formatting V1.xml b/_IDE files/Eclipse Auto Formatting V1.xml deleted file mode 100644 index 659ba3b52..000000000 --- a/_IDE files/Eclipse Auto Formatting V1.xml +++ /dev/null @@ -1,390 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_IDE files/README.txt b/_IDE files/README.txt deleted file mode 100644 index 737e01295..000000000 --- a/_IDE files/README.txt +++ /dev/null @@ -1,11 +0,0 @@ -These Files are used when developing the mod. - -Eclipse Auto Formatting -IntelliJ Auto Formatting -- These files are the auto-formatting settings that should be used when developing for the mod. We want to make sure the style of code is consistant regardless of who is writting the code. - -renderDocMcDistantHorizonsSettings -- This file contains the configuration to run a remote debug instance so you can edit the mod in your IDE while also viewing the OpenGL code in RenderDoc. - -minecraft launch options -- This file contains the Java command line arguments used to launch the mod from a development environment (specifically Eclipse, James didn't test it with IntelliJ), and is included to more easily edit the options for RenderDoc \ No newline at end of file diff --git a/_IDE files/intellij Auto Formatting V1.xml b/_IDE files/intellij Auto Formatting V1.xml deleted file mode 100644 index 126cc559c..000000000 --- a/_IDE files/intellij Auto Formatting V1.xml +++ /dev/null @@ -1,50 +0,0 @@ - - \ No newline at end of file diff --git a/_IDE files/minecraft launch options.txt b/_IDE files/minecraft launch options.txt deleted file mode 100644 index 66ad16049..000000000 Binary files a/_IDE files/minecraft launch options.txt and /dev/null differ diff --git a/_IDE files/renderDocMcDistantHorizonsSettings.cap b/_IDE files/renderDocMcDistantHorizonsSettings.cap deleted file mode 100644 index 10afa9434..000000000 --- a/_IDE files/renderDocMcDistantHorizonsSettings.cap +++ /dev/null @@ -1,39 +0,0 @@ -{ - "rdocCaptureSettings": 1, - "settings": { - "autoStart": false, - "commandLine": "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 -Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES \"-DlegacyClassPath.file=C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\classpath\\runClient_minecraftClasspath.txt\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp=C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\createSrgToMcp\\output.srg\" -Dmixin.env.remapRefMap=true \"-Dmixin.env.refMapRemappingFile=C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\createSrgToMcp\\output.srg\" -DignoreList=bootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,client-extra,fmlcore,javafmllanguage,mclanguage,forge- \"-DnativesDirectory=C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\natives\" -DmergeModules=jna-5.8.0.jar,jna-platform-58.0.jar,java-objc-bridge-1.0.0.jar -p \"C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\0.1.17\\899fb8e3912bb7d14a6f9611de117f77db710ec3\\bootstraplauncher-0.1.17.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\0.9.54\\24b670f2c026ec9777e64a2c2126ebc8635dbe8d\\securejarhandler-0.9.54.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.1\\8b971b182eb5cf100b9e8d4119152d83e00e0fdd\\asm-commons-9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.1\\36464a45d871779f3383a8a9aba2b26562a86729\\asm-util-9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.1\\4f61b83b81d8b659958f4bcc48907e93ecea55a0\\asm-analysis-9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.1\\c333f2a855069cb8eb17a40a3eb8b1b67755d0eb\\asm-tree-9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.1\\a99500cf6eea30535eeac6be73899d048f8d12a8\\asm-9.1.jar\" --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar=cpw.mods.securejarhandler --add-exports java.base/sun.security.util=cpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming -XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump \"-Dos.name=Windows 10\" -Dos.version=10.0 \"-Djava.library.path=C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\natives;C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\natives;C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\natives;C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\natives;C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\natives\" -Dfile.encoding=Cp1252 -classpath \"C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\bin\\main;C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\bin\\test;C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\bin\\default;C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\build\\fg_cache\\net\\minecraftforge\\forge\\1.17.1-37.0.103_mapped_official_1.17.1\\forge-1.17.1-37.0.103_mapped_official_1.17.1-recomp.jar;C:\\Users\\James Seibel\\.gradle\\caches\\forge_gradle\\minecraft_repo\\versions\\1.17.1\\client-extra.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.google.code.findbugs\\jsr305\\3.0.1\\f7be08ec23c21485b9b5a1cf1654c2ec8c58168d\\jsr305-3.0.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\ca.weblite\\java-objc-bridge\\1.0.0\\6ef160c3133a78de015830860197602ca1c855d3\\java-objc-bridge-1.0.0.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\mergetool\\1.1.3\\d7d4b6eac7f49c59255c8ac25190802c29ac9a4a\\mergetool-1.1.3-api.jar;C:\\Users\\James Seibel\\.gradle\\caches\\forge_gradle\\mcp_repo\\net\\minecraft\\mapping\\1.17.1\\mapping-1.17.1-mapping.zip;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\0.9.54\\24b670f2c026ec9777e64a2c2126ebc8635dbe8d\\securejarhandler-0.9.54.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\fmlloader\\1.17.1-37.0.103\\ac18a665e5cbf23223ae33f4d215fccc9a50b613\\fmlloader-1.17.1-37.0.103.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\modlauncher\\9.0.7\\ebe8650527b513823874449e054db053b686b494\\modlauncher-9.0.7.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.openjdk.nashorn\\nashorn-core\\15.3\\43977e804697048fc8d81d333a36c17d07a5b3dd\\nashorn-core-15.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.1\\8b971b182eb5cf100b9e8d4119152d83e00e0fdd\\asm-commons-9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.1\\36464a45d871779f3383a8a9aba2b26562a86729\\asm-util-9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.1\\4f61b83b81d8b659958f4bcc48907e93ecea55a0\\asm-analysis-9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.1\\c333f2a855069cb8eb17a40a3eb8b1b67755d0eb\\asm-tree-9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.1\\a99500cf6eea30535eeac6be73899d048f8d12a8\\asm-9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\accesstransformers\\8.0.4\\272d240aa73f42195b2a68e2ebd8b701ecf41f63\\accesstransformers-8.0.4.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.antlr\\antlr4\\4.9.1\\e92af8ab33e428461927b484e90bb155a4f3a052\\antlr4-4.9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.antlr\\antlr4-runtime\\4.9.1\\428664f05d2b7f7b7610204b5aa7c1763f62011a\\antlr4-runtime-4.9.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\fmlcore\\1.17.1-37.0.103\\1b5f4eb66012e07d68713935b2baec3fc8101451\\fmlcore-1.17.1-37.0.103.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\eventbus\\5.0.3\\f2317ed9d19271be8727a71ae3e5dfeb62715594\\eventbus-5.0.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\forgespi\\4.0.10\\e08fb9a9e485abbbd380516c222e2b502eb0718e\\forgespi-4.0.10.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\coremods\\5.0.1\\386b00279628b105b2d507539c46e134e96f6237\\coremods-5.0.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\unsafe\\0.2.0\\54d7a0a5e8fdb71b973025caa46f341ae5904f39\\unsafe-0.2.0.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.electronwill.night-config\\toml\\3.6.3\\2b05b4d606c517da4d1a7b6d2b97d751c92887d7\\toml-3.6.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.electronwill.night-config\\core\\3.6.3\\c601bfeaeb2c0abe7aaa901b0bbe6d1beff49281\\core-3.6.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.maven\\maven-artifact\\3.8.1\\114a2dd16c4c568bf0ca57719b83f2685dcc5734\\maven-artifact-3.8.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\commons-lang3\\3.8.1\\6505a72a097d9270f7a9e7bf42c4238283247755\\commons-lang3-3.8.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.jodah\\typetools\\0.8.3\\98f84f353457629e81cc6827224871b1a8faa7af\\typetools-0.8.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecrell\\terminalconsoleappender\\1.2.0\\96d02cd3b384ff015a8fef4223bcb4ccf1717c95\\terminalconsoleappender-1.2.0.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-core\\2.14.1\\9141212b8507ab50a45525b545b39d224614528b\\log4j-core-2.14.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-slf4j18-impl\\2.14.1\\312b4d91b21160b9fab43600fa787f31e8cab930\\log4j-slf4j18-impl-2.14.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-api\\2.14.1\\cd8858fbbde69f46bce8db1152c18a43328aae78\\log4j-api-2.14.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.jline\\jline-reader\\3.12.1\\4382ab1382c7b6f379377ed5f665dc2f6e1218bc\\jline-reader-3.12.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.jline\\jline-terminal\\3.12.1\\c777448314e050d980a6b697c140f3bfe9eb7416\\jline-terminal-3.12.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.sf.jopt-simple\\jopt-simple\\5.0.4\\4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c\\jopt-simple-5.0.4.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.spongepowered\\mixin\\0.8.4\\4ec7d77d9ab32596ca0b78bb123956734767e3a\\mixin-0.8.4.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.google.guava\\guava\\21.0\\3a3d111be1be1b745edfa7d91678a12d7ed38709\\guava-21.0.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.google.code.gson\\gson\\2.8.0\\c4ba5371a29ac9b2ad6129b1d39ea38750043eff\\gson-2.8.0.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\0.1.17\\899fb8e3912bb7d14a6f9611de117f77db710ec3\\bootstraplauncher-0.1.17.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\javafmllanguage\\1.17.1-37.0.103\\9d4407369a3f55a7b316757044fb43f3f7e1582d\\javafmllanguage-1.17.1-37.0.103.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\mclanguage\\1.17.1-37.0.103\\22d3f7b559e885b2928dd95802e793d06c0be058\\mclanguage-1.17.1-37.0.103.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.mojang\\blocklist\\1.0.5\\9da540f21c9a8d5ed7c029e1f88d1a6dabb0d6ad\\blocklist-1.0.5.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.mojang\\patchy\\2.1.6\\ce112c16c6275fdfff2d30208533ec906a191f71\\patchy-2.1.6.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.github.oshi\\oshi-core\\5.7.5\\725374463734aacde70a3b20f018aca3f922655f\\oshi-core-5.7.5.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.java.dev.jna\\jna-platform\\5.8.0\\2f12f6d7f7652270d13624cef1b82d8cd9a5398e\\jna-platform-5.8.0.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.java.dev.jna\\jna\\5.8.0\\3551d8d827e54858214107541d3aff9c615cb615\\jna-5.8.0.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.slf4j\\slf4j-api\\1.8.0-beta4\\83b0359d847ee053d745be7ec0d8e9e8a44304b4\\slf4j-api-1.8.0-beta4.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.ibm.icu\\icu4j\\66.1\\72c7519b6d91f7a1f993bd44a99fe95d67211b27\\icu4j-66.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.mojang\\javabridge\\1.1.23\\3e5084d916ba393dfd82928ec97663aeb10b2e2c\\javabridge-1.1.23.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\io.netty\\netty-all\\4.1.25.Final\\d0626cd3108294d1d58c05859add27b4ef21f83b\\netty-all-4.1.25.Final.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\commons-io\\commons-io\\2.5\\2852e6e05fbb95076fc091f6d1780f1f8fe35e0f\\commons-io-2.5.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.httpcomponents\\httpclient\\4.3.3\\18f4247ff4572a074444572cee34647c43e7c9c7\\httpclient-4.3.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\commons-codec\\commons-codec\\1.10\\4b95f4897fa13f2cd904aee711aeafc0c5295cd8\\commons-codec-1.10.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.java.jinput\\jinput\\2.0.5\\39c7796b469a600f72380316f6b1f11db6c2c7c4\\jinput-2.0.5.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.java.jutils\\jutils\\1.0.0\\e12fe1fda814bd348c1579329c86943d2cd3c6a6\\jutils-1.0.0.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.mojang\\brigadier\\1.0.18\\c1ef1234282716483c92183f49bef47b1a89bfa9\\brigadier-1.0.18.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.mojang\\datafixerupper\\4.0.26\\ebd6690f33871ccee9b6132c6480668ee2e35020\\datafixerupper-4.0.26.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.mojang\\authlib\\2.3.31\\bbd00ca33b052f73a6312254780fc580d2da3535\\authlib-2.3.31.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\commons-compress\\1.8.1\\a698750c16740fd5b3871425f4cb3bbaa87f529d\\commons-compress-1.8.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\commons-logging\\commons-logging\\1.1.3\\f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f\\commons-logging-1.1.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.httpcomponents\\httpcore\\4.3.2\\31fbbff1ddbf98f3aa7377c94d33b0447c646b6e\\httpcore-4.3.2.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\it.unimi.dsi\\fastutil\\8.2.1\\5ad88f325e424f8dbc2be5459e21ea5cab3864e9\\fastutil-8.2.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-jemalloc\\3.2.2\\ee8e57a79300f78294576d87c4a587f8c99402e2\\lwjgl-jemalloc-3.2.2.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-openal\\3.2.2\\2b772a102b0a11ee5f2109a5b136f4dc7c630827\\lwjgl-openal-3.2.2.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-opengl\\3.2.2\\6ac5bb88b44c43ea195a570aab059f63da004cd8\\lwjgl-opengl-3.2.2.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-glfw\\3.2.2\\d3ad4df38e400b8afba1de63f84338809399df5b\\lwjgl-glfw-3.2.2.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-stb\\3.2.2\\3b8e6ebc5851dd3d17e37e5cadce2eff2a429f0f\\lwjgl-stb-3.2.2.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-tinyfd\\3.2.2\\fcbe606c8f8da6f8f9a05e2c540eb1ee8632b0e9\\lwjgl-tinyfd-3.2.2.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl\\3.2.2\\8ad6294407e15780b43e84929c40e4c5e997972e\\lwjgl-3.2.2.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.mojang\\text2speech\\1.11.3\\f378f889797edd7df8d32272c06ca80a1b6b0f58\\text2speech-1.11.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.codehaus.plexus\\plexus-utils\\3.2.1\\13b015768e0d04849d2794e4c47eb02d01a0de32\\plexus-utils-3.2.1.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.antlr\\ST4\\4.3\\92f2c1ad8d84abcbeead6cf7f2c53a04166293c2\\ST4-4.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.antlr\\antlr-runtime\\3.5.2\\cd9cd41361c155f3af0f653009dcecb08d8b4afd\\antlr-runtime-3.5.2.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.abego.treelayout\\org.abego.treelayout.core\\1.0.3\\457216e8e6578099ae63667bb1e4439235892028\\org.abego.treelayout.core-1.0.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.glassfish\\javax.json\\1.0.4\\3178f73569fd7a1e5ffc464e680f7a8cc784b85a\\javax.json-1.0.4.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-jemalloc\\3.2.2\\338b25b99da3ba5f441f6492f2ce2a9c608860ed\\lwjgl-jemalloc-3.2.2-natives-windows.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-openal\\3.2.2\\ec20a7d42a2438528fca87e60b1705f1e2339ddb\\lwjgl-openal-3.2.2-natives-windows.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-opengl\\3.2.2\\d8dcdc91066cae2d2d8279cb4a9f9f05d9525826\\lwjgl-opengl-3.2.2-natives-windows.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-glfw\\3.2.2\\dc6826d636bf796b33a49038c354210e661bfc17\\lwjgl-glfw-3.2.2-natives-windows.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-stb\\3.2.2\\811f705cbb29e8ae8d60bdf8fdd38c0c123ad3ef\\lwjgl-stb-3.2.2-natives-windows.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl-tinyfd\\3.2.2\\e9115958773644e863332a6a06488d26f9e1fc9f\\lwjgl-tinyfd-3.2.2-natives-windows.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.lwjgl\\lwjgl\\3.2.2\\5359f3aa50d36352815fc662ea73e1c00d22170\\lwjgl-3.2.2-natives-windows.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\com.mojang\\text2speech\\1.11.3\\c0b242c0091be5acbf303263c7eeeaedd70544c7\\text2speech-1.11.3-natives-windows.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\srgutils\\0.4.3\\84aecb8fc78bd0dd7299bd9963ac9eb83bd00aad\\srgutils-0.4.3.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.java.jinput\\jinput-platform\\2.0.5\\7ff832a6eb9ab6a767f1ade2b548092d0fa64795\\jinput-platform-2.0.5-natives-linux.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.java.jinput\\jinput-platform\\2.0.5\\385ee093e01f587f30ee1c8a2ee7d408fd732e16\\jinput-platform-2.0.5-natives-windows.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\net.java.jinput\\jinput-platform\\2.0.5\\53f9c919f34d2ca9de8c51fc4e1e8282029a9232\\jinput-platform-2.0.5-natives-osx.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.tukaani\\xz\\1.9\\1ea4bec1a921180164852c65006d928617bd2caf\\xz-1.9.jar;C:\\Users\\James Seibel\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\commons-compress\\1.21\\4ec95b60d4e86b5c95a0e919cb172a0af98011ef\\commons-compress-1.21.jar\" -XX:+ShowCodeDetailsInExceptionMessages cpw.mods.bootstraplauncher.BootstrapLauncher --launchTarget forgeclientuserdev --version MOD_DEV --assetIndex 1.17 --assetsDir \"C:\\Users\\James Seibel\\.gradle\\caches\\forge_gradle\\assets\" --gameDir . --fml.forgeVersion 37.0.103 --fml.mcVersion 1.17.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20210706.113038 -mixin.config=lod.mixins.json", - "environment": [ - { - "separator": "Platform style", - "type": "Set", - "value": "official_1.17.1", - "variable": "MCP_MAPPINGS" - }, - { - "separator": "Platform style", - "type": "Set", - "value": "examplemod%%C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\bin\\main;examplemod%%C:\\Users\\James Seibel\\Documents\\Eclipse\\workspaces\\personal-projects\\minecraft-lod-mod\\bin\\main", - "variable": "MOD_CLASSES" - } - ], - "executable": "C:\\Program Files (x86)\\Java\\jdk-17.0.1\\bin\\javaw.exe", - "inject": false, - "numQueuedFrames": 0, - "options": { - "allowFullscreen": true, - "allowVSync": true, - "apiValidation": false, - "captureAllCmdLists": false, - "captureCallstacks": false, - "captureCallstacksOnlyDraws": false, - "debugOutputMute": true, - "delayForDebugger": 0, - "hookIntoChildren": false, - "refAllResources": false, - "verifyBufferAccess": false - }, - "queuedFrameCap": 0, - "workingDir": "C:/Users/James Seibel/Documents/Eclipse/workspaces/personal-projects/minecraft-lod-mod/run" - } -} diff --git a/_logo files/LOD logo flat - with boarder.png b/_logo files/LOD logo flat - with boarder.png deleted file mode 100644 index 35f7242cf..000000000 Binary files a/_logo files/LOD logo flat - with boarder.png and /dev/null differ diff --git a/_logo files/LOD logo flat.png b/_logo files/LOD logo flat.png deleted file mode 100644 index cf94381fc..000000000 Binary files a/_logo files/LOD logo flat.png and /dev/null differ diff --git a/_logo files/LOD logo shade.png b/_logo files/LOD logo shade.png deleted file mode 100644 index f2ff21017..000000000 Binary files a/_logo files/LOD logo shade.png and /dev/null differ diff --git a/_logo files/LogoNameFlat.png b/_logo files/LogoNameFlat.png deleted file mode 100644 index ba695ce06..000000000 Binary files a/_logo files/LogoNameFlat.png and /dev/null differ diff --git a/_logo files/LogoNameFlatAlt.png b/_logo files/LogoNameFlatAlt.png deleted file mode 100644 index 0caf9c6d1..000000000 Binary files a/_logo files/LogoNameFlatAlt.png and /dev/null differ diff --git a/_logo files/LogoNameShade.png b/_logo files/LogoNameShade.png deleted file mode 100644 index f709d51be..000000000 Binary files a/_logo files/LogoNameShade.png and /dev/null differ diff --git a/_logo files/LogoNameShadeAlt.png b/_logo files/LogoNameShadeAlt.png deleted file mode 100644 index d42d720dd..000000000 Binary files a/_logo files/LogoNameShadeAlt.png and /dev/null differ diff --git a/_logo files/Menu-LOD-BW.png b/_logo files/Menu-LOD-BW.png deleted file mode 100644 index 4557aceaf..000000000 Binary files a/_logo files/Menu-LOD-BW.png and /dev/null differ diff --git a/_logo files/Menu-LOD-Button.png b/_logo files/Menu-LOD-Button.png deleted file mode 100644 index 5d87b06bd..000000000 Binary files a/_logo files/Menu-LOD-Button.png and /dev/null differ diff --git a/_logo files/Menu-LOD.png b/_logo files/Menu-LOD.png deleted file mode 100644 index b1b90af24..000000000 Binary files a/_logo files/Menu-LOD.png and /dev/null differ diff --git a/build.gradle b/build.gradle index 03e8ebb7a..53e524651 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -import io.github.rancraftplayz.jarmerger.JarMergerPlugin +import io.github.ran.jarmerger.JarMergerPlugin buildscript { dependencies{ @@ -62,6 +62,19 @@ allprojects { mavenCentral() // used to download and compile dependencies from git repos maven { url 'https://jitpack.io' } + + flatDir { + dirs "${rootDir}/mods/fabric" + content { + includeGroup "fabric-mod" + } + } + flatDir { + dirs "${rootDir}/mods/forge" + content { + includeGroup "forge-mod" + } + } } tasks.withType(JavaCompile) { diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockShapeWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockShapeWrapper.java index abf11e87c..87a55a0b0 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockShapeWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockShapeWrapper.java @@ -40,7 +40,7 @@ public class BlockShapeWrapper implements IBlockShapeWrapper this.noCollision = false; this.toAvoid = ofBlockToAvoid(); setupShapes(chunkWrapper, x, y, z); - System.out.println(block + " non full " + nonFull + " no collision " + noCollision + " to avoid " + toAvoid); + //System.out.println(block + " non full " + nonFull + " no collision " + noCollision + " to avoid " + toAvoid); } private BlockShapeWrapper() diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index c846e3b1e..585ffa197 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -147,15 +147,19 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper */ @Override - public HashSet getVanillaRenderedChunks() { + public HashSet getVanillaRenderedChunks() + { ISodiumAccessor sodium = ModAccessorApi.get(ISodiumAccessor.class); - if (sodium != null) { + if (sodium != null) + { return sodium.getNormalRenderedChunks(); } IOptifineAccessor optifine = ModAccessorApi.get(IOptifineAccessor.class); - if (optifine != null) { + if (optifine != null) + { HashSet pos = optifine.getNormalRenderedChunks(); - if (pos==null) pos = getMaximumRenderedChunks(); + if (pos==null) + pos = getMaximumRenderedChunks(); return pos; } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/LodServerWorld.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/LodServerWorld.java deleted file mode 100644 index 4bb09f586..000000000 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/LodServerWorld.java +++ /dev/null @@ -1,357 +0,0 @@ -/* - * This file is part of the Distant Horizon mod (formerly the LOD Mod), - * licensed under the GNU GPL v3 License. - * - * Copyright (C) 2020 James Seibel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.seibel.lod.common.wrappers.worldGeneration; - -import java.util.HashMap; -import java.util.List; -import java.util.Random; -import java.util.function.Predicate; -import java.util.stream.Stream; - -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.common.wrappers.WrapperUtil; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.RegistryAccess; -import net.minecraft.core.SectionPos; -import net.minecraft.core.particles.ParticleOptions; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundSource; -import net.minecraft.world.DifficultyInstance; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.EmptyTickList; -import net.minecraft.world.level.TickList; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.BiomeManager; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.border.WorldBorder; -import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.chunk.ChunkSource; -import net.minecraft.world.level.chunk.ChunkStatus; -import net.minecraft.world.level.dimension.DimensionType; -import net.minecraft.world.level.entity.EntityTypeTest; -import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.feature.StructureFeature; -import net.minecraft.world.level.levelgen.structure.StructureStart; -import net.minecraft.world.level.lighting.LevelLightEngine; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.storage.LevelData; -import net.minecraft.world.phys.AABB; -import org.jetbrains.annotations.Nullable; - - -/** - * This is a fake ServerWorld used when generating features. - * It allows us to keep each LodChunk generation independent - * of the actual ServerWorld, allowing - * multithread generation. - * - * @author James Seibel - * @version 7-26-2021 - */ -public class LodServerWorld implements WorldGenLevel -{ - - public HashMap heightmaps = new HashMap<>(); - - public final ChunkAccess chunk; - - public final ServerLevel serverWorld; - - public LodServerWorld(ServerLevel newServerWorld, ChunkAccess newChunk) - { - chunk = newChunk; - serverWorld = newServerWorld; - } - - - @Override - public int getHeight(Heightmap.Types heightmapType, int x, int z) - { - // make sure the block position is set relative to the chunk - x = x % LodUtil.CHUNK_WIDTH; - x = (x < 0) ? x + 16 : x; - - z = z % LodUtil.CHUNK_WIDTH; - z = (z < 0) ? z + 16 : z; - - return chunk.getOrCreateHeightmapUnprimed(WrapperUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(x, z); - } - - @Override - public Biome getBiome(BlockPos pos) - { - return chunk.getBiomes().getNoiseBiome(pos.getX() >> 2, pos.getY() >> 2, pos.getZ() >> 2); - } - - @Override - public boolean setBlock(BlockPos pos, BlockState state, int flags, int recursionLeft) - { - return chunk.setBlockState(pos, state, false) == state; - } - - @Override - public BlockState getBlockState(BlockPos pos) - { - return chunk.getBlockState(pos); - } - - @Override - public FluidState getFluidState(BlockPos pos) - { - return chunk.getFluidState(pos); - } - - - @Override - public boolean isStateAtPosition(BlockPos pos, Predicate state) - { - return state.test(chunk.getBlockState(pos)); - } - - @Override - public boolean isFluidAtPosition(BlockPos blockPos, Predicate predicate) { - return predicate.test(chunk.getFluidState(blockPos)); - } - - @Override - public TickList getBlockTicks() - { - return EmptyTickList.empty(); - } - - @Override - public ChunkAccess getChunk(int x, int z, ChunkStatus requiredStatus, boolean nonnull) - { - return chunk; - } - - @Override - public Stream> startsForFeature(SectionPos p_241827_1_, StructureFeature p_241827_2_) - { - return serverWorld.startsForFeature(p_241827_1_, p_241827_2_); - } - - @Override - public TickList getLiquidTicks() - { - return EmptyTickList.empty(); - } - - @Override - public LevelLightEngine getLightEngine() - { - return new LevelLightEngine(null, false, false); - } - - @Override - public long getSeed() - { - return serverWorld.getSeed(); - } - - @Override - public RegistryAccess registryAccess() - { - return serverWorld.registryAccess(); - } - - - /** - * All methods below shouldn't be needed - * and thus have been left unimplemented. - */ - - - @Override - public Random getRandom() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Override - public void playSound(Player player, BlockPos pos, SoundEvent soundIn, SoundSource category, float volume, - float pitch) - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Override - public void addParticle(ParticleOptions particleData, double x, double y, double z, double xSpeed, double ySpeed, - double zSpeed) - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Override - public BiomeManager getBiomeManager() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Override - public int getSeaLevel() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Override - public float getShade(Direction p_230487_1_, boolean p_230487_2_) - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Override - public WorldBorder getWorldBorder() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Override - public boolean removeBlock(BlockPos pos, boolean isMoving) - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Override - public boolean destroyBlock(BlockPos pos, boolean dropBlock, Entity entity, int recursionLeft) - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public ServerLevel getLevel() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public ChunkSource getChunkSource() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public DifficultyInstance getCurrentDifficultyAt(BlockPos arg0) - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Nullable - @Override - public MinecraftServer getServer() { - return serverWorld.getServer(); - } - - - @Override - public LevelData getLevelData() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public void levelEvent(Player arg0, int arg1, BlockPos arg2, int arg3) - { - throw new UnsupportedOperationException("Not Implemented"); - - } - - // TODO: Check if this causes any issues - @Override - public void gameEvent(@Nullable Entity entity, GameEvent gameEvent, BlockPos blockPos) { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public List getEntities(Entity arg0, AABB arg1, Predicate arg2) - { - throw new UnsupportedOperationException("Not Implemented"); - } - - @Override - public List getEntities(EntityTypeTest entityTypeTest, AABB aABB, Predicate predicate) { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public List getEntitiesOfClass(Class arg0, AABB arg1, - Predicate arg2) - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public List players() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public int getSkyDarken() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public Biome getUncachedNoiseBiome(int p_225604_1_, int p_225604_2_, int p_225604_3_) - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public boolean isClientSide() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public DimensionType dimensionType() - { - throw new UnsupportedOperationException("Not Implemented"); - } - - - @Override - public BlockEntity getBlockEntity(BlockPos p_175625_1_) - { - throw new UnsupportedOperationException("Not Implemented"); - } - -} diff --git a/common/src/main/resources/lod.accesswidener b/common/src/main/resources/lod.accesswidener index 740a414b3..7aef3bfe4 100644 --- a/common/src/main/resources/lod.accesswidener +++ b/common/src/main/resources/lod.accesswidener @@ -25,6 +25,9 @@ accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine L # world generation accessible method net/minecraft/world/level/levelgen/Heightmap setHeight (III)V accessible field net/minecraft/world/level/biome/Biome generationSettings Lnet/minecraft/world/level/biome/BiomeGenerationSettings; +accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Ljava/util/function/Supplier; +accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doFill (Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;II)Lnet/minecraft/world/level/chunk/ChunkAccess; +accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V # lod generation from save file accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop; diff --git a/core b/core index 14e72c68c..ab3880a5e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 14e72c68cbef363734b7dcbd18118d38d0ccee54 +Subproject commit ab3880a5e56b7238522fd598696e9fe5ee2f67b6 diff --git a/fabric/build.gradle b/fabric/build.gradle index 61b7ac7da..ac084a749 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -3,6 +3,8 @@ plugins { id "com.modrinth.minotaur" version "1.2.1" } +version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm") + loom { accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener")) } @@ -49,6 +51,9 @@ dependencies { modImplementation "maven.modrinth:sodium:${project.sodium_version}" implementation "org.joml:joml:1.10.2" + // Lithium +// modImplementation "maven.modrinth:lithium:${project.lithium_version}" + // Iris // modImplementation "maven.modrinth:iris:${project.iris_version}" diff --git a/forge/build.gradle b/forge/build.gradle index 30b47ed5d..33ebcec9b 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -2,6 +2,8 @@ plugins { id "com.github.johnrengelman.shadow" version "7.0.0" } +version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm") + loom { accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener")) @@ -23,12 +25,28 @@ configurations { developmentForge.extendsFrom common } +repositories { + // Required for importing CurseForge mods + maven { + url "https://www.cursemaven.com" + content { + includeGroup "curse.maven" + } + } +} + dependencies { forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } + // Optifine +// implementation("forge-mod:OptiFine_1.17.1_HD_U_H1") + + // Starlight +// implementation("curse.maven:starlight-forge-526854:${project.starlight_version_forge}") + // implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") // forgeDependencies(shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}) diff --git a/gradle.properties b/gradle.properties index fb9694f33..b4c22497d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,11 +13,13 @@ fabric_loader_version=0.12.6 fabric_api_version=0.37.1+1.17 # Fabric mods modmenu_version=2.0.14 + starlight_version_fabric=3442770 + lithium_version=mc1.18.1-0.7.7 sodium_version=mc1.17.1-0.3.3 -# iris_version=1.17.x-v1.1.4 -# immersive_portals_version = 0.14-1.17 + iris_version=1.17.x-v1.1.4 + immersive_portals_version = 0.14-1.17 # Forge loader forge_version=37.1.1 # Forge mods - ## currentlly no mods ## + starlight_version_forge=3457784 diff --git a/mods/forge/OptiFine_1.17.1_HD_U_H1.jar b/mods/forge/OptiFine_1.17.1_HD_U_H1.jar new file mode 100644 index 000000000..7e0cde80a Binary files /dev/null and b/mods/forge/OptiFine_1.17.1_HD_U_H1.jar differ diff --git a/plugins/DHJarMerger-1.0.jar b/plugins/DHJarMerger-1.0.jar index 7d06ddeb9..b089a52de 100644 Binary files a/plugins/DHJarMerger-1.0.jar and b/plugins/DHJarMerger-1.0.jar differ