charcoal pile igniter and refactor

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java

@@ -9,11 +9,11 @@
 import gregtech.api.metatileentity.MetaTileEntityHolder;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.pattern.BlockWorldState;
+import gregtech.api.pattern.GreggyBlockPos;
 import gregtech.api.pattern.MultiblockShapeInfo;
 import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.api.pattern.pattern.IBlockPattern;
 import gregtech.api.pattern.pattern.PatternState;
-import gregtech.api.pattern.pattern.PreviewBlockPattern;
 import gregtech.api.pipenet.tile.IPipeTile;
 import gregtech.api.unification.material.Material;
 import gregtech.api.util.BlockInfo;
@@ -73,12 +73,12 @@
 import java.util.Objects;
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 import static gregtech.api.capability.GregtechDataCodes.*;
 
@@ -88,10 +88,6 @@ public abstract class MultiblockControllerBase extends MetaTileEntity implements
         MetaTileEntity mte = (MetaTileEntity) part;
         return ((long) multiblockPartSorter().apply(mte.getPos()) << 32) | mte.getPos().hashCode();
     });
-    /**
-     * Null until the first time {@link MultiblockControllerBase#getMatchingShapes()} is called, if it is not overriden
-     */
-    protected PreviewBlockPattern defaultPattern;
 
     private final Map<MultiblockAbility<Object>, List<Object>> multiblockAbilities = new HashMap<>();
 
@@ -140,7 +136,7 @@ public void update() {
     /**
      * @return structure pattern of this multiblock
      */
-    // todo fix central monitor, charcoal pile igniter, (and vacuum freezer)
+    // todo fix central monitor, and vacuum freezer
     @NotNull
     protected abstract IBlockPattern createStructurePattern();
 
@@ -528,10 +524,11 @@ protected void registerMultiblockAbility(IMultiblockAbilityPart<Object> part) {
         part.registerAbilities(abilityList);
     }
 
-    protected void forEachFormed(String name, Consumer<BlockInfo> action) {
+    protected void forEachFormed(String name, BiConsumer<BlockInfo, GreggyBlockPos> action) {
         Long2ObjectMap<BlockInfo> cache = getSubstructure(name).getCache();
-        for (BlockInfo info : cache.values()) {
-            action.accept(info);
+        GreggyBlockPos pos = new GreggyBlockPos();
+        for (Long2ObjectMap.Entry<BlockInfo> entry : cache.long2ObjectEntrySet()) {
+            action.accept(entry.getValue(), pos.fromLong(entry.getLongKey()));
         }
     }
 
@@ -777,30 +774,23 @@ public List<MultiblockShapeInfo> getMatchingShapes() {
      * The new(and better) way of getting shapes for in world, jei, and autobuild. Default impl just converts
      * {@link MultiblockControllerBase#getMatchingShapes()}, if not empty, to this. If getMatchingShapes is empty, uses
      * a default generated structure pattern, it's not very good which is why you should override this.
-     * 
-     * @param keyMap  A map for autobuild, or null if it is an in world or jei preview.
+     *
+     * @param keyMap  A map for autobuild, or null if it is an in world or jei preview. Note that for in world and jei
+     *                previews you can return a singleton list(only the first element will be used anyway).
      * @param hatches This is whether you should put hatches, JEI previews need hatches, but autobuild and in world
-     *                previews shouldn't(unless the hatch is necessary and only has one valid spot, such as EBF)
+     *                previews shouldn't(unless the hatch is necessary and only has one valid spot, such as EBF muffler)
      */
     // todo add use for the keyMap with the multiblock builder
-    public List<PreviewBlockPattern> getBuildableShapes(@Nullable Object2IntMap<String> keyMap, boolean hatches) {
+    // todo maybe add name arg for building substructures
+    public List<MultiblockShapeInfo> getBuildableShapes(@Nullable Object2IntMap<String> keyMap, boolean hatches) {
         List<MultiblockShapeInfo> infos = getMatchingShapes();
 
         // if there is no overriden getMatchingShapes() just return the default one
         if (infos.isEmpty()) {
-            if (defaultPattern == null) {
-
-                // only generate for the first pattern, if you have more than 1 pattern you better override this
-                defaultPattern = getSubstructure("MAIN").getDefaultShape();
-
-                if (defaultPattern == null) return Collections.emptyList();
-            }
-
-            return Collections.singletonList(defaultPattern);
+            return Collections.singletonList(getSubstructure("MAIN").getDefaultShape());
         }
 
-        // otherwise just convert them all the preview block pattern and return
-        return getMatchingShapes().stream().map(PreviewBlockPattern::new).collect(Collectors.toList());
+        return infos;
     }
 
     @SideOnly(Side.CLIENT)

src/main/java/gregtech/api/pattern/MultiblockShapeInfo.java

@@ -3,7 +3,6 @@
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
 import gregtech.api.pattern.pattern.PatternAisle;
-import gregtech.api.pattern.pattern.PreviewBlockPattern;
 import gregtech.api.util.BlockInfo;
 
 import net.minecraft.block.state.IBlockState;
@@ -12,18 +11,12 @@
 
 import it.unimi.dsi.fastutil.chars.Char2ObjectMap;
 import it.unimi.dsi.fastutil.chars.Char2ObjectOpenHashMap;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
-@Deprecated
 public class MultiblockShapeInfo {
-
-    /**
-     * Array of aisles, you should use {@link PreviewBlockPattern} instead
-     */
     protected final PatternAisle[] aisles;
     protected final Char2ObjectMap<BlockInfo> symbols;
 
@@ -36,16 +29,6 @@ public static Builder builder() {
         return new Builder();
     }
 
-    @ApiStatus.Internal
-    public PatternAisle[] getAisles() {
-        return aisles;
-    }
-
-    @ApiStatus.Internal
-    public Char2ObjectMap<BlockInfo> getSymbols() {
-        return symbols;
-    }
-
     public static class Builder {
 
         private List<PatternAisle> shape = new ArrayList<>();

src/main/java/gregtech/api/pattern/pattern/BlockPattern.java

@@ -3,6 +3,7 @@
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.pattern.BlockWorldState;
 import gregtech.api.pattern.GreggyBlockPos;
+import gregtech.api.pattern.MultiblockShapeInfo;
 import gregtech.api.pattern.OriginOffset;
 import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.api.util.BlockInfo;
@@ -296,7 +297,7 @@ public boolean checkAisle(GreggyBlockPos controllerPos, EnumFacing frontFacing,
 
     @Override
     // todo get real
-    public PreviewBlockPattern getDefaultShape() {
+    public MultiblockShapeInfo getDefaultShape() {
         char[][][] pattern = new char[dimensions[2]][dimensions[1]][dimensions[0]];
 
         for (PatternAisle aisle : aisles) {

src/main/java/gregtech/api/pattern/pattern/ExpandablePattern.java

@@ -3,6 +3,7 @@
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.pattern.BlockWorldState;
 import gregtech.api.pattern.GreggyBlockPos;
+import gregtech.api.pattern.MultiblockShapeInfo;
 import gregtech.api.pattern.OriginOffset;
 import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.api.util.BlockInfo;
@@ -172,7 +173,7 @@ public boolean checkPatternAt(World world, BlockPos centerPos, EnumFacing frontF
     }
 
     @Override
-    public PreviewBlockPattern getDefaultShape() {
+    public MultiblockShapeInfo getDefaultShape() {
         // todo undo
         return null;
     }

src/main/java/gregtech/api/pattern/pattern/IBlockPattern.java

@@ -1,6 +1,7 @@
 package gregtech.api.pattern.pattern;
 
 import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
+import gregtech.api.pattern.MultiblockShapeInfo;
 import gregtech.api.pattern.OriginOffset;
 import gregtech.api.util.BlockInfo;
 import gregtech.api.util.RelativeDirection;
@@ -11,6 +12,7 @@
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public interface IBlockPattern {
 
@@ -46,9 +48,11 @@ boolean checkPatternAt(World world, BlockPos centerPos, EnumFacing frontFacing,
                            boolean isFlipped);
 
     /**
-     * Gets the default shape, if the multiblock does not specify one.
+     * Gets the default shape, if the multiblock does not specify one. Return null to represent the default shape does
+     * not exist.
      */
-    PreviewBlockPattern getDefaultShape();
+    @Nullable
+    MultiblockShapeInfo getDefaultShape();
 
     /**
      * Gets the internal pattern state, you should use the one returned from
@@ -65,9 +69,7 @@ default void clearCache() {
     }
 
     /**
-     * Gets the cache, if you modify literally anything in the cache except clearing it(in which case you should use
-     * clearCache())
-     * then GTCEu is now licensed under ARR just for you, so close your IDE or else.
+     * Gets the cache, do not modify. Note that the cache stores everything in the AABB of the substructure, except for any() TraceabilityPredicates.
      * 
      * @return The cache for rapid pattern checking.
      */