Merge branch '1.12.2' into 4.3-dev

2020-04-14 17:41:33 +01:00
parent aecc8b0889 937617d7af
commit 91b2ee1a13
32 changed files with 869 additions and 1313 deletions
@@ -199,6 +199,13 @@ public class ClientProxy extends CommonProxy {
 		if(Minecraft.getMinecraft().player == player) WizardryClientEventHandler.shakeScreen(intensity);
 	}

+	@Override
+	public void loadShader(EntityPlayer player, ResourceLocation shader){
+		if(Minecraft.getMinecraft().player == player && Wizardry.settings.useShaders
+				&& !Minecraft.getMinecraft().entityRenderer.isShaderActive())
+			Minecraft.getMinecraft().entityRenderer.loadShader(shader);
+	}
+
 	@Override
 	public Set<String> getSpellHUDSkins(){
 		return GuiSpellDisplay.getSkinKeys();
@@ -568,6 +575,12 @@ public class ClientProxy extends CommonProxy {
 		data.randomDescriptions = new HashMap<>();

 		for(Spell spell : Spell.getAllSpells()){
+
+			if(spell.networkID() > message.names.size()){
+				Wizardry.logger.warn("Received no glyph data for spell {}, skipping", spell.getRegistryName());
+				continue;
+			}
+
 			// -1 because the none spell isn't included
 			// This is a case where we must use the network ID, not the metadata
 			data.randomNames.put(spell, message.names.get(spell.networkID() - 1));