Skip to content

Commit

Permalink
fixed a recipe conflict bear pointed out
Browse files Browse the repository at this point in the history
  • Loading branch information
GregoriusT committed Dec 5, 2023
1 parent 791b7b7 commit dc2d4d5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/main/java/gregapi/util/CR.java
Original file line number Diff line number Diff line change
Expand Up @@ -634,14 +634,14 @@ public static boolean remout(ItemStack aOutput, boolean aIgnoreNBT, boolean aNot

/**
* Removes a Crafting Recipe.
* @param aOutput The output of the Recipe.
* @param aNames The output of the Recipe.
* @return if it has removed at least one Recipe.
*/
public static boolean remout(ModData aMod, String... aNames) {if (aMod.mLoaded) for (String aName : aNames) remout(aMod, aName, W); return aMod.mLoaded;}

/**
* Removes a Crafting Recipe.
* @param aOutput The output of the Recipe.
* @param aName The output of the Recipe.
* @return if it has removed at least one Recipe.
*/
public static boolean remout(ModData aMod, String aName, int aMetaData) {return remout(ST.make(aMod, aName, 1, aMetaData));}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
*/
public class Loader_Recipes_Temporary implements Runnable {
@Override public void run() {
ItemStack tStack = null;
ItemStack tStack = NI;

// That Stone Rod is overlapping a Recipe. Luckily it can be made using GT6 Methods, so it is okay to remove it.
CR.delate(MD.FMB, "stoneRod");

// TODO: Graphite Electrodes are made from petroleum coke after it is mixed with coal tar pitch. They are then extruded and shaped, baked to carbonize the binder (pitch) and finally graphitized by heating it to temperatures approaching 3273K.
RM.Extruder.addRecipe2(T, 512, 512, OP.dust.mat(MT.Graphite, 1), IL.Shape_Extruder_Rod .get(0), OP.stick .mat(MT.Graphite, 1));
Expand Down

0 comments on commit dc2d4d5

Please sign in to comment.