Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2026-01-04 15:31:43 +00:00
Code Issues Releases Activity

Add final to sakura classes and methods

Browse Source
This commit is contained in:
Samsuik
2024-02-20 15:55:00 +00:00
parent 26b3945f65
commit f089cdd10b
12 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0017-Store-Entity-Data-State.patch
View File

@@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..c579b375994652f2331a454210986bcc
+
+}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7e2a9c3b356e2ac46c1a0badb82c444def901045..1bd5db8e0919d126d18e250bb1cb35cb96d63f5c 100644
index 7e2a9c3b356e2ac46c1a0badb82c444def901045..6b073e87fb6ebd7edd45dbe297ae6a3f00f1f718 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -547,6 +547,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -58,23 +58,23 @@ index 7e2a9c3b356e2ac46c1a0badb82c444def901045..1bd5db8e0919d126d18e250bb1cb35cb
+ // Sakura start - entity state (from start of tick)
+ private @Nullable me.samsuik.sakura.entity.EntityState entityState = null;
+
+ public Vec3 stuckSpeedMultiplier() {
+ public final Vec3 stuckSpeedMultiplier() {
+ return stuckSpeedMultiplier;
+ }
+
+ public void storeEntityState() {
+ public final void storeEntityState() {
+ entityState = me.samsuik.sakura.entity.EntityState.of(this);
+ }
+
+ public @Nullable me.samsuik.sakura.entity.EntityState entityState() {
+ public final @Nullable me.samsuik.sakura.entity.EntityState entityState() {
+ return entityState;
+ }
+
+ public boolean compareState(Entity to) {
+ public final boolean compareState(Entity to) {
+ return to.entityState() != null && to.entityState().isCurrentState(this);
+ }
+
+ public long getPackedOrigin() {
+ public final long getPackedOrigin() {
+ var v = getOriginVector();
+ if (v == null) return Long.MIN_VALUE;
+ // Note: vector#getBlockN may not be 100% exact
@@ -87,7 +87,7 @@ index 7e2a9c3b356e2ac46c1a0badb82c444def901045..1bd5db8e0919d126d18e250bb1cb35cb
public Entity(EntityType<?> type, Level world) {
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 303c4a47b275e6c53a809c65482ad66734945622..aacb2bb7218eb486f8a76ce586de00225683b4ca 100644
index 7b60000ff3d6e359229d6bacfa0e6e0141d91838..2adba71265af5e9deb900414c1f52e91b02921c1 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -939,6 +939,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {