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

Drop lombok, it has been causing too much confusion

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/replaymod/core/ReplayMod.java
View File

@@ -19,7 +19,6 @@ import com.replaymod.replaystudio.util.I18n;
import com.replaymod.replaystudio.viaversion.ViaVersionPacketConverter;
import com.replaymod.simplepathing.ReplayModSimplePathing;
import de.johni0702.minecraft.gui.container.GuiScreen;
import lombok.Getter;
import net.minecraft.client.MinecraftClient;
import net.minecraft.util.Identifier;
import net.minecraft.resource.DirectoryResourcePack;
@@ -123,16 +122,17 @@ public class ReplayMod implements
Module
{
@Getter(lazy = true)
//#if MC>=11400
private static final String minecraftVersion = MinecraftClient.getInstance().getGame().getVersion().getName();
//#else
//#if MC>=11400
//$$ private static final String minecraftVersion = MCPVersion.getMCVersion();
//#else
//$$ private static final String minecraftVersion = Loader.MC_VERSION;
//#endif
//#endif
public static String getMinecraftVersion() {
//#if MC>=11400
return MinecraftClient.getInstance().getGame().getVersion().getName();
//#else
//#if MC>=11400
//$$ return MCPVersion.getMCVersion();
//#else
//$$ return Loader.MC_VERSION;
//#endif
//#endif
}
public static final String MOD_ID = "replaymod";

7
src/main/java/com/replaymod/core/gui/GuiReplaySettings.java
View File

@@ -14,7 +14,6 @@ import de.johni0702.minecraft.gui.layout.VerticalLayout;
import de.johni0702.minecraft.gui.utils.Consumer;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import lombok.RequiredArgsConstructor;
import net.minecraft.client.resource.language.I18n;
import java.util.List;
@@ -115,11 +114,15 @@ public class GuiReplaySettings extends AbstractGuiScreen<GuiReplaySettings> {
return this;
}
@RequiredArgsConstructor
private static class MultipleChoiceDropdownEntry {
private final Object value;
private final String text;
public MultipleChoiceDropdownEntry(Object value, String text) {
this.value = value;
this.text = text;
}
@Override
public String toString() {
return text;