1.0.6 update

removed owo lib
fixed some bugs
This commit is contained in:
MeexReay 2023-10-20 16:46:07 +03:00
parent 1ad16e6343
commit e593859723
19 changed files with 990 additions and 199 deletions

View file

@ -1,192 +1,371 @@
package themixray.repeating.mod;
import io.wispforest.owo.ui.base.*;
import io.wispforest.owo.ui.component.*;
import io.wispforest.owo.ui.container.*;
import io.wispforest.owo.ui.container.FlowLayout;
import io.wispforest.owo.ui.core.*;
import io.wispforest.owo.ui.core.Insets;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.loader.api.FabricLoader;
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 org.jetbrains.annotations.NotNull;
import net.minecraft.util.math.Vec3d;
import java.io.*;
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;
public class RepeatingScreen extends BaseOwoScreen<FlowLayout> {
public RepeatingMod mod;
public ButtonComponent replay_btn;
public ButtonComponent record_btn;
public ButtonComponent loop_btn;
public boolean was_build = false;
public RepeatingScreen() {
@Environment(EnvType.CLIENT)
public class RepeatingScreen extends Screen {
protected RepeatingScreen() {
super(Text.literal(""));
this.mod = RepeatingMod.me;
}
@Override
protected @NotNull OwoUIAdapter<FlowLayout> createAdapter() {
return OwoUIAdapter.create(this, Containers::horizontalFlow);
}
public RepeatingMod mod;
public ButtonWidget record_btn;
public ButtonWidget replay_btn;
public ButtonWidget loop_btn;
public ButtonWidget export_btn;
public ButtonWidget import_btn;
public SliderWidget pos_delay_slider;
public boolean was_build = false;
public void update_btns() {
if (was_build) {
replay_btn.setMessage(Text.translatable("text.repeating-mod." +
((mod.is_replaying) ? "stop" : "start")).append(" ")
.append(Text.translatable("text.repeating-mod.replay")));
((mod.is_replaying) ? "stop_replay" : "start_replay")));
record_btn.setMessage(Text.translatable("text.repeating-mod." +
((mod.is_recording) ? "stop" : "start")).append(" ")
.append(Text.translatable("text.repeating-mod.record")));
((mod.is_recording) ? "stop_record" : "start_record")));
loop_btn.setMessage(Text.of(((mod.loop_replay) ? "\uefff " : "\ueffe ")));
}
}
@Override
protected void build(FlowLayout rootComponent) {
rootComponent
.surface(Surface.VANILLA_TRANSLUCENT)
.horizontalAlignment(HorizontalAlignment.CENTER)
.verticalAlignment(VerticalAlignment.CENTER);
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
renderBackground(context);
// context.drawCenteredTextWithShadow(textRenderer,
// Text.literal("You must see me"),
// width / 2, height / 2,
// Color.white.getRGB());
super.render(context, mouseX, mouseY, delta);
}
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) -> {
@Override
protected void init() {
record_btn = ButtonWidget.builder(
Text.translatable("text.repeating-mod.start_record"), button -> {
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));
})
.dimensions(width / 2 - 60, height / 2 - 54, 120, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.record_tooltip")))
.build();
replay_btn = ButtonWidget.builder(
Text.translatable("text.repeating-mod.start_replay"), button -> {
if (!mod.is_recording) {
if (mod.is_replaying)
mod.stopReplay();
else mod.startReplay();
update_btns();
}
})
.dimensions(width / 2 - 60, height / 2 - 32, 98, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.replay_tooltip")))
.build();
loop_btn = ButtonWidget.builder(Text.of(""), button -> {
mod.loop_replay = !mod.loop_replay;
update_btns();
})
.dimensions(width / 2 + 40, height / 2 - 32, 20, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.loop_tooltip")))
.build();
export_btn = ButtonWidget.builder(
Text.translatable("text.repeating-mod.export"), button -> {
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("\n");
}
t.append(mod.start_record_pos.getX()+"n"+
mod.start_record_pos.getY()+"n"+
mod.start_record_pos.getZ()+"x"+
mod.finish_record_pos.getX()+"n"+
mod.finish_record_pos.getY()+"n"+
mod.finish_record_pos.getZ());
File p = new File(FabricLoader.getInstance().getGameDir().toFile(),"repeating");
if (!p.exists()) p.mkdir();
File file = new File(p,"export_"+
new SimpleDateFormat("MM_dd_yyyy").format(new Date())
+"_"+RepeatingMod.rand.nextInt(10)+".txt");
try {
if (!file.exists()) file.createNewFile();
Files.write(file.toPath(), t.toString().getBytes());
Runtime.getRuntime().exec("explorer /select,\""+file.getAbsolutePath()+"\"");
} catch (Exception e) {
e.printStackTrace();
}
})
.dimensions(width / 2 - 60, height / 2 - 10, 120, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.export_tooltip")))
.build();
import_btn = ButtonWidget.builder(
Text.translatable("text.repeating-mod.import"), button -> {
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());
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)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.import_tooltip")))
.build();
pos_delay_slider = new SliderWidget(
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) {
@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))));
}
@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);
mod.conf.data.put("record_pos_delay",String.valueOf(mod.record_pos_delay));
mod.conf.save();
}
@Override
public void onRelease(double mouseX, double mouseY) {
super.onRelease(mouseX, mouseY);
applyValue();
}
@Override
protected void onDrag(double mouseX, double mouseY, double deltaX, double deltaY) {
super.onDrag(mouseX, mouseY, deltaX, deltaY);
applyValue();
}
@Override
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
super.render(context, mouseX, mouseY, delta);
updateMessage();
}
};
pos_delay_slider.setTooltip(Tooltip.of(Text.translatable("text.repeating-mod.pos_delay_tooltip")));
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";
}
update_btns();
File p = new File(FabricLoader.getInstance().getGameDir().toFile(),"repeating");
if (!p.exists()) p.mkdir();
File file = new File(p,"export.txt");
addDrawableChild(replay_btn);
addDrawableChild(loop_btn);
addDrawableChild(record_btn);
addDrawableChild(export_btn);
addDrawableChild(import_btn);
addDrawableChild(pos_delay_slider);
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)))
));
// 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();
}
}