Added large fluid extractor multi (#2819)

* Added large fluid extractor multi

* ran spotless

* Prevent multi from requesting more than 1A with 1 energy hatch

* Moved boro. glass registration to bartworks

In GT5u dev environments, borosilicate glass wasn't registered
properly. The block was registered, but it wasn't added to
allLevelsReverse since registerGlass() was never called.
This led to getTier() not working properly (it always returned tier=3).

* Changed speed bonuses and added some QoL changes

Added a multiplication EU/t cost to solenoid tiers and buffed solenoid
parallels.
Added an additive EU/t reduction to heating coil tiers.
Fixed the glass structure check.
Updated the multi's tooltip and sensor info data.

* applied spotless

* large fluid extractor code cleanup

* changed mechanics & improved structure messages

* spotless apply

---------

Co-authored-by: Mary Hopson <doyoumined@gmail.com>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

2 files changed, 14 insertions, 11 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java
index aca6b16330..3d2b33843c 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java
@@ -4,7 +4,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAdder;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered;
-import static gregtech.api.enums.Mods.BartWorks;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,6 +16,7 @@ import net.minecraft.block.Block;
 
 import org.apache.commons.lang3.tuple.Pair;
 
+import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.SetMultimap;
@@ -25,7 +25,6 @@ import com.gtnewhorizon.structurelib.structure.IStructureElement;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.LoaderState;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 /**
  * API for bartworks borosilicate glass.
@@ -38,7 +37,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
  */
 public class BorosilicateGlass {
 
-    private static Block block, block2;
     private static List<Pair<Block, Integer>> representatives;
     private static SetMultimap<Byte, Pair<Block, Integer>> allLevels;
     private static final Table<Block, Integer, Byte> allLevelsReverse = HashBasedTable.create();
@@ -48,17 +46,11 @@ public class BorosilicateGlass {
     }
 
     public static Block getGlassBlock() {
-        if (block == null) {
-            block = GameRegistry.findBlock(BartWorks.ID, "BW_GlasBlocks");
-        }
-        return block;
+        return ItemRegistry.bw_realglas;
     }
 
     public static Block getGlassBlock2() {
-        if (block2 == null) {
-            block2 = GameRegistry.findBlock(BartWorks.ID, "BW_GlasBlocks2");
-        }
-        return block2;
+        return ItemRegistry.bw_realglas;
     }
 
     private static void doRegister(byte level, Block block, int meta,
@@ -111,6 +103,14 @@ public class BorosilicateGlass {
     }
 
     /**
+     * ONLY registers borosilicate glass. Without this, {@link #getTier} won't work properly in environments that don't
+     * have the coremod.
+     */
+    public static void registerBorosilicateGlass() {
+        getAllLevels();
+    }
+
+    /**
      * Register a new block as valid borosilicate glass with given tier (even if it doesn't contain boron at all)
      *
      * Does not support matching by more complex stuff like tile entity!
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
index a5bd2edc12..86927d9add 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
@@ -183,6 +183,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
+import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
 import com.github.bartimaeusnek.bartworks.MainMod;
 import com.github.bartimaeusnek.bartworks.common.blocks.BW_Blocks;
 import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks;
@@ -395,6 +396,8 @@ public class ItemRegistry {
     public static void run() {
         GameRegistry.registerBlock(ItemRegistry.bw_fake_glasses, "BW_FakeGlasBlock");
         GameRegistry.registerBlock(ItemRegistry.bw_fake_glasses2, "BW_FakeGlasBlocks2");
+        BorosilicateGlass.registerBorosilicateGlass();
+
         GameRegistry.registerBlock(ItemRegistry.BW_BLOCKS[2], BW_ItemBlocks.class, "BW_Machinery_Casings");
         GameRegistry.registerItem(ItemRegistry.LEATHER_ROTOR, "BW_LeatherRotor");
         GameRegistry.registerItem(ItemRegistry.WOOL_ROTOR, "BW_WoolRotor");