DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to MC 1.19

Browse Source
This commit is contained in:
Jonas Herzig
2022-06-12 13:43:39 +02:00
parent 9ce25f711f
commit df11ba2e36
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build.gradle
View File

@@ -246,7 +246,7 @@ dependencies {
11800: '1.18', 11800: '1.18',
11801: '1.18.1', 11801: '1.18.1',
11802: '1.18.2', 11802: '1.18.2',
11900: '1.19-pre3', 11900: '1.19',
][mcVersion] ][mcVersion]
mappings 'net.fabricmc:yarn:' + [ mappings 'net.fabricmc:yarn:' + [
11404: '1.14.4+build.16', 11404: '1.14.4+build.16',
@@ -259,7 +259,7 @@ dependencies {
11800: '1.18+build.1:v2', 11800: '1.18+build.1:v2',
11801: '1.18.1+build.1:v2', 11801: '1.18.1+build.1:v2',
11802: '1.18.2+build.1:v2', 11802: '1.18.2+build.1:v2',
11900: '1.19-pre3+build.3:v2', 11900: '1.19+build.2:v2',
][mcVersion] ][mcVersion]
modImplementation 'net.fabricmc:fabric-loader:0.14.6' modImplementation 'net.fabricmc:fabric-loader:0.14.6'
def fabricApiVersion = [ def fabricApiVersion = [
@@ -273,7 +273,7 @@ dependencies {
11800: '0.43.1+1.18', 11800: '0.43.1+1.18',
11801: '0.43.1+1.18', 11801: '0.43.1+1.18',
11802: '0.47.9+1.18.2', 11802: '0.47.9+1.18.2',
11900: '0.53.4+1.19', 11900: '0.55.3+1.19',
][mcVersion] ][mcVersion]
def fabricApiModules = [ def fabricApiModules = [
"api-base", "api-base",
@@ -346,7 +346,10 @@ dependencies {
shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
shadow "com.github.ReplayMod:ReplayStudio:6fc8e20", shadeExclusions shadow "com.github.ReplayMod:ReplayStudio:39debfe", shadeExclusions
// FIXME this should be pulled in by ReplayStudio, and IntelliJ sees it, but javac for some reason does not
implementation 'com.github.viaversion:opennbt:0a02214' // 2.0-SNAPSHOT (ViaVersion Edition)
implementation(FABRIC ? dependencies.project(path: jGui.path, configuration: "namedElements") : jGui) { implementation(FABRIC ? dependencies.project(path: jGui.path, configuration: "namedElements") : 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: 94278dfddb...c1e43fc9f0

2
src/main/java/com/replaymod/editor/gui/MarkerProcessor.java
View File

@@ -124,7 +124,7 @@ public class MarkerProcessor {
PacketTypeRegistry registry = MCVer.getPacketTypeRegistry(true); PacketTypeRegistry registry = MCVer.getPacketTypeRegistry(true);
DimensionTracker dimensionTracker = new DimensionTracker(); DimensionTracker dimensionTracker = new DimensionTracker();
SquashFilter squashFilter = new SquashFilter(null, null); SquashFilter squashFilter = new SquashFilter(null, null, null);
List<Pair<Path, ReplayMetaData>> outputPaths = new ArrayList<>(); List<Pair<Path, ReplayMetaData>> outputPaths = new ArrayList<>();