From 881bd8f58d9a50b998684bc1194d4213a98316f4 Mon Sep 17 00:00:00 2001
From: Zereff06 <Zereff06@gmail.com>
Date: Sun, 14 May 2023 00:51:02 +0300
Subject: tfft * bs * add structure lib chat description * support any EV+ Tier
 Glass

---
 build.gradle                                       | 19 ++++++++++++---
 src/main/java/common/tileentities/GTMTE_TFFT.java  | 28 +++++++++++++++-------
 src/main/resources/assets/kekztech/lang/en_US.lang |  4 ++++
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 78ed8d44f0..3fa171e0dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1683563728
+//version: 1683705740
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -69,7 +69,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.11'
 }
 
 print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -569,9 +569,10 @@ repositories {
 
 def mixinProviderGroup = "io.github.legacymoddingmc"
 def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.6"
+def mixinProviderVersion = "0.1.7.1"
 def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
+ext.mixinProviderSpec = mixinProviderSpec
 
 dependencies {
     if (usesMixins.toBoolean()) {
@@ -822,6 +823,18 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
         }
         this.classpath(project.java17DependenciesCfg)
     }
+
+    public void setup(Project project) {
+        super.setup(project)
+        if (project.usesMixins.toBoolean()) {
+            this.extraJvmArgs.addAll(project.provider(() -> {
+                def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec))
+                mixinCfg.canBeConsumed = false
+                mixinCfg.transitive = false
+                enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : []
+            }))
+        }
+    }
 }
 
 def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient")
diff --git a/src/main/java/common/tileentities/GTMTE_TFFT.java b/src/main/java/common/tileentities/GTMTE_TFFT.java
index 97d4321ce9..fa69df2026 100644
--- a/src/main/java/common/tileentities/GTMTE_TFFT.java
+++ b/src/main/java/common/tileentities/GTMTE_TFFT.java
@@ -1,5 +1,6 @@
 package common.tileentities;
 
+import static com.github.bartimaeusnek.bartworks.util.BW_Util.ofGlassTieredMixed;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockUnlocalizedName;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
@@ -11,6 +12,7 @@ import static gregtech.api.enums.GT_HatchElement.Maintenance;
 import static gregtech.api.enums.GT_HatchElement.OutputHatch;
 import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
 import static java.lang.Math.min;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 import java.math.BigInteger;
 import java.text.MessageFormat;
@@ -31,7 +33,6 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
-import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
 import com.gtnewhorizon.structurelib.StructureLibAPI;
 import com.gtnewhorizon.structurelib.alignment.constructable.ChannelDataAccessor;
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
@@ -198,6 +199,21 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase<GTMTE_T
     private static final String STRUCTURE_PIECE_MID = "mid";
     private static final String STRUCTURE_PIECE_BOTTOM = "bottom";
 
+    @Override
+    public String[] getStructureDescription(ItemStack stackSize) {
+        return description;
+    }
+
+    private static final String[] description = new String[] {
+            translateToLocal("tile.kekztech_tfftstoragefield_block.hint.1"), // Casing
+            translateToLocal("tile.kekztech_tfftstoragefield_block.hint.2"), // Casing, Maintenance Hatch, T.F.F.T Multi
+                                                                             // I/O Hatch, Input/Output Hatch, Energy
+                                                                             // Hatch
+            translateToLocal("tile.kekztech_tfftstoragefield_block.hint.3"), // Glass, T.F.F.T Multi I/O Hatch,
+                                                                             // Input/Output Hatch
+            translateToLocal("tile.kekztech_tfftstoragefield_block.hint.4"), // Glass
+    };
+
     // height channel for height
     // field channel for field
     private static final IStructureDefinition<GTMTE_TFFT> STRUCTURE_DEFINITION = IStructureDefinition
@@ -231,15 +247,13 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase<GTMTE_T
                     buildHatchAdder(GTMTE_TFFT.class)
                             .atLeast(InputHatch.or(TFFTMultiHatch.INSTANCE), OutputHatch.or(TFFTMultiHatch.INSTANCE))
                             .casingIndex(CASING_TEXTURE_ID_2).dot(3).buildAndChain(
-                                    ofBlockUnlocalizedName("IC2", "blockAlloyGlass", 0, true),
                                     ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false),
-                                    BorosilicateGlass.ofBoroGlassAnyTier()))
+                                    ofGlassTieredMixed((byte) 4, (byte) 127, 3)))
             .addElement(
                     'g',
                     ofChain(
-                            ofBlockUnlocalizedName("IC2", "blockAlloyGlass", 0, true),
                             ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false),
-                            BorosilicateGlass.ofBoroGlassAnyTier()))
+                            ofGlassTieredMixed((byte) 4, (byte) 127, 4)))
             .addElement('f', ofChain(TFFTStorageFieldElement.INSTANCE)).build();
 
     public final FluidTankGT[] STORE = new FluidTankGT[MAX_DISTINCT_FLUIDS];
@@ -308,9 +322,7 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase<GTMTE_T
                 .addCasingInfo("T.F.F.T Casing", MIN_CASING_AMOUNT)
                 .addOtherStructurePart("Storage Field Blocks (Tier I-X)", "Inner 3xhx3 solid pillar")
                 .addStructureInfo("Energy hatch is not required when running cost is 0")
-                .addOtherStructurePart(
-                        "Borosilicate Glass(any)/Warded Glass/Reinforced Glass",
-                        "Outer 5xhx5 glass shell")
+                .addOtherStructurePart("EV+ Tier Glass/Warded Glass/Reinforced Glass", "Outer 5xhx5 glass shell")
                 .addMaintenanceHatch("Any top or bottom casing").addEnergyHatch("Any top or bottom casing")
                 .addInputHatch("Instead of any casing or glass, has to touch storage field block")
                 .addOutputHatch("Instead of any casing or glass, has to touch storage field block")
diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index 29083a7f9a..e147c1546c 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -122,6 +122,10 @@ tile.kekztech_tfftstoragefield_block.8.name=T.F.F.T Storage Field Block (Tier VI
 tile.kekztech_tfftstoragefield_block.9.name=T.F.F.T Storage Field Block (Tier IX)
 tile.kekztech_tfftstoragefield_block.10.name=T.F.F.T Storage Field Block (Tier X)
 tile.kekztech_tfftstoragefield_block.desc=This is not a fluid tank
+tile.kekztech_tfftstoragefield_block.hint.1=Hint 1 Dot: T.F.F.T Casing
+tile.kekztech_tfftstoragefield_block.hint.2=Hint 2 Dot: T.F.F.T Casing, Maintenance Hatch, T.F.F.T Multi I/O Hatch, Input/Output Hatch, Energy Hatch
+tile.kekztech_tfftstoragefield_block.hint.3=Hint 3 Dot: EV+ Tier Glass, T.F.F.T Multi I/O Hatch, Input/Output Hatch
+tile.kekztech_tfftstoragefield_block.hint.4=Hint 4 Dot: EV+ Tier Glass
 
 # -------- Item Proxy: Structure Blocks
 tile.kekztech_itemproxycable_block.name=Item Proxy Network Cable
-- 
cgit