diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-11-28 11:01:35 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-11-28 11:01:35 +0000 |
| commit | c6a2686e3d2e19ecde9a8e467829dbc9ef3de7a0 (patch) | |
| tree | 1cf5f599b178d5e91be49d7350f28e3ac64d2fc5 | |
| parent | 474db9db07bba03fc433ba06a52b7a709c536c4e (diff) | |
| download | GT5-Unofficial-c6a2686e3d2e19ecde9a8e467829dbc9ef3de7a0.tar.gz GT5-Unofficial-c6a2686e3d2e19ecde9a8e467829dbc9ef3de7a0.tar.bz2 GT5-Unofficial-c6a2686e3d2e19ecde9a8e467829dbc9ef3de7a0.zip | |
Fixed shaped dust crafting recipes, turns out they don't like multithreading.
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index 9cd3fdaca4..d5ca3211e9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -38,46 +38,30 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { this.toGenerate = M; this.disableOptional = O; mRecipeGenMap.add(this); - } - - @Override - public void run() { - generateRecipes(this.toGenerate, this.disableOptional); - } - - private void generateRecipes(final Material material, final boolean disableOptional){ - - Logger.INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName()); - - final ItemStack normalDust = material.getDust(1); - final ItemStack smallDust = material.getSmallDust(1); - final ItemStack tinyDust = material.getTinyDust(1); - - final ItemStack[] inputStacks = material.getMaterialComposites(); - final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); - - + final ItemStack normalDust = M.getDust(1); + final ItemStack smallDust = M.getSmallDust(1); + final ItemStack tinyDust = M.getTinyDust(1); if (tinyDust != null && normalDust != null) { - if (RecipeUtils.addShapelessGregtechRecipe( + if (RecipeUtils.addShapedRecipe( tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, normalDust)){ - Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Success"); } else { - Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Failed"); } if (RecipeUtils.addShapedRecipe( normalDust, null, null, null, null, null, null, null, null, - material.getTinyDust(9))){ - Logger.INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success"); + M.getTinyDust(9))){ + Logger.INFO("9 Tiny dust from 1 Recipe: "+M.getLocalizedName()+" - Success"); } else { - Logger.INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed"); + Logger.INFO("9 Tiny dust from 1 Recipe: "+M.getLocalizedName()+" - Failed"); } } @@ -87,22 +71,39 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { smallDust, smallDust, null, null, null, null, normalDust)){ - Logger.INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + Logger.INFO("4 Small dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Success"); } else { - Logger.INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Logger.INFO("4 Small dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Failed"); } if (RecipeUtils.addShapedRecipe( null, normalDust, null, null, null, null, null, null, null, - material.getSmallDust(4))){ - Logger.INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + M.getSmallDust(4))){ + Logger.INFO("4 Small dust from 1 Dust Recipe: "+M.getLocalizedName()+" - Success"); } else { - Logger.INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Logger.INFO("4 Small dust from 1 Dust Recipe: "+M.getLocalizedName()+" - Failed"); } } + } + + @Override + public void run() { + generateRecipes(this.toGenerate, this.disableOptional); + } + + private void generateRecipes(final Material material, final boolean disableOptional){ + + Logger.INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName()); + + final ItemStack normalDust = material.getDust(1); + final ItemStack smallDust = material.getSmallDust(1); + final ItemStack tinyDust = material.getTinyDust(1); + + final ItemStack[] inputStacks = material.getMaterialComposites(); + final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); //Macerate blocks back to dusts. final ItemStack materialBlock = material.getBlock(1); |