MeexReay/repeating_mod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port to 1.21.2, MOVEMENTS ARE BROKEN
All checks were successful
Build fabric mod / build (push) Successful in 35m46s
Details

Browse Source
This commit is contained in:
MeexReay 2025-06-14 23:46:18 +03:00
parent 9d7ac6b213
commit 412c3f47ab
5 changed files with 131 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle.properties
View File

@ -4,16 +4,16 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.21 minecraft_version=1.21.2
yarn_mappings=1.21+build.9 yarn_mappings=1.21.2+build.1
loader_version=0.16.14 loader_version=0.16.14
loom_version=1.10-SNAPSHOT loom_version=1.10-SNAPSHOT
# Fabric API # Fabric API
fabric_version=0.102.0+1.21 fabric_version=0.106.1+1.21.2
# Mod Properties # Mod Properties
mod_version = 1.1.2+1.21 mod_version = 1.1.2+1.21.2
maven_group = ru.themixray maven_group = ru.themixray
archives_base_name = repeating-mod archives_base_name = repeating-mod

54
src/main/java/ru/themixray/repeating_mod/Main.java
View File

@ -209,46 +209,14 @@ public class Main implements ClientModInitializer {
return; return;
} }
InputEvent l = ((InputEvent) now_record.getLastEvent("input")); InputEvent curr = InputEvent.current();
if (l == null) { if (curr == null) return;
InputEvent e = new InputEvent(
client.player.input.sneaking,
client.player.input.jumping,
client.player.input.movementSideways,
client.player.input.movementForward,
client.player.input.pressingForward,
client.player.input.pressingBack,
client.player.input.pressingLeft,
client.player.input.pressingRight,
client.player.getHeadYaw(),
client.player.getBodyYaw(),
client.player.getPitch(),
client.player.isSprinting(),
client.player.getYaw(),
client.player.getMovementSpeed());
recordTick(e);
} else {
InputEvent e = new InputEvent(
((Boolean) client.player.input.sneaking == l.sneaking) ? null : client.player.input.sneaking,
((Boolean) client.player.input.jumping == l.jumping) ? null : client.player.input.jumping,
(((Float) client.player.input.movementSideways).equals(l.movementSideways)) ? null : client.player.input.movementSideways,
(((Float) client.player.input.movementForward).equals(l.movementForward)) ? null : client.player.input.movementForward,
((Boolean) client.player.input.pressingForward == l.pressingForward) ? null : client.player.input.pressingForward,
((Boolean) client.player.input.pressingBack == l.pressingBack) ? null : client.player.input.pressingBack,
((Boolean) client.player.input.pressingLeft == l.pressingLeft) ? null : client.player.input.pressingLeft,
((Boolean) client.player.input.pressingRight == l.pressingRight) ? null : client.player.input.pressingRight,
client.player.getHeadYaw(), Main.client.player.getBodyYaw(),client.player.getPitch(),
((Boolean) client.player.isSprinting() == l.sprinting) ? null : client.player.isSprinting(),
client.player.getYaw(),client.player.getMovementSpeed());
if (!(e.isEmpty() && InputEvent last = ((InputEvent) now_record.getLastEvent("input"));
e.yaw == l.yaw && if (last == null) {
e.head_yaw == l.head_yaw && recordTick(curr);
e.pitch == l.pitch && } else if (!curr.equals(last)) {
e.body_yaw == l.body_yaw)) { recordTick(curr.differs(last));
e.fillEmpty(l);
recordTick(e);
}
} }
} }
@ -332,10 +300,10 @@ public class Main implements ClientModInitializer {
client.player.sendMessage(Text.literal("[") client.player.sendMessage(Text.literal("[")
.append(Text.translatable("text.repeating-mod.name")) .append(Text.translatable("text.repeating-mod.name"))
.append("] ").formatted(Formatting.BOLD,Formatting.DARK_GRAY) .append("] ").formatted(Formatting.BOLD,Formatting.DARK_GRAY)
.append(text.formatted(Formatting.RESET).formatted(Formatting.GRAY))); .append(text.formatted(Formatting.RESET).formatted(Formatting.GRAY)), false);
} }
public static void sendDebug(String s) { // public static void sendDebug(String s) {
client.player.sendMessage(Text.literal("[DEBUG] ").append(Text.of(s))); // client.player.sendMessage(Text.literal("[DEBUG] ").append(Text.of(s)), false);
} // }
} }

208
src/main/java/ru/themixray/repeating_mod/event/events/InputEvent.java
View File

@ -1,19 +1,17 @@
package ru.themixray.repeating_mod.event.events; package ru.themixray.repeating_mod.event.events;
import net.minecraft.util.PlayerInput;
import ru.themixray.repeating_mod.Main; import ru.themixray.repeating_mod.Main;
import ru.themixray.repeating_mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class InputEvent extends RecordEvent { public class InputEvent extends RecordEvent {
public Boolean sneaking; public Boolean forward;
public Boolean jumping; public Boolean backward;
public Boolean pressingForward; public Boolean left;
public Boolean pressingBack; public Boolean right;
public Boolean pressingLeft; public Boolean jump;
public Boolean pressingRight; public Boolean sneak;
public Boolean sprinting; public Boolean sprint;
public Float movementSideways;
public Float movementForward;
public float yaw; public float yaw;
public float head_yaw; public float head_yaw;
@ -21,94 +19,118 @@ public class InputEvent extends RecordEvent {
public float pitch; public float pitch;
public float speed; public float speed;
public InputEvent(Boolean sneaking, public static InputEvent current() {
Boolean jumping, if (Main.client.player == null) return null;
Float movementSideways, return new InputEvent(
Float movementForward, Main.client.player.input.playerInput.forward(),
Boolean pressingForward, Main.client.player.input.playerInput.backward(),
Boolean pressingBack, Main.client.player.input.playerInput.left(),
Boolean pressingLeft, Main.client.player.input.playerInput.right(),
Boolean pressingRight, Main.client.player.input.playerInput.jump(),
Main.client.player.input.playerInput.sneak(),
Main.client.player.input.playerInput.sprint(),
Main.client.player.getHeadYaw(),
Main.client.player.getBodyYaw(),
Main.client.player.getPitch(),
Main.client.player.getYaw(),
Main.client.player.getMovementSpeed()
);
}
public InputEvent(Boolean forward,
Boolean backward,
Boolean left,
Boolean right,
Boolean jump,
Boolean sneak,
Boolean sprint,
float head_yaw, float head_yaw,
float body_yaw, float body_yaw,
float head_pitch, float head_pitch,
Boolean sprinting,
float yaw, float yaw,
float speed) { float speed) {
this.sneaking = sneaking; this.forward = forward;
this.jumping = jumping; this.backward = backward;
this.movementSideways = movementSideways; this.left = left;
this.movementForward = movementForward; this.right = right;
this.pressingForward = pressingForward; this.jump = jump;
this.pressingBack = pressingBack; this.sneak = sneak;
this.pressingLeft = pressingLeft; this.sprint = sprint;
this.pressingRight = pressingRight;
this.head_yaw = head_yaw; this.head_yaw = head_yaw;
this.body_yaw = body_yaw; this.body_yaw = body_yaw;
this.pitch = head_pitch; this.pitch = head_pitch;
this.sprinting = sprinting;
this.yaw = yaw; this.yaw = yaw;
this.speed = speed; this.speed = speed;
} }
/**
* Returns differences of this InputEvent to the provided one, saving first booleans if differ and first floats always
*/
public InputEvent differs(InputEvent event) {
return new InputEvent(
forward == event.forward ? null : forward,
backward == event.backward ? null : backward,
left == event.left ? null : left,
right == event.right ? null : right,
jump == event.jump ? null : jump,
sneak == event.sneak ? null : sneak,
sprint == event.sprint ? null : sprint,
head_yaw,
body_yaw,
pitch,
yaw,
speed
);
}
public static InputEvent deserialize(String[] a) { public static InputEvent deserialize(String[] a) {
return new InputEvent( return new InputEvent(
(a[0].equals("n") ? null : a[0].equals("1")), (a[0].equals("n") ? null : a[0].equals("1")),
(a[1].equals("n") ? null : a[1].equals("1")), (a[1].equals("n") ? null : a[1].equals("1")),
(a[2].equals("n") ? null : Float.parseFloat(a[2])), (a[2].equals("n") ? null : a[2].equals("1")),
(a[3].equals("n") ? null : Float.parseFloat(a[3])), (a[3].equals("n") ? null : a[3].equals("1")),
(a[4].equals("n") ? null : a[4].equals("1")), (a[4].equals("n") ? null : a[4].equals("1")),
(a[5].equals("n") ? null : a[5].equals("1")), (a[5].equals("n") ? null : a[5].equals("1")),
(a[6].equals("n") ? null : a[6].equals("1")), (a[6].equals("n") ? null : a[6].equals("1")),
(a[7].equals("n") ? null : a[7].equals("1")), Float.parseFloat(a[7]),
Float.parseFloat(a[8]), Float.parseFloat(a[9]), Float.parseFloat(a[8]),
Float.parseFloat(a[10]), Float.parseFloat(a[9]),
(a[11].equals("n") ? null : a[11].equals("1")), Float.parseFloat(a[10]),
Float.parseFloat(a[12]), Float.parseFloat(a[11])
Float.parseFloat(a[13])); );
} }
protected String[] serializeArgs() { protected String[] serializeArgs() {
return new String[] { return new String[] {
((sneaking == null) ? "n" : (sneaking ? "1" : "0")), // sneaking ((forward == null) ? "n" : (forward ? "1" : "0")),
((jumping == null) ? "n" : (jumping ? "1" : "0")), // jumping ((backward == null) ? "n" : (backward ? "1" : "0")),
((movementSideways == null) ? "n" : String.valueOf(movementSideways)), // movement sideways ((left == null) ? "n" : (left ? "1" : "0")),
((movementForward == null) ? "n" : String.valueOf(movementForward)), // movement forward ((right == null) ? "n" : (right ? "1" : "0")),
((pressingForward == null) ? "n" : (pressingForward ? "1" : "0")), // pressing forward ((jump == null) ? "n" : (jump ? "1" : "0")),
((pressingBack == null) ? "n" : (pressingBack ? "1" : "0")), // pressing back ((sneak == null) ? "n" : (sneak ? "1" : "0")),
((pressingLeft == null) ? "n" : (pressingLeft ? "1" : "0")), // pressing left ((sprint == null) ? "n" : (sprint ? "1" : "0")),
((pressingRight == null) ? "n" : (pressingRight ? "1" : "0")), // pressing right String.valueOf(head_yaw),
String.valueOf(head_yaw), // head yaw String.valueOf(body_yaw),
String.valueOf(body_yaw), // body yaw String.valueOf(pitch),
String.valueOf(pitch), // pitch String.valueOf(yaw),
((sprinting == null) ? "n" : (sprinting ? "1" : "0")), // sprinting String.valueOf(speed),
String.valueOf(yaw), // yaw
String.valueOf(speed) // speed
}; };
} }
public void fillEmpty(InputEvent e) { public boolean equals(InputEvent event) {
if (sneaking == null) sneaking = e.sneaking; return event.forward == forward &&
if (jumping == null) jumping = e.jumping; event.backward == backward &&
if (movementSideways == null) movementSideways = e.movementSideways; event.sprint == sprint &&
if (movementForward == null) movementForward = e.movementForward; event.jump == jump &&
if (pressingForward == null) pressingForward = e.pressingForward; event.sneak == sneak &&
if (pressingBack == null) pressingBack = e.pressingBack; event.left == left &&
if (pressingLeft == null) pressingLeft = e.pressingLeft; event.right == right &&
if (pressingRight == null) pressingRight = e.pressingRight; event.speed == speed &&
if (sprinting == null) sprinting = e.sprinting; event.head_yaw == head_yaw &&
} event.body_yaw == body_yaw &&
event.yaw == yaw &&
public boolean isEmpty() { event.pitch == pitch;
return sneaking == null &&
jumping == null &&
movementSideways == null &&
movementForward == null &&
pressingForward == null &&
pressingBack == null &&
pressingLeft == null &&
pressingRight == null &&
sprinting == null;
} }
public void replay() { public void replay() {
@ -117,8 +139,8 @@ public class InputEvent extends RecordEvent {
public void inputCallback() { public void inputCallback() {
if (Main.client.player != null) { if (Main.client.player != null) {
if (sprinting != null && Main.client.player.isSprinting() != sprinting) if (sprint != null && Main.client.player.isSprinting() != sprint)
Main.client.player.setSprinting(sprinting); Main.client.player.setSprinting(sprint);
if (Main.client.player.getYaw() != yaw) if (Main.client.player.getYaw() != yaw)
Main.client.player.setYaw(yaw); Main.client.player.setYaw(yaw);
if (Main.client.player.getHeadYaw() != head_yaw) if (Main.client.player.getHeadYaw() != head_yaw)
@ -129,22 +151,18 @@ public class InputEvent extends RecordEvent {
Main.client.player.setPitch(pitch); Main.client.player.setPitch(pitch);
if (Main.client.player.getMovementSpeed() != speed) if (Main.client.player.getMovementSpeed() != speed)
Main.client.player.setMovementSpeed(speed); Main.client.player.setMovementSpeed(speed);
if (sneaking != null && Main.client.player.input.sneaking != sneaking)
Main.client.player.input.sneaking = sneaking; PlayerInput input = Main.client.player.input.playerInput;
if (jumping != null && Main.client.player.input.jumping != jumping)
Main.client.player.input.jumping = jumping; Main.client.player.input.playerInput = new PlayerInput(
if (movementSideways != null && Main.client.player.input.movementSideways != movementSideways) this.forward == null ? input.forward() : this.forward,
Main.client.player.input.movementSideways = movementSideways; this.backward == null ? input.backward() : this.backward,
if (movementForward != null && Main.client.player.input.movementForward != movementForward) this.left == null ? input.left() : this.left,
Main.client.player.input.movementForward = movementForward; this.right == null ? input.right() : this.right,
if (pressingForward != null && Main.client.player.input.pressingForward != pressingForward) this.jump == null ? input.jump() : this.jump,
Main.client.player.input.pressingForward = pressingForward; this.sneak == null ? input.sneak() : this.sneak,
if (pressingBack != null && Main.client.player.input.pressingBack != pressingBack) this.sprint == null ? input.sprint() : this.sprint
Main.client.player.input.pressingBack = pressingBack; );
if (pressingLeft != null && Main.client.player.input.pressingLeft != pressingLeft)
Main.client.player.input.pressingLeft = pressingLeft;
if (pressingRight != null && Main.client.player.input.pressingRight != pressingRight)
Main.client.player.input.pressingRight = pressingRight;
} }
} }
} }

4
src/main/java/ru/themixray/repeating_mod/mixin/EntityMixin.java
View File

@ -20,8 +20,8 @@ public abstract class EntityMixin {
if (getUuid().equals(Main.client.player.getUuid())) { if (getUuid().equals(Main.client.player.getUuid())) {
if (Main.me.is_replaying) { if (Main.me.is_replaying) {
if (Main.input_replay != null && if (Main.input_replay != null &&
Main.input_replay.sprinting != null && Main.input_replay.sprint != null &&
Main.input_replay.sprinting != sprinting) { Main.input_replay.sprint != sprinting) {
ci.cancel(); ci.cancel();
} }
} }

2
src/main/java/ru/themixray/repeating_mod/render/shader/ShaderManager.java
View File

@ -51,7 +51,7 @@ public class ShaderManager {
public String loadImport(boolean inline, String name) { public String loadImport(boolean inline, String name) {
return IOUtils.toString(resource.get().getInputStream(), StandardCharsets.UTF_8); return IOUtils.toString(resource.get().getInputStream(), StandardCharsets.UTF_8);
} }
}.readSource(readResourceAsString(resource.get().getInputStream()))); }.readSource(readResourceAsString(resource.get().getInputStream())).getFirst());
} else file_present = false; } else file_present = false;
glCompileShader(i); glCompileShader(i);
if (glGetShaderi(i, GL_COMPILE_STATUS) == 0 || !file_present) { if (glGetShaderi(i, GL_COMPILE_STATUS) == 0 || !file_present) {