From e4e12723f1a8743d7ff625a3fa7609fcd7a46095 Mon Sep 17 00:00:00 2001
From: ImplementsLegend <thsmpsns50@gmail.com>
Date: Sat, 16 Mar 2024 22:37:39 +0100
Subject: [PATCH] fixed puzzle rooms, god altars, painting rooms and factory
 rooms, stopped constant print to console from performance measurement

---
 gradle.properties                               |  4 ++--
 .../mod/vaultfaster/Performance.kt              |  7 +++++--
 .../mixin/MixinStructureTemplate.java           | 17 +++++++++++++----
 src/main/resources/META-INF/mods.toml           |  1 +
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 7c50c6f..6bce2ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,12 +42,12 @@ 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
+mod_version=1.0.1
 # 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=
+mod_authors=implementsLegend
 # 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/src/main/java/implementslegend/mod/vaultfaster/Performance.kt b/src/main/java/implementslegend/mod/vaultfaster/Performance.kt
index 5bc55a9..79c722d 100644
--- a/src/main/java/implementslegend/mod/vaultfaster/Performance.kt
+++ b/src/main/java/implementslegend/mod/vaultfaster/Performance.kt
@@ -3,6 +3,8 @@ package implementslegend.mod.vaultfaster
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicLong
 
+private val printInterval = System.getProperties().getProperty("implementslegend.vaultfaster.performanceprintinterval","-1").toInt()
+
 class Performance {
     var count = AtomicInteger()
     var start = System.currentTimeMillis()
@@ -12,11 +14,12 @@ class Performance {
 
     fun record() {
         val c = count.incrementAndGet()
+        if(printInterval>=0)
         lastPrint.updateAndGet {
-            if(it+400<System.currentTimeMillis()){
+            if(it+ printInterval<System.currentTimeMillis()){
                 println("totalChunks: $c, time: ${System.currentTimeMillis()-start}, chunksPerS: ${(1000*c)/(System.currentTimeMillis()-start).toDouble()}, chunkDelta: ${c-lastCount}")
                 lastCount=c
-                it+400
+                it+printInterval
             }else it
         }
     }
diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinStructureTemplate.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinStructureTemplate.java
index a6779ed..a758434 100644
--- a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinStructureTemplate.java
+++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinStructureTemplate.java
@@ -10,7 +10,9 @@
 import iskallia.vault.core.world.processor.tile.*;
 import iskallia.vault.core.world.template.PlacementSettings;
 import iskallia.vault.core.world.template.StructureTemplate;
+import iskallia.vault.init.ModBlocks;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraftforge.registries.ForgeRegistries;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
@@ -20,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 /*
-* applies tile mapper when processing all tiles except spawners
+* applies tile mapper when processing all tiles except blacklisted
 * */
 @SuppressWarnings("ALL")
 @Mixin(StructureTemplate.class)
@@ -48,7 +50,14 @@ public Iterator<PartialTile> getTiles(TilePredicate filter, PlacementSettings se
                 tile = null;
                 return tile;
             }
-            var isSpawner = ((IndexedBlock)tile.getState().getBlock()).getRegistryIndex()==getSpawnerId();
+            var tileID = ((IndexedBlock)tile.getState().getBlock()).getRegistryIndex();
+            //some blocks would not be processed correctly
+            var dontUseTileMapper = tileID==getSpawnerId()/*order would be messed up and mobs would not spawn*/ ||
+                    tileID == ((IndexedBlock)ModBlocks.GOD_ALTAR).getRegistryIndex() /*you wold get template challange*/ ||
+                    tileID==((IndexedBlock) Blocks.WHITE_CONCRETE).getRegistryIndex() || //some room-specific stuff seems to be broken
+                    tileID==((IndexedBlock) Blocks.LIME_GLAZED_TERRACOTTA).getRegistryIndex() ||
+                    tileID==((IndexedBlock) Blocks.GRAY_GLAZED_TERRACOTTA).getRegistryIndex() ||
+                    tileID==((IndexedBlock) Blocks.COMMAND_BLOCK).getRegistryIndex();
 
             for(Processor<PartialTile> processor : settings.getTileProcessors()) {
 
@@ -59,12 +68,12 @@ public Iterator<PartialTile> getTiles(TilePredicate filter, PlacementSettings se
                 if((processor instanceof TargetTileProcessor<?> ||
                         processor instanceof VaultLootTileProcessor ||
                         processor instanceof ReferenceTileProcessor ||
-                        processor instanceof LeveledTileProcessor) && !isSpawner
+                        processor instanceof LeveledTileProcessor) && !dontUseTileMapper
                 ); else
                     processNotTargetted(processor,tile,settings.getProcessorContext());
             }
 
-            if(!isSpawner)tile=((TileMapperContainer)settings).getTileMapper().mapBlock(tile,settings.getProcessorContext());
+            if(!dontUseTileMapper)tile=((TileMapperContainer)settings).getTileMapper().mapBlock(tile,settings.getProcessorContext());
             /*
             for(Processor<PartialTile> processor : settings.getTileProcessors()) {
 
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 6972a2b..10cfcb6 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -14,6 +14,7 @@ license="${mod_license}"
 #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
+issueTrackerURL="https://github.com/ImplementsLegend/VaultFaster/issues" #optional
 # The modid of the mod
 modId="${mod_id}" #mandatory
 # The version number of the mod