From 22c00c47ff71fa490f9efeb5a9e1ff1ad21effcf Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Wed, 19 Feb 2020 21:17:52 +0000 Subject: [PATCH] Antique Atlas doesn't like my colons :( Fixes #323 --- .../antiqueatlas/WizardryAntiqueAtlasIntegration.java | 6 +++--- src/main/resources/assets/ebwizardry/lang/en_gb.lang | 6 +++--- src/main/resources/assets/ebwizardry/lang/en_us.lang | 6 +++--- src/main/resources/assets/ebwizardry/lang/pl_pl.lang | 6 +++--- src/main/resources/assets/ebwizardry/lang/zh_cn.lang | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/electroblob/wizardry/integration/antiqueatlas/WizardryAntiqueAtlasIntegration.java b/src/main/java/electroblob/wizardry/integration/antiqueatlas/WizardryAntiqueAtlasIntegration.java index 8fb48157..8816224b 100644 --- a/src/main/java/electroblob/wizardry/integration/antiqueatlas/WizardryAntiqueAtlasIntegration.java +++ b/src/main/java/electroblob/wizardry/integration/antiqueatlas/WizardryAntiqueAtlasIntegration.java @@ -38,7 +38,7 @@ public class WizardryAntiqueAtlasIntegration { * {@link electroblob.wizardry.Settings#autoTowerMarkers} is enabled. Server side only! */ public static void markTower(World world, int x, int z){ if(enabled() && Wizardry.settings.autoTowerMarkers){ - AtlasAPI.getMarkerAPI().putGlobalMarker(world, false, TOWER_MARKER.toString(), "integration.antiqueatlas.marker." + TOWER_MARKER.toString(), x, z); + AtlasAPI.getMarkerAPI().putGlobalMarker(world, false, TOWER_MARKER.toString().replace(':', '.'), "integration.antiqueatlas.marker." + TOWER_MARKER.toString(), x, z); } } @@ -46,7 +46,7 @@ public class WizardryAntiqueAtlasIntegration { * {@link electroblob.wizardry.Settings#autoObeliskMarkers} is enabled. Server side only! */ public static void markObelisk(World world, int x, int z){ if(enabled() && Wizardry.settings.autoObeliskMarkers){ - AtlasAPI.getMarkerAPI().putGlobalMarker(world, false, OBELISK_MARKER.toString(), "integration.antiqueatlas.marker." + OBELISK_MARKER.toString(), x, z); + AtlasAPI.getMarkerAPI().putGlobalMarker(world, false, OBELISK_MARKER.toString().replace(':', '.'), "integration.antiqueatlas.marker." + OBELISK_MARKER.toString(), x, z); } } @@ -54,7 +54,7 @@ public class WizardryAntiqueAtlasIntegration { * {@link electroblob.wizardry.Settings#autoShrineMarkers} is enabled. Server side only! */ public static void markShrine(World world, int x, int z){ if(enabled() && Wizardry.settings.autoShrineMarkers){ - AtlasAPI.getMarkerAPI().putGlobalMarker(world, false, SHRINE_MARKER.toString(), "integration.antiqueatlas.marker." + SHRINE_MARKER.toString(), x, z); + AtlasAPI.getMarkerAPI().putGlobalMarker(world, false, SHRINE_MARKER.toString().replace(':', '.'), "integration.antiqueatlas.marker." + SHRINE_MARKER.toString(), x, z); } } diff --git a/src/main/resources/assets/ebwizardry/lang/en_gb.lang b/src/main/resources/assets/ebwizardry/lang/en_gb.lang index be772016..db9e697e 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_gb.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_gb.lang @@ -1284,9 +1284,9 @@ config.ebwizardry.auto_place_shrine_markers.tooltip=Controls whether wizardry au integration.jei.category.ebwizardry\:arcane_workbench=Arcane Workbench -integration.antiqueatlas.marker.ebwizardry\:wizard_tower=Wizard Tower -integration.antiqueatlas.marker.ebwizardry\:obelisk=Obelisk -integration.antiqueatlas.marker.ebwizardry\:shrine=Shrine +integration.antiqueatlas.marker.ebwizardry.wizard_tower=Wizard Tower +integration.antiqueatlas.marker.ebwizardry.obelisk=Obelisk +integration.antiqueatlas.marker.ebwizardry.shrine=Shrine spell.ebwizardry\:magic_missile_festive=Magic Mistletoe spell.ebwizardry\:summon_snow_golem_festive=Summon Frosty The Snowman diff --git a/src/main/resources/assets/ebwizardry/lang/en_us.lang b/src/main/resources/assets/ebwizardry/lang/en_us.lang index 3bee6703..ca3d7a34 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_us.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_us.lang @@ -1284,9 +1284,9 @@ config.ebwizardry.auto_place_shrine_markers.tooltip=Controls whether wizardry au integration.jei.category.ebwizardry\:arcane_workbench=Arcane Workbench -integration.antiqueatlas.marker.ebwizardry\:wizard_tower=Wizard Tower -integration.antiqueatlas.marker.ebwizardry\:obelisk=Obelisk -integration.antiqueatlas.marker.ebwizardry\:shrine=Shrine +integration.antiqueatlas.marker.ebwizardry.wizard_tower=Wizard Tower +integration.antiqueatlas.marker.ebwizardry.obelisk=Obelisk +integration.antiqueatlas.marker.ebwizardry.shrine=Shrine spell.ebwizardry\:magic_missile_festive=Magic Mistletoe spell.ebwizardry\:summon_snow_golem_festive=Summon Frosty The Snowman diff --git a/src/main/resources/assets/ebwizardry/lang/pl_pl.lang b/src/main/resources/assets/ebwizardry/lang/pl_pl.lang index d993dd91..d474ae3a 100644 --- a/src/main/resources/assets/ebwizardry/lang/pl_pl.lang +++ b/src/main/resources/assets/ebwizardry/lang/pl_pl.lang @@ -1272,8 +1272,8 @@ config.ebwizardry.auto_place_shrine_markers.tooltip=Kontroluje, czy Wizardry aut integration.jei.category.ebwizardry\:arcane_workbench=Tajmniczny Stół -integration.antiqueatlas.marker.ebwizardry\:wizard_tower=Wieża Czarodzieja -integration.antiqueatlas.marker.ebwizardry\:obelisk=Obelisk -integration.antiqueatlas.marker.ebwizardry\:shrine=Świątynia +integration.antiqueatlas.marker.ebwizardry.wizard_tower=Wieża Czarodzieja +integration.antiqueatlas.marker.ebwizardry.obelisk=Obelisk +integration.antiqueatlas.marker.ebwizardry.shrine=Świątynia wizard.debug=%1$s, %2$s, %3$s diff --git a/src/main/resources/assets/ebwizardry/lang/zh_cn.lang b/src/main/resources/assets/ebwizardry/lang/zh_cn.lang index be023ed0..90a2eece 100644 --- a/src/main/resources/assets/ebwizardry/lang/zh_cn.lang +++ b/src/main/resources/assets/ebwizardry/lang/zh_cn.lang @@ -1255,9 +1255,9 @@ config.ebwizardry.auto_place_obelisk_markers.tooltip=控制古式地图是否自 config.ebwizardry.auto_place_shrine_markers=自动标记祭坛 config.ebwizardry.auto_place_shrine_markers.tooltip=控制古式地图是否自动标记祭坛。 integration.jei.category.ebwizardry\:arcane_workbench=奥术工作台 -integration.antiqueatlas.marker.ebwizardry\:wizard_tower=巫师塔 -integration.antiqueatlas.marker.ebwizardry\:obelisk=方碑 -integration.antiqueatlas.marker.ebwizardry\:shrine=祭坛 +integration.antiqueatlas.marker.ebwizardry.wizard_tower=巫师塔 +integration.antiqueatlas.marker.ebwizardry.obelisk=方碑 +integration.antiqueatlas.marker.ebwizardry.shrine=祭坛 enchantment.ebwizardry\:magic_sword=魔力灌注 enchantment.ebwizardry\:magic_bow=魔力灌注 enchantment.ebwizardry\:flaming_weapon=火焰灌注