Skip to content

Commit 2f87fee

Browse files
authored
Add missing builtin model methods (#138)
1 parent 258c5e9 commit 2f87fee

File tree

3 files changed

+37
-2
lines changed

3 files changed

+37
-2
lines changed

src/main/java/net/swedz/tesseract/neoforge/compat/mi/machine/builder/HatchMachineBuilder.java

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,37 @@ public HatchMachineBuilder builtinModel(MachineCasing casing, String overlayFold
119119
});
120120
}
121121

122+
public HatchMachineBuilder builtinModel(MachineCasing casing, String overlayFolder)
123+
{
124+
return this.builtinModel(casing, overlayFolder, null);
125+
}
126+
122127
public HatchMachineBuilder builtinModel(MachineCasing casing, Consumer<MachineBuiltinModelBuilder> builder)
123128
{
124129
Assert.notNull(type, "The type must be selected before including a builtin model");
125130
Assert.that(type != RegistrationType.SPECIAL, "Overlay folder must be specified for special hatches");
126131
return this.builtinModel(casing, this.getDefaultOverlayFolder(), builder);
127132
}
128133

129-
public HatchMachineBuilder builtinModel(Consumer<MachineBuiltinModelBuilder> builder)
134+
public HatchMachineBuilder builtinModel(MachineCasing casing)
135+
{
136+
return this.builtinModel(casing, (Consumer<MachineBuiltinModelBuilder>) null);
137+
}
138+
139+
public HatchMachineBuilder builtinModel(String overlayFolder, Consumer<MachineBuiltinModelBuilder> builder)
130140
{
131141
Assert.that(type == RegistrationType.ENERGY, "Machine casing must be specified for non-energy hatches");
132-
return this.builtinModel(energyCableTier.casing, builder);
142+
return this.builtinModel(energyCableTier.casing, overlayFolder, builder);
143+
}
144+
145+
public HatchMachineBuilder builtinModel(Consumer<MachineBuiltinModelBuilder> builder)
146+
{
147+
return this.builtinModel(this.getDefaultOverlayFolder(), builder);
148+
}
149+
150+
public HatchMachineBuilder builtinModel()
151+
{
152+
return this.builtinModel((Consumer<MachineBuiltinModelBuilder>) null);
133153
}
134154

135155
private String getName()

src/main/java/net/swedz/tesseract/neoforge/compat/mi/machine/builder/SingleBlockCraftingMachineBuilder.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ public SingleBlockCraftingMachineBuilder builtinModel(String overlayFolder, Cons
5757
return this.builtinModel(null, overlayFolder, builder);
5858
}
5959

60+
public SingleBlockCraftingMachineBuilder builtinModel(String overlayFolder)
61+
{
62+
return this.builtinModel(overlayFolder, null);
63+
}
64+
6065
public SingleBlockCraftingMachineBuilder bronze()
6166
{
6267
tiers |= TIER_BRONZE;

src/main/java/net/swedz/tesseract/neoforge/compat/mi/machine/builder/SpecialMachineBuilder.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ public SpecialMachineBuilder builtinModel(MachineCasing casing, String overlayFo
4646
});
4747
}
4848

49+
public SpecialMachineBuilder builtinModel(String overlayFolder, Consumer<MachineBuiltinModelBuilder> builder)
50+
{
51+
return this.builtinModel(null, overlayFolder, builder);
52+
}
53+
54+
public SpecialMachineBuilder builtinModel(String overlayFolder)
55+
{
56+
return this.builtinModel(overlayFolder, null);
57+
}
58+
4959
public SpecialMachineBuilder gui(SteamMode steamMode, MachineRecipeType recipeType,
5060
MachineGuiConfigurator builder)
5161
{

0 commit comments

Comments
 (0)