Add config for automated brewing

- Add allowBrewingInMixer config
- Add 0.5.0e to the bug report template
- Allow Flywheel 0.6.6
This commit is contained in:
PepperCode1 2022-09-22 12:09:23 -07:00
parent d6ca0343b8
commit 09124ea92b
5 changed files with 10 additions and 2 deletions

View file

@ -49,6 +49,7 @@ body:
label: Mod Version label: Mod Version
description: The version of the mod you were using when the bug occured description: The version of the mod you were using when the bug occured
options: options:
- "0.5.0e"
- "0.5.0d" - "0.5.0d"
- "0.5.0c" - "0.5.0c"
- "0.5.0b" - "0.5.0b"

View file

@ -186,6 +186,7 @@ public class CreateJEI implements IModPlugin {
.build("automatic_shapeless", MixingCategory::autoShapeless), .build("automatic_shapeless", MixingCategory::autoShapeless),
brewing = builder(BasinRecipe.class) brewing = builder(BasinRecipe.class)
.enableWhen(c -> c.allowBrewingInMixer)
.addRecipes(() -> PotionMixingRecipes.ALL) .addRecipes(() -> PotionMixingRecipes.ALL)
.catalyst(AllBlocks.MECHANICAL_MIXER::get) .catalyst(AllBlocks.MECHANICAL_MIXER::get)
.catalyst(AllBlocks.BASIN::get) .catalyst(AllBlocks.BASIN::get)

View file

@ -218,6 +218,10 @@ public class MechanicalMixerTileEntity extends BasinOperatingTileEntity {
protected List<Recipe<?>> getMatchingRecipes() { protected List<Recipe<?>> getMatchingRecipes() {
List<Recipe<?>> matchingRecipes = super.getMatchingRecipes(); List<Recipe<?>> matchingRecipes = super.getMatchingRecipes();
if (!AllConfigs.SERVER.recipes.allowBrewingInMixer.get()) {
return matchingRecipes;
}
Optional<BasinTileEntity> basin = getBasin(); Optional<BasinTileEntity> basin = getBasin();
if (!basin.isPresent()) if (!basin.isPresent())
return matchingRecipes; return matchingRecipes;

View file

@ -4,6 +4,7 @@ public class CRecipes extends ConfigBase {
public final ConfigBool bulkPressing = b(false, "bulkPressing", Comments.bulkPressing); public final ConfigBool bulkPressing = b(false, "bulkPressing", Comments.bulkPressing);
public final ConfigBool bulkCutting = b(false, "bulkCutting", Comments.bulkCutting); public final ConfigBool bulkCutting = b(false, "bulkCutting", Comments.bulkCutting);
public final ConfigBool allowBrewingInMixer = b(true, "allowBrewingInMixer", Comments.allowBrewingInMixer);
public final ConfigBool allowShapelessInMixer = b(true, "allowShapelessInMixer", Comments.allowShapelessInMixer); public final ConfigBool allowShapelessInMixer = b(true, "allowShapelessInMixer", Comments.allowShapelessInMixer);
public final ConfigBool allowShapedSquareInPress = b(true, "allowShapedSquareInPress", Comments.allowShapedSquareInPress); public final ConfigBool allowShapedSquareInPress = b(true, "allowShapedSquareInPress", Comments.allowShapedSquareInPress);
public final ConfigBool allowRegularCraftingInCrafter = public final ConfigBool allowRegularCraftingInCrafter =
@ -28,8 +29,9 @@ public class CRecipes extends ConfigBase {
private static class Comments { private static class Comments {
static String bulkPressing = "Allow the Mechanical Press to process entire stacks at a time."; static String bulkPressing = "Allow the Mechanical Press to process entire stacks at a time.";
static String bulkCutting = "Allow the Mechanical Saw to process entire stacks at a time."; static String bulkCutting = "Allow the Mechanical Saw to process entire stacks at a time.";
static String allowBrewingInMixer = "Allow supported potions to be brewed by a Mechanical Mixer + Basin.";
static String allowShapelessInMixer = static String allowShapelessInMixer =
"Allow allows any shapeless crafting recipes to be processed by a Mechanical Mixer + Basin."; "Allow any shapeless crafting recipes to be processed by a Mechanical Mixer + Basin.";
static String allowShapedSquareInPress = static String allowShapedSquareInPress =
"Allow any single-ingredient 2x2 or 3x3 crafting recipes to be processed by a Mechanical Press + Basin."; "Allow any single-ingredient 2x2 or 3x3 crafting recipes to be processed by a Mechanical Press + Basin.";
static String allowRegularCraftingInCrafter = static String allowRegularCraftingInCrafter =

View file

@ -33,6 +33,6 @@ Technology that empowers the player.'''
[[dependencies.create]] [[dependencies.create]]
modId="flywheel" modId="flywheel"
mandatory=true mandatory=true
versionRange="[0.6.5,0.6.6)" versionRange="[0.6.5,0.6.7)"
ordering="AFTER" ordering="AFTER"
side="CLIENT" side="CLIENT"