From cdf8f6e32d9131c0e301222955a12cfef8e681c2 Mon Sep 17 00:00:00 2001 From: Electroblob <35599699+Electroblob77@users.noreply.github.com> Date: Tue, 5 Jun 2018 15:43:48 +0100 Subject: [PATCH] Remove now-redundant recipe config options --- .../java/electroblob/wizardry/Settings.java | 41 ---------- .../wizardry/client/GuiWizardHandbook.java | 75 ++++++++----------- .../wizardry/packet/PacketSyncSettings.java | 12 --- 3 files changed, 30 insertions(+), 98 deletions(-) diff --git a/src/main/java/electroblob/wizardry/Settings.java b/src/main/java/electroblob/wizardry/Settings.java index 2008a509..0c747916 100644 --- a/src/main/java/electroblob/wizardry/Settings.java +++ b/src/main/java/electroblob/wizardry/Settings.java @@ -141,19 +141,6 @@ public final class Settings { // Synchronised settings. These settings affect both client-side AND server-side code. Changing these locally // only has an effect if the local game is the host, i.e. a dedicated server, a LAN host or a singleplayer world. - // Recipes (only need syncing for display in the wizard's handbook) - /** [Synchronised] Whether or not firebombs should be craftable. */ - public boolean firebombIsCraftable = true; - /** [Synchronised] Whether or not poison bombs should be craftable. */ - public boolean poisonBombIsCraftable = true; - /** [Synchronised] Whether or not poison bombs should be craftable. */ - public boolean smokeBombIsCraftable = true; - /** - * [Synchronised] Whether to require a magic crystal in the blank scroll crafting recipe (in case it - * conflicts with another mod). - */ - public boolean useAlternateScrollRecipe = false; - // Gamemodes /** * [Synchronised] When set to true, spells a player hasn't cast yet will be unreadable until they are cast @@ -399,34 +386,6 @@ public final class Settings { mindControlTargetsBlacklist = Arrays.stream(property.getStringList()).map(s -> new ResourceLocation(s.toLowerCase(Locale.ROOT).trim())).toArray(ResourceLocation[]::new); propOrder.add(property.getName()); - property = config.get(GAMEPLAY_CATEGORY, "firebombIsCraftable", true, - "Whether firebombs can be crafted or not."); - property.setLanguageKey("config." + Wizardry.MODID + ".firebomb_is_craftable"); - property.setRequiresMcRestart(true); - firebombIsCraftable = property.getBoolean(); - propOrder.add(property.getName()); - - property = config.get(GAMEPLAY_CATEGORY, "poisonBombIsCraftable", true, - "Whether poison bombs can be crafted or not."); - property.setLanguageKey("config." + Wizardry.MODID + ".poison_bomb_is_craftable"); - property.setRequiresMcRestart(true); - poisonBombIsCraftable = property.getBoolean(); - propOrder.add(property.getName()); - - property = config.get(GAMEPLAY_CATEGORY, "smokeBombIsCraftable", true, - "Whether smoke bombs can be crafted or not."); - property.setLanguageKey("config." + Wizardry.MODID + ".smoke_bomb_is_craftable"); - property.setRequiresMcRestart(true); - smokeBombIsCraftable = property.getBoolean(); - propOrder.add(property.getName()); - - property = config.get(GAMEPLAY_CATEGORY, "useAlternateScrollRecipe", false, - "Whether to require a magic crystal in the shapeless crafting recipe for blank scrolls. Set to true if another mod adds a conflicting recipe."); - property.setLanguageKey("config." + Wizardry.MODID + ".use_alternate_scroll_recipe"); - property.setRequiresMcRestart(true); - useAlternateScrollRecipe = property.getBoolean(); - propOrder.add(property.getName()); - config.setCategoryPropertyOrder(GAMEPLAY_CATEGORY, propOrder); } diff --git a/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java b/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java index 5f7a0106..98fa241e 100644 --- a/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java +++ b/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java @@ -659,51 +659,36 @@ public class GuiWizardHandbook extends GuiScreen { craftingGrid.get(2).set(1, new ItemStack(WizardryItems.magic_silk)); craftingResult = new ItemStack(WizardryItems.wizard_boots); RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); - - if(Wizardry.settings.useAlternateScrollRecipe){ - craftingGrid = createGrid(); - craftingGrid.get(0).set(0, new ItemStack(Items.PAPER)); - craftingGrid.get(1).set(0, new ItemStack(Items.STRING)); - craftingGrid.get(2).set(0, new ItemStack(WizardryItems.magic_crystal)); - craftingResult = new ItemStack(WizardryItems.blank_scroll); - RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); - }else{ - craftingGrid = createGrid(); - craftingGrid.get(0).set(0, new ItemStack(Items.PAPER)); - craftingGrid.get(1).set(0, new ItemStack(Items.STRING)); - craftingResult = new ItemStack(WizardryItems.blank_scroll); - RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); - } - - if(Wizardry.settings.firebombIsCraftable){ - craftingGrid = createGrid(); - craftingGrid.get(0).set(0, new ItemStack(Items.BLAZE_POWDER)); - craftingGrid.get(1).set(0, new ItemStack(Items.BLAZE_POWDER)); - craftingGrid.get(0).set(1, new ItemStack(Items.GLASS_BOTTLE)); - craftingGrid.get(1).set(1, new ItemStack(Items.GUNPOWDER)); - craftingResult = new ItemStack(WizardryItems.firebomb, 3); - RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); - } - - if(Wizardry.settings.poisonBombIsCraftable){ - craftingGrid = createGrid(); - craftingGrid.get(0).set(0, new ItemStack(Items.SPIDER_EYE)); - craftingGrid.get(1).set(0, new ItemStack(Items.SPIDER_EYE)); - craftingGrid.get(0).set(1, new ItemStack(Items.GLASS_BOTTLE)); - craftingGrid.get(1).set(1, new ItemStack(Items.GUNPOWDER)); - craftingResult = new ItemStack(WizardryItems.poison_bomb, 3); - RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); - } - - if(Wizardry.settings.smokeBombIsCraftable){ - craftingGrid = createGrid(); - craftingGrid.get(0).set(0, new ItemStack(Items.COAL)); - craftingGrid.get(1).set(0, new ItemStack(Items.COAL)); - craftingGrid.get(0).set(1, new ItemStack(Items.GLASS_BOTTLE)); - craftingGrid.get(1).set(1, new ItemStack(Items.GUNPOWDER)); - craftingResult = new ItemStack(WizardryItems.smoke_bomb, 3); - RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); - } + + craftingGrid = createGrid(); + craftingGrid.get(0).set(0, new ItemStack(Items.PAPER)); + craftingGrid.get(1).set(0, new ItemStack(Items.STRING)); + craftingResult = new ItemStack(WizardryItems.blank_scroll); + RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); + + craftingGrid = createGrid(); + craftingGrid.get(0).set(0, new ItemStack(Items.BLAZE_POWDER)); + craftingGrid.get(1).set(0, new ItemStack(Items.BLAZE_POWDER)); + craftingGrid.get(0).set(1, new ItemStack(Items.GLASS_BOTTLE)); + craftingGrid.get(1).set(1, new ItemStack(Items.GUNPOWDER)); + craftingResult = new ItemStack(WizardryItems.firebomb, 3); + RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); + + craftingGrid = createGrid(); + craftingGrid.get(0).set(0, new ItemStack(Items.SPIDER_EYE)); + craftingGrid.get(1).set(0, new ItemStack(Items.SPIDER_EYE)); + craftingGrid.get(0).set(1, new ItemStack(Items.GLASS_BOTTLE)); + craftingGrid.get(1).set(1, new ItemStack(Items.GUNPOWDER)); + craftingResult = new ItemStack(WizardryItems.poison_bomb, 3); + RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); + + craftingGrid = createGrid(); + craftingGrid.get(0).set(0, new ItemStack(Items.COAL)); + craftingGrid.get(1).set(0, new ItemStack(Items.COAL)); + craftingGrid.get(0).set(1, new ItemStack(Items.GLASS_BOTTLE)); + craftingGrid.get(1).set(1, new ItemStack(Items.GUNPOWDER)); + craftingResult = new ItemStack(WizardryItems.smoke_bomb, 3); + RECIPES.add(ImmutablePair.of(craftingResult, craftingGrid)); } } \ No newline at end of file diff --git a/src/main/java/electroblob/wizardry/packet/PacketSyncSettings.java b/src/main/java/electroblob/wizardry/packet/PacketSyncSettings.java index 7dba0811..c8afb156 100644 --- a/src/main/java/electroblob/wizardry/packet/PacketSyncSettings.java +++ b/src/main/java/electroblob/wizardry/packet/PacketSyncSettings.java @@ -34,10 +34,6 @@ public class PacketSyncSettings implements IMessageHandler { } private static void copySettings(Message message){ - Wizardry.settings.firebombIsCraftable = message.settings.firebombIsCraftable; - Wizardry.settings.poisonBombIsCraftable = message.settings.poisonBombIsCraftable; - Wizardry.settings.smokeBombIsCraftable = message.settings.smokeBombIsCraftable; - Wizardry.settings.useAlternateScrollRecipe = message.settings.useAlternateScrollRecipe; Wizardry.settings.discoveryMode = message.settings.discoveryMode; // Wizardry.settings.maxSpellCommandMultiplier = message.settings.maxSpellCommandMultiplier; // Wizardry.settings.castCommandName = message.settings.castCommandName; @@ -65,10 +61,6 @@ public class PacketSyncSettings implements IMessageHandler { // This is also a great reason to have the settings as an actual object. settings = new Settings(); // The order is important - settings.firebombIsCraftable = buf.readBoolean(); - settings.poisonBombIsCraftable = buf.readBoolean(); - settings.smokeBombIsCraftable = buf.readBoolean(); - settings.useAlternateScrollRecipe = buf.readBoolean(); settings.discoveryMode = buf.readBoolean(); // settings.maxSpellCommandMultiplier = buf.readDouble(); // settings.castCommandName = ByteBufUtils.readUTF8String(buf); @@ -79,10 +71,6 @@ public class PacketSyncSettings implements IMessageHandler { @Override public void toBytes(ByteBuf buf){ - buf.writeBoolean(settings.firebombIsCraftable); - buf.writeBoolean(settings.poisonBombIsCraftable); - buf.writeBoolean(settings.smokeBombIsCraftable); - buf.writeBoolean(settings.useAlternateScrollRecipe); buf.writeBoolean(settings.discoveryMode); // buf.writeDouble(settings.maxSpellCommandMultiplier); // ByteBufUtils.writeUTF8String(buf, settings.castCommandName);