Release 1.9.1.1

trychen · Aug 25, 2019 · 7df657c · 7df657c
1 parent eca2444
commit 7df657c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,6 @@ buildscript {
 
 plugins {
     id 'net.ltgt.apt' version '0.10'
-    id 'maven'
 }
 
 apply plugin: 'net.minecraftforge.gradle.forge'
@@ -129,16 +128,3 @@ idea.workspace.iws.withXml {
     }
 }
 
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            repository(url: "https://maven.mineclay.cn/repository/zhuapublic-snapshot/") {
-                authentication(userName: "$clayUsername", password: "$clayPassword")
-            }
-            pom.version = "$project.version"
-            pom.artifactId = "$project.name"
-            pom.groupId = "$project.group"
-        }
-    }
-}
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 
 # Mod Properties
 mod_id = Pangu
-mod_version = 1.9.0.3-SNAPSHOT
+mod_version = 1.9.1.1
 mod_group = cn.mccraft.pangu
 mod_core_plugin = cn.mccraft.pangu.core.asm.PanguPlugin
 

diff --git a/src/main/java/cn/mccraft/pangu/core/client/ui/Screen.java b/src/main/java/cn/mccraft/pangu/core/client/ui/Screen.java
@@ -92,8 +92,12 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         if (mc == null) return; // 避免提前打开
         if (drawDefaultBackground) drawDefaultBackground();
         draw();
-        rootContainer.onDraw(partialTicks, mouseX, mouseY);
-        if (getModal() != null) getModal().onDraw(partialTicks, mouseX, mouseY);
+        if (getModal() != null){
+            rootContainer.onDraw(partialTicks, 0, 0);
+            getModal().onDraw(partialTicks, mouseX, mouseY);
+        } else {
+            rootContainer.onDraw(partialTicks, mouseX, mouseY);
+        }
         if (isDebug()) {
             Rect.draw(halfWidth, 0, halfWidth + 1 , height, 0xAA00FF00);
             Rect.draw(0, halfHeight, width, halfHeight + 1, 0xAA00FF00);

diff --git a/src/main/java/cn/mccraft/pangu/core/loader/buildin/PotionRegister.java b/src/main/java/cn/mccraft/pangu/core/loader/buildin/PotionRegister.java
@@ -4,6 +4,7 @@
 import cn.mccraft.pangu.core.loader.AutoWired;
 import cn.mccraft.pangu.core.loader.annotation.RegPotion;
 import cn.mccraft.pangu.core.util.NameBuilder;
+import cn.mccraft.pangu.core.util.resource.PanguResLoc;
 import net.minecraft.potion.Potion;
 import net.minecraft.util.StringUtils;
 import net.minecraftforge.event.RegistryEvent;
@@ -24,7 +25,7 @@ public void registerField(Field field, Potion potion, RegPotion regPotion, Strin
             name = NameBuilder.apart(field.getName());
         }
 
-        potion.setRegistryName(NameBuilder.buildRegistryName(name));
+        potion.setRegistryName(PanguResLoc.of(domain, NameBuilder.buildRegistryName(name)));
 
         if (StringUtils.isNullOrEmpty(potion.getName()))
             potion.setPotionName("effect." + NameBuilder.buildTranslationKey(name));