Skip to content

Commit d09abf5

Browse files
committed
Fix entity counting when EntityCulling is not installed
1 parent f243ae3 commit d09abf5

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/client/java/io/github/discusser/toomanyentities/mixin/client/CommonWorldRendererMixin.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ private void beforeEntityRender(CallbackInfo info, @Local(argsOnly = true) Entit
2222
info.cancel();
2323
}
2424
}
25+
26+
@Inject(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/WorldRenderer;regularEntityCount:I", ordinal = 0))
27+
private void afterEntityCountReset(CallbackInfo info) {
28+
TooManyEntitiesClient.entityCounts.clear();
29+
}
2530
}

src/client/java/io/github/discusser/toomanyentities/mixin/client/EntityCullingWorldRendererMixin.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,4 @@ private void afterEntityCountIncrement(CallbackInfo info, @Local Entity entity)
3131
TooManyEntitiesClient.entityCounts.put(key, TooManyEntitiesClient.entityCounts.getOrDefault(key, 0) + 1);
3232
}
3333
}
34-
35-
@Inject(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/WorldRenderer;regularEntityCount:I", ordinal = 0))
36-
private void afterEntityCountReset(CallbackInfo info) {
37-
TooManyEntitiesClient.entityCounts.clear();
38-
}
3934
}

src/client/java/io/github/discusser/toomanyentities/mixin/client/WorldRendererMixin.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,24 @@
22

33
import com.llamalad7.mixinextras.sugar.Local;
44
import io.github.discusser.toomanyentities.TooManyEntitiesClient;
5+
import net.minecraft.client.MinecraftClient;
56
import net.minecraft.client.render.WorldRenderer;
67
import net.minecraft.entity.Entity;
78
import org.spongepowered.asm.mixin.Mixin;
9+
import org.spongepowered.asm.mixin.Shadow;
810
import org.spongepowered.asm.mixin.injection.At;
911
import org.spongepowered.asm.mixin.injection.Inject;
1012
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1113

1214
@Mixin(WorldRenderer.class)
1315
public class WorldRendererMixin {
16+
@Shadow
17+
private int regularEntityCount;
18+
1419
@Inject(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/WorldRenderer;regularEntityCount:I", ordinal = 1, shift = At.Shift.AFTER))
1520
private void afterEntityCountIncrement(CallbackInfo info, @Local Entity entity) {
1621
String key = entity.getType().getTranslationKey();
22+
System.out.println(regularEntityCount + "\t and \t" + TooManyEntitiesClient.entityCounts.get("entity.minecraft.chicken"));
1723
TooManyEntitiesClient.entityCounts.put(key, TooManyEntitiesClient.entityCounts.getOrDefault(key, 0) + 1);
1824
}
1925
}

0 commit comments

Comments
 (0)