Merge remote-tracking branch 'origin/yeetBioandBK' into yeetBioandBK

StaffiX · Oct 16, 2024 · efd1819 · efd1819
2 parents 67bfef4 + 530cd89
commit efd1819
Show file tree

Hide file tree

Showing 252 changed files with 1,290 additions and 1,577 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -38,16 +38,16 @@ dependencies {
     api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
     api("com.github.GTNewHorizons:NotEnoughItems:2.6.42-GTNH:dev")
     api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
-    api("com.github.GTNewHorizons:GTNHLib:0.5.13:dev")
-    api("com.github.GTNewHorizons:ModularUI:1.2.9:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.5.14:dev")
+    api("com.github.GTNewHorizons:ModularUI:1.2.11:dev")
     api("com.github.GTNewHorizons:ModularUI2:2.1.14-1.7.10:dev")
     api("com.github.GTNewHorizons:waila:1.8.1:dev")
     api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-468-GTNH:dev")
     api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.39-gtnh:dev")
     api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
     api("com.github.GTNewHorizons:Postea:1.0.13:dev")
 
-    compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev')
+    compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.2:dev')
     compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
     compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.15:dev")
     implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
@@ -56,10 +56,10 @@ dependencies {
 
     devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.9.0-GTNH:dev")
 
-    compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.53:dev")
+    compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.54:dev")
 
     compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta7:api') { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.2:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.3:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.18:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.16:dev") { transitive = false }
@@ -70,10 +70,10 @@ dependencies {
     compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
     compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.28:dev') { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.94-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.95-GTNH:dev") { transitive = false }
 
     compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false }
-    implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.10-GTNH:dev")
+    implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.12-GTNH:dev")
 
     compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
@@ -82,13 +82,13 @@ dependencies {
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     implementation("com.github.GTNewHorizons:Hodgepodge:2.5.71:dev")
     compileOnly('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') { transitive = false }
-    compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev') { transitive = false }
+    compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.13-GTNH:dev') { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
     compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')
     compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.26-GTNH:dev") {transitive = false}
     // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
     compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
-    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.25-GTNH:dev') {transitive =  false}
+    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.26-GTNH:dev') {transitive =  false}
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.6:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false }

diff --git a/src/main/java/bartworks/common/loaders/recipes/AssemblyLine.java b/src/main/java/bartworks/common/loaders/recipes/AssemblyLine.java
@@ -28,10 +28,10 @@ public void run() {
             ? FluidRegistry.getFluid("molten.indalloy140")
             : FluidRegistry.getFluid("molten.solderingalloy");
         GTValues.RA.stdBuilder()
-            .metadata(RESEARCH_ITEM, ItemList.Pump_IV.get(1L))
+            .metadata(RESEARCH_ITEM, ItemList.Pump_HV.get(1L))
             .metadata(RESEARCH_TIME, 1 * HOURS)
             .itemInputs(
-                ItemList.Pump_IV.get(16),
+                ItemList.Pump_HV.get(16),
                 GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 32L),
                 GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L),
                 GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L),

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java
@@ -13,7 +13,6 @@
 
 package bartworks.common.tileentities.multis;
 
-import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS;
 import static bartworks.util.BWUtil.ofGlassTiered;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
@@ -153,9 +152,7 @@ protected IAlignmentLimits getInitialAlignmentLimits() {
     protected MultiblockTooltipBuilder createTooltip() {
         MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Bacterial Vat")
-            .addInfo("Controller block for the Bacterial Vat")
             .addInfo("For maximum efficiency boost keep the Output Hatch always half filled!")
-            .addSeparator()
             .beginStructureBlock(5, 4, 5, false)
             .addController("Front bottom center")
             .addCasingInfoMin("Clean Stainless Steel Casings", 19, false)
@@ -169,7 +166,7 @@ protected MultiblockTooltipBuilder createTooltip() {
             .addInputHatch("Any casing", 1)
             .addOutputHatch("Any casing", 1)
             .addEnergyHatch("Any casing", 1)
-            .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS);
+            .toolTipFinisher();
         return tt;
     }
 

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
@@ -13,7 +13,6 @@
 
 package bartworks.common.tileentities.multis;
 
-import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS;
 import static bartworks.util.BWUtil.ofGlassTieredMixed;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 import static gregtech.api.enums.HatchElement.Energy;
@@ -64,7 +63,6 @@
 import bartworks.API.recipe.BartWorksRecipeMaps;
 import bartworks.system.material.CircuitGeneration.BWMetaItems;
 import bartworks.system.material.CircuitGeneration.CircuitImprintLoader;
-import bartworks.util.BWTooltipReference;
 import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
@@ -158,32 +156,22 @@ public IStructureDefinition<MTECircuitAssemblyLine> getStructureDefinition() {
     @Override
     protected MultiblockTooltipBuilder createTooltip() {
         MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
-        tt.addMachineType("Circuit Assembler/Circuit Assembly Line")
-            .addInfo("Controller block for the Circuit Assembly Line")
+        tt.addMachineType("Circuit Assembler")
             .addInfo("Change Mode with Screwdriver")
             .addInfo("Does not lose efficiency when overclocked")
-            .addInfo(
-                "--------- " + EnumChatFormatting.GOLD
-                    + StatCollector.translateToLocal("chat.cal.mode.0")
-                    + EnumChatFormatting.GRAY
-                    + " --------")
+            .addSeparator()
+            .addInfo(EnumChatFormatting.GOLD + StatCollector.translateToLocal("chat.cal.mode.0") + ":")
             .addInfo("Imprint this machine with a Circuit Imprint,")
             .addInfo("by putting the imprint in the controller")
             .addInfo("Every Circuit Assembly Line can only be imprinted ONCE")
-            .addInfo(
-                "--------- " + EnumChatFormatting.GOLD
-                    + StatCollector.translateToLocal("chat.cal.mode.1")
-                    + EnumChatFormatting.GRAY
-                    + " --------")
+            .addSeparator()
+            .addInfo(EnumChatFormatting.GOLD + StatCollector.translateToLocal("chat.cal.mode.1") + ":")
             .addInfo(
                 "Does Circuit Assembler recipes, Minimum Length: " + EnumChatFormatting.RED
                     + MINIMUM_CIRCUIT_ASSEMBLER_LENGTH
                     + EnumChatFormatting.GRAY)
             .addInfo("Recipe tier in Circuit Assembler mode is at most Energy Hatch tier - 1.")
             .addInfo("This mode supports Crafting Input Buffer/Bus and allows bus separation")
-            .addInfo("")
-            .addSeparator()
-            .addInfo(BWTooltipReference.TT_BLUEPRINT)
             .beginVariableStructureBlock(2, 7, 3, 3, 3, 3, false)
             .addStructureInfo("From Bottom to Top, Left to Right")
             .addStructureInfo(
@@ -205,7 +193,7 @@ protected MultiblockTooltipBuilder createTooltip() {
             .addOutputBus("As specified in final slice on layer 1", 4)
             .addOtherStructurePart(getColoredTierNameFromTier((byte) 4) + "+ Tier Glass", "As specified on layer 2", 5)
             .addMaintenanceHatch("Any layer 1 casing", 2)
-            .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS);
+            .toolTipFinisher();
         return tt;
     }
 

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java b/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java
@@ -13,7 +13,6 @@
 
 package bartworks.common.tileentities.multis;
 
-import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS;
 import static gregtech.api.enums.GTValues.VN;
 
 import java.lang.reflect.Field;
@@ -115,8 +114,7 @@ protected MultiblockTooltipBuilder createTooltip() {
                     "Heats up " + (long) (this.mTier * 24 * (double) MTEDeepEarthHeatingPump.nulearHeatMod) * 20
                         + "L/s Coolant(minus 10% per Maintenance Problem)");
         }
-        tt.addSeparator()
-            .beginStructureBlock(3, 7, 3, false)
+        tt.beginStructureBlock(3, 7, 3, false)
             .addController("Front bottom")
             .addOtherStructurePart(casings, "form the 3x1x3 Base")
             .addOtherStructurePart(casings, "1x3x1 pillar above the center of the base (2 minimum total)")
@@ -128,7 +126,7 @@ protected MultiblockTooltipBuilder createTooltip() {
             .addInputBus("Mining Pipes, optional, any base casing")
             .addInputHatch("Any base casing")
             .addOutputHatch("Any base casing")
-            .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS);
+            .toolTipFinisher();
         return tt;
     }
 

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java
@@ -14,7 +14,6 @@
 package bartworks.common.tileentities.multis;
 
 import static bartworks.common.loaders.ItemRegistry.BW_BLOCKS;
-import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS;
 import static bartworks.util.BWTooltipReference.TT;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
@@ -265,14 +264,12 @@ protected MultiblockTooltipBuilder createTooltip() {
         MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Implosion Compressor")
             .addInfo("Explosions are fun")
-            .addInfo("Controller block for the Electric Implosion Compressor")
             .addInfo("Uses electricity instead of Explosives")
             .addInfo("Can parallel up to 4^(Tier - 1)")
             .addInfo("Tier is determined by containment block")
             .addInfo("Valid blocks: Neutronium, Infinity, Transcendent Metal, Spacetime, Universium")
             .addInfo("Minimum allowed energy hatch tier is one below recipe tier")
             .addInfo("Supports " + TT + " energy hatches")
-            .addSeparator()
             .beginStructureBlock(3, 9, 3, false)
             .addController("Front 3rd layer center")
             .addCasingInfoMin("Solid Steel Machine Casing", 8, false)
@@ -285,7 +282,7 @@ protected MultiblockTooltipBuilder createTooltip() {
             .addInputHatch("Any bottom casing", 1)
             .addOutputBus("Any bottom casing", 1)
             .addEnergyHatch("Bottom middle and/or top middle", 2)
-            .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS);
+            .toolTipFinisher();
         return tt;
     }
 

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java
@@ -10,7 +10,6 @@
 package bartworks.common.tileentities.multis;
 
 import static bartworks.API.recipe.BartWorksRecipeMaps.htgrFakeRecipes;
-import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_VIA_BARTWORKS;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
@@ -27,7 +26,6 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
@@ -143,8 +141,6 @@ public IStructureDefinition<MTEHighTempGasCooledReactor> getStructureDefinition(
     protected MultiblockTooltipBuilder createTooltip() {
         MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Breeder Reactor")
-            .addInfo("Controller block for the High Temperature Gas-cooled Reactor (HTGR)")
-            .addInfo(AuthorKuba)
             .addInfo("You can clear internal buffer by changing the mode with a screwdriver")
             .addInfo("Needs a constant supply of coolant while running")
             .addInfo("Needs at least 72k Fuel pebbles to start operation (can hold up to 720k pebbles)")
@@ -155,7 +151,6 @@ protected MultiblockTooltipBuilder createTooltip() {
                 "Reactor will take 4 000L/s of coolant multiplied by efficiency and by fuel coolant value (check tooltips)")
             .addInfo("Uses " + GTUtility.formatNumbers(powerUsage) + " EU/t")
             .addInfo("One Operation takes 1 hour")
-            .addSeparator()
             .beginStructureBlock(11, 12, 11, true)
             .addController("Front bottom center")
             .addCasingInfoMin("Europium Reinforced Radiation Proof Casings", 500, false)
@@ -166,7 +161,7 @@ protected MultiblockTooltipBuilder createTooltip() {
             .addOutputHatch("Any bottom layer casing", 1)
             .addEnergyHatch("Any bottom layer casing", 1)
             .addMaintenanceHatch("Any bottom layer casing", 1)
-            .toolTipFinisher(MULTIBLOCK_ADDED_VIA_BARTWORKS.apply(EnumChatFormatting.GOLD + "kuba6000"));
+            .toolTipFinisher(AuthorKuba);
         return tt;
     }
 

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java b/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java
@@ -14,7 +14,6 @@
 package bartworks.common.tileentities.multis;
 
 import static bartworks.common.loaders.ItemRegistry.BW_BLOCKS;
-import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
@@ -129,13 +128,11 @@ public IStructureDefinition<MTEManualTrafo> getStructureDefinition() {
     protected MultiblockTooltipBuilder createTooltip() {
         final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Transformer")
-            .addInfo("Controller block for the Manual Trafo")
             .addInfo("Operates in 4 diffrent modes:")
             .addInfo("Mode 1: Circuit 0 in controller: Direct-Upstep")
             .addInfo("Mode 2: Circuit 1 in controller: Direct-Downstep")
             .addInfo("Mode 3: Circuit 2 in controller: Tapped-Upstep (currently disabled)")
             .addInfo("Mode 4: Circuit 2 in controller: Tapped-Downstep (currently disabled)")
-            .addSeparator()
             .beginVariableStructureBlock(3, 3, 3, 10, 3, 3, false)
             .addController("Front bottom center")
             .addCasingInfoMin("MV Machine Casing", 0, false)
@@ -144,11 +141,12 @@ protected MultiblockTooltipBuilder createTooltip() {
             .addMaintenanceHatch("Any bottom layer casing", 1)
             .addEnergyHatch("Any bottom layer casing", 1)
             .addDynamoHatch("Any top layer casing", 2)
-            .addStructureInfo("---------TAPPED MODE---------")
+            .addStructureInfo("")
+            .addStructureInfo("Tapped Mode :")
             .addEnergyHatch("Touching Transformer-Winding Blocks", 3)
             .addDynamoHatch("Touching Transformer-Winding Blocks", 3)
             .addStructureInfo("Hatches touching Transformer-Winding Blocks must be tiered from bottom to top")
-            .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS);
+            .toolTipFinisher();
         return tt;
     }
 

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java
@@ -13,7 +13,6 @@
 
 package bartworks.common.tileentities.multis;
 
-import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
@@ -132,7 +131,6 @@ public IStructureDefinition<MTEThoriumHighTempReactor> getStructureDefinition()
     protected MultiblockTooltipBuilder createTooltip() {
         final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("High Temperature Reactor")
-            .addInfo("Controller block for the Thorium High Temperature Reactor (THTR)")
             .addInfo("Needs to be primed with " + GTUtility.formatNumbers(HELIUM_NEEDED) + " of helium")
             .addInfo("Needs a constant supply of coolant while running")
             .addInfo("Needs at least 100k Fuel pebbles to start operation (can hold up to 675k pebbles)")
@@ -141,7 +139,6 @@ protected MultiblockTooltipBuilder createTooltip() {
             .addInfo("Reactor will take 4 800L/t of coolant multiplied by efficiency")
             .addInfo("Uses " + GTUtility.formatNumbers(powerUsage) + " EU/t")
             .addInfo("One Operation takes 9 hours")
-            .addSeparator()
             .beginStructureBlock(11, 12, 11, true)
             .addController("Front bottom center")
             .addCasingInfoMin("Radiation Proof Casings", 500, false)
@@ -152,7 +149,7 @@ protected MultiblockTooltipBuilder createTooltip() {
             .addOutputHatch("Any bottom layer casing", 1)
             .addEnergyHatch("Any bottom layer casing", 1)
             .addMaintenanceHatch("Any bottom layer casing", 1)
-            .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS);
+            .toolTipFinisher();
         return tt;
     }