소스 검색

Revert the changes supporting 19w38a/b

Danielshe 5 년 전
부모
커밋
25b538208c

+ 23 - 22
build.gradle

@@ -129,29 +129,30 @@ publishing {
 
 curseforge {
     apiKey = project.hasProperty('apiKey') ? project.property('apiKey') : System.getenv('CF_API_KEY')
-    project {
-        id = '319057'
-        releaseType = 'release'
-        addGameVersion '1.14'
-        addGameVersion '1.14.1'
-        addGameVersion '1.14.2'
-        addGameVersion '1.14.3'
-        addGameVersion '1.14.4'
-        addGameVersion '1.14-Snapshot'
-        addGameVersion '1.15-Snapshot'
-        addGameVersion 'Java 8'
-        relations {
-            requiredDependency 'fabric-api'
-        }
-        mainArtifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}.jar")) {
-            displayName = "[Fabric 1.14.x, 19w34a - 19w37a] ClothConfig2-$project.version"
-        }
-        addArtifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}-sources.jar"))
-        afterEvaluate {
-            uploadTask.dependsOn("remapJar")
-            uploadTask.dependsOn("remapSourcesJar")
+    if (apiKey != null)
+        project {
+            id = '319057'
+            releaseType = 'release'
+            addGameVersion '1.14'
+            addGameVersion '1.14.1'
+            addGameVersion '1.14.2'
+            addGameVersion '1.14.3'
+            addGameVersion '1.14.4'
+            addGameVersion '1.14-Snapshot'
+            addGameVersion '1.15-Snapshot'
+            addGameVersion 'Java 8'
+            relations {
+                requiredDependency 'fabric-api'
+            }
+            mainArtifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}.jar")) {
+                displayName = "[Fabric 1.14.x, 19w34a - 19w37a] ClothConfig2-$project.version"
+            }
+            addArtifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}-sources.jar"))
+            afterEvaluate {
+                uploadTask.dependsOn("remapJar")
+                uploadTask.dependsOn("remapSourcesJar")
+            }
         }
-    }
     options {
         forgeGradleIntegration = false
         javaVersionAutoDetect = false

+ 1 - 1
gradle.properties

@@ -2,5 +2,5 @@ minecraft_version=1.14.4
 yarn_version=1.14.4+build.8
 fabric_loader_version=0.4.8+build.159
 fabric_version=0.3.0+build.207
-mod_version=1.1.2
+mod_version=1.2.1
 modmenu_version=1.7.6+build.115

+ 4 - 0
src/main/java/me/shedaniel/math/compat/RenderHelper.java

@@ -9,6 +9,10 @@ import net.minecraft.util.crash.CrashException;
 import net.minecraft.util.crash.CrashReport;
 import net.minecraft.util.crash.CrashReportSection;
 
+/**
+ * Blaze3D Wrapper for 1.14 - 19w37a
+ */
+@Deprecated
 public class RenderHelper {
     
     static RenderSystem instance;

+ 5 - 1
src/main/java/me/shedaniel/math/compat/RenderSystem.java

@@ -7,7 +7,11 @@ package me.shedaniel.math.compat;
 
 public interface RenderSystem {
     
-    void invokeMethod(Class[] classes, Object[] objects);
+    default void invokeMethod(Class[] classes, Object[] objects) {
+        invokeMethod("color4f", classes, objects);
+    }
+    
+    void invokeMethod(String method, Class[] classes, Object[] objects);
     
     void color4f(float float_1, float float_2, float float_3, float float_4);
     

+ 2 - 2
src/main/java/me/shedaniel/math/compat/RenderSystem1_14.java

@@ -24,9 +24,9 @@ public class RenderSystem1_14 implements RenderSystem {
     }
     
     @Override
-    public void invokeMethod(Class[] classes, Object[] objects) {
+    public void invokeMethod(String method, Class[] classes, Object[] objects) {
         try {
-            getSimpleMethod("color4f", classes).invoke(null, objects);
+            getSimpleMethod(method, classes).invoke(null, objects);
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 2 - 2
src/main/java/me/shedaniel/math/compat/RenderSystemClassInvoker.java

@@ -32,9 +32,9 @@ public class RenderSystemClassInvoker implements RenderSystem {
     }
     
     @Override
-    public void invokeMethod(Class[] classes, Object[] objects) {
+    public void invokeMethod(String method, Class[] classes, Object[] objects) {
         try {
-            getSimpleMethod("color4f", classes).invoke(null, objects);
+            getSimpleMethod(method, classes).invoke(null, objects);
         } catch (Exception e) {
             e.printStackTrace();
         }