Skip to content

Commit

Permalink
Add Lathe Gear -> Buzzsaw Blade recipe (#172)
Browse files Browse the repository at this point in the history
Adds previously missing machine recipe for making buzzsaw blades. Formerly stuck having to make them by hand.

Also fixes build.gradle, which was breaking due to CurseMaven no longer functioning.
  • Loading branch information
serenibyss authored Jan 28, 2022
1 parent acc299c commit f08e5c4
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 7 deletions.
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,32 +49,33 @@ minecraft {

repositories {
maven {
url = "http://dvs1.progwml6.com/files/maven/"
url = "https://dvs1.progwml6.com/files/maven/"
}
maven {
url = "https://maven.blamejared.com/"
}
maven {
name "WynPrice's Curse Maven"
url "https://cursemaven.com"
}

maven {
name "CurseForge Maven API"
url "https://minecraft.curseforge.com/api/maven"
}
maven {
url = "http://chickenbones.net/maven/"
}
maven {
name = "Forestry Maven"
url = "http://maven.ic2.player.to"
}
maven {
name = "tterrag maven"
setUrl("http://maven.tterrag.com/")
}
}

dependencies {
deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+"
deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.673"
deobfCompile "mezz.jei:jei_1.12.2:+"
deobfCompile "curse.maven:forestry-59751:2918418"
deobfCompile "net.sengir.forestry:forestry_1.12.2:5.8.2.422"
deobfCompile "gregtechce:gregtech:1.12.2:1.17.1.770"
deobfCompile "codechicken:ChickenASM:1.12-+"
deobfCompile "codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.357:universal"
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/gregicadditions/GAMaterials.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,22 @@ public void onMaterialsInit() {
OrePrefix.gemFlawless.setIgnored(LIGNITE_COKE);
OrePrefix.gemExquisite.setIgnored(LIGNITE_COKE);

// Gears for the new Gear -> Buzzsaw Blade Lathe recipe
Materials.Cobalt.addFlag(MatFlags.GENERATE_GEAR);
Materials.Manganese.addFlag(MatFlags.GENERATE_GEAR);
Materials.Molybdenum.addFlag(MatFlags.GENERATE_GEAR);
Materials.Neodymium.addFlag(MatFlags.GENERATE_GEAR);
Materials.Thorium.addFlag(MatFlags.GENERATE_GEAR);
Materials.Uranium.addFlag(MatFlags.GENERATE_GEAR);
Materials.Uranium235.addFlag(MatFlags.GENERATE_GEAR);
Materials.PigIron.addFlag(MatFlags.GENERATE_GEAR);
Materials.BlackSteel.addFlag(MatFlags.GENERATE_GEAR);
Materials.RedSteel.addFlag(MatFlags.GENERATE_GEAR);
Materials.BlueSteel.addFlag(MatFlags.GENERATE_GEAR);
Materials.DamascusSteel.addFlag(MatFlags.GENERATE_GEAR);
Materials.Naquadah.addFlag(MatFlags.GENERATE_GEAR);
Materials.NaquadahEnriched.addFlag(MatFlags.GENERATE_GEAR);
Materials.Tritanium.addFlag(MatFlags.GENERATE_GEAR);
Materials.Duranium.addFlag(MatFlags.GENERATE_GEAR);
}
}
10 changes: 10 additions & 0 deletions src/main/java/gregicadditions/recipes/GARecipeAddition.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import gregtech.api.unification.material.Materials;
import gregtech.api.unification.material.type.IngotMaterial;
import gregtech.api.unification.material.type.Material;
import gregtech.api.unification.material.type.SolidMaterial;
import gregtech.api.unification.ore.OrePrefix;
import gregtech.api.unification.stack.MaterialStack;
import gregtech.api.unification.stack.UnificationEntry;
Expand Down Expand Up @@ -230,6 +231,15 @@ public static void init() {
ModHandler.addShapedRecipe("ingot_double_" + m.toString(), OreDictUnifier.get(OrePrefix.valueOf("ingotDouble"), m), "h", "I", "I", 'I', new UnificationEntry(OrePrefix.ingot, m));
ModHandler.addShapedRecipe("double_ingot_to_plate_" + m.toString(), OreDictUnifier.get(OrePrefix.plate, m), "h", "I", 'I', OreDictUnifier.get(OrePrefix.valueOf("ingotDouble"), m));
}

if (m instanceof IngotMaterial && !OreDictUnifier.get(OrePrefix.toolHeadBuzzSaw, m).isEmpty() && ((IngotMaterial) m).toolDurability != 0 && m.hasFlag(SolidMaterial.MatFlags.GENERATE_GEAR)) {
RecipeMaps.LATHE_RECIPES.recipeBuilder()
.input(OrePrefix.gear, m)
.output(OrePrefix.toolHeadBuzzSaw, m)
.duration((int) m.getAverageMass() * 4)
.EUt(8 * (((IngotMaterial) m).blastFurnaceTemperature > 2800 ? 30 : 7))
.buildAndRegister();
}
}

//Pipes
Expand Down

0 comments on commit f08e5c4

Please sign in to comment.