fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove last few harcoded mod ID strings

Browse Source
This commit is contained in:
Electroblob
2018-04-07 12:47:18 +01:00
parent 416868bafb
commit df1eb68f35
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/WizardryEventHandler.java
+1 -1
View File
@@ -83,7 +83,7 @@ public final class WizardryEventHandler {
if(Wizardry.settings.generateLoot){ if(Wizardry.settings.generateLoot){
for(String location : LOOT_INJECTION_LOCATIONS){ for(String location : LOOT_INJECTION_LOCATIONS){
if(event.getName().toString().matches(location)){ if(event.getName().toString().matches(location)){
event.getTable().addPool(getAdditive("ebwizardry:chests/dungeon_additions")); event.getTable().addPool(getAdditive(Wizardry.MODID + ":chests/dungeon_additions"));
} }
} }
} }
src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java
+4 -4
View File
@@ -267,7 +267,7 @@ public class GuiWizardHandbook extends GuiScreen {
BufferedReader bufferedreader = null; BufferedReader bufferedreader = null;
String textFilepath = "ebwizardry:texts/handbook_" String textFilepath = Wizardry.MODID + ":texts/handbook_"
+ Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode() + ".txt"; + Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode() + ".txt";
try{ try{
@@ -281,7 +281,7 @@ public class GuiWizardHandbook extends GuiScreen {
Wizardry.logger.info( Wizardry.logger.info(
"Wizard handbook text file missing for the current language. Using default (English - US) instead."); "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 { try {
@@ -290,7 +290,7 @@ public class GuiWizardHandbook extends GuiScreen {
StandardCharsets.UTF_8)); StandardCharsets.UTF_8));
} catch (IOException x){ } 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); + "missing; please try re-downloading and reinstalling Wizardry.", x);
} }
} }
@@ -427,7 +427,7 @@ public class GuiWizardHandbook extends GuiScreen {
}catch (IOException e){ }catch (IOException e){
Wizardry.logger.error("Something went wrong reading file: " + textFilepath 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);
} }
} }
} }