added chisel input busses (#638)

Quetz4l · web-flow · commit 69791bd5a4e5 · 2023-05-26T06:46:03.000+02:00
* added chisel input busses

* fix industrial chisel tooltip

* fixes industrial chisel
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1684139283
+//version: 1684218858
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -730,7 +730,7 @@ dependencies {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13')
     }
 
     java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -262,6 +262,7 @@ private static void run() {
         rockBreaker();
         thermicFluidHeater();
         advHeatExchanger();
+        chiselBuses();
 
         gt4FarmManager();
         gt4Redstone();
@@ -3551,6 +3552,27 @@ private static void superBuses() {
         }
     }
 
+    private static void chiselBuses() {
+        ItemStack[] mSuperBusesInput = new ItemStack[] { ItemList.Hatch_Input_Bus_HV.get(1),
+                GregtechItemList.Hatch_SuperBus_Input_LV.get(1), GregtechItemList.Hatch_SuperBus_Input_MV.get(1),
+                GregtechItemList.Hatch_SuperBus_Input_HV.get(1), };
+
+        ItemStack[] mChiselBuses = new ItemStack[] { GregtechItemList.GT_MetaTileEntity_ChiselBus_I.get(1),
+                GregtechItemList.GT_MetaTileEntity_ChiselBus_II.get(1),
+                GregtechItemList.GT_MetaTileEntity_ChiselBus_III.get(1),
+                GregtechItemList.GT_MetaTileEntity_ChiselBus_IV.get(1), };
+
+        for (int i = 0; i < 4; i++) {
+            CORE.RA.addSixSlotAssemblingRecipe(
+                    new ItemStack[] { CI.getNumberedCircuit(17), mSuperBusesInput[i], CI.getSensor(i, 1),
+                            CI.getRobotArm(i, 2), CI.getBolt(i, 16), ItemUtils.getSimpleStack(Blocks.chest) },
+                    CI.getAlternativeTieredFluid(i, 144 * 2),
+                    mChiselBuses[i],
+                    20 * 30 * 2,
+                    (int) GT_Values.VP[i + 1]);
+        }
+    }
+
     private static void roundRobinators() {
 
         RecipeUtils.addShapedGregtechRecipe(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -613,6 +613,12 @@ public enum GregtechItemList implements GregtechItemContainer {
     Hatch_SuperBus_Output_UV,
     Hatch_SuperBus_Output_MAX,
 
+    // Chisel Buses for Industrial Chisel
+    GT_MetaTileEntity_ChiselBus_I,
+    GT_MetaTileEntity_ChiselBus_II,
+    GT_MetaTileEntity_ChiselBus_III,
+    GT_MetaTileEntity_ChiselBus_IV,
+
     // ----------------------------------------------------------------------------
 
     /**
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ChiselBus.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ChiselBus.java
@@ -0,0 +1,74 @@
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+
+import net.minecraft.util.EnumChatFormatting;
+
+import com.gtnewhorizons.modularui.api.screen.ModularWindow;
+import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+import com.gtnewhorizons.modularui.common.widget.Scrollable;
+import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.modularui.IAddUIWidgets;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
+import gregtech.api.util.extensions.ArrayExt;
+
+public class GT_MetaTileEntity_ChiselBus extends GT_MetaTileEntity_Hatch_InputBus implements IAddUIWidgets {
+
+    public GT_MetaTileEntity_ChiselBus(int id, String name, String nameRegional, int tier) {
+        super(id, name, nameRegional, tier);
+    }
+
+    public GT_MetaTileEntity_ChiselBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, getSlots(aTier), aDescription, aTextures);
+    }
+
+    @Override
+    public boolean isValidSlot(int aIndex) {
+        return aIndex < getSlots(this.mTier);
+    }
+
+    public static int getSlots(int aTier) {
+        return (1 + aTier) * 16 + 1;
+    }
+
+    @Override
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_ChiselBus(this.mName, this.mTier, ArrayExt.of(this.mDescription), this.mTextures);
+    }
+
+    @Override
+    public boolean allowSelectCircuit() {
+        return false;
+    }
+
+    @Override
+    public String[] getDescription() {
+        return new String[] { "Item Input Bus for Industrial Chisel", getSlots(this.mTier) - 1 + " + 1 " + " Slots",
+                "Added by: " + EnumChatFormatting.AQUA
+                        + "Quetz4l"
+                        + " - "
+                        + EnumChatFormatting.RED
+                        + "[GT++]"
+                        + EnumChatFormatting.RESET };
+    }
+
+    @Override
+    public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
+        int slotIndex = 0;
+        final Scrollable scrollable = new Scrollable().setVerticalScroll();
+        for (int row = 0; row * 4 < inventoryHandler.getSlots() - 1; row++) {
+            int columnsToMake = Math.min(inventoryHandler.getSlots() - row * 4, 4);
+            for (int column = 0; column < columnsToMake; column++) {
+                scrollable.widget(
+                        new SlotWidget(inventoryHandler, slotIndex++).setPos(column * 18, row * 18).setSize(18, 18));
+
+            }
+        }
+
+        builder.widget(scrollable.setSize(18 * 4 + 4, 18 * 4).setPos(52, 7)); // main slots
+        builder.widget(new SlotWidget(inventoryHandler, slotIndex).setPos(18, 18).setSize(18, 18)); // slot for target
+    }
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
@@ -25,6 +25,7 @@
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_OverclockCalculator;
@@ -34,6 +35,7 @@
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ChiselBus;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import team.chisel.carving.Carving;
@@ -42,6 +44,8 @@ public class GregtechMetaTileEntity_IndustrialChisel
         extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialChisel> implements ISurvivalConstructable {
 
     private int mCasing;
+
+    private ItemStack target;
     private static IStructureDefinition<GregtechMetaTileEntity_IndustrialChisel> STRUCTURE_DEFINITION = null;
     private ItemStack mInputCache;
     private ItemStack mOutputCache;
@@ -69,7 +73,9 @@ public String getMachineType() {
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType(getMachineType()).addInfo("Factory Grade Auto Chisel")
-                .addInfo("Target block goes in GUI slot").addInfo("If no target provided, first chisel result is used")
+                .addInfo("Target block goes in Controller slot for common Input Buses")
+                .addInfo("You can also set a target block in each Chisel Input Bus and use them as an Input Bus")
+                .addInfo("If no target is provided for common buses, the result of the first chisel is used")
                 .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 16")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
                 .addController("Front center").addCasingInfo("Sturdy Printer Casing", 10).addInputBus("Any casing", 1)
@@ -81,12 +87,17 @@ protected GT_Multiblock_Tooltip_Builder createTooltip() {
     @Override
     public IStructureDefinition<GregtechMetaTileEntity_IndustrialChisel> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialChisel>builder()
-                    .addShape(
+            STRUCTURE_DEFINITION = StructureDefinition
+                    .<GregtechMetaTileEntity_IndustrialChisel>builder().addShape(
                             mName,
                             transpose(
-                                    new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
-                                            { "CCC", "CCC", "CCC" }, }))
+                                    // spotless:off
+                                    new String[][] {
+                                            { "CCC", "CCC", "CCC" },
+                                            { "C~C", "C-C", "CCC" },
+                                            { "CCC", "CCC", "CCC" },
+                                    }))
+                                    // spotless:on
                     .addElement(
                             'C',
                             buildHatchAdder(GregtechMetaTileEntity_IndustrialChisel.class)
@@ -184,7 +195,7 @@ private static List<ItemStack> getItemsForChiseling(ItemStack aStack) {
     }
 
     private static ItemStack getChiselOutput(ItemStack aInput, ItemStack aTarget) {
-        ItemStack tOutput = null;
+        ItemStack tOutput;
         if (aTarget != null && canBeMadeFrom(aInput, aTarget)) {
             tOutput = aTarget;
         } else if (aTarget != null && !canBeMadeFrom(aInput, aTarget)) {
@@ -195,10 +206,10 @@ private static ItemStack getChiselOutput(ItemStack aInput, ItemStack aTarget) {
         return tOutput;
     }
 
-    private GTPP_Recipe generateChiselRecipe(ItemStack aInput, ItemStack aTarget) {
-        boolean tIsCached = hasValidCache(aInput, aTarget, true);
+    private GTPP_Recipe generateChiselRecipe(ItemStack aInput) {
+        boolean tIsCached = hasValidCache(aInput, this.target, true);
         if (tIsCached || aInput != null && hasChiselResults(aInput)) {
-            ItemStack tOutput = tIsCached ? mOutputCache.copy() : getChiselOutput(aInput, aTarget);
+            ItemStack tOutput = tIsCached ? mOutputCache.copy() : getChiselOutput(aInput, this.target);
             if (tOutput != null) {
                 if (mCachedRecipe != null && GT_Utility.areStacksEqual(aInput, mInputCache)
                         && GT_Utility.areStacksEqual(tOutput, mOutputCache)) {
@@ -225,74 +236,97 @@ private GTPP_Recipe generateChiselRecipe(ItemStack aInput, ItemStack aTarget) {
         return null;
     }
 
+    private GT_Recipe getRecipe() {
+        for (GT_MetaTileEntity_Hatch_InputBus bus : this.mInputBusses) {
+            if (bus instanceof GT_MetaTileEntity_ChiselBus) { // Chisel buses
+                if (bus.mInventory[bus.getSizeInventory() - 1] == null) continue;
+                this.target = bus.mInventory[bus.getSizeInventory() - 1];
+
+                for (int i = bus.getSizeInventory() - 2; i >= 0; i--) {
+                    ItemStack itemsInSlot = bus.mInventory[i];
+                    if (itemsInSlot != null) {
+                        GT_Recipe tRecipe = generateChiselRecipe(itemsInSlot);
+                        if (tRecipe != null) {
+                            return tRecipe;
+                        }
+                    }
+                }
+            } else {
+                target = this.getGUIItemStack(); // Common buses
+                for (int i = bus.getSizeInventory() - 1; i >= 0; i--) {
+                    ItemStack itemsInSlot = bus.mInventory[i];
+                    if (itemsInSlot != null) {
+                        GT_Recipe tRecipe = generateChiselRecipe(itemsInSlot);
+                        if (tRecipe != null) {
+                            return tRecipe;
+                        }
+                    }
+                }
+            }
+
+        }
+        return null;
+    }
+
     @Override
     public boolean checkRecipe(final ItemStack aStack) {
+        GT_Recipe tRecipe = getRecipe();
+        if (tRecipe == null) return false;
+
         ArrayList<ItemStack> aItems = this.getStoredInputs();
-        if (!aItems.isEmpty()) {
 
-            GT_Recipe tRecipe = generateChiselRecipe(aItems.get(0), this.getGUIItemStack());
+        // Based on the Processing Array. A bit overkill, but very flexible.
+        ItemStack[] aItemInputs = aItems.toArray(new ItemStack[aItems.size()]);
 
-            if (tRecipe == null) {
-                return false;
-            }
+        // Reset outputs and progress stats
+        this.lEUt = 0;
+        this.mMaxProgresstime = 0;
+        this.mOutputItems = new ItemStack[] {};
+        this.mOutputFluids = new FluidStack[] {};
+        long tEnergy = getMaxInputEnergy();
 
-            // Based on the Processing Array. A bit overkill, but very flexible.
-            ItemStack[] aItemInputs = aItems.toArray(new ItemStack[aItems.size()]);
-            FluidStack[] aFluidInputs = new FluidStack[] {};
-
-            // Reset outputs and progress stats
-            this.lEUt = 0;
-            this.mMaxProgresstime = 0;
-            this.mOutputItems = new ItemStack[] {};
-            this.mOutputFluids = new FluidStack[] {};
-
-            long tVoltage = getMaxInputVoltage();
-            long tEnergy = getMaxInputEnergy();
-            // Remember last recipe - an optimization for findRecipe()
-            this.mLastRecipe = tRecipe;
-
-            int aMaxParallelRecipes = getMaxParallelRecipes();
-            int aEUPercent = getEuDiscountForParallelism();
-            int aSpeedBonusPercent = 200;
-
-            GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
-                    .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
-                    .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f);
-            if (!voidExcess) {
-                helper.enableVoidProtection(this);
-            }
+        // Remember last recipe - an optimization for findRecipe()
+        this.mLastRecipe = tRecipe;
 
-            if (batchMode) {
-                helper.enableBatchMode(128);
-            }
+        int aMaxParallelRecipes = getMaxParallelRecipes();
+        int aEUPercent = getEuDiscountForParallelism();
+        int aSpeedBonusPercent = 200;
 
-            helper.build();
+        GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+                .setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes).enableConsumption()
+                .enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f);
+        if (!voidExcess) {
+            helper.enableVoidProtection(this);
+        }
 
-            if (helper.getCurrentParallel() == 0) {
-                return false;
-            }
+        if (batchMode) {
+            helper.enableBatchMode(128);
+        }
 
-            this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
-            this.mEfficiencyIncrease = 10000;
+        helper.build();
 
-            GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
-                    .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
-                    .setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
-                    .setParallel((int) Math.floor(helper.getCurrentParallel() / helper.getDurationMultiplier()))
-                    .calculate();
-            lEUt = -calculator.getConsumption();
-            mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
+        if (helper.getCurrentParallel() == 0) {
+            return false;
+        }
 
-            mOutputItems = helper.getItemOutputs();
-            mOutputFluids = helper.getFluidOutputs();
-            updateSlots();
+        this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+        this.mEfficiencyIncrease = 10000;
 
-            // Play sounds (GT++ addition - GT multiblocks play no sounds)
-            startProcess();
-            return true;
-        }
+        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+                .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
+                .setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
+                .setParallel((int) Math.floor(helper.getCurrentParallel() / helper.getDurationMultiplier()))
+                .calculate();
+        lEUt = -calculator.getConsumption();
+        mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
 
-        return false;
+        mOutputItems = helper.getItemOutputs();
+
+        updateSlots();
+
+        // Play sounds (GT++ addition - GT multiblocks play no sounds)
+        startProcess();
+        return true;
     }
 
     @Override
@@ -307,7 +341,7 @@ public int getEuDiscountForParallelism() {
 
     private static String sChiselSound = null;
 
-    private static final String getChiselSound() {
+    private static String getChiselSound() {
         if (sChiselSound == null) {
             sChiselSound = Carving.chisel.getVariationSound(Blocks.stone, 0);
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//version: 1684139283`
	`1`	`+//version: 1684218858`
`2`	`2`	`/*`
`3`	`3`	`DO NOT CHANGE THIS FILE!`
`4`	`4`	`Also, you may replace this file at any time if there is an update available.`
`@@ -730,7 +730,7 @@ dependencies {`
`730`	`730`	`java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")`
`731`	`731`	`}`
`732`	`732`	`if (modId != 'hodgepodge') {`
`733`		`- java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8')`
	`733`	`+ java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13')`
`734`	`734`	`}`
`735`	`735`
`736`	`736`	`java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}`