Merge pull request #14 from duely/mantle_fix

thanks nooby! fixes #9
Bluberry-Kat · Nov 24, 2019 · 407b1a4 · 407b1a4
2 parents f57fde2 + 5198788
commit 407b1a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/project.gradle b/project.gradle
@@ -7,7 +7,7 @@ ext {
 	useElytraVersionFormat = true
 	version = '1'
 
-	concreteVersion = '0.4.43'
+	concreteVersion = '0.4.45'
 	concreteModules = [ 'common', 'reflect', 'network' ]
 
 	coremod = null
@@ -33,6 +33,7 @@ repositories {
 }
 
 dependencies {
+	deobfCompile "slimeknights.mantle:Mantle:1.12-1.3.3.49"
 	compile 'mezz.jei:jei_1.12.2:4.9.1.189'
 }
 }
diff --git a/src/main/java/com/unascribed/gumobtainium/proxy/ClientProxy.java b/src/main/java/com/unascribed/gumobtainium/proxy/ClientProxy.java
@@ -45,8 +45,8 @@ public void onModelRegister(ModelRegistryEvent e) {
 		ModelLoader.setCustomModelResourceLocation(Gumobtainium.VINEGAR, 0, new ModelResourceLocation(Gumobtainium.MODID+":vinegar#inventory"));
 	}
 
-	@SubscribeEvent
-	public void onRenderOverlayPost(RenderGameOverlayEvent.Post e) {
+	@SubscribeEvent(priority=EventPriority.LOWEST, receiveCanceled = true)
+	public void onRenderOverlayPre(RenderGameOverlayEvent.Pre e) {
 		Minecraft mc = Minecraft.getMinecraft();
 		if (e.getType() == ElementType.HEALTH) {
 			if (GumData.getGumHearts(mc.player) > 0) {
@@ -65,7 +65,13 @@ public void onRenderOverlayPost(RenderGameOverlayEvent.Post e) {
 				}
 				mc.renderEngine.bindTexture(GuiIngameForge.ICONS);
 			}
-		} else if (e.getType() == ElementType.FOOD) {
+		}
+	}
+
+	@SubscribeEvent(priority=EventPriority.LOWEST, receiveCanceled = true)
+	public void onRenderOverlayPost(RenderGameOverlayEvent.Post e) {
+		Minecraft mc = Minecraft.getMinecraft();
+		if (e.getType() == ElementType.FOOD) {
 			if (GumData.hasGumbium(mc.player)) {
 				mc.renderEngine.bindTexture(GUI);
 				GlStateManager.enableAlpha();