Improved Auto Chisel processing speed.

Author: tier940

CHANGELOG.md

@@ -1,8 +1,16 @@
+# v1.3.3
+## Chisel Integration
+- Improved Auto Chisel processing speed.
+
+* * *
+
 # v1.3.2
+
 ## Storage Drawers Integration
 - Fixed `stickLong` recipe for materials without `Ingot` or `Gem`.
 
 * * *
+
 # v1.3.1
 ## Tinkers' Construct Integration
 - Fixed TiC main-hand + GT off-hand combination not using the GT off-hand tool when it is the appropriate tool for the block

dependencies.gradle

@@ -61,12 +61,12 @@ dependencies {
         runtimeOnly rfg.deobf("curse.maven:better-builders-wands-238403:2691084")
     }
 
-    // Debug TiC
+    // Debug TiC: 2.13.0.207
     compileOnly rfg.deobf("curse.maven:mantle-74924:2713386")
-    compileOnly rfg.deobf("curse.maven:tinkers-antique-1242239:7339332")
+    compileOnly rfg.deobf("curse.maven:tinkers-antique-1242239:7999105")
     if (project.debug_all.toBoolean() || project.debug_tic.toBoolean()) {
         runtimeOnly rfg.deobf("curse.maven:mantle-74924:2713386")
-        runtimeOnly rfg.deobf("curse.maven:tinkers-antique-1242239:7339332")
+        runtimeOnly rfg.deobf("curse.maven:tinkers-antique-1242239:7999105")
     }
 
     // Debug Storage Drawers: 1.12-5.5.3

src/main/java/com/github/gtexpert/gtmt/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java

@@ -1,16 +1,27 @@
 package com.github.gtexpert.gtmt.integration.chisel.metatileentities;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.items.IItemHandlerModifiable;
 
 import gregtech.api.GTValues;
 import gregtech.api.capability.IEnergyContainer;
+import gregtech.api.capability.IMultipleTankHandler;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.SimpleMachineMetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+import gregtech.api.recipes.Recipe;
 import gregtech.api.recipes.RecipeMap;
+import gregtech.api.recipes.ingredients.GTRecipeInput;
 import gregtech.client.renderer.ICubeRenderer;
 
 import com.github.gtexpert.gtmt.api.capability.SingleblockRecipeLogicNoCache;
@@ -32,9 +43,60 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
 
     private static class AutoChiselRecipeLogic extends SingleblockRecipeLogicNoCache {
 
+        // Shared across all AutoChisel instances — built once from the recipe map on first use.
+        private static volatile Map<Item, List<Recipe>> inputIndex;
+        private static final Object INDEX_LOCK = new Object();
+
         public AutoChiselRecipeLogic(MetaTileEntity tileEntity, RecipeMap<?> recipeMap,
                                      Supplier<IEnergyContainer> energyContainer) {
             super(tileEntity, recipeMap, energyContainer);
         }
+
+        @Override
+        protected Recipe findRecipe(long maxVoltage, IItemHandlerModifiable inputs,
+                                    IMultipleTankHandler fluidInputs) {
+            Map<Item, List<Recipe>> idx = inputIndex;
+            if (idx == null) {
+                synchronized (INDEX_LOCK) {
+                    idx = inputIndex;
+                    if (idx == null) {
+                        inputIndex = idx = buildIndex(getRecipeMap());
+                    }
+                }
+            }
+
+            for (int i = 0; i < inputs.getSlots(); i++) {
+                ItemStack stack = inputs.getStackInSlot(i);
+                if (stack.isEmpty()) continue;
+
+                List<Recipe> candidates = idx.get(stack.getItem());
+                if (candidates == null) return null;
+
+                for (Recipe recipe : candidates) {
+                    if (recipe.getEUt() <= maxVoltage &&
+                            recipe.matches(false, inputs, fluidInputs)) {
+                        return recipe;
+                    }
+                }
+                return null; // primary slot found but no match — stop scanning
+            }
+            return null;
+        }
+
+        private static Map<Item, List<Recipe>> buildIndex(RecipeMap<?> recipeMap) {
+            Map<Item, List<Recipe>> idx = new HashMap<>();
+            for (Recipe recipe : recipeMap.getRecipeList()) {
+                for (GTRecipeInput input : recipe.getInputs()) {
+                    if (input.isNonConsumable()) continue;
+                    for (ItemStack match : input.getInputStacks()) {
+                        idx.computeIfAbsent(match.getItem(), k -> new ArrayList<>()).add(recipe);
+                    }
+                    break; // index by first consumable input only
+                }
+            }
+            // Wrap lists as unmodifiable to prevent accidental mutation
+            idx.replaceAll((k, v) -> Collections.unmodifiableList(v));
+            return Collections.unmodifiableMap(idx);
+        }
     }
 }

src/main/java/com/github/gtexpert/gtmt/integration/tic/TiCClientEvents.java

@@ -1,5 +1,6 @@
 package com.github.gtexpert.gtmt.integration.tic;
 
+import net.minecraftforge.client.event.ModelBakeEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -8,29 +9,21 @@
 
 import com.github.gtexpert.gtmt.integration.tic.materials.ToolMaterialRegistrar;
 
-/**
- * Client-side event handlers for the TiC integration.
- *
- * <p>
- * Registered only on the client via {@link TiCModule#getEventBusSubscribers()}.
- */
 @SideOnly(Side.CLIENT)
 public class TiCClientEvents {
 
     @SubscribeEvent
     public static void onRegisterModels(ModelRegistryEvent event) {
         ToolMaterialRegistrar.registerFluidModels();
+        ToolMaterialRegistrar.registerFluidBlockModelLoader();
+        ToolMaterialRegistrar.suppressFluidBlockModels();
+    }
+
+    @SubscribeEvent
+    public static void onModelBake(ModelBakeEvent event) {
+        ToolMaterialRegistrar.injectFluidItemModels(event.getModelRegistry());
     }
 
-    /**
-     * Re-inject dynamic material name translations after every resource reload.
-     *
-     * <p>
-     * {@link net.minecraft.util.text.translation.LanguageMap#inject} entries are wiped
-     * whenever the language manager reloads (F3+T or in-game language change).
-     * {@link TextureStitchEvent.Post} fires after the language map has already been
-     * refreshed from disk, so this is the correct point to restore the dynamic entries.
-     */
     @SubscribeEvent
     public static void onTextureStitchPost(TextureStitchEvent.Post event) {
         ToolMaterialRegistrar.reinjectTranslations();

src/main/java/com/github/gtexpert/gtmt/integration/tic/TiCModule.java

@@ -43,4 +43,5 @@ public void registerBlocks(RegistryEvent.Register<Block> event) {
         ElasticMaterialRegistrar.register(event.getRegistry());
         TiCSmeltery.register();
     }
+
 }

src/main/java/com/github/gtexpert/gtmt/integration/tic/materials/ElasticMaterialRegistrar.java

@@ -16,6 +16,7 @@
 import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.library.materials.BowStringMaterialStats;
 import slimeknights.tconstruct.library.materials.FletchingMaterialStats;
+import slimeknights.tconstruct.tools.TinkerTraits;
 
 /**
  * Registers GT polymer materials as TiC BowString and Fletching part materials.
@@ -69,6 +70,15 @@ private static void registerElastic(Material gtMaterial,
         TinkerRegistry.addMaterialStats(ticMaterial,
                 new FletchingMaterialStats(fletchAcc, fletchMod));
 
+        if (stringMod >= 1.1f) {
+            ticMaterial.addTrait(TinkerTraits.momentum, "bowstring");
+        } else if (stringMod >= 1.05f) {
+            ticMaterial.addTrait(TinkerTraits.stiff, "bowstring");
+        }
+        if (fletchMod >= 1.05f) {
+            ticMaterial.addTrait(TinkerTraits.heavy, "fletching");
+        }
+
         // Register whichever GT item forms exist for this material
         String suffix = gtMaterial.toCamelCaseString();
         for (OrePrefix prefix : new OrePrefix[] { OrePrefix.plate, OrePrefix.foil, OrePrefix.ring }) {
@@ -82,6 +92,7 @@ private static void registerElastic(Material gtMaterial,
         MaterialIntegration integration;
         if (fluid != null) {
             integration = new MaterialIntegration(ticMaterial, fluid, suffix);
+            ToolMaterialRegistrar.trackIntegratedFluid(fluid);
         } else {
             integration = new MaterialIntegration(ticMaterial);
             for (OrePrefix prefix : new OrePrefix[] { OrePrefix.plate, OrePrefix.foil }) {