small refactoring
This commit is contained in:
parent
543f2a18cf
commit
f3acb4df10
15 changed files with 531 additions and 558 deletions
|
|
@ -7,16 +7,16 @@ import net.minecraft.client.gui.DrawContext;
|
|||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.tooltip.Tooltip;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.client.gui.widget.OptionSliderWidget;
|
||||
import net.minecraft.client.gui.widget.SliderWidget;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import themixray.repeating.mod.events.RecordEvent;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.io.File;
|
||||
import java.nio.file.Files;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -52,11 +52,7 @@ public class RepeatingScreen extends Screen {
|
|||
|
||||
@Override
|
||||
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
|
||||
renderBackgroundTexture(context);
|
||||
// context.drawCenteredTextWithShadow(textRenderer,
|
||||
// Text.literal("You must see me"),
|
||||
// width / 2, height / 2,
|
||||
// Color.white.getRGB());
|
||||
renderBackground(context);
|
||||
super.render(context, mouseX, mouseY, delta);
|
||||
}
|
||||
|
||||
|
|
@ -101,7 +97,7 @@ public class RepeatingScreen extends Screen {
|
|||
if (mod.finish_record_pos == null) return;
|
||||
StringBuilder t = new StringBuilder();
|
||||
for (int i = 0; i < mod.record.size(); i++) {
|
||||
t.append(mod.record.get(i).toText());
|
||||
t.append(mod.record.get(i).serialize());
|
||||
t.append("\n");
|
||||
}
|
||||
t.append(mod.start_record_pos.getX()+"n"+
|
||||
|
|
@ -134,33 +130,43 @@ public class RepeatingScreen extends Screen {
|
|||
|
||||
File p = new File(FabricLoader.getInstance().getGameDir().toFile(),"repeating");
|
||||
if (!p.exists()) p.mkdir();
|
||||
File file = new File(p,"import.txt");
|
||||
|
||||
try {
|
||||
if (!file.exists()) {
|
||||
file.createNewFile();
|
||||
Runtime.getRuntime().exec("explorer /select,\""+file.getAbsolutePath()+"\"");
|
||||
return;
|
||||
JFileChooser fc = new JFileChooser() {
|
||||
@Override
|
||||
protected JDialog createDialog(Component parent) throws HeadlessException {
|
||||
JDialog dialog = super.createDialog(parent);
|
||||
dialog.setLocationByPlatform(true);
|
||||
dialog.setAlwaysOnTop(true);
|
||||
return dialog;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
int retValue = fc.showOpenDialog(null);
|
||||
if (retValue == JFileChooser.APPROVE_OPTION){
|
||||
File file = fc.getSelectedFile();
|
||||
try {
|
||||
String t = Files.readString(file.toPath());
|
||||
List<String> ss = List.of(t.split("\n"));
|
||||
String ls = ss.get(ss.size()-1);
|
||||
ss = ss.subList(0,ss.size()-1);
|
||||
for (String s:ss)
|
||||
mod.record.add(RecordEvent.deserialize(s));
|
||||
String[] lss0 = ls.split("x");
|
||||
String[] lss1 = lss0[0].split("n");
|
||||
String[] lss2 = lss0[1].split("n");
|
||||
mod.start_record_pos = new Vec3d(
|
||||
Float.parseFloat(lss1[0]),
|
||||
Float.parseFloat(lss1[1]),
|
||||
Float.parseFloat(lss1[2]));
|
||||
mod.finish_record_pos = new Vec3d(
|
||||
Float.parseFloat(lss2[0]),
|
||||
Float.parseFloat(lss2[1]),
|
||||
Float.parseFloat(lss2[2]));
|
||||
RepeatingMod.sendMessage(Text.literal(""));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
String t = Files.readString(file.toPath());
|
||||
List<String> ss = List.of(t.split("\n"));
|
||||
String ls = ss.get(ss.size()-1);
|
||||
ss = ss.subList(0,ss.size()-1);
|
||||
for (String s:ss)
|
||||
mod.record.add(RepeatingMod.RecordEvent.fromText(s));
|
||||
String[] lss0 = ls.split("x");
|
||||
String[] lss1 = lss0[0].split("n");
|
||||
String[] lss2 = lss0[1].split("n");
|
||||
mod.start_record_pos = new Vec3d(
|
||||
Float.parseFloat(lss1[0]),
|
||||
Float.parseFloat(lss1[1]),
|
||||
Float.parseFloat(lss1[2]));
|
||||
mod.finish_record_pos = new Vec3d(
|
||||
Float.parseFloat(lss2[0]),
|
||||
Float.parseFloat(lss2[1]),
|
||||
Float.parseFloat(lss2[2]));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
})
|
||||
.dimensions(width / 2 - 60, height / 2 + 12, 120, 20)
|
||||
|
|
@ -171,21 +177,21 @@ public class RepeatingScreen extends Screen {
|
|||
width / 2 - 60, height / 2 + 34, 120, 20,
|
||||
(mod.record_pos_delay < 0) ? Text.translatable("text.repeating-mod.nan_pos_delay") :
|
||||
Text.translatable("text.repeating-mod.pos_delay", String.valueOf(mod.record_pos_delay)),
|
||||
(mod.record_pos_delay/10d+1d)/101d) {
|
||||
(mod.record_pos_delay+1d)/101d) {
|
||||
|
||||
@Override
|
||||
protected void updateMessage() {
|
||||
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*10))));
|
||||
else setMessage(Text.translatable("text.repeating-mod.pos_delay", String.valueOf((long) v)));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyValue() {
|
||||
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*10))));
|
||||
mod.record_pos_delay = (long) (v*10);
|
||||
else setMessage(Text.translatable("text.repeating-mod.pos_delay", String.valueOf((long) v)));
|
||||
mod.record_pos_delay = (long) v;
|
||||
mod.conf.data.put("record_pos_delay",String.valueOf(mod.record_pos_delay));
|
||||
mod.conf.save();
|
||||
}
|
||||
|
|
@ -220,152 +226,5 @@ public class RepeatingScreen extends Screen {
|
|||
addDrawableChild(export_btn);
|
||||
addDrawableChild(import_btn);
|
||||
addDrawableChild(pos_delay_slider);
|
||||
|
||||
|
||||
// rootComponent
|
||||
// .surface(Surface.VANILLA_TRANSLUCENT)
|
||||
// .horizontalAlignment(HorizontalAlignment.CENTER)
|
||||
// .verticalAlignment(VerticalAlignment.CENTER);
|
||||
//
|
||||
// replay_btn = (ButtonComponent) Components.button(Text.of("replay"),
|
||||
// (ButtonComponent btn) -> {
|
||||
// if (!mod.is_recording) {
|
||||
// if (mod.is_replaying)
|
||||
// mod.stopReplay();
|
||||
// else mod.startReplay();
|
||||
// update_btns();
|
||||
// }
|
||||
// }).margins(Insets.of(1)).sizing(
|
||||
// Sizing.fixed(98),Sizing.fixed(20));
|
||||
//
|
||||
// loop_btn = (ButtonComponent) Components.button(Text.of(""),
|
||||
// (ButtonComponent btn) -> {
|
||||
// mod.loop_replay = !mod.loop_replay;
|
||||
// update_btns();
|
||||
// }).margins(Insets.of(1))
|
||||
// .sizing(Sizing.fixed(20),Sizing.fixed(20));
|
||||
//
|
||||
// record_btn = (ButtonComponent) Components.button(Text.of("record"),
|
||||
// (ButtonComponent btn) -> {
|
||||
// if (!mod.is_replaying) {
|
||||
// if (mod.is_recording)
|
||||
// mod.stopRecording();
|
||||
// else mod.startRecording();
|
||||
// update_btns();
|
||||
// }
|
||||
// }).margins(Insets.of(1)).sizing(
|
||||
// Sizing.fixed(120),Sizing.fixed(20));
|
||||
// was_build = true;
|
||||
//
|
||||
// rootComponent.child(
|
||||
// Containers.horizontalFlow(Sizing.content(), Sizing.content()).child(
|
||||
// Containers.verticalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(Containers.verticalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(Components.label(Text.translatable("text.repeating-mod.basic")).margins(Insets.of(1)))
|
||||
// .padding(Insets.of(5))
|
||||
// .surface(Surface.DARK_PANEL)
|
||||
// .verticalAlignment(VerticalAlignment.CENTER)
|
||||
// .horizontalAlignment(HorizontalAlignment.CENTER)
|
||||
// .margins(Insets.of(1)))
|
||||
// .child(Containers.verticalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(Containers.horizontalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(replay_btn).child(loop_btn))
|
||||
// .child(record_btn)
|
||||
// .child(Components.button(Text.translatable(
|
||||
// "text.repeating-mod.export"),
|
||||
// (ButtonComponent btn) -> {
|
||||
// String t = "";
|
||||
// for (int i = 0; i < mod.record.size(); i++) {
|
||||
// t += mod.record.get(i).toText();
|
||||
// if (i != mod.record.size()-1)
|
||||
// t += "\n";
|
||||
// }
|
||||
//
|
||||
// File p = new File(FabricLoader.getInstance().getGameDir().toFile(),"repeating");
|
||||
// if (!p.exists()) p.mkdir();
|
||||
// File file = new File(p,"export.txt");
|
||||
//
|
||||
// try {
|
||||
// if (!file.exists()) file.createNewFile();
|
||||
// Files.write(file.toPath(), t.getBytes());
|
||||
// Runtime.getRuntime().exec("explorer /select,\""+file.getAbsolutePath()+"\"");
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
// }).margins(Insets.of(10,1,1,1)).sizing(
|
||||
// Sizing.fixed(120),Sizing.fixed(20)))
|
||||
// .child(Components.button(Text.translatable(
|
||||
// "text.repeating-mod.import"),
|
||||
// (ButtonComponent btn) -> {
|
||||
// mod.record.clear();
|
||||
//
|
||||
// File p = new File(FabricLoader.getInstance().getGameDir().toFile(),"repeating");
|
||||
// if (!p.exists()) p.mkdir();
|
||||
// File file = new File(p,"import.txt");
|
||||
//
|
||||
// try {
|
||||
// if (!file.exists()) {
|
||||
// file.createNewFile();
|
||||
// Runtime.getRuntime().exec("explorer /select,\""+file.getAbsolutePath()+"\"");
|
||||
// return;
|
||||
// }
|
||||
// String t = Files.readString(file.toPath());
|
||||
// for (String s:t.split("\n"))
|
||||
// mod.record.add(RepeatingMod.RecordEvent.fromText(s));
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
// }).margins(Insets.of(1)).sizing(
|
||||
// Sizing.fixed(120),Sizing.fixed(20)))
|
||||
// .padding(Insets.of(10))
|
||||
// .surface(Surface.DARK_PANEL)
|
||||
// .verticalAlignment(VerticalAlignment.CENTER)
|
||||
// .horizontalAlignment(HorizontalAlignment.CENTER)
|
||||
// .margins(Insets.of(1)))
|
||||
// /*).child(
|
||||
// Containers.verticalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(Containers.verticalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(Components.label(Text.translatable("text.repeating-mod.parkour")).margins(Insets.of(1)))
|
||||
// .padding(Insets.of(5))
|
||||
// .surface(Surface.DARK_PANEL)
|
||||
// .verticalAlignment(VerticalAlignment.CENTER)
|
||||
// .horizontalAlignment(HorizontalAlignment.CENTER)
|
||||
// .margins(Insets.of(1)))
|
||||
// .child(Containers.verticalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(Components.label(Text.translatable("text.repeating-mod.dev")).margins(Insets.of(1)))
|
||||
// .padding(Insets.of(10))
|
||||
// .surface(Surface.DARK_PANEL)
|
||||
// .verticalAlignment(VerticalAlignment.CENTER)
|
||||
// .horizontalAlignment(HorizontalAlignment.CENTER)
|
||||
// .margins(Insets.of(1)))*/
|
||||
// ).child(
|
||||
// Containers.verticalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(Containers.verticalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(Components.label(Text.translatable("text.repeating-mod.settings")).margins(Insets.of(1)))
|
||||
// .padding(Insets.of(5))
|
||||
// .surface(Surface.DARK_PANEL)
|
||||
// .verticalAlignment(VerticalAlignment.CENTER)
|
||||
// .horizontalAlignment(HorizontalAlignment.CENTER)
|
||||
// .margins(Insets.of(1)))
|
||||
// .child(Containers.verticalFlow(Sizing.content(), Sizing.content())
|
||||
// .child(Components.discreteSlider(Sizing.fixed(120),-20,100)
|
||||
// .setFromDiscreteValue(mod.record_pos_delay)
|
||||
// .message((String s)->{
|
||||
// mod.record_pos_delay = Long.parseLong(s);
|
||||
// mod.conf.data.put("record_pos_delay",String.valueOf(mod.record_pos_delay));
|
||||
// mod.conf.save();
|
||||
// if (mod.record_pos_delay > -1)
|
||||
// return Text.translatable("text.repeating-mod.pos_delay", s);
|
||||
// return Text.translatable("text.repeating-mod.nan_pos_delay");
|
||||
// }).scrollStep(25)
|
||||
// .margins(Insets.of(1))
|
||||
// .tooltip(Text.translatable("text.repeating-mod.pos_delay_text")))
|
||||
// .padding(Insets.of(10))
|
||||
// .surface(Surface.DARK_PANEL)
|
||||
// .verticalAlignment(VerticalAlignment.CENTER)
|
||||
// .horizontalAlignment(HorizontalAlignment.CENTER)
|
||||
// .margins(Insets.of(1)))
|
||||
// ));
|
||||
update_btns();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue