From 45998bbe2e741689795fbfc3a2ee7863f80aa187 Mon Sep 17 00:00:00 2001 From: MeexReay Date: Sat, 14 Jun 2025 05:02:06 +0300 Subject: [PATCH] rename group-id and artifact-id, fix recording points render --- gradle.properties | 2 +- .../themixray/repeating_mod}/EasyConfig.java | 2 +- .../themixray/repeating_mod}/Main.java | 46 +++++++++---------- .../themixray/repeating_mod}/RecordList.java | 7 +-- .../themixray/repeating_mod}/RecordState.java | 5 +- .../repeating_mod}/RenderListener.java | 2 +- .../repeating_mod}/RepeatingScreen.java | 44 +++++++++--------- .../themixray/repeating_mod}/TickTask.java | 2 +- .../repeating_mod}/event/RecordEvent.java | 4 +- .../repeating_mod}/event/RecordEventType.java | 4 +- .../event/events/BlockBreakEvent.java | 6 +-- .../event/events/BlockInteractEvent.java | 6 +-- .../event/events/DelayEvent.java | 4 +- .../event/events/GuiCharTypeEvent.java | 6 +-- .../event/events/GuiCloseEvent.java | 6 +-- .../event/events/GuiKeyPressEvent.java | 6 +-- .../event/events/GuiKeyReleaseEvent.java | 6 +-- .../event/events/GuiMouseClickEvent.java | 6 +-- .../event/events/GuiMouseDragEvent.java | 6 +-- .../event/events/GuiMouseMoveEvent.java | 6 +-- .../event/events/GuiMouseReleaseEvent.java | 6 +-- .../event/events/GuiMouseScrollEvent.java | 6 +-- .../event/events/InputEvent.java | 6 +-- .../event/events/MoveEvent.java | 6 +-- .../repeating_mod}/mixin/ClientMixin.java | 6 +-- .../repeating_mod}/mixin/EntityMixin.java | 4 +- .../repeating_mod}/mixin/InputMixin.java | 4 +- .../repeating_mod}/mixin/MovementMixin.java | 10 ++-- .../repeating_mod}/mixin/NetworkMixin.java | 2 +- .../repeating_mod}/mixin/PlayerMixin.java | 10 +--- .../repeating_mod}/mixin/RendererMixin.java | 4 +- .../repeating_mod}/mixin/ScreenMixin.java | 11 ++--- .../repeating_mod}/render/RenderHelper.java | 18 ++++---- .../repeating_mod}/render/RenderSystem.java | 6 +-- .../render/buffer/BufferManager.java | 2 +- .../repeating_mod}/render/buffer/Vertex.java | 15 ++---- .../render/buffer/WorldBuffer.java | 39 +++++++--------- .../repeating_mod}/render/shader/Shader.java | 6 +-- .../render/shader/ShaderManager.java | 6 +-- .../widget/RecordListWidget.java | 16 ++----- .../repeating_mod}/widget/RecordWidget.java | 11 ++--- src/main/resources/fabric.mod.json | 2 +- src/main/resources/repeating-mod.mixins.json | 2 +- 43 files changed, 169 insertions(+), 205 deletions(-) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/EasyConfig.java (95%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/Main.java (83%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/RecordList.java (92%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/RecordState.java (98%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/RenderListener.java (86%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/RepeatingScreen.java (72%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/TickTask.java (94%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/RecordEvent.java (87%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/RecordEventType.java (95%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/BlockBreakEvent.java (85%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/BlockInteractEvent.java (92%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/DelayEvent.java (84%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/GuiCharTypeEvent.java (84%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/GuiCloseEvent.java (73%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/GuiKeyPressEvent.java (86%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/GuiKeyReleaseEvent.java (86%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/GuiMouseClickEvent.java (86%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/GuiMouseDragEvent.java (89%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/GuiMouseMoveEvent.java (84%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/GuiMouseReleaseEvent.java (86%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/GuiMouseScrollEvent.java (86%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/InputEvent.java (98%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/event/events/MoveEvent.java (90%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/mixin/ClientMixin.java (82%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/mixin/EntityMixin.java (88%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/mixin/InputMixin.java (84%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/mixin/MovementMixin.java (82%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/mixin/NetworkMixin.java (94%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/mixin/PlayerMixin.java (64%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/mixin/RendererMixin.java (85%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/mixin/ScreenMixin.java (90%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/render/RenderHelper.java (87%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/render/RenderSystem.java (52%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/render/buffer/BufferManager.java (95%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/render/buffer/Vertex.java (50%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/render/buffer/WorldBuffer.java (63%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/render/shader/Shader.java (67%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/render/shader/ShaderManager.java (93%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/widget/RecordListWidget.java (89%) rename src/main/java/{themixray/repeating/mod => ru/themixray/repeating_mod}/widget/RecordWidget.java (96%) diff --git a/gradle.properties b/gradle.properties index 8feaa20..489444b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,5 +14,5 @@ fabric_version=0.102.0+1.21 # Mod Properties mod_version = 1.1.2+1.21 -maven_group = themixray.repeating.mod +maven_group = ru.themixray archives_base_name = repeating-mod \ No newline at end of file diff --git a/src/main/java/themixray/repeating/mod/EasyConfig.java b/src/main/java/ru/themixray/repeating_mod/EasyConfig.java similarity index 95% rename from src/main/java/themixray/repeating/mod/EasyConfig.java rename to src/main/java/ru/themixray/repeating_mod/EasyConfig.java index 0ee871c..b592deb 100644 --- a/src/main/java/themixray/repeating/mod/EasyConfig.java +++ b/src/main/java/ru/themixray/repeating_mod/EasyConfig.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod; +package ru.themixray.repeating_mod; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/themixray/repeating/mod/Main.java b/src/main/java/ru/themixray/repeating_mod/Main.java similarity index 83% rename from src/main/java/themixray/repeating/mod/Main.java rename to src/main/java/ru/themixray/repeating_mod/Main.java index f213ee2..e5ac5a9 100644 --- a/src/main/java/themixray/repeating/mod/Main.java +++ b/src/main/java/ru/themixray/repeating_mod/Main.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod; +package ru.themixray.repeating_mod; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; @@ -15,13 +15,13 @@ import net.minecraft.util.math.Vec3d; import org.lwjgl.glfw.GLFW; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import themixray.repeating.mod.event.events.DelayEvent; -import themixray.repeating.mod.event.RecordEvent; -import themixray.repeating.mod.event.events.InputEvent; -import themixray.repeating.mod.event.events.MoveEvent; -import themixray.repeating.mod.render.RenderHelper; -import themixray.repeating.mod.render.RenderSystem; -import themixray.repeating.mod.render.buffer.WorldBuffer; +import ru.themixray.repeating_mod.event.events.DelayEvent; +import ru.themixray.repeating_mod.event.RecordEvent; +import ru.themixray.repeating_mod.event.events.InputEvent; +import ru.themixray.repeating_mod.event.events.MoveEvent; +import ru.themixray.repeating_mod.render.RenderHelper; +import ru.themixray.repeating_mod.render.RenderSystem; +import ru.themixray.repeating_mod.render.buffer.WorldBuffer; import java.awt.*; import java.io.File; @@ -35,21 +35,21 @@ public class Main implements ClientModInitializer { public static final FabricLoader loader = FabricLoader.getInstance(); public static Main me; - public RecordList record_list; - public RecordState now_record; + public ru.themixray.repeating_mod.RecordList record_list; + public ru.themixray.repeating_mod.RecordState now_record; public boolean is_recording = false; public long last_record = -1; - public TickTask move_tick = null; + public ru.themixray.repeating_mod.TickTask move_tick = null; - public TickTask replay_tick = null; + public ru.themixray.repeating_mod.TickTask replay_tick = null; public boolean is_replaying = false; public boolean loop_replay = false; public static InputEvent input_replay = null; public long living_ticks = 0; - public static RepeatingScreen menu; + public static ru.themixray.repeating_mod.RepeatingScreen menu; private static KeyBinding menu_key; private static KeyBinding toggle_replay_key; private static KeyBinding toggle_record_key; @@ -58,7 +58,7 @@ public class Main implements ClientModInitializer { public static Random rand = new Random(); - public EasyConfig conf; + public ru.themixray.repeating_mod.EasyConfig conf; public File records_folder; @Override @@ -71,11 +71,11 @@ public class Main implements ClientModInitializer { records_folder = new File(FabricLoader.getInstance().getGameDir().toFile(),"repeating_mod_records"); if (!records_folder.exists()) records_folder.mkdir(); - record_list = new RecordList(records_folder); + record_list = new ru.themixray.repeating_mod.RecordList(records_folder); record_list.loadRecords(); RenderSystem.init(); - WorldRenderEvents.LAST.register(context -> { + WorldRenderEvents.AFTER_ENTITIES.register(context -> { WorldBuffer buffer = RenderHelper.startTri(context); if (now_record != null) { Vec3d start_pos = now_record.getStartRecordPos(); @@ -88,13 +88,13 @@ public class Main implements ClientModInitializer { }); ClientTickEvents.END_CLIENT_TICK.register(client -> { - TickTask.tickTasks(TickTask.TickAt.CLIENT_EVENT); + ru.themixray.repeating_mod.TickTask.tickTasks(ru.themixray.repeating_mod.TickTask.TickAt.CLIENT_EVENT); }); Map def = new HashMap<>(); def.put("record_pos_delay", String.valueOf(record_pos_delay)); - conf = new EasyConfig(loader.getConfigDir(),"repeating-mod",def); + conf = new ru.themixray.repeating_mod.EasyConfig(loader.getConfigDir(),"repeating-mod",def); record_pos_delay = Long.parseLong(conf.data.get("record_pos_delay")); @@ -108,7 +108,7 @@ public class Main implements ClientModInitializer { "key.repeating-mod.toggle_record",InputUtil.Type.KEYSYM, -1,"text.repeating-mod.name")); - menu = new RepeatingScreen(); + menu = new ru.themixray.repeating_mod.RepeatingScreen(); ClientTickEvents.END_CLIENT_TICK.register(client -> { if (menu_key.wasPressed()) client.setScreen(menu); @@ -132,7 +132,7 @@ public class Main implements ClientModInitializer { } }); - new TickTask(0,0) { + new ru.themixray.repeating_mod.TickTask(0,0) { @Override public void run() { living_ticks++; @@ -142,7 +142,7 @@ public class Main implements ClientModInitializer { System.setProperty("java.awt.headless", "false"); } - public void setNowRecord(RecordState record) { + public void setNowRecord(ru.themixray.repeating_mod.RecordState record) { now_record = record; } @@ -177,7 +177,7 @@ public class Main implements ClientModInitializer { now_record.setStartRecordPos(start_pos); if (record_pos_delay > 0) { - move_tick = new TickTask( + move_tick = new ru.themixray.repeating_mod.TickTask( record_pos_delay, record_pos_delay) { @Override @@ -277,7 +277,7 @@ public class Main implements ClientModInitializer { List events = now_record.getEvents(); - replay_tick = new TickTask(0,0, TickTask.TickAt.CLIENT_EVENT) { + replay_tick = new ru.themixray.repeating_mod.TickTask(0,0, ru.themixray.repeating_mod.TickTask.TickAt.CLIENT_EVENT) { public int replay_index = 0; @Override diff --git a/src/main/java/themixray/repeating/mod/RecordList.java b/src/main/java/ru/themixray/repeating_mod/RecordList.java similarity index 92% rename from src/main/java/themixray/repeating/mod/RecordList.java rename to src/main/java/ru/themixray/repeating_mod/RecordList.java index 431a7be..cebbc45 100644 --- a/src/main/java/themixray/repeating/mod/RecordList.java +++ b/src/main/java/ru/themixray/repeating_mod/RecordList.java @@ -1,12 +1,9 @@ -package themixray.repeating.mod; +package ru.themixray.repeating_mod; -import net.minecraft.text.Text; -import themixray.repeating.mod.widget.RecordListWidget; +import ru.themixray.repeating_mod.widget.RecordListWidget; import java.io.File; -import java.io.IOException; import java.nio.file.Files; -import java.text.SimpleDateFormat; import java.util.*; public class RecordList { diff --git a/src/main/java/themixray/repeating/mod/RecordState.java b/src/main/java/ru/themixray/repeating_mod/RecordState.java similarity index 98% rename from src/main/java/themixray/repeating/mod/RecordState.java rename to src/main/java/ru/themixray/repeating_mod/RecordState.java index 782c494..3a684f5 100644 --- a/src/main/java/themixray/repeating/mod/RecordState.java +++ b/src/main/java/ru/themixray/repeating_mod/RecordState.java @@ -1,10 +1,9 @@ -package themixray.repeating.mod; +package ru.themixray.repeating_mod; import com.google.common.collect.Lists; import net.minecraft.util.math.Vec3d; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.event.RecordEvent; -import java.awt.*; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/themixray/repeating/mod/RenderListener.java b/src/main/java/ru/themixray/repeating_mod/RenderListener.java similarity index 86% rename from src/main/java/themixray/repeating/mod/RenderListener.java rename to src/main/java/ru/themixray/repeating_mod/RenderListener.java index 9992e48..80558be 100644 --- a/src/main/java/themixray/repeating/mod/RenderListener.java +++ b/src/main/java/ru/themixray/repeating_mod/RenderListener.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod; +package ru.themixray.repeating_mod; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/themixray/repeating/mod/RepeatingScreen.java b/src/main/java/ru/themixray/repeating_mod/RepeatingScreen.java similarity index 72% rename from src/main/java/themixray/repeating/mod/RepeatingScreen.java rename to src/main/java/ru/themixray/repeating_mod/RepeatingScreen.java index 78f2121..6f4df2c 100644 --- a/src/main/java/themixray/repeating/mod/RepeatingScreen.java +++ b/src/main/java/ru/themixray/repeating_mod/RepeatingScreen.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod; +package ru.themixray.repeating_mod; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -11,7 +11,7 @@ import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.SliderWidget; import net.minecraft.text.Text; -import themixray.repeating.mod.widget.RecordListWidget; +import ru.themixray.repeating_mod.widget.RecordListWidget; import java.awt.*; import java.io.File; @@ -20,7 +20,7 @@ import java.util.List; @Environment(EnvType.CLIENT) public class RepeatingScreen extends Screen { - private static List render_listeners = new ArrayList<>(); + private static List render_listeners = new ArrayList<>(); public ButtonWidget record_btn; public ButtonWidget loop_btn; @@ -34,18 +34,18 @@ public class RepeatingScreen extends Screen { super(Text.empty()); } - public static void addRenderListener(RenderListener render) { + public static void addRenderListener(ru.themixray.repeating_mod.RenderListener render) { render_listeners.add(render); } - public static void removeRenderListener(RenderListener render) { + public static void removeRenderListener(ru.themixray.repeating_mod.RenderListener render) { render_listeners.remove(render); } public void updateButtons() { if (was_build) { - record_btn.setMessage(Text.translatable("text.repeating-mod." + ((Main.me.is_recording) ? "stop_record" : "start_record"))); - loop_btn.setMessage(Text.translatable("text.repeating-mod." + ((Main.me.loop_replay) ? "off_loop" : "on_loop"))); + record_btn.setMessage(Text.translatable("text.repeating-mod." + ((ru.themixray.repeating_mod.Main.me.is_recording) ? "stop_record" : "start_record"))); + loop_btn.setMessage(Text.translatable("text.repeating-mod." + ((ru.themixray.repeating_mod.Main.me.loop_replay) ? "off_loop" : "on_loop"))); } } @@ -53,7 +53,7 @@ public class RepeatingScreen extends Screen { public void render(DrawContext context, int mouseX, int mouseY, float delta) { renderBackground(context, mouseX, mouseY, delta); - for (RenderListener l : render_listeners) { + for (ru.themixray.repeating_mod.RenderListener l : render_listeners) { if (l.beforeRender()) { l.render(context, mouseX, mouseY, delta); } @@ -61,7 +61,7 @@ public class RepeatingScreen extends Screen { super.render(context, mouseX, mouseY, delta); - for (RenderListener l : render_listeners) { + for (ru.themixray.repeating_mod.RenderListener l : render_listeners) { if (!l.beforeRender()) { l.render(context, mouseX, mouseY, delta); } @@ -70,7 +70,7 @@ public class RepeatingScreen extends Screen { @Override protected void init() { - RecordListWidget list_widget = Main.me.record_list.getWidget(); + RecordListWidget list_widget = ru.themixray.repeating_mod.Main.me.record_list.getWidget(); list_widget.setX(width / 2 + 2); list_widget.setY(height / 2 - list_widget.getHeight() / 2); @@ -79,10 +79,10 @@ public class RepeatingScreen extends Screen { record_btn = ButtonWidget.builder( Text.translatable("text.repeating-mod.start_record"), button -> { - if (!Main.me.is_replaying) { - if (Main.me.is_recording) - Main.me.stopRecording(); - else Main.me.startRecording(); + if (!ru.themixray.repeating_mod.Main.me.is_replaying) { + if (ru.themixray.repeating_mod.Main.me.is_recording) + ru.themixray.repeating_mod.Main.me.stopRecording(); + else ru.themixray.repeating_mod.Main.me.startRecording(); updateButtons(); } }) @@ -91,7 +91,7 @@ public class RepeatingScreen extends Screen { .build(); loop_btn = ButtonWidget.builder(Text.empty(), button -> { - Main.me.loop_replay = !Main.me.loop_replay; + ru.themixray.repeating_mod.Main.me.loop_replay = !ru.themixray.repeating_mod.Main.me.loop_replay; updateButtons(); }) .dimensions(width / 2 - 120, height / 2 - 10, 120, 20) @@ -100,9 +100,9 @@ public class RepeatingScreen extends Screen { pos_delay_slider = new SliderWidget( width / 2 - 120, height / 2 + 12, 120, 20, - (Main.me.record_pos_delay < 0) ? Text.translatable("text.repeating-mod.nan_pos_delay") : - Text.translatable("text.repeating-mod.pos_delay", String.valueOf(Main.me.record_pos_delay)), - (Main.me.record_pos_delay+1d)/101d) { + (ru.themixray.repeating_mod.Main.me.record_pos_delay < 0) ? Text.translatable("text.repeating-mod.nan_pos_delay") : + Text.translatable("text.repeating-mod.pos_delay", String.valueOf(ru.themixray.repeating_mod.Main.me.record_pos_delay)), + (ru.themixray.repeating_mod.Main.me.record_pos_delay+1d)/101d) { @Override protected void updateMessage() { @@ -116,9 +116,9 @@ public class RepeatingScreen extends Screen { double v = value*101d-1d; if (v <= 1) setMessage(Text.translatable("text.repeating-mod.nan_pos_delay")); else setMessage(Text.translatable("text.repeating-mod.pos_delay", String.valueOf((long) v))); - Main.me.record_pos_delay = (long) v; - Main.me.conf.data.put("record_pos_delay",String.valueOf(Main.me.record_pos_delay)); - Main.me.conf.save(); + ru.themixray.repeating_mod.Main.me.record_pos_delay = (long) v; + ru.themixray.repeating_mod.Main.me.conf.data.put("record_pos_delay",String.valueOf(ru.themixray.repeating_mod.Main.me.record_pos_delay)); + ru.themixray.repeating_mod.Main.me.conf.save(); } @Override @@ -148,7 +148,7 @@ public class RepeatingScreen extends Screen { if (files != null) { for (File file : files) { try { - Main.me.setNowRecord(Main.me.record_list.cloneRecord(file)); + ru.themixray.repeating_mod.Main.me.setNowRecord(ru.themixray.repeating_mod.Main.me.record_list.cloneRecord(file)); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/src/main/java/themixray/repeating/mod/TickTask.java b/src/main/java/ru/themixray/repeating_mod/TickTask.java similarity index 94% rename from src/main/java/themixray/repeating/mod/TickTask.java rename to src/main/java/ru/themixray/repeating_mod/TickTask.java index c1ff672..d8adbef 100644 --- a/src/main/java/themixray/repeating/mod/TickTask.java +++ b/src/main/java/ru/themixray/repeating_mod/TickTask.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod; +package ru.themixray.repeating_mod; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/themixray/repeating/mod/event/RecordEvent.java b/src/main/java/ru/themixray/repeating_mod/event/RecordEvent.java similarity index 87% rename from src/main/java/themixray/repeating/mod/event/RecordEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/RecordEvent.java index 0c2cb64..c55db10 100644 --- a/src/main/java/themixray/repeating/mod/event/RecordEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/RecordEvent.java @@ -1,6 +1,6 @@ -package themixray.repeating.mod.event; +package ru.themixray.repeating_mod.event; -import themixray.repeating.mod.event.events.*; +import ru.themixray.repeating_mod.event.events.*; public abstract class RecordEvent { public abstract void replay(); diff --git a/src/main/java/themixray/repeating/mod/event/RecordEventType.java b/src/main/java/ru/themixray/repeating_mod/event/RecordEventType.java similarity index 95% rename from src/main/java/themixray/repeating/mod/event/RecordEventType.java rename to src/main/java/ru/themixray/repeating_mod/event/RecordEventType.java index 957159f..853f002 100644 --- a/src/main/java/themixray/repeating/mod/event/RecordEventType.java +++ b/src/main/java/ru/themixray/repeating_mod/event/RecordEventType.java @@ -1,6 +1,6 @@ -package themixray.repeating.mod.event; +package ru.themixray.repeating_mod.event; -import themixray.repeating.mod.event.events.*; +import ru.themixray.repeating_mod.event.events.*; public enum RecordEventType { BLOCK_BREAK('b',"block_break",BlockBreakEvent.class), diff --git a/src/main/java/themixray/repeating/mod/event/events/BlockBreakEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/BlockBreakEvent.java similarity index 85% rename from src/main/java/themixray/repeating/mod/event/events/BlockBreakEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/BlockBreakEvent.java index 0e34fba..dd8a656 100644 --- a/src/main/java/themixray/repeating/mod/event/events/BlockBreakEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/BlockBreakEvent.java @@ -1,8 +1,8 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; import net.minecraft.util.math.BlockPos; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class BlockBreakEvent extends RecordEvent { public BlockPos pos; diff --git a/src/main/java/themixray/repeating/mod/event/events/BlockInteractEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/BlockInteractEvent.java similarity index 92% rename from src/main/java/themixray/repeating/mod/event/events/BlockInteractEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/BlockInteractEvent.java index bdae075..789ea8f 100644 --- a/src/main/java/themixray/repeating/mod/event/events/BlockInteractEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/BlockInteractEvent.java @@ -1,12 +1,12 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class BlockInteractEvent extends RecordEvent { public Hand hand; diff --git a/src/main/java/themixray/repeating/mod/event/events/DelayEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/DelayEvent.java similarity index 84% rename from src/main/java/themixray/repeating/mod/event/events/DelayEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/DelayEvent.java index 1978702..25dcbac 100644 --- a/src/main/java/themixray/repeating/mod/event/events/DelayEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/DelayEvent.java @@ -1,6 +1,6 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.event.RecordEvent; public class DelayEvent extends RecordEvent { public long delay; diff --git a/src/main/java/themixray/repeating/mod/event/events/GuiCharTypeEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/GuiCharTypeEvent.java similarity index 84% rename from src/main/java/themixray/repeating/mod/event/events/GuiCharTypeEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/GuiCharTypeEvent.java index 4428984..7c8dae9 100644 --- a/src/main/java/themixray/repeating/mod/event/events/GuiCharTypeEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/GuiCharTypeEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class GuiCharTypeEvent extends RecordEvent { private char chr; diff --git a/src/main/java/themixray/repeating/mod/event/events/GuiCloseEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/GuiCloseEvent.java similarity index 73% rename from src/main/java/themixray/repeating/mod/event/events/GuiCloseEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/GuiCloseEvent.java index f2c3024..38908fb 100644 --- a/src/main/java/themixray/repeating/mod/event/events/GuiCloseEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/GuiCloseEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class GuiCloseEvent extends RecordEvent { public GuiCloseEvent() {} diff --git a/src/main/java/themixray/repeating/mod/event/events/GuiKeyPressEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/GuiKeyPressEvent.java similarity index 86% rename from src/main/java/themixray/repeating/mod/event/events/GuiKeyPressEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/GuiKeyPressEvent.java index cf5221f..0e83969 100644 --- a/src/main/java/themixray/repeating/mod/event/events/GuiKeyPressEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/GuiKeyPressEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class GuiKeyPressEvent extends RecordEvent { private int keyCode; diff --git a/src/main/java/themixray/repeating/mod/event/events/GuiKeyReleaseEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/GuiKeyReleaseEvent.java similarity index 86% rename from src/main/java/themixray/repeating/mod/event/events/GuiKeyReleaseEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/GuiKeyReleaseEvent.java index 8134c73..253f8bf 100644 --- a/src/main/java/themixray/repeating/mod/event/events/GuiKeyReleaseEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/GuiKeyReleaseEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class GuiKeyReleaseEvent extends RecordEvent { private int keyCode; diff --git a/src/main/java/themixray/repeating/mod/event/events/GuiMouseClickEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseClickEvent.java similarity index 86% rename from src/main/java/themixray/repeating/mod/event/events/GuiMouseClickEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseClickEvent.java index 1c47776..6cc2393 100644 --- a/src/main/java/themixray/repeating/mod/event/events/GuiMouseClickEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseClickEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class GuiMouseClickEvent extends RecordEvent { private double mouseX; diff --git a/src/main/java/themixray/repeating/mod/event/events/GuiMouseDragEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseDragEvent.java similarity index 89% rename from src/main/java/themixray/repeating/mod/event/events/GuiMouseDragEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseDragEvent.java index f351482..eba566f 100644 --- a/src/main/java/themixray/repeating/mod/event/events/GuiMouseDragEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseDragEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class GuiMouseDragEvent extends RecordEvent { private double mouseX; diff --git a/src/main/java/themixray/repeating/mod/event/events/GuiMouseMoveEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseMoveEvent.java similarity index 84% rename from src/main/java/themixray/repeating/mod/event/events/GuiMouseMoveEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseMoveEvent.java index 7da1c82..94480f2 100644 --- a/src/main/java/themixray/repeating/mod/event/events/GuiMouseMoveEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseMoveEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class GuiMouseMoveEvent extends RecordEvent { private double mouseX; diff --git a/src/main/java/themixray/repeating/mod/event/events/GuiMouseReleaseEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseReleaseEvent.java similarity index 86% rename from src/main/java/themixray/repeating/mod/event/events/GuiMouseReleaseEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseReleaseEvent.java index 63b8b6b..3e8c1b4 100644 --- a/src/main/java/themixray/repeating/mod/event/events/GuiMouseReleaseEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseReleaseEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class GuiMouseReleaseEvent extends RecordEvent { private double mouseX; diff --git a/src/main/java/themixray/repeating/mod/event/events/GuiMouseScrollEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseScrollEvent.java similarity index 86% rename from src/main/java/themixray/repeating/mod/event/events/GuiMouseScrollEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseScrollEvent.java index 720e027..8df7061 100644 --- a/src/main/java/themixray/repeating/mod/event/events/GuiMouseScrollEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/GuiMouseScrollEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class GuiMouseScrollEvent extends RecordEvent { private double mouseX; diff --git a/src/main/java/themixray/repeating/mod/event/events/InputEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/InputEvent.java similarity index 98% rename from src/main/java/themixray/repeating/mod/event/events/InputEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/InputEvent.java index 9ca3128..74be7c5 100644 --- a/src/main/java/themixray/repeating/mod/event/events/InputEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/InputEvent.java @@ -1,7 +1,7 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class InputEvent extends RecordEvent { public Boolean sneaking; diff --git a/src/main/java/themixray/repeating/mod/event/events/MoveEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/MoveEvent.java similarity index 90% rename from src/main/java/themixray/repeating/mod/event/events/MoveEvent.java rename to src/main/java/ru/themixray/repeating_mod/event/events/MoveEvent.java index c8b8bf1..97054ca 100644 --- a/src/main/java/themixray/repeating/mod/event/events/MoveEvent.java +++ b/src/main/java/ru/themixray/repeating_mod/event/events/MoveEvent.java @@ -1,9 +1,9 @@ -package themixray.repeating.mod.event.events; +package ru.themixray.repeating_mod.event.events; import net.minecraft.entity.MovementType; import net.minecraft.util.math.Vec3d; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.RecordEvent; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.RecordEvent; public class MoveEvent extends RecordEvent { public Vec3d vec; diff --git a/src/main/java/themixray/repeating/mod/mixin/ClientMixin.java b/src/main/java/ru/themixray/repeating_mod/mixin/ClientMixin.java similarity index 82% rename from src/main/java/themixray/repeating/mod/mixin/ClientMixin.java rename to src/main/java/ru/themixray/repeating_mod/mixin/ClientMixin.java index b3adac0..10b1a8e 100644 --- a/src/main/java/themixray/repeating/mod/mixin/ClientMixin.java +++ b/src/main/java/ru/themixray/repeating_mod/mixin/ClientMixin.java @@ -1,12 +1,12 @@ -package themixray.repeating.mod.mixin; +package ru.themixray.repeating_mod.mixin; import net.minecraft.client.MinecraftClient; 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; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.TickTask; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.TickTask; @Mixin(MinecraftClient.class) public abstract class ClientMixin { diff --git a/src/main/java/themixray/repeating/mod/mixin/EntityMixin.java b/src/main/java/ru/themixray/repeating_mod/mixin/EntityMixin.java similarity index 88% rename from src/main/java/themixray/repeating/mod/mixin/EntityMixin.java rename to src/main/java/ru/themixray/repeating_mod/mixin/EntityMixin.java index 185de64..9bf8341 100644 --- a/src/main/java/themixray/repeating/mod/mixin/EntityMixin.java +++ b/src/main/java/ru/themixray/repeating_mod/mixin/EntityMixin.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod.mixin; +package ru.themixray.repeating_mod.mixin; import net.minecraft.entity.Entity; import org.spongepowered.asm.mixin.Mixin; @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import themixray.repeating.mod.Main; +import ru.themixray.repeating_mod.Main; import java.util.UUID; diff --git a/src/main/java/themixray/repeating/mod/mixin/InputMixin.java b/src/main/java/ru/themixray/repeating_mod/mixin/InputMixin.java similarity index 84% rename from src/main/java/themixray/repeating/mod/mixin/InputMixin.java rename to src/main/java/ru/themixray/repeating_mod/mixin/InputMixin.java index c58f53c..33acbf1 100644 --- a/src/main/java/themixray/repeating/mod/mixin/InputMixin.java +++ b/src/main/java/ru/themixray/repeating_mod/mixin/InputMixin.java @@ -1,11 +1,11 @@ -package themixray.repeating.mod.mixin; +package ru.themixray.repeating_mod.mixin; import net.minecraft.client.input.KeyboardInput; 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; -import themixray.repeating.mod.Main; +import ru.themixray.repeating_mod.Main; @Mixin(KeyboardInput.class) public abstract class InputMixin { diff --git a/src/main/java/themixray/repeating/mod/mixin/MovementMixin.java b/src/main/java/ru/themixray/repeating_mod/mixin/MovementMixin.java similarity index 82% rename from src/main/java/themixray/repeating/mod/mixin/MovementMixin.java rename to src/main/java/ru/themixray/repeating_mod/mixin/MovementMixin.java index f9084e7..73f970b 100644 --- a/src/main/java/themixray/repeating/mod/mixin/MovementMixin.java +++ b/src/main/java/ru/themixray/repeating_mod/mixin/MovementMixin.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod.mixin; +package ru.themixray.repeating_mod.mixin; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.fabricmc.fabric.api.event.player.UseBlockCallback; @@ -9,10 +9,10 @@ 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; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.event.events.BlockBreakEvent; -import themixray.repeating.mod.event.events.BlockInteractEvent; -import themixray.repeating.mod.TickTask; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.events.BlockBreakEvent; +import ru.themixray.repeating_mod.event.events.BlockInteractEvent; +import ru.themixray.repeating_mod.TickTask; @Mixin(ClientPlayerEntity.class) public abstract class MovementMixin { diff --git a/src/main/java/themixray/repeating/mod/mixin/NetworkMixin.java b/src/main/java/ru/themixray/repeating_mod/mixin/NetworkMixin.java similarity index 94% rename from src/main/java/themixray/repeating/mod/mixin/NetworkMixin.java rename to src/main/java/ru/themixray/repeating_mod/mixin/NetworkMixin.java index 396b6c2..58f7570 100644 --- a/src/main/java/themixray/repeating/mod/mixin/NetworkMixin.java +++ b/src/main/java/ru/themixray/repeating_mod/mixin/NetworkMixin.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod.mixin; +package ru.themixray.repeating_mod.mixin; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.listener.ServerPlayPacketListener; diff --git a/src/main/java/themixray/repeating/mod/mixin/PlayerMixin.java b/src/main/java/ru/themixray/repeating_mod/mixin/PlayerMixin.java similarity index 64% rename from src/main/java/themixray/repeating/mod/mixin/PlayerMixin.java rename to src/main/java/ru/themixray/repeating_mod/mixin/PlayerMixin.java index 67735f9..c5627c8 100644 --- a/src/main/java/themixray/repeating/mod/mixin/PlayerMixin.java +++ b/src/main/java/ru/themixray/repeating_mod/mixin/PlayerMixin.java @@ -1,18 +1,12 @@ -package themixray.repeating.mod.mixin; +package ru.themixray.repeating_mod.mixin; -import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.entity.Entity; import net.minecraft.network.ClientConnection; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import themixray.repeating.mod.Main; - -import java.util.UUID; +import ru.themixray.repeating_mod.Main; @Mixin(ClientConnection.class) public abstract class PlayerMixin { diff --git a/src/main/java/themixray/repeating/mod/mixin/RendererMixin.java b/src/main/java/ru/themixray/repeating_mod/mixin/RendererMixin.java similarity index 85% rename from src/main/java/themixray/repeating/mod/mixin/RendererMixin.java rename to src/main/java/ru/themixray/repeating_mod/mixin/RendererMixin.java index 22ca225..c035167 100644 --- a/src/main/java/themixray/repeating/mod/mixin/RendererMixin.java +++ b/src/main/java/ru/themixray/repeating_mod/mixin/RendererMixin.java @@ -1,11 +1,11 @@ -package themixray.repeating.mod.mixin; +package ru.themixray.repeating_mod.mixin; import net.minecraft.client.render.*; 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; -import themixray.repeating.mod.TickTask; +import ru.themixray.repeating_mod.TickTask; @Mixin(GameRenderer.class) public abstract class RendererMixin { diff --git a/src/main/java/themixray/repeating/mod/mixin/ScreenMixin.java b/src/main/java/ru/themixray/repeating_mod/mixin/ScreenMixin.java similarity index 90% rename from src/main/java/themixray/repeating/mod/mixin/ScreenMixin.java rename to src/main/java/ru/themixray/repeating_mod/mixin/ScreenMixin.java index 63d5fc5..3d74704 100644 --- a/src/main/java/themixray/repeating/mod/mixin/ScreenMixin.java +++ b/src/main/java/ru/themixray/repeating_mod/mixin/ScreenMixin.java @@ -1,20 +1,15 @@ -package themixray.repeating.mod.mixin; +package ru.themixray.repeating_mod.mixin; import net.minecraft.client.gui.AbstractParentElement; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.ParentElement; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.render.GameRenderer; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.TickTask; -import themixray.repeating.mod.event.events.*; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.event.events.*; @Mixin(Screen.class) public abstract class ScreenMixin extends AbstractParentElement implements Drawable { diff --git a/src/main/java/themixray/repeating/mod/render/RenderHelper.java b/src/main/java/ru/themixray/repeating_mod/render/RenderHelper.java similarity index 87% rename from src/main/java/themixray/repeating/mod/render/RenderHelper.java rename to src/main/java/ru/themixray/repeating_mod/render/RenderHelper.java index 4f80464..c67abd4 100644 --- a/src/main/java/themixray/repeating/mod/render/RenderHelper.java +++ b/src/main/java/ru/themixray/repeating_mod/render/RenderHelper.java @@ -1,10 +1,10 @@ -package themixray.repeating.mod.render; +package ru.themixray.repeating_mod.render; import lombok.experimental.UtilityClass; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; -import net.minecraft.util.math.Vec3d; -import themixray.repeating.mod.render.buffer.WorldBuffer; -import themixray.repeating.mod.render.shader.ShaderManager; +import org.joml.Vector3f; +import ru.themixray.repeating_mod.render.buffer.WorldBuffer; +import ru.themixray.repeating_mod.render.shader.ShaderManager; import java.awt.*; @@ -27,8 +27,8 @@ public class RenderHelper { } public void drawLine(WorldBuffer buffer, float x1, float y1, float z1, float x2, float y2, float z2, Color color) { - buffer.vert(x1, y1, z1, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); - buffer.vert(x2, y2, z2, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); + buffer.vert(new Vector3f(x1, y1, z1), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); + buffer.vert(new Vector3f(x2, y2, z2), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); } public static WorldBuffer startTri(WorldRenderContext context) { @@ -49,9 +49,9 @@ public class RenderHelper { } public void drawTri(WorldBuffer buffer, float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, Color color) { - buffer.vert(x1, y1, z1, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); - buffer.vert(x2, y2, z2, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); - buffer.vert(x3, y3, z3, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); + buffer.vert(new Vector3f(x1, y1, z1), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); + buffer.vert(new Vector3f(x2, y2, z2), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); + buffer.vert(new Vector3f(x3, y3, z3), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); } public static void drawRectFromTri(WorldBuffer buffer, diff --git a/src/main/java/themixray/repeating/mod/render/RenderSystem.java b/src/main/java/ru/themixray/repeating_mod/render/RenderSystem.java similarity index 52% rename from src/main/java/themixray/repeating/mod/render/RenderSystem.java rename to src/main/java/ru/themixray/repeating_mod/render/RenderSystem.java index a5fa15c..90f12e9 100644 --- a/src/main/java/themixray/repeating/mod/render/RenderSystem.java +++ b/src/main/java/ru/themixray/repeating_mod/render/RenderSystem.java @@ -1,8 +1,8 @@ -package themixray.repeating.mod.render; +package ru.themixray.repeating_mod.render; import lombok.experimental.UtilityClass; -import themixray.repeating.mod.render.buffer.BufferManager; -import themixray.repeating.mod.render.shader.ShaderManager; +import ru.themixray.repeating_mod.render.buffer.BufferManager; +import ru.themixray.repeating_mod.render.shader.ShaderManager; @UtilityClass public class RenderSystem { diff --git a/src/main/java/themixray/repeating/mod/render/buffer/BufferManager.java b/src/main/java/ru/themixray/repeating_mod/render/buffer/BufferManager.java similarity index 95% rename from src/main/java/themixray/repeating/mod/render/buffer/BufferManager.java rename to src/main/java/ru/themixray/repeating_mod/render/buffer/BufferManager.java index 76d2853..9fb32ff 100644 --- a/src/main/java/themixray/repeating/mod/render/buffer/BufferManager.java +++ b/src/main/java/ru/themixray/repeating_mod/render/buffer/BufferManager.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod.render.buffer; +package ru.themixray.repeating_mod.render.buffer; import lombok.experimental.UtilityClass; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; diff --git a/src/main/java/themixray/repeating/mod/render/buffer/Vertex.java b/src/main/java/ru/themixray/repeating_mod/render/buffer/Vertex.java similarity index 50% rename from src/main/java/themixray/repeating/mod/render/buffer/Vertex.java rename to src/main/java/ru/themixray/repeating_mod/render/buffer/Vertex.java index 5aaa113..a87e2e6 100644 --- a/src/main/java/themixray/repeating/mod/render/buffer/Vertex.java +++ b/src/main/java/ru/themixray/repeating_mod/render/buffer/Vertex.java @@ -1,14 +1,11 @@ -package themixray.repeating.mod.render.buffer; +package ru.themixray.repeating_mod.render.buffer; import lombok.Getter; +import org.joml.Vector3f; public class Vertex { @Getter - private float x; - @Getter - private float y; - @Getter - private float z; + private Vector3f pos; @Getter private float r; @Getter @@ -18,10 +15,8 @@ public class Vertex { @Getter private float a; - public Vertex(float x, float y, float z, float r, float g, float b, float a) { - this.x = x; - this.y = y; - this.z = z; + public Vertex(Vector3f pos, float r, float g, float b, float a) { + this.pos = pos; this.r = r; this.g = g; this.b = b; diff --git a/src/main/java/themixray/repeating/mod/render/buffer/WorldBuffer.java b/src/main/java/ru/themixray/repeating_mod/render/buffer/WorldBuffer.java similarity index 63% rename from src/main/java/themixray/repeating/mod/render/buffer/WorldBuffer.java rename to src/main/java/ru/themixray/repeating_mod/render/buffer/WorldBuffer.java index 390f97d..fa27670 100644 --- a/src/main/java/themixray/repeating/mod/render/buffer/WorldBuffer.java +++ b/src/main/java/ru/themixray/repeating_mod/render/buffer/WorldBuffer.java @@ -1,11 +1,12 @@ -package themixray.repeating.mod.render.buffer; +package ru.themixray.repeating_mod.render.buffer; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; -import net.minecraft.util.math.Vec3d; import org.apache.commons.lang3.ArrayUtils; import org.joml.Matrix4f; +import org.joml.Quaternionf; +import org.joml.Vector3f; import org.lwjgl.BufferUtils; -import themixray.repeating.mod.render.shader.Shader; +import ru.themixray.repeating_mod.render.shader.Shader; import java.nio.FloatBuffer; import java.util.ArrayList; @@ -18,17 +19,19 @@ public class WorldBuffer { private final int drawMode; private final Shader shader; private FloatBuffer projectionMatrix; - private final Vec3d cameraPos; + private final Vector3f cameraPos; + private final Quaternionf cameraRot; public WorldBuffer(int drawMode, Shader shader, WorldRenderContext worldRenderContext) { this.drawMode = drawMode; this.shader = shader; - this.cameraPos = worldRenderContext.camera().getPos(); - makeProjectionMatrix(worldRenderContext.projectionMatrix(), worldRenderContext.matrixStack().peek().getPositionMatrix()); + this.cameraPos = worldRenderContext.camera().getPos().toVector3f(); + this.cameraRot = worldRenderContext.camera().getRotation().invert(); + this.projectionMatrix = worldRenderContext.projectionMatrix().mul(worldRenderContext.matrixStack().peek().getPositionMatrix()).get(BufferUtils.createFloatBuffer(16)); } - public void vert(float x, float y, float z, float r, float g, float b, float a) { - vertices.add(new Vertex(x - (float) cameraPos.x, y - (float) cameraPos.y, z - (float) cameraPos.z, r, g, b, a)); + public void vert(Vector3f pos, float r, float g, float b, float a) { + vertices.add(new Vertex(cameraRot.transform(pos.sub(cameraPos)), r, g, b, a)); } public void draw() { @@ -36,7 +39,7 @@ public class WorldBuffer { BufferManager.bindBuffer(); BufferManager.writeBuffer(getBuffer()); - applyProjectionMatrix(); + shader.uniformMatrix4f("u_projection", projectionMatrix); glVertexAttribPointer(0, 3, GL_FLOAT, false, 0, 0); glEnableVertexAttribArray(0); @@ -55,12 +58,12 @@ public class WorldBuffer { private FloatBuffer getBuffer() { FloatBuffer floatBuffer = BufferUtils.createFloatBuffer(vertices.size() * 7); ArrayList floats = new ArrayList<>(); - for (Vertex vertex : vertices) { - floats.add(vertex.getX()); - floats.add(vertex.getY()); - floats.add(vertex.getZ()); + for (ru.themixray.repeating_mod.render.buffer.Vertex vertex : vertices) { + floats.add(vertex.getPos().x); + floats.add(vertex.getPos().y); + floats.add(vertex.getPos().z); } - for (Vertex vertex : vertices) { + for (ru.themixray.repeating_mod.render.buffer.Vertex vertex : vertices) { floats.add(vertex.getR()); floats.add(vertex.getG()); floats.add(vertex.getB()); @@ -71,12 +74,4 @@ public class WorldBuffer { floatBuffer.put(ArrayUtils.toPrimitive(floatArray)); return floatBuffer.flip(); } - - private void makeProjectionMatrix(Matrix4f projectionMatrix, Matrix4f viewModelMatrix) { - this.projectionMatrix = projectionMatrix.mul(viewModelMatrix).get(BufferUtils.createFloatBuffer(16)); - } - - private void applyProjectionMatrix() { - shader.uniformMatrix4f("u_projection", projectionMatrix); - } } diff --git a/src/main/java/themixray/repeating/mod/render/shader/Shader.java b/src/main/java/ru/themixray/repeating_mod/render/shader/Shader.java similarity index 67% rename from src/main/java/themixray/repeating/mod/render/shader/Shader.java rename to src/main/java/ru/themixray/repeating_mod/render/shader/Shader.java index e11dd9a..efe5550 100644 --- a/src/main/java/themixray/repeating/mod/render/shader/Shader.java +++ b/src/main/java/ru/themixray/repeating_mod/render/shader/Shader.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod.render.shader; +package ru.themixray.repeating_mod.render.shader; import lombok.Getter; @@ -12,8 +12,8 @@ public class Shader { public Shader(String name) { - int v = ShaderManager.loadShaderProgram(name, ShaderManager.ShaderType.VERTEX); - int f = ShaderManager.loadShaderProgram(name, ShaderManager.ShaderType.FRAGMENT); + int v = ru.themixray.repeating_mod.render.shader.ShaderManager.loadShaderProgram(name, ru.themixray.repeating_mod.render.shader.ShaderManager.ShaderType.VERTEX); + int f = ru.themixray.repeating_mod.render.shader.ShaderManager.loadShaderProgram(name, ru.themixray.repeating_mod.render.shader.ShaderManager.ShaderType.FRAGMENT); this.id = glCreateProgram(); glAttachShader(id, v); glAttachShader(id, f); diff --git a/src/main/java/themixray/repeating/mod/render/shader/ShaderManager.java b/src/main/java/ru/themixray/repeating_mod/render/shader/ShaderManager.java similarity index 93% rename from src/main/java/themixray/repeating/mod/render/shader/ShaderManager.java rename to src/main/java/ru/themixray/repeating_mod/render/shader/ShaderManager.java index 08d6a9b..34c0d25 100644 --- a/src/main/java/themixray/repeating/mod/render/shader/ShaderManager.java +++ b/src/main/java/ru/themixray/repeating_mod/render/shader/ShaderManager.java @@ -1,4 +1,4 @@ -package themixray.repeating.mod.render.shader; +package ru.themixray.repeating_mod.render.shader; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.TextureUtil; @@ -27,14 +27,14 @@ import static org.lwjgl.opengl.GL33.*; @UtilityClass public class ShaderManager { @Getter - private Shader positionColorShader; + private ru.themixray.repeating_mod.render.shader.Shader positionColorShader; public void init() { ClientLifecycleEvents.CLIENT_STARTED.register(client -> loadShaders()); } private void loadShaders() { - positionColorShader = new Shader("position_color"); + positionColorShader = new ru.themixray.repeating_mod.render.shader.Shader("position_color"); } public int loadShaderProgram(String name, ShaderType type) { diff --git a/src/main/java/themixray/repeating/mod/widget/RecordListWidget.java b/src/main/java/ru/themixray/repeating_mod/widget/RecordListWidget.java similarity index 89% rename from src/main/java/themixray/repeating/mod/widget/RecordListWidget.java rename to src/main/java/ru/themixray/repeating_mod/widget/RecordListWidget.java index d038f91..5b7a7e3 100644 --- a/src/main/java/themixray/repeating/mod/widget/RecordListWidget.java +++ b/src/main/java/ru/themixray/repeating_mod/widget/RecordListWidget.java @@ -1,22 +1,14 @@ -package themixray.repeating.mod.widget; +package ru.themixray.repeating_mod.widget; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; -import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.*; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.RecordState; -import themixray.repeating.mod.RepeatingScreen; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.RecordState; +import ru.themixray.repeating_mod.RepeatingScreen; -import java.util.ArrayList; import java.util.LinkedList; -import java.util.List; -import java.util.function.Consumer; public class RecordListWidget extends ScrollableWidget { private LinkedList widgets = new LinkedList<>(); diff --git a/src/main/java/themixray/repeating/mod/widget/RecordWidget.java b/src/main/java/ru/themixray/repeating_mod/widget/RecordWidget.java similarity index 96% rename from src/main/java/themixray/repeating/mod/widget/RecordWidget.java rename to src/main/java/ru/themixray/repeating_mod/widget/RecordWidget.java index 719a606..7d53358 100644 --- a/src/main/java/themixray/repeating/mod/widget/RecordWidget.java +++ b/src/main/java/ru/themixray/repeating_mod/widget/RecordWidget.java @@ -1,17 +1,14 @@ -package themixray.repeating.mod.widget; +package ru.themixray.repeating_mod.widget; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.*; -import net.minecraft.text.Style; import net.minecraft.text.Text; -import net.minecraft.text.TextColor; import net.minecraft.util.Formatting; -import themixray.repeating.mod.Main; -import themixray.repeating.mod.RecordState; -import themixray.repeating.mod.RenderListener; -import themixray.repeating.mod.RepeatingScreen; +import ru.themixray.repeating_mod.Main; +import ru.themixray.repeating_mod.RecordState; +import ru.themixray.repeating_mod.RepeatingScreen; import java.awt.*; import java.io.IOException; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2e09cc1..9bbbbe2 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,7 +19,7 @@ "environment": "client", "entrypoints": { "client": [ - "themixray.repeating.mod.Main" + "ru.themixray.repeating_mod.Main" ] }, "mixins": [ diff --git a/src/main/resources/repeating-mod.mixins.json b/src/main/resources/repeating-mod.mixins.json index 4196f7e..7bfbaa8 100644 --- a/src/main/resources/repeating-mod.mixins.json +++ b/src/main/resources/repeating-mod.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "themixray.repeating.mod.mixin", + "package": "ru.themixray.repeating_mod.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ ],