diff --git a/src/main/java/com/replaymod/compat/optifine/DisableFastRender.java b/src/main/java/com/replaymod/compat/optifine/DisableFastRender.java index 137fb7605..fe25d172d 100644 --- a/src/main/java/com/replaymod/compat/optifine/DisableFastRender.java +++ b/src/main/java/com/replaymod/compat/optifine/DisableFastRender.java @@ -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; diff --git a/src/main/java/com/replaymod/compat/shaders/ShaderBeginRender.java b/src/main/java/com/replaymod/compat/shaders/ShaderBeginRender.java index 8a782e8bd..1ee0d502d 100644 --- a/src/main/java/com/replaymod/compat/shaders/ShaderBeginRender.java +++ b/src/main/java/com/replaymod/compat/shaders/ShaderBeginRender.java @@ -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; diff --git a/src/main/java/com/replaymod/core/KeyBindingRegistry.java b/src/main/java/com/replaymod/core/KeyBindingRegistry.java index 6223717cf..fc2ee64c2 100644 --- a/src/main/java/com/replaymod/core/KeyBindingRegistry.java +++ b/src/main/java/com/replaymod/core/KeyBindingRegistry.java @@ -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; diff --git a/src/main/java/com/replaymod/core/MinecraftMethodAccessor.java b/src/main/java/com/replaymod/core/MinecraftMethodAccessor.java new file mode 100644 index 000000000..ef70e2a3f --- /dev/null +++ b/src/main/java/com/replaymod/core/MinecraftMethodAccessor.java @@ -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 +} diff --git a/src/main/java/com/replaymod/core/ReplayMod.java b/src/main/java/com/replaymod/core/ReplayMod.java index 99a787009..49f59b70c 100644 --- a/src/main/java/com/replaymod/core/ReplayMod.java +++ b/src/main/java/com/replaymod/core/ReplayMod.java @@ -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; diff --git a/src/main/java/com/replaymod/core/events/KeyBindingEventCallback.java b/src/main/java/com/replaymod/core/events/KeyBindingEventCallback.java index c9784d023..2f5eb4bae 100644 --- a/src/main/java/com/replaymod/core/events/KeyBindingEventCallback.java +++ b/src/main/java/com/replaymod/core/events/KeyBindingEventCallback.java @@ -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 EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/core/events/KeyEventCallback.java b/src/main/java/com/replaymod/core/events/KeyEventCallback.java index 894f822ab..f7fa6e0d4 100644 --- a/src/main/java/com/replaymod/core/events/KeyEventCallback.java +++ b/src/main/java/com/replaymod/core/events/KeyEventCallback.java @@ -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 EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/core/events/PostRenderCallback.java b/src/main/java/com/replaymod/core/events/PostRenderCallback.java index a72f0d6c0..8c6defcea 100644 --- a/src/main/java/com/replaymod/core/events/PostRenderCallback.java +++ b/src/main/java/com/replaymod/core/events/PostRenderCallback.java @@ -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 EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java b/src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java index 1445ae433..00e73388c 100644 --- a/src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java +++ b/src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java @@ -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 { diff --git a/src/main/java/com/replaymod/core/events/PreRenderCallback.java b/src/main/java/com/replaymod/core/events/PreRenderCallback.java index 907ed0cbf..77822dce1 100644 --- a/src/main/java/com/replaymod/core/events/PreRenderCallback.java +++ b/src/main/java/com/replaymod/core/events/PreRenderCallback.java @@ -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 EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/core/events/PreRenderHandCallback.java b/src/main/java/com/replaymod/core/events/PreRenderHandCallback.java index ea231cf62..41b91b5b7 100644 --- a/src/main/java/com/replaymod/core/events/PreRenderHandCallback.java +++ b/src/main/java/com/replaymod/core/events/PreRenderHandCallback.java @@ -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 EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/core/events/SettingsChangedCallback.java b/src/main/java/com/replaymod/core/events/SettingsChangedCallback.java index 2fc680a8b..5d8d9b4a8 100644 --- a/src/main/java/com/replaymod/core/events/SettingsChangedCallback.java +++ b/src/main/java/com/replaymod/core/events/SettingsChangedCallback.java @@ -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 EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/core/gui/GuiBackgroundProcesses.java b/src/main/java/com/replaymod/core/gui/GuiBackgroundProcesses.java index 27f6834d3..3307e7f94 100644 --- a/src/main/java/com/replaymod/core/gui/GuiBackgroundProcesses.java +++ b/src/main/java/com/replaymod/core/gui/GuiBackgroundProcesses.java @@ -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; diff --git a/src/main/java/com/replaymod/core/gui/GuiReplayButton.java b/src/main/java/com/replaymod/core/gui/GuiReplayButton.java index 9bd3476f1..6dcb85c5b 100644 --- a/src/main/java/com/replaymod/core/gui/GuiReplayButton.java +++ b/src/main/java/com/replaymod/core/gui/GuiReplayButton.java @@ -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 { diff --git a/src/main/java/com/replaymod/core/gui/GuiReplaySettings.java b/src/main/java/com/replaymod/core/gui/GuiReplaySettings.java index b13590dbc..999c7b02e 100644 --- a/src/main/java/com/replaymod/core/gui/GuiReplaySettings.java +++ b/src/main/java/com/replaymod/core/gui/GuiReplaySettings.java @@ -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; diff --git a/src/main/java/com/replaymod/core/gui/RestoreReplayGui.java b/src/main/java/com/replaymod/core/gui/RestoreReplayGui.java index 4d9ba137b..d217a5432 100644 --- a/src/main/java/com/replaymod/core/gui/RestoreReplayGui.java +++ b/src/main/java/com/replaymod/core/gui/RestoreReplayGui.java @@ -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; diff --git a/src/main/java/com/replaymod/core/utils/Utils.java b/src/main/java/com/replaymod/core/utils/Utils.java index 0d4a8c935..4b8f6d874 100644 --- a/src/main/java/com/replaymod/core/utils/Utils.java +++ b/src/main/java/com/replaymod/core/utils/Utils.java @@ -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; diff --git a/src/main/java/com/replaymod/core/utils/WrappedTimer.java b/src/main/java/com/replaymod/core/utils/WrappedTimer.java index 2db83188c..05452c1c9 100644 --- a/src/main/java/com/replaymod/core/utils/WrappedTimer.java +++ b/src/main/java/com/replaymod/core/utils/WrappedTimer.java @@ -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 { diff --git a/src/main/java/com/replaymod/core/versions/MCVer.java b/src/main/java/com/replaymod/core/versions/MCVer.java index d5282f4bb..6b5cbeff5 100644 --- a/src/main/java/com/replaymod/core/versions/MCVer.java +++ b/src/main/java/com/replaymod/core/versions/MCVer.java @@ -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; @@ -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; @@ -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 @@ -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; diff --git a/src/main/java/com/replaymod/core/versions/scheduler/SchedulerImpl.java b/src/main/java/com/replaymod/core/versions/scheduler/SchedulerImpl.java index 2da1760a4..98945492a 100644 --- a/src/main/java/com/replaymod/core/versions/scheduler/SchedulerImpl.java +++ b/src/main/java/com/replaymod/core/versions/scheduler/SchedulerImpl.java @@ -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; diff --git a/src/main/java/com/replaymod/editor/gui/GuiEditReplay.java b/src/main/java/com/replaymod/editor/gui/GuiEditReplay.java index 1ee869959..a1df93a66 100644 --- a/src/main/java/com/replaymod/editor/gui/GuiEditReplay.java +++ b/src/main/java/com/replaymod/editor/gui/GuiEditReplay.java @@ -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; diff --git a/src/main/java/com/replaymod/editor/handler/GuiHandler.java b/src/main/java/com/replaymod/editor/handler/GuiHandler.java index 38628e839..3776ab799 100644 --- a/src/main/java/com/replaymod/editor/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/editor/handler/GuiHandler.java @@ -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; diff --git a/src/main/java/com/replaymod/extras/FullBrightness.java b/src/main/java/com/replaymod/extras/FullBrightness.java index f0a63fc75..b99e5cbfe 100644 --- a/src/main/java/com/replaymod/extras/FullBrightness.java +++ b/src/main/java/com/replaymod/extras/FullBrightness.java @@ -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; diff --git a/src/main/java/com/replaymod/extras/HotkeyButtons.java b/src/main/java/com/replaymod/extras/HotkeyButtons.java index 418292070..4493d1ab7 100644 --- a/src/main/java/com/replaymod/extras/HotkeyButtons.java +++ b/src/main/java/com/replaymod/extras/HotkeyButtons.java @@ -4,17 +4,17 @@ import com.replaymod.core.ReplayMod; import com.replaymod.replay.events.ReplayOpenedCallback; import com.replaymod.replay.gui.overlay.GuiReplayOverlay; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -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.GuiTooltip; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.GridLayout; -import de.johni0702.minecraft.gui.layout.LayoutData; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +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.GuiTooltip; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.GridLayout; +import com.replaymod.gui.layout.LayoutData; +import com.replaymod.gui.utils.EventRegistrations; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; diff --git a/src/main/java/com/replaymod/extras/QuickMode.java b/src/main/java/com/replaymod/extras/QuickMode.java index 454d20be2..10a3f6bb6 100644 --- a/src/main/java/com/replaymod/extras/QuickMode.java +++ b/src/main/java/com/replaymod/extras/QuickMode.java @@ -6,9 +6,9 @@ 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.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.element.GuiImage; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.utils.EventRegistrations; public class QuickMode extends EventRegistrations implements Extra { private ReplayModReplay module; diff --git a/src/main/java/com/replaymod/extras/advancedscreenshots/GuiCreateScreenshot.java b/src/main/java/com/replaymod/extras/advancedscreenshots/GuiCreateScreenshot.java index 62d316cf8..8dae3ef60 100644 --- a/src/main/java/com/replaymod/extras/advancedscreenshots/GuiCreateScreenshot.java +++ b/src/main/java/com/replaymod/extras/advancedscreenshots/GuiCreateScreenshot.java @@ -4,12 +4,12 @@ import com.replaymod.render.RenderSettings; import com.replaymod.render.gui.GuiRenderSettings; import com.replaymod.replay.ReplayModReplay; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.function.Loadable; -import de.johni0702.minecraft.gui.layout.GridLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.function.Loadable; +import com.replaymod.gui.layout.GridLayout; +import com.replaymod.gui.layout.VerticalLayout; import net.minecraft.util.crash.CrashReport; import java.io.File; @@ -116,4 +116,4 @@ public void load(RenderSettings settings) { protected Path getSettingsPath() { return getMinecraft().runDirectory.toPath().resolve("config/replaymod-screenshotsettings.json"); } -} \ No newline at end of file +} diff --git a/src/main/java/com/replaymod/extras/advancedscreenshots/GuiUploadScreenshot.java b/src/main/java/com/replaymod/extras/advancedscreenshots/GuiUploadScreenshot.java index 1e5a1abb0..67938411c 100644 --- a/src/main/java/com/replaymod/extras/advancedscreenshots/GuiUploadScreenshot.java +++ b/src/main/java/com/replaymod/extras/advancedscreenshots/GuiUploadScreenshot.java @@ -5,14 +5,14 @@ import com.replaymod.core.versions.MCVer; import com.replaymod.extras.Setting; import com.replaymod.render.RenderSettings; -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.GuiCheckbox; -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.AbstractGuiPopup; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiCheckbox; +import com.replaymod.gui.element.GuiLabel; +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.ReadableColor; import java.net.URI; diff --git a/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotWriter.java b/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotWriter.java index 70522b228..748c4ab1e 100644 --- a/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotWriter.java +++ b/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotWriter.java @@ -9,7 +9,7 @@ import com.replaymod.render.rendering.FrameConsumer; import com.replaymod.replay.ReplayModReplay; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import de.johni0702.minecraft.gui.versions.Image; +import com.replaymod.gui.versions.Image; import net.minecraft.util.crash.CrashReport; import java.io.File; diff --git a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java index d5ecb0be3..7d8a5b5af 100644 --- a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java +++ b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java @@ -10,7 +10,7 @@ import com.replaymod.replay.camera.CameraEntity; import com.replaymod.replay.events.ReplayClosedCallback; import com.replaymod.replay.events.ReplayOpenedCallback; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.utils.EventRegistrations; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java index 97e0d20f8..5446070b9 100644 --- a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java +++ b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java @@ -2,22 +2,22 @@ import com.replaymod.core.utils.Utils; import com.replaymod.replay.ReplayModReplay; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiClickable; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.container.GuiVerticalList; -import de.johni0702.minecraft.gui.element.GuiCheckbox; -import de.johni0702.minecraft.gui.element.GuiImage; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.element.GuiTooltip; -import de.johni0702.minecraft.gui.element.IGuiCheckbox; -import de.johni0702.minecraft.gui.function.Closeable; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.utils.Colors; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiClickable; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.container.GuiVerticalList; +import com.replaymod.gui.element.GuiCheckbox; +import com.replaymod.gui.element.GuiImage; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.element.GuiTooltip; +import com.replaymod.gui.element.IGuiCheckbox; +import com.replaymod.gui.function.Closeable; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.utils.Colors; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/replaymod/extras/youtube/GuiYoutubeUpload.java b/src/main/java/com/replaymod/extras/youtube/GuiYoutubeUpload.java index 6c1358ef3..52da500be 100644 --- a/src/main/java/com/replaymod/extras/youtube/GuiYoutubeUpload.java +++ b/src/main/java/com/replaymod/extras/youtube/GuiYoutubeUpload.java @@ -7,26 +7,25 @@ import com.google.common.util.concurrent.ListenableFuture; import com.replaymod.core.utils.Utils; import com.replaymod.core.versions.MCVer; +import com.replaymod.gui.element.GuiTextField; import com.replaymod.render.RenderSettings; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.element.*; -import de.johni0702.minecraft.gui.element.advanced.GuiDropdownMenu; -import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar; -import de.johni0702.minecraft.gui.element.advanced.GuiTextArea; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; -import de.johni0702.minecraft.gui.popup.GuiFileChooserPopup; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.element.advanced.GuiDropdownMenu; +import com.replaymod.gui.element.advanced.GuiProgressBar; +import com.replaymod.gui.element.advanced.GuiTextArea; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.popup.GuiFileChooserPopup; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import de.johni0702.minecraft.gui.versions.Image; +import com.replaymod.gui.versions.Image; import joptsimple.internal.Strings; import net.minecraft.client.resource.language.I18n; import org.apache.commons.io.IOUtils; //#if MC>=11400 -import net.minecraft.util.Util; //#else //$$ import org.lwjgl.Sys; //#endif @@ -69,13 +68,13 @@ public void run() { uploadButton.setTooltip(null); } else { uploadButton.setDisabled(); - uploadButton.setTooltip(new GuiTooltip().setI18nText(problem)); + uploadButton.setTooltip(new com.replaymod.gui.element.GuiTooltip().setI18nText(problem)); } } } }; - public final GuiTextField nameField = new GuiTextField().setI18nHint("replaymod.gui.videotitle") + public final com.replaymod.gui.element.GuiTextField nameField = new com.replaymod.gui.element.GuiTextField().setI18nHint("replaymod.gui.videotitle") .onTextChanged(s -> inputValidation.run()); public final GuiTextArea descriptionField = new GuiTextArea().setMaxCharCount(Integer.MAX_VALUE) @@ -84,7 +83,7 @@ public void run() { descriptionField.setText(new String[]{I18n.translate("replaymod.gui.videodescription")}); } - public final GuiTextField tagsField = new GuiTextField().setI18nHint("replaymod.gui.videotags"); + public final com.replaymod.gui.element.GuiTextField tagsField = new GuiTextField().setI18nHint("replaymod.gui.videotags"); { nameField.setNext(descriptionField) @@ -112,7 +111,7 @@ protected void layout(GuiPanel container, int width, int height) { public final GuiDropdownMenu visibilityDropdown = new GuiDropdownMenu() .setSize(200, 20).setValues(VideoVisibility.values()).setSelected(VideoVisibility.PUBLIC); - public final GuiButton thumbnailButton = new GuiButton().onClick(new Runnable() { + public final com.replaymod.gui.element.GuiButton thumbnailButton = new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { @Override public void run() { GuiFileChooserPopup.openLoadGui( @@ -139,11 +138,11 @@ public void run() { } }).setSize(200, 20).setI18nLabel("replaymod.gui.videothumbnail"); - public final GuiImage thumbnail = new GuiImage().setSize(200, 112).setTexture(Utils.DEFAULT_THUMBNAIL); + public final com.replaymod.gui.element.GuiImage thumbnail = new com.replaymod.gui.element.GuiImage().setSize(200, 112).setTexture(Utils.DEFAULT_THUMBNAIL); - public final GuiButton uploadButton = new GuiButton(this).setSize(98, 20); + public final com.replaymod.gui.element.GuiButton uploadButton = new com.replaymod.gui.element.GuiButton(this).setSize(98, 20); - public final GuiButton closeButton = new GuiButton(this).onClick(new Runnable() { + public final com.replaymod.gui.element.GuiButton closeButton = new com.replaymod.gui.element.GuiButton(this).onClick(new Runnable() { @Override public void run() { previousScreen.display(); @@ -181,7 +180,7 @@ public GuiYoutubeUpload(GuiScreen previousScreen, File videoFile, int videoFrame } private void setState(boolean uploading) { - invokeAll(GuiElement.class, e -> e.setEnabled(!uploading)); + invokeAll(com.replaymod.gui.element.GuiElement.class, e -> e.setEnabled(!uploading)); uploadButton.setEnabled(); if (uploading) { uploadButton.onClick(() -> { diff --git a/src/main/java/com/replaymod/extras/youtube/YoutubeUpload.java b/src/main/java/com/replaymod/extras/youtube/YoutubeUpload.java index fa284bc0b..68b9ba234 100644 --- a/src/main/java/com/replaymod/extras/youtube/YoutubeUpload.java +++ b/src/main/java/com/replaymod/extras/youtube/YoutubeUpload.java @@ -2,11 +2,12 @@ import com.replaymod.core.ReplayMod; import com.replaymod.extras.Extra; +import com.replaymod.gui.container.GuiScreen; import com.replaymod.render.gui.GuiRenderingDone; -import de.johni0702.minecraft.gui.container.AbstractGuiScreen; -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.element.GuiButton; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.versions.callbacks.InitScreenCallback; import net.minecraft.client.gui.screen.Screen; public class YoutubeUpload extends EventRegistrations implements Extra { @@ -17,7 +18,7 @@ public void register(ReplayMod mod) { { on(InitScreenCallback.EVENT, ((screen, buttons) -> onGuiOpen(screen))); } private void onGuiOpen(Screen vanillaGui) { - AbstractGuiScreen abstractScreen = de.johni0702.minecraft.gui.container.GuiScreen.from(vanillaGui); + AbstractGuiScreen abstractScreen = GuiScreen.from(vanillaGui); if (abstractScreen instanceof GuiRenderingDone) { GuiRenderingDone gui = (GuiRenderingDone) abstractScreen; // Check if there already is a youtube button diff --git a/src/main/java/com/replaymod/extras/youtube/YoutubeUploader.java b/src/main/java/com/replaymod/extras/youtube/YoutubeUploader.java index 1739c6761..1ea0f466e 100644 --- a/src/main/java/com/replaymod/extras/youtube/YoutubeUploader.java +++ b/src/main/java/com/replaymod/extras/youtube/YoutubeUploader.java @@ -26,7 +26,7 @@ import com.google.common.util.concurrent.SettableFuture; import com.replaymod.render.RenderSettings; import com.replaymod.render.metadata.MetadataInjector; -import de.johni0702.minecraft.gui.utils.NonNull; +import com.replaymod.gui.utils.NonNull; import net.minecraft.client.MinecraftClient; import org.apache.commons.exec.CommandLine; import org.apache.commons.io.FileUtils; diff --git a/src/main/java/de/johni0702/minecraft/gui/GuiRenderer.java b/src/main/java/com/replaymod/gui/GuiRenderer.java similarity index 98% rename from src/main/java/de/johni0702/minecraft/gui/GuiRenderer.java rename to src/main/java/com/replaymod/gui/GuiRenderer.java index cbec39922..aaaff5cf3 100644 --- a/src/main/java/de/johni0702/minecraft/gui/GuiRenderer.java +++ b/src/main/java/com/replaymod/gui/GuiRenderer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui; +package com.replaymod.gui; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; diff --git a/src/main/java/de/johni0702/minecraft/gui/MinecraftGuiRenderer.java b/src/main/java/com/replaymod/gui/MinecraftGuiRenderer.java similarity index 90% rename from src/main/java/de/johni0702/minecraft/gui/MinecraftGuiRenderer.java rename to src/main/java/com/replaymod/gui/MinecraftGuiRenderer.java index bf6ef67bf..e9ac6e68d 100644 --- a/src/main/java/de/johni0702/minecraft/gui/MinecraftGuiRenderer.java +++ b/src/main/java/com/replaymod/gui/MinecraftGuiRenderer.java @@ -22,16 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui; +package com.replaymod.gui; -import de.johni0702.minecraft.gui.utils.NonNull; +import com.replaymod.gui.utils.NonNull; import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; import de.johni0702.minecraft.gui.utils.lwjgl.WritableDimension; -import de.johni0702.minecraft.gui.versions.MCVer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawableHelper; @@ -47,21 +46,20 @@ //$$ import static de.johni0702.minecraft.gui.versions.MCVer.*; //#endif -import static de.johni0702.minecraft.gui.versions.MCVer.*; import static org.lwjgl.opengl.GL11.*; public class MinecraftGuiRenderer implements GuiRenderer { private final DrawableHelper gui = new DrawableHelper(){}; - private final MinecraftClient mc = getMinecraft(); + private final MinecraftClient mc = com.replaymod.gui.versions.MCVer.getMinecraft(); private final MatrixStack matrixStack; @NonNull //#if MC>=11400 - private final int scaledWidth = newScaledResolution(mc).getScaledWidth(); - private final int scaledHeight = newScaledResolution(mc).getScaledHeight(); - private final double scaleFactor = newScaledResolution(mc).getScaleFactor(); + private final int scaledWidth = com.replaymod.gui.versions.MCVer.newScaledResolution(mc).getScaledWidth(); + private final int scaledHeight = com.replaymod.gui.versions.MCVer.newScaledResolution(mc).getScaledHeight(); + private final double scaleFactor = com.replaymod.gui.versions.MCVer.newScaledResolution(mc).getScaleFactor(); //#else //$$ private final int scaledWidth = newScaledResolution(mc).getScaledWidth(); //$$ private final int scaledHeight = newScaledResolution(mc).getScaledHeight(); @@ -114,7 +112,7 @@ public void setDrawingArea(int x, int y, int width, int height) { @Override public void bindTexture(Identifier location) { //#if MC>=11500 - MCVer.getMinecraft().getTextureManager().bindTexture(location); + com.replaymod.gui.versions.MCVer.getMinecraft().getTextureManager().bindTexture(location); //#else //$$ MCVer.getMinecraft().getTextureManager().bindTexture(location); //#endif @@ -184,7 +182,7 @@ public void drawRect(int x, int y, int width, int height, ReadableColor tl, Read disableAlphaTest(); blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0); shadeModel(GL_SMOOTH); - MCVer.drawRect(x, y, width, height, tl, tr, bl, br); + com.replaymod.gui.versions.MCVer.drawRect(x, y, width, height, tl, tr, bl, br); shadeModel(GL_FLAT); enableAlphaTest(); enableTexture(); @@ -212,7 +210,7 @@ public int drawCenteredString(int x, int y, ReadableColor color, String text) { @Override public int drawString(int x, int y, int color, String text, boolean shadow) { - TextRenderer fontRenderer = MCVer.getFontRenderer(); + TextRenderer fontRenderer = com.replaymod.gui.versions.MCVer.getFontRenderer(); try { if (shadow) { return fontRenderer.drawWithShadow( @@ -239,7 +237,7 @@ public int drawString(int x, int y, ReadableColor color, String text, boolean sh @Override public int drawCenteredString(int x, int y, int color, String text, boolean shadow) { - TextRenderer fontRenderer = MCVer.getFontRenderer(); + TextRenderer fontRenderer = com.replaymod.gui.versions.MCVer.getFontRenderer(); x-=fontRenderer.getWidth(text) / 2; return drawString(x, y, color, text, shadow); } @@ -281,7 +279,7 @@ public void invertColors(int right, int bottom, int left, int top) { enableColorLogicOp(); logicOp(GL11.GL_OR_REVERSE); - MCVer.drawRect(right, bottom, left, top); + com.replaymod.gui.versions.MCVer.drawRect(right, bottom, left, top); disableColorLogicOp(); enableTexture(); diff --git a/src/main/java/de/johni0702/minecraft/gui/OffsetGuiRenderer.java b/src/main/java/com/replaymod/gui/OffsetGuiRenderer.java similarity index 95% rename from src/main/java/de/johni0702/minecraft/gui/OffsetGuiRenderer.java rename to src/main/java/com/replaymod/gui/OffsetGuiRenderer.java index db652a953..4dcc61def 100644 --- a/src/main/java/de/johni0702/minecraft/gui/OffsetGuiRenderer.java +++ b/src/main/java/com/replaymod/gui/OffsetGuiRenderer.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui; +package com.replaymod.gui; -import de.johni0702.minecraft.gui.utils.NonNull; +import com.replaymod.gui.utils.NonNull; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; @@ -33,10 +33,10 @@ import net.minecraft.util.Identifier; import org.lwjgl.opengl.GL11; -public class OffsetGuiRenderer implements GuiRenderer { +public class OffsetGuiRenderer implements com.replaymod.gui.GuiRenderer { @NonNull - private final GuiRenderer renderer; + private final com.replaymod.gui.GuiRenderer renderer; @NonNull private final ReadablePoint position; @@ -48,7 +48,7 @@ public class OffsetGuiRenderer implements GuiRenderer { /** * Creates a new strict offset jgui renderer with the same settings as the supplied one. - * @see #OffsetGuiRenderer(GuiRenderer, ReadablePoint, ReadableDimension, boolean) + * @see #OffsetGuiRenderer(com.replaymod.gui.GuiRenderer, ReadablePoint, ReadableDimension, boolean) * @param renderer The renderer to copy from */ public OffsetGuiRenderer(OffsetGuiRenderer renderer) { @@ -63,7 +63,7 @@ public OffsetGuiRenderer(OffsetGuiRenderer renderer) { * @param position The position of this renderer within the parent (used as is, not copied) * @param size The size of the drawable area (used as is, not copied) */ - public OffsetGuiRenderer(GuiRenderer renderer, ReadablePoint position, ReadableDimension size) { + public OffsetGuiRenderer(com.replaymod.gui.GuiRenderer renderer, ReadablePoint position, ReadableDimension size) { this(renderer, position, size, true); } diff --git a/src/main/java/de/johni0702/minecraft/gui/RenderInfo.java b/src/main/java/com/replaymod/gui/RenderInfo.java similarity index 90% rename from src/main/java/de/johni0702/minecraft/gui/RenderInfo.java rename to src/main/java/com/replaymod/gui/RenderInfo.java index 1245afa0a..a8062d1bb 100644 --- a/src/main/java/de/johni0702/minecraft/gui/RenderInfo.java +++ b/src/main/java/com/replaymod/gui/RenderInfo.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui; +package com.replaymod.gui; -import de.johni0702.minecraft.gui.versions.MCVer; +import com.replaymod.gui.versions.MCVer; import net.minecraft.util.crash.CrashReport; import net.minecraft.util.crash.CrashReportSection; @@ -53,9 +53,9 @@ public RenderInfo layer(int layer) { public void addTo(CrashReport crashReport) { CrashReportSection category = crashReport.addElement("Render info details"); - MCVer.addDetail(category, "Partial Tick", () -> "" + partialTick); - MCVer.addDetail(category, "Mouse X", () -> "" + mouseX); - MCVer.addDetail(category, "Mouse Y", () -> "" + mouseY); + com.replaymod.gui.versions.MCVer.addDetail(category, "Partial Tick", () -> "" + partialTick); + com.replaymod.gui.versions.MCVer.addDetail(category, "Mouse X", () -> "" + mouseX); + com.replaymod.gui.versions.MCVer.addDetail(category, "Mouse Y", () -> "" + mouseY); MCVer.addDetail(category, "Layer", () -> "" + layer); } diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiClickableContainer.java b/src/main/java/com/replaymod/gui/container/AbstractGuiClickableContainer.java similarity index 91% rename from src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiClickableContainer.java rename to src/main/java/com/replaymod/gui/container/AbstractGuiClickableContainer.java index db3cb73a8..b141460aa 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiClickableContainer.java +++ b/src/main/java/com/replaymod/gui/container/AbstractGuiClickableContainer.java @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.element.IGuiClickable; -import de.johni0702.minecraft.gui.function.Clickable; +import com.replaymod.gui.element.IGuiClickable; +import com.replaymod.gui.function.Clickable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java b/src/main/java/com/replaymod/gui/container/AbstractGuiContainer.java similarity index 76% rename from src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java rename to src/main/java/com/replaymod/gui/container/AbstractGuiContainer.java index 07c2703ca..9e1db7f7d 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java +++ b/src/main/java/com/replaymod/gui/container/AbstractGuiContainer.java @@ -22,22 +22,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; - -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.OffsetGuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.element.AbstractComposedGuiElement; -import de.johni0702.minecraft.gui.element.ComposedGuiElement; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.layout.Layout; -import de.johni0702.minecraft.gui.layout.LayoutData; +package com.replaymod.gui.container; + +import com.replaymod.gui.element.AbstractComposedGuiElement; +import com.replaymod.gui.element.ComposedGuiElement; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.layout.LayoutData; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.OffsetGuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.layout.Layout; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; +import com.replaymod.gui.versions.MCVer; import net.minecraft.util.crash.CrashReport; import net.minecraft.util.crash.CrashReportSection; import net.minecraft.util.crash.CrashException; @@ -49,13 +49,13 @@ import static com.google.common.base.Preconditions.checkState; public abstract class AbstractGuiContainer> - extends AbstractComposedGuiElement implements GuiContainer { + extends AbstractComposedGuiElement implements com.replaymod.gui.container.GuiContainer { private static final Layout DEFAULT_LAYOUT = new HorizontalLayout(); - private Map elements = new LinkedHashMap<>(); + private Map elements = new LinkedHashMap<>(); - private Map> layedOutElements; + private Map> layedOutElements; private Layout layout = DEFAULT_LAYOUT; @@ -64,7 +64,7 @@ public abstract class AbstractGuiContainer> public AbstractGuiContainer() { } - public AbstractGuiContainer(GuiContainer container) { + public AbstractGuiContainer(com.replaymod.gui.container.GuiContainer container) { super(container); } @@ -80,12 +80,12 @@ public Layout getLayout() { } @Override - public void convertFor(GuiElement element, Point point) { + public void convertFor(com.replaymod.gui.element.GuiElement element, Point point) { convertFor(element, point, element.getLayer()); } @Override - public void convertFor(GuiElement element, Point point, int relativeLayer) { + public void convertFor(com.replaymod.gui.element.GuiElement element, Point point, int relativeLayer) { if (layedOutElements == null || !layedOutElements.containsKey(element)) { layout(null, new RenderInfo(0, 0, 0, relativeLayer)); } @@ -100,21 +100,21 @@ public void convertFor(GuiElement element, Point point, int relativeLayer) { } @Override - public Collection getChildren() { + public Collection getChildren() { return Collections.unmodifiableCollection(elements.keySet()); } @Override - public Map getElements() { + public Map getElements() { return Collections.unmodifiableMap(elements); } @Override - public T addElements(LayoutData layoutData, GuiElement... elements) { + public T addElements(com.replaymod.gui.layout.LayoutData layoutData, com.replaymod.gui.element.GuiElement... elements) { if (layoutData == null) { layoutData = LayoutData.NONE; } - for (GuiElement element : elements) { + for (com.replaymod.gui.element.GuiElement element : elements) { this.elements.put(element, layoutData); element.setContainer(this); } @@ -122,7 +122,7 @@ public T addElements(LayoutData layoutData, GuiElement... elements) { } @Override - public T removeElement(GuiElement element) { + public T removeElement(com.replaymod.gui.element.GuiElement element) { if (elements.remove(element) != null) { element.setContainer(null); if (layedOutElements != null) { @@ -146,10 +146,10 @@ public void layout(ReadableDimension size, RenderInfo renderInfo) { MCVer.addDetail(category, "Layout", layout::toString); throw new CrashException(crashReport); } - for (final Map.Entry> e : layedOutElements.entrySet()) { - GuiElement element = e.getKey(); - if (element instanceof ComposedGuiElement) { - if (((ComposedGuiElement) element).getMaxLayer() < renderInfo.layer) { + for (final Map.Entry> e : layedOutElements.entrySet()) { + com.replaymod.gui.element.GuiElement element = e.getKey(); + if (element instanceof com.replaymod.gui.element.ComposedGuiElement) { + if (((com.replaymod.gui.element.ComposedGuiElement) element).getMaxLayer() < renderInfo.layer) { continue; } } else { @@ -170,10 +170,10 @@ public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo render if (backgroundColor != null && renderInfo.getLayer() == 0) { renderer.drawRect(0, 0, size.getWidth(), size.getHeight(), backgroundColor); } - for (final Map.Entry> e : layedOutElements.entrySet()) { - GuiElement element = e.getKey(); + for (final Map.Entry> e : layedOutElements.entrySet()) { + com.replaymod.gui.element.GuiElement element = e.getKey(); boolean strict; - if (element instanceof ComposedGuiElement) { + if (element instanceof com.replaymod.gui.element.ComposedGuiElement) { if (((ComposedGuiElement) element).getMaxLayer() < renderInfo.layer) { continue; } @@ -204,7 +204,7 @@ public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo render MCVer.addDetail(category, "Element", () -> e.getKey().toString()); MCVer.addDetail(category, "Position", ePosition::toString); MCVer.addDetail(category, "Size", eSize::toString); - if (e.getKey() instanceof GuiContainer) { + if (e.getKey() instanceof com.replaymod.gui.container.GuiContainer) { MCVer.addDetail(category, "Layout", () -> ((GuiContainer) e.getKey()).getLayout().toString()); } throw new CrashException(crashReport); @@ -219,10 +219,10 @@ public ReadableDimension calcMinSize() { @Override public T sortElements() { - sortElements(new Comparator() { + sortElements(new Comparator() { @SuppressWarnings("unchecked") @Override - public int compare(GuiElement o1, GuiElement o2) { + public int compare(com.replaymod.gui.element.GuiElement o1, com.replaymod.gui.element.GuiElement o2) { if (o1 instanceof Comparable && o2 instanceof Comparable) { return ((Comparable) o1).compareTo(o2); } diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiOverlay.java b/src/main/java/com/replaymod/gui/container/AbstractGuiOverlay.java similarity index 83% rename from src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiOverlay.java rename to src/main/java/com/replaymod/gui/container/AbstractGuiOverlay.java index 7c80d56ee..d7e1d857c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiOverlay.java +++ b/src/main/java/com/replaymod/gui/container/AbstractGuiOverlay.java @@ -22,23 +22,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; - -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.MinecraftGuiRenderer; -import de.johni0702.minecraft.gui.OffsetGuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.function.*; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.utils.MouseUtils; +package com.replaymod.gui.container; + +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.function.Scrollable; +import com.replaymod.gui.versions.MCVer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.MinecraftGuiRenderer; +import com.replaymod.gui.OffsetGuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.utils.MouseUtils; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; -import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; -import de.johni0702.minecraft.gui.versions.callbacks.RenderHudCallback; +import com.replaymod.gui.versions.callbacks.PreTickCallback; +import com.replaymod.gui.versions.callbacks.RenderHudCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.crash.CrashReport; @@ -76,10 +76,10 @@ public boolean isVisible() { public void setVisible(boolean visible) { if (this.visible != visible) { if (visible) { - invokeAll(Loadable.class, Loadable::load); + invokeAll(com.replaymod.gui.function.Loadable.class, com.replaymod.gui.function.Loadable::load); eventHandler.register(); } else { - invokeAll(Closeable.class, Closeable::close); + invokeAll(com.replaymod.gui.function.Closeable.class, com.replaymod.gui.function.Closeable::close); eventHandler.unregister(); } updateUserInputGui(); @@ -145,7 +145,7 @@ public void layout(ReadableDimension size, RenderInfo renderInfo) { } super.layout(size, renderInfo); if (mouseVisible && renderInfo.layer == getMaxLayer()) { - final GuiElement tooltip = forEach(GuiElement.class, e -> e.getTooltip(renderInfo)); + final com.replaymod.gui.element.GuiElement tooltip = forEach(com.replaymod.gui.element.GuiElement.class, e -> e.getTooltip(renderInfo)); if (tooltip != null) { tooltip.layout(tooltip.getMinSize(), renderInfo); } @@ -156,7 +156,7 @@ public void layout(ReadableDimension size, RenderInfo renderInfo) { public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) { super.draw(renderer, size, renderInfo); if (mouseVisible && renderInfo.layer == getMaxLayer()) { - final GuiElement tooltip = forEach(GuiElement.class, e -> e.getTooltip(renderInfo)); + final com.replaymod.gui.element.GuiElement tooltip = forEach(GuiElement.class, e -> e.getTooltip(renderInfo)); if (tooltip != null) { final ReadableDimension tooltipSize = tooltip.getMinSize(); int x, y; @@ -178,13 +178,13 @@ public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo render CrashReport crashReport = CrashReport.create(ex, "Rendering Gui Tooltip"); renderInfo.addTo(crashReport); CrashReportSection category = crashReport.addElement("Gui container details"); - MCVer.addDetail(category, "Container", this::toString); - MCVer.addDetail(category, "Width", () -> "" + size.getWidth()); - MCVer.addDetail(category, "Height", () -> "" + size.getHeight()); + com.replaymod.gui.versions.MCVer.addDetail(category, "Container", this::toString); + com.replaymod.gui.versions.MCVer.addDetail(category, "Width", () -> "" + size.getWidth()); + com.replaymod.gui.versions.MCVer.addDetail(category, "Height", () -> "" + size.getHeight()); category = crashReport.addElement("Tooltip details"); - MCVer.addDetail(category, "Element", tooltip::toString); - MCVer.addDetail(category, "Position", position::toString); - MCVer.addDetail(category, "Size", tooltipSize::toString); + com.replaymod.gui.versions.MCVer.addDetail(category, "Element", tooltip::toString); + com.replaymod.gui.versions.MCVer.addDetail(category, "Position", position::toString); + com.replaymod.gui.versions.MCVer.addDetail(category, "Size", tooltipSize::toString); throw new CrashException(crashReport); } } @@ -225,7 +225,7 @@ private void renderOverlay(MatrixStack stack, float partialTicks) { } } - { on(PreTickCallback.EVENT, () -> invokeAll(Tickable.class, Tickable::tick)); } + { on(PreTickCallback.EVENT, () -> invokeAll(com.replaymod.gui.function.Tickable.class, com.replaymod.gui.function.Tickable::tick)); } private void updateRenderer() { MinecraftClient mc = getMinecraft(); @@ -261,7 +261,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { Point mousePos = MouseUtils.getMousePos(); boolean controlDown = hasControlDown(); boolean shiftDown = hasShiftDown(); - if (!invokeHandlers(Typeable.class, e -> e.typeKey(mousePos, keyCode, '\0', controlDown, shiftDown))) { + if (!invokeHandlers(com.replaymod.gui.function.Typeable.class, e -> e.typeKey(mousePos, keyCode, '\0', controlDown, shiftDown))) { return super.keyPressed(keyCode, scanCode, modifiers); } return true; @@ -272,7 +272,7 @@ public boolean charTyped(char keyChar, int modifiers) { Point mousePos = MouseUtils.getMousePos(); boolean controlDown = hasControlDown(); boolean shiftDown = hasShiftDown(); - if (!invokeHandlers(Typeable.class, e -> e.typeKey(mousePos, 0, keyChar, controlDown, shiftDown))) { + if (!invokeHandlers(com.replaymod.gui.function.Typeable.class, e -> e.typeKey(mousePos, 0, keyChar, controlDown, shiftDown))) { return super.charTyped(keyChar, modifiers); } return true; @@ -306,7 +306,7 @@ public boolean mouseClicked(double mouseXD, double mouseYD, int mouseButton) { //#endif //$$ { //#endif - invokeHandlers(Clickable.class, e -> e.mouseClick(new Point(mouseX, mouseY), mouseButton)); + invokeHandlers(com.replaymod.gui.function.Clickable.class, e -> e.mouseClick(new Point(mouseX, mouseY), mouseButton)); } @Override @@ -317,7 +317,7 @@ public boolean mouseReleased(double mouseXD, double mouseYD, int mouseButton) { //#else //$$ protected void mouseReleased(int mouseX, int mouseY, int mouseButton) { //#endif - invokeHandlers(Draggable.class, e -> e.mouseRelease(new Point(mouseX, mouseY), mouseButton)); + invokeHandlers(com.replaymod.gui.function.Draggable.class, e -> e.mouseRelease(new Point(mouseX, mouseY), mouseButton)); } @Override @@ -329,7 +329,7 @@ public boolean mouseDragged(double mouseXD, double mouseYD, int mouseButton, dou //#else //$$ protected void mouseClickMove(int mouseX, int mouseY, int mouseButton, long timeSinceLastClick) { //#endif - invokeHandlers(Draggable.class, e -> e.mouseDrag(new Point(mouseX, mouseY), mouseButton, timeSinceLastClick)); + invokeHandlers(com.replaymod.gui.function.Draggable.class, e -> e.mouseDrag(new Point(mouseX, mouseY), mouseButton, timeSinceLastClick)); } @Override @@ -338,7 +338,7 @@ public void tick() { //#else //$$ public void updateScreen() { //#endif - invokeAll(Tickable.class, Tickable::tick); + invokeAll(com.replaymod.gui.function.Tickable.class, com.replaymod.gui.function.Tickable::tick); } //#if MC>=11400 diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScreen.java b/src/main/java/com/replaymod/gui/container/AbstractGuiScreen.java similarity index 82% rename from src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScreen.java rename to src/main/java/com/replaymod/gui/container/AbstractGuiScreen.java index 09615ce81..f6be5b1c0 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScreen.java +++ b/src/main/java/com/replaymod/gui/container/AbstractGuiScreen.java @@ -22,35 +22,33 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; - -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.MinecraftGuiRenderer; -import de.johni0702.minecraft.gui.OffsetGuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.function.*; -import de.johni0702.minecraft.gui.utils.MouseUtils; +package com.replaymod.gui.container; + +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.function.Loadable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.MinecraftGuiRenderer; +import com.replaymod.gui.OffsetGuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.utils.MouseUtils; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.crash.CrashReport; import net.minecraft.util.crash.CrashReportSection; import net.minecraft.util.crash.CrashException; //#if MC>=11400 -import de.johni0702.minecraft.gui.versions.MCVer.Keyboard; //#else //$$ import org.lwjgl.input.Keyboard; //$$ import org.lwjgl.input.Mouse; //#endif //#if MC>=10800 -import com.mojang.blaze3d.platform.GlStateManager; + //#if MC<11400 //$$ import java.io.IOException; @@ -67,7 +65,7 @@ public abstract class AbstractGuiScreen> extends private boolean enabledRepeatedKeyEvents = true; - private GuiLabel title; + private com.replaymod.gui.element.GuiLabel title; protected boolean suppressVanillaKeys; @@ -87,7 +85,7 @@ public void layout(ReadableDimension size, RenderInfo renderInfo) { } super.layout(size, renderInfo); if (renderInfo.layer == getMaxLayer()) { - final GuiElement tooltip = forEach(GuiElement.class, e -> e.getTooltip(renderInfo)); + final com.replaymod.gui.element.GuiElement tooltip = forEach(com.replaymod.gui.element.GuiElement.class, e -> e.getTooltip(renderInfo)); if (tooltip != null) { tooltip.layout(tooltip.getMinSize(), renderInfo); } @@ -128,7 +126,7 @@ public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo render } super.draw(renderer, size, renderInfo); if (renderInfo.layer == getMaxLayer()) { - final GuiElement tooltip = forEach(GuiElement.class, e -> e.getTooltip(renderInfo)); + final com.replaymod.gui.element.GuiElement tooltip = forEach(GuiElement.class, e -> e.getTooltip(renderInfo)); if (tooltip != null) { final ReadableDimension tooltipSize = tooltip.getMinSize(); int x, y; @@ -150,13 +148,13 @@ public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo render CrashReport crashReport = CrashReport.create(ex, "Rendering Gui Tooltip"); renderInfo.addTo(crashReport); CrashReportSection category = crashReport.addElement("Gui container details"); - MCVer.addDetail(category, "Container", this::toString); - MCVer.addDetail(category, "Width", () -> "" + size.getWidth()); - MCVer.addDetail(category, "Height", () -> "" + size.getHeight()); + com.replaymod.gui.versions.MCVer.addDetail(category, "Container", this::toString); + com.replaymod.gui.versions.MCVer.addDetail(category, "Width", () -> "" + size.getWidth()); + com.replaymod.gui.versions.MCVer.addDetail(category, "Height", () -> "" + size.getHeight()); category = crashReport.addElement("Tooltip details"); - MCVer.addDetail(category, "Element", tooltip::toString); - MCVer.addDetail(category, "Position", position::toString); - MCVer.addDetail(category, "Size", tooltipSize::toString); + com.replaymod.gui.versions.MCVer.addDetail(category, "Element", tooltip::toString); + com.replaymod.gui.versions.MCVer.addDetail(category, "Position", position::toString); + com.replaymod.gui.versions.MCVer.addDetail(category, "Size", tooltipSize::toString); throw new CrashException(crashReport); } } @@ -176,7 +174,7 @@ public ReadableDimension getMaxSize() { public void setEnabledRepeatedKeyEvents(boolean enableRepeatKeyEvents) { this.enabledRepeatedKeyEvents = enableRepeatKeyEvents; if (wrapped.active) { - Keyboard.enableRepeatEvents(enableRepeatKeyEvents); + com.replaymod.gui.versions.MCVer.Keyboard.enableRepeatEvents(enableRepeatKeyEvents); } } @@ -192,7 +190,7 @@ public boolean isEnabledRepeatedKeyEvents() { return this.enabledRepeatedKeyEvents; } - public GuiLabel getTitle() { + public com.replaymod.gui.element.GuiLabel getTitle() { return this.title; } @@ -253,7 +251,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { Point mouse = MouseUtils.getMousePos(); boolean ctrlDown = hasControlDown(); boolean shiftDown = hasShiftDown(); - if (!invokeHandlers(Typeable.class, e -> e.typeKey(mouse, keyCode, '\0', ctrlDown, shiftDown))) { + if (!invokeHandlers(com.replaymod.gui.function.Typeable.class, e -> e.typeKey(mouse, keyCode, '\0', ctrlDown, shiftDown))) { if (suppressVanillaKeys) { return false; } @@ -267,7 +265,7 @@ public boolean charTyped(char keyChar, int scanCode) { Point mouse = MouseUtils.getMousePos(); boolean ctrlDown = hasControlDown(); boolean shiftDown = hasShiftDown(); - if (!invokeHandlers(Typeable.class, e -> e.typeKey(mouse, 0, keyChar, ctrlDown, shiftDown))) { + if (!invokeHandlers(com.replaymod.gui.function.Typeable.class, e -> e.typeKey(mouse, 0, keyChar, ctrlDown, shiftDown))) { if (suppressVanillaKeys) { return false; } @@ -306,7 +304,7 @@ public boolean mouseClicked(double mouseXD, double mouseYD, int mouseButton) { //#endif //$$ { //#endif - invokeHandlers(Clickable.class, e -> e.mouseClick(new Point(mouseX, mouseY), mouseButton)); + invokeHandlers(com.replaymod.gui.function.Clickable.class, e -> e.mouseClick(new Point(mouseX, mouseY), mouseButton)); } @Override @@ -317,7 +315,7 @@ public boolean mouseReleased(double mouseXD, double mouseYD, int mouseButton) { //#else //$$ protected void mouseReleased(int mouseX, int mouseY, int mouseButton) { //#endif - invokeHandlers(Draggable.class, e -> e.mouseRelease(new Point(mouseX, mouseY), mouseButton)); + invokeHandlers(com.replaymod.gui.function.Draggable.class, e -> e.mouseRelease(new Point(mouseX, mouseY), mouseButton)); } @Override @@ -329,7 +327,7 @@ public boolean mouseDragged(double mouseXD, double mouseYD, int mouseButton, dou //#else //$$ protected void mouseClickMove(int mouseX, int mouseY, int mouseButton, long timeSinceLastClick) { //#endif - invokeHandlers(Draggable.class, e -> e.mouseDrag(new Point(mouseX, mouseY), mouseButton, timeSinceLastClick)); + invokeHandlers(com.replaymod.gui.function.Draggable.class, e -> e.mouseDrag(new Point(mouseX, mouseY), mouseButton, timeSinceLastClick)); } @Override @@ -338,7 +336,7 @@ public void tick() { //#else //$$ public void updateScreen() { //#endif - invokeAll(Tickable.class, Tickable::tick); + invokeAll(com.replaymod.gui.function.Tickable.class, com.replaymod.gui.function.Tickable::tick); } //#if MC>=11400 @@ -356,7 +354,7 @@ public boolean mouseScrolled( //$$ Point mouse = MouseUtils.getMousePos(); //#endif int wheel = (int) (dWheel * 120); - return invokeHandlers(Scrollable.class, e -> e.scroll(mouse, wheel)); + return invokeHandlers(com.replaymod.gui.function.Scrollable.class, e -> e.scroll(mouse, wheel)); } //#else //$$ @Override @@ -380,10 +378,10 @@ public void removed() { //#else //$$ public void onGuiClosed() { //#endif - invokeAll(Closeable.class, Closeable::close); + invokeAll(com.replaymod.gui.function.Closeable.class, com.replaymod.gui.function.Closeable::close); active = false; if (enabledRepeatedKeyEvents) { - Keyboard.enableRepeatEvents(false); + com.replaymod.gui.versions.MCVer.Keyboard.enableRepeatEvents(false); } } @@ -395,10 +393,10 @@ public void init() { //#endif active = false; if (enabledRepeatedKeyEvents) { - Keyboard.enableRepeatEvents(true); + com.replaymod.gui.versions.MCVer.Keyboard.enableRepeatEvents(true); } screenSize = new Dimension(width, height); - invokeAll(Loadable.class, Loadable::load); + invokeAll(com.replaymod.gui.function.Loadable.class, Loadable::load); } public T getWrapper() { diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScrollable.java b/src/main/java/com/replaymod/gui/container/AbstractGuiScrollable.java similarity index 95% rename from src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScrollable.java rename to src/main/java/com/replaymod/gui/container/AbstractGuiScrollable.java index afcf5d538..767ed5d72 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScrollable.java +++ b/src/main/java/com/replaymod/gui/container/AbstractGuiScrollable.java @@ -22,13 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.OffsetGuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.function.Scrollable; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.function.Scrollable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.OffsetGuiRenderer; +import com.replaymod.gui.RenderInfo; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiVerticalList.java b/src/main/java/com/replaymod/gui/container/AbstractGuiVerticalList.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiVerticalList.java rename to src/main/java/com/replaymod/gui/container/AbstractGuiVerticalList.java index 94627bc33..c44a54cf2 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiVerticalList.java +++ b/src/main/java/com/replaymod/gui/container/AbstractGuiVerticalList.java @@ -22,13 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.function.Draggable; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; +import com.replaymod.gui.function.Draggable; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; @@ -36,14 +36,14 @@ import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; import de.johni0702.minecraft.gui.utils.lwjgl.WritableDimension; -import static de.johni0702.minecraft.gui.utils.Colors.TRANSPARENT; +import static com.replaymod.gui.utils.Colors.TRANSPARENT; import static de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor.BLACK; public abstract class AbstractGuiVerticalList> extends AbstractGuiScrollable implements Draggable { public static final ReadableColor BACKGROUND = new Color(0, 0, 0, 150); - private final VerticalLayout listLayout = new VerticalLayout().setSpacing(3); + private final com.replaymod.gui.layout.VerticalLayout listLayout = new com.replaymod.gui.layout.VerticalLayout().setSpacing(3); private final GuiPanel listPanel = new GuiPanel(this).setLayout(listLayout); @@ -55,7 +55,7 @@ protected void layout(T container, int width, int height) { } @Override - public ReadableDimension calcMinSize(GuiContainer container) { + public ReadableDimension calcMinSize(com.replaymod.gui.container.GuiContainer container) { final ReadableDimension panelSize = listPanel.getMinSize(); return new ReadableDimension() { @Override diff --git a/src/main/java/de/johni0702/minecraft/gui/container/GuiClickable.java b/src/main/java/com/replaymod/gui/container/GuiClickable.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/container/GuiClickable.java rename to src/main/java/com/replaymod/gui/container/GuiClickable.java index e2cc8b111..ecee5878c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/GuiClickable.java +++ b/src/main/java/com/replaymod/gui/container/GuiClickable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; public class GuiClickable extends AbstractGuiClickableContainer { diff --git a/src/main/java/de/johni0702/minecraft/gui/container/GuiContainer.java b/src/main/java/com/replaymod/gui/container/GuiContainer.java similarity index 76% rename from src/main/java/de/johni0702/minecraft/gui/container/GuiContainer.java rename to src/main/java/com/replaymod/gui/container/GuiContainer.java index e1149c637..3e91a5cba 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/GuiContainer.java +++ b/src/main/java/com/replaymod/gui/container/GuiContainer.java @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; -import de.johni0702.minecraft.gui.element.ComposedGuiElement; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.layout.Layout; -import de.johni0702.minecraft.gui.layout.LayoutData; +import com.replaymod.gui.element.ComposedGuiElement; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.layout.LayoutData; +import com.replaymod.gui.layout.Layout; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; @@ -39,7 +39,7 @@ public interface GuiContainer> extends ComposedGuiElem T setLayout(Layout layout); Layout getLayout(); - void convertFor(GuiElement element, Point point); + void convertFor(com.replaymod.gui.element.GuiElement element, Point point); /** * Converts the global coordinates of the point to ones relative to the element. @@ -48,11 +48,11 @@ public interface GuiContainer> extends ComposedGuiElem * @param relativeLayer Layer at which the point is relative to this element, * positive values are above this element */ - void convertFor(GuiElement element, Point point, int relativeLayer); + void convertFor(com.replaymod.gui.element.GuiElement element, Point point, int relativeLayer); - Map getElements(); - T addElements(LayoutData layoutData, GuiElement... elements); - T removeElement(GuiElement element); + Map getElements(); + T addElements(LayoutData layoutData, com.replaymod.gui.element.GuiElement... elements); + T removeElement(com.replaymod.gui.element.GuiElement element); T sortElements(); T sortElements(Comparator comparator); diff --git a/src/main/java/de/johni0702/minecraft/gui/container/GuiOverlay.java b/src/main/java/com/replaymod/gui/container/GuiOverlay.java similarity index 80% rename from src/main/java/de/johni0702/minecraft/gui/container/GuiOverlay.java rename to src/main/java/com/replaymod/gui/container/GuiOverlay.java index 25f777e12..13c0d5265 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/GuiOverlay.java +++ b/src/main/java/com/replaymod/gui/container/GuiOverlay.java @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; -public class GuiOverlay extends AbstractGuiOverlay { +public class GuiOverlay extends com.replaymod.gui.container.AbstractGuiOverlay { @SuppressWarnings("unchecked") - public static AbstractGuiOverlay from(net.minecraft.client.gui.screen.Screen minecraft) { - if (!(minecraft instanceof AbstractGuiOverlay.UserInputGuiScreen)) { + public static com.replaymod.gui.container.AbstractGuiOverlay from(net.minecraft.client.gui.screen.Screen minecraft) { + if (!(minecraft instanceof com.replaymod.gui.container.AbstractGuiOverlay.UserInputGuiScreen)) { return null; } return ((AbstractGuiOverlay.UserInputGuiScreen) minecraft).getOverlay(); diff --git a/src/main/java/de/johni0702/minecraft/gui/container/GuiPanel.java b/src/main/java/com/replaymod/gui/container/GuiPanel.java similarity index 70% rename from src/main/java/de/johni0702/minecraft/gui/container/GuiPanel.java rename to src/main/java/com/replaymod/gui/container/GuiPanel.java index d142c9ed7..d6a339f36 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/GuiPanel.java +++ b/src/main/java/com/replaymod/gui/container/GuiPanel.java @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.layout.Layout; -import de.johni0702.minecraft.gui.layout.LayoutData; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.layout.LayoutData; +import com.replaymod.gui.layout.Layout; import java.util.ArrayList; import java.util.Map; @@ -40,12 +40,12 @@ public GuiPanel(GuiContainer container) { super(container); } - GuiPanel(Layout layout, int width , int height, Map withElements) { + GuiPanel(Layout layout, int width , int height, Map withElements) { setLayout(layout); if (width != 0 || height != 0) { setSize(width, height); } - for (Map.Entry e : withElements.entrySet()) { + for (Map.Entry e : withElements.entrySet()) { addElements(e.getValue(), e.getKey()); } } @@ -63,8 +63,8 @@ public static class GuiPanelBuilder { private Layout layout; private int width; private int height; - private ArrayList withElements$key; - private ArrayList withElements$value; + private ArrayList withElements$key; + private ArrayList withElements$value; GuiPanelBuilder() { } @@ -84,22 +84,22 @@ public GuiPanelBuilder height(int height) { return this; } - public GuiPanelBuilder with(GuiElement withKey, LayoutData withValue) { + public GuiPanelBuilder with(com.replaymod.gui.element.GuiElement withKey, com.replaymod.gui.layout.LayoutData withValue) { if (this.withElements$key == null) { - this.withElements$key = new ArrayList(); - this.withElements$value = new ArrayList(); + this.withElements$key = new ArrayList(); + this.withElements$value = new ArrayList(); } this.withElements$key.add(withKey); this.withElements$value.add(withValue); return this; } - public GuiPanelBuilder withElements(Map withElements) { + public GuiPanelBuilder withElements(Map withElements) { if (this.withElements$key == null) { - this.withElements$key = new ArrayList(); - this.withElements$value = new ArrayList(); + this.withElements$key = new ArrayList(); + this.withElements$value = new ArrayList(); } - for (final Map.Entry $lombokEntry : withElements.entrySet()) { + for (final Map.Entry $lombokEntry : withElements.entrySet()) { this.withElements$key.add($lombokEntry.getKey()); this.withElements$value.add($lombokEntry.getValue()); } @@ -115,7 +115,7 @@ public GuiPanelBuilder clearWithElements() { } public GuiPanel build() { - Map withElements; + Map withElements; switch (this.withElements$key == null ? 0 : this.withElements$key.size()) { case 0: withElements = java.util.Collections.emptyMap(); @@ -124,7 +124,7 @@ public GuiPanel build() { withElements = java.util.Collections.singletonMap(this.withElements$key.get(0), this.withElements$value.get(0)); break; default: - withElements = new java.util.LinkedHashMap(this.withElements$key.size() < 1073741824 ? 1 + this.withElements$key.size() + (this.withElements$key.size() - 3) / 3 : Integer.MAX_VALUE); + withElements = new java.util.LinkedHashMap(this.withElements$key.size() < 1073741824 ? 1 + this.withElements$key.size() + (this.withElements$key.size() - 3) / 3 : Integer.MAX_VALUE); for (int $i = 0; $i < this.withElements$key.size(); $i++) withElements.put(this.withElements$key.get($i), (LayoutData) this.withElements$value.get($i)); withElements = java.util.Collections.unmodifiableMap(withElements); diff --git a/src/main/java/de/johni0702/minecraft/gui/container/GuiScreen.java b/src/main/java/com/replaymod/gui/container/GuiScreen.java similarity index 83% rename from src/main/java/de/johni0702/minecraft/gui/container/GuiScreen.java rename to src/main/java/com/replaymod/gui/container/GuiScreen.java index b90cbf7c5..f638ed70d 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/GuiScreen.java +++ b/src/main/java/com/replaymod/gui/container/GuiScreen.java @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; -public class GuiScreen extends AbstractGuiScreen { +public class GuiScreen extends com.replaymod.gui.container.AbstractGuiScreen { @SuppressWarnings("unchecked") - public static AbstractGuiScreen from(net.minecraft.client.gui.screen.Screen minecraft) { - if (!(minecraft instanceof AbstractGuiScreen.MinecraftGuiScreen)) { + public static com.replaymod.gui.container.AbstractGuiScreen from(net.minecraft.client.gui.screen.Screen minecraft) { + if (!(minecraft instanceof com.replaymod.gui.container.AbstractGuiScreen.MinecraftGuiScreen)) { return null; } return ((AbstractGuiScreen.MinecraftGuiScreen) minecraft).getWrapper(); diff --git a/src/main/java/de/johni0702/minecraft/gui/container/GuiScrollable.java b/src/main/java/com/replaymod/gui/container/GuiScrollable.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/container/GuiScrollable.java rename to src/main/java/com/replaymod/gui/container/GuiScrollable.java index fbf75c9b1..995761d71 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/GuiScrollable.java +++ b/src/main/java/com/replaymod/gui/container/GuiScrollable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; public class GuiScrollable extends AbstractGuiScrollable { public GuiScrollable() { diff --git a/src/main/java/de/johni0702/minecraft/gui/container/GuiVerticalList.java b/src/main/java/com/replaymod/gui/container/GuiVerticalList.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/container/GuiVerticalList.java rename to src/main/java/com/replaymod/gui/container/GuiVerticalList.java index ce1d2c3c5..c4f00ce7f 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/GuiVerticalList.java +++ b/src/main/java/com/replaymod/gui/container/GuiVerticalList.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.container; +package com.replaymod.gui.container; public class GuiVerticalList extends AbstractGuiVerticalList { public GuiVerticalList() { diff --git a/src/main/java/de/johni0702/minecraft/gui/container/VanillaGuiScreen.java b/src/main/java/com/replaymod/gui/container/VanillaGuiScreen.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/container/VanillaGuiScreen.java rename to src/main/java/com/replaymod/gui/container/VanillaGuiScreen.java index d24c87926..70bc903b7 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/VanillaGuiScreen.java +++ b/src/main/java/com/replaymod/gui/container/VanillaGuiScreen.java @@ -1,22 +1,22 @@ -package de.johni0702.minecraft.gui.container; - -import de.johni0702.minecraft.gui.function.Draggable; -import de.johni0702.minecraft.gui.function.Scrollable; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.utils.MouseUtils; +package com.replaymod.gui.container; + +import com.replaymod.gui.function.Draggable; +import com.replaymod.gui.function.Scrollable; +import com.replaymod.gui.function.Typeable; +import com.replaymod.gui.versions.MCVer; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.utils.MouseUtils; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; -import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; -import de.johni0702.minecraft.gui.versions.callbacks.OpenGuiScreenCallback; -import de.johni0702.minecraft.gui.versions.callbacks.PostRenderScreenCallback; -import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; +import com.replaymod.gui.versions.callbacks.InitScreenCallback; +import com.replaymod.gui.versions.callbacks.OpenGuiScreenCallback; +import com.replaymod.gui.versions.callbacks.PostRenderScreenCallback; +import com.replaymod.gui.versions.callbacks.PreTickCallback; import net.minecraft.client.util.math.MatrixStack; //#if FABRIC>=1 -import de.johni0702.minecraft.gui.versions.callbacks.KeyboardCallback; -import de.johni0702.minecraft.gui.versions.callbacks.MouseCallback; +import com.replaymod.gui.versions.callbacks.KeyboardCallback; +import com.replaymod.gui.versions.callbacks.MouseCallback; //#elseif MC>=11600 //$$ import net.minecraftforge.client.event.GuiScreenEvent; //$$ import net.minecraftforge.eventbus.api.EventPriority; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractComposedGuiElement.java b/src/main/java/com/replaymod/gui/element/AbstractComposedGuiElement.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractComposedGuiElement.java rename to src/main/java/com/replaymod/gui/element/AbstractComposedGuiElement.java index f5faab33c..ab507be88 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractComposedGuiElement.java +++ b/src/main/java/com/replaymod/gui/element/AbstractComposedGuiElement.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; import java.util.function.BiFunction; import java.util.function.Function; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiButton.java b/src/main/java/com/replaymod/gui/element/AbstractGuiButton.java similarity index 95% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiButton.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiButton.java index 4ac3b3ed5..9c68472aa 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiButton.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiButton.java @@ -22,17 +22,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.function.Clickable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.function.Clickable; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; +import com.replaymod.gui.versions.MCVer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.resource.language.I18n; @@ -52,7 +52,6 @@ //#if MC>=10800 import static com.mojang.blaze3d.platform.GlStateManager.*; //#endif -import static de.johni0702.minecraft.gui.versions.MCVer.*; import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiCheckbox.java b/src/main/java/com/replaymod/gui/element/AbstractGuiCheckbox.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiCheckbox.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiCheckbox.java index 2793bedb4..fb1bdf973 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiCheckbox.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiCheckbox.java @@ -22,16 +22,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import de.johni0702.minecraft.gui.versions.MCVer; +import com.replaymod.gui.versions.MCVer; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.resource.language.I18n; import net.minecraft.util.Identifier; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiClickable.java b/src/main/java/com/replaymod/gui/element/AbstractGuiClickable.java similarity index 91% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiClickable.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiClickable.java index 89ff4eba9..9a8c5e161 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiClickable.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiClickable.java @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.function.Clickable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.function.Clickable; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiElement.java b/src/main/java/com/replaymod/gui/element/AbstractGuiElement.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiElement.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiElement.java index 615ae83dd..fe4869219 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiElement.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiElement.java @@ -22,19 +22,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import de.johni0702.minecraft.gui.versions.MCVer; +import com.replaymod.gui.versions.MCVer; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Identifier; -public abstract class AbstractGuiElement> implements GuiElement { +public abstract class AbstractGuiElement> implements com.replaymod.gui.element.GuiElement { protected static final Identifier TEXTURE = new Identifier("jgui", "gui.png"); @@ -42,7 +42,7 @@ public abstract class AbstractGuiElement> implem private GuiContainer container; - private GuiElement tooltip; + private com.replaymod.gui.element.GuiElement tooltip; private boolean enabled = true; @@ -98,7 +98,7 @@ public T setDisabled() { } @Override - public GuiElement getTooltip(RenderInfo renderInfo) { + public com.replaymod.gui.element.GuiElement getTooltip(RenderInfo renderInfo) { if (tooltip != null && lastSize != null) { Point mouse = new Point(renderInfo.mouseX, renderInfo.mouseY); if (container != null) { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiHorizontalScrollbar.java b/src/main/java/com/replaymod/gui/element/AbstractGuiHorizontalScrollbar.java similarity index 94% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiHorizontalScrollbar.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiHorizontalScrollbar.java index 8ba0249cd..37588b720 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiHorizontalScrollbar.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiHorizontalScrollbar.java @@ -22,15 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; - -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.OffsetGuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.function.Clickable; -import de.johni0702.minecraft.gui.function.Draggable; -import de.johni0702.minecraft.gui.utils.Utils; +package com.replaymod.gui.element; + +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.OffsetGuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.function.Clickable; +import com.replaymod.gui.function.Draggable; +import com.replaymod.gui.utils.Utils; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiImage.java b/src/main/java/com/replaymod/gui/element/AbstractGuiImage.java similarity index 95% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiImage.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiImage.java index f22241ce6..997b957c1 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiImage.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiImage.java @@ -22,15 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; import com.google.common.base.Preconditions; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import de.johni0702.minecraft.gui.versions.Image; +import com.replaymod.gui.versions.Image; import net.minecraft.client.texture.NativeImageBackedTexture; import net.minecraft.util.Identifier; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiLabel.java b/src/main/java/com/replaymod/gui/element/AbstractGuiLabel.java similarity index 94% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiLabel.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiLabel.java index b95cc9447..b3e75f73c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiLabel.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiLabel.java @@ -22,15 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import de.johni0702.minecraft.gui.versions.MCVer; +import com.replaymod.gui.versions.MCVer; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.resource.language.I18n; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiNumberField.java b/src/main/java/com/replaymod/gui/element/AbstractGuiNumberField.java similarity index 98% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiNumberField.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiNumberField.java index 75759c0f4..1e218e81c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiNumberField.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiNumberField.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; import com.google.common.base.Preconditions; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; import java.util.Locale; import java.util.regex.Pattern; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiPasswordField.java b/src/main/java/com/replaymod/gui/element/AbstractGuiPasswordField.java similarity index 90% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiPasswordField.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiPasswordField.java index 043be86b2..5bd660f11 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiPasswordField.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiPasswordField.java @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiSlider.java b/src/main/java/com/replaymod/gui/element/AbstractGuiSlider.java similarity index 94% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiSlider.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiSlider.java index b4701a311..b32e255c5 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiSlider.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiSlider.java @@ -22,13 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.function.Clickable; -import de.johni0702.minecraft.gui.function.Draggable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.function.Clickable; +import com.replaymod.gui.function.Draggable; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTextField.java b/src/main/java/com/replaymod/gui/element/AbstractGuiTextField.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTextField.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiTextField.java index 6b6bd5324..09c074d25 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTextField.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiTextField.java @@ -22,25 +22,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.function.Clickable; -import de.johni0702.minecraft.gui.function.Focusable; -import de.johni0702.minecraft.gui.function.Tickable; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.function.Clickable; +import com.replaymod.gui.function.Focusable; +import com.replaymod.gui.function.Tickable; +import com.replaymod.gui.function.Typeable; +import com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; +import com.replaymod.gui.versions.MCVer; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; @@ -52,8 +52,8 @@ //$$ import org.lwjgl.input.Keyboard; //#endif -import static de.johni0702.minecraft.gui.utils.Utils.clamp; -import static de.johni0702.minecraft.gui.versions.MCVer.*; +import static com.replaymod.gui.utils.Utils.clamp; +import static com.replaymod.gui.versions.MCVer.*; public abstract class AbstractGuiTextField> extends AbstractGuiElement implements Clickable, Tickable, Typeable, IGuiTextField { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTexturedButton.java b/src/main/java/com/replaymod/gui/element/AbstractGuiTexturedButton.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTexturedButton.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiTexturedButton.java index 2dcda7f1b..6bd8799f0 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTexturedButton.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiTexturedButton.java @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.function.Clickable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.function.Clickable; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; @@ -44,7 +44,6 @@ //#if MC>=10800 import static com.mojang.blaze3d.platform.GlStateManager.*; //#endif -import static de.johni0702.minecraft.gui.versions.MCVer.*; import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiToggleButton.java b/src/main/java/com/replaymod/gui/element/AbstractGuiToggleButton.java similarity index 92% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiToggleButton.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiToggleButton.java index c1188a87c..bceb218fe 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiToggleButton.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiToggleButton.java @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; public abstract class AbstractGuiToggleButton> diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTooltip.java b/src/main/java/com/replaymod/gui/element/AbstractGuiTooltip.java similarity index 94% rename from src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTooltip.java rename to src/main/java/com/replaymod/gui/element/AbstractGuiTooltip.java index 78773a291..e97c90978 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTooltip.java +++ b/src/main/java/com/replaymod/gui/element/AbstractGuiTooltip.java @@ -22,16 +22,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.utils.StringUtils; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.utils.StringUtils; import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import de.johni0702.minecraft.gui.versions.MCVer; +import com.replaymod.gui.versions.MCVer; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.resource.language.I18n; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/ComposedGuiElement.java b/src/main/java/com/replaymod/gui/element/ComposedGuiElement.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/element/ComposedGuiElement.java rename to src/main/java/com/replaymod/gui/element/ComposedGuiElement.java index ba8c51e39..248adf70b 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/ComposedGuiElement.java +++ b/src/main/java/com/replaymod/gui/element/ComposedGuiElement.java @@ -22,14 +22,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; import java.util.Collection; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; -public interface ComposedGuiElement> extends GuiElement { +public interface ComposedGuiElement> extends com.replaymod.gui.element.GuiElement { Collection getChildren(); default R forEach(Class ofType, Function function) { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiButton.java b/src/main/java/com/replaymod/gui/element/GuiButton.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiButton.java rename to src/main/java/com/replaymod/gui/element/GuiButton.java index b8ef43275..ae9a5df1e 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiButton.java +++ b/src/main/java/com/replaymod/gui/element/GuiButton.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiButton extends AbstractGuiButton { public GuiButton() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiCheckbox.java b/src/main/java/com/replaymod/gui/element/GuiCheckbox.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiCheckbox.java rename to src/main/java/com/replaymod/gui/element/GuiCheckbox.java index cbedc7d97..ae22b79a1 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiCheckbox.java +++ b/src/main/java/com/replaymod/gui/element/GuiCheckbox.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiCheckbox extends AbstractGuiCheckbox { public GuiCheckbox() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiElement.java b/src/main/java/com/replaymod/gui/element/GuiElement.java similarity index 91% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiElement.java rename to src/main/java/com/replaymod/gui/element/GuiElement.java index 907676fac..e12f99831 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiElement.java +++ b/src/main/java/com/replaymod/gui/element/GuiElement.java @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiHorizontalScrollbar.java b/src/main/java/com/replaymod/gui/element/GuiHorizontalScrollbar.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiHorizontalScrollbar.java rename to src/main/java/com/replaymod/gui/element/GuiHorizontalScrollbar.java index 0db9099f7..9f717c364 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiHorizontalScrollbar.java +++ b/src/main/java/com/replaymod/gui/element/GuiHorizontalScrollbar.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiHorizontalScrollbar extends AbstractGuiHorizontalScrollbar { public GuiHorizontalScrollbar() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiImage.java b/src/main/java/com/replaymod/gui/element/GuiImage.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiImage.java rename to src/main/java/com/replaymod/gui/element/GuiImage.java index 7000b85aa..141d38e38 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiImage.java +++ b/src/main/java/com/replaymod/gui/element/GuiImage.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiImage extends AbstractGuiImage { public GuiImage() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiLabel.java b/src/main/java/com/replaymod/gui/element/GuiLabel.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiLabel.java rename to src/main/java/com/replaymod/gui/element/GuiLabel.java index 70d16434d..e6bdfcb5e 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiLabel.java +++ b/src/main/java/com/replaymod/gui/element/GuiLabel.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiLabel extends AbstractGuiLabel { public GuiLabel() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiNumberField.java b/src/main/java/com/replaymod/gui/element/GuiNumberField.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiNumberField.java rename to src/main/java/com/replaymod/gui/element/GuiNumberField.java index 3cd675e07..eba97fdc5 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiNumberField.java +++ b/src/main/java/com/replaymod/gui/element/GuiNumberField.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiNumberField extends AbstractGuiNumberField { public GuiNumberField() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiPasswordField.java b/src/main/java/com/replaymod/gui/element/GuiPasswordField.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiPasswordField.java rename to src/main/java/com/replaymod/gui/element/GuiPasswordField.java index 054e3ff20..407ed74fd 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiPasswordField.java +++ b/src/main/java/com/replaymod/gui/element/GuiPasswordField.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiPasswordField extends AbstractGuiPasswordField { public GuiPasswordField() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiSlider.java b/src/main/java/com/replaymod/gui/element/GuiSlider.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiSlider.java rename to src/main/java/com/replaymod/gui/element/GuiSlider.java index 97777ba00..64d2e6d58 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiSlider.java +++ b/src/main/java/com/replaymod/gui/element/GuiSlider.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiSlider extends AbstractGuiSlider { public GuiSlider() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiTextField.java b/src/main/java/com/replaymod/gui/element/GuiTextField.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiTextField.java rename to src/main/java/com/replaymod/gui/element/GuiTextField.java index 6413f4836..2d5301423 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiTextField.java +++ b/src/main/java/com/replaymod/gui/element/GuiTextField.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiTextField extends AbstractGuiTextField { public GuiTextField() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiTexturedButton.java b/src/main/java/com/replaymod/gui/element/GuiTexturedButton.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiTexturedButton.java rename to src/main/java/com/replaymod/gui/element/GuiTexturedButton.java index 841cb8ec5..7e8825d87 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiTexturedButton.java +++ b/src/main/java/com/replaymod/gui/element/GuiTexturedButton.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiTexturedButton extends AbstractGuiTexturedButton { public GuiTexturedButton() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiToggleButton.java b/src/main/java/com/replaymod/gui/element/GuiToggleButton.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiToggleButton.java rename to src/main/java/com/replaymod/gui/element/GuiToggleButton.java index 3dbfc3fa8..131806e9f 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiToggleButton.java +++ b/src/main/java/com/replaymod/gui/element/GuiToggleButton.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiToggleButton extends AbstractGuiToggleButton> { public GuiToggleButton() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/GuiTooltip.java b/src/main/java/com/replaymod/gui/element/GuiTooltip.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/element/GuiTooltip.java rename to src/main/java/com/replaymod/gui/element/GuiTooltip.java index 363ecf6e8..1c6d750a2 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/GuiTooltip.java +++ b/src/main/java/com/replaymod/gui/element/GuiTooltip.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; public class GuiTooltip extends AbstractGuiTooltip { @Override diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiButton.java b/src/main/java/com/replaymod/gui/element/IGuiButton.java similarity index 98% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiButton.java rename to src/main/java/com/replaymod/gui/element/IGuiButton.java index 4d7651dc7..b9dd98262 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiButton.java +++ b/src/main/java/com/replaymod/gui/element/IGuiButton.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiCheckbox.java b/src/main/java/com/replaymod/gui/element/IGuiCheckbox.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiCheckbox.java rename to src/main/java/com/replaymod/gui/element/IGuiCheckbox.java index 8b64c4de7..00d95e1d3 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiCheckbox.java +++ b/src/main/java/com/replaymod/gui/element/IGuiCheckbox.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; public interface IGuiCheckbox> extends IGuiClickable { T setLabel(String label); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiClickable.java b/src/main/java/com/replaymod/gui/element/IGuiClickable.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiClickable.java rename to src/main/java/com/replaymod/gui/element/IGuiClickable.java index 7d77fc075..7166c4e9a 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiClickable.java +++ b/src/main/java/com/replaymod/gui/element/IGuiClickable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; public interface IGuiClickable> extends GuiElement { T onClick(Runnable onClick); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiHorizontalScrollbar.java b/src/main/java/com/replaymod/gui/element/IGuiHorizontalScrollbar.java similarity index 98% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiHorizontalScrollbar.java rename to src/main/java/com/replaymod/gui/element/IGuiHorizontalScrollbar.java index 89df6e722..ab79984d4 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiHorizontalScrollbar.java +++ b/src/main/java/com/replaymod/gui/element/IGuiHorizontalScrollbar.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; public interface IGuiHorizontalScrollbar> extends GuiElement { /** diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiImage.java b/src/main/java/com/replaymod/gui/element/IGuiImage.java similarity index 94% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiImage.java rename to src/main/java/com/replaymod/gui/element/IGuiImage.java index 966a4ed8b..8afb30544 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiImage.java +++ b/src/main/java/com/replaymod/gui/element/IGuiImage.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.versions.Image; +import com.replaymod.gui.versions.Image; import net.minecraft.util.Identifier; public interface IGuiImage> extends GuiElement { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiLabel.java b/src/main/java/com/replaymod/gui/element/IGuiLabel.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiLabel.java rename to src/main/java/com/replaymod/gui/element/IGuiLabel.java index 76a1ea7db..f843bd06f 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiLabel.java +++ b/src/main/java/com/replaymod/gui/element/IGuiLabel.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiNumberField.java b/src/main/java/com/replaymod/gui/element/IGuiNumberField.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiNumberField.java rename to src/main/java/com/replaymod/gui/element/IGuiNumberField.java index 8d2bdd4e0..e1f667dcf 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiNumberField.java +++ b/src/main/java/com/replaymod/gui/element/IGuiNumberField.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; public interface IGuiNumberField> extends IGuiTextField { byte getByte(); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiSlider.java b/src/main/java/com/replaymod/gui/element/IGuiSlider.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiSlider.java rename to src/main/java/com/replaymod/gui/element/IGuiSlider.java index 68ee960ee..b301f4936 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiSlider.java +++ b/src/main/java/com/replaymod/gui/element/IGuiSlider.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; public interface IGuiSlider> extends GuiElement { T setText(String text); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiTextField.java b/src/main/java/com/replaymod/gui/element/IGuiTextField.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiTextField.java rename to src/main/java/com/replaymod/gui/element/IGuiTextField.java index f63ebdebb..e22519416 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiTextField.java +++ b/src/main/java/com/replaymod/gui/element/IGuiTextField.java @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; -import de.johni0702.minecraft.gui.function.Focusable; -import de.johni0702.minecraft.gui.utils.Consumer; -import de.johni0702.minecraft.gui.utils.NonNull; +import com.replaymod.gui.function.Focusable; +import com.replaymod.gui.utils.Consumer; +import com.replaymod.gui.utils.NonNull; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; public interface IGuiTextField> extends GuiElement, Focusable { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiTexturedButton.java b/src/main/java/com/replaymod/gui/element/IGuiTexturedButton.java similarity index 98% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiTexturedButton.java rename to src/main/java/com/replaymod/gui/element/IGuiTexturedButton.java index 9efc43a0d..01b17dae7 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiTexturedButton.java +++ b/src/main/java/com/replaymod/gui/element/IGuiTexturedButton.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiToggleButton.java b/src/main/java/com/replaymod/gui/element/IGuiToggleButton.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/element/IGuiToggleButton.java rename to src/main/java/com/replaymod/gui/element/IGuiToggleButton.java index 06ff05ae4..6bdf6d3ea 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiToggleButton.java +++ b/src/main/java/com/replaymod/gui/element/IGuiToggleButton.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element; +package com.replaymod.gui.element; public interface IGuiToggleButton> extends IGuiButton { T setValues(V[] values); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiColorPicker.java b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiColorPicker.java similarity index 91% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiColorPicker.java rename to src/main/java/com/replaymod/gui/element/advanced/AbstractGuiColorPicker.java index 74b463266..318793365 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiColorPicker.java +++ b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiColorPicker.java @@ -22,18 +22,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; - -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.OffsetGuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.AbstractComposedGuiElement; -import de.johni0702.minecraft.gui.element.AbstractGuiElement; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.function.Clickable; -import de.johni0702.minecraft.gui.function.Draggable; -import de.johni0702.minecraft.gui.utils.Consumer; +package com.replaymod.gui.element.advanced; + +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.element.AbstractComposedGuiElement; +import com.replaymod.gui.element.AbstractGuiElement; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.function.Clickable; +import com.replaymod.gui.function.Draggable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.OffsetGuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; @@ -45,7 +45,7 @@ import java.util.Collections; public abstract class AbstractGuiColorPicker> - extends AbstractComposedGuiElement implements IGuiColorPicker, Clickable { + extends AbstractComposedGuiElement implements IGuiColorPicker, com.replaymod.gui.function.Clickable { protected static final int PICKER_SIZE = 100; private static final ReadableColor OUTLINE_COLOR = new Color(255, 255, 255); @@ -137,8 +137,8 @@ public T setOpened(boolean opened) { } @Override - public Collection getChildren() { - return opened ? Collections.singleton(picker) : Collections.emptyList(); + public Collection getChildren() { + return opened ? Collections.singleton(picker) : Collections.emptyList(); } @Override diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiDropdownMenu.java b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiDropdownMenu.java similarity index 86% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiDropdownMenu.java rename to src/main/java/com/replaymod/gui/element/advanced/AbstractGuiDropdownMenu.java index 76965ff68..b0b5c919d 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiDropdownMenu.java +++ b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiDropdownMenu.java @@ -22,27 +22,27 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; - -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.OffsetGuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.element.AbstractComposedGuiElement; -import de.johni0702.minecraft.gui.element.AbstractGuiClickable; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.element.IGuiClickable; -import de.johni0702.minecraft.gui.function.Clickable; -import de.johni0702.minecraft.gui.layout.VerticalLayout; -import de.johni0702.minecraft.gui.utils.Consumer; +package com.replaymod.gui.element.advanced; + +import com.replaymod.gui.element.AbstractComposedGuiElement; +import com.replaymod.gui.element.AbstractGuiClickable; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.IGuiClickable; +import com.replaymod.gui.function.Clickable; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.versions.MCVer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.OffsetGuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; import net.minecraft.client.font.TextRenderer; import java.util.Collection; @@ -65,7 +65,7 @@ public abstract class AbstractGuiDropdownMenu unmodifiableDropdownEntries; + private Map unmodifiableDropdownEntries; private Function toString = Object::toString; @@ -83,7 +83,7 @@ public int getMaxLayer() { @Override protected ReadableDimension calcMinSize() { - TextRenderer fontRenderer = MCVer.getFontRenderer(); + TextRenderer fontRenderer = com.replaymod.gui.versions.MCVer.getFontRenderer(); int maxWidth = 0; for (V value : values) { int width = fontRenderer.getWidth(toString.apply(value)); @@ -97,7 +97,7 @@ protected ReadableDimension calcMinSize() { @Override public void layout(ReadableDimension size, RenderInfo renderInfo) { super.layout(size, renderInfo); - TextRenderer fontRenderer = MCVer.getFontRenderer(); + TextRenderer fontRenderer = com.replaymod.gui.versions.MCVer.getFontRenderer(); if (renderInfo.layer == 1) { ReadablePoint offsetPoint = new Point(0, size.getHeight()); ReadableDimension offsetSize = new Dimension(size.getWidth(), (fontRenderer.fontHeight + 5) * values.length); @@ -108,7 +108,7 @@ public void layout(ReadableDimension size, RenderInfo renderInfo) { @Override public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) { super.draw(renderer, size, renderInfo); - TextRenderer fontRenderer = MCVer.getFontRenderer(); + TextRenderer fontRenderer = com.replaymod.gui.versions.MCVer.getFontRenderer(); if (renderInfo.layer == 0) { int width = size.getWidth(); int height = size.getHeight(); @@ -146,7 +146,7 @@ public T setValues(V... values) { this.values = values; dropdown = new GuiPanel(){ @Override - public void convertFor(GuiElement element, Point point, int relativeLayer) { + public void convertFor(com.replaymod.gui.element.GuiElement element, Point point, int relativeLayer) { AbstractGuiDropdownMenu parent = AbstractGuiDropdownMenu.this; if (parent.getContainer() != null) { parent.getContainer().convertFor(parent, point, relativeLayer + 1); @@ -155,7 +155,7 @@ public void convertFor(GuiElement element, Point point, int relativeLayer) { super.convertFor(element, point, relativeLayer); } }.setLayout(new VerticalLayout()); - Map dropdownEntries = new LinkedHashMap<>(); + Map dropdownEntries = new LinkedHashMap<>(); for (V value : values) { DropdownEntry entry = new DropdownEntry(value); dropdownEntries.put(value, entry); @@ -194,8 +194,8 @@ public T setOpened(boolean opened) { } @Override - public Collection getChildren() { - return opened ? Collections.singletonList(dropdown) : Collections.emptyList(); + public Collection getChildren() { + return opened ? Collections.singletonList(dropdown) : Collections.emptyList(); } @Override diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiProgressBar.java b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiProgressBar.java similarity index 91% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiProgressBar.java rename to src/main/java/com/replaymod/gui/element/advanced/AbstractGuiProgressBar.java index 10336d0cc..875fa7aff 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiProgressBar.java +++ b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiProgressBar.java @@ -22,16 +22,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.AbstractGuiElement; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.element.AbstractGuiElement; +import com.replaymod.gui.versions.MCVer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import de.johni0702.minecraft.gui.versions.MCVer; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.resource.language.I18n; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiResourceLoadingList.java b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiResourceLoadingList.java similarity index 84% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiResourceLoadingList.java rename to src/main/java/com/replaymod/gui/element/advanced/AbstractGuiResourceLoadingList.java index c4f350cf6..be0664953 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiResourceLoadingList.java +++ b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiResourceLoadingList.java @@ -22,29 +22,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.AbstractGuiVerticalList; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.function.Clickable; -import de.johni0702.minecraft.gui.function.Closeable; -import de.johni0702.minecraft.gui.function.Loadable; -import de.johni0702.minecraft.gui.function.Tickable; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; -import de.johni0702.minecraft.gui.utils.Colors; -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.container.AbstractGuiVerticalList; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.function.*; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.utils.Colors; +import com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; import net.minecraft.client.gui.screen.Screen; import java.util.ArrayList; @@ -53,20 +48,20 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.Supplier; -import static de.johni0702.minecraft.gui.utils.Utils.DOUBLE_CLICK_INTERVAL; +import static com.replaymod.gui.utils.Utils.DOUBLE_CLICK_INTERVAL; //#if MC>=11400 -import de.johni0702.minecraft.gui.versions.MCVer.Keyboard; + //#else //$$ import org.lwjgl.input.Keyboard; //#endif public abstract class AbstractGuiResourceLoadingList - , U extends GuiElement & Comparable> + , U extends com.replaymod.gui.element.GuiElement & Comparable> extends AbstractGuiVerticalList implements Tickable, Loadable, Closeable, Typeable { private static final String[] LOADING_TEXT = {"Ooo", "oOo", "ooO", "oOo"}; - private final GuiLabel loadingElement = new GuiLabel(); - private final GuiPanel resourcesPanel = new GuiPanel(getListPanel()).setLayout(new VerticalLayout()); + private final com.replaymod.gui.element.GuiLabel loadingElement = new GuiLabel(); + private final com.replaymod.gui.container.GuiPanel resourcesPanel = new com.replaymod.gui.container.GuiPanel(getListPanel()).setLayout(new com.replaymod.gui.layout.VerticalLayout()); private final Queue resourcesQueue = new ConcurrentLinkedQueue<>(); @@ -82,7 +77,7 @@ public abstract class AbstractGuiResourceLoadingList public AbstractGuiResourceLoadingList() { } - public AbstractGuiResourceLoadingList(GuiContainer container) { + public AbstractGuiResourceLoadingList(com.replaymod.gui.container.GuiContainer container) { super(container); } @@ -110,7 +105,7 @@ public void load() { // Clear list resourcesQueue.clear(); - for (GuiElement element : new ArrayList<>(resourcesPanel.getChildren())) { + for (com.replaymod.gui.element.GuiElement element : new ArrayList<>(resourcesPanel.getChildren())) { resourcesPanel.removeElement(element); } selected.clear(); @@ -189,7 +184,7 @@ public List getSelected() { @Override public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, boolean ctrlDown, boolean shiftDown) { - if (Screen.hasControlDown() && keyCode == Keyboard.KEY_A) { + if (Screen.hasControlDown() && keyCode == com.replaymod.gui.versions.MCVer.Keyboard.KEY_A) { List all = new ArrayList<>(); for (GuiElement child : getListPanel().getChildren()) { if (child instanceof AbstractGuiResourceLoadingList.Element) { @@ -210,13 +205,13 @@ public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, b return false; } - private class Element extends GuiPanel implements Clickable, Comparable { + private class Element extends com.replaymod.gui.container.GuiPanel implements Clickable, Comparable { private final U resource; public Element(final U resource) { this.resource = resource; addElements(null, resource); - setLayout(new CustomLayout() { + setLayout(new CustomLayout() { @Override protected void layout(GuiPanel container, int width, int height) { pos(resource, 2, 2); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTextArea.java b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiTextArea.java similarity index 90% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTextArea.java rename to src/main/java/com/replaymod/gui/element/advanced/AbstractGuiTextArea.java index 203e9bcd2..ddf2c9133 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTextArea.java +++ b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiTextArea.java @@ -22,24 +22,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; - -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.AbstractGuiElement; -import de.johni0702.minecraft.gui.function.Clickable; -import de.johni0702.minecraft.gui.function.Focusable; -import de.johni0702.minecraft.gui.function.Tickable; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.utils.Consumer; +package com.replaymod.gui.element.advanced; + +import com.replaymod.gui.element.AbstractGuiElement; +import com.replaymod.gui.function.Clickable; +import com.replaymod.gui.function.Focusable; +import com.replaymod.gui.function.Tickable; +import com.replaymod.gui.function.Typeable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; @@ -53,8 +52,7 @@ import java.util.Arrays; -import static de.johni0702.minecraft.gui.utils.Utils.clamp; -import static de.johni0702.minecraft.gui.versions.MCVer.*; +import static com.replaymod.gui.utils.Utils.clamp; public abstract class AbstractGuiTextArea> extends AbstractGuiElement implements Clickable, Typeable, Tickable, IGuiTextArea { @@ -64,7 +62,7 @@ public abstract class AbstractGuiTextArea> private static final int LINE_SPACING = 2; private boolean focused; - private Focusable next, previous; + private com.replaymod.gui.function.Focusable next, previous; private Consumer focusChanged; @@ -198,14 +196,14 @@ public void deleteSelectedText() { private void updateCurrentOffset() { currentXOffset = Math.min(currentXOffset, cursorX); String line = text[cursorY].substring(currentXOffset, cursorX); - TextRenderer fontRenderer = MCVer.getFontRenderer(); + TextRenderer fontRenderer = com.replaymod.gui.versions.MCVer.getFontRenderer(); int currentWidth = fontRenderer.getWidth(line); if (currentWidth > size.getWidth() - BORDER * 2) { currentXOffset = cursorX - fontRenderer.trimToWidth(line, size.getWidth() - BORDER * 2, true).length(); } currentYOffset = Math.min(currentYOffset, cursorY); - int lineHeight = MCVer.getFontRenderer().fontHeight + LINE_SPACING; + int lineHeight = com.replaymod.gui.versions.MCVer.getFontRenderer().fontHeight + LINE_SPACING; int contentHeight = size.getHeight() - BORDER * 2; int maxLines = contentHeight / lineHeight; if (cursorY - currentYOffset >= maxLines) { @@ -382,7 +380,7 @@ public boolean mouseClick(ReadablePoint position, int button) { updateCurrentOffset(); int mouseX = position.getX() - BORDER; int mouseY = position.getY() - BORDER; - TextRenderer fontRenderer = MCVer.getFontRenderer(); + TextRenderer fontRenderer = com.replaymod.gui.versions.MCVer.getFontRenderer(); int textY = clamp(mouseY / (fontRenderer.fontHeight + LINE_SPACING) + currentYOffset, 0, text.length - 1); if (cursorY != textY) { currentXOffset = 0; @@ -414,13 +412,13 @@ public T setFocused(boolean isFocused) { } @Override - public T setNext(Focusable next) { + public T setNext(com.replaymod.gui.function.Focusable next) { this.next = next; return getThis(); } @Override - public T setPrevious(Focusable previous) { + public T setPrevious(com.replaymod.gui.function.Focusable previous) { this.previous = previous; return getThis(); } @@ -431,7 +429,7 @@ public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo render updateCurrentOffset(); super.draw(renderer, size, renderInfo); - TextRenderer fontRenderer = MCVer.getFontRenderer(); + TextRenderer fontRenderer = com.replaymod.gui.versions.MCVer.getFontRenderer(); int width = size.getWidth(); int height = size.getHeight(); @@ -509,8 +507,8 @@ public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo render @Override public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, boolean ctrlDown, boolean shiftDown) { - if (keyCode == Keyboard.KEY_TAB) { - Focusable other = shiftDown ? previous : next; + if (keyCode == com.replaymod.gui.versions.MCVer.Keyboard.KEY_TAB) { + com.replaymod.gui.function.Focusable other = shiftDown ? previous : next; if (other != null) { setFocused(false); other.setFocused(true); @@ -524,22 +522,22 @@ public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, b if (Screen.hasControlDown()) { switch (keyCode) { - case Keyboard.KEY_A: // Select all + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_A: // Select all cursorX = cursorY = 0; selectionY = text.length - 1; selectionX = text[selectionY].length(); return true; - case Keyboard.KEY_C: // Copy - MCVer.setClipboardString(getSelectedText()); + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_C: // Copy + com.replaymod.gui.versions.MCVer.setClipboardString(getSelectedText()); return true; - case Keyboard.KEY_V: // Paste + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_V: // Paste if (isEnabled()) { - writeText(MCVer.getClipboardString()); + writeText(com.replaymod.gui.versions.MCVer.getClipboardString()); } return true; - case Keyboard.KEY_X: // Cut + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_X: // Cut if (isEnabled()) { - MCVer.setClipboardString(cutSelectedText()); + com.replaymod.gui.versions.MCVer.setClipboardString(cutSelectedText()); } return true; } @@ -548,13 +546,13 @@ public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, b boolean words = Screen.hasControlDown(); boolean select = Screen.hasShiftDown(); switch (keyCode) { - case Keyboard.KEY_HOME: + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_HOME: cursorX = 0; break; - case Keyboard.KEY_END: + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_END: cursorX = text[cursorY].length(); break; - case Keyboard.KEY_LEFT: + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_LEFT: if (cursorX == 0) { if (cursorY > 0) { cursorY--; @@ -568,7 +566,7 @@ public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, b } } break; - case Keyboard.KEY_RIGHT: + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_RIGHT: if (cursorX == text[cursorY].length()) { if (cursorY < text.length - 1) { cursorY++; @@ -582,19 +580,19 @@ public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, b } } break; - case Keyboard.KEY_UP: + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_UP: if (cursorY > 0) { cursorY--; cursorX = Math.min(cursorX, text[cursorY].length()); } break; - case Keyboard.KEY_DOWN: + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_DOWN: if (cursorY + 1 < text.length) { cursorY++; cursorX = Math.min(cursorX, text[cursorY].length()); } break; - case Keyboard.KEY_BACK: + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_BACK: if (isEnabled()) { if (getSelectedText().length() > 0) { deleteSelectedText(); @@ -605,7 +603,7 @@ public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, b } } return true; - case Keyboard.KEY_DELETE: + case com.replaymod.gui.versions.MCVer.Keyboard.KEY_DELETE: if (isEnabled()) { if (getSelectedText().length() > 0) { deleteSelectedText(); @@ -704,7 +702,7 @@ public boolean isFocused() { return this.focused; } - public Focusable getNext() { + public com.replaymod.gui.function.Focusable getNext() { return this.next; } diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTimeline.java b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiTimeline.java similarity index 95% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTimeline.java rename to src/main/java/com/replaymod/gui/element/advanced/AbstractGuiTimeline.java index ed7d2f656..a2bc3e5fb 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTimeline.java +++ b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiTimeline.java @@ -22,23 +22,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; - -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.AbstractGuiElement; -import de.johni0702.minecraft.gui.element.GuiTooltip; -import de.johni0702.minecraft.gui.function.Clickable; -import de.johni0702.minecraft.gui.utils.Colors; -import de.johni0702.minecraft.gui.utils.Utils; +package com.replaymod.gui.element.advanced; + +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.element.AbstractGuiElement; +import com.replaymod.gui.element.GuiTooltip; +import com.replaymod.gui.function.Clickable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.utils.Colors; +import com.replaymod.gui.utils.Utils; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import static de.johni0702.minecraft.gui.utils.Utils.clamp; +import static com.replaymod.gui.utils.Utils.clamp; public abstract class AbstractGuiTimeline> extends AbstractGuiElement implements IGuiTimeline, Clickable { protected static final int TEXTURE_WIDTH = 64; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTimelineTime.java b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiTimelineTime.java similarity index 87% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTimelineTime.java rename to src/main/java/com/replaymod/gui/element/advanced/AbstractGuiTimelineTime.java index 9b5d62a1a..7adff7b82 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTimelineTime.java +++ b/src/main/java/com/replaymod/gui/element/advanced/AbstractGuiTimelineTime.java @@ -22,19 +22,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.AbstractGuiElement; -import de.johni0702.minecraft.gui.utils.Colors; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.element.AbstractGuiElement; +import com.replaymod.gui.versions.MCVer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +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.MCVer; -import static de.johni0702.minecraft.gui.element.advanced.AbstractGuiTimeline.BORDER_LEFT; -import static de.johni0702.minecraft.gui.element.advanced.AbstractGuiTimeline.BORDER_RIGHT; +import static com.replaymod.gui.element.advanced.AbstractGuiTimeline.BORDER_LEFT; +import static com.replaymod.gui.element.advanced.AbstractGuiTimeline.BORDER_RIGHT; public abstract class AbstractGuiTimelineTime, U extends AbstractGuiTimeline> extends AbstractGuiElement implements IGuiTimelineTime { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiColorPicker.java b/src/main/java/com/replaymod/gui/element/advanced/GuiColorPicker.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiColorPicker.java rename to src/main/java/com/replaymod/gui/element/advanced/GuiColorPicker.java index 4939ff477..7841ca914 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiColorPicker.java +++ b/src/main/java/com/replaymod/gui/element/advanced/GuiColorPicker.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiColorPicker extends AbstractGuiColorPicker { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiDropdownMenu.java b/src/main/java/com/replaymod/gui/element/advanced/GuiDropdownMenu.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiDropdownMenu.java rename to src/main/java/com/replaymod/gui/element/advanced/GuiDropdownMenu.java index 72eb32615..aabf46757 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiDropdownMenu.java +++ b/src/main/java/com/replaymod/gui/element/advanced/GuiDropdownMenu.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiDropdownMenu extends AbstractGuiDropdownMenu> { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiProgressBar.java b/src/main/java/com/replaymod/gui/element/advanced/GuiProgressBar.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiProgressBar.java rename to src/main/java/com/replaymod/gui/element/advanced/GuiProgressBar.java index 9cda0fa95..178b57adb 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiProgressBar.java +++ b/src/main/java/com/replaymod/gui/element/advanced/GuiProgressBar.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiProgressBar extends AbstractGuiProgressBar { public GuiProgressBar() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiResourceLoadingList.java b/src/main/java/com/replaymod/gui/element/advanced/GuiResourceLoadingList.java similarity index 90% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiResourceLoadingList.java rename to src/main/java/com/replaymod/gui/element/advanced/GuiResourceLoadingList.java index 6127db046..6857143f4 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiResourceLoadingList.java +++ b/src/main/java/com/replaymod/gui/element/advanced/GuiResourceLoadingList.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.GuiElement; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.container.GuiContainer; public class GuiResourceLoadingList & Comparable> extends AbstractGuiResourceLoadingList, U> { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiTextArea.java b/src/main/java/com/replaymod/gui/element/advanced/GuiTextArea.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiTextArea.java rename to src/main/java/com/replaymod/gui/element/advanced/GuiTextArea.java index 0903c8c88..2aca39a50 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiTextArea.java +++ b/src/main/java/com/replaymod/gui/element/advanced/GuiTextArea.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiTextArea extends AbstractGuiTextArea { public GuiTextArea() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiTimeline.java b/src/main/java/com/replaymod/gui/element/advanced/GuiTimeline.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiTimeline.java rename to src/main/java/com/replaymod/gui/element/advanced/GuiTimeline.java index b60408316..b45c40286 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiTimeline.java +++ b/src/main/java/com/replaymod/gui/element/advanced/GuiTimeline.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiTimeline extends AbstractGuiTimeline { public GuiTimeline() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiTimelineTime.java b/src/main/java/com/replaymod/gui/element/advanced/GuiTimelineTime.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiTimelineTime.java rename to src/main/java/com/replaymod/gui/element/advanced/GuiTimelineTime.java index 9d1c5171b..629d97bb3 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/GuiTimelineTime.java +++ b/src/main/java/com/replaymod/gui/element/advanced/GuiTimelineTime.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiContainer; public class GuiTimelineTime> extends AbstractGuiTimelineTime, U> { public GuiTimelineTime() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiColorPicker.java b/src/main/java/com/replaymod/gui/element/advanced/IGuiColorPicker.java similarity index 90% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiColorPicker.java rename to src/main/java/com/replaymod/gui/element/advanced/IGuiColorPicker.java index 7ed9640ec..1ca148957 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiColorPicker.java +++ b/src/main/java/com/replaymod/gui/element/advanced/IGuiColorPicker.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; public interface IGuiColorPicker> extends GuiElement { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiDropdownMenu.java b/src/main/java/com/replaymod/gui/element/advanced/IGuiDropdownMenu.java similarity index 91% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiDropdownMenu.java rename to src/main/java/com/replaymod/gui/element/advanced/IGuiDropdownMenu.java index b76c8b909..27a8508a9 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiDropdownMenu.java +++ b/src/main/java/com/replaymod/gui/element/advanced/IGuiDropdownMenu.java @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.element.IGuiClickable; -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.IGuiClickable; +import com.replaymod.gui.utils.Consumer; import java.util.Map; import java.util.function.Function; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiProgressBar.java b/src/main/java/com/replaymod/gui/element/advanced/IGuiProgressBar.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiProgressBar.java rename to src/main/java/com/replaymod/gui/element/advanced/IGuiProgressBar.java index 9f940e664..0fd7a36eb 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiProgressBar.java +++ b/src/main/java/com/replaymod/gui/element/advanced/IGuiProgressBar.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.element.GuiElement; +import com.replaymod.gui.element.GuiElement; public interface IGuiProgressBar> extends GuiElement { T setProgress(float progress); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiTextArea.java b/src/main/java/com/replaymod/gui/element/advanced/IGuiTextArea.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiTextArea.java rename to src/main/java/com/replaymod/gui/element/advanced/IGuiTextArea.java index 32ccfc12a..e8e049c67 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiTextArea.java +++ b/src/main/java/com/replaymod/gui/element/advanced/IGuiTextArea.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.function.Focusable; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.function.Focusable; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; public interface IGuiTextArea> extends GuiElement, Focusable { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiTimeline.java b/src/main/java/com/replaymod/gui/element/advanced/IGuiTimeline.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiTimeline.java rename to src/main/java/com/replaymod/gui/element/advanced/IGuiTimeline.java index e4508b1b1..6e4c71cf5 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiTimeline.java +++ b/src/main/java/com/replaymod/gui/element/advanced/IGuiTimeline.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.element.GuiElement; +import com.replaymod.gui.element.GuiElement; public interface IGuiTimeline> extends GuiElement { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiTimelineTime.java b/src/main/java/com/replaymod/gui/element/advanced/IGuiTimelineTime.java similarity index 94% rename from src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiTimelineTime.java rename to src/main/java/com/replaymod/gui/element/advanced/IGuiTimelineTime.java index a536190e7..c0066a3eb 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiTimelineTime.java +++ b/src/main/java/com/replaymod/gui/element/advanced/IGuiTimelineTime.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.element.advanced; +package com.replaymod.gui.element.advanced; -import de.johni0702.minecraft.gui.element.GuiElement; +import com.replaymod.gui.element.GuiElement; /** * Displays the time of a timeline at its big markers. diff --git a/src/main/java/de/johni0702/minecraft/gui/function/Clickable.java b/src/main/java/com/replaymod/gui/function/Clickable.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/function/Clickable.java rename to src/main/java/com/replaymod/gui/function/Clickable.java index 3064230c0..44d136d6b 100644 --- a/src/main/java/de/johni0702/minecraft/gui/function/Clickable.java +++ b/src/main/java/com/replaymod/gui/function/Clickable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.function; +package com.replaymod.gui.function; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; diff --git a/src/main/java/de/johni0702/minecraft/gui/function/Closeable.java b/src/main/java/com/replaymod/gui/function/Closeable.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/function/Closeable.java rename to src/main/java/com/replaymod/gui/function/Closeable.java index 0079989c3..8367d0e89 100644 --- a/src/main/java/de/johni0702/minecraft/gui/function/Closeable.java +++ b/src/main/java/com/replaymod/gui/function/Closeable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.function; +package com.replaymod.gui.function; public interface Closeable { void close(); diff --git a/src/main/java/de/johni0702/minecraft/gui/function/Draggable.java b/src/main/java/com/replaymod/gui/function/Draggable.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/function/Draggable.java rename to src/main/java/com/replaymod/gui/function/Draggable.java index 4e594d821..e20bc581a 100644 --- a/src/main/java/de/johni0702/minecraft/gui/function/Draggable.java +++ b/src/main/java/com/replaymod/gui/function/Draggable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.function; +package com.replaymod.gui.function; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; diff --git a/src/main/java/de/johni0702/minecraft/gui/function/Focusable.java b/src/main/java/com/replaymod/gui/function/Focusable.java similarity index 94% rename from src/main/java/de/johni0702/minecraft/gui/function/Focusable.java rename to src/main/java/com/replaymod/gui/function/Focusable.java index 2d782df1d..16400a150 100644 --- a/src/main/java/de/johni0702/minecraft/gui/function/Focusable.java +++ b/src/main/java/com/replaymod/gui/function/Focusable.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.function; +package com.replaymod.gui.function; -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.utils.Consumer; public interface Focusable> { diff --git a/src/main/java/de/johni0702/minecraft/gui/function/Loadable.java b/src/main/java/com/replaymod/gui/function/Loadable.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/function/Loadable.java rename to src/main/java/com/replaymod/gui/function/Loadable.java index b8f422fbf..6099880f7 100644 --- a/src/main/java/de/johni0702/minecraft/gui/function/Loadable.java +++ b/src/main/java/com/replaymod/gui/function/Loadable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.function; +package com.replaymod.gui.function; public interface Loadable { void load(); diff --git a/src/main/java/de/johni0702/minecraft/gui/function/Scrollable.java b/src/main/java/com/replaymod/gui/function/Scrollable.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/function/Scrollable.java rename to src/main/java/com/replaymod/gui/function/Scrollable.java index e40d92a08..cb07c2577 100644 --- a/src/main/java/de/johni0702/minecraft/gui/function/Scrollable.java +++ b/src/main/java/com/replaymod/gui/function/Scrollable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.function; +package com.replaymod.gui.function; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; diff --git a/src/main/java/de/johni0702/minecraft/gui/function/Tickable.java b/src/main/java/com/replaymod/gui/function/Tickable.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/function/Tickable.java rename to src/main/java/com/replaymod/gui/function/Tickable.java index 51691f644..6502d9f21 100644 --- a/src/main/java/de/johni0702/minecraft/gui/function/Tickable.java +++ b/src/main/java/com/replaymod/gui/function/Tickable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.function; +package com.replaymod.gui.function; public interface Tickable { void tick(); diff --git a/src/main/java/de/johni0702/minecraft/gui/function/Typeable.java b/src/main/java/com/replaymod/gui/function/Typeable.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/function/Typeable.java rename to src/main/java/com/replaymod/gui/function/Typeable.java index 6ba17fe68..6f665f4d6 100644 --- a/src/main/java/de/johni0702/minecraft/gui/function/Typeable.java +++ b/src/main/java/com/replaymod/gui/function/Typeable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.function; +package com.replaymod.gui.function; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/CustomLayout.java b/src/main/java/com/replaymod/gui/layout/CustomLayout.java similarity index 95% rename from src/main/java/de/johni0702/minecraft/gui/layout/CustomLayout.java rename to src/main/java/com/replaymod/gui/layout/CustomLayout.java index df3237b0c..88cc79f7c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/CustomLayout.java +++ b/src/main/java/com/replaymod/gui/layout/CustomLayout.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.layout; +package com.replaymod.gui.layout; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.GuiElement; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.element.GuiElement; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; @@ -36,8 +36,8 @@ import java.util.LinkedHashMap; import java.util.Map; -public abstract class CustomLayout> implements Layout { - private final Layout parent; +public abstract class CustomLayout> implements com.replaymod.gui.layout.Layout { + private final com.replaymod.gui.layout.Layout parent; private final Map> result = new LinkedHashMap<>(); public CustomLayout() { diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/GridLayout.java b/src/main/java/com/replaymod/gui/layout/GridLayout.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/layout/GridLayout.java rename to src/main/java/com/replaymod/gui/layout/GridLayout.java index 24db00c7b..949d25122 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/GridLayout.java +++ b/src/main/java/com/replaymod/gui/layout/GridLayout.java @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.layout; +package com.replaymod.gui.layout; import com.google.common.base.Preconditions; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.GuiElement; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.element.GuiElement; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; @@ -66,7 +66,7 @@ public Map> layOut(GuiContain } Map> map = new LinkedHashMap<>(); - Iterator> iter = container.getElements().entrySet().iterator(); + Iterator> iter = container.getElements().entrySet().iterator(); for (int i = 0; i < rows; i++) { for (int j = 0; j < columns; j++) { if (!iter.hasNext()) { @@ -92,7 +92,7 @@ public Map> layOut(GuiContain } } - Map.Entry entry = iter.next(); + Map.Entry entry = iter.next(); GuiElement element = entry.getKey(); Data data = entry.getValue() instanceof Data ? (Data) entry.getValue() : DEFAULT_DATA; Dimension elementSize = new Dimension(element.getMinSize()); @@ -116,7 +116,7 @@ public ReadableDimension calcMinSize(GuiContainer container) { int maxWidth = 0, maxHeight = 0; int elements = 0; - for (Map.Entry entry : container.getElements().entrySet()) { + for (Map.Entry entry : container.getElements().entrySet()) { GuiElement element = entry.getKey(); ReadableDimension minSize = element.getMinSize(); @@ -164,7 +164,7 @@ private Pair calcNeededCellSize(GuiContainer container) { int[] rowMaxHeight = new int[(container.getElements().size() - 1 + columns) / columns]; int elements = 0; - for (Map.Entry entry : container.getElements().entrySet()) { + for (Map.Entry entry : container.getElements().entrySet()) { int column = elements % columns; int row = elements / columns; diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/HorizontalLayout.java b/src/main/java/com/replaymod/gui/layout/HorizontalLayout.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/layout/HorizontalLayout.java rename to src/main/java/com/replaymod/gui/layout/HorizontalLayout.java index fec06f2c1..71feeb2aa 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/HorizontalLayout.java +++ b/src/main/java/com/replaymod/gui/layout/HorizontalLayout.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.layout; +package com.replaymod.gui.layout; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.GuiElement; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.element.GuiElement; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; @@ -56,7 +56,7 @@ public Map> layOut(GuiContain int x = 0; int spacing = 0; Map> map = new LinkedHashMap<>(); - for (Map.Entry entry : container.getElements().entrySet()) { + for (Map.Entry entry : container.getElements().entrySet()) { x += spacing; spacing = this.spacing; @@ -88,7 +88,7 @@ public ReadableDimension calcMinSize(GuiContainer container) { int maxHeight = 0; int width = 0; int spacing = 0; - for (Map.Entry entry : container.getElements().entrySet()) { + for (Map.Entry entry : container.getElements().entrySet()) { width += spacing; spacing = this.spacing; diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/Layout.java b/src/main/java/com/replaymod/gui/layout/Layout.java similarity index 88% rename from src/main/java/de/johni0702/minecraft/gui/layout/Layout.java rename to src/main/java/com/replaymod/gui/layout/Layout.java index e00cfaf4f..0ba241387 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/Layout.java +++ b/src/main/java/com/replaymod/gui/layout/Layout.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.layout; +package com.replaymod.gui.layout; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.GuiElement; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.element.GuiElement; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; import org.apache.commons.lang3.tuple.Pair; @@ -34,7 +34,7 @@ public interface Layout { - Map> layOut(GuiContainer container, ReadableDimension size); + Map> layOut(com.replaymod.gui.container.GuiContainer container, ReadableDimension size); ReadableDimension calcMinSize(GuiContainer container); diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/LayoutData.java b/src/main/java/com/replaymod/gui/layout/LayoutData.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/layout/LayoutData.java rename to src/main/java/com/replaymod/gui/layout/LayoutData.java index aaf4c2c23..38dd8a5c5 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/LayoutData.java +++ b/src/main/java/com/replaymod/gui/layout/LayoutData.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.layout; +package com.replaymod.gui.layout; public interface LayoutData { LayoutData NONE = VoidLayoutData.INSTANCE; diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/VerticalLayout.java b/src/main/java/com/replaymod/gui/layout/VerticalLayout.java similarity index 94% rename from src/main/java/de/johni0702/minecraft/gui/layout/VerticalLayout.java rename to src/main/java/com/replaymod/gui/layout/VerticalLayout.java index 208d540bf..fde410694 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/VerticalLayout.java +++ b/src/main/java/com/replaymod/gui/layout/VerticalLayout.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.layout; +package com.replaymod.gui.layout; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.element.GuiElement; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.element.GuiElement; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; @@ -56,7 +56,7 @@ public Map> layOut(GuiContain int y = 0; int spacing = 0; Map> map = new LinkedHashMap<>(); - for (Map.Entry entry : container.getElements().entrySet()) { + for (Map.Entry entry : container.getElements().entrySet()) { y += spacing; spacing = this.spacing; @@ -88,7 +88,7 @@ public ReadableDimension calcMinSize(GuiContainer container) { int maxWidth = 0; int height = 0; int spacing = 0; - for (Map.Entry entry : container.getElements().entrySet()) { + for (Map.Entry entry : container.getElements().entrySet()) { height += spacing; spacing = this.spacing; diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/VoidLayoutData.java b/src/main/java/com/replaymod/gui/layout/VoidLayoutData.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/layout/VoidLayoutData.java rename to src/main/java/com/replaymod/gui/layout/VoidLayoutData.java index d20a9c27c..63b5d88d2 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/VoidLayoutData.java +++ b/src/main/java/com/replaymod/gui/layout/VoidLayoutData.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.layout; +package com.replaymod.gui.layout; public class VoidLayoutData implements LayoutData { public static final VoidLayoutData INSTANCE = new VoidLayoutData(); diff --git a/src/main/java/de/johni0702/minecraft/gui/popup/AbstractGuiPopup.java b/src/main/java/com/replaymod/gui/popup/AbstractGuiPopup.java similarity index 79% rename from src/main/java/de/johni0702/minecraft/gui/popup/AbstractGuiPopup.java rename to src/main/java/com/replaymod/gui/popup/AbstractGuiPopup.java index 7f41e16e4..4c0e5710c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/popup/AbstractGuiPopup.java +++ b/src/main/java/com/replaymod/gui/popup/AbstractGuiPopup.java @@ -22,23 +22,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.popup; - -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.AbstractGuiOverlay; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.Layout; +package com.replaymod.gui.popup; + +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.AbstractGuiContainer; +import com.replaymod.gui.container.AbstractGuiOverlay; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.Layout; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import java.util.function.Function; public abstract class AbstractGuiPopup> extends AbstractGuiContainer { - private final GuiPanel popupContainer = new GuiPanel(this){ + private final com.replaymod.gui.container.GuiPanel popupContainer = new com.replaymod.gui.container.GuiPanel(this){ private final int u0 = 0; private final int v0 = 39; @@ -81,24 +81,24 @@ public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo render super.draw(renderer, size, renderInfo); } - }.setLayout(new CustomLayout() { + }.setLayout(new com.replaymod.gui.layout.CustomLayout() { @Override - protected void layout(GuiPanel container, int width, int height) { + protected void layout(com.replaymod.gui.container.GuiPanel container, int width, int height) { pos(popup, 10, 10); } @Override - public ReadableDimension calcMinSize(GuiContainer container) { + public ReadableDimension calcMinSize(com.replaymod.gui.container.GuiContainer container) { ReadableDimension size = popup.calcMinSize(); return new Dimension(size.getWidth() + 20, size.getHeight() + 20); } }); - protected final GuiPanel popup = new GuiPanel(popupContainer); + protected final com.replaymod.gui.container.GuiPanel popup = new GuiPanel(popupContainer); private int layer; { - setLayout(new CustomLayout() { + setLayout(new com.replaymod.gui.layout.CustomLayout() { @Override protected void layout(T container, int width, int height) { pos(popupContainer, width / 2 - width(popupContainer) / 2, height / 2 - height(popupContainer) / 2); @@ -111,9 +111,9 @@ protected void layout(T container, int width, int height) { private boolean wasMouseVisible; private boolean renderBackground = true; - private final GuiContainer container; + private final com.replaymod.gui.container.GuiContainer container; - public AbstractGuiPopup(GuiContainer container) { + public AbstractGuiPopup(com.replaymod.gui.container.GuiContainer container) { while (container.getContainer() != null) { container = container.getContainer(); } @@ -134,10 +134,10 @@ protected void layout(GuiContainer container, int width, int height) { size(AbstractGuiPopup.this, width, height); } }); - if (container instanceof AbstractGuiOverlay) { + if (container instanceof com.replaymod.gui.container.AbstractGuiOverlay) { // Popup opened on a overlay gui. These normally allow interaction with the game world which // is undesirable when e.g. typing text into a input field. Therefore we disable user input. - AbstractGuiOverlay overlay = (AbstractGuiOverlay) container; + com.replaymod.gui.container.AbstractGuiOverlay overlay = (com.replaymod.gui.container.AbstractGuiOverlay) container; wasAllowUserInput = overlay.isAllowUserInput(); overlay.setAllowUserInput(false); // We also force the mouse to be visible @@ -149,8 +149,8 @@ protected void layout(GuiContainer container, int width, int height) { protected void close() { getContainer().setLayout(originalLayout); getContainer().removeElement(this); - if (container instanceof AbstractGuiOverlay) { - AbstractGuiOverlay overlay = (AbstractGuiOverlay) container; + if (container instanceof com.replaymod.gui.container.AbstractGuiOverlay) { + com.replaymod.gui.container.AbstractGuiOverlay overlay = (AbstractGuiOverlay) container; overlay.setAllowUserInput(wasAllowUserInput); overlay.setMouseVisible(wasMouseVisible); } diff --git a/src/main/java/de/johni0702/minecraft/gui/popup/GuiFileChooserPopup.java b/src/main/java/com/replaymod/gui/popup/GuiFileChooserPopup.java similarity index 74% rename from src/main/java/de/johni0702/minecraft/gui/popup/GuiFileChooserPopup.java rename to src/main/java/com/replaymod/gui/popup/GuiFileChooserPopup.java index f90a991ea..1b8ea508e 100644 --- a/src/main/java/de/johni0702/minecraft/gui/popup/GuiFileChooserPopup.java +++ b/src/main/java/com/replaymod/gui/popup/GuiFileChooserPopup.java @@ -22,83 +22,81 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.popup; - -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -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.container.GuiVerticalList; -import de.johni0702.minecraft.gui.element.GuiButton; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.element.GuiTextField; -import de.johni0702.minecraft.gui.element.advanced.GuiDropdownMenu; -import de.johni0702.minecraft.gui.function.Typeable; -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 de.johni0702.minecraft.gui.utils.Consumer; +package com.replaymod.gui.popup; + +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScrollable; +import com.replaymod.gui.container.GuiVerticalList; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.GuiTextField; +import com.replaymod.gui.element.advanced.GuiDropdownMenu; +import com.replaymod.gui.function.Typeable; +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 com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; -import de.johni0702.minecraft.gui.versions.MCVer; import java.io.File; import java.io.IOException; import java.nio.file.InvalidPathException; import java.util.*; -import java.util.concurrent.CompletableFuture; //#if MC>=11400 -import de.johni0702.minecraft.gui.versions.MCVer.Keyboard; + //#else //$$ import org.lwjgl.input.Keyboard; //#endif public class GuiFileChooserPopup extends AbstractGuiPopup implements Typeable { - public static GuiFileChooserPopup openSaveGui(GuiContainer container, String buttonLabel, String...fileExtensions) { - GuiFileChooserPopup popup = new GuiFileChooserPopup(container, fileExtensions, false).setBackgroundColor(Colors.DARK_TRANSPARENT); + public static GuiFileChooserPopup openSaveGui(com.replaymod.gui.container.GuiContainer container, String buttonLabel, String...fileExtensions) { + GuiFileChooserPopup popup = new GuiFileChooserPopup(container, fileExtensions, false).setBackgroundColor(com.replaymod.gui.utils.Colors.DARK_TRANSPARENT); popup.acceptButton.setI18nLabel(buttonLabel); popup.open(); return popup; } - public static GuiFileChooserPopup openLoadGui(GuiContainer container, String buttonLabel, String...fileExtensions) { + public static GuiFileChooserPopup openLoadGui(com.replaymod.gui.container.GuiContainer container, String buttonLabel, String...fileExtensions) { GuiFileChooserPopup popup = new GuiFileChooserPopup(container, fileExtensions, true).setBackgroundColor(Colors.DARK_TRANSPARENT); popup.acceptButton.setI18nLabel(buttonLabel).setDisabled(); popup.open(); return popup; } - private Consumer onAccept = (file) -> {}; + private com.replaymod.gui.utils.Consumer onAccept = (file) -> {}; private Runnable onCancel = () -> {}; - private final GuiScrollable pathScrollable = new GuiScrollable(popup) { + private final com.replaymod.gui.container.GuiScrollable pathScrollable = new GuiScrollable(popup) { @Override - public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) { + public void draw(com.replaymod.gui.GuiRenderer renderer, ReadableDimension size, com.replaymod.gui.RenderInfo renderInfo) { scrollX(0); super.draw(renderer, size, renderInfo); } }; - private final GuiPanel pathPanel = new GuiPanel(pathScrollable).setLayout(new HorizontalLayout()); - private final GuiVerticalList fileList = new GuiVerticalList(popup); - private final GuiTextField nameField = new GuiTextField(popup).onEnter(new Runnable() { + private final com.replaymod.gui.container.GuiPanel pathPanel = new com.replaymod.gui.container.GuiPanel(pathScrollable).setLayout(new HorizontalLayout()); + private final com.replaymod.gui.container.GuiVerticalList fileList = new GuiVerticalList(popup); + private final com.replaymod.gui.element.GuiTextField nameField = new GuiTextField(popup).onEnter(new Runnable() { @Override public void run() { if (acceptButton.isEnabled()) { acceptButton.onClick(); } } - }).onTextChanged(new Consumer() { + }).onTextChanged(new com.replaymod.gui.utils.Consumer() { @Override public void consume(String oldName) { updateButton(); } }).setMaxLength(Integer.MAX_VALUE); - private final GuiButton acceptButton = new GuiButton(popup).onClick(new Runnable() { + private final com.replaymod.gui.element.GuiButton acceptButton = new com.replaymod.gui.element.GuiButton(popup).onClick(new Runnable() { @Override public void run() { String fileName = nameField.getText(); @@ -112,7 +110,7 @@ public void run() { } }).setSize(50, 20); - private final GuiButton cancelButton = new GuiButton(popup).onClick(new Runnable() { + private final com.replaymod.gui.element.GuiButton cancelButton = new com.replaymod.gui.element.GuiButton(popup).onClick(new Runnable() { @Override public void run() { onCancel.run(); @@ -121,8 +119,8 @@ public void run() { }).setI18nLabel("gui.cancel").setSize(50, 20); { - fileList.setLayout(new VerticalLayout().setSpacing(1)); - popup.setLayout(new CustomLayout() { + fileList.setLayout(new com.replaymod.gui.layout.VerticalLayout().setSpacing(1)); + popup.setLayout(new CustomLayout() { @Override protected void layout(GuiPanel container, int width, int height) { pos(pathScrollable, 0, 0); @@ -136,7 +134,7 @@ protected void layout(GuiPanel container, int width, int height) { } @Override - public ReadableDimension calcMinSize(GuiContainer container) { + public ReadableDimension calcMinSize(com.replaymod.gui.container.GuiContainer container) { return new Dimension(300, 200); } }); @@ -191,7 +189,7 @@ public void setFolder(File folder) { updateButton(); - for (GuiElement element : new ArrayList<>(pathPanel.getElements().keySet())) { + for (com.replaymod.gui.element.GuiElement element : new ArrayList<>(pathPanel.getElements().keySet())) { pathPanel.removeElement(element); } for (GuiElement element : new ArrayList<>(fileList.getListPanel().getElements().keySet())) { @@ -213,7 +211,7 @@ public int compare(File f1, File f2) { }); for (final File file : files) { if (file.isDirectory()) { - fileList.getListPanel().addElements(new VerticalLayout.Data(0), new GuiButton().onClick(new Runnable() { + fileList.getListPanel().addElements(new com.replaymod.gui.layout.VerticalLayout.Data(0), new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { @Override public void run() { setFolder(file); @@ -221,7 +219,7 @@ public void run() { }).setLabel(file.getName() + File.separator)); } else { if (hasValidExtension(file.getName())) { - fileList.getListPanel().addElements(new VerticalLayout.Data(0), new GuiButton().onClick(new Runnable() { + fileList.getListPanel().addElements(new VerticalLayout.Data(0), new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { @Override public void run() { setFileName(file.getName()); @@ -237,18 +235,18 @@ public void run() { if (roots != null && roots.length > 1) { // Windows can have multiple file system roots // So we place a dropdown menu (skinned like a button) at the front of the path - final GuiDropdownMenu dropdown = new GuiDropdownMenu(pathPanel) { - private final GuiButton skin = new GuiButton(); + final com.replaymod.gui.element.advanced.GuiDropdownMenu dropdown = new GuiDropdownMenu(pathPanel) { + private final com.replaymod.gui.element.GuiButton skin = new com.replaymod.gui.element.GuiButton(); @Override protected ReadableDimension calcMinSize() { ReadableDimension dim = super.calcMinSize(); - return new Dimension(dim.getWidth() - 5 - MCVer.getFontRenderer().fontHeight, + return new Dimension(dim.getWidth() - 5 - com.replaymod.gui.versions.MCVer.getFontRenderer().fontHeight, dim.getHeight()); } @Override - public void layout(ReadableDimension size, RenderInfo renderInfo) { + public void layout(ReadableDimension size, com.replaymod.gui.RenderInfo renderInfo) { super.layout(size, renderInfo); if (renderInfo.layer == 0) { skin.layout(size, renderInfo); @@ -279,7 +277,7 @@ public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo render // First set values and current selection dropdown.setValues(actualRoots.toArray(new File[actualRoots.size()])).setSelected(selected); // then add selection handler afterwards - dropdown.onSelection(new Consumer() { + dropdown.onSelection(new com.replaymod.gui.utils.Consumer() { @Override public void consume(Integer old) { setFolder(dropdown.getSelectedValue()); @@ -292,7 +290,7 @@ public void consume(Integer old) { folder = folder.getParentFile(); } for (final File parent : parents) { - pathPanel.addElements(null, new GuiButton().onClick(new Runnable() { + pathPanel.addElements(null, new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { @Override public void run() { setFolder(parent); @@ -334,14 +332,14 @@ public GuiFileChooserPopup onCancel(Runnable onCancel) { @Override public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, boolean ctrlDown, boolean shiftDown) { - if (keyCode == Keyboard.KEY_ESCAPE) { + if (keyCode == com.replaymod.gui.versions.MCVer.Keyboard.KEY_ESCAPE) { cancelButton.onClick(); return true; } return false; } - public GuiButton getAcceptButton() { + public com.replaymod.gui.element.GuiButton getAcceptButton() { return this.acceptButton; } diff --git a/src/main/java/de/johni0702/minecraft/gui/popup/GuiInfoPopup.java b/src/main/java/com/replaymod/gui/popup/GuiInfoPopup.java similarity index 68% rename from src/main/java/de/johni0702/minecraft/gui/popup/GuiInfoPopup.java rename to src/main/java/com/replaymod/gui/popup/GuiInfoPopup.java index 007b22be7..c061d278c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/popup/GuiInfoPopup.java +++ b/src/main/java/com/replaymod/gui/popup/GuiInfoPopup.java @@ -22,53 +22,54 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.popup; - -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.GuiElement; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.layout.VerticalLayout; -import de.johni0702.minecraft.gui.utils.Colors; +package com.replaymod.gui.popup; + +import com.replaymod.gui.container.GuiContainer; +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.function.Typeable; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.utils.Colors; +import com.replaymod.gui.versions.MCVer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; //#if MC>=11400 -import de.johni0702.minecraft.gui.versions.MCVer.Keyboard; + //#else //$$ import org.lwjgl.input.Keyboard; //#endif public class GuiInfoPopup extends AbstractGuiPopup implements Typeable { - public static GuiInfoPopup open(GuiContainer container, String...info) { - GuiElement[] labels = new GuiElement[info.length]; + public static GuiInfoPopup open(com.replaymod.gui.container.GuiContainer container, String...info) { + com.replaymod.gui.element.GuiElement[] labels = new com.replaymod.gui.element.GuiElement[info.length]; for (int i = 0; i < info.length; i++) { - labels[i] = new GuiLabel().setI18nText(info[i]).setColor(Colors.BLACK); + labels[i] = new GuiLabel().setI18nText(info[i]).setColor(com.replaymod.gui.utils.Colors.BLACK); } return open(container, labels); } - public static GuiInfoPopup open(GuiContainer container, GuiElement... info) { + public static GuiInfoPopup open(com.replaymod.gui.container.GuiContainer container, GuiElement... info) { GuiInfoPopup popup = new GuiInfoPopup(container).setBackgroundColor(Colors.DARK_TRANSPARENT); - popup.getInfo().addElements(new VerticalLayout.Data(0.5), info); + popup.getInfo().addElements(new com.replaymod.gui.layout.VerticalLayout.Data(0.5), info); popup.open(); return popup; } private Runnable onClosed = () -> {}; - private final GuiButton closeButton = new GuiButton().setSize(150, 20).onClick(() -> { + private final com.replaymod.gui.element.GuiButton closeButton = new com.replaymod.gui.element.GuiButton().setSize(150, 20).onClick(() -> { close(); onClosed.run(); }).setI18nLabel("gui.back"); - private final GuiPanel info = new GuiPanel().setMinSize(new Dimension(320, 50)) - .setLayout(new VerticalLayout(VerticalLayout.Alignment.TOP).setSpacing(2)); + private final com.replaymod.gui.container.GuiPanel info = new com.replaymod.gui.container.GuiPanel().setMinSize(new Dimension(320, 50)) + .setLayout(new com.replaymod.gui.layout.VerticalLayout(com.replaymod.gui.layout.VerticalLayout.Alignment.TOP).setSpacing(2)); { - popup.setLayout(new VerticalLayout().setSpacing(10)) + popup.setLayout(new com.replaymod.gui.layout.VerticalLayout().setSpacing(10)) .addElements(new VerticalLayout.Data(0.5), info, closeButton); } @@ -100,7 +101,7 @@ protected GuiInfoPopup getThis() { @Override public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, boolean ctrlDown, boolean shiftDown) { - if (keyCode == Keyboard.KEY_ESCAPE) { + if (keyCode == MCVer.Keyboard.KEY_ESCAPE) { closeButton.onClick(); return true; } diff --git a/src/main/java/de/johni0702/minecraft/gui/popup/GuiYesNoPopup.java b/src/main/java/com/replaymod/gui/popup/GuiYesNoPopup.java similarity index 69% rename from src/main/java/de/johni0702/minecraft/gui/popup/GuiYesNoPopup.java rename to src/main/java/com/replaymod/gui/popup/GuiYesNoPopup.java index 97b252cdc..1ced14ebb 100644 --- a/src/main/java/de/johni0702/minecraft/gui/popup/GuiYesNoPopup.java +++ b/src/main/java/com/replaymod/gui/popup/GuiYesNoPopup.java @@ -22,21 +22,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.popup; - -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.GuiElement; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; -import de.johni0702.minecraft.gui.utils.Colors; +package com.replaymod.gui.popup; + +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.function.Typeable; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.utils.Colors; +import com.replaymod.gui.versions.MCVer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; //#if MC>=11400 -import de.johni0702.minecraft.gui.versions.MCVer.Keyboard; //#else //$$ import org.lwjgl.input.Keyboard; //#endif @@ -44,9 +44,9 @@ import java.util.function.Consumer; public class GuiYesNoPopup extends AbstractGuiPopup implements Typeable { - public static GuiYesNoPopup open(GuiContainer container, GuiElement... info) { + public static GuiYesNoPopup open(com.replaymod.gui.container.GuiContainer container, GuiElement... info) { GuiYesNoPopup popup = new GuiYesNoPopup(container).setBackgroundColor(Colors.DARK_TRANSPARENT); - popup.getInfo().addElements(new VerticalLayout.Data(0.5), info); + popup.getInfo().addElements(new com.replaymod.gui.layout.VerticalLayout.Data(0.5), info); popup.open(); return popup; } @@ -55,7 +55,7 @@ public static GuiYesNoPopup open(GuiContainer container, GuiElement... info) { private Runnable onAccept = () -> {}; private Runnable onReject = () -> {}; - private final GuiButton yesButton = new GuiButton().setSize(150, 20).onClick(new Runnable() { + private final com.replaymod.gui.element.GuiButton yesButton = new com.replaymod.gui.element.GuiButton().setSize(150, 20).onClick(new Runnable() { @Override public void run() { close(); @@ -64,7 +64,7 @@ public void run() { } }); - private final GuiButton noButton = new GuiButton().setSize(150, 20).onClick(new Runnable() { + private final com.replaymod.gui.element.GuiButton noButton = new com.replaymod.gui.element.GuiButton().setSize(150, 20).onClick(new Runnable() { @Override public void run() { close(); @@ -73,15 +73,15 @@ public void run() { } }); - private final GuiPanel info = new GuiPanel().setMinSize(new Dimension(320, 50)) - .setLayout(new VerticalLayout(VerticalLayout.Alignment.TOP).setSpacing(2)); + private final com.replaymod.gui.container.GuiPanel info = new com.replaymod.gui.container.GuiPanel().setMinSize(new Dimension(320, 50)) + .setLayout(new com.replaymod.gui.layout.VerticalLayout(com.replaymod.gui.layout.VerticalLayout.Alignment.TOP).setSpacing(2)); - private final GuiPanel buttons = new GuiPanel() - .setLayout(new HorizontalLayout(HorizontalLayout.Alignment.CENTER).setSpacing(5)) + private final com.replaymod.gui.container.GuiPanel buttons = new com.replaymod.gui.container.GuiPanel() + .setLayout(new com.replaymod.gui.layout.HorizontalLayout(com.replaymod.gui.layout.HorizontalLayout.Alignment.CENTER).setSpacing(5)) .addElements(new HorizontalLayout.Data(0.5), yesButton, noButton); { - popup.setLayout(new VerticalLayout().setSpacing(10)) + popup.setLayout(new com.replaymod.gui.layout.VerticalLayout().setSpacing(10)) .addElements(new VerticalLayout.Data(0.5), info, buttons); } @@ -133,14 +133,14 @@ protected GuiYesNoPopup getThis() { @Override public boolean typeKey(ReadablePoint mousePosition, int keyCode, char keyChar, boolean ctrlDown, boolean shiftDown) { - if (keyCode == Keyboard.KEY_ESCAPE) { + if (keyCode == MCVer.Keyboard.KEY_ESCAPE) { noButton.onClick(); return true; } return false; } - public GuiButton getYesButton() { + public com.replaymod.gui.element.GuiButton getYesButton() { return this.yesButton; } @@ -148,7 +148,7 @@ public GuiButton getNoButton() { return this.noButton; } - public GuiPanel getInfo() { + public com.replaymod.gui.container.GuiPanel getInfo() { return this.info; } diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/Colors.java b/src/main/java/com/replaymod/gui/utils/Colors.java similarity index 97% rename from src/main/java/de/johni0702/minecraft/gui/utils/Colors.java rename to src/main/java/com/replaymod/gui/utils/Colors.java index f6265510a..5bade770b 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/Colors.java +++ b/src/main/java/com/replaymod/gui/utils/Colors.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; import de.johni0702.minecraft.gui.utils.lwjgl.Color; diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/Consumer.java b/src/main/java/com/replaymod/gui/utils/Consumer.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/utils/Consumer.java rename to src/main/java/com/replaymod/gui/utils/Consumer.java index cc209ec04..28ea876b4 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/Consumer.java +++ b/src/main/java/com/replaymod/gui/utils/Consumer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; public interface Consumer { void consume(T obj); diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/Consumers.java b/src/main/java/com/replaymod/gui/utils/Consumers.java similarity index 92% rename from src/main/java/de/johni0702/minecraft/gui/utils/Consumers.java rename to src/main/java/com/replaymod/gui/utils/Consumers.java index 900731b31..b6dd6ec72 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/Consumers.java +++ b/src/main/java/com/replaymod/gui/utils/Consumers.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; public class Consumers { - public static Consumer from(final Runnable runnable) { + public static com.replaymod.gui.utils.Consumer from(final Runnable runnable) { return new Consumer() { @Override public void consume(U obj) { diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/Event.java b/src/main/java/com/replaymod/gui/utils/Event.java similarity index 95% rename from src/main/java/de/johni0702/minecraft/gui/utils/Event.java rename to src/main/java/com/replaymod/gui/utils/Event.java index c40c268e9..4d15c0680 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/Event.java +++ b/src/main/java/com/replaymod/gui/utils/Event.java @@ -1,4 +1,4 @@ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/EventRegistration.java b/src/main/java/com/replaymod/gui/utils/EventRegistration.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/utils/EventRegistration.java rename to src/main/java/com/replaymod/gui/utils/EventRegistration.java index 794ea22ac..8c6992e07 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/EventRegistration.java +++ b/src/main/java/com/replaymod/gui/utils/EventRegistration.java @@ -1,4 +1,4 @@ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; public class EventRegistration { public static EventRegistration create(Event event, T callback) { diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/EventRegistrations.java b/src/main/java/com/replaymod/gui/utils/EventRegistrations.java similarity index 92% rename from src/main/java/de/johni0702/minecraft/gui/utils/EventRegistrations.java rename to src/main/java/com/replaymod/gui/utils/EventRegistrations.java index cdb11790e..13187a050 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/EventRegistrations.java +++ b/src/main/java/com/replaymod/gui/utils/EventRegistrations.java @@ -1,7 +1,7 @@ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; //#if FABRIC<1 -//$$ import de.johni0702.minecraft.gui.versions.forge.EventsAdapter; +//$$ import com.replaymod.gui.versions.forge.EventsAdapter; //$$ import net.minecraftforge.common.MinecraftForge; //#endif diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/MouseUtils.java b/src/main/java/com/replaymod/gui/utils/MouseUtils.java similarity index 90% rename from src/main/java/de/johni0702/minecraft/gui/utils/MouseUtils.java rename to src/main/java/com/replaymod/gui/utils/MouseUtils.java index 871ff5549..4d33bdfd7 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/MouseUtils.java +++ b/src/main/java/com/replaymod/gui/utils/MouseUtils.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; +import com.replaymod.gui.versions.MCVer; import de.johni0702.minecraft.gui.utils.lwjgl.Point; -import de.johni0702.minecraft.gui.versions.MCVer; import net.minecraft.client.MinecraftClient; //#if MC>=11400 @@ -36,13 +36,13 @@ //#endif public class MouseUtils { - private static final MinecraftClient mc = MCVer.getMinecraft(); + private static final MinecraftClient mc = com.replaymod.gui.versions.MCVer.getMinecraft(); public static Point getMousePos() { //#if MC>=11400 int mouseX = (int) mc.mouse.getX(); int mouseY = (int) mc.mouse.getY(); - Window mainWindow = MCVer.newScaledResolution(mc); + Window mainWindow = com.replaymod.gui.versions.MCVer.newScaledResolution(mc); mouseX = (int) Math.round((double) mouseX * mainWindow.getScaledWidth() / mainWindow.getWidth()); mouseY = (int) Math.round((double) mouseY * mainWindow.getScaledHeight() / mainWindow.getHeight()); //#else diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/NonNull.java b/src/main/java/com/replaymod/gui/utils/NonNull.java similarity index 83% rename from src/main/java/de/johni0702/minecraft/gui/utils/NonNull.java rename to src/main/java/com/replaymod/gui/utils/NonNull.java index d63382857..899a5e94c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/NonNull.java +++ b/src/main/java/com/replaymod/gui/utils/NonNull.java @@ -1,4 +1,4 @@ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/StringUtils.java b/src/main/java/com/replaymod/gui/utils/StringUtils.java similarity index 96% rename from src/main/java/de/johni0702/minecraft/gui/utils/StringUtils.java rename to src/main/java/com/replaymod/gui/utils/StringUtils.java index 8d49a075e..92d8e8862 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/StringUtils.java +++ b/src/main/java/com/replaymod/gui/utils/StringUtils.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; -import de.johni0702.minecraft.gui.versions.MCVer; +import com.replaymod.gui.versions.MCVer; import net.minecraft.client.font.TextRenderer; import java.util.ArrayList; diff --git a/src/main/java/de/johni0702/minecraft/gui/utils/Utils.java b/src/main/java/com/replaymod/gui/utils/Utils.java similarity index 89% rename from src/main/java/de/johni0702/minecraft/gui/utils/Utils.java rename to src/main/java/com/replaymod/gui/utils/Utils.java index 111f48a24..9174f7a37 100644 --- a/src/main/java/de/johni0702/minecraft/gui/utils/Utils.java +++ b/src/main/java/com/replaymod/gui/utils/Utils.java @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.johni0702.minecraft.gui.utils; +package com.replaymod.gui.utils; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.function.Focusable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.function.Focusable; import java.util.Arrays; import java.util.HashSet; @@ -41,10 +41,10 @@ public class Utils { /** * Link the specified focusable compontents in the order they're supplied. * @param focusables Focusables to link - * @see Focusable#setNext(Focusable) - * @see Focusable#setPrevious(Focusable) + * @see com.replaymod.gui.function.Focusable#setNext(com.replaymod.gui.function.Focusable) + * @see com.replaymod.gui.function.Focusable#setPrevious(com.replaymod.gui.function.Focusable) */ - public static void link(Focusable... focusables) { + public static void link(com.replaymod.gui.function.Focusable... focusables) { checkArgument(new HashSet<>(Arrays.asList(focusables)).size() == focusables.length, "focusables must be unique and not null"); for (int i = 0; i < focusables.length; i++) { Focusable next = focusables[(i + 1) % focusables.length]; @@ -54,7 +54,7 @@ public static void link(Focusable... focusables) { } public static void drawDynamicRect(GuiRenderer renderer, int width, int height, int u, int v, int uWidth, int vHeight, - int topBorder, int bottomBorder, int leftBorder, int rightBorder) { + int topBorder, int bottomBorder, int leftBorder, int rightBorder) { int textureBodyHeight = vHeight - topBorder - bottomBorder; int textureBodyWidth = uWidth - leftBorder - rightBorder; // Left and right borders diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/Image.java b/src/main/java/com/replaymod/gui/versions/Image.java similarity index 98% rename from src/main/java/de/johni0702/minecraft/gui/versions/Image.java rename to src/main/java/com/replaymod/gui/versions/Image.java index 1a094095d..33c3661b1 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/Image.java +++ b/src/main/java/com/replaymod/gui/versions/Image.java @@ -1,4 +1,4 @@ -package de.johni0702.minecraft.gui.versions; +package com.replaymod.gui.versions; import net.minecraft.client.texture.NativeImage; import net.minecraft.client.texture.NativeImageBackedTexture; diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/MCVer.java b/src/main/java/com/replaymod/gui/versions/MCVer.java similarity index 99% rename from src/main/java/de/johni0702/minecraft/gui/versions/MCVer.java rename to src/main/java/com/replaymod/gui/versions/MCVer.java index c9084c867..47b55f561 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/MCVer.java +++ b/src/main/java/com/replaymod/gui/versions/MCVer.java @@ -1,4 +1,4 @@ -package de.johni0702.minecraft.gui.versions; +package com.replaymod.gui.versions; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/MatrixStack.java b/src/main/java/com/replaymod/gui/versions/MatrixStack.java similarity index 100% rename from src/main/java/de/johni0702/minecraft/gui/versions/MatrixStack.java rename to src/main/java/com/replaymod/gui/versions/MatrixStack.java diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/InitScreenCallback.java b/src/main/java/com/replaymod/gui/versions/callbacks/InitScreenCallback.java similarity index 89% rename from src/main/java/de/johni0702/minecraft/gui/versions/callbacks/InitScreenCallback.java rename to src/main/java/com/replaymod/gui/versions/callbacks/InitScreenCallback.java index 8df683b22..7273c38ec 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/InitScreenCallback.java +++ b/src/main/java/com/replaymod/gui/versions/callbacks/InitScreenCallback.java @@ -1,6 +1,6 @@ -package de.johni0702.minecraft.gui.versions.callbacks; +package com.replaymod.gui.versions.callbacks; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.AbstractButtonWidget; diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/KeyboardCallback.java b/src/main/java/com/replaymod/gui/versions/callbacks/KeyboardCallback.java similarity index 93% rename from src/main/java/de/johni0702/minecraft/gui/versions/callbacks/KeyboardCallback.java rename to src/main/java/com/replaymod/gui/versions/callbacks/KeyboardCallback.java index 53b905aa5..e35fd038e 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/KeyboardCallback.java +++ b/src/main/java/com/replaymod/gui/versions/callbacks/KeyboardCallback.java @@ -1,6 +1,6 @@ -package de.johni0702.minecraft.gui.versions.callbacks; +package com.replaymod.gui.versions.callbacks; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; public interface KeyboardCallback { Event EVENT = Event.create((listeners) -> diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/MouseCallback.java b/src/main/java/com/replaymod/gui/versions/callbacks/MouseCallback.java similarity index 94% rename from src/main/java/de/johni0702/minecraft/gui/versions/callbacks/MouseCallback.java rename to src/main/java/com/replaymod/gui/versions/callbacks/MouseCallback.java index 682cad03c..293b86e3a 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/MouseCallback.java +++ b/src/main/java/com/replaymod/gui/versions/callbacks/MouseCallback.java @@ -1,6 +1,6 @@ -package de.johni0702.minecraft.gui.versions.callbacks; +package com.replaymod.gui.versions.callbacks; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; public interface MouseCallback { Event EVENT = Event.create((listeners) -> diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/OpenGuiScreenCallback.java b/src/main/java/com/replaymod/gui/versions/callbacks/OpenGuiScreenCallback.java similarity index 79% rename from src/main/java/de/johni0702/minecraft/gui/versions/callbacks/OpenGuiScreenCallback.java rename to src/main/java/com/replaymod/gui/versions/callbacks/OpenGuiScreenCallback.java index 3eb1d8c0b..2c5233e60 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/OpenGuiScreenCallback.java +++ b/src/main/java/com/replaymod/gui/versions/callbacks/OpenGuiScreenCallback.java @@ -1,6 +1,6 @@ -package de.johni0702.minecraft.gui.versions.callbacks; +package com.replaymod.gui.versions.callbacks; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; import net.minecraft.client.gui.screen.Screen; public interface OpenGuiScreenCallback { diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/PostRenderScreenCallback.java b/src/main/java/com/replaymod/gui/versions/callbacks/PostRenderScreenCallback.java similarity index 81% rename from src/main/java/de/johni0702/minecraft/gui/versions/callbacks/PostRenderScreenCallback.java rename to src/main/java/com/replaymod/gui/versions/callbacks/PostRenderScreenCallback.java index 20b9f5444..d60916368 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/PostRenderScreenCallback.java +++ b/src/main/java/com/replaymod/gui/versions/callbacks/PostRenderScreenCallback.java @@ -1,6 +1,6 @@ -package de.johni0702.minecraft.gui.versions.callbacks; +package com.replaymod.gui.versions.callbacks; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; import net.minecraft.client.util.math.MatrixStack; public interface PostRenderScreenCallback { diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/PreTickCallback.java b/src/main/java/com/replaymod/gui/versions/callbacks/PreTickCallback.java similarity index 73% rename from src/main/java/de/johni0702/minecraft/gui/versions/callbacks/PreTickCallback.java rename to src/main/java/com/replaymod/gui/versions/callbacks/PreTickCallback.java index a3f2df008..52e5cdad5 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/PreTickCallback.java +++ b/src/main/java/com/replaymod/gui/versions/callbacks/PreTickCallback.java @@ -1,6 +1,6 @@ -package de.johni0702.minecraft.gui.versions.callbacks; +package com.replaymod.gui.versions.callbacks; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; public interface PreTickCallback { Event EVENT = Event.create((listeners) -> diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/RenderHudCallback.java b/src/main/java/com/replaymod/gui/versions/callbacks/RenderHudCallback.java similarity index 80% rename from src/main/java/de/johni0702/minecraft/gui/versions/callbacks/RenderHudCallback.java rename to src/main/java/com/replaymod/gui/versions/callbacks/RenderHudCallback.java index 14c240a48..59ef1a81f 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/callbacks/RenderHudCallback.java +++ b/src/main/java/com/replaymod/gui/versions/callbacks/RenderHudCallback.java @@ -1,6 +1,6 @@ -package de.johni0702.minecraft.gui.versions.callbacks; +package com.replaymod.gui.versions.callbacks; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; import net.minecraft.client.util.math.MatrixStack; public interface RenderHudCallback { diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/forge/EventsAdapter.java b/src/main/java/com/replaymod/gui/versions/forge/EventsAdapter.java similarity index 98% rename from src/main/java/de/johni0702/minecraft/gui/versions/forge/EventsAdapter.java rename to src/main/java/com/replaymod/gui/versions/forge/EventsAdapter.java index e6e29cf23..237a2a5e8 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/forge/EventsAdapter.java +++ b/src/main/java/com/replaymod/gui/versions/forge/EventsAdapter.java @@ -1,4 +1,4 @@ -package de.johni0702.minecraft.gui.versions.forge; +package com.replaymod.gui.versions.forge; //#if FABRIC<1 //$$ import com.mojang.blaze3d.matrix.MatrixStack; diff --git a/src/main/java/com/replaymod/core/mixin/AbstractButtonWidgetAccessor.java b/src/main/java/com/replaymod/mixin/AbstractButtonWidgetAccessor.java similarity index 89% rename from src/main/java/com/replaymod/core/mixin/AbstractButtonWidgetAccessor.java rename to src/main/java/com/replaymod/mixin/AbstractButtonWidgetAccessor.java index 069aa53b9..d466f0d1e 100644 --- a/src/main/java/com/replaymod/core/mixin/AbstractButtonWidgetAccessor.java +++ b/src/main/java/com/replaymod/mixin/AbstractButtonWidgetAccessor.java @@ -1,5 +1,5 @@ //#if MC>=11400 -package com.replaymod.core.mixin; +package com.replaymod.mixin; import net.minecraft.client.gui.widget.AbstractButtonWidget; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/recording/mixin/AddServerScreenAccessor.java b/src/main/java/com/replaymod/mixin/AddServerScreenAccessor.java similarity index 88% rename from src/main/java/com/replaymod/recording/mixin/AddServerScreenAccessor.java rename to src/main/java/com/replaymod/mixin/AddServerScreenAccessor.java index b89411235..5fa3a5a72 100644 --- a/src/main/java/com/replaymod/recording/mixin/AddServerScreenAccessor.java +++ b/src/main/java/com/replaymod/mixin/AddServerScreenAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import net.minecraft.client.gui.screen.AddServerScreen; import net.minecraft.client.network.ServerInfo; diff --git a/src/main/java/com/replaymod/render/mixin/ChunkRenderDispatcherAccessor.java b/src/main/java/com/replaymod/mixin/ChunkRenderDispatcherAccessor.java similarity index 100% rename from src/main/java/com/replaymod/render/mixin/ChunkRenderDispatcherAccessor.java rename to src/main/java/com/replaymod/mixin/ChunkRenderDispatcherAccessor.java diff --git a/src/main/java/com/replaymod/render/blend/mixin/ContainerLocalRenderInformationAccessor.java b/src/main/java/com/replaymod/mixin/ContainerLocalRenderInformationAccessor.java similarity index 100% rename from src/main/java/com/replaymod/render/blend/mixin/ContainerLocalRenderInformationAccessor.java rename to src/main/java/com/replaymod/mixin/ContainerLocalRenderInformationAccessor.java diff --git a/src/main/java/com/replaymod/render/blend/mixin/EntityAccessor.java b/src/main/java/com/replaymod/mixin/EntityAccessor.java similarity index 100% rename from src/main/java/com/replaymod/render/blend/mixin/EntityAccessor.java rename to src/main/java/com/replaymod/mixin/EntityAccessor.java diff --git a/src/main/java/com/replaymod/recording/mixin/EntityLivingBaseAccessor.java b/src/main/java/com/replaymod/mixin/EntityLivingBaseAccessor.java similarity index 92% rename from src/main/java/com/replaymod/recording/mixin/EntityLivingBaseAccessor.java rename to src/main/java/com/replaymod/mixin/EntityLivingBaseAccessor.java index 20b07a785..a75daf17a 100644 --- a/src/main/java/com/replaymod/recording/mixin/EntityLivingBaseAccessor.java +++ b/src/main/java/com/replaymod/mixin/EntityLivingBaseAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import net.minecraft.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/replay/mixin/EntityOtherPlayerMPAccessor.java b/src/main/java/com/replaymod/mixin/EntityOtherPlayerMPAccessor.java similarity index 100% rename from src/main/java/com/replaymod/replay/mixin/EntityOtherPlayerMPAccessor.java rename to src/main/java/com/replaymod/mixin/EntityOtherPlayerMPAccessor.java diff --git a/src/main/java/com/replaymod/replay/mixin/EntityPlayerAccessor.java b/src/main/java/com/replaymod/mixin/EntityPlayerAccessor.java similarity index 85% rename from src/main/java/com/replaymod/replay/mixin/EntityPlayerAccessor.java rename to src/main/java/com/replaymod/mixin/EntityPlayerAccessor.java index b70b9ac6b..7f2ef6db1 100644 --- a/src/main/java/com/replaymod/replay/mixin/EntityPlayerAccessor.java +++ b/src/main/java/com/replaymod/mixin/EntityPlayerAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(PlayerEntity.class) -public interface EntityPlayerAccessor extends EntityLivingBaseAccessor { +public interface EntityPlayerAccessor extends Mixin_EntityLivingBaseAccessor { //#if MC>=10904 @Accessor("selectedItem") ItemStack getItemStackMainHand(); diff --git a/src/main/java/com/replaymod/replay/mixin/FirstPersonRendererAccessor.java b/src/main/java/com/replaymod/mixin/FirstPersonRendererAccessor.java similarity index 96% rename from src/main/java/com/replaymod/replay/mixin/FirstPersonRendererAccessor.java rename to src/main/java/com/replaymod/mixin/FirstPersonRendererAccessor.java index de4dd2820..fdc5b318b 100644 --- a/src/main/java/com/replaymod/replay/mixin/FirstPersonRendererAccessor.java +++ b/src/main/java/com/replaymod/mixin/FirstPersonRendererAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import net.minecraft.client.render.item.HeldItemRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/replaymod/core/mixin/GuiMainMenuAccessor.java b/src/main/java/com/replaymod/mixin/GuiMainMenuAccessor.java similarity index 93% rename from src/main/java/com/replaymod/core/mixin/GuiMainMenuAccessor.java rename to src/main/java/com/replaymod/mixin/GuiMainMenuAccessor.java index 3716e1abd..e1e3dc8d5 100644 --- a/src/main/java/com/replaymod/core/mixin/GuiMainMenuAccessor.java +++ b/src/main/java/com/replaymod/mixin/GuiMainMenuAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.core.mixin; +package com.replaymod.mixin; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/com/replaymod/core/mixin/GuiScreenAccessor.java b/src/main/java/com/replaymod/mixin/GuiScreenAccessor.java similarity index 95% rename from src/main/java/com/replaymod/core/mixin/GuiScreenAccessor.java rename to src/main/java/com/replaymod/mixin/GuiScreenAccessor.java index d55529b2c..01f59bcbb 100644 --- a/src/main/java/com/replaymod/core/mixin/GuiScreenAccessor.java +++ b/src/main/java/com/replaymod/mixin/GuiScreenAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.core.mixin; +package com.replaymod.mixin; import net.minecraft.client.gui.screen.Screen; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/recording/mixin/IntegratedServerAccessor.java b/src/main/java/com/replaymod/mixin/IntegratedServerAccessor.java similarity index 91% rename from src/main/java/com/replaymod/recording/mixin/IntegratedServerAccessor.java rename to src/main/java/com/replaymod/mixin/IntegratedServerAccessor.java index 38e69f93c..ac5cecea0 100644 --- a/src/main/java/com/replaymod/recording/mixin/IntegratedServerAccessor.java +++ b/src/main/java/com/replaymod/mixin/IntegratedServerAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import net.minecraft.server.integrated.IntegratedServer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/render/blend/mixin/ItemRendererAccessor.java b/src/main/java/com/replaymod/mixin/ItemRendererAccessor.java similarity index 89% rename from src/main/java/com/replaymod/render/blend/mixin/ItemRendererAccessor.java rename to src/main/java/com/replaymod/mixin/ItemRendererAccessor.java index 70fb862e7..fc0a70721 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/ItemRendererAccessor.java +++ b/src/main/java/com/replaymod/mixin/ItemRendererAccessor.java @@ -1,5 +1,5 @@ //#if MC>=10904 -package com.replaymod.render.blend.mixin; +package com.replaymod.mixin; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.color.item.ItemColors; diff --git a/src/main/java/com/replaymod/core/mixin/KeyBindingAccessor.java b/src/main/java/com/replaymod/mixin/KeyBindingAccessor.java similarity index 90% rename from src/main/java/com/replaymod/core/mixin/KeyBindingAccessor.java rename to src/main/java/com/replaymod/mixin/KeyBindingAccessor.java index b24f1420a..5ddcb888c 100644 --- a/src/main/java/com/replaymod/core/mixin/KeyBindingAccessor.java +++ b/src/main/java/com/replaymod/mixin/KeyBindingAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.core.mixin; +package com.replaymod.mixin; import net.minecraft.client.options.KeyBinding; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/render/mixin/MainWindowAccessor.java b/src/main/java/com/replaymod/mixin/MainWindowAccessor.java similarity index 91% rename from src/main/java/com/replaymod/render/mixin/MainWindowAccessor.java rename to src/main/java/com/replaymod/mixin/MainWindowAccessor.java index 335c9908e..5cfc6371f 100644 --- a/src/main/java/com/replaymod/render/mixin/MainWindowAccessor.java +++ b/src/main/java/com/replaymod/mixin/MainWindowAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import net.minecraft.client.util.Window; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/core/mixin/MinecraftAccessor.java b/src/main/java/com/replaymod/mixin/MinecraftAccessor.java similarity index 90% rename from src/main/java/com/replaymod/core/mixin/MinecraftAccessor.java rename to src/main/java/com/replaymod/mixin/MinecraftAccessor.java index 1ec58296a..aeacb7f49 100644 --- a/src/main/java/com/replaymod/core/mixin/MinecraftAccessor.java +++ b/src/main/java/com/replaymod/mixin/MinecraftAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.core.mixin; +package com.replaymod.mixin; import net.minecraft.client.MinecraftClient; import net.minecraft.util.crash.CrashReport; @@ -43,8 +43,13 @@ public interface MinecraftAccessor { //$$ Queue> getScheduledTasks(); //#endif + //#if FABRIC>=1 @Accessor("crashReport") CrashReport getCrashReporter(); + //#else + //$$ @Accessor + //$$ CrashReport getCrashReporter(); + //#endif //#if MC<11400 //$$ @Accessor diff --git a/src/main/java/com/replaymod/replay/mixin/MixinCamera.java b/src/main/java/com/replaymod/mixin/MixinCamera.java similarity index 97% rename from src/main/java/com/replaymod/replay/mixin/MixinCamera.java rename to src/main/java/com/replaymod/mixin/MixinCamera.java index 7c1166d65..13286d4e4 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinCamera.java +++ b/src/main/java/com/replaymod/mixin/MixinCamera.java @@ -1,4 +1,4 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.camera.CameraEntity; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/replaymod/render/mixin/MixinChunkRenderWorker.java b/src/main/java/com/replaymod/mixin/MixinChunkRenderWorker.java similarity index 100% rename from src/main/java/com/replaymod/render/mixin/MixinChunkRenderWorker.java rename to src/main/java/com/replaymod/mixin/MixinChunkRenderWorker.java diff --git a/src/main/java/com/replaymod/compat/shaders/mixin/MixinChunkVisibility.java b/src/main/java/com/replaymod/mixin/MixinChunkVisibility.java similarity index 96% rename from src/main/java/com/replaymod/compat/shaders/mixin/MixinChunkVisibility.java rename to src/main/java/com/replaymod/mixin/MixinChunkVisibility.java index f1c58c077..b5d24382e 100644 --- a/src/main/java/com/replaymod/compat/shaders/mixin/MixinChunkVisibility.java +++ b/src/main/java/com/replaymod/mixin/MixinChunkVisibility.java @@ -1,5 +1,5 @@ //#if MC>=11500 -package com.replaymod.compat.shaders.mixin; +package com.replaymod.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Pseudo; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java b/src/main/java/com/replaymod/mixin/MixinDownloadingPackFinder.java similarity index 96% rename from src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java rename to src/main/java/com/replaymod/mixin/MixinDownloadingPackFinder.java index 8a5810968..e3547df85 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java +++ b/src/main/java/com/replaymod/mixin/MixinDownloadingPackFinder.java @@ -1,8 +1,8 @@ //#if MC>=10800 -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import com.replaymod.recording.packet.ResourcePackRecorder; -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.utils.Consumer; import net.minecraft.client.resource.ClientBuiltinResourcePackProvider; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/replaymod/render/mixin/MixinEffectRenderer.java b/src/main/java/com/replaymod/mixin/MixinEffectRenderer.java similarity index 100% rename from src/main/java/com/replaymod/render/mixin/MixinEffectRenderer.java rename to src/main/java/com/replaymod/mixin/MixinEffectRenderer.java diff --git a/src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java b/src/main/java/com/replaymod/mixin/MixinEntityRenderer.java similarity index 94% rename from src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java rename to src/main/java/com/replaymod/mixin/MixinEntityRenderer.java index 559f23361..d42f449f1 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java +++ b/src/main/java/com/replaymod/mixin/MixinEntityRenderer.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.hooks.EntityRendererHandler; import net.minecraft.client.render.GameRenderer; diff --git a/src/main/java/com/replaymod/replay/mixin/MixinFMLClientHandler.java b/src/main/java/com/replaymod/mixin/MixinFMLClientHandler.java similarity index 100% rename from src/main/java/com/replaymod/replay/mixin/MixinFMLClientHandler.java rename to src/main/java/com/replaymod/mixin/MixinFMLClientHandler.java diff --git a/src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java b/src/main/java/com/replaymod/mixin/MixinGameRenderer.java similarity index 97% rename from src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java rename to src/main/java/com/replaymod/mixin/MixinGameRenderer.java index a7c817a90..176671e9a 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java +++ b/src/main/java/com/replaymod/mixin/MixinGameRenderer.java @@ -1,5 +1,5 @@ //#if MC>=11400 -package com.replaymod.core.mixin; +package com.replaymod.mixin; import com.replaymod.core.events.PostRenderWorldCallback; import com.replaymod.core.events.PreRenderHandCallback; diff --git a/src/main/java/com/replaymod/render/mixin/MixinGlStateManager.java b/src/main/java/com/replaymod/mixin/MixinGlStateManager.java similarity index 97% rename from src/main/java/com/replaymod/render/mixin/MixinGlStateManager.java rename to src/main/java/com/replaymod/mixin/MixinGlStateManager.java index 84a06a3d4..f368fa4fd 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinGlStateManager.java +++ b/src/main/java/com/replaymod/mixin/MixinGlStateManager.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.hooks.FogStateCallback; import com.replaymod.render.hooks.Texture2DStateCallback; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinGuiScreen.java b/src/main/java/com/replaymod/mixin/MixinGuiScreen.java similarity index 100% rename from src/main/java/com/replaymod/recording/mixin/MixinGuiScreen.java rename to src/main/java/com/replaymod/mixin/MixinGuiScreen.java diff --git a/src/main/java/com/replaymod/replay/mixin/MixinGuiSpectator.java b/src/main/java/com/replaymod/mixin/MixinGuiSpectator.java similarity index 96% rename from src/main/java/com/replaymod/replay/mixin/MixinGuiSpectator.java rename to src/main/java/com/replaymod/mixin/MixinGuiSpectator.java index 9d938f7e5..ef09a8048 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinGuiSpectator.java +++ b/src/main/java/com/replaymod/mixin/MixinGuiSpectator.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.camera.CameraEntity; import net.minecraft.client.gui.hud.SpectatorHud; diff --git a/src/main/java/com/replaymod/replay/mixin/MixinInGameHud.java b/src/main/java/com/replaymod/mixin/MixinInGameHud.java similarity index 97% rename from src/main/java/com/replaymod/replay/mixin/MixinInGameHud.java rename to src/main/java/com/replaymod/mixin/MixinInGameHud.java index 88431748c..ea2afa197 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinInGameHud.java +++ b/src/main/java/com/replaymod/mixin/MixinInGameHud.java @@ -1,5 +1,5 @@ //#if MC>=11400 -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.events.RenderHotbarCallback; import com.replaymod.replay.events.RenderSpectatorCrosshairCallback; diff --git a/src/main/java/com/replaymod/core/mixin/MixinKeyboardListener.java b/src/main/java/com/replaymod/mixin/MixinKeyboardListener.java similarity index 97% rename from src/main/java/com/replaymod/core/mixin/MixinKeyboardListener.java rename to src/main/java/com/replaymod/mixin/MixinKeyboardListener.java index 3c218b897..ed2e18c65 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinKeyboardListener.java +++ b/src/main/java/com/replaymod/mixin/MixinKeyboardListener.java @@ -1,4 +1,4 @@ -package com.replaymod.core.mixin; +package com.replaymod.mixin; import com.replaymod.core.events.KeyBindingEventCallback; import com.replaymod.core.events.KeyEventCallback; diff --git a/src/main/java/com/replaymod/core/mixin/MixinMinecraft.java b/src/main/java/com/replaymod/mixin/MixinMinecraft.java similarity index 93% rename from src/main/java/com/replaymod/core/mixin/MixinMinecraft.java rename to src/main/java/com/replaymod/mixin/MixinMinecraft.java index 626827448..32e69db1a 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinMinecraft.java +++ b/src/main/java/com/replaymod/mixin/MixinMinecraft.java @@ -1,6 +1,6 @@ -package com.replaymod.core.mixin; +package com.replaymod.mixin; -import com.replaymod.core.versions.MCVer; +import com.replaymod.core.MinecraftMethodAccessor; import net.minecraft.client.MinecraftClient; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -17,8 +17,6 @@ //$$ import org.lwjgl.input.Mouse; //#endif -import java.io.IOException; - //#if MC>=11400 import net.minecraft.util.thread.ReentrantThreadExecutor; //#endif @@ -28,26 +26,30 @@ public abstract class MixinMinecraft //#if MC>=11400 extends ReentrantThreadExecutor //#endif - implements MCVer.MinecraftMethodAccessor { + implements MinecraftMethodAccessor + { + //#if MC>=11400 public MixinMinecraft(String string_1) { super(string_1); } //#endif - //#if MC>=11400 + //#if FABRIC>=1 @Shadow protected abstract void handleInputEvents(); + //#elseif MC>=11400 + //$$ @Shadow protected abstract void processKeyBinds(); + //#endif - @Override public void replayModProcessKeyBinds() { handleInputEvents(); } //#if MC>=11400 - @Override public void replayModExecuteTaskQueue() { runTasks(); } //#endif + //#if MC>=11400 @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;render(FJZ)V")) diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinModelRenderer.java b/src/main/java/com/replaymod/mixin/MixinModelRenderer.java similarity index 100% rename from src/main/java/com/replaymod/render/blend/mixin/MixinModelRenderer.java rename to src/main/java/com/replaymod/mixin/MixinModelRenderer.java diff --git a/src/main/java/com/replaymod/core/mixin/MixinMouse.java b/src/main/java/com/replaymod/mixin/MixinMouse.java similarity index 95% rename from src/main/java/com/replaymod/core/mixin/MixinMouse.java rename to src/main/java/com/replaymod/mixin/MixinMouse.java index 7ede977b5..45cccfc46 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinMouse.java +++ b/src/main/java/com/replaymod/mixin/MixinMouse.java @@ -1,5 +1,5 @@ //#if MC>=11400 -package com.replaymod.core.mixin; +package com.replaymod.mixin; import com.replaymod.core.events.KeyBindingEventCallback; import com.replaymod.core.events.KeyEventCallback; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinMouseHelper.java b/src/main/java/com/replaymod/mixin/MixinMouseHelper.java similarity index 97% rename from src/main/java/com/replaymod/recording/mixin/MixinMouseHelper.java rename to src/main/java/com/replaymod/mixin/MixinMouseHelper.java index 01e9572f9..bcf1319b9 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinMouseHelper.java +++ b/src/main/java/com/replaymod/mixin/MixinMouseHelper.java @@ -1,5 +1,5 @@ //#if MC>=11400 -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import com.replaymod.replay.InputReplayTimer; import com.replaymod.replay.ReplayModReplay; diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMouseListener.java b/src/main/java/com/replaymod/mixin/MixinMouseListener.java similarity index 81% rename from src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMouseListener.java rename to src/main/java/com/replaymod/mixin/MixinMouseListener.java index 2f49f986e..683845a00 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMouseListener.java +++ b/src/main/java/com/replaymod/mixin/MixinMouseListener.java @@ -1,7 +1,7 @@ //#if FABRIC>=1 -package de.johni0702.minecraft.gui.versions.mixin; +package com.replaymod.mixin; -import de.johni0702.minecraft.gui.versions.callbacks.MouseCallback; +import com.replaymod.gui.versions.callbacks.MouseCallback; import net.minecraft.client.Mouse; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; @@ -19,7 +19,7 @@ public abstract class MixinMouseListener { @Inject(method = "method_1611", at = @At("HEAD"), cancellable = true) private void mouseDown(boolean[] result, double x, double y, int button, CallbackInfo ci) { - if (MouseCallback.EVENT.invoker().mouseDown(x, y, button)) { + if (com.replaymod.gui.versions.callbacks.MouseCallback.EVENT.invoker().mouseDown(x, y, button)) { result[0] = true; ci.cancel(); } @@ -27,7 +27,7 @@ private void mouseDown(boolean[] result, double x, double y, int button, Callbac @Inject(method = "method_1605", at = @At("HEAD"), cancellable = true) private void mouseUp(boolean[] result, double x, double y, int button, CallbackInfo ci) { - if (MouseCallback.EVENT.invoker().mouseUp(x, y, button)) { + if (com.replaymod.gui.versions.callbacks.MouseCallback.EVENT.invoker().mouseUp(x, y, button)) { result[0] = true; ci.cancel(); } @@ -35,7 +35,7 @@ private void mouseUp(boolean[] result, double x, double y, int button, CallbackI @Inject(method = "method_1602", at = @At("HEAD"), cancellable = true) private void mouseDrag(Element element, double x, double y, double dx, double dy, CallbackInfo ci) { - if (MouseCallback.EVENT.invoker().mouseDrag(x, y, getActiveButton(), dx, dy)) { + if (com.replaymod.gui.versions.callbacks.MouseCallback.EVENT.invoker().mouseDrag(x, y, getActiveButton(), dx, dy)) { ci.cancel(); } } diff --git a/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerLoginClient.java b/src/main/java/com/replaymod/mixin/MixinNetHandlerLoginClient.java similarity index 97% rename from src/main/java/com/replaymod/recording/mixin/MixinNetHandlerLoginClient.java rename to src/main/java/com/replaymod/mixin/MixinNetHandlerLoginClient.java index b67d40bc9..84c6f0670 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerLoginClient.java +++ b/src/main/java/com/replaymod/mixin/MixinNetHandlerLoginClient.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import com.replaymod.core.versions.MCVer; import com.replaymod.recording.ReplayModRecording; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java b/src/main/java/com/replaymod/mixin/MixinNetHandlerPlayClient.java similarity index 99% rename from src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java rename to src/main/java/com/replaymod/mixin/MixinNetHandlerPlayClient.java index 8c1841fc7..8fbead2a2 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java +++ b/src/main/java/com/replaymod/mixin/MixinNetHandlerPlayClient.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import com.replaymod.core.versions.MCVer; import com.replaymod.recording.handler.RecordingEventHandler; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinNetworkDispatcher.java b/src/main/java/com/replaymod/mixin/MixinNetworkDispatcher.java similarity index 100% rename from src/main/java/com/replaymod/recording/mixin/MixinNetworkDispatcher.java rename to src/main/java/com/replaymod/mixin/MixinNetworkDispatcher.java diff --git a/src/main/java/com/replaymod/render/mixin/MixinOpenGlHelper.java b/src/main/java/com/replaymod/mixin/MixinOpenGlHelper.java similarity index 100% rename from src/main/java/com/replaymod/render/mixin/MixinOpenGlHelper.java rename to src/main/java/com/replaymod/mixin/MixinOpenGlHelper.java diff --git a/src/main/java/com/replaymod/render/mixin/MixinParticleManager.java b/src/main/java/com/replaymod/mixin/MixinParticleManager.java similarity index 99% rename from src/main/java/com/replaymod/render/mixin/MixinParticleManager.java rename to src/main/java/com/replaymod/mixin/MixinParticleManager.java index 456dceac3..73b032b65 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinParticleManager.java +++ b/src/main/java/com/replaymod/mixin/MixinParticleManager.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; //#if MC>=10904 import com.replaymod.core.versions.MCVer; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinPlayerControllerMP.java b/src/main/java/com/replaymod/mixin/MixinPlayerControllerMP.java similarity index 100% rename from src/main/java/com/replaymod/recording/mixin/MixinPlayerControllerMP.java rename to src/main/java/com/replaymod/mixin/MixinPlayerControllerMP.java diff --git a/src/main/java/com/replaymod/extras/playeroverview/mixin/MixinRender.java b/src/main/java/com/replaymod/mixin/MixinRender.java similarity index 98% rename from src/main/java/com/replaymod/extras/playeroverview/mixin/MixinRender.java rename to src/main/java/com/replaymod/mixin/MixinRender.java index 70196dbc0..55a5a025e 100644 --- a/src/main/java/com/replaymod/extras/playeroverview/mixin/MixinRender.java +++ b/src/main/java/com/replaymod/mixin/MixinRender.java @@ -1,4 +1,4 @@ -package com.replaymod.extras.playeroverview.mixin; +package com.replaymod.mixin; import com.replaymod.extras.ReplayModExtras; import com.replaymod.extras.playeroverview.PlayerOverview; diff --git a/src/main/java/com/replaymod/replay/mixin/MixinRenderArrow.java b/src/main/java/com/replaymod/mixin/MixinRenderArrow.java similarity index 97% rename from src/main/java/com/replaymod/replay/mixin/MixinRenderArrow.java rename to src/main/java/com/replaymod/mixin/MixinRenderArrow.java index bc20c96e2..7769d511b 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinRenderArrow.java +++ b/src/main/java/com/replaymod/mixin/MixinRenderArrow.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.ReplayModReplay; import net.minecraft.client.render.entity.EntityRenderer; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinRenderGlobal.java b/src/main/java/com/replaymod/mixin/MixinRenderGlobal.java similarity index 97% rename from src/main/java/com/replaymod/recording/mixin/MixinRenderGlobal.java rename to src/main/java/com/replaymod/mixin/MixinRenderGlobal.java index 3da5048f6..63c4a8547 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinRenderGlobal.java +++ b/src/main/java/com/replaymod/mixin/MixinRenderGlobal.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import com.replaymod.recording.handler.RecordingEventHandler; import net.minecraft.client.render.WorldRenderer; diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java b/src/main/java/com/replaymod/mixin/MixinRenderItem.java similarity index 98% rename from src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java rename to src/main/java/com/replaymod/mixin/MixinRenderItem.java index cf41e5e24..0e53e5ef9 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java +++ b/src/main/java/com/replaymod/mixin/MixinRenderItem.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.render.blend.mixin; +package com.replaymod.mixin; import com.replaymod.render.blend.BlendState; import com.replaymod.render.blend.exporters.ItemExporter; diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderLivingBase.java b/src/main/java/com/replaymod/mixin/MixinRenderLivingBase.java similarity index 97% rename from src/main/java/com/replaymod/render/blend/mixin/MixinRenderLivingBase.java rename to src/main/java/com/replaymod/mixin/MixinRenderLivingBase.java index 04efa6333..c0af8647b 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderLivingBase.java +++ b/src/main/java/com/replaymod/mixin/MixinRenderLivingBase.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.render.blend.mixin; +package com.replaymod.mixin; import com.replaymod.render.blend.BlendState; import com.replaymod.render.blend.exporters.EntityExporter; diff --git a/src/main/java/com/replaymod/render/mixin/MixinRenderManager.java b/src/main/java/com/replaymod/mixin/MixinRenderManager.java similarity index 98% rename from src/main/java/com/replaymod/render/mixin/MixinRenderManager.java rename to src/main/java/com/replaymod/mixin/MixinRenderManager.java index c824b26d8..65c2d2ef4 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinRenderManager.java +++ b/src/main/java/com/replaymod/mixin/MixinRenderManager.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.core.versions.MCVer; import com.replaymod.render.hooks.EntityRendererHandler; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinS26PacketMapChunkBulk.java b/src/main/java/com/replaymod/mixin/MixinS26PacketMapChunkBulk.java similarity index 100% rename from src/main/java/com/replaymod/recording/mixin/MixinS26PacketMapChunkBulk.java rename to src/main/java/com/replaymod/mixin/MixinS26PacketMapChunkBulk.java diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinScreen.java b/src/main/java/com/replaymod/mixin/MixinScreen.java similarity index 90% rename from src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinScreen.java rename to src/main/java/com/replaymod/mixin/MixinScreen.java index 5df118a57..4130b190e 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinScreen.java +++ b/src/main/java/com/replaymod/mixin/MixinScreen.java @@ -1,6 +1,6 @@ -package de.johni0702.minecraft.gui.versions.mixin; +package com.replaymod.mixin; -import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; +import com.replaymod.gui.versions.callbacks.InitScreenCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.AbstractButtonWidget; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinServerInfo.java b/src/main/java/com/replaymod/mixin/MixinServerInfo.java similarity index 97% rename from src/main/java/com/replaymod/recording/mixin/MixinServerInfo.java rename to src/main/java/com/replaymod/mixin/MixinServerInfo.java index f91072281..d8cf0d7a4 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinServerInfo.java +++ b/src/main/java/com/replaymod/mixin/MixinServerInfo.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import com.replaymod.recording.ServerInfoExt; import net.minecraft.client.network.ServerInfo; diff --git a/src/main/java/com/replaymod/compat/shaders/mixin/MixinShaderEntityRenderer.java b/src/main/java/com/replaymod/mixin/MixinShaderEntityRenderer.java similarity index 96% rename from src/main/java/com/replaymod/compat/shaders/mixin/MixinShaderEntityRenderer.java rename to src/main/java/com/replaymod/mixin/MixinShaderEntityRenderer.java index fe9263a14..7ea981ba5 100644 --- a/src/main/java/com/replaymod/compat/shaders/mixin/MixinShaderEntityRenderer.java +++ b/src/main/java/com/replaymod/mixin/MixinShaderEntityRenderer.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.compat.shaders.mixin; +package com.replaymod.mixin; import com.replaymod.compat.shaders.ShaderReflection; import com.replaymod.replay.ReplayHandler; diff --git a/src/main/java/com/replaymod/compat/shaders/mixin/MixinShaderRenderChunk.java b/src/main/java/com/replaymod/mixin/MixinShaderRenderChunk.java similarity index 98% rename from src/main/java/com/replaymod/compat/shaders/mixin/MixinShaderRenderChunk.java rename to src/main/java/com/replaymod/mixin/MixinShaderRenderChunk.java index b803ed2d4..eace83807 100644 --- a/src/main/java/com/replaymod/compat/shaders/mixin/MixinShaderRenderChunk.java +++ b/src/main/java/com/replaymod/mixin/MixinShaderRenderChunk.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.compat.shaders.mixin; +package com.replaymod.mixin; import com.replaymod.render.hooks.EntityRendererHandler; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/replaymod/compat/shaders/mixin/MixinShaders.java b/src/main/java/com/replaymod/mixin/MixinShaders.java similarity index 100% rename from src/main/java/com/replaymod/compat/shaders/mixin/MixinShaders.java rename to src/main/java/com/replaymod/mixin/MixinShaders.java diff --git a/src/main/java/com/replaymod/compat/shaders/mixin/MixinShadersRender.java b/src/main/java/com/replaymod/mixin/MixinShadersRender.java similarity index 97% rename from src/main/java/com/replaymod/compat/shaders/mixin/MixinShadersRender.java rename to src/main/java/com/replaymod/mixin/MixinShadersRender.java index 81f16dbbd..0abacb410 100644 --- a/src/main/java/com/replaymod/compat/shaders/mixin/MixinShadersRender.java +++ b/src/main/java/com/replaymod/mixin/MixinShadersRender.java @@ -1,4 +1,4 @@ -package com.replaymod.compat.shaders.mixin; +package com.replaymod.mixin; import net.minecraft.client.render.GameRenderer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java b/src/main/java/com/replaymod/mixin/MixinTileEntityEndPortalRenderer.java similarity index 98% rename from src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java rename to src/main/java/com/replaymod/mixin/MixinTileEntityEndPortalRenderer.java index 9139c5165..a15249f56 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java +++ b/src/main/java/com/replaymod/mixin/MixinTileEntityEndPortalRenderer.java @@ -1,4 +1,4 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.ReplayHandler; import com.replaymod.replay.ReplayModReplay; diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinTileEntityRendererDispatcher.java b/src/main/java/com/replaymod/mixin/MixinTileEntityRendererDispatcher.java similarity index 100% rename from src/main/java/com/replaymod/render/blend/mixin/MixinTileEntityRendererDispatcher.java rename to src/main/java/com/replaymod/mixin/MixinTileEntityRendererDispatcher.java diff --git a/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java b/src/main/java/com/replaymod/mixin/MixinViewFrustum.java similarity index 98% rename from src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java rename to src/main/java/com/replaymod/mixin/MixinViewFrustum.java index ee60b7625..3d8d6254c 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java +++ b/src/main/java/com/replaymod/mixin/MixinViewFrustum.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import net.minecraft.client.render.BuiltChunkStorage; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java b/src/main/java/com/replaymod/mixin/MixinWorldClient.java similarity index 99% rename from src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java rename to src/main/java/com/replaymod/mixin/MixinWorldClient.java index e5c798897..4f39a67fb 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java +++ b/src/main/java/com/replaymod/mixin/MixinWorldClient.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; //#if MC>=10904 import com.replaymod.recording.handler.RecordingEventHandler; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_BlockOnChunkRebuilds.java b/src/main/java/com/replaymod/mixin/Mixin_BlockOnChunkRebuilds.java similarity index 99% rename from src/main/java/com/replaymod/render/mixin/Mixin_BlockOnChunkRebuilds.java rename to src/main/java/com/replaymod/mixin/Mixin_BlockOnChunkRebuilds.java index a11818c43..66a254558 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_BlockOnChunkRebuilds.java +++ b/src/main/java/com/replaymod/mixin/Mixin_BlockOnChunkRebuilds.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; //#if MC>=11500 import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyColorSky.java b/src/main/java/com/replaymod/mixin/Mixin_ChromaKeyColorSky.java similarity index 97% rename from src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyColorSky.java rename to src/main/java/com/replaymod/mixin/Mixin_ChromaKeyColorSky.java index b43d7bd7c..758f2c322 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyColorSky.java +++ b/src/main/java/com/replaymod/mixin/Mixin_ChromaKeyColorSky.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.mojang.blaze3d.platform.GlStateManager; import com.replaymod.render.hooks.EntityRendererHandler; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyDisableFog.java b/src/main/java/com/replaymod/mixin/Mixin_ChromaKeyDisableFog.java similarity index 96% rename from src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyDisableFog.java rename to src/main/java/com/replaymod/mixin/Mixin_ChromaKeyDisableFog.java index 48719c54b..2c7e921af 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyDisableFog.java +++ b/src/main/java/com/replaymod/mixin/Mixin_ChromaKeyDisableFog.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.core.versions.MCVer; import com.replaymod.render.hooks.EntityRendererHandler; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyForceSky.java b/src/main/java/com/replaymod/mixin/Mixin_ChromaKeyForceSky.java similarity index 97% rename from src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyForceSky.java rename to src/main/java/com/replaymod/mixin/Mixin_ChromaKeyForceSky.java index 1d22d82ae..27d089730 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyForceSky.java +++ b/src/main/java/com/replaymod/mixin/Mixin_ChromaKeyForceSky.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.hooks.EntityRendererHandler; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinChunkRenderWorker.java b/src/main/java/com/replaymod/mixin/Mixin_ChunkRenderWorker.java similarity index 100% rename from src/main/java/com/replaymod/render/blend/mixin/MixinChunkRenderWorker.java rename to src/main/java/com/replaymod/mixin/Mixin_ChunkRenderWorker.java diff --git a/src/main/java/com/replaymod/core/mixin/Mixin_ContextualKeyBindings.java b/src/main/java/com/replaymod/mixin/Mixin_ContextualKeyBindings.java similarity index 98% rename from src/main/java/com/replaymod/core/mixin/Mixin_ContextualKeyBindings.java rename to src/main/java/com/replaymod/mixin/Mixin_ContextualKeyBindings.java index 6b246c3f7..5674ba6b7 100644 --- a/src/main/java/com/replaymod/core/mixin/Mixin_ContextualKeyBindings.java +++ b/src/main/java/com/replaymod/mixin/Mixin_ContextualKeyBindings.java @@ -1,4 +1,4 @@ -package com.replaymod.core.mixin; +package com.replaymod.mixin; import com.replaymod.core.ReplayMod; import com.replaymod.replay.ReplayModReplay; diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinEffectRenderer.java b/src/main/java/com/replaymod/mixin/Mixin_EffectRenderer.java similarity index 100% rename from src/main/java/com/replaymod/render/blend/mixin/MixinEffectRenderer.java rename to src/main/java/com/replaymod/mixin/Mixin_EffectRenderer.java diff --git a/src/main/java/com/replaymod/replay/mixin/EntityLivingBaseAccessor.java b/src/main/java/com/replaymod/mixin/Mixin_EntityLivingBaseAccessor.java similarity index 89% rename from src/main/java/com/replaymod/replay/mixin/EntityLivingBaseAccessor.java rename to src/main/java/com/replaymod/mixin/Mixin_EntityLivingBaseAccessor.java index 4e51c06a2..34584d65c 100644 --- a/src/main/java/com/replaymod/replay/mixin/EntityLivingBaseAccessor.java +++ b/src/main/java/com/replaymod/mixin/Mixin_EntityLivingBaseAccessor.java @@ -1,11 +1,11 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import net.minecraft.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(LivingEntity.class) -public interface EntityLivingBaseAccessor { +public interface Mixin_EntityLivingBaseAccessor { //#if MC>=11400 @Accessor("serverX") double getInterpTargetX(); diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java b/src/main/java/com/replaymod/mixin/Mixin_ForceChunkLoading.java similarity index 98% rename from src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java rename to src/main/java/com/replaymod/mixin/Mixin_ForceChunkLoading.java index 72c121a45..bd9b32c42 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java +++ b/src/main/java/com/replaymod/mixin/Mixin_ForceChunkLoading.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.compat.shaders.ShaderReflection; import com.replaymod.render.hooks.ForceChunkLoadingHook; diff --git a/src/main/java/com/replaymod/core/mixin/Mixin_HideDynamicResourcePacks.java b/src/main/java/com/replaymod/mixin/Mixin_HideDynamicResourcePacks.java similarity index 97% rename from src/main/java/com/replaymod/core/mixin/Mixin_HideDynamicResourcePacks.java rename to src/main/java/com/replaymod/mixin/Mixin_HideDynamicResourcePacks.java index 853c9cd4c..98937c724 100644 --- a/src/main/java/com/replaymod/core/mixin/Mixin_HideDynamicResourcePacks.java +++ b/src/main/java/com/replaymod/mixin/Mixin_HideDynamicResourcePacks.java @@ -1,5 +1,5 @@ //#if FABRIC>=1 -package com.replaymod.core.mixin; +package com.replaymod.mixin; import net.minecraft.client.gui.screen.pack.PackListWidget; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_HideNameTags.java b/src/main/java/com/replaymod/mixin/Mixin_HideNameTags.java similarity index 97% rename from src/main/java/com/replaymod/render/mixin/Mixin_HideNameTags.java rename to src/main/java/com/replaymod/mixin/Mixin_HideNameTags.java index 6377afda0..574b52a34 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_HideNameTags.java +++ b/src/main/java/com/replaymod/mixin/Mixin_HideNameTags.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.core.versions.MCVer; import com.replaymod.render.hooks.EntityRendererHandler; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_HideNameTags_LivingEntity.java b/src/main/java/com/replaymod/mixin/Mixin_HideNameTags_LivingEntity.java similarity index 86% rename from src/main/java/com/replaymod/render/mixin/Mixin_HideNameTags_LivingEntity.java rename to src/main/java/com/replaymod/mixin/Mixin_HideNameTags_LivingEntity.java index cafbe9f89..33c6837ae 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_HideNameTags_LivingEntity.java +++ b/src/main/java/com/replaymod/mixin/Mixin_HideNameTags_LivingEntity.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import net.minecraft.client.render.entity.LivingEntityRenderer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/replay/mixin/MixinKeyboardListener.java b/src/main/java/com/replaymod/mixin/Mixin_KeyboardListener.java similarity index 95% rename from src/main/java/com/replaymod/replay/mixin/MixinKeyboardListener.java rename to src/main/java/com/replaymod/mixin/Mixin_KeyboardListener.java index 12caef5af..dc9ec264a 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinKeyboardListener.java +++ b/src/main/java/com/replaymod/mixin/Mixin_KeyboardListener.java @@ -1,4 +1,4 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.extras.advancedscreenshots.AdvancedScreenshots; import com.replaymod.replay.ReplayModReplay; @@ -18,7 +18,7 @@ //#else //$$ @Mixin(Minecraft.class) //#endif -public abstract class MixinKeyboardListener { +public abstract class Mixin_KeyboardListener { @Inject( //#if MC>=11400 method = "onKey", diff --git a/src/main/java/com/replaymod/replay/mixin/Mixin_MoveRealmsButton.java b/src/main/java/com/replaymod/mixin/Mixin_MoveRealmsButton.java similarity index 96% rename from src/main/java/com/replaymod/replay/mixin/Mixin_MoveRealmsButton.java rename to src/main/java/com/replaymod/mixin/Mixin_MoveRealmsButton.java index 3066899f2..336adfe99 100644 --- a/src/main/java/com/replaymod/replay/mixin/Mixin_MoveRealmsButton.java +++ b/src/main/java/com/replaymod/mixin/Mixin_MoveRealmsButton.java @@ -1,5 +1,5 @@ //#if MC>=11600 -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.core.ReplayMod; import com.replaymod.replay.Setting; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_Camera.java b/src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_Camera.java similarity index 96% rename from src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_Camera.java rename to src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_Camera.java index fb58ab874..3b86ff0ae 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_Camera.java +++ b/src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_Camera.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.hooks.EntityRendererHandler; import net.minecraft.client.render.GameRenderer; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_DisableFrustumCulling.java b/src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_DisableFrustumCulling.java similarity index 97% rename from src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_DisableFrustumCulling.java rename to src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_DisableFrustumCulling.java index f174e0a39..589119748 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_DisableFrustumCulling.java +++ b/src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_DisableFrustumCulling.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.core.versions.MCVer; import com.replaymod.render.hooks.EntityRendererHandler; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_Rotation.java b/src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_Rotation.java similarity index 98% rename from src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_Rotation.java rename to src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_Rotation.java index 6107028ec..9bd36f4d3 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_Rotation.java +++ b/src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_Rotation.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.capturer.CubicOpenGlFrameCapturer; import com.replaymod.render.hooks.EntityRendererHandler; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_SkipHand.java b/src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_SkipHand.java similarity index 97% rename from src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_SkipHand.java rename to src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_SkipHand.java index 939f6ec86..135d6fab5 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_Omnidirectional_SkipHand.java +++ b/src/main/java/com/replaymod/mixin/Mixin_Omnidirectional_SkipHand.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.hooks.EntityRendererHandler; import net.minecraft.client.render.Camera; diff --git a/src/main/java/com/replaymod/replay/mixin/MixinParticleManager.java b/src/main/java/com/replaymod/mixin/Mixin_ParticleManager.java similarity index 94% rename from src/main/java/com/replaymod/replay/mixin/MixinParticleManager.java rename to src/main/java/com/replaymod/mixin/Mixin_ParticleManager.java index 6e9b86496..f7d096ac0 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinParticleManager.java +++ b/src/main/java/com/replaymod/mixin/Mixin_ParticleManager.java @@ -1,4 +1,4 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; //#if MC>=10904 import net.minecraft.client.particle.Particle; @@ -19,7 +19,7 @@ import java.util.Queue; @Mixin(ParticleManager.class) -public abstract class MixinParticleManager { +public abstract class Mixin_ParticleManager { @Final @Shadow private Queue newParticles; diff --git a/src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java b/src/main/java/com/replaymod/mixin/Mixin_PlayerControllerMP.java similarity index 98% rename from src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java rename to src/main/java/com/replaymod/mixin/Mixin_PlayerControllerMP.java index 2949eba28..95ca44d56 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java +++ b/src/main/java/com/replaymod/mixin/Mixin_PlayerControllerMP.java @@ -1,4 +1,4 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.ReplayModReplay; import com.replaymod.replay.camera.CameraEntity; @@ -38,7 +38,7 @@ //#endif @Mixin(ClientPlayerInteractionManager.class) -public abstract class MixinPlayerControllerMP { +public abstract class Mixin_PlayerControllerMP { @Shadow private MinecraftClient client; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_PreserveDepthDuringHandRendering.java b/src/main/java/com/replaymod/mixin/Mixin_PreserveDepthDuringHandRendering.java similarity index 96% rename from src/main/java/com/replaymod/render/mixin/Mixin_PreserveDepthDuringHandRendering.java rename to src/main/java/com/replaymod/mixin/Mixin_PreserveDepthDuringHandRendering.java index 5edd5e298..6e97618aa 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_PreserveDepthDuringHandRendering.java +++ b/src/main/java/com/replaymod/mixin/Mixin_PreserveDepthDuringHandRendering.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.hooks.EntityRendererHandler; import net.minecraft.client.render.GameRenderer; diff --git a/src/main/java/com/replaymod/core/mixin/Mixin_RegisterDynamicResourcePacks.java b/src/main/java/com/replaymod/mixin/Mixin_RegisterDynamicResourcePacks.java similarity index 98% rename from src/main/java/com/replaymod/core/mixin/Mixin_RegisterDynamicResourcePacks.java rename to src/main/java/com/replaymod/mixin/Mixin_RegisterDynamicResourcePacks.java index fde3a013a..2648240c1 100644 --- a/src/main/java/com/replaymod/core/mixin/Mixin_RegisterDynamicResourcePacks.java +++ b/src/main/java/com/replaymod/mixin/Mixin_RegisterDynamicResourcePacks.java @@ -1,5 +1,5 @@ //#if FABRIC>=1 -package com.replaymod.core.mixin; +package com.replaymod.mixin; import com.replaymod.core.ReplayMod; import com.replaymod.core.versions.LangResourcePack; diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java b/src/main/java/com/replaymod/mixin/Mixin_RenderGlobal.java similarity index 98% rename from src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java rename to src/main/java/com/replaymod/mixin/Mixin_RenderGlobal.java index af495f1d6..8e9eb55de 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java +++ b/src/main/java/com/replaymod/mixin/Mixin_RenderGlobal.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.render.blend.mixin; +package com.replaymod.mixin; import com.replaymod.render.blend.BlendState; import com.replaymod.render.blend.exporters.EntityExporter; @@ -32,7 +32,7 @@ //#else //$$ @Mixin(RenderGlobal.class) //#endif -public abstract class MixinRenderGlobal { +public abstract class Mixin_RenderGlobal { // FIXME wither skull ._. mojang pls diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/Mixin_RenderHudCallback.java b/src/main/java/com/replaymod/mixin/Mixin_RenderHudCallback.java similarity index 85% rename from src/main/java/de/johni0702/minecraft/gui/versions/mixin/Mixin_RenderHudCallback.java rename to src/main/java/com/replaymod/mixin/Mixin_RenderHudCallback.java index d223f960a..874ed1ac3 100644 --- a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/Mixin_RenderHudCallback.java +++ b/src/main/java/com/replaymod/mixin/Mixin_RenderHudCallback.java @@ -1,9 +1,8 @@ //#if FABRIC>=1 -package de.johni0702.minecraft.gui.versions.mixin; +package com.replaymod.mixin; -import de.johni0702.minecraft.gui.versions.callbacks.RenderHudCallback; +import com.replaymod.gui.versions.callbacks.RenderHudCallback; import net.minecraft.client.gui.hud.InGameHud; -import net.minecraft.client.render.GameRenderer; import net.minecraft.client.util.math.MatrixStack; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/replay/mixin/MixinRenderItem.java b/src/main/java/com/replaymod/mixin/Mixin_RenderItem.java similarity index 95% rename from src/main/java/com/replaymod/replay/mixin/MixinRenderItem.java rename to src/main/java/com/replaymod/mixin/Mixin_RenderItem.java index 63eb35635..492537fae 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinRenderItem.java +++ b/src/main/java/com/replaymod/mixin/Mixin_RenderItem.java @@ -1,4 +1,4 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.ReplayHandler; import com.replaymod.replay.ReplayModReplay; @@ -17,7 +17,7 @@ //#else //$$ @Mixin(net.minecraft.client.render.item.ItemRenderer.class) //#endif -public class MixinRenderItem { +public class Mixin_RenderItem { //#if MC>=11400 //#if MC>=11500 @Redirect(method = "setupGlintTexturing", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J")) diff --git a/src/main/java/com/replaymod/replay/mixin/MixinRenderLivingBase.java b/src/main/java/com/replaymod/mixin/Mixin_RenderLivingBase.java similarity index 96% rename from src/main/java/com/replaymod/replay/mixin/MixinRenderLivingBase.java rename to src/main/java/com/replaymod/mixin/Mixin_RenderLivingBase.java index 0ac43d248..8970ef8ac 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinRenderLivingBase.java +++ b/src/main/java/com/replaymod/mixin/Mixin_RenderLivingBase.java @@ -1,4 +1,4 @@ -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.camera.CameraEntity; import net.minecraft.entity.LivingEntity; @@ -22,7 +22,7 @@ //#else //$$ @Mixin(RendererLivingEntity.class) //#endif -public abstract class MixinRenderLivingBase { +public abstract class Mixin_RenderLivingBase { //#if FABRIC>=1 @Inject(method = "hasLabel", at = @At("HEAD"), cancellable = true) //#else diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java b/src/main/java/com/replaymod/mixin/Mixin_RenderManager.java similarity index 98% rename from src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java rename to src/main/java/com/replaymod/mixin/Mixin_RenderManager.java index 57764995d..9b28b73aa 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java +++ b/src/main/java/com/replaymod/mixin/Mixin_RenderManager.java @@ -1,5 +1,5 @@ //#if MC>=10800 -package com.replaymod.render.blend.mixin; +package com.replaymod.mixin; import com.replaymod.render.blend.BlendState; import com.replaymod.render.blend.exporters.EntityExporter; @@ -21,7 +21,7 @@ //#endif @Mixin(EntityRenderDispatcher.class) -public abstract class MixinRenderManager { +public abstract class Mixin_RenderManager { @Inject( //#if MC>=11500 diff --git a/src/main/java/com/replaymod/replay/mixin/Mixin_ShowSpectatedHand_NoOF.java b/src/main/java/com/replaymod/mixin/Mixin_ShowSpectatedHand_NoOF.java similarity index 97% rename from src/main/java/com/replaymod/replay/mixin/Mixin_ShowSpectatedHand_NoOF.java rename to src/main/java/com/replaymod/mixin/Mixin_ShowSpectatedHand_NoOF.java index d4b208dc5..a49962b83 100644 --- a/src/main/java/com/replaymod/replay/mixin/Mixin_ShowSpectatedHand_NoOF.java +++ b/src/main/java/com/replaymod/mixin/Mixin_ShowSpectatedHand_NoOF.java @@ -1,5 +1,5 @@ //#if MC>=11400 -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.camera.CameraEntity; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/src/main/java/com/replaymod/replay/mixin/Mixin_ShowSpectatedHand_OF.java b/src/main/java/com/replaymod/mixin/Mixin_ShowSpectatedHand_OF.java similarity index 98% rename from src/main/java/com/replaymod/replay/mixin/Mixin_ShowSpectatedHand_OF.java rename to src/main/java/com/replaymod/mixin/Mixin_ShowSpectatedHand_OF.java index 684c6a515..57c8d0f97 100644 --- a/src/main/java/com/replaymod/replay/mixin/Mixin_ShowSpectatedHand_OF.java +++ b/src/main/java/com/replaymod/mixin/Mixin_ShowSpectatedHand_OF.java @@ -1,5 +1,5 @@ //#if MC>=11400 -package com.replaymod.replay.mixin; +package com.replaymod.mixin; import com.replaymod.replay.camera.CameraEntity; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_SkipBlockOutlinesDuringRender.java b/src/main/java/com/replaymod/mixin/Mixin_SkipBlockOutlinesDuringRender.java similarity index 96% rename from src/main/java/com/replaymod/render/mixin/Mixin_SkipBlockOutlinesDuringRender.java rename to src/main/java/com/replaymod/mixin/Mixin_SkipBlockOutlinesDuringRender.java index 6d192f27b..a8e495c81 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_SkipBlockOutlinesDuringRender.java +++ b/src/main/java/com/replaymod/mixin/Mixin_SkipBlockOutlinesDuringRender.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.hooks.EntityRendererHandler; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_StabilizeCamera.java b/src/main/java/com/replaymod/mixin/Mixin_StabilizeCamera.java similarity index 99% rename from src/main/java/com/replaymod/render/mixin/Mixin_StabilizeCamera.java rename to src/main/java/com/replaymod/mixin/Mixin_StabilizeCamera.java index 564c805c4..76ca06cfc 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_StabilizeCamera.java +++ b/src/main/java/com/replaymod/mixin/Mixin_StabilizeCamera.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.RenderSettings; import com.replaymod.render.hooks.EntityRendererHandler; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_Stereoscopic_Camera.java b/src/main/java/com/replaymod/mixin/Mixin_Stereoscopic_Camera.java similarity index 98% rename from src/main/java/com/replaymod/render/mixin/Mixin_Stereoscopic_Camera.java rename to src/main/java/com/replaymod/mixin/Mixin_Stereoscopic_Camera.java index 945ac1075..6ea8f21db 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_Stereoscopic_Camera.java +++ b/src/main/java/com/replaymod/mixin/Mixin_Stereoscopic_Camera.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import com.replaymod.render.capturer.StereoscopicOpenGlFrameCapturer; import com.replaymod.render.hooks.EntityRendererHandler; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_Stereoscopic_HandRenderPass.java b/src/main/java/com/replaymod/mixin/Mixin_Stereoscopic_HandRenderPass.java similarity index 87% rename from src/main/java/com/replaymod/render/mixin/Mixin_Stereoscopic_HandRenderPass.java rename to src/main/java/com/replaymod/mixin/Mixin_Stereoscopic_HandRenderPass.java index c4facf6d9..090f79f4a 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_Stereoscopic_HandRenderPass.java +++ b/src/main/java/com/replaymod/mixin/Mixin_Stereoscopic_HandRenderPass.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import net.minecraft.client.render.GameRenderer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_WindowsWorkaroundForTinyEXRNatives.java b/src/main/java/com/replaymod/mixin/Mixin_WindowsWorkaroundForTinyEXRNatives.java similarity index 98% rename from src/main/java/com/replaymod/render/mixin/Mixin_WindowsWorkaroundForTinyEXRNatives.java rename to src/main/java/com/replaymod/mixin/Mixin_WindowsWorkaroundForTinyEXRNatives.java index 3df81c08e..80a146a30 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_WindowsWorkaroundForTinyEXRNatives.java +++ b/src/main/java/com/replaymod/mixin/Mixin_WindowsWorkaroundForTinyEXRNatives.java @@ -1,5 +1,5 @@ //#if MC>=11400 -package com.replaymod.render.mixin; +package com.replaymod.mixin; import org.lwjgl.system.Library; import org.lwjgl.system.Platform; diff --git a/src/main/java/com/replaymod/render/blend/mixin/WorldRendererAccessor.java b/src/main/java/com/replaymod/mixin/Mixin_WorldRendererAccessor.java similarity index 100% rename from src/main/java/com/replaymod/render/blend/mixin/WorldRendererAccessor.java rename to src/main/java/com/replaymod/mixin/Mixin_WorldRendererAccessor.java diff --git a/src/main/java/com/replaymod/recording/mixin/NetworkManagerAccessor.java b/src/main/java/com/replaymod/mixin/NetworkManagerAccessor.java similarity index 88% rename from src/main/java/com/replaymod/recording/mixin/NetworkManagerAccessor.java rename to src/main/java/com/replaymod/mixin/NetworkManagerAccessor.java index ec9190233..0f4cc31c9 100644 --- a/src/main/java/com/replaymod/recording/mixin/NetworkManagerAccessor.java +++ b/src/main/java/com/replaymod/mixin/NetworkManagerAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import io.netty.channel.Channel; import net.minecraft.network.ClientConnection; diff --git a/src/main/java/com/replaymod/render/blend/mixin/ParticleAccessor.java b/src/main/java/com/replaymod/mixin/ParticleAccessor.java similarity index 92% rename from src/main/java/com/replaymod/render/blend/mixin/ParticleAccessor.java rename to src/main/java/com/replaymod/mixin/ParticleAccessor.java index 47a5304db..feab16c99 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/ParticleAccessor.java +++ b/src/main/java/com/replaymod/mixin/ParticleAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.render.blend.mixin; +package com.replaymod.mixin; import net.minecraft.client.particle.Particle; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/core/mixin/ResourcePackRepositoryAccessor.java b/src/main/java/com/replaymod/mixin/ResourcePackRepositoryAccessor.java similarity index 100% rename from src/main/java/com/replaymod/core/mixin/ResourcePackRepositoryAccessor.java rename to src/main/java/com/replaymod/mixin/ResourcePackRepositoryAccessor.java diff --git a/src/main/java/com/replaymod/recording/mixin/SPacketSpawnMobAccessor.java b/src/main/java/com/replaymod/mixin/SPacketSpawnMobAccessor.java similarity index 92% rename from src/main/java/com/replaymod/recording/mixin/SPacketSpawnMobAccessor.java rename to src/main/java/com/replaymod/mixin/SPacketSpawnMobAccessor.java index 78b663354..d3bfbd0a7 100644 --- a/src/main/java/com/replaymod/recording/mixin/SPacketSpawnMobAccessor.java +++ b/src/main/java/com/replaymod/mixin/SPacketSpawnMobAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import net.minecraft.entity.data.DataTracker; import net.minecraft.network.packet.s2c.play.MobSpawnS2CPacket; diff --git a/src/main/java/com/replaymod/recording/mixin/SPacketSpawnPlayerAccessor.java b/src/main/java/com/replaymod/mixin/SPacketSpawnPlayerAccessor.java similarity index 92% rename from src/main/java/com/replaymod/recording/mixin/SPacketSpawnPlayerAccessor.java rename to src/main/java/com/replaymod/mixin/SPacketSpawnPlayerAccessor.java index 73f7f6672..8a6e2cfca 100644 --- a/src/main/java/com/replaymod/recording/mixin/SPacketSpawnPlayerAccessor.java +++ b/src/main/java/com/replaymod/mixin/SPacketSpawnPlayerAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import net.minecraft.entity.data.DataTracker; import net.minecraft.network.packet.s2c.play.PlayerSpawnS2CPacket; diff --git a/src/main/java/com/replaymod/core/mixin/TimerAccessor.java b/src/main/java/com/replaymod/mixin/TimerAccessor.java similarity index 97% rename from src/main/java/com/replaymod/core/mixin/TimerAccessor.java rename to src/main/java/com/replaymod/mixin/TimerAccessor.java index 0f10f2613..4757b05b4 100644 --- a/src/main/java/com/replaymod/core/mixin/TimerAccessor.java +++ b/src/main/java/com/replaymod/mixin/TimerAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.core.mixin; +package com.replaymod.mixin; import net.minecraft.client.render.RenderTickCounter; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/render/mixin/WorldRendererAccessor.java b/src/main/java/com/replaymod/mixin/WorldRendererAccessor.java similarity index 96% rename from src/main/java/com/replaymod/render/mixin/WorldRendererAccessor.java rename to src/main/java/com/replaymod/mixin/WorldRendererAccessor.java index 0806f547e..99a1eb2da 100644 --- a/src/main/java/com/replaymod/render/mixin/WorldRendererAccessor.java +++ b/src/main/java/com/replaymod/mixin/WorldRendererAccessor.java @@ -1,4 +1,4 @@ -package com.replaymod.render.mixin; +package com.replaymod.mixin; import net.minecraft.client.render.WorldRenderer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/pathing/gui/GuiKeyframeRepository.java b/src/main/java/com/replaymod/pathing/gui/GuiKeyframeRepository.java index 6ac40e612..71439b227 100644 --- a/src/main/java/com/replaymod/pathing/gui/GuiKeyframeRepository.java +++ b/src/main/java/com/replaymod/pathing/gui/GuiKeyframeRepository.java @@ -1,7 +1,5 @@ package com.replaymod.pathing.gui; -import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.SettableFuture; import com.replaymod.core.ReplayMod; import com.replaymod.core.utils.Utils; @@ -15,25 +13,25 @@ import com.replaymod.replaystudio.pathing.path.Timeline; import com.replaymod.replaystudio.pathing.serialize.TimelineSerialization; import com.replaymod.replaystudio.replay.ReplayFile; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.AbstractGuiClickableContainer; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.container.GuiVerticalList; -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.GuiTextField; -import de.johni0702.minecraft.gui.function.Closeable; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.GridLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; -import de.johni0702.minecraft.gui.popup.GuiYesNoPopup; -import de.johni0702.minecraft.gui.utils.Colors; -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.AbstractGuiClickableContainer; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.container.GuiVerticalList; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.element.GuiTextField; +import com.replaymod.gui.function.Closeable; +import com.replaymod.gui.function.Typeable; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.GridLayout; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.popup.GuiYesNoPopup; +import com.replaymod.gui.utils.Colors; +import com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; @@ -50,8 +48,8 @@ import java.util.Set; import java.util.stream.Collectors; -import static de.johni0702.minecraft.gui.versions.MCVer.getClipboardString; -import static de.johni0702.minecraft.gui.versions.MCVer.setClipboardString; +import static com.replaymod.gui.versions.MCVer.getClipboardString; +import static com.replaymod.gui.versions.MCVer.setClipboardString; /** * Gui for loading and saving {@link Timeline Timelines}. diff --git a/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java b/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java index a495399ee..95639a3ba 100644 --- a/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java +++ b/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java @@ -6,14 +6,14 @@ import com.google.common.primitives.Longs; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import com.replaymod.core.mixin.MinecraftAccessor; -import com.replaymod.core.mixin.TimerAccessor; +import com.replaymod.mixin.MinecraftAccessor; +import com.replaymod.mixin.TimerAccessor; import com.replaymod.core.utils.WrappedTimer; import com.replaymod.replay.ReplayHandler; import com.replaymod.replaystudio.pathing.path.Keyframe; import com.replaymod.replaystudio.pathing.path.Path; import com.replaymod.replaystudio.pathing.path.Timeline; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.utils.EventRegistrations; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.RenderTickCounter; diff --git a/src/main/java/com/replaymod/pathing/player/ReplayTimer.java b/src/main/java/com/replaymod/pathing/player/ReplayTimer.java index 30d5f4626..8e910a64d 100644 --- a/src/main/java/com/replaymod/pathing/player/ReplayTimer.java +++ b/src/main/java/com/replaymod/pathing/player/ReplayTimer.java @@ -1,7 +1,7 @@ package com.replaymod.pathing.player; import com.replaymod.core.utils.WrappedTimer; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; import net.minecraft.client.render.RenderTickCounter; /** diff --git a/src/main/java/com/replaymod/pathing/properties/CameraProperties.java b/src/main/java/com/replaymod/pathing/properties/CameraProperties.java index 19e42b31c..b77139ccc 100644 --- a/src/main/java/com/replaymod/pathing/properties/CameraProperties.java +++ b/src/main/java/com/replaymod/pathing/properties/CameraProperties.java @@ -9,7 +9,7 @@ import com.replaymod.replaystudio.pathing.property.AbstractPropertyGroup; import com.replaymod.replaystudio.pathing.property.PropertyPart; import com.replaymod.replaystudio.pathing.property.PropertyParts; -import de.johni0702.minecraft.gui.utils.NonNull; +import com.replaymod.gui.utils.NonNull; import org.apache.commons.lang3.tuple.Triple; import java.io.IOException; diff --git a/src/main/java/com/replaymod/pathing/properties/TimestampProperty.java b/src/main/java/com/replaymod/pathing/properties/TimestampProperty.java index 24d09770b..9ac2e5d96 100644 --- a/src/main/java/com/replaymod/pathing/properties/TimestampProperty.java +++ b/src/main/java/com/replaymod/pathing/properties/TimestampProperty.java @@ -7,7 +7,7 @@ import com.replaymod.replaystudio.pathing.property.AbstractProperty; import com.replaymod.replaystudio.pathing.property.PropertyPart; import com.replaymod.replaystudio.pathing.property.PropertyParts; -import de.johni0702.minecraft.gui.utils.NonNull; +import com.replaymod.gui.utils.NonNull; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/com/replaymod/recording/ReplayModRecording.java b/src/main/java/com/replaymod/recording/ReplayModRecording.java index 94ae09022..163bf24ec 100644 --- a/src/main/java/com/replaymod/recording/ReplayModRecording.java +++ b/src/main/java/com/replaymod/recording/ReplayModRecording.java @@ -7,7 +7,7 @@ import com.replaymod.core.versions.MCVer.Keyboard; import com.replaymod.recording.handler.ConnectionEventHandler; import com.replaymod.recording.handler.GuiHandler; -import com.replaymod.recording.mixin.NetworkManagerAccessor; +import com.replaymod.mixin.NetworkManagerAccessor; import com.replaymod.recording.packet.PacketListener; import io.netty.channel.Channel; import io.netty.util.AttributeKey; diff --git a/src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java b/src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java index b9af96927..c155ffc26 100644 --- a/src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java +++ b/src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java @@ -4,14 +4,15 @@ import com.replaymod.core.utils.Utils; import com.replaymod.core.versions.MCVer; import com.replaymod.editor.gui.MarkerProcessor; +import com.replaymod.gui.container.GuiScreen; import com.replaymod.recording.packet.PacketListener; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.VanillaGuiScreen; -import de.johni0702.minecraft.gui.element.GuiButton; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.VanillaGuiScreen; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.versions.callbacks.InitScreenCallback; import net.minecraft.client.gui.screen.GameMenuScreen; import net.minecraft.client.gui.screen.Screen; @@ -93,9 +94,9 @@ private void injectIntoIngameMenu(Screen guiScreen, .>map(it -> (height) -> it.y) .orElse((height) -> height / 4 + 120 - 16); VanillaGuiScreen vanillaGui = VanillaGuiScreen.wrap(guiScreen); - vanillaGui.setLayout(new CustomLayout(vanillaGui.getLayout()) { + vanillaGui.setLayout(new CustomLayout(vanillaGui.getLayout()) { @Override - protected void layout(de.johni0702.minecraft.gui.container.GuiScreen container, int width, int height) { + protected void layout(GuiScreen container, int width, int height) { pos(panel, width / 2 - 100, yPos.apply(height) + 16 + 8); } }).addElements(null, panel); diff --git a/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java b/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java index 06783108e..d39495ebc 100644 --- a/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java +++ b/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java @@ -2,10 +2,10 @@ import com.replaymod.core.SettingsRegistry; import com.replaymod.recording.Setting; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.MinecraftGuiRenderer; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.versions.callbacks.RenderHudCallback; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.MinecraftGuiRenderer; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.versions.callbacks.RenderHudCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.resource.language.I18n; diff --git a/src/main/java/com/replaymod/recording/gui/GuiSavingReplay.java b/src/main/java/com/replaymod/recording/gui/GuiSavingReplay.java index 7f1a1238c..83d41907a 100644 --- a/src/main/java/com/replaymod/recording/gui/GuiSavingReplay.java +++ b/src/main/java/com/replaymod/recording/gui/GuiSavingReplay.java @@ -6,21 +6,21 @@ import com.replaymod.replay.gui.screen.GuiReplayViewer; import com.replaymod.replaystudio.replay.ReplayMetaData; import com.replaymod.replaystudio.us.myles.ViaVersion.api.Pair; -import de.johni0702.minecraft.gui.container.AbstractGuiScreen; -import de.johni0702.minecraft.gui.container.GuiContainer; -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.GuiTextField; -import de.johni0702.minecraft.gui.element.GuiTooltip; -import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar; -import de.johni0702.minecraft.gui.function.Focusable; -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.GuiContainer; +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.GuiTextField; +import com.replaymod.gui.element.GuiTooltip; +import com.replaymod.gui.element.advanced.GuiProgressBar; +import com.replaymod.gui.function.Focusable; +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 de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import net.minecraft.client.MinecraftClient; @@ -35,7 +35,7 @@ import java.util.List; import static com.replaymod.core.versions.MCVer.getMinecraft; -import static de.johni0702.minecraft.gui.utils.Utils.link; +import static com.replaymod.gui.utils.Utils.link; public class GuiSavingReplay { diff --git a/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java b/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java index 0e90c7ebd..5ff366ca6 100644 --- a/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java +++ b/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java @@ -9,7 +9,7 @@ import com.replaymod.recording.Setting; import com.replaymod.recording.gui.GuiRecordingControls; import com.replaymod.recording.gui.GuiRecordingOverlay; -import com.replaymod.recording.mixin.NetworkManagerAccessor; +import com.replaymod.mixin.NetworkManagerAccessor; import com.replaymod.recording.packet.PacketListener; import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.replay.ReplayMetaData; diff --git a/src/main/java/com/replaymod/recording/handler/GuiHandler.java b/src/main/java/com/replaymod/recording/handler/GuiHandler.java index 10f7c9201..3d0e95f6c 100644 --- a/src/main/java/com/replaymod/recording/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/recording/handler/GuiHandler.java @@ -5,16 +5,16 @@ import com.replaymod.core.gui.GuiReplayButton; import com.replaymod.recording.ServerInfoExt; import com.replaymod.recording.Setting; -import com.replaymod.recording.mixin.AddServerScreenAccessor; -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.GuiCheckbox; -import de.johni0702.minecraft.gui.element.GuiToggleButton; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.popup.GuiInfoPopup; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; +import com.replaymod.mixin.AddServerScreenAccessor; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.container.VanillaGuiScreen; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiCheckbox; +import com.replaymod.gui.element.GuiToggleButton; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.popup.GuiInfoPopup; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.versions.callbacks.InitScreenCallback; import net.minecraft.client.gui.screen.AddServerScreen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.screen.world.SelectWorldScreen; diff --git a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java index a04cbee65..c11e2a237 100644 --- a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java +++ b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java @@ -1,10 +1,10 @@ package com.replaymod.recording.handler; import com.replaymod.core.events.PreRenderCallback; -import com.replaymod.recording.mixin.IntegratedServerAccessor; +import com.replaymod.mixin.IntegratedServerAccessor; import com.replaymod.recording.packet.PacketListener; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.versions.callbacks.PreTickCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.Entity; @@ -41,7 +41,7 @@ //#endif //#if MC>=10904 -import com.replaymod.recording.mixin.EntityLivingBaseAccessor; +import com.replaymod.mixin.EntityLivingBaseAccessor; import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket; import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket; import net.minecraft.network.packet.s2c.play.WorldEventS2CPacket; diff --git a/src/main/java/com/replaymod/recording/packet/PacketListener.java b/src/main/java/com/replaymod/recording/packet/PacketListener.java index f7de7c45e..569fcf737 100644 --- a/src/main/java/com/replaymod/recording/packet/PacketListener.java +++ b/src/main/java/com/replaymod/recording/packet/PacketListener.java @@ -2,7 +2,6 @@ import com.github.steveice10.netty.buffer.PooledByteBufAllocator; import com.github.steveice10.packetlib.tcp.io.ByteBufNetOutput; -import com.google.common.collect.Lists; import com.google.gson.Gson; import com.replaymod.core.ReplayMod; import com.replaymod.core.utils.Restrictions; @@ -13,15 +12,13 @@ import com.replaymod.recording.Setting; import com.replaymod.recording.gui.GuiSavingReplay; import com.replaymod.recording.handler.ConnectionEventHandler; -import com.replaymod.recording.mixin.SPacketSpawnMobAccessor; -import com.replaymod.recording.mixin.SPacketSpawnPlayerAccessor; import com.replaymod.replaystudio.PacketData; import com.replaymod.replaystudio.data.Marker; import com.replaymod.replaystudio.io.ReplayOutputStream; import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.replay.ReplayMetaData; import com.replaymod.replaystudio.us.myles.ViaVersion.api.Pair; -import de.johni0702.minecraft.gui.container.VanillaGuiScreen; +import com.replaymod.gui.container.VanillaGuiScreen; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; @@ -30,7 +27,6 @@ import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket; import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket; import net.minecraft.network.packet.s2c.play.ItemPickupAnimationS2CPacket; -import net.minecraft.network.packet.s2c.play.MobSpawnS2CPacket; import net.minecraft.network.packet.s2c.play.PlayerSpawnS2CPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.data.DataTracker; @@ -63,7 +59,6 @@ import net.minecraft.network.NetworkSide; //#endif -import java.io.DataOutputStream; import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; diff --git a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java index 6c28c388e..55229ac6b 100644 --- a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java +++ b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java @@ -19,7 +19,7 @@ //#endif //#if MC>=10800 -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.utils.Consumer; //#else //$$ import net.minecraft.client.gui.GuiScreenWorking; //$$ import net.minecraft.util.HttpUtil; diff --git a/src/main/java/com/replaymod/render/PNGWriter.java b/src/main/java/com/replaymod/render/PNGWriter.java index 846e63be2..7d0abe326 100644 --- a/src/main/java/com/replaymod/render/PNGWriter.java +++ b/src/main/java/com/replaymod/render/PNGWriter.java @@ -7,7 +7,7 @@ import com.replaymod.render.rendering.FrameConsumer; import com.replaymod.render.utils.ByteBufferPool; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import de.johni0702.minecraft.gui.versions.Image; +import com.replaymod.gui.versions.Image; import net.minecraft.util.crash.CrashReport; import java.io.IOException; diff --git a/src/main/java/com/replaymod/render/ReplayModRender.java b/src/main/java/com/replaymod/render/ReplayModRender.java index 71e07b201..4e1e84fdd 100644 --- a/src/main/java/com/replaymod/render/ReplayModRender.java +++ b/src/main/java/com/replaymod/render/ReplayModRender.java @@ -8,8 +8,8 @@ import com.replaymod.replay.events.ReplayClosedCallback; import com.replaymod.replay.events.ReplayOpenedCallback; import com.replaymod.replaystudio.replay.ReplayFile; -import de.johni0702.minecraft.gui.container.VanillaGuiScreen; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.container.VanillaGuiScreen; +import com.replaymod.gui.utils.EventRegistrations; import net.minecraft.util.crash.CrashReport; import net.minecraft.util.crash.CrashException; import org.apache.commons.io.FileUtils; diff --git a/src/main/java/com/replaymod/render/blend/BlendMaterials.java b/src/main/java/com/replaymod/render/blend/BlendMaterials.java index 1248352f0..4aca95a69 100644 --- a/src/main/java/com/replaymod/render/blend/BlendMaterials.java +++ b/src/main/java/com/replaymod/render/blend/BlendMaterials.java @@ -4,7 +4,7 @@ import com.replaymod.render.blend.data.DMaterial; import com.replaymod.render.blend.data.DPackedFile; import com.replaymod.render.blend.data.DTexture; -import de.johni0702.minecraft.gui.versions.Image; +import com.replaymod.gui.versions.Image; import net.minecraft.client.util.GlAllocationUtils; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java b/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java index b25b6556c..54de89d15 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java @@ -29,7 +29,7 @@ //#endif //#if MC>=10904 -import com.replaymod.render.blend.mixin.ItemRendererAccessor; +import com.replaymod.mixin.ItemRendererAccessor; //#endif import java.util.List; diff --git a/src/main/java/com/replaymod/render/blend/exporters/ParticlesExporter.java b/src/main/java/com/replaymod/render/blend/exporters/ParticlesExporter.java index 3cf2fb1a3..26bc85d7b 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/ParticlesExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/ParticlesExporter.java @@ -7,7 +7,7 @@ import com.replaymod.render.blend.Exporter; import com.replaymod.render.blend.data.DMesh; import com.replaymod.render.blend.data.DObject; -import com.replaymod.render.blend.mixin.ParticleAccessor; +import com.replaymod.mixin.ParticleAccessor; import de.johni0702.minecraft.gui.utils.lwjgl.vector.Matrix4f; import de.johni0702.minecraft.gui.utils.lwjgl.vector.Vector3f; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/replaymod/render/capturer/ODSFrameCapturer.java b/src/main/java/com/replaymod/render/capturer/ODSFrameCapturer.java index d4bb955ac..69c6d2534 100644 --- a/src/main/java/com/replaymod/render/capturer/ODSFrameCapturer.java +++ b/src/main/java/com/replaymod/render/capturer/ODSFrameCapturer.java @@ -1,7 +1,7 @@ package com.replaymod.render.capturer; import com.replaymod.render.rendering.Channel; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.utils.EventRegistrations; import com.replaymod.render.RenderSettings; import com.replaymod.render.frame.CubicOpenGlFrame; import com.replaymod.render.frame.ODSOpenGlFrame; diff --git a/src/main/java/com/replaymod/render/events/ReplayRenderCallback.java b/src/main/java/com/replaymod/render/events/ReplayRenderCallback.java index c2bfe3627..faed105c6 100644 --- a/src/main/java/com/replaymod/render/events/ReplayRenderCallback.java +++ b/src/main/java/com/replaymod/render/events/ReplayRenderCallback.java @@ -1,7 +1,7 @@ package com.replaymod.render.events; import com.replaymod.render.rendering.VideoRenderer; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; public interface ReplayRenderCallback { interface Pre { diff --git a/src/main/java/com/replaymod/render/gui/GuiExportFailed.java b/src/main/java/com/replaymod/render/gui/GuiExportFailed.java index de5e9c0e3..9ba581701 100644 --- a/src/main/java/com/replaymod/render/gui/GuiExportFailed.java +++ b/src/main/java/com/replaymod/render/gui/GuiExportFailed.java @@ -3,15 +3,15 @@ import com.replaymod.core.ReplayMod; import com.replaymod.render.RenderSettings; import com.replaymod.render.FFmpegWriter; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.container.GuiVerticalList; -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.CustomLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.container.GuiVerticalList; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.layout.VerticalLayout; import net.minecraft.util.crash.CrashReport; import net.minecraft.util.crash.CrashReportSection; import net.minecraft.util.crash.CrashException; diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java index 7cd0a6cdb..4b2f23569 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java @@ -15,23 +15,23 @@ import com.replaymod.replaystudio.pathing.path.Timeline; import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.us.myles.ViaVersion.api.Pair; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.AbstractGuiClickableContainer; -import de.johni0702.minecraft.gui.container.AbstractGuiScreen; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiVerticalList; -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.GuiTooltip; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.GridLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.popup.AbstractGuiPopup; -import de.johni0702.minecraft.gui.utils.Colors; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.AbstractGuiClickableContainer; +import com.replaymod.gui.container.AbstractGuiScreen; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiVerticalList; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.element.GuiTooltip; +import com.replaymod.gui.function.Typeable; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.GridLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.popup.AbstractGuiPopup; +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.utils.lwjgl.ReadablePoint; diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java index b6eae92fc..386568566 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java @@ -6,29 +6,29 @@ import com.google.gson.InstanceCreator; import com.google.gson.JsonSyntaxException; import com.replaymod.core.ReplayMod; +import com.replaymod.gui.element.GuiTextField; import com.replaymod.render.RenderSettings; import com.replaymod.render.ReplayModRender; import com.replaymod.render.FFmpegWriter; import com.replaymod.render.rendering.VideoRenderer; import com.replaymod.replay.ReplayHandler; import com.replaymod.replaystudio.pathing.path.Timeline; -import de.johni0702.minecraft.gui.container.AbstractGuiScreen; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.container.GuiVerticalList; -import de.johni0702.minecraft.gui.element.*; -import de.johni0702.minecraft.gui.element.advanced.GuiColorPicker; -import de.johni0702.minecraft.gui.element.advanced.GuiDropdownMenu; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.GridLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; -import de.johni0702.minecraft.gui.popup.AbstractGuiPopup; -import de.johni0702.minecraft.gui.popup.GuiFileChooserPopup; -import de.johni0702.minecraft.gui.utils.Colors; -import de.johni0702.minecraft.gui.utils.Consumer; -import de.johni0702.minecraft.gui.utils.Utils; +import com.replaymod.gui.container.AbstractGuiScreen; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.container.GuiVerticalList; +import com.replaymod.gui.element.advanced.GuiColorPicker; +import com.replaymod.gui.element.advanced.GuiDropdownMenu; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.GridLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.popup.AbstractGuiPopup; +import com.replaymod.gui.popup.GuiFileChooserPopup; +import com.replaymod.gui.utils.Colors; +import com.replaymod.gui.utils.Consumer; +import com.replaymod.gui.utils.Utils; import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; @@ -78,9 +78,9 @@ public void consume(Integer old) { }).setMinSize(new Dimension(0, 20)).setValues(RenderSettings.RenderMethod.getSupported()); { - for (Map.Entry entry : + for (Map.Entry entry : renderMethodDropdown.getDropdownEntries().entrySet()) { - entry.getValue().setTooltip(new GuiTooltip().setText(entry.getKey().getDescription())); + entry.getValue().setTooltip(new com.replaymod.gui.element.GuiTooltip().setText(entry.getKey().getDescription())); } } @@ -104,9 +104,9 @@ public void consume(Integer old) { } }).setMinSize(new Dimension(0, 20)).setValues(RenderSettings.EncodingPreset.getSupported()); - public final GuiNumberField videoWidth = new GuiNumberField().setSize(50, 20).setMinValue(1).setValidateOnFocusChange(true); - public final GuiNumberField videoHeight = new GuiNumberField().setSize(50, 20).setMinValue(1).setValidateOnFocusChange(true); - public final GuiSlider frameRateSlider = new GuiSlider().onValueChanged(new Runnable() { + public final com.replaymod.gui.element.GuiNumberField videoWidth = new com.replaymod.gui.element.GuiNumberField().setSize(50, 20).setMinValue(1).setValidateOnFocusChange(true); + public final com.replaymod.gui.element.GuiNumberField videoHeight = new com.replaymod.gui.element.GuiNumberField().setSize(50, 20).setMinValue(1).setValidateOnFocusChange(true); + public final com.replaymod.gui.element.GuiSlider frameRateSlider = new com.replaymod.gui.element.GuiSlider().onValueChanged(new Runnable() { @Override public void run() { frameRateSlider.setText(I18n.translate("replaymod.gui.rendersettings.framerate") @@ -115,13 +115,13 @@ public void run() { }).setSize(122, 20).setSteps(110); public final GuiPanel videoResolutionPanel = new GuiPanel() .setLayout(new HorizontalLayout(HorizontalLayout.Alignment.RIGHT).setSpacing(2)) - .addElements(new HorizontalLayout.Data(0.5), videoWidth, new GuiLabel().setText("*"), videoHeight); + .addElements(new HorizontalLayout.Data(0.5), videoWidth, new com.replaymod.gui.element.GuiLabel().setText("*"), videoHeight); - public final GuiNumberField bitRateField = new GuiNumberField().setValue(10).setSize(50, 20).setValidateOnFocusChange(true); + public final com.replaymod.gui.element.GuiNumberField bitRateField = new com.replaymod.gui.element.GuiNumberField().setValue(10).setSize(50, 20).setValidateOnFocusChange(true); public final GuiDropdownMenu bitRateUnit = new GuiDropdownMenu() .setSize(50, 20).setValues("bps", "kbps", "mbps").setSelected("mbps"); - public final GuiButton outputFileButton = new GuiButton().setMinSize(new Dimension(0, 20)).onClick(new Runnable() { + public final com.replaymod.gui.element.GuiButton outputFileButton = new com.replaymod.gui.element.GuiButton().setMinSize(new Dimension(0, 20)).onClick(new Runnable() { @Override public void run() { GuiFileChooserPopup popup = GuiFileChooserPopup.openSaveGui(GuiRenderSettings.this, "replaymod.gui.save", @@ -140,34 +140,34 @@ public void run() { public final GuiPanel mainPanel = new GuiPanel() .addElements(new GridLayout.Data(1, 0.5), - new GuiLabel().setI18nText("replaymod.gui.rendersettings.renderer"), renderMethodDropdown, - new GuiLabel().setI18nText("replaymod.gui.rendersettings.presets"), encodingPresetDropdown, - new GuiLabel().setI18nText("replaymod.gui.rendersettings.customresolution"), videoResolutionPanel, - new GuiLabel().setI18nText("replaymod.gui.rendersettings.bitrate"), new GuiPanel().addElements(null, + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.renderer"), renderMethodDropdown, + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.presets"), encodingPresetDropdown, + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.customresolution"), videoResolutionPanel, + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.bitrate"), new GuiPanel().addElements(null, new GuiPanel().addElements(null, bitRateField, bitRateUnit).setLayout(new HorizontalLayout()), frameRateSlider).setLayout(new HorizontalLayout(HorizontalLayout.Alignment.RIGHT).setSpacing(3)), - new GuiLabel().setI18nText("replaymod.gui.rendersettings.outputfile"), outputFileButton) + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.outputfile"), outputFileButton) .setLayout(new GridLayout().setCellsEqualSize(false).setColumns(2).setSpacingX(5).setSpacingY(5)); - public final GuiCheckbox nametagCheckbox = new GuiCheckbox() + public final com.replaymod.gui.element.GuiCheckbox nametagCheckbox = new com.replaymod.gui.element.GuiCheckbox() .setI18nLabel("replaymod.gui.rendersettings.nametags"); public final GuiPanel stabilizePanel = new GuiPanel().setLayout(new HorizontalLayout().setSpacing(10)); - public final GuiCheckbox stabilizeYaw = new GuiCheckbox(stabilizePanel) + public final com.replaymod.gui.element.GuiCheckbox stabilizeYaw = new com.replaymod.gui.element.GuiCheckbox(stabilizePanel) .setI18nLabel("replaymod.gui.yaw"); - public final GuiCheckbox stabilizePitch = new GuiCheckbox(stabilizePanel) + public final com.replaymod.gui.element.GuiCheckbox stabilizePitch = new com.replaymod.gui.element.GuiCheckbox(stabilizePanel) .setI18nLabel("replaymod.gui.pitch"); - public final GuiCheckbox stabilizeRoll = new GuiCheckbox(stabilizePanel) + public final com.replaymod.gui.element.GuiCheckbox stabilizeRoll = new com.replaymod.gui.element.GuiCheckbox(stabilizePanel) .setI18nLabel("replaymod.gui.roll"); - public final GuiCheckbox chromaKeyingCheckbox = new GuiCheckbox() + public final com.replaymod.gui.element.GuiCheckbox chromaKeyingCheckbox = new com.replaymod.gui.element.GuiCheckbox() .setI18nLabel("replaymod.gui.rendersettings.chromakey"); public final GuiColorPicker chromaKeyingColor = new GuiColorPicker().setSize(30, 15); public static final int MIN_SPHERICAL_FOV = 120; public static final int MAX_SPHERICAL_FOV = 360; public static final int SPHERICAL_FOV_STEP_SIZE = 5; - public final GuiSlider sphericalFovSlider = new GuiSlider() + public final com.replaymod.gui.element.GuiSlider sphericalFovSlider = new com.replaymod.gui.element.GuiSlider() .onValueChanged(new Runnable() { @Override public void run() { @@ -178,13 +178,13 @@ public void run() { } }).setSize(200, 20).setSteps((MAX_SPHERICAL_FOV - MIN_SPHERICAL_FOV) / SPHERICAL_FOV_STEP_SIZE); - public final GuiCheckbox injectSphericalMetadata = new GuiCheckbox() + public final com.replaymod.gui.element.GuiCheckbox injectSphericalMetadata = new com.replaymod.gui.element.GuiCheckbox() .setI18nLabel("replaymod.gui.rendersettings.sphericalmetadata"); - public final GuiCheckbox depthMap = new GuiCheckbox() + public final com.replaymod.gui.element.GuiCheckbox depthMap = new com.replaymod.gui.element.GuiCheckbox() .setI18nLabel("replaymod.gui.rendersettings.depthmap"); - public final GuiCheckbox cameraPathExport = new GuiCheckbox() + public final com.replaymod.gui.element.GuiCheckbox cameraPathExport = new com.replaymod.gui.element.GuiCheckbox() .setI18nLabel("replaymod.gui.rendersettings.camerapath"); public final GuiDropdownMenu antiAliasingDropdown = new GuiDropdownMenu() @@ -194,18 +194,18 @@ public void run() { .addElements(null, nametagCheckbox, new GuiPanel().setLayout( new GridLayout().setCellsEqualSize(false).setColumns(2).setSpacingX(5).setSpacingY(15)) .addElements(new GridLayout.Data(0, 0.5), - new GuiLabel().setI18nText("replaymod.gui.rendersettings.stabilizecamera"), stabilizePanel, + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.stabilizecamera"), stabilizePanel, chromaKeyingCheckbox, chromaKeyingColor, injectSphericalMetadata, sphericalFovSlider, - depthMap, new GuiLabel(), - cameraPathExport, new GuiLabel(), - new GuiLabel().setI18nText("replaymod.gui.rendersettings.antialiasing"), antiAliasingDropdown)); + depthMap, new com.replaymod.gui.element.GuiLabel(), + cameraPathExport, new com.replaymod.gui.element.GuiLabel(), + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.antialiasing"), antiAliasingDropdown)); - public final GuiTextField exportCommand = new GuiTextField().setI18nHint("replaymod.gui.rendersettings.command") + public final com.replaymod.gui.element.GuiTextField exportCommand = new com.replaymod.gui.element.GuiTextField().setI18nHint("replaymod.gui.rendersettings.command") .setSize(55, 20).setMaxLength(100).onTextChanged((old) -> updateInputs()); - public final GuiTextField exportArguments = new GuiTextField().setI18nHint("replaymod.gui.rendersettings.arguments") + public final com.replaymod.gui.element.GuiTextField exportArguments = new GuiTextField().setI18nHint("replaymod.gui.rendersettings.arguments") .setMinSize(new Dimension(245, 20)).setMaxLength(500).onTextChanged((old) -> updateInputs()); - public final GuiButton exportReset = new GuiButton().setLabel("X") + public final com.replaymod.gui.element.GuiButton exportReset = new com.replaymod.gui.element.GuiButton().setLabel("X") .setSize(20, 20) .onClick(() -> { exportCommand.setText(""); @@ -216,7 +216,7 @@ cameraPathExport, new GuiLabel(), public final GuiPanel commandlinePanel = new GuiPanel().setLayout(new VerticalLayout().setSpacing(10)) .addElements(null, new GuiPanel().setLayout(new HorizontalLayout().setSpacing(5)).addElements(null, exportCommand, exportArguments, exportReset), - new GuiLabel(new GuiPanel().setLayout(new CustomLayout() { + new com.replaymod.gui.element.GuiLabel(new GuiPanel().setLayout(new CustomLayout() { @Override protected void layout(GuiPanel container, int width, int height) { size(container.getChildren().iterator().next(), width, height); @@ -230,10 +230,10 @@ public ReadableDimension calcMinSize(GuiContainer container) { public final GuiPanel buttonPanel = new GuiPanel(contentPanel).setLayout(new HorizontalLayout().setSpacing(4)); - public final GuiButton queueButton = new GuiButton(buttonPanel) + public final com.replaymod.gui.element.GuiButton queueButton = new com.replaymod.gui.element.GuiButton(buttonPanel) .setSize(100, 20) .setI18nLabel("replaymod.gui.rendersettings.addtoqueue"); - public final GuiButton renderButton = new GuiButton(buttonPanel).onClick(() -> ReplayMod.instance.runLaterWithoutLock(new Runnable() { + public final com.replaymod.gui.element.GuiButton renderButton = new com.replaymod.gui.element.GuiButton(buttonPanel).onClick(() -> ReplayMod.instance.runLaterWithoutLock(new Runnable() { @Override public void run() { // Closing this GUI ensures that settings are saved @@ -267,7 +267,7 @@ public void run() { } } })).setSize(100, 20).setI18nLabel("replaymod.gui.render"); - public final GuiButton cancelButton = new GuiButton(buttonPanel) + public final com.replaymod.gui.element.GuiButton cancelButton = new com.replaymod.gui.element.GuiButton(buttonPanel) .onClick(this::close) .setSize(100, 20) .setI18nLabel("replaymod.gui.cancel"); @@ -292,9 +292,9 @@ public ReadableDimension calcMinSize(GuiContainer container) { settingsList.getListPanel().setLayout(new VerticalLayout().setSpacing(10)) .addElements(new VerticalLayout.Data(0.5), - new GuiLabel().setI18nText("replaymod.gui.rendersettings.video"), mainPanel, new GuiPanel(), - new GuiLabel().setI18nText("replaymod.gui.rendersettings.advanced"), advancedPanel, new GuiPanel(), - new GuiLabel().setI18nText("replaymod.gui.rendersettings.commandline"), commandlinePanel); + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.video"), mainPanel, new GuiPanel(), + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.advanced"), advancedPanel, new GuiPanel(), + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.rendersettings.commandline"), commandlinePanel); videoWidth.onTextChanged(new Consumer() { @Override @@ -358,16 +358,16 @@ protected void updateInputs() { videoWidth.setTextColor(Colors.WHITE); videoHeight.setTextColor(Colors.WHITE); } else { - queueButton.setDisabled().setTooltip(new GuiTooltip().setI18nText(resolutionError)); + queueButton.setDisabled().setTooltip(new com.replaymod.gui.element.GuiTooltip().setI18nText(resolutionError)); videoWidth.setTextColor(Colors.RED); videoHeight.setTextColor(Colors.RED); } String[] compatError = VideoRenderer.checkCompat(); if (resolutionError != null) { - renderButton.setDisabled().setTooltip(new GuiTooltip().setI18nText(resolutionError)); + renderButton.setDisabled().setTooltip(new com.replaymod.gui.element.GuiTooltip().setI18nText(resolutionError)); } else if (compatError != null) { - renderButton.setDisabled().setTooltip(new GuiTooltip().setText(compatError)); + renderButton.setDisabled().setTooltip(new com.replaymod.gui.element.GuiTooltip().setText(compatError)); } else { renderButton.setEnabled().setTooltip(null); } @@ -386,10 +386,10 @@ protected void updateInputs() { case CUBIC: case EQUIRECTANGULAR: case ODS: - stabilizePanel.invokeAll(IGuiCheckbox.class, GuiElement::setEnabled); + stabilizePanel.invokeAll(com.replaymod.gui.element.IGuiCheckbox.class, com.replaymod.gui.element.GuiElement::setEnabled); break; default: - stabilizePanel.invokeAll(IGuiCheckbox.class, GuiElement::setDisabled); + stabilizePanel.invokeAll(com.replaymod.gui.element.IGuiCheckbox.class, com.replaymod.gui.element.GuiElement::setDisabled); } // Enable/Disable Spherical FOV slider @@ -400,7 +400,7 @@ protected void updateInputs() { && renderMethod.isSpherical()) { injectSphericalMetadata.setEnabled().setTooltip(null); } else { - injectSphericalMetadata.setDisabled().setTooltip(new GuiTooltip().setColor(Colors.RED) + injectSphericalMetadata.setDisabled().setTooltip(new com.replaymod.gui.element.GuiTooltip().setColor(Colors.RED) .setI18nText("replaymod.gui.rendersettings.sphericalmetadata.error")); } @@ -421,7 +421,7 @@ protected void updateInputs() { if (isEXR || isPNG) { depthMap.setEnabled().setTooltip(null); } else { - depthMap.setDisabled().setTooltip(new GuiTooltip().setColor(Colors.RED) + depthMap.setDisabled().setTooltip(new com.replaymod.gui.element.GuiTooltip().setColor(Colors.RED) .setI18nText("replaymod.gui.rendersettings.depthmap.only_exr_or_png")); } diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderingDone.java b/src/main/java/com/replaymod/render/gui/GuiRenderingDone.java index 823d2ddf8..531b758b2 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderingDone.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderingDone.java @@ -5,14 +5,14 @@ import com.replaymod.render.RenderSettings; import com.replaymod.render.ReplayModRender; import com.replaymod.render.Setting; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.element.GuiButton; -import de.johni0702.minecraft.gui.element.GuiCheckbox; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiCheckbox; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.layout.VerticalLayout; import java.io.File; diff --git a/src/main/java/com/replaymod/render/gui/GuiVideoRenderer.java b/src/main/java/com/replaymod/render/gui/GuiVideoRenderer.java index bc69f0616..7fc8943a2 100644 --- a/src/main/java/com/replaymod/render/gui/GuiVideoRenderer.java +++ b/src/main/java/com/replaymod/render/gui/GuiVideoRenderer.java @@ -1,19 +1,18 @@ package com.replaymod.render.gui; import com.replaymod.core.utils.Utils; -import com.replaymod.render.frame.BitmapFrame; import com.replaymod.render.rendering.VideoRenderer; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.element.GuiButton; -import de.johni0702.minecraft.gui.element.GuiCheckbox; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar; -import de.johni0702.minecraft.gui.function.Tickable; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiCheckbox; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.element.advanced.GuiProgressBar; +import com.replaymod.gui.function.Tickable; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.HorizontalLayout; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; diff --git a/src/main/java/com/replaymod/render/hooks/EntityRendererHandler.java b/src/main/java/com/replaymod/render/hooks/EntityRendererHandler.java index 54560f1db..aafd01f13 100644 --- a/src/main/java/com/replaymod/render/hooks/EntityRendererHandler.java +++ b/src/main/java/com/replaymod/render/hooks/EntityRendererHandler.java @@ -6,7 +6,7 @@ import com.replaymod.render.capturer.CaptureData; import com.replaymod.render.capturer.RenderInfo; import com.replaymod.render.capturer.WorldRenderer; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.utils.EventRegistrations; import net.minecraft.client.MinecraftClient; //#if MC>=11500 diff --git a/src/main/java/com/replaymod/render/hooks/FogStateCallback.java b/src/main/java/com/replaymod/render/hooks/FogStateCallback.java index 1a8ad4e27..c2750d6b9 100644 --- a/src/main/java/com/replaymod/render/hooks/FogStateCallback.java +++ b/src/main/java/com/replaymod/render/hooks/FogStateCallback.java @@ -1,6 +1,6 @@ package com.replaymod.render.hooks; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; public interface FogStateCallback { Event EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/render/hooks/Texture2DStateCallback.java b/src/main/java/com/replaymod/render/hooks/Texture2DStateCallback.java index 1a063697c..6d45e002a 100644 --- a/src/main/java/com/replaymod/render/hooks/Texture2DStateCallback.java +++ b/src/main/java/com/replaymod/render/hooks/Texture2DStateCallback.java @@ -1,6 +1,6 @@ package com.replaymod.render.hooks; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; public interface Texture2DStateCallback { Event EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/render/rendering/Pipeline.java b/src/main/java/com/replaymod/render/rendering/Pipeline.java index cf7f057d5..20f8813d7 100644 --- a/src/main/java/com/replaymod/render/rendering/Pipeline.java +++ b/src/main/java/com/replaymod/render/rendering/Pipeline.java @@ -1,6 +1,6 @@ package com.replaymod.render.rendering; -import com.replaymod.core.mixin.MinecraftAccessor; +import com.replaymod.mixin.MinecraftAccessor; import com.replaymod.core.versions.MCVer; import com.replaymod.render.capturer.WorldRenderer; import com.replaymod.render.frame.BitmapFrame; diff --git a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java index 762c74e9b..d7bb6f89b 100644 --- a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java +++ b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java @@ -1,11 +1,11 @@ package com.replaymod.render.rendering; -import com.replaymod.core.mixin.MinecraftAccessor; -import com.replaymod.core.mixin.TimerAccessor; +import com.replaymod.mixin.MinecraftAccessor; +import com.replaymod.core.MinecraftMethodAccessor; +import com.replaymod.mixin.TimerAccessor; import com.replaymod.core.utils.WrappedTimer; import com.replaymod.core.versions.MCVer; import com.replaymod.pathing.player.AbstractTimelinePlayer; -import com.replaymod.pathing.player.ReplayTimer; import com.replaymod.pathing.properties.TimestampProperty; import com.replaymod.render.CameraPathExporter; import com.replaymod.render.PNGWriter; @@ -20,8 +20,7 @@ import com.replaymod.render.gui.GuiVideoRenderer; import com.replaymod.render.hooks.ForceChunkLoadingHook; import com.replaymod.render.metadata.MetadataInjector; -import com.replaymod.render.mixin.MainWindowAccessor; -import com.replaymod.render.mixin.WorldRendererAccessor; +import com.replaymod.mixin.MainWindowAccessor; import com.replaymod.replay.ReplayHandler; import com.replaymod.replaystudio.pathing.path.Keyframe; import com.replaymod.replaystudio.pathing.path.Path; @@ -29,7 +28,6 @@ import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import net.minecraft.client.MinecraftClient; -import com.mojang.blaze3d.platform.GLX; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.client.util.Window; @@ -70,9 +68,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Optional; -import java.util.Queue; import java.util.concurrent.Future; -import java.util.concurrent.FutureTask; import static com.google.common.collect.Iterables.getLast; import static com.replaymod.core.versions.MCVer.*; @@ -432,7 +428,7 @@ private void executeTaskQueue() { } break; } - ((MCVer.MinecraftMethodAccessor) mc).replayModExecuteTaskQueue(); + ((MinecraftMethodAccessor) mc).replayModExecuteTaskQueue(); //#else //$$ Queue> scheduledTasks = ((MinecraftAccessor) mc).getScheduledTasks(); //$$ //noinspection SynchronizationOnLocalVariableOrMethodParameter diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java index fc0714b7e..076a3de6b 100644 --- a/src/main/java/com/replaymod/replay/FullReplaySender.java +++ b/src/main/java/com/replaymod/replay/FullReplaySender.java @@ -5,14 +5,14 @@ import com.google.common.base.Preconditions; import com.google.common.io.Files; import com.replaymod.core.ReplayMod; -import com.replaymod.core.mixin.MinecraftAccessor; -import com.replaymod.core.mixin.TimerAccessor; +import com.replaymod.mixin.MinecraftAccessor; +import com.replaymod.mixin.TimerAccessor; import com.replaymod.core.utils.Restrictions; import com.replaymod.replay.camera.CameraEntity; import com.replaymod.replaystudio.io.ReplayInputStream; import com.replaymod.replaystudio.replay.ReplayFile; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.versions.callbacks.PreTickCallback; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelDuplexHandler; @@ -64,7 +64,6 @@ //#endif //#if MC>=11400 -import com.replaymod.core.versions.MCVer; import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; import net.minecraft.network.packet.s2c.play.PlayerActionResponseS2CPacket; import net.minecraft.network.packet.s2c.play.OpenScreenS2CPacket; diff --git a/src/main/java/com/replaymod/replay/NoGuiScreenshot.java b/src/main/java/com/replaymod/replay/NoGuiScreenshot.java index 5345c2bcd..247c95994 100644 --- a/src/main/java/com/replaymod/replay/NoGuiScreenshot.java +++ b/src/main/java/com/replaymod/replay/NoGuiScreenshot.java @@ -3,7 +3,7 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.replaymod.core.ReplayMod; -import de.johni0702.minecraft.gui.versions.Image; +import com.replaymod.gui.versions.Image; import net.minecraft.client.MinecraftClient; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.util.ScreenshotUtils; diff --git a/src/main/java/com/replaymod/replay/QuickReplaySender.java b/src/main/java/com/replaymod/replay/QuickReplaySender.java index 18b30a0c1..5295ac233 100644 --- a/src/main/java/com/replaymod/replay/QuickReplaySender.java +++ b/src/main/java/com/replaymod/replay/QuickReplaySender.java @@ -7,12 +7,12 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import com.replaymod.core.mixin.MinecraftAccessor; -import com.replaymod.core.mixin.TimerAccessor; +import com.replaymod.mixin.MinecraftAccessor; +import com.replaymod.mixin.TimerAccessor; import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.util.RandomAccessReplay; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.versions.callbacks.PreTickCallback; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandler; diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java index 0d3ec1d1e..6f08871cb 100644 --- a/src/main/java/com/replaymod/replay/ReplayHandler.java +++ b/src/main/java/com/replaymod/replay/ReplayHandler.java @@ -5,8 +5,8 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.replaymod.core.ReplayMod; -import com.replaymod.core.mixin.MinecraftAccessor; -import com.replaymod.core.mixin.TimerAccessor; +import com.replaymod.mixin.MinecraftAccessor; +import com.replaymod.mixin.TimerAccessor; import com.replaymod.core.utils.Restrictions; import com.replaymod.core.utils.Utils; import com.replaymod.core.utils.WrappedTimer; @@ -19,13 +19,13 @@ import com.replaymod.replaystudio.data.Marker; import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.util.Location; -import de.johni0702.minecraft.gui.container.AbstractGuiScreen; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.popup.AbstractGuiPopup; +import com.replaymod.gui.container.AbstractGuiScreen; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.element.advanced.GuiProgressBar; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.popup.AbstractGuiPopup; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.embedded.EmbeddedChannel; import net.minecraft.client.MinecraftClient; @@ -50,7 +50,7 @@ //#endif //#if MC>=11400 -import com.replaymod.replay.mixin.EntityLivingBaseAccessor; +import com.replaymod.mixin.Mixin_EntityLivingBaseAccessor; import net.minecraft.entity.LivingEntity; //#else //$$ import com.replaymod.replay.mixin.EntityOtherPlayerMPAccessor; @@ -704,7 +704,7 @@ private void skipTeleportInterpolation(Entity entity) { //#if MC>=11400 if (entity instanceof LivingEntity && !(entity instanceof CameraEntity)) { LivingEntity e = (LivingEntity) entity; - EntityLivingBaseAccessor ea = (EntityLivingBaseAccessor) e; + Mixin_EntityLivingBaseAccessor ea = (Mixin_EntityLivingBaseAccessor) e; e.updatePosition(ea.getInterpTargetX(), ea.getInterpTargetY(), ea.getInterpTargetZ()); e.yaw = (float) ea.getInterpTargetYaw(); e.pitch = (float) ea.getInterpTargetPitch(); diff --git a/src/main/java/com/replaymod/replay/ReplayModReplay.java b/src/main/java/com/replaymod/replay/ReplayModReplay.java index 05113411e..3709c40df 100644 --- a/src/main/java/com/replaymod/replay/ReplayModReplay.java +++ b/src/main/java/com/replaymod/replay/ReplayModReplay.java @@ -7,7 +7,7 @@ import com.replaymod.core.KeyBindingRegistry; import com.replaymod.core.Module; import com.replaymod.core.ReplayMod; -import com.replaymod.core.mixin.MinecraftAccessor; +import com.replaymod.mixin.MinecraftAccessor; import com.replaymod.core.utils.ModCompat; import com.replaymod.core.versions.MCVer; import com.replaymod.core.versions.MCVer.Keyboard; diff --git a/src/main/java/com/replaymod/replay/ReplaySender.java b/src/main/java/com/replaymod/replay/ReplaySender.java index ab46bd896..5fbbeb658 100644 --- a/src/main/java/com/replaymod/replay/ReplaySender.java +++ b/src/main/java/com/replaymod/replay/ReplaySender.java @@ -1,7 +1,7 @@ package com.replaymod.replay; -import com.replaymod.core.mixin.MinecraftAccessor; -import com.replaymod.core.mixin.TimerAccessor; +import com.replaymod.mixin.MinecraftAccessor; +import com.replaymod.mixin.TimerAccessor; import net.minecraft.client.MinecraftClient; import static com.replaymod.core.versions.MCVer.getMinecraft; diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java index 27bbb6183..95d2a8e66 100644 --- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java +++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java @@ -10,19 +10,17 @@ import com.replaymod.replay.ReplayHandler; import com.replaymod.replay.events.RenderHotbarCallback; import com.replaymod.replay.events.RenderSpectatorCrosshairCallback; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.versions.callbacks.PreTickCallback; import com.replaymod.core.utils.Utils; import com.replaymod.replay.ReplayModReplay; import com.replaymod.replay.Setting; -import com.replaymod.replay.mixin.FirstPersonRendererAccessor; +import com.replaymod.mixin.FirstPersonRendererAccessor; import com.replaymod.replaystudio.util.Location; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.entity.Entity; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.entity.decoration.ItemFrameEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.stat.StatHandler; diff --git a/src/main/java/com/replaymod/replay/camera/SpectatorCameraController.java b/src/main/java/com/replaymod/replay/camera/SpectatorCameraController.java index 30a150185..a51aba9eb 100644 --- a/src/main/java/com/replaymod/replay/camera/SpectatorCameraController.java +++ b/src/main/java/com/replaymod/replay/camera/SpectatorCameraController.java @@ -1,7 +1,7 @@ package com.replaymod.replay.camera; import com.replaymod.replay.ReplayModReplay; -import com.replaymod.replay.mixin.EntityPlayerAccessor; +import com.replaymod.mixin.EntityPlayerAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.options.KeyBinding; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/replaymod/replay/events/RenderHotbarCallback.java b/src/main/java/com/replaymod/replay/events/RenderHotbarCallback.java index 36e1667c6..c8d4a227d 100644 --- a/src/main/java/com/replaymod/replay/events/RenderHotbarCallback.java +++ b/src/main/java/com/replaymod/replay/events/RenderHotbarCallback.java @@ -1,6 +1,6 @@ package com.replaymod.replay.events; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; public interface RenderHotbarCallback { Event EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/replay/events/RenderSpectatorCrosshairCallback.java b/src/main/java/com/replaymod/replay/events/RenderSpectatorCrosshairCallback.java index bad49102b..70a824ecf 100644 --- a/src/main/java/com/replaymod/replay/events/RenderSpectatorCrosshairCallback.java +++ b/src/main/java/com/replaymod/replay/events/RenderSpectatorCrosshairCallback.java @@ -1,6 +1,6 @@ package com.replaymod.replay.events; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; public interface RenderSpectatorCrosshairCallback { Event EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/replay/events/ReplayClosedCallback.java b/src/main/java/com/replaymod/replay/events/ReplayClosedCallback.java index cf3e6a5d3..3b2dd89c7 100644 --- a/src/main/java/com/replaymod/replay/events/ReplayClosedCallback.java +++ b/src/main/java/com/replaymod/replay/events/ReplayClosedCallback.java @@ -1,7 +1,7 @@ package com.replaymod.replay.events; import com.replaymod.replay.ReplayHandler; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; public interface ReplayClosedCallback { Event EVENT = Event.create((listeners) -> diff --git a/src/main/java/com/replaymod/replay/events/ReplayClosingCallback.java b/src/main/java/com/replaymod/replay/events/ReplayClosingCallback.java index 9392f5364..1faeeda46 100644 --- a/src/main/java/com/replaymod/replay/events/ReplayClosingCallback.java +++ b/src/main/java/com/replaymod/replay/events/ReplayClosingCallback.java @@ -1,7 +1,7 @@ package com.replaymod.replay.events; import com.replaymod.replay.ReplayHandler; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; import java.io.IOException; diff --git a/src/main/java/com/replaymod/replay/events/ReplayOpenedCallback.java b/src/main/java/com/replaymod/replay/events/ReplayOpenedCallback.java index 9bd272386..8145927fb 100644 --- a/src/main/java/com/replaymod/replay/events/ReplayOpenedCallback.java +++ b/src/main/java/com/replaymod/replay/events/ReplayOpenedCallback.java @@ -1,7 +1,7 @@ package com.replaymod.replay.events; import com.replaymod.replay.ReplayHandler; -import de.johni0702.minecraft.gui.utils.Event; +import com.replaymod.gui.utils.Event; import java.io.IOException; diff --git a/src/main/java/com/replaymod/replay/gui/overlay/GuiEditMarkerPopup.java b/src/main/java/com/replaymod/replay/gui/overlay/GuiEditMarkerPopup.java index ab2a3d783..43dc1d9c9 100644 --- a/src/main/java/com/replaymod/replay/gui/overlay/GuiEditMarkerPopup.java +++ b/src/main/java/com/replaymod/replay/gui/overlay/GuiEditMarkerPopup.java @@ -1,15 +1,15 @@ package com.replaymod.replay.gui.overlay; import com.google.common.base.Strings; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.element.*; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.layout.GridLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; -import de.johni0702.minecraft.gui.popup.AbstractGuiPopup; -import de.johni0702.minecraft.gui.utils.Colors; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.element.GuiTextField; +import com.replaymod.gui.function.Typeable; +import com.replaymod.gui.layout.GridLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.popup.AbstractGuiPopup; +import com.replaymod.gui.utils.Colors; import com.replaymod.core.versions.MCVer.Keyboard; import com.replaymod.replaystudio.data.Marker; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; @@ -17,47 +17,47 @@ import java.util.function.Consumer; public class GuiEditMarkerPopup extends AbstractGuiPopup implements Typeable { - private static GuiNumberField newGuiNumberField() { - return new GuiNumberField().setSize(150, 20).setValidateOnFocusChange(true); + private static com.replaymod.gui.element.GuiNumberField newGuiNumberField() { + return new com.replaymod.gui.element.GuiNumberField().setSize(150, 20).setValidateOnFocusChange(true); } private final Consumer onSave; - public final GuiLabel title = new GuiLabel().setI18nText("replaymod.gui.editkeyframe.title.marker"); + public final com.replaymod.gui.element.GuiLabel title = new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.editkeyframe.title.marker"); - public final GuiTextField nameField = new GuiTextField().setSize(150, 20); + public final com.replaymod.gui.element.GuiTextField nameField = new GuiTextField().setSize(150, 20); // TODO: Replace with a min/sec/msec field - public final GuiNumberField timeField = newGuiNumberField().setPrecision(0); + public final com.replaymod.gui.element.GuiNumberField timeField = newGuiNumberField().setPrecision(0); - public final GuiNumberField xField = newGuiNumberField().setPrecision(10); - public final GuiNumberField yField = newGuiNumberField().setPrecision(10); - public final GuiNumberField zField = newGuiNumberField().setPrecision(10); + public final com.replaymod.gui.element.GuiNumberField xField = newGuiNumberField().setPrecision(10); + public final com.replaymod.gui.element.GuiNumberField yField = newGuiNumberField().setPrecision(10); + public final com.replaymod.gui.element.GuiNumberField zField = newGuiNumberField().setPrecision(10); - public final GuiNumberField yawField = newGuiNumberField().setPrecision(5); - public final GuiNumberField pitchField = newGuiNumberField().setPrecision(5); - public final GuiNumberField rollField = newGuiNumberField().setPrecision(5); + public final com.replaymod.gui.element.GuiNumberField yawField = newGuiNumberField().setPrecision(5); + public final com.replaymod.gui.element.GuiNumberField pitchField = newGuiNumberField().setPrecision(5); + public final com.replaymod.gui.element.GuiNumberField rollField = newGuiNumberField().setPrecision(5); public final GuiPanel inputs = GuiPanel.builder() .layout(new GridLayout().setColumns(2).setSpacingX(7).setSpacingY(3)) - .with(new GuiLabel().setI18nText("replaymod.gui.editkeyframe.markername"), new GridLayout.Data(0, 0.5)) + .with(new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.editkeyframe.markername"), new GridLayout.Data(0, 0.5)) .with(nameField, new GridLayout.Data(1, 0.5)) - .with(new GuiLabel().setI18nText("replaymod.gui.editkeyframe.timestamp"), new GridLayout.Data(0, 0.5)) + .with(new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.editkeyframe.timestamp"), new GridLayout.Data(0, 0.5)) .with(timeField, new GridLayout.Data(1, 0.5)) - .with(new GuiLabel().setI18nText("replaymod.gui.editkeyframe.xpos"), new GridLayout.Data(0, 0.5)) + .with(new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.editkeyframe.xpos"), new GridLayout.Data(0, 0.5)) .with(xField, new GridLayout.Data(1, 0.5)) - .with(new GuiLabel().setI18nText("replaymod.gui.editkeyframe.ypos"), new GridLayout.Data(0, 0.5)) + .with(new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.editkeyframe.ypos"), new GridLayout.Data(0, 0.5)) .with(yField, new GridLayout.Data(1, 0.5)) - .with(new GuiLabel().setI18nText("replaymod.gui.editkeyframe.zpos"), new GridLayout.Data(0, 0.5)) + .with(new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.editkeyframe.zpos"), new GridLayout.Data(0, 0.5)) .with(zField, new GridLayout.Data(1, 0.5)) - .with(new GuiLabel().setI18nText("replaymod.gui.editkeyframe.camyaw"), new GridLayout.Data(0, 0.5)) + .with(new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.editkeyframe.camyaw"), new GridLayout.Data(0, 0.5)) .with(yawField, new GridLayout.Data(1, 0.5)) - .with(new GuiLabel().setI18nText("replaymod.gui.editkeyframe.campitch"), new GridLayout.Data(0, 0.5)) + .with(new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.editkeyframe.campitch"), new GridLayout.Data(0, 0.5)) .with(pitchField, new GridLayout.Data(1, 0.5)) - .with(new GuiLabel().setI18nText("replaymod.gui.editkeyframe.camroll"), new GridLayout.Data(0, 0.5)) + .with(new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.editkeyframe.camroll"), new GridLayout.Data(0, 0.5)) .with(rollField, new GridLayout.Data(1, 0.5)) .build(); - public final GuiButton saveButton = new GuiButton().onClick(new Runnable() { + public final com.replaymod.gui.element.GuiButton saveButton = new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { @Override public void run() { Marker marker = new Marker(); @@ -74,7 +74,7 @@ public void run() { } }).setSize(150, 20).setI18nLabel("replaymod.gui.save"); - public final GuiButton cancelButton = new GuiButton().onClick(new Runnable() { + public final com.replaymod.gui.element.GuiButton cancelButton = new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { @Override public void run() { close(); @@ -93,7 +93,7 @@ public GuiEditMarkerPopup(GuiContainer container, Marker marker, Consumer e.setColor(Colors.BLACK)); + popup.invokeAll(com.replaymod.gui.element.IGuiLabel.class, e -> e.setColor(Colors.BLACK)); nameField.setText(Strings.nullToEmpty(marker.getName())); timeField.setValue(marker.getTime()); diff --git a/src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java b/src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java index 8954652ae..daa814726 100644 --- a/src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java +++ b/src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java @@ -7,11 +7,11 @@ import com.replaymod.replay.camera.CameraEntity; import com.replaymod.replaystudio.data.Marker; import com.replaymod.replaystudio.util.Location; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.element.advanced.AbstractGuiTimeline; -import de.johni0702.minecraft.gui.function.Draggable; -import de.johni0702.minecraft.gui.function.Typeable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.element.advanced.AbstractGuiTimeline; +import com.replaymod.gui.function.Draggable; +import com.replaymod.gui.function.Typeable; import de.johni0702.minecraft.gui.utils.lwjgl.Point; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; @@ -25,7 +25,7 @@ import java.util.Set; import java.util.function.Consumer; -import static de.johni0702.minecraft.gui.utils.Utils.clamp; +import static com.replaymod.gui.utils.Utils.clamp; public class GuiMarkerTimeline extends AbstractGuiTimeline implements Draggable, Typeable { protected static final int TEXTURE_MARKER_X = 109; diff --git a/src/main/java/com/replaymod/replay/gui/overlay/GuiReplayOverlay.java b/src/main/java/com/replaymod/replay/gui/overlay/GuiReplayOverlay.java index 14bef7b15..75ed5a69b 100644 --- a/src/main/java/com/replaymod/replay/gui/overlay/GuiReplayOverlay.java +++ b/src/main/java/com/replaymod/replay/gui/overlay/GuiReplayOverlay.java @@ -7,18 +7,18 @@ import com.replaymod.replay.ReplayHandler; import com.replaymod.replay.ReplayModReplay; import com.replaymod.replay.ReplaySender; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.AbstractGuiOverlay; -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.GuiSlider; -import de.johni0702.minecraft.gui.element.GuiTooltip; -import de.johni0702.minecraft.gui.element.advanced.IGuiTimeline; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.AbstractGuiOverlay; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.GuiSlider; +import com.replaymod.gui.element.GuiTooltip; +import com.replaymod.gui.element.advanced.IGuiTimeline; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.utils.EventRegistrations; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; import de.johni0702.minecraft.gui.utils.lwjgl.WritablePoint; diff --git a/src/main/java/com/replaymod/replay/gui/screen/GuiModCompatWarning.java b/src/main/java/com/replaymod/replay/gui/screen/GuiModCompatWarning.java index a91b0acd4..eefc17f2b 100644 --- a/src/main/java/com/replaymod/replay/gui/screen/GuiModCompatWarning.java +++ b/src/main/java/com/replaymod/replay/gui/screen/GuiModCompatWarning.java @@ -3,14 +3,14 @@ import com.replaymod.core.utils.ModCompat; import com.replaymod.replaystudio.data.ModInfo; import com.replaymod.replaystudio.util.I18n; -import de.johni0702.minecraft.gui.container.AbstractGuiScreen; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiVerticalList; -import de.johni0702.minecraft.gui.element.GuiButton; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; +import com.replaymod.gui.container.AbstractGuiScreen; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiVerticalList; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.layout.VerticalLayout; import java.util.Map; diff --git a/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java b/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java index 7e4ea045e..2ecac4e1b 100644 --- a/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java +++ b/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java @@ -1,13 +1,14 @@ package com.replaymod.replay.gui.screen; import com.google.common.util.concurrent.SettableFuture; +import com.replaymod.gui.element.GuiTextField; import com.replaymod.render.gui.GuiRenderQueue; import com.replaymod.render.rendering.VideoRenderer; import com.replaymod.render.utils.RenderJob; import com.replaymod.replaystudio.us.myles.ViaVersion.api.Pair; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.versions.Image; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.versions.Image; import net.minecraft.client.font.TextRenderer; import net.minecraft.util.Formatting; import com.replaymod.core.ReplayMod; @@ -20,20 +21,19 @@ import com.replaymod.replay.Setting; import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.replay.ReplayMetaData; -import de.johni0702.minecraft.gui.container.AbstractGuiContainer; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.element.*; -import de.johni0702.minecraft.gui.element.advanced.AbstractGuiResourceLoadingList; -import de.johni0702.minecraft.gui.function.Typeable; -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 de.johni0702.minecraft.gui.popup.GuiYesNoPopup; -import de.johni0702.minecraft.gui.utils.Colors; -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.container.AbstractGuiContainer; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.element.advanced.AbstractGuiResourceLoadingList; +import com.replaymod.gui.function.Typeable; +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 com.replaymod.gui.popup.GuiYesNoPopup; +import com.replaymod.gui.utils.Colors; +import com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; @@ -64,7 +64,7 @@ import java.util.stream.Collectors; import static com.replaymod.replay.ReplayModReplay.LOGGER; -import static de.johni0702.minecraft.gui.versions.MCVer.getFontRenderer; +import static com.replaymod.gui.versions.MCVer.getFontRenderer; //#if MC>=11400 import net.minecraft.text.TranslatableText; @@ -81,7 +81,7 @@ public class GuiReplayViewer extends GuiScreen { } }); - public final GuiButton loadButton = new GuiButton().onClick(new Runnable() { + public final com.replaymod.gui.element.GuiButton loadButton = new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { private boolean loading = false; @Override @@ -114,7 +114,7 @@ public void run() { } }).setSize(150, 20); - public final GuiButton folderButton = new GuiButton().onClick(new Runnable() { + public final com.replaymod.gui.element.GuiButton folderButton = new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { @Override public void run() { try { @@ -127,14 +127,14 @@ public void run() { } }).setSize(150, 20).setI18nLabel("replaymod.gui.viewer.replayfolder"); - public final GuiButton renameButton = new GuiButton().onClick(new Runnable() { + public final com.replaymod.gui.element.GuiButton renameButton = new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { @Override public void run() { final File file = list.getSelected().get(0).file; String name = Utils.fileNameToReplayName(file.getName()); - final GuiTextField nameField = new GuiTextField().setSize(200, 20).setFocused(true).setText(name); + final com.replaymod.gui.element.GuiTextField nameField = new com.replaymod.gui.element.GuiTextField().setSize(200, 20).setFocused(true).setText(name); final GuiYesNoPopup popup = GuiYesNoPopup.open(GuiReplayViewer.this, - new GuiLabel().setI18nText("replaymod.gui.viewer.rename.name").setColor(Colors.BLACK), + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.viewer.rename.name").setColor(Colors.BLACK), nameField ).setYesI18nLabel("replaymod.gui.rename").setNoI18nLabel("replaymod.gui.cancel"); ((VerticalLayout) popup.getInfo().getLayout()).setSpacing(7); @@ -176,12 +176,12 @@ public void run() { }); } }).setSize(73, 20).setI18nLabel("replaymod.gui.rename").setDisabled(); - public final GuiButton deleteButton = new GuiButton().onClick(() -> { + public final com.replaymod.gui.element.GuiButton deleteButton = new com.replaymod.gui.element.GuiButton().onClick(() -> { for (GuiReplayEntry entry : list.getSelected()) { String name = entry.name.getText(); GuiYesNoPopup.open(GuiReplayViewer.this, - new GuiLabel().setI18nText("replaymod.gui.viewer.delete.linea").setColor(Colors.BLACK), - new GuiLabel().setI18nText("replaymod.gui.viewer.delete.lineb", name + Formatting.RESET).setColor(Colors.BLACK) + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.viewer.delete.linea").setColor(Colors.BLACK), + new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.viewer.delete.lineb", name + Formatting.RESET).setColor(Colors.BLACK) ).setYesI18nLabel("replaymod.gui.delete").setNoI18nLabel("replaymod.gui.cancel").onAccept(() -> { try { FileUtils.forceDelete(entry.file); @@ -193,20 +193,20 @@ public void run() { } }).setSize(73, 20).setI18nLabel("replaymod.gui.delete").setDisabled(); - public final GuiButton settingsButton = new GuiButton(this) + public final com.replaymod.gui.element.GuiButton settingsButton = new com.replaymod.gui.element.GuiButton(this) .setSize(20, 20) .setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setSpriteUV(20, 0) - .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.settings")) + .setTooltip(new com.replaymod.gui.element.GuiTooltip().setI18nText("replaymod.gui.settings")) .onClick(() -> new GuiReplaySettings(toMinecraft(), getMod().getCore().getSettingsRegistry()).display()); - public final GuiButton cancelButton = new GuiButton().onClick(new Runnable() { + public final com.replaymod.gui.element.GuiButton cancelButton = new com.replaymod.gui.element.GuiButton().onClick(new Runnable() { @Override public void run() { getMinecraft().openScreen(null); } }).setSize(73, 20).setI18nLabel("replaymod.gui.cancel"); - public final List replaySpecificButtons = new ArrayList<>(); + public final List replaySpecificButtons = new ArrayList<>(); { replaySpecificButtons.addAll(Arrays.asList(renameButton)); } public final GuiPanel editorButton = new GuiPanel(); @@ -226,7 +226,7 @@ public GuiReplayViewer(ReplayModReplay mod) { throw new CrashException(CrashReport.create(e, "Getting replay folder")); } - setTitle(new GuiLabel().setI18nText("replaymod.gui.replayviewer")); + setTitle(new com.replaymod.gui.element.GuiLabel().setI18nText("replaymod.gui.replayviewer")); setLayout(new CustomLayout() { @Override @@ -257,12 +257,12 @@ private void updateButtons() { Set jobs = selected.stream().flatMap(entry -> entry.renderQueue.stream()).collect(Collectors.toSet()); String[] tooltipLines = jobs.stream().map(RenderJob::getName).toArray(String[]::new); loadButton.setI18nLabel("replaymod.gui.viewer.bulkrender", jobs.size()); - loadButton.setTooltip(new GuiTooltip().setText(tooltipLines)); + loadButton.setTooltip(new com.replaymod.gui.element.GuiTooltip().setText(tooltipLines)); loadButton.setEnabled(!jobs.isEmpty()); String[] compatError = VideoRenderer.checkCompat(); if (compatError != null) { - loadButton.setDisabled().setTooltip(new GuiTooltip().setText(compatError)); + loadButton.setDisabled().setTooltip(new com.replaymod.gui.element.GuiTooltip().setText(compatError)); } } else { loadButton.setI18nLabel("replaymod.gui.load"); @@ -271,7 +271,7 @@ private void updateButtons() { } } - private static final GuiImage DEFAULT_THUMBNAIL = new GuiImage().setTexture(Utils.DEFAULT_THUMBNAIL); + private static final com.replaymod.gui.element.GuiImage DEFAULT_THUMBNAIL = new com.replaymod.gui.element.GuiImage().setTexture(Utils.DEFAULT_THUMBNAIL); public static class GuiSelectReplayPopup extends AbstractGuiPopup { public static GuiSelectReplayPopup openGui(GuiContainer container, File folder) { @@ -285,9 +285,9 @@ public static GuiSelectReplayPopup openGui(GuiContainer container, File folder) private final GuiReplayList list = new GuiReplayList(popup); - private final GuiButton acceptButton = new GuiButton(popup).setI18nLabel("gui.done").setSize(50, 20).setDisabled(); + private final com.replaymod.gui.element.GuiButton acceptButton = new com.replaymod.gui.element.GuiButton(popup).setI18nLabel("gui.done").setSize(50, 20).setDisabled(); - private final GuiButton cancelButton = new GuiButton(popup).setI18nLabel("gui.cancel").setSize(50, 20); + private final com.replaymod.gui.element.GuiButton cancelButton = new com.replaymod.gui.element.GuiButton(popup).setI18nLabel("gui.cancel").setSize(50, 20); public GuiSelectReplayPopup(GuiContainer container, File folder) { @@ -334,11 +334,11 @@ public GuiReplayList getList() { return list; } - public GuiButton getAcceptButton() { + public com.replaymod.gui.element.GuiButton getAcceptButton() { return acceptButton; } - public GuiButton getCancelButton() { + public com.replaymod.gui.element.GuiButton getCancelButton() { return cancelButton; } @@ -352,7 +352,7 @@ public static class GuiReplayList extends AbstractGuiResourceLoadingList implements Comparable { public final File file; - public final GuiLabel name = new GuiLabel(); - public final GuiLabel server = new GuiLabel().setColor(Colors.LIGHT_GRAY); - public final GuiLabel date = new GuiLabel().setColor(Colors.LIGHT_GRAY); + public final com.replaymod.gui.element.GuiLabel name = new com.replaymod.gui.element.GuiLabel(); + public final com.replaymod.gui.element.GuiLabel server = new com.replaymod.gui.element.GuiLabel().setColor(Colors.LIGHT_GRAY); + public final com.replaymod.gui.element.GuiLabel date = new com.replaymod.gui.element.GuiLabel().setColor(Colors.LIGHT_GRAY); public final GuiPanel infoPanel = new GuiPanel(this).setLayout(new VerticalLayout().setSpacing(2)) .addElements(null, name, server, date); - public final GuiLabel version = new GuiLabel(this).setColor(Colors.RED); - public final GuiImage thumbnail; - public final GuiLabel duration = new GuiLabel(); + public final com.replaymod.gui.element.GuiLabel version = new com.replaymod.gui.element.GuiLabel(this).setColor(Colors.RED); + public final com.replaymod.gui.element.GuiImage thumbnail; + public final com.replaymod.gui.element.GuiLabel duration = new com.replaymod.gui.element.GuiLabel(); public final GuiPanel durationPanel = new GuiPanel().setBackgroundColor(Colors.HALF_TRANSPARENT) .addElements(null, duration).setLayout(new CustomLayout() { @Override @@ -495,7 +495,7 @@ public ReadableDimension calcMinSize(GuiContainer container) { return new Dimension(dimension.getWidth() + 2, dimension.getHeight() + 2); } }); - public final GuiImage renderQueueIcon = new GuiImage() + public final com.replaymod.gui.element.GuiImage renderQueueIcon = new com.replaymod.gui.element.GuiImage() .setSize(10, 10) .setTexture(ReplayMod.TEXTURE, 40, 0, 20, 20); @@ -523,16 +523,16 @@ public GuiReplayEntry(File file, ReplayMetaData metaData, Image thumbImage, List dateMillis = metaData.getDate(); date.setText(new SimpleDateFormat().format(new Date(dateMillis))); if (thumbImage == null) { - thumbnail = new GuiImage(DEFAULT_THUMBNAIL).setSize(30 * 16 / 9, 30); + thumbnail = new com.replaymod.gui.element.GuiImage(DEFAULT_THUMBNAIL).setSize(30 * 16 / 9, 30); addElements(null, thumbnail); } else { - thumbnail = new GuiImage(this).setTexture(thumbImage).setSize(30 * 16 / 9, 30); + thumbnail = new com.replaymod.gui.element.GuiImage(this).setTexture(thumbImage).setSize(30 * 16 / 9, 30); } duration.setText(Utils.convertSecondsToShortString(metaData.getDuration() / 1000)); addElements(null, durationPanel); if (!renderQueue.isEmpty()) { - renderQueueIcon.setTooltip(new GuiTooltip() + renderQueueIcon.setTooltip(new com.replaymod.gui.element.GuiTooltip() .setText(renderQueue.stream().map(RenderJob::getName).toArray(String[]::new))); addElements(null, renderQueueIcon); } diff --git a/src/main/java/com/replaymod/replay/handler/GuiHandler.java b/src/main/java/com/replaymod/replay/handler/GuiHandler.java index 8f8b4a850..fa91bffa2 100644 --- a/src/main/java/com/replaymod/replay/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/replay/handler/GuiHandler.java @@ -1,13 +1,14 @@ package com.replaymod.replay.handler; import com.replaymod.core.gui.GuiReplayButton; +import com.replaymod.gui.container.GuiScreen; import com.replaymod.replay.Setting; -import de.johni0702.minecraft.gui.container.VanillaGuiScreen; -import de.johni0702.minecraft.gui.element.GuiTooltip; -import de.johni0702.minecraft.gui.layout.CustomLayout; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.container.VanillaGuiScreen; +import com.replaymod.gui.element.GuiTooltip; +import com.replaymod.gui.layout.CustomLayout; +import com.replaymod.gui.utils.EventRegistrations; import de.johni0702.minecraft.gui.utils.lwjgl.Point; -import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; +import com.replaymod.gui.versions.callbacks.InitScreenCallback; import com.replaymod.replay.ReplayModReplay; import com.replaymod.replay.gui.screen.GuiReplayViewer; import net.minecraft.client.gui.screen.GameMenuScreen; @@ -236,11 +237,11 @@ private void injectIntoMainMenu(Screen guiScreen, List but .onClick(() -> new GuiReplayViewer(mod).display()) .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.replayviewer")); - vanillaGui.setLayout(new CustomLayout(vanillaGui.getLayout()) { + vanillaGui.setLayout(new CustomLayout(vanillaGui.getLayout()) { private Point pos; @Override - protected void layout(de.johni0702.minecraft.gui.container.GuiScreen container, int width, int height) { + protected void layout(GuiScreen container, int width, int height) { if (pos == null) { // Delaying computation so we can take into account buttons // added after our callback. diff --git a/src/main/java/com/replaymod/replay/mixin/MixinEntityRenderer.java b/src/main/java/com/replaymod/replay/mixin/MixinEntityRenderer.java deleted file mode 100644 index 743815c42..000000000 --- a/src/main/java/com/replaymod/replay/mixin/MixinEntityRenderer.java +++ /dev/null @@ -1 +0,0 @@ -// 1.7.10 and below diff --git a/src/main/java/com/replaymod/replay/mixin/MixinRenderManager.java b/src/main/java/com/replaymod/replay/mixin/MixinRenderManager.java deleted file mode 100644 index 2350c64e3..000000000 --- a/src/main/java/com/replaymod/replay/mixin/MixinRenderManager.java +++ /dev/null @@ -1,2 +0,0 @@ -// Appears to no longer be needed in 1.14+ (maybe not even 1.13?) -// 1.8 - 1.12.2 diff --git a/src/main/java/com/replaymod/replay/mixin/MixinWorldClient.java b/src/main/java/com/replaymod/replay/mixin/MixinWorldClient.java deleted file mode 100644 index c5d79e4dd..000000000 --- a/src/main/java/com/replaymod/replay/mixin/MixinWorldClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.replaymod.replay.mixin; - -import net.minecraft.client.world.ClientWorld; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(ClientWorld.class) -public abstract class MixinWorldClient { - // Looks like this has finally been fixed in 1.14 (or been moved somewhere else entirely, guess we'll find out) - // 1.12.2 and below -} diff --git a/src/main/java/com/replaymod/simplepathing/ReplayModSimplePathing.java b/src/main/java/com/replaymod/simplepathing/ReplayModSimplePathing.java index fd60d3d88..0823738fc 100644 --- a/src/main/java/com/replaymod/simplepathing/ReplayModSimplePathing.java +++ b/src/main/java/com/replaymod/simplepathing/ReplayModSimplePathing.java @@ -5,7 +5,7 @@ import com.replaymod.core.ReplayMod; import com.replaymod.core.SettingsRegistry; import com.replaymod.core.events.SettingsChangedCallback; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.utils.EventRegistrations; import com.replaymod.core.versions.MCVer.Keyboard; import com.replaymod.replay.ReplayHandler; import com.replaymod.replay.ReplayModReplay; diff --git a/src/main/java/com/replaymod/simplepathing/gui/GuiEditKeyframe.java b/src/main/java/com/replaymod/simplepathing/gui/GuiEditKeyframe.java index eb3561eca..f80438bfd 100644 --- a/src/main/java/com/replaymod/simplepathing/gui/GuiEditKeyframe.java +++ b/src/main/java/com/replaymod/simplepathing/gui/GuiEditKeyframe.java @@ -17,22 +17,22 @@ import com.replaymod.simplepathing.SPTimeline.SPPath; import com.replaymod.simplepathing.Setting; import com.replaymod.simplepathing.properties.ExplicitInterpolationProperty; -import de.johni0702.minecraft.gui.container.AbstractGuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.element.GuiButton; -import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.element.GuiNumberField; -import de.johni0702.minecraft.gui.element.GuiTooltip; -import de.johni0702.minecraft.gui.element.IGuiClickable; -import de.johni0702.minecraft.gui.element.IGuiLabel; -import de.johni0702.minecraft.gui.element.advanced.GuiDropdownMenu; -import de.johni0702.minecraft.gui.function.Typeable; -import de.johni0702.minecraft.gui.layout.GridLayout; -import de.johni0702.minecraft.gui.layout.HorizontalLayout; -import de.johni0702.minecraft.gui.layout.VerticalLayout; -import de.johni0702.minecraft.gui.popup.AbstractGuiPopup; -import de.johni0702.minecraft.gui.utils.Colors; -import de.johni0702.minecraft.gui.utils.Consumer; +import com.replaymod.gui.container.AbstractGuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiLabel; +import com.replaymod.gui.element.GuiNumberField; +import com.replaymod.gui.element.GuiTooltip; +import com.replaymod.gui.element.IGuiClickable; +import com.replaymod.gui.element.IGuiLabel; +import com.replaymod.gui.element.advanced.GuiDropdownMenu; +import com.replaymod.gui.function.Typeable; +import com.replaymod.gui.layout.GridLayout; +import com.replaymod.gui.layout.HorizontalLayout; +import com.replaymod.gui.layout.VerticalLayout; +import com.replaymod.gui.popup.AbstractGuiPopup; +import com.replaymod.gui.utils.Colors; +import com.replaymod.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; import net.minecraft.client.resource.language.I18n; import org.apache.logging.log4j.LogManager; @@ -47,7 +47,7 @@ //$$ import org.lwjgl.input.Keyboard; //#endif -import static de.johni0702.minecraft.gui.utils.Utils.link; +import static com.replaymod.gui.utils.Utils.link; public abstract class GuiEditKeyframe> extends AbstractGuiPopup implements Typeable { private static GuiNumberField newGuiNumberField() { diff --git a/src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java b/src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java index 784e5a10a..36ba169b5 100644 --- a/src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java +++ b/src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java @@ -15,9 +15,9 @@ import com.replaymod.simplepathing.ReplayModSimplePathing; import com.replaymod.simplepathing.SPTimeline; import com.replaymod.simplepathing.SPTimeline.SPPath; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.element.advanced.AbstractGuiTimeline; -import de.johni0702.minecraft.gui.function.Draggable; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.element.advanced.AbstractGuiTimeline; +import com.replaymod.gui.function.Draggable; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormats; diff --git a/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java b/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java index cdce5a51b..25f3e7347 100644 --- a/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java +++ b/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java @@ -26,25 +26,25 @@ import com.replaymod.simplepathing.SPTimeline; import com.replaymod.simplepathing.SPTimeline.SPPath; import com.replaymod.simplepathing.Setting; -import de.johni0702.minecraft.gui.GuiRenderer; -import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.GuiContainer; -import de.johni0702.minecraft.gui.container.GuiPanel; -import de.johni0702.minecraft.gui.container.GuiScreen; -import de.johni0702.minecraft.gui.element.GuiButton; -import de.johni0702.minecraft.gui.element.GuiElement; -import de.johni0702.minecraft.gui.element.GuiHorizontalScrollbar; -import de.johni0702.minecraft.gui.element.GuiLabel; -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 de.johni0702.minecraft.gui.popup.GuiInfoPopup; -import de.johni0702.minecraft.gui.popup.GuiYesNoPopup; -import de.johni0702.minecraft.gui.utils.Colors; +import com.replaymod.gui.GuiRenderer; +import com.replaymod.gui.RenderInfo; +import com.replaymod.gui.container.GuiContainer; +import com.replaymod.gui.container.GuiPanel; +import com.replaymod.gui.container.GuiScreen; +import com.replaymod.gui.element.GuiButton; +import com.replaymod.gui.element.GuiElement; +import com.replaymod.gui.element.GuiHorizontalScrollbar; +import com.replaymod.gui.element.GuiLabel; +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 com.replaymod.gui.popup.GuiInfoPopup; +import com.replaymod.gui.popup.GuiYesNoPopup; +import com.replaymod.gui.utils.Colors; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; import de.johni0702.minecraft.gui.utils.lwjgl.WritablePoint; diff --git a/src/main/java/com/replaymod/simplepathing/preview/PathPreview.java b/src/main/java/com/replaymod/simplepathing/preview/PathPreview.java index 4c3be7976..f9511f1d7 100644 --- a/src/main/java/com/replaymod/simplepathing/preview/PathPreview.java +++ b/src/main/java/com/replaymod/simplepathing/preview/PathPreview.java @@ -3,7 +3,7 @@ import com.replaymod.core.KeyBindingRegistry; import com.replaymod.core.SettingsRegistry; import com.replaymod.core.events.SettingsChangedCallback; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.utils.EventRegistrations; import com.replaymod.core.versions.MCVer.Keyboard; import com.replaymod.replay.ReplayHandler; import com.replaymod.replay.events.ReplayClosedCallback; diff --git a/src/main/java/com/replaymod/simplepathing/preview/PathPreviewRenderer.java b/src/main/java/com/replaymod/simplepathing/preview/PathPreviewRenderer.java index 4aa42bb0f..566c4d0e1 100644 --- a/src/main/java/com/replaymod/simplepathing/preview/PathPreviewRenderer.java +++ b/src/main/java/com/replaymod/simplepathing/preview/PathPreviewRenderer.java @@ -17,7 +17,7 @@ import com.replaymod.simplepathing.ReplayModSimplePathing; import com.replaymod.simplepathing.SPTimeline; import com.replaymod.simplepathing.gui.GuiPathing; -import de.johni0702.minecraft.gui.utils.EventRegistrations; +import com.replaymod.gui.utils.EventRegistrations; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.Tessellator; diff --git a/src/main/java/com/replaymod/simplepathing/properties/ExplicitInterpolationProperty.java b/src/main/java/com/replaymod/simplepathing/properties/ExplicitInterpolationProperty.java index d86328e93..5f374acea 100644 --- a/src/main/java/com/replaymod/simplepathing/properties/ExplicitInterpolationProperty.java +++ b/src/main/java/com/replaymod/simplepathing/properties/ExplicitInterpolationProperty.java @@ -4,7 +4,7 @@ import com.google.gson.stream.JsonWriter; import com.replaymod.replaystudio.pathing.property.AbstractProperty; import com.replaymod.replaystudio.pathing.property.PropertyPart; -import de.johni0702.minecraft.gui.utils.NonNull; +import com.replaymod.gui.utils.NonNull; import org.apache.commons.lang3.ObjectUtils; import java.io.IOException; diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinGameRenderer.java b/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinGameRenderer.java deleted file mode 100644 index 4edd6ab2b..000000000 --- a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinGameRenderer.java +++ /dev/null @@ -1,31 +0,0 @@ -//#if FABRIC>=1 -package de.johni0702.minecraft.gui.versions.mixin; - -import de.johni0702.minecraft.gui.versions.callbacks.PostRenderScreenCallback; -import net.minecraft.client.render.GameRenderer; -import net.minecraft.client.util.math.MatrixStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(GameRenderer.class) -public class MixinGameRenderer { - @Inject( - method = "render", - at = @At( - value = "INVOKE", - //#if MC>=11600 - target = "Lnet/minecraft/client/gui/screen/Screen;render(Lnet/minecraft/client/util/math/MatrixStack;IIF)V", - //#else - //$$ target = "Lnet/minecraft/client/gui/screen/Screen;render(IIF)V", - //#endif - shift = At.Shift.AFTER - ) - ) - private void postRenderScreen(float partialTicks, long nanoTime, boolean renderWorld, CallbackInfo ci) { - MatrixStack stack = new MatrixStack(); - PostRenderScreenCallback.EVENT.invoker().postRenderScreen(stack, partialTicks); - } -} -//#endif diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinKeyboardListener.java b/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinKeyboardListener.java deleted file mode 100644 index 5a538c128..000000000 --- a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinKeyboardListener.java +++ /dev/null @@ -1,72 +0,0 @@ -//#if FABRIC>=1 -package de.johni0702.minecraft.gui.versions.mixin; - -import de.johni0702.minecraft.gui.versions.callbacks.KeyboardCallback; -import net.minecraft.client.Keyboard; -import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.ParentElement; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Group; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(Keyboard.class) -public class MixinKeyboardListener { - @Inject( - method = "method_1454", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/ParentElement;keyPressed(III)Z"), - cancellable = true - ) - private void keyPressed(int i, boolean[] bls, ParentElement element, int keyCode, int scanCode, int modifiers, CallbackInfo ci) { - if (KeyboardCallback.EVENT.invoker().keyPressed(keyCode, scanCode, modifiers)) { - bls[0] = true; - ci.cancel(); - } - } - - @Inject( - method = "method_1454", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/ParentElement;keyReleased(III)Z"), - cancellable = true - ) - private void keyReleased(int i, boolean[] bls, ParentElement element, int keyCode, int scanCode, int modifiers, CallbackInfo ci) { - if (KeyboardCallback.EVENT.invoker().keyReleased(keyCode, scanCode, modifiers)) { - bls[0] = true; - ci.cancel(); - } - } - - @Inject(method = "method_1458", at = @At("HEAD"), cancellable = true) - @Group(min = 1, max = 1, name = "replaymod-jgui-charTyped-int") - private static void charTyped(Element element, int keyChar, int modifiers, CallbackInfo ci) { - if (KeyboardCallback.EVENT.invoker().charTyped((char) keyChar, modifiers)) { - ci.cancel(); - } - } - - @Inject(method = "lambda$onCharEvent$5", at = @At("HEAD"), cancellable = true, remap = false) - @Group(min = 1, max = 1, name = "replaymod-jgui-charTyped-int") - private void charTypedOptifine(int keyChar, int modifiers, Element element, CallbackInfo ci) { - if (KeyboardCallback.EVENT.invoker().charTyped((char) keyChar, modifiers)) { - ci.cancel(); - } - } - - @Inject(method = "method_1473", at = @At("HEAD"), cancellable = true) - @Group(min = 1, max = 1, name = "replaymod-jgui-charTyped-char") - private static void charTyped(Element element, char keyChar, int modifiers, CallbackInfo ci) { - if (KeyboardCallback.EVENT.invoker().charTyped(keyChar, modifiers)) { - ci.cancel(); - } - } - - @Inject(method = "lambda$onCharEvent$6", at = @At("HEAD"), cancellable = true, remap = false) - @Group(min = 1, max = 1, name = "replaymod-jgui-charTyped-char") - private void charTypedOptifine(char keyChar, int modifiers, Element element, CallbackInfo ci) { - if (KeyboardCallback.EVENT.invoker().charTyped(keyChar, modifiers)) { - ci.cancel(); - } - } -} -//#endif diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMinecraft.java b/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMinecraft.java deleted file mode 100644 index 80cf9110a..000000000 --- a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMinecraft.java +++ /dev/null @@ -1,26 +0,0 @@ -// Note: this will also work in 1.13 but we don't really support 1.13 and MixinGradle is yet to be updated -//#if FABRIC>=1 -package de.johni0702.minecraft.gui.versions.mixin; - -import de.johni0702.minecraft.gui.versions.callbacks.OpenGuiScreenCallback; -import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(MinecraftClient.class) -public abstract class MixinMinecraft { - @Inject(method = "tick", at = @At("HEAD")) - private void preTick(CallbackInfo ci) { - PreTickCallback.EVENT.invoker().preTick(); - } - - @Inject(method = "openScreen", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;")) - private void openGuiScreen(Screen newGuiScreen, CallbackInfo ci) { - OpenGuiScreenCallback.EVENT.invoker().openGuiScreen(newGuiScreen); - } -} -//#endif diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 0cc23fb15..ee969928e 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[32,)" +loaderVersion="[35,)" issueTrackerURL="https://github.com/ReplayMod/ReplayMod/issues" showAsResourcePack=false license="GPLv3" @@ -17,7 +17,7 @@ license="GPLv3" [[dependencies.replaymod]] modId="forge" mandatory=true - versionRange="[32,)" + versionRange="[35,)" ordering="NONE" side="BOTH" diff --git a/src/main/resources/mixins.extras.playeroverview.replaymod.json b/src/main/resources/mixins.extras.playeroverview.replaymod.json index 9c9bf8e73..a3f56688c 100644 --- a/src/main/resources/mixins.extras.playeroverview.replaymod.json +++ b/src/main/resources/mixins.extras.playeroverview.replaymod.json @@ -4,9 +4,9 @@ "mixins": [], "server": [], "client": [ - "MixinRender" + "com.replaymod.mixin.MixinRender" ], "compatibilityLevel": "JAVA_8", "minVersion": "0.6.11", "refmap": "mixins.replaymod.refmap.json" -} \ No newline at end of file +} diff --git a/src/main/resources/mixins.jgui.json b/src/main/resources/mixins.jgui.json index 5b57bb460..55cc86598 100644 --- a/src/main/resources/mixins.jgui.json +++ b/src/main/resources/mixins.jgui.json @@ -6,13 +6,13 @@ "client": [ //#if FABRIC>=1 //#if MC>=11400 - "Mixin_RenderHudCallback", - "MixinGameRenderer", - "MixinScreen", - "MixinMouseListener", - "MixinKeyboardListener", + "com.replaymod.gui.versions.mixin.Mixin_RenderHudCallback", + "com.replaymod.gui.versions.mixin.MixinGameRenderer", + "com.replaymod.gui.versions.mixin.MixinScreen", + "com.replaymod.gui.versions.mixin.MixinMouseListener", + "com.replaymod.gui.versions.mixin.MixinKeyboardListener", // Note: MixinMinecraft actually belongs one line down in the 1.13 part but see its source file for why it isn't - "MixinMinecraft" + "com.replaymod.gui.versions.mixin.MixinMinecraft" //#endif //#endif ], diff --git a/src/main/resources/mixins.render.blend.replaymod.json b/src/main/resources/mixins.render.blend.replaymod.json index abf980ae7..7812f039b 100644 --- a/src/main/resources/mixins.render.blend.replaymod.json +++ b/src/main/resources/mixins.render.blend.replaymod.json @@ -20,13 +20,13 @@ "ItemRendererAccessor", //#endif "ParticleAccessor", - "MixinRenderGlobal", + "Mixin_RenderGlobal", "MixinRenderItem", "MixinRenderLivingBase", - "MixinRenderManager" + "Mixin_RenderManager" //#endif ], "compatibilityLevel": "JAVA_8", "minVersion": "0.6.11", "refmap": "mixins.replaymod.refmap.json" -} \ No newline at end of file +} diff --git a/src/main/resources/mixins.replay.replaymod.json b/src/main/resources/mixins.replay.replaymod.json index ff2737f11..690b2f545 100644 --- a/src/main/resources/mixins.replay.replaymod.json +++ b/src/main/resources/mixins.replay.replaymod.json @@ -12,7 +12,7 @@ "MixinCamera", "MixinInGameHud", //#endif - "EntityLivingBaseAccessor", + "com.replaymod.mixin.Mixin_EntityLivingBaseAccessor", //#if MC>=11400 "Mixin_ShowSpectatedHand_NoOF", "Mixin_ShowSpectatedHand_OF", @@ -22,7 +22,7 @@ "EntityPlayerAccessor", "FirstPersonRendererAccessor", //#if MC>=10904 - "MixinParticleManager", + "com.replaymod.mixin.Mixin_ParticleManager", //#endif //#if MC>=10800 "MixinGuiSpectator", @@ -35,14 +35,14 @@ //$$ "MixinEntityRenderer", //$$ "MixinFMLClientHandler", //#endif - "MixinKeyboardListener", - "MixinPlayerControllerMP", - "MixinRenderItem", - "MixinRenderLivingBase", + "com.replaymod.mixin.Mixin_KeyboardListener", + "com.replaymod.mixin.Mixin_PlayerControllerMP", + "com.replaymod.mixin.Mixin_RenderItem", + "com.replaymod.mixin.Mixin_RenderLivingBase", "MixinTileEntityEndPortalRenderer", "MixinWorldClient" ], "compatibilityLevel": "JAVA_8", "minVersion": "0.6.11", "refmap": "mixins.replaymod.refmap.json" -} \ No newline at end of file +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index e491ce517..310520a12 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,10 @@ { "pack": { "description": "ReplayMod resources", - //#if MC>=11400 - "pack_format": 4 + //#if MC>=11600 + "pack_format": 6 + //#elseif MC>=11400 + //$$ "pack_format": 4 //#else //#if MC>=11002 //$$ "pack_format": 2 diff --git a/versions/1.16.4-forge/src/main/java/com/replaymod/core/ReplayModBackend.java b/versions/1.16.4-forge/src/main/java/com/replaymod/core/ReplayModBackend.java index 2026422e1..43a322541 100644 --- a/versions/1.16.4-forge/src/main/java/com/replaymod/core/ReplayModBackend.java +++ b/versions/1.16.4-forge/src/main/java/com/replaymod/core/ReplayModBackend.java @@ -1,7 +1,7 @@ package com.replaymod.core; import com.mojang.bridge.launcher.Launcher; -import com.replaymod.core.mixin.MinecraftAccessor; +import com.replaymod.mixin.MinecraftAccessor; import com.replaymod.core.versions.forge.EventsAdapter; import com.replaymod.extras.modcore.ModCoreInstaller; import net.minecraft.resources.IResourcePack; @@ -37,9 +37,9 @@ public void init(FMLCommonSetupEvent event) { eventsAdapter.register(); // config = new Configuration(event.getSuggestedConfigurationFile()); // config.load(); - SettingsRegistry settingsRegistry = mod.getSettingsRegistry(); + // SettingsRegistry settingsRegistry = mod.getSettingsRegistry(); // settingsRegistry.backend.setConfiguration(config); - settingsRegistry.save(); // Save default values to disk + // settingsRegistry.save(); // Save default values to disk } public String getVersion() { diff --git a/versions/1.16.4-forge/src/main/java/com/replaymod/core/versions/forge/EventsAdapter.java b/versions/1.16.4-forge/src/main/java/com/replaymod/core/versions/forge/EventsAdapter.java index 64b7b11d1..55a22bf1e 100644 --- a/versions/1.16.4-forge/src/main/java/com/replaymod/core/versions/forge/EventsAdapter.java +++ b/versions/1.16.4-forge/src/main/java/com/replaymod/core/versions/forge/EventsAdapter.java @@ -2,9 +2,9 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.replaymod.core.events.*; +import com.replaymod.gui.utils.EventRegistrations; import com.replaymod.replay.events.RenderHotbarCallback; import com.replaymod.replay.events.RenderSpectatorCrosshairCallback; -import de.johni0702.minecraft.gui.utils.EventRegistrations; import net.minecraftforge.client.event.InputEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderHandEvent; diff --git a/versions/1.16.4-forge/src/main/java/de/johni0702/minecraft/gui/versions/forge/EventsAdapter.java b/versions/1.16.4-forge/src/main/java/com/replaymod/gui/versions/forge/EventsAdapter.java similarity index 94% rename from versions/1.16.4-forge/src/main/java/de/johni0702/minecraft/gui/versions/forge/EventsAdapter.java rename to versions/1.16.4-forge/src/main/java/com/replaymod/gui/versions/forge/EventsAdapter.java index 05a32c636..be08964fb 100644 --- a/versions/1.16.4-forge/src/main/java/de/johni0702/minecraft/gui/versions/forge/EventsAdapter.java +++ b/versions/1.16.4-forge/src/main/java/com/replaymod/gui/versions/forge/EventsAdapter.java @@ -1,8 +1,8 @@ -package de.johni0702.minecraft.gui.versions.forge; +package com.replaymod.gui.versions.forge; import com.mojang.blaze3d.matrix.MatrixStack; -import de.johni0702.minecraft.gui.utils.EventRegistrations; -import de.johni0702.minecraft.gui.versions.callbacks.*; +import com.replaymod.gui.utils.EventRegistrations; +import com.replaymod.gui.versions.callbacks.*; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.Widget; import net.minecraftforge.client.event.GuiOpenEvent; diff --git a/versions/1.16.4-forge/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerLoginClient.java b/versions/1.16.4-forge/src/main/java/com/replaymod/mixin/MixinNetHandlerLoginClient.java similarity index 96% rename from versions/1.16.4-forge/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerLoginClient.java rename to versions/1.16.4-forge/src/main/java/com/replaymod/mixin/MixinNetHandlerLoginClient.java index 342ff2514..7112ea0a0 100644 --- a/versions/1.16.4-forge/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerLoginClient.java +++ b/versions/1.16.4-forge/src/main/java/com/replaymod/mixin/MixinNetHandlerLoginClient.java @@ -1,4 +1,4 @@ -package com.replaymod.recording.mixin; +package com.replaymod.mixin; import com.replaymod.recording.ReplayModRecording; import net.minecraft.client.network.login.ClientLoginNetHandler;