Drop lombok, it has been causing too much confusion

Basically the result of the Delombok function, except we use IntelliJ's equals,
hashCode and toString and don't re-organize imports (cause that breaks the
preprocessor) and a bunch of manual cleanup was necessary (and half the classes
weren't even converted).
This commit is contained in:
Jonas Herzig
2020-08-28 13:18:23 +02:00
parent 23e51d7099
commit 16c759f1dd
32 changed files with 400 additions and 103 deletions

View File

@@ -7,7 +7,6 @@ import com.replaymod.render.capturer.RenderInfo;
import com.replaymod.render.rendering.Pipelines;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import lombok.RequiredArgsConstructor;
import net.minecraft.client.MinecraftClient;
import net.minecraft.util.crash.CrashReport;
@@ -22,7 +21,6 @@ import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
import static com.replaymod.core.versions.MCVer.getRenderPartialTicks;
@RequiredArgsConstructor
public class ScreenshotRenderer implements RenderInfo {
private final MinecraftClient mc = MCVer.getMinecraft();
@@ -31,6 +29,10 @@ public class ScreenshotRenderer implements RenderInfo {
private int framesDone;
public ScreenshotRenderer(RenderSettings settings) {
this.settings = settings;
}
public boolean renderScreenshot() throws Throwable {
try {
//#if MC>=11400

View File

@@ -22,7 +22,6 @@ import de.johni0702.minecraft.gui.popup.GuiFileChooserPopup;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import de.johni0702.minecraft.gui.versions.Image;
import joptsimple.internal.Strings;
import lombok.RequiredArgsConstructor;
import net.minecraft.client.resource.language.I18n;
import org.apache.commons.io.IOUtils;
@@ -46,7 +45,6 @@ import java.security.GeneralSecurityException;
import static com.replaymod.extras.ReplayModExtras.LOGGER;
import static java.util.Arrays.asList;
@RequiredArgsConstructor
public class GuiYoutubeUpload extends GuiScreen {
private final GuiScreen previousScreen;
private final File videoFile;
@@ -185,6 +183,13 @@ public class GuiYoutubeUpload extends GuiScreen {
inputValidation.run();
}
public GuiYoutubeUpload(GuiScreen previousScreen, File videoFile, int videoFrames, RenderSettings settings) {
this.previousScreen = previousScreen;
this.videoFile = videoFile;
this.videoFrames = videoFrames;
this.settings = settings;
}
private void setState(boolean uploading) {
forEach(GuiElement.class).setEnabled(!uploading);
uploadButton.setEnabled();

View File

@@ -26,8 +26,7 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import com.replaymod.render.RenderSettings;
import com.replaymod.render.metadata.MetadataInjector;
import lombok.Getter;
import lombok.NonNull;
import de.johni0702.minecraft.gui.utils.NonNull;
import net.minecraft.client.MinecraftClient;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.io.FileUtils;
@@ -60,10 +59,8 @@ public class YoutubeUploader {
@NonNull
private Supplier<Double> progress = Suppliers.ofInstance(0d);
@Getter
private State state;
@Getter
private volatile boolean cancelled;
public YoutubeUploader(MinecraftClient minecraft, File videoFile, int videoFrames,
@@ -252,6 +249,14 @@ public class YoutubeUploader {
return progress.get();
}
public State getState() {
return this.state;
}
public boolean isCancelled() {
return this.cancelled;
}
public enum State {
AUTH, PREPARE_VIDEO, UPLOAD, CLEANUP
}