Skip to content
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.

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

Add Cable Recipes and 4x Cable/Wire Recipes #1405

Merged
merged 1 commit into from
Jan 26, 2021
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,20 @@ public static void register() {
wirePrefix.addProcessingHandler(IngotMaterial.class, WireRecipeHandler::generateWireRecipe);
wirePrefix.addProcessingHandler(Material.class, WireRecipeHandler::generateWireCombiningRecipe);
}

for (OrePrefix cablePrefix : CABLE_DOUBLING_ORDER) {
cablePrefix.addProcessingHandler(Material.class, WireRecipeHandler::generateCableCombiningRecipe);
}
}

private static final OrePrefix[] WIRE_DOUBLING_ORDER = new OrePrefix[]{
OrePrefix.wireGtSingle, OrePrefix.wireGtDouble, OrePrefix.wireGtQuadruple, OrePrefix.wireGtOctal, OrePrefix.wireGtHex
};

private static final OrePrefix[] CABLE_DOUBLING_ORDER = new OrePrefix[]{
OrePrefix.cableGtSingle, OrePrefix.cableGtDouble, OrePrefix.cableGtQuadruple, OrePrefix.cableGtOctal, OrePrefix.cableGtHex
};

public static void processWireSingle(OrePrefix wirePrefix, IngotMaterial material) {
RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
.input(OrePrefix.ingot, material)
Expand Down Expand Up @@ -135,6 +143,41 @@ public static void generateWireCombiningRecipe(OrePrefix wirePrefix, Material ma
OreDictUnifier.get(WIRE_DOUBLING_ORDER[wireIndex - 1], material, 2),
new UnificationEntry(wirePrefix, material));
}

if (wireIndex < 3) {
ModHandler.addShapelessRecipe(String.format("%s_wire_%s_quadrupling", material, wirePrefix),
OreDictUnifier.get(WIRE_DOUBLING_ORDER[wireIndex + 2], material),
new UnificationEntry(wirePrefix, material),
new UnificationEntry(wirePrefix, material),
new UnificationEntry(wirePrefix, material),
new UnificationEntry(wirePrefix, material));
}
}

public static void generateCableCombiningRecipe(OrePrefix cablePrefix, Material material) {
int cableIndex = ArrayUtils.indexOf(CABLE_DOUBLING_ORDER, cablePrefix);

if (cableIndex < CABLE_DOUBLING_ORDER.length - 1) {
ModHandler.addShapelessRecipe(String.format("%s_cable_%s_doubling", material, cablePrefix),
OreDictUnifier.get(CABLE_DOUBLING_ORDER[cableIndex + 1], material),
new UnificationEntry(cablePrefix, material),
new UnificationEntry(cablePrefix, material));
}

if (cableIndex > 0) {
ModHandler.addShapelessRecipe(String.format("%s_cable_%s_splitting", material, cablePrefix),
OreDictUnifier.get(CABLE_DOUBLING_ORDER[cableIndex - 1], material, 2),
new UnificationEntry(cablePrefix, material));
}

if (cableIndex < 3) {
ModHandler.addShapelessRecipe(String.format("%s_cable_%s_quadrupling", material, cablePrefix),
OreDictUnifier.get(CABLE_DOUBLING_ORDER[cableIndex + 2], material),
new UnificationEntry(cablePrefix, material),
new UnificationEntry(cablePrefix, material),
new UnificationEntry(cablePrefix, material),
new UnificationEntry(cablePrefix, material));
}
}

private static int getMaterialAmount(int cableTier, int insulationTier) {
Expand Down