Skip to content

[1.20.1] Backport HighlightHandler memory optimization #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThatGravyBoat merged 1 commit into from
May 3, 2025
Merged

[1.20.1] Backport HighlightHandler memory optimization #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 68 additions & 4 deletions .../src/main/java/com/teamresourceful/resourcefullib/client/highlights/HighlightHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.serialization.Codec;
import com.mojang.serialization.JsonOps;
import com.teamresourceful.resourcefullib.client.CloseablePoseStack;
import com.teamresourceful.resourcefullib.client.highlights.base.Highlight;
import com.teamresourceful.resourcefullib.client.highlights.base.HighlightLine;
import com.teamresourceful.resourcefullib.client.highlights.base.Highlightable;
import com.teamresourceful.resourcefullib.client.highlights.state.HighlightStates;
import com.teamresourceful.resourcefullib.common.color.Color;
import it.unimi.dsi.fastutil.objects.Reference2ReferenceMap;
import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
Expand All @@ -25,10 +30,14 @@

public class HighlightHandler extends SimpleJsonResourceReloadListener {

private static final Map<BlockState, Highlight> STATE_CACHE = new HashMap<>();
private static final Reference2ReferenceMap<BlockState, float[]> STATE_CACHE = new Reference2ReferenceOpenHashMap<>();
private static final Map<ResourceLocation, Highlight> BOX_CACHE = new HashMap<>();

public static final Codec<Highlight> HIGHLIGHT_CODEC = ResourceLocation.CODEC.xmap(HighlightHandler::getOrThrow, Highlight::id);
private static float red = 0f;
private static float green = 0f;
private static float blue = 0f;
private static float alpha = 0.4f;

public HighlightHandler() {
super(new Gson(), "resourcefullib/highlights");
Expand All @@ -45,10 +54,34 @@ protected void apply(@NotNull Map<ResourceLocation, JsonElement> jsons, @NotNull

highlights.forEach((key, value) -> Highlight.codec(key).parse(JsonOps.INSTANCE, value).result().ifPresent(box -> BOX_CACHE.put(key, box)));

Map<Highlight, float[]> cache = new HashMap<>();

blocks.forEach((key, value) -> BuiltInRegistries.BLOCK.getOptional(key)
.flatMap(block -> HighlightStates.codec(block).parse(JsonOps.INSTANCE, value).result())
.ifPresent(variants -> variants.states().forEach((states, box) -> states.forEach(state -> STATE_CACHE.put(state, box))))
.flatMap(block -> HighlightStates.codec(block).parse(JsonOps.INSTANCE, value).result())
.ifPresent(variants -> variants.states().forEach((states, box) -> states.forEach(state -> {
if (cache.containsKey(box)) {
STATE_CACHE.put(state, cache.get(box));
} else {
float[] lines = new float[box.lines().size() * 9];
int i = 0;
for (HighlightLine line : box.lines()) {
lines[i++] = line.start().x();
lines[i++] = line.start().y();
lines[i++] = line.start().z();
lines[i++] = line.end().x();
lines[i++] = line.end().y();
lines[i++] = line.end().z();
lines[i++] = line.normal().x();
lines[i++] = line.normal().y();
lines[i++] = line.normal().z();
}
STATE_CACHE.put(state, lines);
cache.put(box, lines);
}
})))
);

BOX_CACHE.clear();
}

public static boolean onBlockHighlight(Vec3 cameraPos, Entity cameraEntity, PoseStack stack, BlockPos blockPos, BlockState state, VertexConsumer consumer) {
Expand All @@ -60,7 +93,30 @@ public static boolean onBlockHighlight(Vec3 cameraPos, Entity cameraEntity, Pose
}
}
if (STATE_CACHE.containsKey(state)) {
STATE_CACHE.get(state).render(consumer, stack, cameraPos, state.getOffset(cameraEntity.level(), blockPos), blockPos);
Vec3 offset = state.getOffset(cameraEntity.level(), blockPos);
try (var ignored = new CloseablePoseStack(stack)) {
float x = (float) (blockPos.getX() - cameraPos.x());
float y = (float) (blockPos.getY() - cameraPos.y());
float z = (float) (blockPos.getZ() - cameraPos.z());
x += (float) offset.x();
y += (float) offset.y();
z += (float) offset.z();

float[] lines = STATE_CACHE.get(state);
if (lines.length % 9 != 0) return false;

for (int i = 0; i < lines.length; i += 9) {
HighlightLine.render(
stack, consumer,
red, green, blue, alpha,
x, y, z,
lines[i], lines[i + 1], lines[i + 2],
lines[i + 3], lines[i + 4], lines[i + 5],
lines[i + 6], lines[i + 7], lines[i + 8]
);
}
}

return true;
}
return false;
Expand All @@ -71,4 +127,12 @@ private static Highlight getOrThrow(ResourceLocation id) {
if (highlight == null) throw new RuntimeException("No highlight with the id '" + id + "' was found!");
return highlight;
}

public static void setColor(int value) {
Color color = new Color(value);
red = color.getFloatRed();
green = color.getFloatGreen();
blue = color.getFloatBlue();
alpha = color.getFloatAlpha();
}
}
23 changes: 20 additions & 3 deletions ...rc/main/java/com/teamresourceful/resourcefullib/client/highlights/base/HighlightLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,27 @@ public void recalculateNormal() {
}

public void render(PoseStack poseStack, VertexConsumer consumer, float x, float y, float z) {
PoseStack.Pose last = poseStack.last();
render(
poseStack, consumer,
0f, 0f, 0f, 0.4f,
x, y, z,
start.x(), start.y(), start.z(),
end.x(), end.y(), end.z(),
normal.x(), normal.y(), normal.z()
);
}

consumer.vertex(last.pose(), x+start.x(), y+start.y(), z+start.z()).color(0f, 0f, 0f, 0.4f).normal(last.normal(), normal.x(), normal.y(), normal.z()).endVertex();
consumer.vertex(last.pose(), x+end.x(), y+end.y(), z+end.z()).color(0f, 0f, 0f, 0.4f).normal(last.normal(), normal.x(), normal.y(), normal.z()).endVertex();
public static void render(
PoseStack stack, VertexConsumer consumer,
float r, float g, float b, float a,
float x, float y, float z,
float x1, float y1, float z1,
float x2, float y2, float z2,
float normalX, float normalY, float normalZ
) {
PoseStack.Pose last = stack.last();
consumer.vertex(last.pose(), x + x1, y + y1, z + z1).color(r, g, b, a).normal(last.normal(), normalX, normalY, normalZ).endVertex();
consumer.vertex(last.pose(), x + x2, y + y2, z + z2).color(r, g, b, a).normal(last.normal(), normalX, normalY, normalZ).endVertex();
}

private static Vector3f normal(Vector3f start, Vector3f end) {
Expand Down
Loading