3
0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-10-05 09:20:07 +02:00

Update for 1.17-rc1 and use Java 16

Dieser Commit ist enthalten in:
Camotoy 2021-06-07 12:33:54 -04:00
Ursprung 91f2c3796f
Commit 28fb957fd9
7 geänderte Dateien mit 19 neuen und 21 gelöschten Zeilen

Datei anzeigen

@ -2,7 +2,7 @@ pipeline {
agent any agent any
tools { tools {
gradle 'Gradle 6' gradle 'Gradle 6'
jdk 'Java 8' jdk 'Java 16'
} }
parameters{ parameters{
@ -27,7 +27,10 @@ pipeline {
stage ('Deploy') { stage ('Deploy') {
when { when {
branch "java-1.16" anyOf {
branch "java-1.16"
branch "java-1.17"
}
} }
steps { steps {

Datei anzeigen

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '0.5-SNAPSHOT' id 'fabric-loom' version '0.8-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '6.1.0' id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'java' id 'java'
@ -8,8 +8,8 @@ plugins {
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'java' apply plugin: 'java'
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_16
archivesBaseName = project.archives_base_name archivesBaseName = project.archives_base_name
version = project.mod_version version = project.mod_version
@ -54,14 +54,9 @@ repositories {
processResources { processResources {
inputs.property "version", project.version inputs.property "version", project.version
from(sourceSets.main.resources.srcDirs) { filesMatching("fabric.mod.json") {
include "fabric.mod.json"
expand "version": project.version expand "version": project.version
} }
from(sourceSets.main.resources.srcDirs) {
exclude "fabric.mod.json"
}
} }
// ensure that the encoding is set to UTF-8, no matter what the system default is // ensure that the encoding is set to UTF-8, no matter what the system default is

Datei anzeigen

@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.16.3 minecraft_version=1.17-rc1
yarn_mappings=1.16.3+build.28 yarn_mappings=1.17-rc1+build.5
loader_version=0.10.1+build.209 loader_version=0.11.3
# Mod Properties # Mod Properties
mod_version=1.3.0-SNAPSHOT mod_version=1.3.0-SNAPSHOT
maven_group=org.geysermc.platform maven_group=org.geysermc.platform
archives_base_name=Geyser-Fabric archives_base_name=Geyser-Fabric
# Dependencies # Dependencies
# check this on https://modmuss50.me/fabric.html # check this on https://modmuss50.me/fabric.html
fabric_version=0.23.0+build.410-1.16 fabric_version=0.34.9+1.17

Datei anzeigen

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

Datei anzeigen

@ -35,7 +35,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.WritableBookItem; import net.minecraft.item.WritableBookItem;
import net.minecraft.item.WrittenBookItem; import net.minecraft.item.WrittenBookItem;
import net.minecraft.nbt.ListTag; import net.minecraft.nbt.NbtList;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.session.GeyserSession;
@ -89,7 +89,7 @@ public class GeyserFabricWorldManager extends GeyserWorldManager {
.putString("Name", "minecraft:writable_book"); .putString("Name", "minecraft:writable_book");
List<NbtMap> pages = new ArrayList<>(hasBookPages ? pageCount : 1); List<NbtMap> pages = new ArrayList<>(hasBookPages ? pageCount : 1);
if (hasBookPages && WritableBookItem.isValid(book.getTag())) { if (hasBookPages && WritableBookItem.isValid(book.getTag())) {
ListTag listTag = book.getTag().getList("pages", 8); NbtList listTag = book.getTag().getList("pages", 8);
for (int i = 0; i < listTag.size(); i++) { for (int i = 0; i < listTag.size(); i++) {
String page = listTag.getString(i); String page = listTag.getString(i);

Datei anzeigen

@ -23,8 +23,8 @@
"geyser-fabric.mixins.json" "geyser-fabric.mixins.json"
], ],
"depends": { "depends": {
"fabricloader": ">=0.10.1+build.209", "fabricloader": ">=0.11.3",
"fabric": "*", "fabric": "*",
"minecraft": ">=1.16.3" "minecraft": "1.17.x"
} }
} }

Datei anzeigen

@ -1,7 +1,7 @@
{ {
"required": true, "required": true,
"package": "org.geysermc.platform.fabric.mixin", "package": "org.geysermc.platform.fabric.mixin",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_16",
"client": [ "client": [
"client.IntegratedServerMixin" "client.IntegratedServerMixin"
], ],