address some reviews

create BuilderFactory so only `makeBuilder()` is visible
remove event testing code

Author: ghzdude

src/main/java/gregtech/api/block/coil/BuilderFactory.java

@@ -0,0 +1,6 @@
+package gregtech.api.block.coil;
+
+public interface BuilderFactory {
+
+    CoilBlockBuilder makeBuilder(int id, String name);
+}

src/main/java/gregtech/api/block/coil/CoilBlockBuilder.java

@@ -15,15 +15,11 @@ public class CoilBlockBuilder {
     private final String modid;
     private final Consumer<CustomCoilBlock> onBuild;
 
-    private CoilBlockBuilder(String modid, Consumer<CustomCoilBlock> onBuild) {
+    CoilBlockBuilder(String modid, Consumer<CustomCoilBlock> onBuild) {
         this.modid = modid;
         this.onBuild = onBuild;
     }
 
-    static CoilBlockBuilder builder(String modid, Consumer<CustomCoilBlock> onBuild) {
-        return new CoilBlockBuilder(modid, onBuild);
-    }
-
     public CoilBlockBuilder addCoilType(UnaryOperator<CoilStatBuilder> builder) {
         if (stats.size() >= ACTIVE_META_LIMIT) {
             throw new IllegalStateException("Cannot exceed active meta limit!");
@@ -35,9 +31,7 @@ public CoilBlockBuilder addCoilType(UnaryOperator<CoilStatBuilder> builder) {
     public CustomCoilBlock build() {
         if (this.stats.isEmpty())
             throw new IllegalArgumentException("Variants is empty!");
-        CustomCoilBlock.setActiveList(this.stats);
-        var block = new CustomCoilBlock();
-        CustomCoilBlock.clearActiveList();
+        var block = new CustomCoilBlock(this.stats);
         for (var stat : this.stats) {
             GregTechAPI.HEATING_COILS.put(block.getState(stat), stat);
         }

src/main/java/gregtech/api/block/coil/CoilManager.java

@@ -15,7 +15,7 @@ public class CoilManager {
 
     private static CoilManager instance;
     private static int networkId;
-    private static CoilRegistry internal;
+    private static BuilderFactory internal;
 
     private final Object2ObjectMap<String, CoilRegistry> registryMap = new Object2ObjectOpenHashMap<>();
     private final Int2ObjectMap<CoilRegistry> networkMap = new Int2ObjectOpenHashMap<>();
@@ -30,15 +30,15 @@ public static CoilManager getInstance() {
 
     private CoilManager() {}
 
-    public CoilRegistry getRegistry(String modid) {
+    public BuilderFactory getRegistry(String modid) {
         CoilRegistry coilRegistry = registryMap.get(modid);
         if (coilRegistry == null) {
             throw new IllegalArgumentException("No MTE registry exists for modid \"" + modid + "\"");
         }
         return coilRegistry;
     }
 
-    public CoilRegistry createRegistry(String modid) {
+    public BuilderFactory createRegistry(String modid) {
         if (registryMap.containsKey(modid)) {
             throw new IllegalArgumentException("MTE Registry for modid \"" + modid + "\" is already registered");
         }
@@ -48,7 +48,7 @@ public CoilRegistry createRegistry(String modid) {
         return registry;
     }
 
-    public CoilRegistry getRegistry(int networkId) {
+    public BuilderFactory getRegistry(int networkId) {
         CoilRegistry coilRegistry = networkMap.get(networkId);
         return coilRegistry == null ? internal : coilRegistry;
     }

src/main/java/gregtech/api/block/coil/CoilRegistry.java

@@ -6,7 +6,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
-public class CoilRegistry extends GTControlledRegistry<ResourceLocation, CustomCoilBlock> {
+public class CoilRegistry extends GTControlledRegistry<ResourceLocation, CustomCoilBlock> implements BuilderFactory {
 
     private final String modid;
     private final int networkId;
@@ -17,9 +17,10 @@ public CoilRegistry(String modId, int networkId) {
         this.networkId = networkId;
     }
 
+    @Override
     public CoilBlockBuilder makeBuilder(int id, String name) {
         ResourceLocation loc = new ResourceLocation(this.modid, name);
-        return CoilBlockBuilder.builder(this.modid, b -> register(id, loc, b));
+        return new CoilBlockBuilder(this.modid, b -> register(id, loc, b));
     }
 
     @Override

src/main/java/gregtech/api/block/coil/CustomCoilBlock.java

@@ -42,16 +42,18 @@ public final class CustomCoilBlock extends VariantActiveBlock<CustomCoilStats> {
 
     private static final AtomicReference<List<CustomCoilStats>> activeSublist = new AtomicReference<>();
 
-    static void setActiveList(List<CustomCoilStats> sublist) {
+    // called in constructor to handle super constructor nonsense
+    private static net.minecraft.block.material.Material setActiveList(List<CustomCoilStats> sublist) {
         activeSublist.set(sublist);
+        return net.minecraft.block.material.Material.IRON;
     }
 
-    static void clearActiveList() {
+    private static void clearActiveList() {
         activeSublist.set(null);
     }
 
-    public CustomCoilBlock() {
-        super(net.minecraft.block.material.Material.IRON);
+    public CustomCoilBlock(List<CustomCoilStats> stats) {
+        super(setActiveList(stats));
         setTranslationKey("wire_coil");
         setHardness(5.0f);
         setResistance(10.0f);
@@ -68,7 +70,9 @@ public BlockRenderLayer getRenderLayer(CustomCoilStats value) {
 
     @Override
     protected @NotNull Collection<CustomCoilStats> computeVariants() {
-        return activeSublist.get(); // stupid super constructor nonsense
+        List<CustomCoilStats> stats = activeSublist.get();
+        clearActiveList();
+        return stats;
     }
 
     @Override

src/main/java/gregtech/common/CommonProxy.java

@@ -3,7 +3,6 @@
 import gregtech.api.GTValues;
 import gregtech.api.GregTechAPI;
 import gregtech.api.block.VariantItemBlock;
-import gregtech.api.block.coil.CoilManager;
 import gregtech.api.block.coil.CoilRegistry;
 import gregtech.api.block.coil.CustomCoilBlock;
 import gregtech.api.block.machines.MachineItemBlock;
@@ -15,7 +14,6 @@
 import gregtech.api.recipes.ingredients.GTRecipeOreInput;
 import gregtech.api.recipes.properties.impl.FusionEUToStartProperty;
 import gregtech.api.unification.material.Material;
-import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.info.MaterialFlags;
 import gregtech.api.unification.material.properties.DustProperty;
 import gregtech.api.unification.material.properties.PropertyKey;
@@ -228,31 +226,6 @@ public static void registerBlocksLast(RegistryEvent.Register<Block> event) {
         FLUID_BLOCKS.forEach(event.getRegistry()::register);
     }
 
-    // todo REMOVE, THIS IS FOR TESTING
-    @SubscribeEvent
-    public static void registerCoils(CoilManager.CoilRegistryEvent event) {
-        final String modid = "test";
-        CoilRegistry registry = CoilManager.getInstance().createRegistry(modid);
-
-        registry.makeBuilder(0, "coil_block")
-                .addCoilType(b -> b
-                        .coilTemp(42069)
-                        .generic()
-                        .tooltip((stack, world, strings, advanced) -> {
-                            strings.add("this is a custom coil!");
-                        })
-                        .tier(GTValues.UHV)
-                        .multiSmelter(69, 98)
-                        .material(Materials.Chlorine))
-                .addCoilType(b -> b
-                        .coilTemp(696969)
-                        .generic()
-                        .tier(GTValues.UHV)
-                        .multiSmelter(69, 99)
-                        .material(Materials.Neutronium))
-                .build();
-    }
-
     @SubscribeEvent
     public static void registerItems(RegistryEvent.Register<Item> event) {
         GTLog.logger.info("Registering Items...");

src/main/java/gregtech/core/CoreModule.java

@@ -201,10 +201,6 @@ public void preInit(FMLPreInitializationEvent event) {
         OreDictUnifier.init();
 
         MetaBlocks.init();
-
-        // for (CoilRegistry registry : coilManager.getRegistries()) {
-        // registry.unfreeze();
-        // }
         logger.info("Registering Coils");
         MinecraftForge.EVENT_BUS.post(new CoilManager.CoilRegistryEvent());
 
@@ -263,9 +259,6 @@ public void init(FMLInitializationEvent event) {
         for (MTERegistry registry : mteManager.getRegistries()) {
             registry.freeze();
         }
-        // for (CoilRegistry r : coilManager.getRegistries()) {
-        // r.freeze();
-        // }
         proxy.onLoad();
         if (RecipeMap.isFoundInvalidRecipe()) {
             logger.fatal("Seems like invalid recipe was found.");