From 2944395e54a21aecfad847b59cf67f1c30b6baa9 Mon Sep 17 00:00:00 2001 From: MeexReay Date: Sat, 14 Jun 2025 05:09:39 +0300 Subject: [PATCH] remove some crap --- .../java/ru/themixray/repeating_mod/Main.java | 28 ++++++------- .../repeating_mod/RepeatingScreen.java | 40 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/ru/themixray/repeating_mod/Main.java b/src/main/java/ru/themixray/repeating_mod/Main.java index e5ac5a9..3079d38 100644 --- a/src/main/java/ru/themixray/repeating_mod/Main.java +++ b/src/main/java/ru/themixray/repeating_mod/Main.java @@ -35,21 +35,21 @@ public class Main implements ClientModInitializer { public static final FabricLoader loader = FabricLoader.getInstance(); public static Main me; - public ru.themixray.repeating_mod.RecordList record_list; - public ru.themixray.repeating_mod.RecordState now_record; + public RecordList record_list; + public RecordState now_record; public boolean is_recording = false; public long last_record = -1; - public ru.themixray.repeating_mod.TickTask move_tick = null; + public TickTask move_tick = null; - public ru.themixray.repeating_mod.TickTask replay_tick = null; + public 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 ru.themixray.repeating_mod.RepeatingScreen menu; + public static 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 ru.themixray.repeating_mod.EasyConfig conf; + public EasyConfig conf; public File records_folder; @Override @@ -71,7 +71,7 @@ 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 ru.themixray.repeating_mod.RecordList(records_folder); + record_list = new RecordList(records_folder); record_list.loadRecords(); RenderSystem.init(); @@ -88,13 +88,13 @@ public class Main implements ClientModInitializer { }); ClientTickEvents.END_CLIENT_TICK.register(client -> { - ru.themixray.repeating_mod.TickTask.tickTasks(ru.themixray.repeating_mod.TickTask.TickAt.CLIENT_EVENT); + TickTask.tickTasks(TickTask.TickAt.CLIENT_EVENT); }); Map def = new HashMap<>(); def.put("record_pos_delay", String.valueOf(record_pos_delay)); - conf = new ru.themixray.repeating_mod.EasyConfig(loader.getConfigDir(),"repeating-mod",def); + conf = new 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 ru.themixray.repeating_mod.RepeatingScreen(); + menu = new RepeatingScreen(); ClientTickEvents.END_CLIENT_TICK.register(client -> { if (menu_key.wasPressed()) client.setScreen(menu); @@ -132,7 +132,7 @@ public class Main implements ClientModInitializer { } }); - new ru.themixray.repeating_mod.TickTask(0,0) { + new 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(ru.themixray.repeating_mod.RecordState record) { + public void setNowRecord(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 ru.themixray.repeating_mod.TickTask( + move_tick = new 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 ru.themixray.repeating_mod.TickTask(0,0, ru.themixray.repeating_mod.TickTask.TickAt.CLIENT_EVENT) { + replay_tick = new TickTask(0,0, TickTask.TickAt.CLIENT_EVENT) { public int replay_index = 0; @Override diff --git a/src/main/java/ru/themixray/repeating_mod/RepeatingScreen.java b/src/main/java/ru/themixray/repeating_mod/RepeatingScreen.java index 6f4df2c..8d95918 100644 --- a/src/main/java/ru/themixray/repeating_mod/RepeatingScreen.java +++ b/src/main/java/ru/themixray/repeating_mod/RepeatingScreen.java @@ -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(ru.themixray.repeating_mod.RenderListener render) { + public static void addRenderListener(RenderListener render) { render_listeners.add(render); } - public static void removeRenderListener(ru.themixray.repeating_mod.RenderListener render) { + public static void removeRenderListener(RenderListener render) { render_listeners.remove(render); } public void updateButtons() { if (was_build) { - 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"))); + 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"))); } } @@ -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 (ru.themixray.repeating_mod.RenderListener l : render_listeners) { + for (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 (ru.themixray.repeating_mod.RenderListener l : render_listeners) { + for (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 = ru.themixray.repeating_mod.Main.me.record_list.getWidget(); + RecordListWidget list_widget = 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 (!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(); + if (!Main.me.is_replaying) { + if (Main.me.is_recording) + Main.me.stopRecording(); + else Main.me.startRecording(); updateButtons(); } }) @@ -91,7 +91,7 @@ public class RepeatingScreen extends Screen { .build(); loop_btn = ButtonWidget.builder(Text.empty(), button -> { - ru.themixray.repeating_mod.Main.me.loop_replay = !ru.themixray.repeating_mod.Main.me.loop_replay; + Main.me.loop_replay = !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, - (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) { + (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) { @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))); - 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(); + 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(); } @Override @@ -148,7 +148,7 @@ public class RepeatingScreen extends Screen { if (files != null) { for (File file : files) { try { - ru.themixray.repeating_mod.Main.me.setNowRecord(ru.themixray.repeating_mod.Main.me.record_list.cloneRecord(file)); + Main.me.setNowRecord(Main.me.record_list.cloneRecord(file)); } catch (Exception e) { throw new RuntimeException(e); }