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.

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

Wiremill Circuit Recipes #1004

Merged
merged 3 commits into from
Mar 27, 2024
Merged

Wiremill Circuit Recipes #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fe43c0
Wiremill Circuit Recipes
ReclipseTheOne Mar 24, 2024
bb7dc9a
Merge branch '1.20.1' into 1.20.1
ReclipseTheOne Mar 26, 2024
e41afe6
Ported the 1.12.2 Wiremill Circuit recipes
ReclipseTheOne Mar 26, 2024
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 src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ public class GTRecipeTypes {
.setSound(GTSoundEntries.CENTRIFUGE);


public final static GTRecipeType WIREMILL_RECIPES = register("wiremill", ELECTRIC).setMaxIOSize(1, 1, 0, 0).setEUIO(IO.IN)
public final static GTRecipeType WIREMILL_RECIPES = register("wiremill", ELECTRIC).setMaxIOSize(2, 1, 0, 0).setEUIO(IO.IN)
.setSlotOverlay(false, false, GuiTextures.WIREMILL_OVERLAY)
.setProgressBar(GuiTextures.PROGRESS_BAR_WIREMILL, LEFT_TO_RIGHT)
.setSound(GTSoundEntries.MOTOR);
Expand Down
47 changes: 39 additions & 8 deletions src/main/java/com/gregtechceu/gtceu/data/recipe/generated/WireRecipeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.gregtechceu.gtceu.data.recipe.generated;

import com.google.common.collect.ImmutableMap;
import com.gregtechceu.gtceu.api.GTValues;
import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper;
import com.gregtechceu.gtceu.api.data.chemical.material.Material;
import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
Expand All @@ -12,14 +13,16 @@
import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder;
import com.gregtechceu.gtceu.utils.GTUtil;
import net.minecraft.data.recipes.FinishedRecipe;
import net.minecraft.resources.ResourceLocation;

import java.util.Map;
import java.util.function.Consumer;

import static com.gregtechceu.gtceu.api.GTValues.*;
import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_PLATE;

import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_FINE_WIRE;
import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.NO_WORKING;
import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_PLATE;

import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*;
import static com.gregtechceu.gtceu.common.data.GTMaterials.*;
import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*;
Expand Down Expand Up @@ -51,10 +54,16 @@ public class WireRecipeHandler {
cableGtHex, 5
);

private static final TagPrefix[] wireSizes = {wireGtDouble, wireGtQuadruple, wireGtOctal, wireGtHex};

public static void init(Consumer<FinishedRecipe> provider) {

// Generate 1x Wire creation recipes (Wiremill, Extruder, Wire Cutters)
wireGtSingle.executeHandler(PropertyKey.WIRE, (tagPrefix, material, property) -> processWireSingle(tagPrefix, material, property, provider));
// Generate Wire creation recipes (Wiremill, Extruder, Wire Cutters)
// Wiremill: Ingot -> 1x, 2x, 4x, 8x, 16x, Fine
// Wiremill: 1x Wire -> Fine
// Extruder: Ingot -> 1x Wire
// Wire Cutter: Plate -> 1x Wire
wireGtSingle.executeHandler(PropertyKey.WIRE, (tagPrefix, material, property) -> processWires(tagPrefix, material, property, provider));

// Generate Cable Covering Recipes
wireGtSingle.executeHandler(PropertyKey.WIRE, (tagPrefix, material, property) -> generateCableCovering(tagPrefix, material, property, provider));
Expand All @@ -65,7 +74,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
}


public static void processWireSingle(TagPrefix wirePrefix, Material material, WireProperties property, Consumer<FinishedRecipe> provider) {
public static void processWires(TagPrefix wirePrefix, Material material, WireProperties property, Consumer<FinishedRecipe> provider) {
TagPrefix prefix = material.hasProperty(PropertyKey.INGOT) ? ingot : material.hasProperty(PropertyKey.GEM) ? gem : dust;

EXTRUDER_RECIPES.recipeBuilder("extrude_" + material.getName() + "_wire")
Expand All @@ -77,11 +86,33 @@ public static void processWireSingle(TagPrefix wirePrefix, Material material, Wi
.save(provider);

WIREMILL_RECIPES.recipeBuilder("mill_" + material.getName() + "_wire")
.inputItems(prefix, material)
.outputItems(wireGtSingle, material, 2)
.duration((int) material.getMass())
.inputItems(prefix, material)
.circuitMeta(1)
.outputItems(wireGtSingle, material, 2)
.duration((int) material.getMass())
.EUt(getVoltageMultiplier(material))
.save(provider);

for (TagPrefix wireSize : wireSizes) {
final int multiplier = (int) (wireSize.getMaterialAmount(material) / GTValues.M);
WIREMILL_RECIPES.recipeBuilder("mill_" + material.getName() + "_wire_" + (multiplier * 2))
.inputItems(prefix, material, multiplier)
.circuitMeta(multiplier * 2)
.outputItems(wireSize, material)
.duration((int) material.getMass() * multiplier)
.EUt(getVoltageMultiplier(material))
.save(provider);
}

if (material.hasFlag(GENERATE_FINE_WIRE)) {
WIREMILL_RECIPES.recipeBuilder("mill_" + material.getName() + "_wire_fine")
.inputItems(prefix, material, 1)
.circuitMeta(3)
.outputItems(wireFine, material, 8)
.duration((int) material.getMass() * 3)
.EUt(getVoltageMultiplier(material))
.save(provider);
}

if (!material.hasFlag(NO_WORKING) && material.hasFlag(GENERATE_PLATE)) {
VanillaRecipeHelper.addShapedRecipe(provider, String.format("%s_wire_single", material.getName()),
Expand Down