Manual XML will reload when user language changes

ephys · Jan 17, 2015 · c04a34a · c04a34a · Adaptivity · Jan 17, 2015
1 parent 0b7c786
commit c04a34a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/tsteelworks/client/core/TSClientProxy.java b/src/main/java/tsteelworks/client/core/TSClientProxy.java
@@ -42,7 +42,7 @@ public class TSClientProxy extends TSCommonProxy {
 	public void preInit() {
 		super.preInit();
 
-		readManuals();
+		TSClientProxy.readManuals();
 	}
 
 	@Override
@@ -73,8 +73,6 @@ public static BookData getManualFromStack(ItemStack stack) {
 	}
 
 	private void initManualIcons() {
-		ResourceLocation res = new ResourceLocation("tsteelworks:manuals/deeptankbuild1.png");
-
 		// Blocks
 		MantleClientRegistry.registerManualIcon("highovenbook", new ItemStack(TSContent.bookManual, 1, 0));
 		MantleClientRegistry.registerManualIcon("highoven", new ItemStack(TSContent.highoven));
@@ -187,7 +185,7 @@ private void addRenderMappings() {
 		}
 	}
 
-	private void readManuals() {
+	public static void readManuals() {
 		// TODO: is there an event that would allow us to reload if the user changes their language ?
 		String currentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode();
 

diff --git a/src/main/java/tsteelworks/client/core/TSEventHandler.java b/src/main/java/tsteelworks/client/core/TSEventHandler.java
@@ -7,7 +7,7 @@
 
 public class TSEventHandler {
 	@SubscribeEvent
-	public void reloadTextures(TextureStitchEvent.Post event) {
+	public void reloadResources(TextureStitchEvent.Post event) {
 		if (TSContent.steamFluid != null)
 			TSContent.steamFluid.setIcons(ModsData.Fluids.steamBlock.getIcon(0,0), ModsData.Fluids.steamBlock.getIcon(2, 0));
 
@@ -16,5 +16,7 @@ public void reloadTextures(TextureStitchEvent.Post event) {
 
 		if (TSContent.liquidCementFluid != null)
 			TSContent.liquidCementFluid.setIcons(ModsData.Fluids.liquidCement.getIcon(0,0), ModsData.Fluids.liquidCement.getIcon(2, 0));
+
+		TSClientProxy.readManuals();
 	}
 }
diff --git a/src/main/java/tsteelworks/client/gui/DeepTankGui.java b/src/main/java/tsteelworks/client/gui/DeepTankGui.java
@@ -85,7 +85,7 @@ protected void drawFluidStackTooltip(FluidStack liquid, int x, int z) {
 		List<String> tooltips = new ArrayList<>();
 
 		tooltips.add(liquid.getFluid().getLocalizedName(liquid));
-		tooltips.add(EnumChatFormatting.LIGHT_PURPLE + "mB: " + liquid.amount);
+		tooltips.add(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("quantity.mb") + ": " + liquid.amount);
 
 		drawHoveringText(tooltips, x, z, fontRendererObj);
 	}

diff --git a/src/main/java/tsteelworks/common/modifier/TSActiveOmniMod.java b/src/main/java/tsteelworks/common/modifier/TSActiveOmniMod.java
@@ -21,4 +21,4 @@ public void updateTool(ToolCore tool, ItemStack stack, World world, Entity entit
 		if (tags.hasKey("Vacuous"))
 			EntityHelper.drawItemsToEntity((EntityLivingBase) entity, tags.getInteger("Vacuous") + 1);
 	}
-}
+}
diff --git a/src/main/resources/assets/tsteelworks/lang/fr_FR.lang b/src/main/resources/assets/tsteelworks/lang/fr_FR.lang
@@ -8,7 +8,7 @@ gui.button.prev=<
 
 item.tsteelworks.Materials.ScorchedBrick.name=Briques Roussies
 item.tsteelworks.Materials.LimestoneBrick.name=Briques de Calcaire
-item.tsteelworks.manual.highoven.name=Les Travaux de l'Acier et Vous
+item.tsteelworks.manual.highoven.name=La Sidérurgie et Vous
 item.tsteelworks.helmetSteel.name=Casque en Acier
 item.tsteelworks.chestplateSteel.name=Plastron en Acier
 item.tsteelworks.leggingsSteel.name=Jambières en Acier
@@ -124,6 +124,7 @@ material.limestonebrick.tooltip1=La pierre avec une touche de chaux
 manual.steelworks.tooltip1=By: La Société des Bricoleurs
 
 modifier.tool.vacuous=Vide
+modifier.toolstation.vacuous=Vide
 
 fluid.water=Eau
 iron.molten=Fer Fondu
-Original file line number
+Diff line change
@@ Expand Up @@
     		if (tags.hasKey("Vacuous"))
     			EntityHelper.drawItemsToEntity((EntityLivingBase) entity, tags.getInteger("Vacuous") + 1);
     	}
-    }
+    }