From df1eb68f3582096ed3872ae84b337971af12827d Mon Sep 17 00:00:00 2001 From: Electroblob <35599699+Electroblob77@users.noreply.github.com> Date: Sat, 7 Apr 2018 12:47:18 +0100 Subject: [PATCH] Remove last few harcoded mod ID strings --- .../java/electroblob/wizardry/WizardryEventHandler.java | 2 +- .../electroblob/wizardry/client/GuiWizardHandbook.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/electroblob/wizardry/WizardryEventHandler.java b/src/main/java/electroblob/wizardry/WizardryEventHandler.java index ad5bd338..b3799275 100644 --- a/src/main/java/electroblob/wizardry/WizardryEventHandler.java +++ b/src/main/java/electroblob/wizardry/WizardryEventHandler.java @@ -83,7 +83,7 @@ public final class WizardryEventHandler { if(Wizardry.settings.generateLoot){ for(String location : LOOT_INJECTION_LOCATIONS){ if(event.getName().toString().matches(location)){ - event.getTable().addPool(getAdditive("ebwizardry:chests/dungeon_additions")); + event.getTable().addPool(getAdditive(Wizardry.MODID + ":chests/dungeon_additions")); } } } diff --git a/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java b/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java index 77ab7e51..1375d541 100644 --- a/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java +++ b/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java @@ -267,7 +267,7 @@ public class GuiWizardHandbook extends GuiScreen { BufferedReader bufferedreader = null; - String textFilepath = "ebwizardry:texts/handbook_" + String textFilepath = Wizardry.MODID + ":texts/handbook_" + Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode() + ".txt"; try{ @@ -281,7 +281,7 @@ public class GuiWizardHandbook extends GuiScreen { Wizardry.logger.info( "Wizard handbook text file missing for the current language. Using default (English - US) instead."); - textFilepath = "ebwizardry:texts/handbook_en_US.txt"; + textFilepath = Wizardry.MODID + ":texts/handbook_en_us.txt"; try { @@ -290,7 +290,7 @@ public class GuiWizardHandbook extends GuiScreen { StandardCharsets.UTF_8)); } catch (IOException x){ - Wizardry.logger.error("Couldn't find file: " + Wizardry.MODID + ":assets/texts/handbook_en_US.txt. The file may be" + Wizardry.logger.error("Couldn't find file: " + Wizardry.MODID + "/assets/texts/handbook_en_us.txt. The file may be" + "missing; please try re-downloading and reinstalling Wizardry.", x); } } @@ -427,7 +427,7 @@ public class GuiWizardHandbook extends GuiScreen { }catch (IOException e){ Wizardry.logger.error("Something went wrong reading file: " + textFilepath - + ". The file may be damaged;" + "please try re-downloading and reinstalling wizardry.", e); + + ". The file may be damaged; please try re-downloading and reinstalling wizardry.", e); } } }