diff options
Diffstat (limited to 'src/main/java/bartworks/system/material/werkstoff_loaders')
2 files changed, 14 insertions, 29 deletions
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java index 022cf4c3e6..5512274260 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java @@ -38,7 +38,6 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; import bartworks.system.material.Werkstoff; -import bartworks.system.material.WerkstoffLoader; import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -185,18 +184,14 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { .addTo(wiremillRecipes); // smallGear - if (WerkstoffLoader.smallGearShape != null) { - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ingot), WerkstoffLoader.smallGearShape.get(0L)) - .itemOutputs(werkstoff.get(gearGtSmall)) - .duration( - (int) werkstoff.getStats() - .getMass()) - .eut(8 * tVoltageMultiplier) - .addTo(extruderRecipes); - - } + GTValues.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Small_Gear.get(0L)) + .itemOutputs(werkstoff.get(gearGtSmall)) + .duration( + (int) werkstoff.getStats() + .getMass()) + .eut(8 * tVoltageMultiplier) + .addTo(extruderRecipes); GTModHandler.addCraftingRecipe( werkstoff.get(gearGtSmall), @@ -234,16 +229,12 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { .eut(24) .addTo(assemblerRecipes); - if (WerkstoffLoader.rotorShape != null) { - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ingot, 5), WerkstoffLoader.rotorShape.get(0L)) - .itemOutputs(werkstoff.get(rotor)) - .duration(10 * SECONDS) - .eut(60) - .addTo(extruderRecipes); - - } + GTValues.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot, 5), ItemList.Shape_Extruder_Rotor.get(0L)) + .itemOutputs(werkstoff.get(rotor)) + .duration(10 * SECONDS) + .eut(60) + .addTo(extruderRecipes); // molten -> metal if (werkstoff.hasItemType(cellMolten)) { diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java index 8d639574cb..710f122592 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java @@ -300,12 +300,6 @@ public class MoltenCellLoader implements IWerkstoffRunnable { .getMass() > 128 ? 64 : 30) .addTo(fluidSolidifierRecipes); - // No Spring Molds - - if (WerkstoffLoader.rotorMold == null) { - return; - } - GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rotor.get(0)) .itemOutputs(werkstoff.get(rotor)) |