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

Update to 1.16-pre1

Browse Source
This commit is contained in:
Jonas Herzig
2020-06-15 09:44:37 +02:00
parent 14b84c5e1b
commit 2ffde14c60
7 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java
View File

@@ -65,7 +65,7 @@ public class ConnectionEventHandler {
if (local) {
//#if MC>=10800
//#if MC>=11600
//$$ if (mc.getServer().getWorld(World.field_25179).isDebugWorld()) {
//$$ if (mc.getServer().getWorld(World.OVERWORLD).isDebugWorld()) {
//#else
//#if MC>=11400
if (mc.getServer().getWorld(DimensionType.OVERWORLD).getGeneratorType() == LevelGeneratorType.DEBUG_ALL_BLOCK_STATES) {
@@ -91,7 +91,7 @@ public class ConnectionEventHandler {
String worldName;
if (local) {
//#if MC>=11600
//$$ worldName = mc.getServer().method_27728().getLevelName();
//$$ worldName = mc.getServer().getSaveProperties().getLevelName();
//#else
worldName = mc.getServer().getLevelName();
//#endif

8
src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java
View File

@@ -30,7 +30,13 @@ public abstract class MixinDownloadingPackFinder implements ResourcePackRecorder
//#if MC>=10800
@Inject(method = "loadServerPack", at = @At("HEAD"))
private void recordDownloadedPack(File file, CallbackInfoReturnable ci) {
private void recordDownloadedPack(
File file,
//#if MC>=11600
//$$ net.minecraft.class_5352 arg,
//#endif
CallbackInfoReturnable ci
) {
if (requestCallback != null) {
requestCallback.consume(file);
requestCallback = null;