Skip to content

Commit 56c4d98

Browse files
committed
forgot the subclasses oops
1 parent ce6327c commit 56c4d98

File tree

4 files changed

+44
-7
lines changed

4 files changed

+44
-7
lines changed

src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractCraftingMultiblockBlockEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
public abstract class AbstractCraftingMultiblockBlockEntity extends MultiblockMachineBlockEntity implements Tickable,
4141
MultiblockInventoryComponentHolder, CrafterComponentHolder {
42-
private AbstractCraftingMultiblockBlockEntity(BEP bep, MachineGuiParameters.Builder guiParams, OrientationComponent.Params orientationParams,
42+
public AbstractCraftingMultiblockBlockEntity(BEP bep, MachineGuiParameters.Builder guiParams, OrientationComponent.Params orientationParams,
4343
ShapeTemplate[] shapeTemplates) {
4444
super(bep, guiParams.backgroundHeight(200).build(), orientationParams);
4545

src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractElectricCraftingMultiblockBlockEntity.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import aztech.modern_industrialization.api.machine.holder.EnergyListComponentHolder;
2727
import aztech.modern_industrialization.machines.BEP;
2828
import aztech.modern_industrialization.machines.components.*;
29+
import aztech.modern_industrialization.machines.gui.MachineGuiParameters;
2930
import aztech.modern_industrialization.machines.guicomponents.CraftingMultiblockGui;
3031
import aztech.modern_industrialization.machines.multiblocks.HatchBlockEntity;
3132
import aztech.modern_industrialization.machines.multiblocks.ShapeMatcher;
@@ -35,6 +36,7 @@
3536
import java.util.List;
3637
import java.util.UUID;
3738
import net.minecraft.core.Direction;
39+
import net.minecraft.resources.ResourceLocation;
3840
import net.minecraft.server.level.ServerLevel;
3941
import net.minecraft.world.InteractionHand;
4042
import net.minecraft.world.ItemInteractionResult;
@@ -44,15 +46,26 @@
4446
public abstract class AbstractElectricCraftingMultiblockBlockEntity extends AbstractCraftingMultiblockBlockEntity
4547
implements EnergyListComponentHolder, CrafterComponent.Behavior {
4648

47-
public AbstractElectricCraftingMultiblockBlockEntity(BEP bep, String name, OrientationComponent.Params orientationParams,
49+
public AbstractElectricCraftingMultiblockBlockEntity(BEP bep, MachineGuiParameters.Builder guiParams,
50+
OrientationComponent.Params orientationParams,
4851
ShapeTemplate[] shapeTemplates) {
49-
super(bep, name, orientationParams, shapeTemplates);
52+
super(bep, guiParams, orientationParams, shapeTemplates);
5053

5154
this.redstoneControl = new RedstoneControlComponent();
5255
registerGuiComponent(new CraftingMultiblockGui.Server(() -> shapeValid.shapeValid, crafter::getProgress, crafter, () -> 0));
5356
registerComponents(redstoneControl);
5457
}
5558

59+
public AbstractElectricCraftingMultiblockBlockEntity(BEP bep, String name, OrientationComponent.Params orientationParams,
60+
ShapeTemplate[] shapeTemplates) {
61+
this(bep, new MachineGuiParameters.Builder(name, false), orientationParams, shapeTemplates);
62+
}
63+
64+
public AbstractElectricCraftingMultiblockBlockEntity(BEP bep, ResourceLocation blockId, OrientationComponent.Params orientationParams,
65+
ShapeTemplate[] shapeTemplates) {
66+
this(bep, new MachineGuiParameters.Builder(blockId, false), orientationParams, shapeTemplates);
67+
}
68+
5669
protected final RedstoneControlComponent redstoneControl;
5770
protected final List<EnergyComponent> energyInputs = new ArrayList<>();
5871

src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/ElectricCraftingMultiblockBlockEntity.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,17 @@
2626
import aztech.modern_industrialization.api.machine.holder.EnergyListComponentHolder;
2727
import aztech.modern_industrialization.machines.BEP;
2828
import aztech.modern_industrialization.machines.components.*;
29+
import aztech.modern_industrialization.machines.gui.MachineGuiParameters;
2930
import aztech.modern_industrialization.machines.guicomponents.SlotPanel;
3031
import aztech.modern_industrialization.machines.init.MachineTier;
3132
import aztech.modern_industrialization.machines.multiblocks.ShapeTemplate;
3233
import aztech.modern_industrialization.machines.recipe.MachineRecipeType;
34+
import net.minecraft.resources.ResourceLocation;
3335

3436
public class ElectricCraftingMultiblockBlockEntity extends AbstractElectricCraftingMultiblockBlockEntity implements EnergyListComponentHolder {
35-
public ElectricCraftingMultiblockBlockEntity(BEP bep, String name, ShapeTemplate shapeTemplate, MachineRecipeType recipeType) {
36-
super(bep, name, new OrientationComponent.Params(false, false, false), new ShapeTemplate[] { shapeTemplate });
37+
public ElectricCraftingMultiblockBlockEntity(BEP bep, MachineGuiParameters.Builder guiParams, ShapeTemplate shapeTemplate,
38+
MachineRecipeType recipeType) {
39+
super(bep, guiParams, new OrientationComponent.Params(false, false, false), new ShapeTemplate[] { shapeTemplate });
3740
this.recipeType = recipeType;
3841
this.upgrades = new UpgradeComponent();
3942
this.overdrive = new OverdriveComponent();
@@ -44,6 +47,14 @@ public ElectricCraftingMultiblockBlockEntity(BEP bep, String name, ShapeTemplate
4447
.withOverdrive(overdrive));
4548
}
4649

50+
public ElectricCraftingMultiblockBlockEntity(BEP bep, String name, ShapeTemplate shapeTemplate, MachineRecipeType recipeType) {
51+
this(bep, new MachineGuiParameters.Builder(name, false), shapeTemplate, recipeType);
52+
}
53+
54+
public ElectricCraftingMultiblockBlockEntity(BEP bep, ResourceLocation blockId, ShapeTemplate shapeTemplate, MachineRecipeType recipeType) {
55+
this(bep, new MachineGuiParameters.Builder(blockId, false), shapeTemplate, recipeType);
56+
}
57+
4758
private final MachineRecipeType recipeType;
4859
private final UpgradeComponent upgrades;
4960
private final OverdriveComponent overdrive;

src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamCraftingMultiblockBlockEntity.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import aztech.modern_industrialization.machines.components.CrafterComponent;
2828
import aztech.modern_industrialization.machines.components.OrientationComponent;
2929
import aztech.modern_industrialization.machines.components.OverclockComponent;
30+
import aztech.modern_industrialization.machines.gui.MachineGuiParameters;
3031
import aztech.modern_industrialization.machines.guicomponents.CraftingMultiblockGui;
3132
import aztech.modern_industrialization.machines.helper.SteamHelper;
3233
import aztech.modern_industrialization.machines.multiblocks.HatchBlockEntity;
@@ -38,6 +39,7 @@
3839
import java.util.UUID;
3940
import net.minecraft.core.Direction;
4041
import net.minecraft.network.chat.Component;
42+
import net.minecraft.resources.ResourceLocation;
4143
import net.minecraft.server.level.ServerLevel;
4244
import net.minecraft.world.InteractionHand;
4345
import net.minecraft.world.ItemInteractionResult;
@@ -48,9 +50,10 @@ public class SteamCraftingMultiblockBlockEntity extends AbstractCraftingMultiblo
4850

4951
private final OverclockComponent overclockComponent;
5052

51-
public SteamCraftingMultiblockBlockEntity(BEP bep, String name, ShapeTemplate shapeTemplate, MachineRecipeType recipeType,
53+
public SteamCraftingMultiblockBlockEntity(BEP bep, MachineGuiParameters.Builder guiParams, ShapeTemplate shapeTemplate,
54+
MachineRecipeType recipeType,
5255
List<OverclockComponent.Catalyst> overclockCatalysts) {
53-
super(bep, name, new OrientationComponent.Params(false, false, false), new ShapeTemplate[] { shapeTemplate });
56+
super(bep, guiParams, new OrientationComponent.Params(false, false, false), new ShapeTemplate[] { shapeTemplate });
5457

5558
this.overclockComponent = new OverclockComponent(overclockCatalysts);
5659
this.recipeType = recipeType;
@@ -59,6 +62,16 @@ public SteamCraftingMultiblockBlockEntity(BEP bep, String name, ShapeTemplate sh
5962
this.registerComponents(overclockComponent);
6063
}
6164

65+
public SteamCraftingMultiblockBlockEntity(BEP bep, String name, ShapeTemplate shapeTemplate, MachineRecipeType recipeType,
66+
List<OverclockComponent.Catalyst> overclockCatalysts) {
67+
this(bep, new MachineGuiParameters.Builder(name, false), shapeTemplate, recipeType, overclockCatalysts);
68+
}
69+
70+
public SteamCraftingMultiblockBlockEntity(BEP bep, ResourceLocation blockId, ShapeTemplate shapeTemplate, MachineRecipeType recipeType,
71+
List<OverclockComponent.Catalyst> overclockCatalysts) {
72+
this(bep, new MachineGuiParameters.Builder(blockId, false), shapeTemplate, recipeType, overclockCatalysts);
73+
}
74+
6275
@Override
6376
protected CrafterComponent.Behavior getBehavior() {
6477
return new Behavior();

0 commit comments

Comments
 (0)