Skip to content

Properly defer machine registration (1.21) #5412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gustovafing wants to merge 8 commits into from
Open

Properly defer machine registration (1.21) #5412

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12d1dc2
start working on deferred machine registration
gustovafing Aug 30, 2026
cec5825
fully expose block builder when making a machine
gustovafing Aug 30, 2026
d948c02
implement deferred machine registration
gustovafing Aug 30, 2026
fc32728
move multiblock creation properties to creation subclass
gustovafing Aug 31, 2026
1767651
move all machine properties to properties obj
gustovafing Aug 31, 2026
eeded09
start working on deferred machine registration
gustovafing Aug 30, 2026
e862cf3
spotless
gustovafing Sep 9, 2026
41bd8be
update machine builder stuff
gustovafing Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
182 changes: 123 additions & 59 deletions src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@
import com.gregtechceu.gtceu.api.data.RotationState;
import com.gregtechceu.gtceu.api.item.MetaMachineItem;
import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine;
import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility;
import com.gregtechceu.gtceu.api.mui.factory.PanelFactory;
import com.gregtechceu.gtceu.api.recipe.GTRecipe;
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier;
import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifierList;
import com.gregtechceu.gtceu.api.registry.registrate.builder.MachineBuilder;
import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider;
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
import com.gregtechceu.gtceu.common.data.GTRecipeModifiers;
import com.gregtechceu.gtceu.config.ConfigHolder;
import com.gregtechceu.gtceu.utils.GTUtil;

import net.minecraft.core.Direction;
Expand All @@ -22,11 +28,14 @@
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.Property;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.neoforged.neoforge.registries.DeferredHolder;

import brachy.modularui.theme.ThemeAPI;
import com.tterrag.registrate.providers.DataGenContext;
import com.tterrag.registrate.util.nullness.NonNullBiConsumer;
import it.unimi.dsi.fastutil.objects.Reference2IntMap;
import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
import lombok.Getter;
Expand All @@ -35,10 +44,7 @@
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;

import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.function.*;

/**
Expand All @@ -52,7 +58,6 @@ public class MachineDefinition {
private final ResourceLocation id;
// This is only stored here for KJS use.
@Getter
@Setter
@Nullable
private String langValue;
Comment thread
gustovafing marked this conversation as resolved.
Outdated
@Setter(onMethod_ = @ApiStatus.Internal)
Expand All @@ -62,91 +67,110 @@ public class MachineDefinition {
@Setter
private Supplier<BlockEntityType<? extends MetaMachine>> blockEntityTypeSupplier;
@Getter
@Setter
private GTRecipeType[] recipeTypes;
private final GTRecipeType[] recipeTypes;
@Getter
@Setter
private int tier = -1;
private final int tier;
@Getter
@Setter
private int defaultPaintingColor;
private final int defaultPaintingColor;
@Getter
@Setter
private RecipeModifier recipeModifier;
private final RecipeModifier recipeModifier;
@Getter
@Setter
private boolean alwaysTryModifyRecipe;
private final boolean alwaysTryModifyRecipe;
@Getter
@Setter
private BiPredicate<IRecipeLogicMachine, @Nullable GTRecipe> beforeWorking = (machine, recipe) -> true;
private final BiPredicate<IRecipeLogicMachine, @Nullable GTRecipe> beforeWorking;
@Getter
@Setter
private Predicate<IRecipeLogicMachine> onWorking = (machine) -> true;
private final Predicate<IRecipeLogicMachine> onWorking;
@Getter
@Setter
private Consumer<IRecipeLogicMachine> onWaiting = (machine) -> {};
private final Consumer<IRecipeLogicMachine> onWaiting;
@Getter
@Setter
private Consumer<IRecipeLogicMachine> afterWorking = (machine) -> {};
private final Consumer<IRecipeLogicMachine> afterWorking;
@Getter
@Setter
private boolean regressWhenWaiting = true;
private final boolean regressWhenWaiting;
/** Whether this machine can be rotated or face upwards. */
@Getter
@Setter
private boolean allowExtendedFacing;

private final boolean allowExtendedFacing;
@Getter
@Setter
private RotationState rotationState;
@Setter
private VoxelShape shape;
@Getter
@Setter
private boolean renderWorldPreview;
@Getter
@Setter
private boolean renderXEIPreview;
private final RotationState rotationState;
private final VoxelShape shape;
private final Map<Direction, VoxelShape> cache = new EnumMap<>(Direction.class);
@Getter
@Setter
private BiConsumer<ItemStack, List<Component>> tooltipBuilder;
private final BiConsumer<ItemStack, List<Component>> tooltipBuilder;
@Getter
@Setter
private Supplier<BlockState> appearance;
private final Supplier<BlockState> appearance;
@Getter
@Setter
private boolean allowCoverOnFront;
private final boolean allowCoverOnFront;
@Getter
@Setter
@Nullable
private PanelFactory UI;
private final PanelFactory UI;
@Getter
@Setter
private String themeId = ThemeAPI.DEFAULT_ID;
private final String themeId;
@Getter
@Setter
private Reference2IntMap<RecipeCapability<?>> recipeOutputLimits = new Reference2IntOpenHashMap<>();

private final Reference2IntMap<RecipeCapability<?>> recipeOutputLimits;
@Getter
@Setter(onMethod_ = @ApiStatus.Internal)
private StateDefinition<MachineDefinition, MachineRenderState> stateDefinition;
private final StateDefinition<MachineDefinition, MachineRenderState> stateDefinition;
@Accessors(fluent = true)
@Getter
private MachineRenderState defaultRenderState;
private final MachineRenderState defaultRenderState;

public MachineDefinition(ResourceLocation id) {
@SuppressWarnings({ "unchecked", "rawtypes" })
public MachineDefinition(ResourceLocation id, Properties properties) {
this.id = id;

this.rotationState = properties.rotationState();
this.langValue = properties.langValue();
this.UI = properties.ui();
this.themeId = properties.themeId();
this.recipeTypes = properties.recipeTypes();
this.blockHolder = properties.blockHolder();
this.itemHolder = properties.itemHolder();
this.tier = properties.tier();
this.recipeOutputLimits = properties.recipeOutputLimits();
this.blockEntityTypeSupplier = properties.blockEntityTypeSupplier();
this.tooltipBuilder = (itemStack, components) -> {
components.addAll(properties.tooltips());
if (properties.tooltipBuilder() != null) properties.tooltipBuilder().accept(itemStack, components);
};
this.recipeModifier = properties.recipeModifier();
this.alwaysTryModifyRecipe = properties.alwaysTryModifyRecipe();
this.beforeWorking = properties.beforeWorking();
this.onWorking = properties.onWorking();
this.onWaiting = properties.onWaiting();
this.afterWorking = properties.afterWorking();
this.regressWhenWaiting = properties.regressWhenWaiting();
this.allowCoverOnFront = properties.allowCoverOnFront();

for (GTRecipeType type : recipeTypes) {
if (type.getIconSupplier() == null) {
type.setIconSupplier(this::asStack);
}
}
if (properties.appearance() == null) {
properties.appearance(() -> blockHolder.value().defaultBlockState());
}
this.appearance = properties.appearance();
this.allowExtendedFacing = properties.allowExtendedFacing();
this.shape = properties.shape();
this.defaultPaintingColor = properties.paintingColor();

// Initialise render state

StateDefinition.Builder<MachineDefinition, MachineRenderState> builder = new StateDefinition.Builder<>(
this);
properties.modelProperties().keySet().forEach(builder::add);
stateDefinition = builder.create(MachineDefinition::defaultRenderState, MachineRenderState::new);

MachineRenderState defaultState = getStateDefinition().any();
for (var entry : properties.modelProperties().entrySet()) {
if (entry.getValue() == null) continue;
defaultState = defaultState.setValue((Property) entry.getKey(), (Comparable) entry.getValue());
}
this.defaultRenderState = defaultState;
}

public boolean isTiered() {
return tier != -1;
}

public final void registerDefaultState(MachineRenderState state) {
Comment thread
gustovafing marked this conversation as resolved.
this.defaultRenderState = state;
}

public MetaMachineBlock getBlock() {
return blockHolder.get();
}
Expand Down Expand Up @@ -243,4 +267,44 @@ public int getOutputSize(RecipeCapability<?> cap, GTRecipeType... recipeTypes) {
int machineTypeOutputLimit = this.getRecipeOutputLimits().getOrDefault(cap, recipeTypeOutputSize);
return Math.min(recipeTypeOutputSize, machineTypeOutputLimit);
}

@Accessors(fluent = true)
@Getter
@Setter
public static class Properties {

private DeferredHolder<Block, ? extends MetaMachineBlock> blockHolder;
private DeferredHolder<Item, ? extends MetaMachineItem> itemHolder;
private Supplier<BlockEntityType<? extends MetaMachine>> blockEntityTypeSupplier;

@Nullable
private MachineBuilder.ModelInitializer model = null;
private @Nullable NonNullBiConsumer<DataGenContext<Block, ? extends Block>, GTBlockstateProvider> blockModel = null;
protected final Map<Property<?>, @Nullable Comparable<?>> modelProperties = new IdentityHashMap<>();
private VoxelShape shape = Shapes.block();
private RotationState rotationState = RotationState.NON_Y_AXIS;
private boolean allowExtendedFacing = false;
private boolean hasBER = ConfigHolder.INSTANCE.client.machinesHaveBERsByDefault;
private GTRecipeType[] recipeTypes = new GTRecipeType[0];
private int tier = -1;
private Reference2IntMap<RecipeCapability<?>> recipeOutputLimits = new Reference2IntOpenHashMap<>();
private int paintingColor = ConfigHolder.INSTANCE.client.getDefaultPaintingColor();
private PartAbility[] abilities = new PartAbility[0];
private final List<Component> tooltips = new ArrayList<>();
private @Nullable BiConsumer<ItemStack, List<Component>> tooltipBuilder;
private RecipeModifier recipeModifier = new RecipeModifierList(GTRecipeModifiers.OC_NON_PERFECT);
private boolean alwaysTryModifyRecipe;
private BiPredicate<IRecipeLogicMachine, GTRecipe> beforeWorking = (machine, recipe) -> true;
private Predicate<IRecipeLogicMachine> onWorking = (machine) -> true;
private Consumer<IRecipeLogicMachine> onWaiting = (machine) -> {};
private Consumer<IRecipeLogicMachine> afterWorking = (machine) -> {};
private boolean regressWhenWaiting = true;
private boolean allowCoverOnFront = false;
@Nullable
private PanelFactory ui = null;
private String themeId = ThemeAPI.DEFAULT_ID;
private @Nullable Supplier<BlockState> appearance;
@Nullable
private String langValue = null;
}
}
78 changes: 57 additions & 21 deletions src/main/java/com/gregtechceu/gtceu/api/machine/MultiblockMachineDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine;
import com.gregtechceu.gtceu.api.machine.multiblock.part.MultiblockPartMachine;
import com.gregtechceu.gtceu.api.multiblock.pattern.IBlockPattern;
import com.gregtechceu.gtceu.utils.memoization.GTMemoizer;

import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
Expand All @@ -11,10 +12,12 @@

import brachy.modularui.api.widget.IWidget;
import brachy.modularui.value.sync.PanelSyncManager;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.function.TriFunction;
import org.jetbrains.annotations.Nullable;

import java.util.*;
import java.util.function.BiFunction;
Expand All @@ -24,35 +27,68 @@
public class MultiblockMachineDefinition extends MachineDefinition {

@Getter
@Setter
private boolean generator;
private final boolean generator;
@Getter
private Map<String, Supplier<IBlockPattern>> structurePatterns = new HashMap<>();
private final Map<String, Supplier<IBlockPattern>> structurePatterns;
@Getter
@Setter
private boolean allowFlip;
private final boolean allowFlip;
@Getter
@Setter
private boolean renderXEIPreview;
@Setter
private final boolean renderXEIPreview;
@Getter
@Nullable
private Supplier<ItemStack[]> recoveryItems;
@Setter
private final boolean renderWorldPreview;
@Getter
private Function<MultiblockControllerMachine, Comparator<MultiblockPartMachine>> partSorter;
private final Supplier<ItemStack[]> recoveryItems;
@Getter
@Setter
private TriFunction<MultiblockControllerMachine, MultiblockPartMachine, Direction, BlockState> partAppearance;
private final Function<MultiblockControllerMachine, Comparator<MultiblockPartMachine>> partSorter;
@Getter
@Setter
private BiFunction<MultiblockControllerMachine, PanelSyncManager, List<IWidget>> additionalDisplay;
private final TriFunction<MultiblockControllerMachine, MultiblockPartMachine, Direction, BlockState> partAppearance;
@Getter
private final BiFunction<MultiblockControllerMachine, PanelSyncManager, List<IWidget>> additionalDisplay;

public MultiblockMachineDefinition(ResourceLocation id, Properties properties) {
super(id, properties);
this.generator = properties.generator;

public MultiblockMachineDefinition(ResourceLocation id) {
super(id);
Map<String, Supplier<IBlockPattern>> structurePatterns = new Object2ObjectOpenHashMap<>();
if (properties.patterns().isEmpty()) {
throw new IllegalStateException("Missing default structure pattern for " + getName());
}
for (Map.Entry<String, Function<MultiblockMachineDefinition, IBlockPattern>> entry : properties.patterns
.entrySet()) {
structurePatterns.put(entry.getKey(), GTMemoizer.memoize(() -> entry.getValue().apply(this)));
}
this.structurePatterns = Collections.unmodifiableMap(structurePatterns);
this.allowFlip = properties.allowFlip();
this.renderXEIPreview = properties.renderMultiblockXEIPreview;
this.renderWorldPreview = properties.renderMultiblockWorldPreview;
this.recoveryItems = () -> properties.recoveryItems.stream().map(Supplier::get).flatMap(Arrays::stream)
.toArray(ItemStack[]::new);
this.partSorter = GTMemoizer.memoizeFunctionWeakIdent(properties.partSorter());
this.partAppearance = properties.partAppearance();
this.additionalDisplay = properties.additionalDisplay();
}

public void setPattern(String structureName, Supplier<IBlockPattern> pattern) {
structurePatterns.put(structureName, pattern);
@Accessors(fluent = true)
@Getter
@Setter
public static class Properties extends MachineDefinition.Properties {

private boolean generator = false;
private final Map<String, Function<MultiblockMachineDefinition, IBlockPattern>> patterns = new Object2ReferenceOpenHashMap<>();
private boolean allowFlip = true;
private final List<Supplier<ItemStack[]>> recoveryItems = new ArrayList<>();
private Function<MultiblockControllerMachine, Comparator<MultiblockPartMachine>> partSorter = (c) -> (a,
b) -> 0;
private TriFunction<MultiblockControllerMachine, MultiblockPartMachine, Direction, BlockState> partAppearance = (controller,
part,
side) -> controller
.getDefinition()
.getAppearance()
.get();
private boolean renderMultiblockWorldPreview = true;
private boolean renderMultiblockXEIPreview = true;
private BiFunction<MultiblockControllerMachine, PanelSyncManager, List<IWidget>> additionalDisplay = (m,
sm) -> Collections
.emptyList();
}
}
10 changes: 10 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/api/multiblock/Predicates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.gregtechceu.gtceu.api.multiblock.util.BlockInfo;
import com.gregtechceu.gtceu.api.pipenet.IPipeNode;
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
import com.gregtechceu.gtceu.api.registry.registrate.entry.MachineEntry;
import com.gregtechceu.gtceu.common.data.GTMaterialBlocks;
import com.gregtechceu.gtceu.config.ConfigHolder;

Expand Down Expand Up @@ -157,6 +158,15 @@ private static String blockToString(Block block) {
.orElse("unknown block");
}

public static MultiPredicate machines(MachineEntry<MachineDefinition> definition) {
Comment thread
gustovafing marked this conversation as resolved.
return machines(definition.value());
}

@SafeVarargs
public static MultiPredicate machines(MachineEntry<MachineDefinition>... definitions) {
return machines(Arrays.stream(definitions).map(Holder::value).toArray(MachineDefinition[]::new));
}

public static MultiPredicate machines(@Nullable MachineDefinition... definitions) {
List<Block> blocks = new ArrayList<>();
for (MachineDefinition definition : definitions) {
Expand Down
Loading
Loading