From bef5e41a8d4e3d3ab282f76df3525bb6a9d62a3e Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Thu, 15 Jun 2017 14:37:18 +0200 Subject: [PATCH] Update mappings --- build.gradle | 2 +- jGui | 2 +- .../java/com/replaymod/core/AbstractTask.java | 2 +- .../replaymod/compat/shaders/ShaderBeginRender.java | 2 +- .../java/com/replaymod/core/KeyBindingRegistry.java | 4 ++-- .../com/replaymod/core/handler/MainMenuHandler.java | 8 ++++---- .../java/com/replaymod/core/utils/WrappedTimer.java | 6 +++--- .../java/com/replaymod/online/gui/GuiRegister.java | 2 +- .../pathing/player/AbstractTimelinePlayer.java | 10 +++++----- .../replaymod/recording/gui/GuiRecordingOverlay.java | 2 +- .../recording/handler/ConnectionEventHandler.java | 2 +- .../recording/handler/RecordingEventHandler.java | 2 +- .../recording/packet/ResourcePackRecorder.java | 6 +++--- .../replaymod/render/rendering/VideoRenderer.java | 6 +++--- .../java/com/replaymod/replay/NoGuiScreenshot.java | 2 +- .../java/com/replaymod/replay/ReplayHandler.java | 4 ++-- src/main/java/com/replaymod/replay/ReplaySender.java | 6 +++--- .../replay/camera/ClassicCameraController.java | 2 +- .../com/replaymod/replay/handler/GuiHandler.java | 12 ++++++------ .../com/replaymod/replay/mixin/MixinRenderItem.java | 2 +- .../mixin/MixinTileEntityEndPortalRenderer.java | 2 +- .../java/com/replaymod/simplepathing/SPTimeline.java | 2 +- 22 files changed, 44 insertions(+), 44 deletions(-) diff --git a/build.gradle b/build.gradle index 9d297d2f..407744ef 100755 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ minecraft { coreMod = 'com.replaymod.core.LoadingPlugin' version = '1.12-14.21.0.2327' runDir = "eclipse" - mappings = "snapshot_20161220" + mappings = "snapshot_20170615" replace '@MOD_VERSION@', project.version replace '@MC_VERSION@', project.minecraft.version } diff --git a/jGui b/jGui index 78ebb77a..e5fcc650 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit 78ebb77aedd6c9bf6865f58970590c1a0cad9212 +Subproject commit e5fcc65032e6b3ed53f3013db091c71f9c2e2ca7 diff --git a/src/integration-test/java/com/replaymod/core/AbstractTask.java b/src/integration-test/java/com/replaymod/core/AbstractTask.java index c6abf8f5..7320023b 100644 --- a/src/integration-test/java/com/replaymod/core/AbstractTask.java +++ b/src/integration-test/java/com/replaymod/core/AbstractTask.java @@ -299,7 +299,7 @@ public abstract class AbstractTask implements Task { return; } - clickNow(button.xPosition + 5, button.yPosition + 5); + clickNow(button.x + 5, button.y + 5); } catch (IllegalAccessException | NoSuchFieldException e) { future.setException(e); } diff --git a/src/main/java/com/replaymod/compat/shaders/ShaderBeginRender.java b/src/main/java/com/replaymod/compat/shaders/ShaderBeginRender.java index e8919846..d74d570c 100644 --- a/src/main/java/com/replaymod/compat/shaders/ShaderBeginRender.java +++ b/src/main/java/com/replaymod/compat/shaders/ShaderBeginRender.java @@ -30,7 +30,7 @@ public class ShaderBeginRender { // check if Shaders are enabled if (!(boolean) (ShaderReflection.config_isShaders.invoke(null))) return; - ShaderReflection.shaders_beginRender.invoke(null, mc, mc.timer.field_194147_b, 0); + ShaderReflection.shaders_beginRender.invoke(null, mc, mc.timer.renderPartialTicks, 0); } catch (IllegalAccessException | InvocationTargetException e) { e.printStackTrace(); } diff --git a/src/main/java/com/replaymod/core/KeyBindingRegistry.java b/src/main/java/com/replaymod/core/KeyBindingRegistry.java index 9d792864..52e134d8 100644 --- a/src/main/java/com/replaymod/core/KeyBindingRegistry.java +++ b/src/main/java/com/replaymod/core/KeyBindingRegistry.java @@ -85,7 +85,7 @@ public class KeyBindingRegistry { CrashReport crashReport = CrashReport.makeCrashReport(cause, "Handling Key Binding"); CrashReportCategory category = crashReport.makeCategory("Key Binding"); category.addCrashSection("Key Binding", keyBinding); - category.setDetail("Handler", runnable::toString); + category.addDetail("Handler", runnable::toString); throw new ReportedException(crashReport); } } @@ -100,7 +100,7 @@ public class KeyBindingRegistry { CrashReport crashReport = CrashReport.makeCrashReport(cause, "Handling Raw Key Binding"); CrashReportCategory category = crashReport.makeCategory("Key Binding"); category.addCrashSection("Key Code", keyCode); - category.setDetail("Handler", runnable::toString); + category.addDetail("Handler", runnable::toString); throw new ReportedException(crashReport); } } diff --git a/src/main/java/com/replaymod/core/handler/MainMenuHandler.java b/src/main/java/com/replaymod/core/handler/MainMenuHandler.java index 475f02ea..d3fd3cab 100644 --- a/src/main/java/com/replaymod/core/handler/MainMenuHandler.java +++ b/src/main/java/com/replaymod/core/handler/MainMenuHandler.java @@ -19,12 +19,12 @@ public class MainMenuHandler { if (event.getGui() instanceof GuiMainMenu) { for (GuiButton button : event.getButtonList()) { // Buttons that aren't in a rectangle directly above our space don't need moving - if (button.xPosition + button.width < event.getGui().width / 2 - 100 - || button.xPosition > event.getGui().width / 2 + 100 - || button.yPosition > event.getGui().height / 4 + 10 + 4 * 24) continue; + if (button.x + button.width < event.getGui().width / 2 - 100 + || button.x > event.getGui().width / 2 + 100 + || button.y > event.getGui().height / 4 + 10 + 4 * 24) continue; // Move button up to make space for two rows of buttons // and then move back down by 10 to compensate for the space to the exit button that was already there - button.yPosition -= 2 * 24 - 10; + button.y -= 2 * 24 - 10; } } } diff --git a/src/main/java/com/replaymod/core/utils/WrappedTimer.java b/src/main/java/com/replaymod/core/utils/WrappedTimer.java index bc7e464a..5b6c16e7 100644 --- a/src/main/java/com/replaymod/core/utils/WrappedTimer.java +++ b/src/main/java/com/replaymod/core/utils/WrappedTimer.java @@ -22,9 +22,9 @@ public class WrappedTimer extends Timer { protected void copy(Timer from, Timer to) { to.elapsedTicks = from.elapsedTicks; - to.field_194147_b = from.field_194147_b; // elapsedPartialTicks + to.renderPartialTicks = from.renderPartialTicks; to.lastSyncSysClock = from.lastSyncSysClock; - to.field_194148_c = from.field_194148_c; // lastTickDiff - to.field_194149_e = from.field_194149_e; // msPerTick + to.elapsedPartialTicks = from.elapsedPartialTicks; + to.tickLength = from.tickLength; } } diff --git a/src/main/java/com/replaymod/online/gui/GuiRegister.java b/src/main/java/com/replaymod/online/gui/GuiRegister.java index 574a6c05..af39e944 100644 --- a/src/main/java/com/replaymod/online/gui/GuiRegister.java +++ b/src/main/java/com/replaymod/online/gui/GuiRegister.java @@ -55,7 +55,7 @@ public class GuiRegister extends AbstractGuiScreen { pos(cancelButton, width / 2 + 2, 170); pos(statusLabel, width / 2 - statusLabel.getMinSize().getWidth() / 2, 152); - FontRenderer font = getMinecraft().fontRendererObj; + FontRenderer font = getMinecraft().fontRenderer; int lineCount = font.listFormattedStringToWidth(disclaimerLabel.getText(), width - 10).size(); Dimension dim = new Dimension(width - 10, font.FONT_HEIGHT * lineCount); disclaimerLabel.setSize(dim); diff --git a/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java b/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java index b49d9a80..e6f28449 100644 --- a/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java +++ b/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java @@ -69,8 +69,8 @@ public abstract class AbstractTimelinePlayer { MinecraftForge.EVENT_BUS.register(this); lastTime = 0; mc.timer = new ReplayTimer(mc.timer); - mc.timer.field_194149_e = WrappedTimer.DEFAULT_MS_PER_TICK; - mc.timer.field_194147_b = mc.timer.elapsedTicks = 0; + mc.timer.tickLength = WrappedTimer.DEFAULT_MS_PER_TICK; + mc.timer.renderPartialTicks = mc.timer.elapsedTicks = 0; return future = settableFuture = SettableFuture.create(); } @@ -108,9 +108,9 @@ public abstract class AbstractTimelinePlayer { float timeInTicks = replayTime / 50f; float previousTimeInTicks = lastTime / 50f; float passedTicks = timeInTicks - previousTimeInTicks; - mc.timer.field_194147_b += passedTicks; - mc.timer.elapsedTicks = (int) mc.timer.field_194147_b; - mc.timer.field_194147_b -= mc.timer.elapsedTicks; + mc.timer.renderPartialTicks += passedTicks; + mc.timer.elapsedTicks = (int) mc.timer.renderPartialTicks; + mc.timer.renderPartialTicks -= mc.timer.elapsedTicks; lastTime = replayTime; diff --git a/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java b/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java index 9a5a5e41..79737bdd 100644 --- a/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java +++ b/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java @@ -42,7 +42,7 @@ public class GuiRecordingOverlay { public void renderRecordingIndicator(RenderGameOverlayEvent.Post event) { if (event.getType() != RenderGameOverlayEvent.ElementType.ALL) return; if (settingsRegistry.get(Setting.INDICATOR)) { - FontRenderer fontRenderer = mc.fontRendererObj; + FontRenderer fontRenderer = mc.fontRenderer; fontRenderer.drawString(I18n.format("replaymod.gui.recording").toUpperCase(), 30, 18 - (fontRenderer.FONT_HEIGHT / 2), 0xffffffff); mc.renderEngine.bindTexture(TEXTURE); GlStateManager.resetColor(); diff --git a/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java b/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java index 43eb9819..b2f87013 100755 --- a/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java +++ b/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java @@ -46,7 +46,7 @@ public class ConnectionEventHandler { try { boolean local = networkManager.isLocalChannel(); if (local) { - if (mc.getIntegratedServer().getEntityWorld().getWorldType() == WorldType.DEBUG_WORLD) { + if (mc.getIntegratedServer().getEntityWorld().getWorldType() == WorldType.DEBUG_ALL_BLOCK_STATES) { logger.info("Debug World recording is not supported."); return; } diff --git a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java index cc237ac8..c5319c2a 100755 --- a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java +++ b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java @@ -235,7 +235,7 @@ public class RecordingEventHandler { public void onPickupItem(ItemPickupEvent event) { try { packetListener.save(new SPacketCollectItem(event.pickedUp.getEntityId(), event.player.getEntityId(), - event.pickedUp.getEntityItem().getMaxStackSize())); + event.pickedUp.getItem().getMaxStackSize())); } catch(Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java index 9b02105c..7cec0542 100644 --- a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java +++ b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java @@ -88,7 +88,7 @@ public class ResourcePackRecorder { if (levelDir.isFile()) { netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.ACCEPTED)); - Futures.addCallback(mc.getResourcePackRepository().setResourcePackInstance(levelDir), new FutureCallback() { + Futures.addCallback(mc.getResourcePackRepository().setServerResourcePack(levelDir), new FutureCallback() { @Override public void onSuccess(Object result) { recordResourcePack(levelDir, requestId); @@ -174,7 +174,7 @@ public class ResourcePackRecorder { String fileHash = Hashing.sha1().hashBytes(Files.toByteArray(file)).toString(); if (fileHash.equals(hash)) { recordResourcePack(file, requestId); - return repo.setResourcePackInstance(file); + return repo.setServerResourcePack(file); } logger.warn("File " + file + " had wrong hash (expected " + hash + ", found " + fileHash + "). Deleting it."); @@ -196,7 +196,7 @@ public class ResourcePackRecorder { @Override public void onSuccess(Object value) { recordResourcePack(file, requestId); - repo.setResourcePackInstance(file); + repo.setServerResourcePack(file); } @Override diff --git a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java index 953da3dd..b49b9436 100644 --- a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java +++ b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java @@ -112,8 +112,8 @@ public class VideoRenderer implements RenderInfo { if (videoStart > 1000) { int replayTime = videoStart - 1000; - timer.field_194147_b = 0; - timer.field_194149_e = WrappedTimer.DEFAULT_MS_PER_TICK; + timer.renderPartialTicks = 0; + timer.tickLength = WrappedTimer.DEFAULT_MS_PER_TICK; while (replayTime < videoStart) { timer.elapsedTicks = 1; replayTime += 50; @@ -168,7 +168,7 @@ public class VideoRenderer implements RenderInfo { mc.displayHeight = displayHeightBefore; framesDone++; - return mc.timer.field_194147_b; + return mc.timer.renderPartialTicks; } @Override diff --git a/src/main/java/com/replaymod/replay/NoGuiScreenshot.java b/src/main/java/com/replaymod/replay/NoGuiScreenshot.java index 588269ff..1fdfff51 100644 --- a/src/main/java/com/replaymod/replay/NoGuiScreenshot.java +++ b/src/main/java/com/replaymod/replay/NoGuiScreenshot.java @@ -43,7 +43,7 @@ public class NoGuiScreenshot { mc.getFramebuffer().bindFramebuffer(true); GlStateManager.enableTexture2D(); - mc.entityRenderer.updateCameraAndRender(mc.timer.field_194147_b, System.nanoTime()); + mc.entityRenderer.updateCameraAndRender(mc.timer.renderPartialTicks, System.nanoTime()); mc.getFramebuffer().unbindFramebuffer(); GlStateManager.popMatrix(); diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java index 57d186df..e022b014 100755 --- a/src/main/java/com/replaymod/replay/ReplayHandler.java +++ b/src/main/java/com/replaymod/replay/ReplayHandler.java @@ -120,7 +120,7 @@ public class ReplayHandler { mc.loadWorld(null); } - mc.timer.field_194149_e = WrappedTimer.DEFAULT_MS_PER_TICK; + mc.timer.tickLength = WrappedTimer.DEFAULT_MS_PER_TICK; overlay.setVisible(false); ReplayModReplay.instance.replayHandler = null; @@ -301,7 +301,7 @@ public class ReplayHandler { @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { drawBackground(0); - drawCenteredString(fontRendererObj, I18n.format("replaymod.gui.pleasewait"), + drawCenteredString(fontRenderer, I18n.format("replaymod.gui.pleasewait"), width / 2, height / 2, 0xffffffff); } }; diff --git a/src/main/java/com/replaymod/replay/ReplaySender.java b/src/main/java/com/replaymod/replay/ReplaySender.java index b749d3a7..ee6d8e4f 100755 --- a/src/main/java/com/replaymod/replay/ReplaySender.java +++ b/src/main/java/com/replaymod/replay/ReplaySender.java @@ -397,7 +397,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter { if (!file.exists()) { IOUtils.copy(replayFile.getResourcePack(hash).get(), new FileOutputStream(file)); } - mc.getResourcePackRepository().setResourcePackInstance(file); + mc.getResourcePackRepository().setServerResourcePack(file); } } return null; @@ -519,7 +519,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter { * @return {@code true} if it is paused, {@code false} otherwise */ public boolean paused() { - return mc.timer.field_194149_e == Float.POSITIVE_INFINITY; + return mc.timer.tickLength == Float.POSITIVE_INFINITY; } /** @@ -539,7 +539,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter { */ public void setReplaySpeed(final double d) { if(d != 0) this.replaySpeed = d; - mc.timer.field_194149_e = WrappedTimer.DEFAULT_MS_PER_TICK / (float) d; + mc.timer.tickLength = WrappedTimer.DEFAULT_MS_PER_TICK / (float) d; } ///////////////////////////////////////////////////////// diff --git a/src/main/java/com/replaymod/replay/camera/ClassicCameraController.java b/src/main/java/com/replaymod/replay/camera/ClassicCameraController.java index 57bfa770..1690cef5 100644 --- a/src/main/java/com/replaymod/replay/camera/ClassicCameraController.java +++ b/src/main/java/com/replaymod/replay/camera/ClassicCameraController.java @@ -132,7 +132,7 @@ public class ClassicCameraController implements CameraController { Vec3d movement = direction.normalize(); double factor = motion * (frac / 1000D); - camera.moveCamera(movement.xCoord * factor, movement.yCoord * factor, movement.zCoord * factor); + camera.moveCamera(movement.x * factor, movement.y * factor, movement.z * factor); } private void setMovement(MoveDirection dir) { diff --git a/src/main/java/com/replaymod/replay/handler/GuiHandler.java b/src/main/java/com/replaymod/replay/handler/GuiHandler.java index 5c15898a..bdc1d4d0 100644 --- a/src/main/java/com/replaymod/replay/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/replay/handler/GuiHandler.java @@ -68,12 +68,12 @@ public class GuiHandler { } } if (achievements != null && stats != null) { - moveAllButtonsDirectlyBelowUpwards(buttonList, achievements.yPosition, - achievements.xPosition, stats.xPosition + stats.width); + moveAllButtonsDirectlyBelowUpwards(buttonList, achievements.y, + achievements.x, stats.x + stats.width); } if (openToLan != null) { - moveAllButtonsDirectlyBelowUpwards(buttonList, openToLan.yPosition, - openToLan.xPosition, openToLan.xPosition + openToLan.width); + moveAllButtonsDirectlyBelowUpwards(buttonList, openToLan.y, + openToLan.x, openToLan.x + openToLan.width); } } } @@ -87,8 +87,8 @@ public class GuiHandler { */ private void moveAllButtonsDirectlyBelowUpwards(List buttons, int belowY, int xStart, int xEnd) { for (GuiButton button : buttons) { - if (button.yPosition >= belowY && button.xPosition <= xEnd && button.xPosition + button.width >= xStart) { - button.yPosition -= 24; + if (button.y >= belowY && button.x <= xEnd && button.x + button.width >= xStart) { + button.y -= 24; } } } diff --git a/src/main/java/com/replaymod/replay/mixin/MixinRenderItem.java b/src/main/java/com/replaymod/replay/mixin/MixinRenderItem.java index 5e09555d..542aa978 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinRenderItem.java +++ b/src/main/java/com/replaymod/replay/mixin/MixinRenderItem.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(RenderItem.class) public class MixinRenderItem { - @Redirect(method = "func_191966_a", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getSystemTime()J")) + @Redirect(method = "renderEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getSystemTime()J")) private long getEnchantmentTime() { ReplayHandler replayHandler = ReplayModReplay.instance.getReplayHandler(); if (replayHandler != null) { diff --git a/src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java b/src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java index 3c7ffc17..aa824ec9 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java +++ b/src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(TileEntityEndPortalRenderer.class) public class MixinTileEntityEndPortalRenderer { - @Redirect(method = "func_192841_a", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getSystemTime()J")) + @Redirect(method = "renderTileEntityAt", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getSystemTime()J")) private long replayModReplay_getEnchantmentTime() { ReplayHandler replayHandler = ReplayModReplay.instance.getReplayHandler(); if (replayHandler != null) { diff --git a/src/main/java/com/replaymod/simplepathing/SPTimeline.java b/src/main/java/com/replaymod/simplepathing/SPTimeline.java index a41c6079..f0f05c1f 100644 --- a/src/main/java/com/replaymod/simplepathing/SPTimeline.java +++ b/src/main/java/com/replaymod/simplepathing/SPTimeline.java @@ -658,7 +658,7 @@ public class SPTimeline implements PathingRegistry { } catch (IOException e) { CrashReport crash = CrashReport.makeCrashReport(e, "Serializing interpolator"); CrashReportCategory category = crash.makeCategory("Serializing interpolator"); - category.setDetail("Interpolator", interpolator::toString); + category.addDetail("Interpolator", interpolator::toString); throw new ReportedException(crash); }