Skip to content

Use resource location for machine casings #17

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

Closed
wants to merge 1 commit into from
Closed

Use resource location for machine casings #17

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
4 changes: 2 additions & 2 deletions src/main/java/net/swedz/tesseract/neoforge/compat/mi/hook/MIHookTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static List<Consumer<MachineCasingModelsMIHookDatagenProvider>> getMachin
return MACHINE_CASING_MODELS.computeIfAbsent(modId, (k) -> Lists.newArrayList());
}

public static void addMachineCasingModel(String name, Consumer<MachineCasingModelsMIHookDatagenProvider> action)
public static void addMachineCasingModel(Consumer<MachineCasingModelsMIHookDatagenProvider> action)
{
assertTracking();

Expand All @@ -113,7 +113,7 @@ public record MachineModelProperties(
{
public void addToMachineJson(JsonObject json)
{
json.addProperty("casing", defaultCasing.name);
json.addProperty("casing", defaultCasing.key.toString());

var defaultOverlays = new JsonObject();

Expand Down
18 changes: 9 additions & 9 deletions ...swedz/tesseract/neoforge/compat/mi/hook/context/listener/MachineCasingsMIHookContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@

public final class MachineCasingsMIHookContext implements MIHookContext
{
public MachineCasing register(String name, BiConsumer<MachineCasing, MachineCasingModelsMIHookDatagenProvider> model)
public MachineCasing register(String id, BiConsumer<MachineCasing, MachineCasingModelsMIHookDatagenProvider> model)
{
MachineCasing casing = MachineCasings.create(name);
MIHookTracker.addMachineCasingModel(name, (provider) -> model.accept(casing, provider));
MachineCasing casing = MachineCasings.create(MIHookTracker.id(id));
MIHookTracker.addMachineCasingModel((provider) -> model.accept(casing, provider));
return casing;
}

public MachineCasing registerImitateBlock(String name, Supplier<Block> block)
public MachineCasing registerImitateBlock(String id, Supplier<Block> block)
{
return this.register(name, (casing, provider) -> provider.imitateBlock(casing, block.get()));
return this.register(id, (casing, provider) -> provider.imitateBlock(casing, block.get()));
}

public MachineCasing registerCubeBottomTop(String name, ResourceLocation side, ResourceLocation bottom, ResourceLocation top)
public MachineCasing registerCubeBottomTop(String id, ResourceLocation side, ResourceLocation bottom, ResourceLocation top)
{
return this.register(name, (casing, provider) -> provider.cubeBottomTop(casing, side, bottom, top));
return this.register(id, (casing, provider) -> provider.cubeBottomTop(casing, side, bottom, top));
}

public MachineCasing registerCubeAll(String name, ResourceLocation side)
public MachineCasing registerCubeAll(String id, ResourceLocation side)
{
return this.register(name, (casing, provider) -> provider.cubeAll(casing, side));
return this.register(id, (casing, provider) -> provider.cubeAll(casing, side));
}
}
16 changes: 6 additions & 10 deletions .../swedz/tesseract/neoforge/datagen/mi/client/MachineCasingModelsMIHookDatagenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.swedz.tesseract.neoforge.datagen.mi.client;

import aztech.modern_industrialization.MI;
import aztech.modern_industrialization.machines.models.MachineBakedModel;
import aztech.modern_industrialization.machines.models.MachineCasing;
import aztech.modern_industrialization.machines.models.UseBlockModelUnbakedModel;
Expand All @@ -20,37 +19,34 @@

public final class MachineCasingModelsMIHookDatagenProvider extends ModelProvider<BlockModelBuilder>
{
private final String actualModId;

public MachineCasingModelsMIHookDatagenProvider(GatherDataEvent event, String actualModId)
public MachineCasingModelsMIHookDatagenProvider(GatherDataEvent event, String modId)
{
super(event.getGenerator().getPackOutput(), MI.ID, MachineBakedModel.CASING_FOLDER, BlockModelBuilder::new, event.getExistingFileHelper());
this.actualModId = actualModId;
super(event.getGenerator().getPackOutput(), modId, MachineBakedModel.CASING_FOLDER, BlockModelBuilder::new, event.getExistingFileHelper());
}

@Override
protected void registerModels()
{
for(Consumer<MachineCasingModelsMIHookDatagenProvider> action : MIHookTracker.getMachineCasingModels(actualModId))
for(Consumer<MachineCasingModelsMIHookDatagenProvider> action : MIHookTracker.getMachineCasingModels(modid))
{
action.accept(this);
}
}

public void imitateBlock(MachineCasing casing, Block block)
{
getBuilder(casing.name)
getBuilder(casing.key.toString())
.customLoader((bmb, existingFileHelper) -> new UseBlockModelModelBuilder<>(block, bmb, existingFileHelper));
}

public void cubeBottomTop(MachineCasing casing, ResourceLocation side, ResourceLocation bottom, ResourceLocation top)
{
this.cubeBottomTop(casing.name, side, bottom, top);
this.cubeBottomTop(casing.key.toString(), side, bottom, top);
}

public void cubeAll(MachineCasing casing, ResourceLocation side)
{
this.cubeAll(casing.name, side);
this.cubeAll(casing.key.toString(), side);
}

@Override
Expand Down