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

Make use of new @Pattern feature to centralize version-aware code

Browse Source 
That is, most of the business code should not be aware that it is being compiled
to multiple versions even when it heavily interacts with MC, preprocessor
statements should be an escape hatch, not the norm.
Similarly, code should not be forced to do `MCVer.getWindow(mc)` instead of the
much more intuitive `mc.getWindow()`, and a new preprocessor (technically remap)
feature makes this possible by defining "search and replace"-like patterns (but
smarter in that they are type-aware) in one or more central places (the
"Patterns.java" files) which then are applied all over the code base.

In a way, this is another step in the automatic back-porting process where
preprocessor statements are used when we cannot yet do something automatically.
Previously we "merely" automatically converted between different mapping, this
new feature now also allows us to automatically perform simple refactoring
tasks like changing field access to a getter+setter (e.g. `mc.getWindow()`), or
changing how a method is called (e.g. `BufferBuilder.begin`), or changing a
method call chain (e.g. `dispatcher.camera.getYaw()`), or most other
search-and-replace-like changes and any combination of those.
The only major limitation is that the replacement itself is not smart, so
arguments must be kept in same order (or be temporarily assigned to local
variables which then can be used in any order).
This commit is contained in:
Jonas Herzig
2021-02-27 17:54:49 +01:00
parent 06a46e6f38
commit cfb9e15b8a
56 changed files with 890 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/replaymod/replay/FullReplaySender.java
View File

@@ -367,7 +367,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
// To counteract this, we need to manually update it's position if it hasn't been added
// to any chunk yet.
if (mc.world != null) {
for (PlayerEntity playerEntity : playerEntities(mc.world)) {
for (PlayerEntity playerEntity : mc.world.getPlayers()) {
if (!playerEntity.updateNeeded && playerEntity instanceof OtherClientPlayerEntity) {
playerEntity.tickMovement();
}
@@ -417,7 +417,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
// Note: Not sure if it's still required but there's this really handy method anyway
world.finishRemovingEntities();
//#else
//$$ Iterator<Entity> iter = loadedEntityList(world).iterator();
//$$ Iterator<Entity> iter = world.loadedEntityList.iterator();
//$$ while (iter.hasNext()) {
//$$ Entity entity = iter.next();
//$$ if (entity.isDead) {
@@ -455,10 +455,10 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
}
}
};
if (MCVer.isOnMainThread()) {
if (mc.isOnThread()) {
doLightUpdates.run();
} else {
MCVer.scheduleOnMainThread(doLightUpdates);
mc.send(doLightUpdates);
}
}
//#endif
@@ -742,8 +742,8 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
//#endif
if(cent != null) {
if(!allowMovement && !((Math.abs(Entity_getX(cent) - ppl.getX()) > TP_DISTANCE_LIMIT) ||
(Math.abs(Entity_getZ(cent) - ppl.getZ()) > TP_DISTANCE_LIMIT))) {
if(!allowMovement && !((Math.abs(cent.getX() - ppl.getX()) > TP_DISTANCE_LIMIT) ||
(Math.abs(cent.getZ() - ppl.getZ()) > TP_DISTANCE_LIMIT))) {
return null;
} else {
allowMovement = false;
@@ -754,7 +754,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
@Override
@SuppressWarnings("unchecked")
public void run() {
if (mc.world == null || !isOnMainThread()) {
if (mc.world == null || !mc.isOnThread()) {
ReplayMod.instance.runLater(this);
return;
}
@@ -1171,7 +1171,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
//#endif
List<Entity> entitiesInChunk = new ArrayList<>();
// Gather all entities in that chunk
for (Collection<Entity> entityList : getEntityLists(chunk)) {
for (Collection<Entity> entityList : chunk.getEntitySectionArray()) {
entitiesInChunk.addAll(entityList);
}
for (Entity entity : entitiesInChunk) {
@@ -1189,9 +1189,9 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
// Check whether the entity has left the chunk
//#if MC>=11404
int chunkX = MathHelper.floor(Entity_getX(entity) / 16);
int chunkY = MathHelper.floor(Entity_getY(entity) / 16);
int chunkZ = MathHelper.floor(Entity_getZ(entity) / 16);
int chunkX = MathHelper.floor(entity.getX() / 16);
int chunkY = MathHelper.floor(entity.getY() / 16);
int chunkZ = MathHelper.floor(entity.getZ() / 16);
if (entity.chunkX != chunkX || entity.chunkY != chunkY || entity.chunkZ != chunkZ) {
if (entity.updateNeeded) {
// Entity has left the chunk

21
src/main/java/com/replaymod/replay/NoGuiScreenshot.java
View File

@@ -3,7 +3,6 @@ package com.replaymod.replay;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import com.replaymod.core.ReplayMod;
import com.replaymod.core.versions.MCVer;
import de.johni0702.minecraft.gui.versions.Image;
import net.minecraft.client.MinecraftClient;
import com.mojang.blaze3d.platform.GlStateManager;
@@ -13,10 +12,6 @@ import net.minecraft.client.util.ScreenshotUtils;
import net.minecraft.client.util.math.MatrixStack;
//#endif
//#if MC>=11400
import static com.replaymod.core.versions.MCVer.getWindow;
//#endif
//#if MC<11400
//$$ import com.google.common.io.Files;
//$$ import org.apache.commons.io.FileUtils;
@@ -55,11 +50,8 @@ public class NoGuiScreenshot {
return;
}
//#if MC>=11400
int frameWidth = getWindow(mc).getFramebufferWidth(), frameHeight = getWindow(mc).getFramebufferHeight();
//#else
//$$ int frameWidth = mc.displayWidth, frameHeight = mc.displayHeight;
//#endif
int frameWidth = mc.getWindow().getFramebufferWidth();
int frameHeight = mc.getWindow().getFramebufferHeight();
final boolean guiHidden = mc.options.hudHidden;
try {
@@ -76,16 +68,17 @@ public class NoGuiScreenshot {
mc.getFramebuffer().beginWrite(true);
GlStateManager.enableTexture();
float tickDelta = mc.getTickDelta();
//#if MC>=11500
mc.gameRenderer.renderWorld(MCVer.getRenderPartialTicks(), System.nanoTime(), new MatrixStack());
mc.gameRenderer.renderWorld(tickDelta, System.nanoTime(), new MatrixStack());
//#else
//#if MC>=11400
//$$ mc.gameRenderer.renderWorld(MCVer.getRenderPartialTicks(), System.nanoTime());
//$$ mc.gameRenderer.renderWorld(tickDelta, System.nanoTime());
//#else
//#if MC>=10809
//$$ mc.entityRenderer.updateCameraAndRender(MCVer.getRenderPartialTicks(), System.nanoTime());
//$$ mc.entityRenderer.updateCameraAndRender(tickDelta, System.nanoTime());
//#else
//$$ mc.entityRenderer.updateCameraAndRender(MCVer.getRenderPartialTicks());
//$$ mc.entityRenderer.updateCameraAndRender(tickDelta);
//#endif
//#endif
//#endif

65
src/main/java/com/replaymod/replay/ReplayHandler.java
View File

@@ -31,6 +31,7 @@ import io.netty.channel.embedded.EmbeddedChannel;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
import net.minecraft.client.network.ClientLoginNetworkHandler;
import net.minecraft.client.util.Window;
import net.minecraft.util.crash.CrashReport;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
@@ -50,12 +51,10 @@ import org.lwjgl.opengl.GL11;
//#if MC>=11400
import com.replaymod.replay.mixin.EntityLivingBaseAccessor;
import net.minecraft.client.util.Window;
import net.minecraft.entity.LivingEntity;
//#else
//$$ import com.replaymod.replay.mixin.EntityOtherPlayerMPAccessor;
//$$ import net.minecraft.client.entity.EntityOtherPlayerMP;
//$$ import net.minecraft.client.gui.ScaledResolution;
//$$ import org.lwjgl.opengl.Display;
//#endif
@@ -148,7 +147,7 @@ public class ReplayHandler {
private UUID spectating;
public ReplayHandler(ReplayFile replayFile, boolean asyncMode) throws IOException {
Preconditions.checkState(isOnMainThread(), "Must be called from Minecraft thread.");
Preconditions.checkState(mc.isOnThread(), "Must be called from Minecraft thread.");
this.replayFile = replayFile;
replayDuration = replayFile.getMetaData().getDuration();
@@ -171,7 +170,7 @@ public class ReplayHandler {
}
void restartedReplay() {
Preconditions.checkState(isOnMainThread(), "Must be called from Minecraft thread.");
Preconditions.checkState(mc.isOnThread(), "Must be called from Minecraft thread.");
channel.close();
@@ -197,7 +196,7 @@ public class ReplayHandler {
}
public void endReplay() throws IOException {
Preconditions.checkState(isOnMainThread(), "Must be called from Minecraft thread.");
Preconditions.checkState(mc.isOnThread(), "Must be called from Minecraft thread.");
ReplayClosingCallback.EVENT.invoker().replayClosing(this);
@@ -246,7 +245,7 @@ public class ReplayHandler {
}
private void setup() {
Preconditions.checkState(isOnMainThread(), "Must be called from Minecraft thread.");
Preconditions.checkState(mc.isOnThread(), "Must be called from Minecraft thread.");
//#if MC>=11100
mc.inGameHud.getChatHud().clear(false);
@@ -403,7 +402,7 @@ public class ReplayHandler {
CameraEntity cam = getCameraEntity();
if (cam != null) {
targetCameraPosition = new Location(Entity_getX(cam), Entity_getY(cam), Entity_getZ(cam), cam.yaw, cam.pitch);
targetCameraPosition = new Location(cam.getX(), cam.getY(), cam.getZ(), cam.yaw, cam.pitch);
} else {
targetCameraPosition = null;
}
@@ -486,8 +485,8 @@ public class ReplayHandler {
cameraEntity.setCameraController(new SpectatorCameraController(cameraEntity));
}
if (getRenderViewEntity(mc) != e) {
setRenderViewEntity(mc, e);
if (mc.getCameraEntity() != e) {
mc.setCameraEntity(e);
cameraEntity.setCameraPosRot(e);
}
}
@@ -505,7 +504,7 @@ public class ReplayHandler {
* @return {@code true} if the camera is the view entity, {@code false} otherwise
*/
public boolean isCameraView() {
return mc.player instanceof CameraEntity && mc.player == getRenderViewEntity(mc);
return mc.player instanceof CameraEntity && mc.player == mc.getCameraEntity();
}
/**
@@ -539,11 +538,11 @@ public class ReplayHandler {
}
// Update all entity positions (especially prev/lastTick values)
for (Entity entity : loadedEntityList(mc.world)) {
for (Entity entity : mc.world.getEntities()) {
skipTeleportInterpolation(entity);
entity.lastRenderX = entity.prevX = Entity_getX(entity);
entity.lastRenderY = entity.prevY = Entity_getY(entity);
entity.lastRenderZ = entity.prevZ = Entity_getZ(entity);
entity.lastRenderX = entity.prevX = entity.getX();
entity.lastRenderY = entity.prevY = entity.getY();
entity.lastRenderZ = entity.prevZ = entity.getZ();
entity.prevYaw = entity.yaw;
entity.prevPitch = entity.pitch;
}
@@ -563,7 +562,7 @@ public class ReplayHandler {
quickReplaySender.sendPacketsTill(targetTime);
// Immediately apply player teleport interpolation
for (Entity entity : loadedEntityList(mc.world)) {
for (Entity entity : mc.world.getEntities()) {
skipTeleportInterpolation(entity);
}
return;
@@ -582,7 +581,7 @@ public class ReplayHandler {
if (retainCameraPosition) {
CameraEntity cam = getCameraEntity();
if (cam != null) {
targetCameraPosition = new Location(Entity_getX(cam), Entity_getY(cam), Entity_getZ(cam),
targetCameraPosition = new Location(cam.getX(), cam.getY(), cam.getZ(),
cam.yaw, cam.pitch);
} else {
targetCameraPosition = null;
@@ -612,8 +611,8 @@ public class ReplayHandler {
);
enableTexture();
mc.getFramebuffer().beginWrite(true);
Window window = mc.getWindow();
//#if MC>=11500
Window window = getWindow(mc);
RenderSystem.clear(256, MinecraftClient.IS_SYSTEM_MAC);
RenderSystem.matrixMode(GL11.GL_PROJECTION);
RenderSystem.loadIdentity();
@@ -623,23 +622,13 @@ public class ReplayHandler {
RenderSystem.translatef(0, 0, -2000);
//#else
//#if MC>=11400
//$$ getWindow(mc).method_4493(true);
//#else
//#if MC>=11400
//$$ mc.mainWindow.setupOverlayRendering();
//$$ window.method_4493(true);
//#else
//$$ mc.entityRenderer.setupOverlayRendering();
//#endif
//#endif
//#endif
//#if MC>=11400
Window
//#else
//$$ ScaledResolution
//#endif
resolution = newScaledResolution(mc);
guiScreen.toMinecraft().init(mc, resolution.getScaledWidth(), resolution.getScaledHeight());
guiScreen.toMinecraft().init(mc, window.getScaledWidth(), window.getScaledHeight());
//#if MC>=11600
guiScreen.toMinecraft().render(new MatrixStack(), 0, 0, 0);
//#else
@@ -654,18 +643,14 @@ public class ReplayHandler {
mc.getFramebuffer().endWrite();
popMatrix();
pushMatrix();
//#if MC>=11400
mc.getFramebuffer().draw(getWindow(mc).getFramebufferWidth(), getWindow(mc).getFramebufferHeight());
//#else
//$$ mc.getFramebuffer().framebufferRender(mc.displayWidth, mc.displayHeight);
//#endif
mc.getFramebuffer().draw(mc.getWindow().getFramebufferWidth(), mc.getWindow().getFramebufferHeight());
popMatrix();
//#if MC>=11500
getWindow(mc).swapBuffers();
mc.getWindow().swapBuffers();
//#else
//#if MC>=11400
//$$ getWindow(mc).setFullscreen(true);
//$$ mc.window.setFullscreen(true);
//#else
//$$ Display.update();
//#endif
@@ -691,11 +676,11 @@ public class ReplayHandler {
//#else
//$$ .processReceivedPackets();
//#endif
for (Entity entity : loadedEntityList(mc.world)) {
for (Entity entity : mc.world.getEntities()) {
skipTeleportInterpolation(entity);
entity.lastRenderX = entity.prevX = Entity_getX(entity);
entity.lastRenderY = entity.prevY = Entity_getY(entity);
entity.lastRenderZ = entity.prevZ = Entity_getZ(entity);
entity.lastRenderX = entity.prevX = entity.getX();
entity.lastRenderY = entity.prevY = entity.getY();
entity.lastRenderZ = entity.prevZ = entity.getZ();
entity.prevYaw = entity.yaw;
entity.prevPitch = entity.pitch;
}

8
src/main/java/com/replaymod/replay/ReplayModReplay.java
View File

@@ -32,8 +32,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Optional;
import static com.replaymod.core.versions.MCVer.*;
public class ReplayModReplay implements Module {
{ instance = this; }
@@ -68,9 +66,9 @@ public class ReplayModReplay implements Module {
if (camera != null) {
Marker marker = new Marker();
marker.setTime(replayHandler.getReplaySender().currentTimeStamp());
marker.setX(Entity_getX(camera));
marker.setY(Entity_getY(camera));
marker.setZ(Entity_getZ(camera));
marker.setX(camera.getX());
marker.setY(camera.getY());
marker.setZ(camera.getZ());
marker.setYaw(camera.yaw);
marker.setPitch(camera.pitch);
marker.setRoll(camera.roll);

40
src/main/java/com/replaymod/replay/camera/CameraEntity.java
View File

@@ -31,7 +31,6 @@ import net.minecraft.util.math.Box;
//#if FABRIC>=1
//#else
//$$ import com.replaymod.core.versions.MCVer;
//$$ import net.minecraftforge.client.event.EntityViewRenderEvent;
//$$ import net.minecraftforge.client.event.RenderGameOverlayEvent;
//$$ import net.minecraftforge.common.MinecraftForge;
@@ -185,7 +184,7 @@ public class CameraEntity
* @param z Delta in Z direction
*/
public void moveCamera(double x, double y, double z) {
setCameraPosition(Entity_getX(this) + x, Entity_getY(this) + y, Entity_getZ(this) + z);
setCameraPosition(this.getX() + x, this.getY() + y, this.getZ() + z);
}
/**
@@ -198,7 +197,7 @@ public class CameraEntity
this.lastRenderX = this.prevX = x;
this.lastRenderY = this.prevY = y;
this.lastRenderZ = this.prevZ = z;
Entity_setPos(this, x, y, z);
this.setPos(x, y, z);
updateBoundingBox();
}
@@ -239,7 +238,7 @@ public class CameraEntity
this.prevZ = to.prevZ;
this.prevYaw = to.prevYaw;
this.prevPitch = to.prevPitch;
Entity_setPos(this, Entity_getX(to), Entity_getY(to), Entity_getZ(to));
this.setPos(to.getX(), to.getY(), to.getZ());
this.yaw = to.yaw;
this.pitch = to.pitch;
this.lastRenderX = to.lastRenderX;
@@ -258,17 +257,18 @@ public class CameraEntity
//#else
//$$ this.boundingBox.setBB(AxisAlignedBB.getBoundingBox(
//#endif
Entity_getX(this) - width / 2, Entity_getY(this), Entity_getZ(this) - width / 2,
Entity_getX(this) + width / 2, Entity_getY(this) + height, Entity_getZ(this) + width / 2));
this.getX() - width / 2, this.getY(), this.getZ() - width / 2,
this.getX() + width / 2, this.getY() + height, this.getZ() + width / 2));
}
@Override
public void tick() {
//#if MC>=10800
Entity view = getRenderViewEntity(this.client);
Entity view =
//#else
//$$ EntityLivingBase view = getRenderViewEntity(this.mc);
//$$ EntityLivingBase view =
//#endif
this.client.getCameraEntity();
if (view != null) {
// Make sure we're always spectating the right entity
// This is important if the spectated player respawns as their
@@ -284,9 +284,9 @@ public class CameraEntity
}
view = this.world.getPlayerByUuid(spectating);
if (view != null) {
setRenderViewEntity(this.client, view);
this.client.setCameraEntity(view);
} else {
setRenderViewEntity(this.client, this);
this.client.setCameraEntity(this);
return;
}
}
@@ -309,7 +309,7 @@ public class CameraEntity
@Override
public void setRotation(float yaw, float pitch) {
if (getRenderViewEntity(this.client) == this) {
if (this.client.getCameraEntity() == this) {
// Only update camera rotation when the camera is the view
super.setRotation(yaw, pitch);
}
@@ -357,7 +357,7 @@ public class CameraEntity
}
private boolean falseUnlessSpectating(Function<Entity, Boolean> property) {
Entity view = getRenderViewEntity(this.client);
Entity view = this.client.getCameraEntity();
if (view != null && view != this) {
return property.apply(view);
}
@@ -407,7 +407,7 @@ public class CameraEntity
//#if MC>=10800
@Override
public float getSpeed() {
Entity view = getRenderViewEntity(this.client);
Entity view = this.client.getCameraEntity();
if (view != this && view instanceof AbstractClientPlayerEntity) {
return ((AbstractClientPlayerEntity) view).getSpeed();
}
@@ -422,7 +422,7 @@ public class CameraEntity
@Override
public boolean isInvisible() {
Entity view = getRenderViewEntity(this.client);
Entity view = this.client.getCameraEntity();
if (view != this) {
return view.isInvisible();
}
@@ -431,7 +431,7 @@ public class CameraEntity
@Override
public Identifier getSkinTexture() {
Entity view = getRenderViewEntity(this.client);
Entity view = this.client.getCameraEntity();
if (view != this && view instanceof PlayerEntity) {
return Utils.getResourceLocationForPlayerUUID(view.getUuid());
}
@@ -450,7 +450,7 @@ public class CameraEntity
@Override
public boolean isPartVisible(PlayerModelPart modelPart) {
Entity view = getRenderViewEntity(this.client);
Entity view = this.client.getCameraEntity();
if (view != this && view instanceof PlayerEntity) {
return ((PlayerEntity) view).isPartVisible(modelPart);
}
@@ -460,7 +460,7 @@ public class CameraEntity
@Override
public float getHandSwingProgress(float renderPartialTicks) {
Entity view = getRenderViewEntity(this.client);
Entity view = this.client.getCameraEntity();
if (view != this && view instanceof PlayerEntity) {
return ((PlayerEntity) view).getHandSwingProgress(renderPartialTicks);
}
@@ -705,7 +705,7 @@ public class CameraEntity
{ on(PreRenderHandCallback.EVENT, this::onRenderHand); }
private boolean onRenderHand() {
// Unless we are spectating another player, don't render our hand
Entity view = getRenderViewEntity(mc);
Entity view = mc.getCameraEntity();
if (view == CameraEntity.this || !(view instanceof PlayerEntity)) {
return true; // cancel hand rendering
} else {
@@ -761,7 +761,7 @@ public class CameraEntity
//#else
//$$ @SubscribeEvent
//$$ public void preRenderGameOverlay(RenderGameOverlayEvent.Pre event) {
//$$ switch (MCVer.getType(event)) {
//$$ switch (event.getType()) {
//$$ case ALL:
//$$ heldItemTooltipsWasTrue = mc.gameSettings.heldItemTooltips;
//$$ mc.gameSettings.heldItemTooltips = false;
@@ -797,7 +797,7 @@ public class CameraEntity
//$$
//$$ @SubscribeEvent
//$$ public void postRenderGameOverlay(RenderGameOverlayEvent.Post event) {
//$$ if (MCVer.getType(event) != RenderGameOverlayEvent.ElementType.ALL) return;
//$$ if (event.getType() != RenderGameOverlayEvent.ElementType.ALL) return;
//$$ mc.gameSettings.heldItemTooltips = heldItemTooltipsWasTrue;
//$$ }
//#endif

6
src/main/java/com/replaymod/replay/camera/ClassicCameraController.java
View File

@@ -1,9 +1,11 @@
package com.replaymod.replay.camera;
import de.johni0702.minecraft.gui.utils.lwjgl.vector.Vector3f;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.options.KeyBinding;
import static com.replaymod.core.versions.MCVer.*;
import static net.minecraft.util.math.MathHelper.cos;
import static net.minecraft.util.math.MathHelper.sin;
// TODO: Marius is responsible for this. Please, someone clean it up.
public class ClassicCameraController implements CameraController {
@@ -32,7 +34,7 @@ public class ClassicCameraController implements CameraController {
public void update(float partialTicksPassed) {
boolean forward = false, backward = false, left = false, right = false, up = false, down = false;
speedup = false;
for(KeyBinding kb : getMinecraft().options.keysAll) {
for(KeyBinding kb : MinecraftClient.getInstance().options.keysAll) {
if(!kb.isPressed()) continue;
if(kb.getTranslationKey().equals("key.forward")) {
forward = true;

4
src/main/java/com/replaymod/replay/camera/SpectatorCameraController.java
View File

@@ -52,9 +52,9 @@ public class SpectatorCameraController implements CameraController {
// Always make sure the camera is in the exact same spot as the spectated entity
// This is necessary as some rendering code for the hand doesn't respect the view entity
// and always uses mc.thePlayer
Entity view = getRenderViewEntity(mc);
Entity view = mc.getCameraEntity();
if (view != null && view != camera) {
camera.setCameraPosRot(getRenderViewEntity(mc));
camera.setCameraPosRot(mc.getCameraEntity());
// If it's a player, also 'steal' its inventory so the rendering code knows what item to render
if (view instanceof PlayerEntity) {
PlayerEntity viewPlayer = (PlayerEntity) view;

18
src/main/java/com/replaymod/replay/handler/GuiHandler.java
View File

@@ -113,8 +113,8 @@ public class GuiHandler extends EventRegistrations {
BUTTON_EXIT_REPLAY,
b.x,
b.y,
width(b),
height(b),
b.getWidth(),
b.getHeight(),
"replaymod.gui.exit",
this::onButton
));
@@ -133,9 +133,9 @@ public class GuiHandler extends EventRegistrations {
//#if MC>=11400
} else if (id.equals(BUTTON_OPTIONS)) {
//#if MC>=11400
width(b, 204);
b.setWidth(204);
//#else
//$$ width(b, 200);
//$$ b.width = 200
//#endif
//#endif
}
@@ -147,7 +147,7 @@ public class GuiHandler extends EventRegistrations {
}
if (achievements != null && stats != null) {
moveAllButtonsInRect(buttonList,
achievements.x, stats.x + width(stats),
achievements.x, stats.x + stats.getWidth(),
achievements.y, Integer.MAX_VALUE,
-24);
}
@@ -185,8 +185,8 @@ public class GuiHandler extends EventRegistrations {
int moveBy
) {
buttons.stream()
.filter(button -> button.x <= xEnd && button.x + width(button) >= xStart)
.filter(button -> button.y <= yEnd && button.y + height(button) >= yStart)
.filter(button -> button.x <= xEnd && button.x + button.getWidth() >= xStart)
.filter(button -> button.y <= yEnd && button.y + button.getHeight() >= yStart)
.forEach(button -> button.y += moveBy);
}
@@ -261,8 +261,8 @@ public class GuiHandler extends EventRegistrations {
//#else
//$$ @SubscribeEvent
//$$ public void onButton(GuiScreenEvent.ActionPerformedEvent.Pre event) {
//$$ GuiScreen guiScreen = getGui(event);
//$$ GuiButton button = getButton(event);
//$$ GuiScreen guiScreen = event.getGui();
//$$ GuiButton button = event.getButton();
//#endif
if(!button.active) return;