Skip to content

Several tweaks for brainsweep sacrifice entity display #1023

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

Open
YukkuriC wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Several tweaks for brainsweep sacrifice entity display #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22f751e
loop example entity each second for more JEI info
YukkuriC Apr 2, 2026
670a426
add by-type cache layer to prevent JEI entity vibrating each frame
YukkuriC Apr 2, 2026
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
13 changes: 11 additions & 2 deletions ...java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/BrainsweepeeIngredient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
import net.minecraft.util.GsonHelper;
import net.minecraft.util.StringRepresentable;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.Level;
import org.jetbrains.annotations.Nullable;

import java.util.List;
import java.util.Locale;
import java.util.*;

// Partially based on:
// https://github.com/SlimeKnights/Mantle/blob/1.18.2/src/main/java/slimeknights/mantle/recipe/ingredient/EntityIngredient.java
Expand Down Expand Up @@ -83,4 +83,13 @@ public static Component getModNameComponent(String namespace) {
String mod = IXplatAbstractions.INSTANCE.getModName(namespace);
return Component.literal(mod).withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC);
}

private static Map<EntityType<?>, Entity> cachedExampleEntity = new HashMap<>();
protected static Entity getCachedExampleEntity(EntityType<?> type, Level level) {
// don't cache for server levels (if any) to prevent wrong side
if (!level.isClientSide) {
return type.create(level);
}
return cachedExampleEntity.computeIfAbsent(type, t -> t.create(level));
}
}
11 changes: 7 additions & 4 deletions ...in/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/EntityTagIngredient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,13 @@ public List<Component> getTooltip(boolean advanced) {

@Override
public Entity exampleEntity(Level level) {
var someEntityTys = BuiltInRegistries.ENTITY_TYPE.getTagOrEmpty(this.entityTypeTag).iterator();
if (someEntityTys.hasNext()) {
var someTy = someEntityTys.next();
return someTy.value().create(level);
var someEntityTysHolder = BuiltInRegistries.ENTITY_TYPE.getTag(this.entityTypeTag);
if (someEntityTysHolder.isEmpty()) return null;
var someEntityTys = someEntityTysHolder.get();
if (someEntityTys.size() > 0) {
long seconds = System.currentTimeMillis();
var someTy = someEntityTys.get((int) (seconds % someEntityTys.size()));
return getCachedExampleEntity(someTy.value(), level);
} else {
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/EntityTypeIngredient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public List<Component> getTooltip(boolean advanced) {

@Override
public Entity exampleEntity(Level level) {
return this.entityType.create(level);
return getCachedExampleEntity(this.entityType, level);
}

@Override
Expand Down
Loading