From 82ba6223a9b07c8c1cf39e5e64887f3348459042 Mon Sep 17 00:00:00 2001 From: ImplementsLegend Date: Fri, 15 Mar 2024 21:09:32 +0100 Subject: [PATCH] Initial Commit --- LICENSE | 21 ++ build.gradle | 245 +++++++++++++++++ gradle.properties | 53 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 ++++++++++++++++++ gradlew.bat | 92 +++++++ readme.md | 21 ++ settings.gradle | 15 ++ .../mod/vaultfaster/CachedPaletteContainer.kt | 10 + .../mod/vaultfaster/IndexedBlock.kt | 6 + .../mod/vaultfaster/ObjectiveTemplateEvent.kt | 100 +++++++ .../mod/vaultfaster/Performance.kt | 23 ++ .../mod/vaultfaster/TileMapper.kt | 200 ++++++++++++++ .../mod/vaultfaster/TileMapperContainer.kt | 7 + .../mod/vaultfaster/VaultFaster.java | 77 ++++++ .../mod/vaultfaster/batchSetBlock.kt | 235 +++++++++++++++++ .../mod/vaultfaster/blocks.kt | 27 ++ .../mixin/ChunkAccessAccessor.java | 11 + .../mod/vaultfaster/mixin/FixObjectives.java | 30 +++ .../vaultfaster/mixin/JigsawRootAccessor.kt | 11 + .../vaultfaster/mixin/LevelChunkAccessor.java | 11 + .../vaultfaster/mixin/MeasurePerformance.java | 43 +++ .../mixin/MixinBlockRegistryIndex.java | 29 ++ .../mixin/MixinLeveledProcessor.java | 74 ++++++ .../mod/vaultfaster/mixin/MixinPalette.java | 42 +++ .../mixin/MixinPartBlockProperties.java | 24 ++ .../mixin/MixinPartialBlockState.java | 26 ++ .../mixin/MixinPlacementSettings.java | 59 +++++ .../mixin/MixinReferenceTileProcessor.java | 55 ++++ .../mixin/MixinStructureTemplate.java | 90 +++++++ .../mod/vaultfaster/mixin/MixinTemplate.java | 52 ++++ .../vaultfaster/mixin/MixinVaultLayout.java | 60 +++++ .../vaultfaster/mixin/NoBiomeDecorations.java | 30 +++ .../mixin/PartialBlockIDAccessor.kt | 11 + .../mixin/PartialBlockRegistryIndex.java | 88 +++++++ .../vaultfaster/mixin/PredicateIdAccessor.kt | 12 + .../mixin/ProcessorPredicateAccessor.kt | 11 + .../vaultfaster/mixin/ProtoChunkAccessor.java | 17 ++ .../vaultfaster/mixin/TileGroupsAccessor.kt | 12 + .../mod/vaultfaster/sectionBlocks.kt | 41 +++ src/main/resources/META-INF/mods.toml | 55 ++++ src/main/resources/pack.mcmeta | 8 + src/main/resources/vaultfaster.mixins.json | 36 +++ 44 files changed, 2326 insertions(+) create mode 100644 LICENSE 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 100755 gradlew create mode 100644 gradlew.bat create mode 100644 readme.md create mode 100644 settings.gradle create mode 100644 src/main/java/implementslegend/mod/vaultfaster/CachedPaletteContainer.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/IndexedBlock.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/ObjectiveTemplateEvent.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/Performance.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/TileMapper.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/TileMapperContainer.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/VaultFaster.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/batchSetBlock.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/blocks.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/ChunkAccessAccessor.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/FixObjectives.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/JigsawRootAccessor.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/LevelChunkAccessor.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MeasurePerformance.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinBlockRegistryIndex.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinLeveledProcessor.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPalette.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartBlockProperties.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartialBlockState.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPlacementSettings.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinReferenceTileProcessor.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinStructureTemplate.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinTemplate.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/MixinVaultLayout.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/NoBiomeDecorations.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/PartialBlockIDAccessor.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/PartialBlockRegistryIndex.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/PredicateIdAccessor.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/ProcessorPredicateAccessor.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/ProtoChunkAccessor.java create mode 100644 src/main/java/implementslegend/mod/vaultfaster/mixin/TileGroupsAccessor.kt create mode 100644 src/main/java/implementslegend/mod/vaultfaster/sectionBlocks.kt create mode 100644 src/main/resources/META-INF/mods.toml create mode 100644 src/main/resources/pack.mcmeta create mode 100644 src/main/resources/vaultfaster.mixins.json diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c986429 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2024 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..fc21022 --- /dev/null +++ b/build.gradle @@ -0,0 +1,245 @@ +buildscript { + repositories { + + maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } + mavenCentral() + } + dependencies { + classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' + } +} +plugins { + id 'eclipse' + id 'idea' + id 'net.minecraftforge.gradle' version '[6.0.16,6.2)' + id 'org.jetbrains.kotlin.jvm' version '1.8.22' +} + +apply plugin: 'org.spongepowered.mixin' + +group = mod_group_id +version = mod_version + +base { + archivesName = mod_id +} + +java { + toolchain.languageVersion = JavaLanguageVersion.of(17) +} + +minecraft { + // The mappings can be changed at any time and must be in the following format. + // Channel: Version: + // official MCVersion Official field/method names from Mojang mapping files + // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official + // + // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. + // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md + // + // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge + // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started + // + // Use non-default mappings at your own risk. They may not always work. + // Simply re-run your setup task after changing the mappings to update your workspace. + mappings channel: mapping_channel, version: mapping_version + + // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. + // In most cases, it is not necessary to enable. + // enableEclipsePrepareRuns = true + // enableIdeaPrepareRuns = true + + // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. + // It is REQUIRED to be set to true for this template to function. + // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html + copyIdeResources = true + + // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. + // The folder name can be set on a run configuration using the "folderName" property. + // By default, the folder name of a run configuration is the name of the Gradle project containing it. + // generateRunFolders = true + + // This property enables access transformers for use in development. + // They will be applied to the Minecraft artifact. + // The access transformer file can be anywhere in the project. + // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. + // This default location is a best practice to automatically put the file in the right place in the final jar. + // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + // applies to all the run configs below + configureEach { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + property 'forge.logging.markers', 'REGISTRIES' + + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + property 'forge.logging.console.level', 'debug' + + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + + client { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', mod_id + } + + server { + property 'forge.enabledGameTestNamespaces', mod_id + args '--nogui' + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + property 'forge.enabledGameTestNamespaces', mod_id + } + + data { + // example of overriding the workingDirectory set in configureEach above + workingDirectory project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + } + } +} + + +mixin { + add sourceSets.main, "${mod_id}.refmap.json" + + config "${mod_id}.mixins.json" +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +repositories { + flatDir { + dir 'libs' + } + mavenCentral() + // Put repositories for dependencies here + // ForgeGradle automatically adds the Forge maven and Maven Central for you + + // If you have mod jar dependencies in ./libs, you can declare them as a repository like so. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver + // flatDir { + // dir 'libs' + // } +} + +dependencies { + // Specify the version of Minecraft to use. + // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. + // The "userdev" classifier will be requested and setup by ForgeGradle. + // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], + // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. + minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + implementation fg.deobf("blank:the_vault-1.18.2:3.11.0.2853") + runtimeOnly fg.deobf("blank:modular-routers-1.18.2:9.1.1-93") + runtimeOnly fg.deobf("blank:jei-1.18.2:9.7.2.1001") + runtimeOnly fg.deobf("blank:geckolib-forge-1.18:3.0.57") + runtimeOnly fg.deobf("blank:curios-forge-1.18.2:5.0.9.0") + runtimeOnly fg.deobf("blank:Quark:3.2-358") + runtimeOnly fg.deobf("blank:AutoRegLib:1.7-53") + runtimeOnly fg.deobf("blank:Architects-Palette:1.18.2-1.3.2") + runtimeOnly fg.deobf("blank:architectury:4.10.88-forge") + runtimeOnly fg.deobf("blank:rottencreatures:forge-1.18.2-1.0.0") + runtimeOnly fg.deobf("blank:ispawner:1.1.7-forge") + runtimeOnly fg.deobf("blank:kotlinforforge:3.12.0-all") + runtimeOnly fg.deobf("blank:sophisticatedbackpacks-1.18.2:3.18.46.821") + runtimeOnly fg.deobf("blank:sophisticatedcore-1.18.2:0.5.48.244") + runtimeOnly fg.deobf("blank:alexsmobs:1.18.6") + runtimeOnly fg.deobf("blank:citadel:1.11.3-1.18.2") + runtimeOnly fg.deobf("blank:spark:1.9.11-forge") + runtimeOnly fg.deobf("blank:rubidium:0.5.5")//minecraft rendering is too slow + annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' + //implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" + + // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings + // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") + // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") + + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") + + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +tasks.named('processResources', ProcessResources).configure { + var replaceProperties = [ + minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, + forge_version: forge_version, forge_version_range: forge_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 + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + }} + +// Example for how to get properties into the manifest for reading at runtime. +tasks.named('jar', Jar).configure { + manifest { + attributes([ + "Specification-Title": mod_id, + "Specification-Vendor": mod_authors, + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": project.jar.archiveVersion, + "Implementation-Vendor": mod_authors, + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } + + // This is the preferred method to reobfuscate your jar file + finalizedBy 'reobfJar' +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + +// Merge the resources and classes into the same directory. +// This is done because java expects modules to be in a single directory. +// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem +// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later. +sourceSets.each { + def dir = layout.buildDirectory.dir("sourcesSets/$it.name") + it.output.resourcesDir = dir + it.java.destinationDirectory = dir +} +kotlin { + jvmToolchain(17) +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..7c50c6f --- /dev/null +++ b/gradle.properties @@ -0,0 +1,53 @@ +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false + + +# The Minecraft version must agree with the Forge version to get a valid artifact +minecraft_version=1.18.2 +# 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.18.2,1.19) +# The Forge version must agree with the Minecraft version to get a valid artifact +forge_version=40.2.9 +# The Forge version range can use any version of Forge as bounds or match the loader version range +forge_version_range=[40,) +# The loader version range can only use the major version of Forge/FML as bounds +loader_version_range=[40,) +# The mapping channel to use for mappings. +# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. +# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. +# +# | Channel | Version | | +# |-----------|----------------------|--------------------------------------------------------------------------------| +# | official | MCVersion | Official field/method names from Mojang mapping files | +# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official | +# +# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. +# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md +# +# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge. +# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started +mapping_channel=official +# The mapping version to query from the mapping channel. +# This must match the format required by the mapping channel. +mapping_version=1.18.2 + + +# 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=vaultfaster +# The human-readable display name for the mod. +mod_name=vaultFaster +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=MIT +# The mod version. See https://semver.org/ +mod_version=1.0-SNAPSHOT +# 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=implementsLegend.mod +# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. +mod_authors= +# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. +mod_description= diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7f93135c49b765f8051ef9d0a6055ff8e46073d8 GIT binary patch literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3fa8f86 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + 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..6689b85 --- /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. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +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/readme.md b/readme.md new file mode 100644 index 0000000..0744bc6 --- /dev/null +++ b/readme.md @@ -0,0 +1,21 @@ +Vault Faster +===== +Minecraft Vault Hunters optimization mod with one goal: make vault world generation faster. \ +More than 4x performance improvement. + + +List of changes: +- [batchSetBlocks.kt] blocks are placed with optimised algorithm +- - skips heightmap updates +- - locks chunk only once per section instead of every block +- - skips iskallia.vault.core.event.CommonEvents.BLOCK_SET event +- [MixinBlockRegistryIndex.java, PartialBlockRegistryIndex.java, IndexedBlock.kt] replaced "string ids"/*ResourceLocation*s of blocks and *PartialTile*s with "numerical ids"/*registryIndex* +- [TileMapper.kt] added tile mapper; algorithm for minimizing number of applicable *iskallia.vault.core.world.processor.tile.TileProcessor*s by storing them in multimap indexed with numerical id of a block +- cached some values +- [NoBiomeDecorations.java] removed biome decorations + +Performance on my system (# of chunks generated in 50 seconds): +- unmodified, 5 cpu cores: 1330 +- unmodified, 2 cpu cores: 430 +- modified, 5 cpu cores: 5500 +- modified, 2 cpu cores: 2000 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..4021f9f --- /dev/null +++ b/settings.gradle @@ -0,0 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} + +rootProject.name = 'vaultFaster' diff --git a/src/main/java/implementslegend/mod/vaultfaster/CachedPaletteContainer.kt b/src/main/java/implementslegend/mod/vaultfaster/CachedPaletteContainer.kt new file mode 100644 index 0000000..e4b8813 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/CachedPaletteContainer.kt @@ -0,0 +1,10 @@ +package implementslegend.mod.vaultfaster + +import iskallia.vault.core.world.processor.Palette +import iskallia.vault.core.world.processor.ProcessorContext +import org.spongepowered.asm.mixin.gen.Accessor + +interface CachedPaletteContainer { + fun getCachedPalette(ctx:ProcessorContext):Palette + +} \ No newline at end of file diff --git a/src/main/java/implementslegend/mod/vaultfaster/IndexedBlock.kt b/src/main/java/implementslegend/mod/vaultfaster/IndexedBlock.kt new file mode 100644 index 0000000..9df3c5d --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/IndexedBlock.kt @@ -0,0 +1,6 @@ +package implementslegend.mod.vaultfaster + +interface IndexedBlock { + val registryIndex:Int + fun copyRegistryIndex(newIndex: Int) +} \ No newline at end of file diff --git a/src/main/java/implementslegend/mod/vaultfaster/ObjectiveTemplateEvent.kt b/src/main/java/implementslegend/mod/vaultfaster/ObjectiveTemplateEvent.kt new file mode 100644 index 0000000..f248532 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/ObjectiveTemplateEvent.kt @@ -0,0 +1,100 @@ +package implementslegend.mod.vaultfaster + +import implementslegend.mod.vaultfaster.mixin.JigsawRootAccessor +import iskallia.vault.block.HeraldControllerBlock +import iskallia.vault.block.MonolithBlock +import iskallia.vault.block.ObeliskBlock +import iskallia.vault.core.event.CommonEvents +import iskallia.vault.core.event.Event +import iskallia.vault.core.vault.objective.* +import iskallia.vault.core.world.data.entity.PartialCompoundNbt +import iskallia.vault.core.world.data.tile.PartialBlockState +import iskallia.vault.core.world.data.tile.PartialTile +import iskallia.vault.core.world.template.DynamicTemplate +import iskallia.vault.core.world.template.JigsawTemplate +import iskallia.vault.init.ModBlocks +import net.minecraft.core.BlockPos +import net.minecraft.world.level.block.state.BlockState +import net.minecraft.world.level.block.state.properties.DoubleBlockHalf + +data class ObjectiveTemplateData(var template:JigsawTemplate) + +/* +* objective POIs used block set event; That was slow and it was disabled by "fast set blocks" (batchSetBlocks.kt) +* this is a replacement +* it works by changing type of template used for placing objectives +* herald boss room probably doesn't use template, just the actual block, so it is still broken +* +* */ + + +object ObjectiveTemplateEvent:Event(){ + init { + CommonEvents.REGISTRY.add(this) + } + private val SCAVENGER_OBJECTIVE_TEMPLATE = + dynamicTemplateOf( + BlockPos(0,0,0) to ModBlocks.SCAVENGER_ALTAR.defaultBlockState() + ) + private val LODESTONE_OBJECTIVE_TEMPLATE = + dynamicTemplateOf( + BlockPos(0,1,0) to ModBlocks.LODESTONE.defaultBlockState() + ) + private val MONOLITH_OBJECTIVE_TEMPLATE = + try { + dynamicTemplateOf( + BlockPos(0,0,0) to ModBlocks.MONOLITH.defaultBlockState().setValue(MonolithBlock.HALF, DoubleBlockHalf.LOWER), + BlockPos(0,1,0) to ModBlocks.MONOLITH.defaultBlockState().setValue(MonolithBlock.HALF, DoubleBlockHalf.UPPER), + ) + }catch (e:NoSuchFieldError){//3.13 made monolith single half; trying to access MonolithBlock.HALF will cause NoSuchFieldError + dynamicTemplateOf( + BlockPos(0,0,0) to ModBlocks.MONOLITH.defaultBlockState() + ) + } + private val CRAKE_OBJECTIVE_TEMPLATE = + dynamicTemplateOf( + BlockPos(0,0,0) to ModBlocks.CRAKE_COLUMN.defaultBlockState(), + BlockPos(0,1,0) to ModBlocks.CRAKE_PEDESTAL.defaultBlockState(), + ) + private val OBELISK_OBJECTIVE_TEMPLATE = + dynamicTemplateOf( + BlockPos(0,0,0) to ModBlocks.OBELISK.defaultBlockState().setValue(ObeliskBlock.HALF, DoubleBlockHalf.LOWER), + BlockPos(0,1,0) to ModBlocks.OBELISK.defaultBlockState().setValue(ObeliskBlock.HALF, DoubleBlockHalf.UPPER), + ) + private val HERALD_OBJECTIVE_TEMPLATE = + dynamicTemplateOf( + BlockPos(0,0,0) to ModBlocks.HERALD_CONTROLLER.defaultBlockState().setValue(HeraldControllerBlock.HALF, DoubleBlockHalf.LOWER), + BlockPos(0,1,0) to ModBlocks.HERALD_CONTROLLER.defaultBlockState().setValue(HeraldControllerBlock.HALF, DoubleBlockHalf.UPPER), + ) + + override fun createChild() = this + + /*registers event for given objective*/ + @JvmOverloads + fun registerObjectiveTemplate(objective:Objective, newTemplate:DynamicTemplate? = getTemplateForObjective(objective)){ + register(objective){ + (template)-> + (template as? JigsawRootAccessor)?.let { + if (newTemplate != null) it.root = newTemplate + } + } + } + private fun getTemplateForObjective(objective: Objective) = + when(objective){ + is ScavengerObjective -> SCAVENGER_OBJECTIVE_TEMPLATE + is MonolithObjective -> MONOLITH_OBJECTIVE_TEMPLATE + is ObeliskObjective -> OBELISK_OBJECTIVE_TEMPLATE + is CrakePedestalObjective -> CRAKE_OBJECTIVE_TEMPLATE + is LodestoneObjective -> LODESTONE_OBJECTIVE_TEMPLATE + is HeraldObjective -> HERALD_OBJECTIVE_TEMPLATE//does not work for herald + else -> null + } + +} + + +@JvmName("dynamicTemplateOfTiles") +private fun dynamicTemplateOf(vararg tiles:PartialTile) = DynamicTemplate().apply { + tiles.forEach (this::add) +} +private fun dynamicTemplateOf(vararg tiles:Pair) = dynamicTemplateOf(*tiles.map { (pos,state)->PartialTile.of(PartialBlockState.of(state), PartialCompoundNbt.empty(),pos) }.toTypedArray()) diff --git a/src/main/java/implementslegend/mod/vaultfaster/Performance.kt b/src/main/java/implementslegend/mod/vaultfaster/Performance.kt new file mode 100644 index 0000000..5bc55a9 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/Performance.kt @@ -0,0 +1,23 @@ +package implementslegend.mod.vaultfaster + +import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.atomic.AtomicLong + +class Performance { + var count = AtomicInteger() + var start = System.currentTimeMillis() + var lastPrint = AtomicLong(start) + var lastCount = 0 + + + fun record() { + val c = count.incrementAndGet() + lastPrint.updateAndGet { + if(it+400 list of tile processors +* trying to apply every tile processor to every tile was just too taxing and way to reduce number of considered processors was required +* this is probably the most important optimisation in the entire mod +* +* */ + +class TileMapper { + val couldContainReferences = AtomicBoolean(true) + var couldContainReferencesBadSync = true //so that you don't have to check Atomic version every time + + + //all processors for which numerical ids couldn't be determined + val unconditional:ArrayList = arrayListOf() + /* + * main table for storing all the mappings + * idx: numerical id of block + * value: list of applicable tile processors + */ + val mappings:Array> = Array(BLOCKS.size()){ + arrayListOf() + } + + + /* + * applies tile processors to a tile + * */ + fun mapBlock(tile: PartialTile?, ctx: ProcessorContext):PartialTile? { + val idx = ((tile?:return null).state.block as IndexedBlock).registryIndex + var newTile:PartialTile =tile + if (couldContainReferencesBadSync && couldContainReferences.getAndSet(false)) { + couldContainReferencesBadSync=false + val newProcessors = arrayListOf() + unconditional.removeIf { + tryFlatten(it, newProcessors, ctx) + } + unconditional += newProcessors + } + newTile = mapUnconditional(idx, newTile, ctx)?:return null + newTile = mapConditional(idx, newTile, ctx)?:return null + return newTile + + } + + private fun mapUnconditional(idx:Int,tile:PartialTile,ctx:ProcessorContext):PartialTile?{ + var newTile:PartialTile? =tile + + for(tileProcessor in unconditional){ + newTile=tileProcessor.process(newTile?:return null,ctx) + if(idx!=(tile.state.block as IndexedBlock).registryIndex) return mapBlock(newTile, ctx) + } + return newTile + } + private fun mapConditional(idx:Int,tile:PartialTile,ctx:ProcessorContext):PartialTile?{ + + var newTile:PartialTile? =tile + for(tileProcessor in mappings.getOrNull(idx)?: emptyList()){ + if(/*cond(tile)*/ true){ + newTile=tileProcessor.process(newTile?:return null,ctx) + if(idx!=(tile.state.block as IndexedBlock).registryIndex) return mapBlock(newTile, ctx) + } + } + return newTile + } + + private fun tryFlatten(processor: TileProcessor, newProcessors: ArrayList, ctx: ProcessorContext): Boolean { + if(processor !is ReferenceTileProcessor) return false + + ((processor as CachedPaletteContainer).getCachedPalette(ctx) as TileMapperContainer).tileMapper.let { mapper -> + mapper.mappings.forEachIndexed{ + idx,processors-> + mappings[idx]+=processors + } + mapper.unconditional.forEach { + if (!tryFlatten(it,newProcessors,ctx))newProcessors+=it + } + } + + return true + + } + + fun addProcessor(processor: TileProcessor){ + try { + if (processor is SpawnerTileProcessor || processor is WeightedTileProcessor) { + addProcessor((processor as ProcessorPredicateAccessor).predicate, processor) + } else if (processor is BernoulliWeightedTileProcessor) { + addProcessor(processor.target, processor) + } else if (processor is VaultLootTileProcessor) { + addProcessor(PartialBlock.of(ModBlocks.PLACEHOLDER), processor) + } else if (processor is SpawnerElementTileProcessor) { + addProcessor(PartialBlock.of(ForgeRegistries.BLOCKS.getValue(ResourceLocation("ispawner","spawner"))), processor) + } else if (processor is LeveledTileProcessor) { + addProcessor(LeveledPredicate(processor),processor) + } else { + addUnconditional(processor) + } + } catch (th: UnconditionalPredicate) { + addUnconditional(processor) + } + + } + + private fun addUnconditional(processor: TileProcessor) { + if(processor is ReferenceTileProcessor) { + couldContainReferences.set(true) + couldContainReferencesBadSync = true + } + unconditional += processor + } + + private fun addProcessor(predicate:TilePredicate, processor: TileProcessor){ + getIndices(predicate).takeIf { indices -> indices.none { it<0 } }?.forEach { + mappings[it]+=processor + }?: run { + addUnconditional(processor) + } + } + + /** + * determines which blocks can mach given predicate + * @param pred predicate for which to determine blocks + * @return sequence of numerical ids of blocks that can match the given predicate + * @throws UnconditionalPredicate if predicate isn't restricted by block type + * */ + private fun getIndices(pred:TilePredicate):Sequence{ + return when(pred){ + is PartialBlockTag->{ + val key = TagKey(Registry.BLOCK_REGISTRY,(pred as PredicateIdAccessor).id) + ForgeRegistries.BLOCKS.tags()?.getTag(key)?.iterator()?.asSequence()?.map { (it as IndexedBlock).registryIndex }?: emptySequence() + + } + is PartialBlockGroup->{ + val key = (pred as PredicateIdAccessor).id + (ModConfigs.TILE_GROUPS as TileGroupsAccessor).groups[key]?.asSequence()?.flatMap ( ::getIndices )?: emptySequence() + + } + is PartialTile->{ + sequenceOf((pred.state.block as IndexedBlock).registryIndex) + } + is PartialBlockState->{ + sequenceOf((pred.block as IndexedBlock).registryIndex) + } + is PartialBlock->{ + sequenceOf((pred as IndexedBlock).registryIndex) + } + is OrTilePredicate->{ + pred.children.asSequence().flatMap ( ::getIndices ) + } + is LeveledPredicate->{ + pred.processor.levels.entries.asSequence().flatMap{ + (_,processor)-> + + if (processor is SpawnerTileProcessor || processor is WeightedTileProcessor) { + getIndices((processor as ProcessorPredicateAccessor).predicate) + } else if (processor is BernoulliWeightedTileProcessor) { + getIndices(processor.target) + } else if (processor is VaultLootTileProcessor) { + getIndices(PartialBlock.of(ModBlocks.PLACEHOLDER)) + } else if (processor is LeveledTileProcessor) { + getIndices(LeveledPredicate(processor)) + } else { + throw UnconditionalPredicate() + } + } + } + else -> throw UnconditionalPredicate() + }.distinct() + } +} + +private class UnconditionalPredicate:Throwable() + +private class LeveledPredicate(val processor:LeveledTileProcessor):TilePredicate { + override fun test(p0: PartialBlockState?, p1: PartialCompoundNbt?) = true +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/TileMapperContainer.kt b/src/main/java/implementslegend/mod/vaultfaster/TileMapperContainer.kt new file mode 100644 index 0000000..9129194 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/TileMapperContainer.kt @@ -0,0 +1,7 @@ +package implementslegend.mod.vaultfaster +/* +* for flattening purposes +* */ +interface TileMapperContainer { + val tileMapper:TileMapper +} \ No newline at end of file diff --git a/src/main/java/implementslegend/mod/vaultfaster/VaultFaster.java b/src/main/java/implementslegend/mod/vaultfaster/VaultFaster.java new file mode 100644 index 0000000..a1ff423 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/VaultFaster.java @@ -0,0 +1,77 @@ +package implementslegend.mod.vaultfaster; + +import com.mojang.logging.LogUtils; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.InterModComms; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.event.server.ServerStartingEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.slf4j.Logger; + +import java.util.stream.Collectors; +/* +* template file; does nothing +* +* */ +// The value here should match an entry in the META-INF/mods.toml file +@Mod("vaultfaster") +public class VaultFaster { + + // Directly reference a slf4j logger + private static final Logger LOGGER = LogUtils.getLogger(); + + public VaultFaster() { + // Register the setup method for modloading + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + // Register the enqueueIMC method for modloading + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); + // Register the processIMC method for modloading + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); + + // Register ourselves for server and other game events we are interested in + MinecraftForge.EVENT_BUS.register(this); + } + + private void setup(final FMLCommonSetupEvent event) { + // Some preinit code + LOGGER.info("HELLO FROM PREINIT"); + LOGGER.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName()); + } + + private void enqueueIMC(final InterModEnqueueEvent event) { + // Some example code to dispatch IMC to another mod + InterModComms.sendTo("vaultfaster", "helloworld", () -> { LOGGER.info("Hello world from the MDK"); return "Hello world";}); + } + + private void processIMC(final InterModProcessEvent event) { + // Some example code to receive and process InterModComms from other mods + LOGGER.info("Got IMC {}", event.getIMCStream(). + map(m->m.messageSupplier().get()). + collect(Collectors.toList())); + } + + // You can use SubscribeEvent and let the Event Bus discover methods to call + @SubscribeEvent + public void onServerStarting(ServerStartingEvent event) { + // Do something when the server starts + LOGGER.info("HELLO from server starting"); + } + + // You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD + // Event bus for receiving Registry Events) + @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) + public static class RegistryEvents { + @SubscribeEvent + public static void onBlocksRegistry(final RegistryEvent.Register blockRegistryEvent) { + // Register a new block here + LOGGER.info("HELLO from Register Block"); + } + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/batchSetBlock.kt b/src/main/java/implementslegend/mod/vaultfaster/batchSetBlock.kt new file mode 100644 index 0000000..f9b559b --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/batchSetBlock.kt @@ -0,0 +1,235 @@ +package implementslegend.mod.vaultfaster + +import implementslegend.mod.vaultfaster.mixin.ChunkAccessAccessor +import implementslegend.mod.vaultfaster.mixin.LevelChunkAccessor +import implementslegend.mod.vaultfaster.mixin.ProtoChunkAccessor +import iskallia.vault.VaultMod +import iskallia.vault.core.world.data.tile.PartialTile +import iskallia.vault.core.world.template.PlacementSettings +import iskallia.vault.core.world.template.Template +import iskallia.vault.init.ModBlocks +import net.minecraft.core.BlockPos +import net.minecraft.core.SectionPos +import net.minecraft.nbt.CompoundTag +import net.minecraft.world.Clearable +import net.minecraft.world.level.LevelAccessor +import net.minecraft.world.level.block.Block +import net.minecraft.world.level.block.Blocks +import net.minecraft.world.level.block.EntityBlock +import net.minecraft.world.level.block.entity.CommandBlockEntity +import net.minecraft.world.level.block.state.BlockState +import net.minecraft.world.level.chunk.ChunkAccess +import net.minecraft.world.level.chunk.ChunkStatus +import net.minecraft.world.level.chunk.LevelChunk +import net.minecraft.world.level.chunk.ProtoChunk +import net.minecraft.world.level.levelgen.Heightmap +import net.minecraft.world.level.lighting.LevelLightEngine +import net.minecraftforge.fml.loading.FMLEnvironment +import java.util.* + + +private infix fun Int.rangeUntilWidth(i: Int): IntRange = this until (this+i) + +@JvmInline +value class TileResult(val result:Any){ + val placedBlockEntities get()= placedBlockEntitiesGetter(result) as MutableList + val flowingPositions get()= flowingPositionsGetter(result) as MutableList + val sourcePositions get()= sourcePositionsGetter(result) as MutableList + + private companion object{ + + private var clazz = Arrays.stream(Template::class.java.declaredClasses).filter { it: Class<*> -> it.name.endsWith("TilePlacementResult") }.toList()[0] + val placedBlockEntitiesGetter = clazz.getField("placedBlockEntities")::get + val flowingPositionsGetter = clazz.getField("flowingPositions")::get + val sourcePositionsGetter = clazz.getField("sourcePositions")::get + } +} + + +fun LevelAccessor.placeTiles(blocks: Iterator, settings: PlacementSettings, result_:Any){ + val result = TileResult(result_) + val nl = ArrayList>(4096) + val tiles = ArrayList>(4096) + blocks.forEachRemaining{ + tile-> + val state = tile.state + .asWhole() + .orElseGet { + if (FMLEnvironment.production) { + VaultMod.LOGGER.error("Could not resolve tile '$tile' at (${tile.pos.x}, ${tile.pos.y}, ${tile.pos.z})") + } + ModBlocks.ERROR_BLOCK.defaultBlockState() + } + if (tile.entity.asWhole().isPresent) { + val blockentity = getBlockEntity(tile.pos) + Clearable.tryClear(blockentity) + } + nl+=tile.pos to state + tile.entity.asWhole().ifPresent{ + result.placedBlockEntities.add(tile) + tiles+=tile.pos to it + } + } + setBlocks(nl) + tiles.forEach { + (pos,tile)-> + try { + val blockEntity = getBlockEntity(pos) + + blockEntity?.load(tile) + if (blockEntity is CommandBlockEntity) { + scheduleTick(pos, Blocks.COMMAND_BLOCK, 1) + } + + } catch (e:Exception){setBlock(pos,ModBlocks.ERROR_BLOCK.defaultBlockState(),0)} + } +} + +fun LevelAccessor.setBlocks(blocks: List>){ + blocks.groupBy { SectionPos.of(it.first) }.forEach { (sectionPos, pairs) -> + val chunk = getChunk(sectionPos.x, sectionPos.z) + chunk.setBlocks((sectionPos.y-(chunk.minBuildHeight shr 4)),pairs) + } +} + + +/* +* the actual "fast set blocks" algorithm; +* differences: +* only acquires lock once per section +* can skip heightmap updates +* no "block set" events +* but light updates seem to be a bit broken for LevelChunk +* */ + +fun ChunkAccess.setBlocks(sectionIdx: Int, blocks: Iterable>, skipHeightmaps:Boolean=true){ + + val sectionHeightRange = minBuildHeight + 16 * sectionIdx rangeUntilWidth 16 + val sectionXRange = pos.x*16 rangeUntilWidth 16 + val sectionZRange = pos.z*16 rangeUntilWidth 16 + if(sectionIdx>4) + Unit + val section = getSection(sectionIdx) + val tasks = ArrayList<()->Unit>(4096) + try { + + section.acquire() + blocks.forEach { (position, newState) -> + if (position.x !in sectionXRange || position.z !in sectionZRange || position.y !in sectionHeightRange) return@forEach + + if (newState.getLightEmission(this, position) > 0 && this is ProtoChunk) (this as ProtoChunkAccessor).lights.add(BlockPos((position.x and 15) + sectionXRange.first, position.y, (position.z and 15) + sectionZRange.first)) + val j: Int = position.x and 15 + val k: Int = position.y and 15 + val l: Int = position.z and 15 + val old = if(this is LevelChunk)getBlockState(position) else null + val oldLight = old?.getLightEmission(this, position) + val oldOpacity = old?.getLightBlock(this, position) + val blockstate: BlockState = section.setBlockState(j, k, l, newState,false) + + + + if (!newState.hasBlockEntity()) { + if (blockstate.hasBlockEntity()) { + removeBlockEntity(position) + } + } + (this as? ProtoChunk)?.apply { + + + if (newState.hasBlockEntity()) { + val compoundtag = CompoundTag() + compoundtag.putInt("x", position.x) + compoundtag.putInt("y", position.y) + compoundtag.putInt("z", position.z) + compoundtag.putString("id", "DUMMY") + setBlockEntityNbt(compoundtag) + } + + if (status.isOrAfter(ChunkStatus.FEATURES) && newState !== blockstate && (newState.getLightBlock(this, position) != blockstate.getLightBlock(this, position) || newState.getLightEmission(this, position) != blockstate.getLightEmission(this, position) || newState.useShapeForLightOcclusion() || blockstate.useShapeForLightOcclusion())) { + (this as ProtoChunkAccessor).lightEngine?.checkBlock(position) + } + if(!skipHeightmaps) { + + val enumset = status.heightmapsAfter() + var enumset1: EnumSet? = null + + enumset.forEach { heightmapType -> + val heightmap = heightmaps.singleOrNull { it.key == heightmapType } + if (heightmap == null) { + val es = enumset1 ?: EnumSet.noneOf(Heightmap.Types::class.java).also { enumset1 = it } + es.add(heightmapType) + } + } + enumset1?.let { Heightmap.primeHeightmaps(this, it) } + + enumset.forEach { heightmapType -> heightmaps.singleOrNull { it.key == heightmapType }?.value?.update(j, position.y, l, blockstate) } + } + } + (this as? LevelChunk)?.apply { + + if (newState.hasBlockEntity()) { + val blockentity = (newState.getBlock() as EntityBlock).newBlockEntity(position, newState) + if (blockentity != null) { + setBlockEntity(blockentity) + } else { + removeBlockEntity(position) + } + } + + val block: Block = newState.block + if (!skipHeightmaps) { + heightmaps.singleOrNull { it.key == Heightmap.Types.MOTION_BLOCKING }?.value?.update(j, position.y, l, newState) + heightmaps.singleOrNull { it.key == Heightmap.Types.MOTION_BLOCKING_NO_LEAVES }?.value?.update(j, position.y, l, newState) + heightmaps.singleOrNull { it.key == Heightmap.Types.OCEAN_FLOOR }?.value?.update(j, position.y, l, newState) + heightmaps.singleOrNull { it.key == Heightmap.Types.WORLD_SURFACE }?.value?.update(j, position.y, l, newState) + } + val flag1: Boolean = section.hasOnlyAir() + if (/*flag != flag1*/ true) { + } + + val flag2: Boolean = blockstate.hasBlockEntity() + if (!level.isClientSide) { + blockstate.onRemove(level, position, newState, false) + } else if ((!blockstate.`is`(block) || !newState.hasBlockEntity()) && flag2) { + removeBlockEntity(position) + } + + + tasks += { + val blockstate1 = this.getBlockState(position) + if (blockstate1 !== old && (blockstate1.getLightBlock(this, position) != oldOpacity || blockstate1.getLightEmission(this, position) != oldLight || blockstate1.useShapeForLightOcclusion() || blockstate.useShapeForLightOcclusion())) { + level.profiler.push("queueCheckLight") + level.chunkSource.lightEngine.checkBlock(position) + level.profiler.pop() + } + if (section.getBlockState(j, k, l).`is`(block)) { + if (!level.isClientSide && !level.captureBlockSnapshots) { + newState.onPlace(level, position, blockstate, false) + } + if (newState.hasBlockEntity()) { + var blockentity = this.getBlockEntity(position, LevelChunk.EntityCreationType.CHECK) + if (blockentity == null) { + blockentity = (block as EntityBlock).newBlockEntity(position, newState) + if (blockentity != null) { + addAndRegisterBlockEntity(blockentity) + } + } else { + blockentity.blockState = newState + + (this as LevelChunkAccessor).callUpdateBlockEntityTicker(blockentity) + //(this as LevelChunkAccessor).callUpdateBlockEntityTicker(blockentity) + } + } + (this as ChunkAccessAccessor).setUnsaved(true) + //(this as LevelChunkAccessor).unsaved = true + } + } + } + } + }finally { + section.release() + tasks.forEach{ + it() + } + } +} \ No newline at end of file diff --git a/src/main/java/implementslegend/mod/vaultfaster/blocks.kt b/src/main/java/implementslegend/mod/vaultfaster/blocks.kt new file mode 100644 index 0000000..888db5d --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/blocks.kt @@ -0,0 +1,27 @@ +package implementslegend.mod.vaultfaster + +import net.minecraft.core.IdMapper +import net.minecraft.world.level.block.Block +import net.minecraftforge.registries.ForgeRegistries +import net.minecraftforge.registries.ForgeRegistry + +//forge bad + +/* + external block <-> integer map + forge registries use pretty slow way of mapping blocks to numbers + also their mappings may change within single game instance + */ + +val BLOCKS by lazy { + val data = (ForgeRegistries.BLOCKS as ForgeRegistry).values + + val result = IdMapper(data.maxOf { (it as IndexedBlock).registryIndex }+1) + data.forEach { + result.addMapping(it,(it as IndexedBlock).registryIndex) + } + result +} + +fun getBlockByIDOrNull(id:Int):Block? = BLOCKS.byId(id) +fun getIdForBlock(block:Block?) = block?.let { BLOCKS.getId(it) }?:-1 \ No newline at end of file diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/ChunkAccessAccessor.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/ChunkAccessAccessor.java new file mode 100644 index 0000000..5b26f46 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/ChunkAccessAccessor.java @@ -0,0 +1,11 @@ +package implementslegend.mod.vaultfaster.mixin; + +import net.minecraft.world.level.chunk.ChunkAccess; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(ChunkAccess.class) +public interface ChunkAccessAccessor { + @Accessor + void setUnsaved(boolean value); +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/FixObjectives.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/FixObjectives.java new file mode 100644 index 0000000..88602cd --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/FixObjectives.java @@ -0,0 +1,30 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.ObjectiveTemplateEvent; +import iskallia.vault.core.event.Event; +import iskallia.vault.core.event.common.BlockSetEvent; +import iskallia.vault.core.vault.objective.*; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.function.Consumer; + + +/* +* removal of CommonEvents.BLOCK_SET_EVENT caused objectives to stop working; this is a fix (but herald still doesn't work) +* +* */ +@Mixin({ScavengerObjective.class, LodestoneObjective.class, HeraldObjective.class, ObeliskObjective.class, MonolithObjective.class, CrakePedestalObjective.class}) +public class FixObjectives { + + + /* + * replaces old block set event with new objective template event + * */ + @Redirect(method = "initServer",at = @At(value = "INVOKE", target = "Liskallia/vault/core/event/common/BlockSetEvent;register(Ljava/lang/Object;Ljava/util/function/Consumer;)Liskallia/vault/core/event/Event;"),remap = false) + private Event fixObjective(BlockSetEvent instance, Object o, Consumer consumer){ + ObjectiveTemplateEvent.INSTANCE.registerObjectiveTemplate((Objective)(Object)this); + return ObjectiveTemplateEvent.INSTANCE; + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/JigsawRootAccessor.kt b/src/main/java/implementslegend/mod/vaultfaster/mixin/JigsawRootAccessor.kt new file mode 100644 index 0000000..4b3a142 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/JigsawRootAccessor.kt @@ -0,0 +1,11 @@ +package implementslegend.mod.vaultfaster.mixin + +import iskallia.vault.core.world.template.JigsawTemplate +import iskallia.vault.core.world.template.Template +import org.spongepowered.asm.mixin.Mixin +import org.spongepowered.asm.mixin.gen.Accessor + +@Mixin(JigsawTemplate::class) +interface JigsawRootAccessor { + var root: Template @Accessor get @Accessor set +} \ No newline at end of file diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/LevelChunkAccessor.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/LevelChunkAccessor.java new file mode 100644 index 0000000..33313ae --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/LevelChunkAccessor.java @@ -0,0 +1,11 @@ +package implementslegend.mod.vaultfaster.mixin; + +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.chunk.LevelChunk; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(LevelChunk.class) +public interface LevelChunkAccessor { + @Invoker void callUpdateBlockEntityTicker(T p_156407_); +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MeasurePerformance.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MeasurePerformance.java new file mode 100644 index 0000000..214e3b2 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MeasurePerformance.java @@ -0,0 +1,43 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.Performance; +import iskallia.vault.core.world.generator.DummyChunkGenerator; +import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderSet; +import net.minecraft.core.Registry; +import net.minecraft.server.level.WorldGenRegion; +import net.minecraft.world.level.StructureFeatureManager; +import net.minecraft.world.level.biome.BiomeSource; +import net.minecraft.world.level.chunk.ChunkAccess; +import net.minecraft.world.level.chunk.ChunkGenerator; +import net.minecraft.world.level.levelgen.blending.Blender; +import net.minecraft.world.level.levelgen.structure.StructureSet; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.List; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; + +@Mixin(DummyChunkGenerator.class) +public abstract class MeasurePerformance extends ChunkGenerator { + private Performance performance = new Performance(); + + public MeasurePerformance(Registry p_207960_, Optional> p_207961_, BiomeSource p_207962_) { + super(p_207960_, p_207961_, p_207962_); + } + + @Inject(method = "buildSurface", at = @At("TAIL")) + private void chunkDone(WorldGenRegion genRegion, StructureFeatureManager structureFeatureManager, ChunkAccess chunk, CallbackInfo ci){ + performance.record(); + } + + @Override + public void addDebugScreenInfo(List p_208054_, BlockPos p_208055_) { + p_208054_.add("generated chunks: "+performance.getCount()); + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinBlockRegistryIndex.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinBlockRegistryIndex.java new file mode 100644 index 0000000..626f269 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinBlockRegistryIndex.java @@ -0,0 +1,29 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.IndexedBlock; +import net.minecraft.core.Registry; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.ForgeRegistry; +import org.spongepowered.asm.mixin.Mixin; + +/* +* adds registry indices to all blocks +* */ + +@Mixin(BlockBehaviour.class) +public class MixinBlockRegistryIndex implements IndexedBlock { + + private int registryIndex = -1; + @Override + public int getRegistryIndex() { + if(registryIndex<0){ + registryIndex= ((ForgeRegistry)ForgeRegistries.BLOCKS).getID((BlockBehaviour) (Object)this); + } + return registryIndex; + } + + @Override + public void copyRegistryIndex(int newIndex) {} +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinLeveledProcessor.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinLeveledProcessor.java new file mode 100644 index 0000000..0be93b9 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinLeveledProcessor.java @@ -0,0 +1,74 @@ +package implementslegend.mod.vaultfaster.mixin; + +import iskallia.vault.core.Version; +import iskallia.vault.core.data.key.PaletteKey; +import iskallia.vault.core.vault.Vault; +import iskallia.vault.core.vault.VaultLevel; +import iskallia.vault.core.vault.VaultRegistry; +import iskallia.vault.core.world.data.tile.PartialTile; +import iskallia.vault.core.world.processor.Palette; +import iskallia.vault.core.world.processor.ProcessorContext; +import iskallia.vault.core.world.processor.tile.LeveledTileProcessor; +import iskallia.vault.core.world.processor.tile.TileProcessor; +import iskallia.vault.init.ModConfigs; +import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; +import net.minecraftforge.fml.config.ModConfig; +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.Inject; + +import java.lang.ref.PhantomReference; +import java.util.Map; + + +/* +* replaces map* of levels with table +* for some reason that map is hash map with linear search, but tree map would be better; doesn't matter since table is instant +* */ +@Mixin(LeveledTileProcessor.class) +public class MixinLeveledProcessor { + + @Shadow public Map levels; + private int cachedLevel = -1; + + private TileProcessor[] table; + private PhantomReference lastVault = new PhantomReference(null,null); + public int getCachedLevel(ProcessorContext context) {//this could break when running 2 vaults simultaneously + var lvl = cachedLevel; + if (lvl<0 || !lastVault.refersTo(context.getVault())) { + lastVault = new PhantomReference<>(context.getVault(),null); + lvl= context.getVault() == null ? -1 : ((VaultLevel)context.getVault().get(Vault.LEVEL)).get(); + cachedLevel=lvl; + } + return lvl; + } + + + @Overwrite(remap = false) + public PartialTile process(PartialTile tile, ProcessorContext context) { + TileProcessor processor; + int level = getCachedLevel(context); + + var table = getOrCreateTable(); + if(level<0)level=0; + if(level>=table.length) level=table.length-1; + processor=table[level]; + + return processor == null ? tile : (PartialTile)processor.process(tile, context); + } + + private TileProcessor[] getOrCreateTable() { + if(this.table==null) { + var table = new TileProcessor[ModConfigs.LEVELS_META.getMaxLevel()]; + for (Map.Entry entry : this.levels.entrySet()) { + for (int i = entry.getKey(); i < table.length; i++) { + table[i] = (TileProcessor) entry.getValue(); + } + } + this.table = table; + } + return table; + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPalette.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPalette.java new file mode 100644 index 0000000..16bfe7f --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPalette.java @@ -0,0 +1,42 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.TileMapper; +import implementslegend.mod.vaultfaster.TileMapperContainer; +import iskallia.vault.core.world.processor.Palette; +import iskallia.vault.core.world.processor.tile.TileProcessor; +import org.jetbrains.annotations.NotNull; +import org.objectweb.asm.Opcodes; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +import java.util.List; + +/* + * adds TileMapper; faster processing of tiles + */ + +@Mixin(Palette.class) +public class MixinPalette implements TileMapperContainer { + @Shadow protected List tileProcessors; + private TileMapper mapper = new TileMapper(); + + @NotNull + @Override + public TileMapper getTileMapper() { + return mapper; + } + + @Inject(method = "processTile",at = @At("HEAD"),remap = false) + private void registerProcessor(TileProcessor processor, CallbackInfoReturnable cir){ + mapper.addProcessor(processor); + } + @Inject(method = "copy",locals = LocalCapture.CAPTURE_FAILHARD,at = @At(value = "NEW", shift = At.Shift.BY, by = 4, target = "()Liskallia/vault/core/world/processor/Palette;"),remap = false) + private void copyMapper(CallbackInfoReturnable cir, Palette nw){ + tileProcessors.forEach(((TileMapperContainer) nw).getTileMapper()::addProcessor); + } + +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartBlockProperties.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartBlockProperties.java new file mode 100644 index 0000000..8a55083 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartBlockProperties.java @@ -0,0 +1,24 @@ +package implementslegend.mod.vaultfaster.mixin; + +import iskallia.vault.core.world.data.tile.PartialBlockProperties; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +import java.util.LinkedHashMap; +import java.util.Map; + +/* +* replaces regular hash map with linked hash map for faster iteration +* */ + +@Mixin(PartialBlockProperties.class) +public class MixinPartBlockProperties { + + + + @ModifyVariable(method = "", at = @At(value = "HEAD"), argsOnly = true) + private static Map useLinkedHashMap(Map values){ + return new LinkedHashMap(values); + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartialBlockState.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartialBlockState.java new file mode 100644 index 0000000..d64c15d --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartialBlockState.java @@ -0,0 +1,26 @@ +package implementslegend.mod.vaultfaster.mixin; + + +import implementslegend.mod.vaultfaster.IndexedBlock; +import iskallia.vault.core.world.data.tile.PartialBlock; +import iskallia.vault.core.world.data.tile.PartialBlockState; +import net.minecraft.world.level.block.Block; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; +/* +* comparison using registry indices +* */ +@Mixin(PartialBlockState.class) +public class MixinPartialBlockState { + + @Shadow private PartialBlock block; + + + @Overwrite(remap = false) + public boolean is(Block b){ + return ((IndexedBlock)b).getRegistryIndex() == ((IndexedBlock)block).getRegistryIndex(); + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPlacementSettings.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPlacementSettings.java new file mode 100644 index 0000000..6c5a830 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPlacementSettings.java @@ -0,0 +1,59 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.TileMapper; +import implementslegend.mod.vaultfaster.TileMapperContainer; +import iskallia.vault.core.world.processor.Palette; +import iskallia.vault.core.world.processor.Processor; +import iskallia.vault.core.world.processor.tile.*; +import iskallia.vault.core.world.template.PlacementSettings; +import org.jetbrains.annotations.NotNull; +import org.objectweb.asm.Opcodes; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +import java.util.List; + + +/* + * adds TileMapper; faster processing of tiles + */ + + +@Mixin(PlacementSettings.class) +public class MixinPlacementSettings implements TileMapperContainer { + @Shadow + protected List tileProcessors; + private TileMapper mapper = new TileMapper(); + + @NotNull + @Override + public TileMapper getTileMapper() { + return mapper; + } + + @Inject(method = "addProcessor(Liskallia/vault/core/world/processor/Processor;)Liskallia/vault/core/world/template/PlacementSettings;",at = @At("HEAD"),remap = false) + private void registerProcessor(Processor processor, CallbackInfoReturnable cir){ + if(processor instanceof TargetTileProcessor || + processor instanceof VaultLootTileProcessor || + processor instanceof ReferenceTileProcessor || + processor instanceof LeveledTileProcessor + ) mapper.addProcessor((TileProcessor) processor); + } + @Inject(method = "copy",locals = LocalCapture.CAPTURE_FAILHARD,at = @At(value = "INVOKE", shift = At.Shift.BY, by = 2,opcode = Opcodes.INVOKESPECIAL,ordinal = 0,target = "Liskallia/vault/core/world/template/PlacementSettings;(Liskallia/vault/core/world/processor/ProcessorContext;)V"),remap = false) + private void copyMapper(CallbackInfoReturnable cir, PlacementSettings nw){ + + TileMapper tileMapper = ((TileMapperContainer) nw).getTileMapper(); + tileProcessors.forEach(processor -> { + if(processor instanceof TargetTileProcessor || + processor instanceof VaultLootTileProcessor || + processor instanceof ReferenceTileProcessor || + processor instanceof LeveledTileProcessor + ) tileMapper.addProcessor(processor); + }); + + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinReferenceTileProcessor.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinReferenceTileProcessor.java new file mode 100644 index 0000000..6dd6afd --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinReferenceTileProcessor.java @@ -0,0 +1,55 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.CachedPaletteContainer; +import implementslegend.mod.vaultfaster.TileMapperContainer; +import iskallia.vault.core.Version; +import iskallia.vault.core.data.key.PaletteKey; +import iskallia.vault.core.vault.Vault; +import iskallia.vault.core.vault.VaultRegistry; +import iskallia.vault.core.world.data.tile.PartialTile; +import iskallia.vault.core.world.processor.Palette; +import iskallia.vault.core.world.processor.ProcessorContext; +import iskallia.vault.core.world.processor.tile.ReferenceTileProcessor; +import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; + +import java.lang.ref.PhantomReference; + +/* +* caches some slow accesses +* */ + +@Mixin(ReferenceTileProcessor.class) +public class MixinReferenceTileProcessor implements CachedPaletteContainer { + + @Shadow @Final private ResourceLocation id; + private Palette cachedPalette; + private Version cachedVersion; + private PhantomReference lastVault = new PhantomReference(null,null); + + @Overwrite(remap = false) + public PartialTile process(PartialTile value, ProcessorContext context) { + value=((TileMapperContainer)getCachedPalette(context)).getTileMapper().mapBlock(value, context); + return value; + } + + @NotNull + @Override + public Palette getCachedPalette(ProcessorContext context) {//this could break when running 2 vaults simultaneously + var palette = cachedPalette; + if (cachedVersion==null || cachedPalette==null || !lastVault.refersTo(context.getVault())) { + lastVault = new PhantomReference<>(context.getVault(),null); + Version version = context.getVault() == null ? Version.latest() : (Version)context.getVault().get(Vault.VERSION); + if(version!=cachedVersion){ + cachedVersion=version; + palette = (Palette)((PaletteKey) VaultRegistry.PALETTE.getKey(this.id)).get(version); + cachedPalette=palette; + } + } + return palette; + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinStructureTemplate.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinStructureTemplate.java new file mode 100644 index 0000000..a6779ed --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinStructureTemplate.java @@ -0,0 +1,90 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.IndexedBlock; +import implementslegend.mod.vaultfaster.TileMapperContainer; +import iskallia.vault.core.util.iterator.MappingIterator; +import iskallia.vault.core.world.data.tile.PartialTile; +import iskallia.vault.core.world.data.tile.TilePredicate; +import iskallia.vault.core.world.processor.Processor; +import iskallia.vault.core.world.processor.ProcessorContext; +import iskallia.vault.core.world.processor.tile.*; +import iskallia.vault.core.world.template.PlacementSettings; +import iskallia.vault.core.world.template.StructureTemplate; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistries; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; + +import java.util.Iterator; +import java.util.List; +import java.util.Map; +/* +* applies tile mapper when processing all tiles except spawners +* */ +@SuppressWarnings("ALL") +@Mixin(StructureTemplate.class) +public class MixinStructureTemplate { + + + @Shadow private Map> tiles; + + private int spawnerId = -1; + + private int getSpawnerId(){ + if(spawnerId<0){ + spawnerId = ((IndexedBlock)ForgeRegistries.BLOCKS.getValue(ResourceLocation.tryParse("ispawner:spawner"))).getRegistryIndex(); + } + return spawnerId; + } + + @Overwrite(remap = false) + public Iterator getTiles(TilePredicate filter, PlacementSettings settings) { + + return new MappingIterator(((List)this.tiles.get(filter)).iterator(), (PartialTile tile) -> { + tile = tile.copy(); + + if (tile == null || !filter.test(tile)) { + tile = null; + return tile; + } + var isSpawner = ((IndexedBlock)tile.getState().getBlock()).getRegistryIndex()==getSpawnerId(); + + for(Processor processor : settings.getTileProcessors()) { + + if (tile == null || !filter.test(tile)) { + tile = null; + break; + } + if((processor instanceof TargetTileProcessor || + processor instanceof VaultLootTileProcessor || + processor instanceof ReferenceTileProcessor || + processor instanceof LeveledTileProcessor) && !isSpawner + ); else + processNotTargetted(processor,tile,settings.getProcessorContext()); + } + + if(!isSpawner)tile=((TileMapperContainer)settings).getTileMapper().mapBlock(tile,settings.getProcessorContext()); + /* + for(Processor processor : settings.getTileProcessors()) { + + if (tile == null || !filter.test(tile)) { + tile = null; + break; + } + tile=(processor instanceof TargetTileProcessor)? processTargeted(processor,tile,settings.getProcessorContext()):processNotTargetted(processor,tile,settings.getProcessorContext()); + }*/ + + return tile; + }); + } + + /*for profiling*/ + private PartialTile processNotTargetted(Processor processor, PartialTile tile, ProcessorContext processorContext) { + return processor.process(tile, processorContext); + } + + private PartialTile processTargeted(Processor processor, PartialTile tile, ProcessorContext processorContext) { + return processor.process(tile, processorContext); + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinTemplate.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinTemplate.java new file mode 100644 index 0000000..eaa934e --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinTemplate.java @@ -0,0 +1,52 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.BatchSetBlockKt; +import iskallia.vault.core.world.data.tile.PartialTile; +import iskallia.vault.core.world.template.PlacementSettings; +import iskallia.vault.core.world.template.Template; +import net.minecraft.world.level.ServerLevelAccessor; +import net.minecraft.world.level.block.Blocks; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Coerce; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; + + +/* +* applies fast batchSetBlocks algorithm for faster placement of blocks +* */ +@Mixin(Template.class) +public abstract class MixinTemplate { + + private static Constructor resultConstructor = getResultConstructor(); + + private static Constructor getResultConstructor() { + var result = Arrays.stream(Template.class.getDeclaredClasses()).filter((it)->it.getName().endsWith("TilePlacementResult")).toList().get(0).getConstructors()[0]; + result.trySetAccessible(); + return result; + } + + @Shadow public abstract Iterator getTiles(PlacementSettings settings); + + + @Coerce + @Inject(method = "placeTiles",at = @At(value = "INVOKE", target = "Liskallia/vault/core/world/template/Template;getTiles(Liskallia/vault/core/world/template/PlacementSettings;)Ljava/util/Iterator;"),cancellable = true, remap = false) + private void fastPlaceTiles(ServerLevelAccessor world, PlacementSettings settings, CallbackInfoReturnable cir) throws InvocationTargetException, InstantiationException, IllegalAccessException { + Object result = resultConstructor.newInstance(/*private classes are hard to access*/ + new ArrayList(1024), new ArrayList(settings.doKeepFluids() ? 4096 : 0), new ArrayList(settings.doKeepFluids() ? 4096 : 0) + ); + var tiles = getTiles(settings); + BatchSetBlockKt.placeTiles(world,tiles,settings, result); + + cir.setReturnValue(result); + } + +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinVaultLayout.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinVaultLayout.java new file mode 100644 index 0000000..7f26ee1 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinVaultLayout.java @@ -0,0 +1,60 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.BatchSetBlockKt; +import implementslegend.mod.vaultfaster.ObjectiveTemplateData; +import implementslegend.mod.vaultfaster.ObjectiveTemplateEvent; +import implementslegend.mod.vaultfaster.SectionBlocksKt; +import iskallia.vault.core.data.DataObject; +import iskallia.vault.core.data.key.FieldKey; +import iskallia.vault.core.event.Event; +import iskallia.vault.core.event.common.NoiseGenerationEvent; +import iskallia.vault.core.random.RandomSource; +import iskallia.vault.core.util.RegionPos; +import iskallia.vault.core.vault.Vault; +import iskallia.vault.core.world.generator.layout.VaultLayout; +import iskallia.vault.core.world.template.JigsawTemplate; +import iskallia.vault.core.world.template.PlacementSettings; +import iskallia.vault.core.world.template.Template; +import iskallia.vault.init.ModBlocks; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.List; +import java.util.function.Consumer; + +@Mixin(VaultLayout.class) +public abstract class MixinVaultLayout { + + @Shadow @Final public static FieldKey FILL_AIR; + + /*faster way to fill the world with bedrock, could be even faster if you just replaced palette entry*/ + @Redirect(method = "initServer",at = @At(value = "INVOKE", target = "Liskallia/vault/core/event/common/NoiseGenerationEvent;register(Ljava/lang/Object;Ljava/util/function/Consumer;)Liskallia/vault/core/event/Event;"),remap = false) + private Event batchFill(NoiseGenerationEvent instance, Object o, Consumer consumer){ + + return instance.register(o,((DataObject)(Object)this).has(FILL_AIR)?(obj)->{}:(NoiseGenerationEvent.Data obj)->{ + for(var section = 3;section>=0;section--) { + + BatchSetBlockKt.setBlocks(obj.getChunk(), section, SectionBlocksKt.blocksToFill(obj.getChunk().getPos().getWorldPosition().atY(16*section-obj.getGenRegion().getMinBuildHeight())),true); + } + obj.getChunk().getHeightmaps().forEach((entry)->{//batchSetBlocks skips heightmap updates; must be done manually + for(var x = 0;x<16;x++) { + for(var z = 0;z<16;z++) { + entry.getValue().update(x, 63, z, ModBlocks.VAULT_BEDROCK.defaultBlockState()); + } + } + }); + }); + } + + + /*calls event to change template for objective placeholder since the old method is removed*/ + @Redirect(method = "getAt",at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z",ordinal = 0),remap = false) + boolean invokeObjectiveFixEvent(List instance, Object e){ + var data = new ObjectiveTemplateData((JigsawTemplate) e); + ObjectiveTemplateEvent.INSTANCE.invoke(data); + return instance.add(data.getTemplate()); + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/NoBiomeDecorations.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/NoBiomeDecorations.java new file mode 100644 index 0000000..eba3b7c --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/NoBiomeDecorations.java @@ -0,0 +1,30 @@ +package implementslegend.mod.vaultfaster.mixin; + +import iskallia.vault.core.world.generator.DummyChunkGenerator; +import net.minecraft.core.HolderSet; +import net.minecraft.core.Registry; +import net.minecraft.world.level.StructureFeatureManager; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.biome.BiomeSource; +import net.minecraft.world.level.chunk.ChunkAccess; +import net.minecraft.world.level.chunk.ChunkGenerator; +import net.minecraft.world.level.levelgen.structure.StructureSet; +import org.spongepowered.asm.mixin.Mixin; + +import java.util.Optional; +/* +* removes decorations +* */ +@Mixin(DummyChunkGenerator.class) +public abstract class NoBiomeDecorations extends ChunkGenerator { + + + public NoBiomeDecorations(Registry p_207960_, Optional> p_207961_, BiomeSource p_207962_) { + super(p_207960_, p_207961_, p_207962_); + } + + @Override + public void applyBiomeDecoration(WorldGenLevel p_187712_, ChunkAccess p_187713_, StructureFeatureManager p_187714_) { + + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/PartialBlockIDAccessor.kt b/src/main/java/implementslegend/mod/vaultfaster/mixin/PartialBlockIDAccessor.kt new file mode 100644 index 0000000..081db1a --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/PartialBlockIDAccessor.kt @@ -0,0 +1,11 @@ +package implementslegend.mod.vaultfaster.mixin + +import iskallia.vault.core.world.data.tile.PartialBlock +import net.minecraft.resources.ResourceLocation +import org.spongepowered.asm.mixin.Mixin +import org.spongepowered.asm.mixin.gen.Accessor + +@Mixin(PartialBlock::class) +interface PartialBlockIDAccessor { + val id: ResourceLocation @Accessor get +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/PartialBlockRegistryIndex.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/PartialBlockRegistryIndex.java new file mode 100644 index 0000000..0894dac --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/PartialBlockRegistryIndex.java @@ -0,0 +1,88 @@ +package implementslegend.mod.vaultfaster.mixin; + +import implementslegend.mod.vaultfaster.BlocksKt; +import implementslegend.mod.vaultfaster.IndexedBlock; +import iskallia.vault.core.world.data.tile.PartialBlock; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.ForgeRegistry; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.Optional; + + +/* +* replaces resource locations with registry indicies for faster comparisons +* */ + +@Mixin(PartialBlock.class) +public class PartialBlockRegistryIndex implements IndexedBlock { + @Shadow protected ResourceLocation id; + private int regIdx = -69420; + + @Override + public int getRegistryIndex(){ + if(regIdx==-69420){ + regIdx= BlocksKt.getIdForBlock(((ForgeRegistry) ForgeRegistries.BLOCKS).getValue(this.id)); + if(regIdx==0 ) { + var resName = ((PartialBlockIDAccessor)this).getId(); + if(!resName.getNamespace().equals("minecraft") && !resName.getPath().equals("air")) regIdx=-666; + } + } + return regIdx; + } + @Override + public void copyRegistryIndex(int newIndex){ + regIdx=newIndex; + } + + + + @Overwrite(remap = false) + public static PartialBlock of(Block block) { + var partial = PartialBlock.of(block.getRegistryName()); + ((IndexedBlock)partial).copyRegistryIndex(((IndexedBlock)block).getRegistryIndex()); + return partial; + } + + + + @Overwrite(remap = false) + public static PartialBlock of(BlockState state) { + return PartialBlock.of(state.getBlock()); + } + + @Overwrite(remap = false) + public boolean isSubsetOf(PartialBlock other) { + return this.id == null || (regIdx<0?this.id.equals(((PartialBlockIDAccessor)other).getId()):((IndexedBlock)other).getRegistryIndex()==getRegistryIndex()); + } + + @Overwrite(remap = false) + public Optional asWhole() { + return Optional.ofNullable(BlocksKt.getBlockByIDOrNull(getRegistryIndex())); + } + + + @Overwrite(remap = false) + public PartialBlock copy() { + var pb = PartialBlock.of(this.id); + ((IndexedBlock)pb).copyRegistryIndex(getRegistryIndex()); + return pb; + } + + + @Inject(method = "fillInto(Liskallia/vault/core/world/data/tile/PartialBlock;)V",at = @At("HEAD"), remap = false) + public void fillInto(PartialBlock other, CallbackInfo ci) { + if (this.id != null) { + ((IndexedBlock)other).copyRegistryIndex(getRegistryIndex()); + } + } +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/PredicateIdAccessor.kt b/src/main/java/implementslegend/mod/vaultfaster/mixin/PredicateIdAccessor.kt new file mode 100644 index 0000000..f9b4a8d --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/PredicateIdAccessor.kt @@ -0,0 +1,12 @@ +package implementslegend.mod.vaultfaster.mixin + +import iskallia.vault.core.world.data.tile.PartialBlockGroup +import iskallia.vault.core.world.data.tile.PartialBlockTag +import net.minecraft.resources.ResourceLocation +import org.spongepowered.asm.mixin.Mixin +import org.spongepowered.asm.mixin.gen.Accessor + +@Mixin(value = [PartialBlockGroup::class, PartialBlockTag::class]) +interface PredicateIdAccessor { + val id:ResourceLocation @Accessor get +} \ No newline at end of file diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/ProcessorPredicateAccessor.kt b/src/main/java/implementslegend/mod/vaultfaster/mixin/ProcessorPredicateAccessor.kt new file mode 100644 index 0000000..f2811ed --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/ProcessorPredicateAccessor.kt @@ -0,0 +1,11 @@ +package implementslegend.mod.vaultfaster.mixin + +import iskallia.vault.core.world.data.tile.TilePredicate +import iskallia.vault.core.world.processor.tile.TargetTileProcessor +import org.spongepowered.asm.mixin.Mixin +import org.spongepowered.asm.mixin.gen.Accessor + +@Mixin(TargetTileProcessor::class) +interface ProcessorPredicateAccessor { + val predicate:TilePredicate @Accessor get +} \ No newline at end of file diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/ProtoChunkAccessor.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/ProtoChunkAccessor.java new file mode 100644 index 0000000..06be5f7 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/ProtoChunkAccessor.java @@ -0,0 +1,17 @@ +package implementslegend.mod.vaultfaster.mixin; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.chunk.ProtoChunk; +import net.minecraft.world.level.lighting.LevelLightEngine; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import java.util.List; + +@Mixin(ProtoChunk.class) +public interface ProtoChunkAccessor { + @Accessor + LevelLightEngine getLightEngine(); + @Accessor + List getLights(); +} diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/TileGroupsAccessor.kt b/src/main/java/implementslegend/mod/vaultfaster/mixin/TileGroupsAccessor.kt new file mode 100644 index 0000000..1e6c91f --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/TileGroupsAccessor.kt @@ -0,0 +1,12 @@ +package implementslegend.mod.vaultfaster.mixin + +import iskallia.vault.config.TileGroupsConfig +import iskallia.vault.core.world.data.tile.TilePredicate +import net.minecraft.resources.ResourceLocation +import org.spongepowered.asm.mixin.Mixin +import org.spongepowered.asm.mixin.gen.Accessor + +@Mixin(TileGroupsConfig::class) +interface TileGroupsAccessor { + val groups:Map> @Accessor get +} \ No newline at end of file diff --git a/src/main/java/implementslegend/mod/vaultfaster/sectionBlocks.kt b/src/main/java/implementslegend/mod/vaultfaster/sectionBlocks.kt new file mode 100644 index 0000000..6e7e7c2 --- /dev/null +++ b/src/main/java/implementslegend/mod/vaultfaster/sectionBlocks.kt @@ -0,0 +1,41 @@ +package implementslegend.mod.vaultfaster + +import iskallia.vault.init.ModBlocks +import net.minecraft.core.BlockPos +import net.minecraft.core.BlockPos.MutableBlockPos +import net.minecraft.world.level.block.state.BlockState + +/* +* sequence for filling entire section with bedrock +* */ + +fun blocksToFill(offset:BlockPos):Iterable> { + + val mutBlockPos = MutableBlockPos() + mutBlockPos.set(offset) + mutBlockPos.x-- + mutBlockPos.y+=15 + val state = ModBlocks.VAULT_BEDROCK.defaultBlockState() + return generateSequence>{ + mutBlockPos.x-=offset.x + mutBlockPos.y-=offset.y + mutBlockPos.z-=offset.z + mutBlockPos.x++ + while(mutBlockPos.x>15) { + mutBlockPos.x%=16 + mutBlockPos.z++ + while(mutBlockPos.z>15) { + mutBlockPos.z%=16 + mutBlockPos.y-- + if(mutBlockPos.y<0) return@generateSequence null + } + } + mutBlockPos.x+=offset.x + mutBlockPos.y+=offset.y + mutBlockPos.z+=offset.z + (mutBlockPos to state) + + + }.asIterable() + +} \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..6972a2b --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,55 @@ +# 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="javafml" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the forge version +loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +# 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.minecraftforge.net/en/latest/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="vaultfaster.png" #optional +# A text field displayed in the mod UI +#credits="Thanks for this example mod goes to Java" #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}''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies."${mod_id}"]] #optional + # the modid of the dependency + modId="forge" #mandatory + # Does this dependency have to exist - if not, ordering below must be specified + mandatory=true #mandatory + # The version range of the dependency + versionRange="${forge_version_range}" #mandatory + # An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory + # 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="the_vault" + mandatory=true + # This version range declares a minimum of the current minecraft version up to but not including the next major version + versionRange="[1.18.2-3.11,)" + ordering="NONE" + side="BOTH" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..57c389e --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": "vaultfaster resources", + "pack_format": 9, + "forge:resource_pack_format": 8, + "forge:data_pack_format": 9 + } +} diff --git a/src/main/resources/vaultfaster.mixins.json b/src/main/resources/vaultfaster.mixins.json new file mode 100644 index 0000000..3b275a9 --- /dev/null +++ b/src/main/resources/vaultfaster.mixins.json @@ -0,0 +1,36 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "implementslegend.mod.vaultfaster.mixin", + "compatibilityLevel": "JAVA_17", + "refmap": "vaultfaster.refmap.json", + "mixins": [ + "MeasurePerformance", + "ChunkAccessAccessor", + "FixObjectives", + "JigsawRootAccessor", + "LevelChunkAccessor", + "MixinBlockRegistryIndex", + "MixinLeveledProcessor", + "MixinPalette", + "MixinPartBlockProperties", + "MixinPartialBlockState", + "MixinPlacementSettings", + "MixinReferenceTileProcessor", + "MixinStructureTemplate", + "MixinTemplate", + "MixinVaultLayout", + "NoBiomeDecorations", + "PartialBlockIDAccessor", + "PartialBlockRegistryIndex", + "PredicateIdAccessor", + "ProcessorPredicateAccessor", + "ProtoChunkAccessor", + "TileGroupsAccessor" + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +}