Skip to content

Update MachineBuilder Type Arguments to support the 7.5.0 changes #191

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

Merged
Ghostipedia merged 1 commit into from
Jan 17, 2026
Merged

Update MachineBuilder Type Arguments to support the 7.5.0 changes #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle/forge.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
ldlib = "1.0.40.b"
gtceu = "7.2.0"
gtceu = "7.5.0-SNAPSHOT"
registrate = "MC1.20-1.3.11"
configuration = "3.1.0-forge"
mixinExtras = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicMachines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ private static MachineDefinition[] registerThermiaTieredHatch(String name, Strin

private static MachineDefinition[] registerTieredMachines(String name,
BiFunction<IMachineBlockEntity, Integer, MetaMachine> factory,
BiFunction<Integer, MachineBuilder<MachineDefinition>, MachineDefinition> builder,
BiFunction<Integer, MachineBuilder<MachineDefinition, ?>, MachineDefinition> builder,
int... tiers) {
MachineDefinition[] definitions = new MachineDefinition[GTValues.TIER_COUNT];
for (int tier : tiers) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicMachinesUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,14 @@ public static MachineDefinition[] registerSimpleGenerator(String name,

public static MachineDefinition[] registerTieredSingleBlockMachines(String name,
BiFunction<IMachineBlockEntity, Integer, MetaMachine> factory,
BiFunction<Integer, MachineBuilder<MachineDefinition>, MachineDefinition> builder,
BiFunction<Integer, MachineBuilder<MachineDefinition, ?>, MachineDefinition> builder,
int... tiers) {
return registerTieredMachines(name, factory, builder, tiers);
}

public static MachineDefinition[] registerTieredMachines(String name,
BiFunction<IMachineBlockEntity, Integer, MetaMachine> factory,
BiFunction<Integer, MachineBuilder<MachineDefinition>, MachineDefinition> builder,
BiFunction<Integer, MachineBuilder<MachineDefinition, ?>, MachineDefinition> builder,
int... tiers) {
MachineDefinition[] definitions = new MachineDefinition[GTValues.TIER_COUNT];
for (int tier : tiers) {
Expand All @@ -200,7 +200,7 @@ public static MachineDefinition[] registerTieredMachines(String name,

public static Pair<MachineDefinition, MachineDefinition> registerSteamMachines(String name,
BiFunction<IMachineBlockEntity, Boolean, MetaMachine> factory,
BiFunction<Boolean, MachineBuilder<MachineDefinition>, MachineDefinition> builder) {
BiFunction<Boolean, MachineBuilder<MachineDefinition, ?>, MachineDefinition> builder) {
MachineDefinition lowTier = builder.apply(false,
REGISTRATE.machine("lp_%s".formatted(name), holder -> factory.apply(holder, false))
.langValue("I DO NOT EXIST")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicModularMachines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class CosmicModularMachines {
public static MultiblockMachineDefinition[] registerTieredModules(
String name,
BiFunction<IMachineBlockEntity, Integer, MultiblockControllerMachine> factory,
BiFunction<Integer, MultiblockMachineBuilder, MultiblockMachineDefinition> builder,
BiFunction<Integer, MultiblockMachineBuilder<?,?>, MultiblockMachineDefinition> builder,
int... tiers) {
MultiblockMachineDefinition[] definitions = new MultiblockMachineDefinition[GTValues.TIER_COUNT];
for (int tier : tiers) {
Expand Down
Loading