Skip to content

Commit

Permalink
♻️ Restructure package
Browse files Browse the repository at this point in the history
  • Loading branch information
@unhappychoice
unhappychoice committed Apr 27, 2021
1 parent 4ad3cfe commit 89057d3
Show file tree
Hide file tree
Showing 323 changed files with 1,370 additions and 1,530 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/compat/optifine/DisableFastRender.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.replaymod.compat.optifine;

import de.johni0702.minecraft.gui.utils.EventRegistrations;
import com.replaymod.gui.utils.EventRegistrations;
import com.replaymod.core.versions.MCVer;
import com.replaymod.render.events.ReplayRenderCallback;
import net.minecraft.client.MinecraftClient;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/compat/shaders/ShaderBeginRender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import com.replaymod.core.events.PreRenderCallback;
import com.replaymod.render.hooks.EntityRendererHandler;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import com.replaymod.gui.utils.EventRegistrations;
import net.minecraft.client.MinecraftClient;

import java.lang.reflect.InvocationTargetException;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/replaymod/core/KeyBindingRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import com.replaymod.core.events.PreRenderCallback;
import com.replaymod.core.mixin.KeyBindingAccessor;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import com.replaymod.mixin.KeyBindingAccessor;
import com.replaymod.gui.utils.EventRegistrations;
import com.replaymod.core.events.KeyBindingEventCallback;
import com.replaymod.core.events.KeyEventCallback;
import net.minecraft.client.options.KeyBinding;
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/com/replaymod/core/MinecraftMethodAccessor.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.replaymod.core;

public interface MinecraftMethodAccessor {
//#if MC>=11400
void replayModProcessKeyBinds();
//#else
//#if MC>=10904
//$$ void replayModRunTickMouse();
//$$ void replayModRunTickKeyboard();
//#else
//$$ void replayModSetEarlyReturnFromRunTick(boolean earlyReturn);
//#endif
//#endif
//#if MC>=11400
void replayModExecuteTaskQueue();
//#endif
}
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/ReplayMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.replaymod.replaystudio.us.myles.ViaVersion.api.protocol.ProtocolVersion;
import com.replaymod.replaystudio.util.I18n;
import com.replaymod.simplepathing.ReplayModSimplePathing;
import de.johni0702.minecraft.gui.container.GuiScreen;
import com.replaymod.gui.container.GuiScreen;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.options.Option;
import net.minecraft.resource.DirectoryResourcePack;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/events/KeyBindingEventCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.replaymod.core.events;

import de.johni0702.minecraft.gui.utils.Event;
import com.replaymod.gui.utils.Event;

public interface KeyBindingEventCallback {
Event<KeyBindingEventCallback> EVENT = Event.create((listeners) ->
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/events/KeyEventCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.replaymod.core.events;

import de.johni0702.minecraft.gui.utils.Event;
import com.replaymod.gui.utils.Event;

public interface KeyEventCallback {
Event<KeyEventCallback> EVENT = Event.create((listeners) ->
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/events/PostRenderCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.replaymod.core.events;

import de.johni0702.minecraft.gui.utils.Event;
import com.replaymod.gui.utils.Event;

public interface PostRenderCallback {
Event<PostRenderCallback> EVENT = Event.create((listeners) ->
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.replaymod.core.events;

import de.johni0702.minecraft.gui.utils.Event;
import com.replaymod.gui.utils.Event;
import net.minecraft.client.util.math.MatrixStack;

public interface PostRenderWorldCallback {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/events/PreRenderCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.replaymod.core.events;

import de.johni0702.minecraft.gui.utils.Event;
import com.replaymod.gui.utils.Event;

public interface PreRenderCallback {
Event<PreRenderCallback> EVENT = Event.create((listeners) ->
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/events/PreRenderHandCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.replaymod.core.events;

import de.johni0702.minecraft.gui.utils.Event;
import com.replaymod.gui.utils.Event;

public interface PreRenderHandCallback {
Event<PreRenderHandCallback> EVENT = Event.create((listeners) ->
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/events/SettingsChangedCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.replaymod.core.events;

import com.replaymod.core.SettingsRegistry;
import de.johni0702.minecraft.gui.utils.Event;
import com.replaymod.gui.utils.Event;

public interface SettingsChangedCallback {
Event<SettingsChangedCallback> EVENT = Event.create((listeners) ->
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/com/replaymod/core/gui/GuiBackgroundProcesses.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.replaymod.core.gui;

import de.johni0702.minecraft.gui.GuiRenderer;
import de.johni0702.minecraft.gui.RenderInfo;
import de.johni0702.minecraft.gui.container.AbstractGuiContainer;
import de.johni0702.minecraft.gui.container.GuiPanel;
import de.johni0702.minecraft.gui.container.GuiScreen;
import de.johni0702.minecraft.gui.container.VanillaGuiScreen;
import de.johni0702.minecraft.gui.element.GuiElement;
import de.johni0702.minecraft.gui.layout.CustomLayout;
import de.johni0702.minecraft.gui.layout.VerticalLayout;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import com.replaymod.gui.GuiRenderer;
import com.replaymod.gui.RenderInfo;
import com.replaymod.gui.container.AbstractGuiContainer;
import com.replaymod.gui.container.GuiPanel;
import com.replaymod.gui.container.GuiScreen;
import com.replaymod.gui.container.VanillaGuiScreen;
import com.replaymod.gui.element.GuiElement;
import com.replaymod.gui.layout.CustomLayout;
import com.replaymod.gui.layout.VerticalLayout;
import com.replaymod.gui.utils.EventRegistrations;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback;
import com.replaymod.gui.versions.callbacks.InitScreenCallback;

import static com.replaymod.core.versions.MCVer.getMinecraft;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/replaymod/core/gui/GuiReplayButton.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.replaymod.core.gui;

import com.replaymod.core.ReplayMod;
import de.johni0702.minecraft.gui.GuiRenderer;
import de.johni0702.minecraft.gui.RenderInfo;
import de.johni0702.minecraft.gui.element.GuiButton;
import com.replaymod.gui.GuiRenderer;
import com.replaymod.gui.RenderInfo;
import com.replaymod.gui.element.GuiButton;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;

public class GuiReplayButton extends GuiButton {
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/com/replaymod/core/gui/GuiReplaySettings.java
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.replaymod.core.gui;

import com.replaymod.core.SettingsRegistry;
import de.johni0702.minecraft.gui.container.AbstractGuiScreen;
import de.johni0702.minecraft.gui.container.GuiPanel;
import de.johni0702.minecraft.gui.element.GuiButton;
import de.johni0702.minecraft.gui.element.GuiElement;
import de.johni0702.minecraft.gui.element.GuiLabel;
import de.johni0702.minecraft.gui.element.GuiToggleButton;
import de.johni0702.minecraft.gui.element.advanced.GuiDropdownMenu;
import de.johni0702.minecraft.gui.layout.CustomLayout;
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.layout.VerticalLayout;
import de.johni0702.minecraft.gui.utils.Consumer;
import com.replaymod.gui.container.AbstractGuiScreen;
import com.replaymod.gui.container.GuiPanel;
import com.replaymod.gui.element.GuiButton;
import com.replaymod.gui.element.GuiElement;
import com.replaymod.gui.element.GuiLabel;
import com.replaymod.gui.element.GuiToggleButton;
import com.replaymod.gui.element.advanced.GuiDropdownMenu;
import com.replaymod.gui.layout.CustomLayout;
import com.replaymod.gui.layout.HorizontalLayout;
import com.replaymod.gui.layout.VerticalLayout;
import com.replaymod.gui.utils.Consumer;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import net.minecraft.client.resource.language.I18n;
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/com/replaymod/core/gui/RestoreReplayGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
import com.replaymod.replaystudio.io.ReplayOutputStream;
import com.replaymod.replaystudio.replay.ReplayFile;
import com.replaymod.replaystudio.replay.ReplayMetaData;
import de.johni0702.minecraft.gui.container.AbstractGuiScreen;
import de.johni0702.minecraft.gui.container.GuiPanel;
import de.johni0702.minecraft.gui.container.GuiScreen;
import de.johni0702.minecraft.gui.container.VanillaGuiScreen;
import de.johni0702.minecraft.gui.element.GuiButton;
import de.johni0702.minecraft.gui.element.GuiLabel;
import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar;
import de.johni0702.minecraft.gui.layout.CustomLayout;
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.layout.VerticalLayout;
import de.johni0702.minecraft.gui.utils.Colors;
import com.replaymod.gui.container.AbstractGuiScreen;
import com.replaymod.gui.container.GuiPanel;
import com.replaymod.gui.container.GuiScreen;
import com.replaymod.gui.container.VanillaGuiScreen;
import com.replaymod.gui.element.GuiButton;
import com.replaymod.gui.element.GuiLabel;
import com.replaymod.gui.element.advanced.GuiProgressBar;
import com.replaymod.gui.layout.CustomLayout;
import com.replaymod.gui.layout.HorizontalLayout;
import com.replaymod.gui.layout.VerticalLayout;
import com.replaymod.gui.utils.Colors;
import net.minecraft.util.crash.CrashReport;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
Expand Down
31 changes: 15 additions & 16 deletions src/main/java/com/replaymod/core/utils/Utils.java
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
package com.replaymod.core.utils;

import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.net.PercentEscaper;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.replaymod.core.ReplayMod;
import com.replaymod.replaystudio.us.myles.ViaVersion.api.protocol.ProtocolVersion;
import de.johni0702.minecraft.gui.GuiRenderer;
import de.johni0702.minecraft.gui.RenderInfo;
import de.johni0702.minecraft.gui.container.AbstractGuiScrollable;
import de.johni0702.minecraft.gui.container.GuiContainer;
import de.johni0702.minecraft.gui.container.GuiPanel;
import de.johni0702.minecraft.gui.container.GuiScrollable;
import de.johni0702.minecraft.gui.element.GuiButton;
import de.johni0702.minecraft.gui.element.GuiElement;
import de.johni0702.minecraft.gui.element.GuiLabel;
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.layout.VerticalLayout;
import de.johni0702.minecraft.gui.popup.GuiInfoPopup;
import de.johni0702.minecraft.gui.utils.Colors;
import com.replaymod.gui.GuiRenderer;
import com.replaymod.gui.RenderInfo;
import com.replaymod.gui.container.AbstractGuiScrollable;
import com.replaymod.gui.container.GuiContainer;
import com.replaymod.gui.container.GuiPanel;
import com.replaymod.gui.container.GuiScrollable;
import com.replaymod.gui.element.GuiButton;
import com.replaymod.gui.element.GuiElement;
import com.replaymod.gui.element.GuiLabel;
import com.replaymod.gui.layout.HorizontalLayout;
import com.replaymod.gui.layout.VerticalLayout;
import com.replaymod.gui.popup.GuiInfoPopup;
import com.replaymod.gui.utils.Colors;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import de.johni0702.minecraft.gui.versions.Image;
import de.johni0702.minecraft.gui.versions.MCVer;
import com.replaymod.gui.versions.Image;
import com.replaymod.gui.versions.MCVer;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.util.crash.CrashReport;
import net.minecraft.util.Identifier;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/utils/WrappedTimer.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.replaymod.core.utils;

import com.replaymod.core.mixin.TimerAccessor;
import com.replaymod.mixin.TimerAccessor;
import net.minecraft.client.render.RenderTickCounter;

public class WrappedTimer extends RenderTickCounter {
Expand Down
23 changes: 4 additions & 19 deletions src/main/java/com/replaymod/core/versions/MCVer.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.replaymod.core.versions;

import com.replaymod.core.mixin.GuiScreenAccessor;
import com.replaymod.mixin.GuiScreenAccessor;
import com.replaymod.core.MinecraftMethodAccessor;
import com.replaymod.replaystudio.protocol.PacketTypeRegistry;
import com.replaymod.replaystudio.us.myles.ViaVersion.api.protocol.ProtocolVersion;
import com.replaymod.replaystudio.us.myles.ViaVersion.packets.State;
Expand All @@ -13,7 +14,7 @@
//#endif

//#if MC>=11400
import com.replaymod.render.mixin.MainWindowAccessor;
import com.replaymod.mixin.MainWindowAccessor;
import net.minecraft.SharedConstants;
import net.minecraft.client.gl.Framebuffer;
import net.minecraft.client.gui.widget.ButtonWidget;
Expand Down Expand Up @@ -47,7 +48,7 @@
//#endif

//#if MC>=10904
import com.replaymod.render.blend.mixin.ParticleAccessor;
import com.replaymod.mixin.ParticleAccessor;
import net.minecraft.client.particle.Particle;
import net.minecraft.util.math.Vec3d;
//#endif
Expand Down Expand Up @@ -249,22 +250,6 @@ public static void processKeyBinds() {
}
//#endif

public interface MinecraftMethodAccessor {
//#if MC>=11400
void replayModProcessKeyBinds();
//#else
//#if MC>=10904
//$$ void replayModRunTickMouse();
//$$ void replayModRunTickKeyboard();
//#else
//$$ void replayModSetEarlyReturnFromRunTick(boolean earlyReturn);
//#endif
//#endif
//#if MC>=11400
void replayModExecuteTaskQueue();
//#endif
}

//#if MC>=10800 && MC<11500
//$$ public interface ChunkRenderWorkerAccessor {
//$$ void doRunTask(ChunkRenderTask task) throws InterruptedException;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/replaymod/core/versions/scheduler/SchedulerImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.replaymod.core.versions.scheduler;

import com.replaymod.core.mixin.MinecraftAccessor;
import com.replaymod.mixin.MinecraftAccessor;
import net.minecraft.client.MinecraftClient;
import net.minecraft.util.crash.CrashException;
import net.minecraft.util.thread.ReentrantThreadExecutor;
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/com/replaymod/editor/gui/GuiEditReplay.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
import com.replaymod.replay.gui.overlay.GuiMarkerTimeline;
import com.replaymod.replaystudio.data.Marker;
import com.replaymod.replaystudio.replay.ReplayFile;
import de.johni0702.minecraft.gui.GuiRenderer;
import de.johni0702.minecraft.gui.container.GuiContainer;
import de.johni0702.minecraft.gui.container.GuiPanel;
import de.johni0702.minecraft.gui.element.GuiButton;
import de.johni0702.minecraft.gui.element.GuiHorizontalScrollbar;
import de.johni0702.minecraft.gui.element.GuiTooltip;
import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar;
import de.johni0702.minecraft.gui.element.advanced.GuiTimelineTime;
import de.johni0702.minecraft.gui.layout.CustomLayout;
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.layout.VerticalLayout;
import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
import com.replaymod.gui.GuiRenderer;
import com.replaymod.gui.container.GuiContainer;
import com.replaymod.gui.container.GuiPanel;
import com.replaymod.gui.element.GuiButton;
import com.replaymod.gui.element.GuiHorizontalScrollbar;
import com.replaymod.gui.element.GuiTooltip;
import com.replaymod.gui.element.advanced.GuiProgressBar;
import com.replaymod.gui.element.advanced.GuiTimelineTime;
import com.replaymod.gui.layout.CustomLayout;
import com.replaymod.gui.layout.HorizontalLayout;
import com.replaymod.gui.layout.VerticalLayout;
import com.replaymod.gui.popup.AbstractGuiPopup;
import de.johni0702.minecraft.gui.utils.lwjgl.Color;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import net.minecraft.util.crash.CrashReport;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/replaymod/editor/handler/GuiHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import com.replaymod.editor.ReplayModEditor;
import com.replaymod.editor.gui.GuiEditReplay;
import com.replaymod.replay.gui.screen.GuiReplayViewer;
import de.johni0702.minecraft.gui.container.AbstractGuiScreen;
import de.johni0702.minecraft.gui.container.GuiScreen;
import de.johni0702.minecraft.gui.element.GuiButton;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback;
import com.replaymod.gui.container.AbstractGuiScreen;
import com.replaymod.gui.container.GuiScreen;
import com.replaymod.gui.element.GuiButton;
import com.replaymod.gui.utils.EventRegistrations;
import com.replaymod.gui.versions.callbacks.InitScreenCallback;
import net.minecraft.util.crash.CrashReport;

import java.io.IOException;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/replaymod/extras/FullBrightness.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import com.replaymod.replay.ReplayModReplay;
import com.replaymod.replay.events.ReplayOpenedCallback;
import com.replaymod.replay.gui.overlay.GuiReplayOverlay;
import de.johni0702.minecraft.gui.element.GuiImage;
import de.johni0702.minecraft.gui.element.IGuiImage;
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import com.replaymod.gui.element.GuiImage;
import com.replaymod.gui.element.IGuiImage;
import com.replaymod.gui.layout.HorizontalLayout;
import com.replaymod.gui.utils.EventRegistrations;
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects;
Expand Down
Loading

0 comments on commit 89057d3

Please sign in to comment.