Update to 1.17.1

This commit is contained in:
Jonas Herzig
2021-07-24 11:05:39 +02:00
parent 927db36baa
commit 2415a886e2
6 changed files with 16 additions and 4 deletions

View File

@@ -239,6 +239,7 @@ dependencies {
11603: '1.16.3', 11603: '1.16.3',
11604: '1.16.4', 11604: '1.16.4',
11700: '1.17', 11700: '1.17',
11701: '1.17.1',
][mcVersion] ][mcVersion]
mappings 'net.fabricmc:yarn:' + [ mappings 'net.fabricmc:yarn:' + [
11404: '1.14.4+build.16', 11404: '1.14.4+build.16',
@@ -247,6 +248,7 @@ dependencies {
11603: '1.16.3+build.1:v2', 11603: '1.16.3+build.1:v2',
11604: '1.16.4+build.6:v2', 11604: '1.16.4+build.6:v2',
11700: '1.17+build.13:v2', 11700: '1.17+build.13:v2',
11701: '1.17.1+build.29:v2',
][mcVersion] ][mcVersion]
modImplementation 'net.fabricmc:fabric-loader:0.11.6' modImplementation 'net.fabricmc:fabric-loader:0.11.6'
def fabricApiVersion = [ def fabricApiVersion = [
@@ -256,6 +258,7 @@ dependencies {
11603: '0.17.1+build.394-1.16', 11603: '0.17.1+build.394-1.16',
11604: '0.25.1+build.416-1.16', 11604: '0.25.1+build.416-1.16',
11700: '0.36.0+1.17', 11700: '0.36.0+1.17',
11701: '0.37.1+1.17',
][mcVersion] ][mcVersion]
def fabricApiModules = [ def fabricApiModules = [
"api-base", "api-base",
@@ -326,7 +329,7 @@ dependencies {
shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
shadow "com.github.ReplayMod:ReplayStudio:0e72e36", shadeExclusions shadow "com.github.ReplayMod:ReplayStudio:a67fb11", shadeExclusions
implementation(jGui){ implementation(jGui){
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those

2
jGui

Submodule jGui updated: 9b5e0192ab...943ddc84bc

View File

@@ -176,6 +176,7 @@ val doRelease by tasks.registering {
defaultTasks("bundleJar") defaultTasks("bundleJar")
preprocess { preprocess {
val mc11701 = createNode("1.17.1", 11701, "yarn")
val mc11700 = createNode("1.17", 11700, "yarn") val mc11700 = createNode("1.17", 11700, "yarn")
val mc11604 = createNode("1.16.4", 11604, "yarn") val mc11604 = createNode("1.16.4", 11604, "yarn")
val mc11601 = createNode("1.16.1", 11601, "yarn") val mc11601 = createNode("1.16.1", 11601, "yarn")
@@ -193,6 +194,7 @@ preprocess {
val mc10800 = createNode("1.8", 10800, "srg") val mc10800 = createNode("1.8", 10800, "srg")
val mc10710 = createNode("1.7.10", 10710, "srg") val mc10710 = createNode("1.7.10", 10710, "srg")
mc11701.link(mc11700)
mc11700.link(mc11604, file("versions/mapping-fabric-1.17-1.16.4.txt")) mc11700.link(mc11604, file("versions/mapping-fabric-1.17-1.16.4.txt"))
mc11604.link(mc11601) mc11604.link(mc11601)
mc11601.link(mc11502) mc11601.link(mc11502)

View File

@@ -30,6 +30,7 @@ val jGuiVersions = listOf(
"1.16.1", "1.16.1",
"1.16.4", "1.16.4",
"1.17", "1.17",
"1.17.1",
) )
val replayModVersions = listOf( val replayModVersions = listOf(
// "1.7.10", // "1.7.10",
@@ -48,6 +49,7 @@ val replayModVersions = listOf(
"1.16.1", "1.16.1",
"1.16.4", "1.16.4",
"1.17", "1.17",
"1.17.1",
) )
rootProject.buildFileName = "root.gradle.kts" rootProject.buildFileName = "root.gradle.kts"

View File

@@ -39,7 +39,7 @@ public class Util {
} }
} }
private static FloatBuffer floatBuffer = GlAllocationUtils.allocateFloatBuffer(16); private static FloatBuffer floatBuffer = GlAllocationUtils.allocateByteBuffer(16 * 4).asFloatBuffer();
public static Matrix4f getGlMatrix(int matrix) { public static Matrix4f getGlMatrix(int matrix) {
floatBuffer.clear(); floatBuffer.clear();
//#if MC>=11400 //#if MC>=11400

View File

@@ -103,7 +103,12 @@ public class NoGuiScreenshot {
// Read it, create the screenshot and finish the future // Read it, create the screenshot and finish the future
try { try {
//#if MC>=11400 //#if MC>=11400
Image image = new Image(ScreenshotUtils.takeScreenshot(frameWidth, frameHeight, mc.getFramebuffer())); Image image = new Image(ScreenshotUtils.takeScreenshot(
//#if MC<11701
frameWidth, frameHeight,
//#endif
mc.getFramebuffer()
));
//#else //#else
//$$ // We're using Minecraft's ScreenShotHelper even though it writes the screenshot to //$$ // We're using Minecraft's ScreenShotHelper even though it writes the screenshot to
//$$ // disk for better maintainability //$$ // disk for better maintainability