Skip to content

Commit 6b9f37d

Browse files
OondanomalaOondanomala
committed
Rename EntityCullingModBase to EntityCullingMod
In a separate commit to make the diff readable
1 parent be8e6f2 commit 6b9f37d

File tree

6 files changed

+28
-31
lines changed

6 files changed

+28
-31
lines changed

‎src/main/java/dev/tr7zw/entityculling/CullTask.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.ConcurrentModificationException;
44
import java.util.Iterator;
5-
import java.util.Map.Entry;
65
import java.util.Set;
76

87
import com.logisticscraft.occlusionculling.OcclusionCullingInstance;
@@ -16,16 +15,15 @@
1615
import net.minecraft.util.AxisAlignedBB;
1716
import net.minecraft.util.BlockPos;
1817
import net.minecraft.util.Vec3;
19-
import net.minecraft.world.chunk.Chunk;
2018

2119
public class CullTask implements Runnable {
2220

2321
public boolean requestCull = false;
2422

2523
private final OcclusionCullingInstance culling;
2624
private final Minecraft client = Minecraft.getMinecraft();
27-
private final int sleepDelay = EntityCullingModBase.instance.config.sleepDelay;
28-
private final int hitboxLimit = EntityCullingModBase.instance.config.hitboxLimit;
25+
private final int sleepDelay = EntityCullingMod.instance.config.sleepDelay;
26+
private final int hitboxLimit = EntityCullingMod.instance.config.hitboxLimit;
2927
private final Set<String> unCullable;
3028
public long lastTime = 0;
3129

@@ -45,9 +43,9 @@ public void run() {
4543
try {
4644
Thread.sleep(sleepDelay);
4745

48-
if (EntityCullingModBase.enabled && client.theWorld != null && client.thePlayer != null && client.thePlayer.ticksExisted > 10 && client.getRenderViewEntity() != null) {
46+
if (EntityCullingMod.enabled && client.theWorld != null && client.thePlayer != null && client.thePlayer.ticksExisted > 10 && client.getRenderViewEntity() != null) {
4947
Vec3 cameraMC;
50-
if(EntityCullingModBase.instance.config.debugMode) {
48+
if(EntityCullingMod.instance.config.debugMode) {
5149
cameraMC = client.thePlayer.getPositionEyes(0);
5250
} else {
5351
cameraMC = getCameraPos();
@@ -105,7 +103,7 @@ public void run() {
105103
cullable.setCulled(false);
106104
continue;
107105
}
108-
if(entity.getPositionVector().squareDistanceTo(cameraMC) > EntityCullingModBase.instance.config.tracingDistance * EntityCullingModBase.instance.config.tracingDistance) {
106+
if(entity.getPositionVector().squareDistanceTo(cameraMC) > EntityCullingMod.instance.config.tracingDistance * EntityCullingMod.instance.config.tracingDistance) {
109107
cullable.setCulled(false); // If your entity view distance is larger than tracingDistance just render it
110108
continue;
111109
}
@@ -177,7 +175,7 @@ private Vec3 getCameraPos() {
177175
}
178176

179177
private boolean isSkippableArmorstand(Entity entity) {
180-
if(!EntityCullingModBase.instance.config.skipMarkerArmorStands)return false;
178+
if(!EntityCullingMod.instance.config.skipMarkerArmorStands)return false;
181179
return entity instanceof EntityArmorStand && ((EntityArmorStand) entity).hasMarker();
182180
}
183181
}

src/main/java/dev/tr7zw/entityculling/EntityCullingModBase.java renamed to src/main/java/dev/tr7zw/entityculling/EntityCullingMod.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.lwjgl.input.Keyboard;
2525

2626
@Mod(modid = "entityculling", name = "EntityCulling", version = "@VER@", clientSideOnly = true)
27-
public class EntityCullingModBase {
27+
public class EntityCullingMod {
2828

29-
public static EntityCullingModBase instance = new EntityCullingModBase();
29+
public static EntityCullingMod instance = new EntityCullingMod();
3030
public OcclusionCullingInstance culling;
3131
public boolean debugHitboxes = false;
3232
public static boolean enabled = true; // public static to make it faster for the jvm
@@ -47,7 +47,7 @@ public class EntityCullingModBase {
4747
//public int skippedEntityTicks = 0;
4848

4949
// TODO: Should probably be using FMLPreInitializationEvent
50-
public EntityCullingModBase() {
50+
public EntityCullingMod() {
5151
instance = this;
5252
if (settingsFile.exists()) {
5353
try {

‎src/main/java/dev/tr7zw/entityculling/mixin/BlockEntityRenderDispatcherMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.spongepowered.asm.mixin.injection.Inject;
66
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
77

8-
import dev.tr7zw.entityculling.EntityCullingModBase;
8+
import dev.tr7zw.entityculling.EntityCullingMod;
99
import dev.tr7zw.entityculling.access.Cullable;
1010
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
1111
import net.minecraft.tileentity.TileEntity;
@@ -17,11 +17,11 @@ public class BlockEntityRenderDispatcherMixin {
1717
public void renderTileEntityAt(TileEntity blockEntity, double p_renderTileEntityAt_2_, double d1,
1818
double d2, float f1, int p_renderTileEntityAt_9_, CallbackInfo info) {
1919
if (!((Cullable) blockEntity).isForcedVisible() && ((Cullable) blockEntity).isCulled()) {
20-
EntityCullingModBase.instance.skippedBlockEntities++;
20+
EntityCullingMod.instance.skippedBlockEntities++;
2121
info.cancel();
2222
return;
2323
}
24-
EntityCullingModBase.instance.renderedBlockEntities++;
24+
EntityCullingMod.instance.renderedBlockEntities++;
2525
}
2626

2727
}

‎src/main/java/dev/tr7zw/entityculling/mixin/CullableMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.spongepowered.asm.mixin.Mixin;
44

5-
import dev.tr7zw.entityculling.EntityCullingModBase;
5+
import dev.tr7zw.entityculling.EntityCullingMod;
66
import dev.tr7zw.entityculling.access.Cullable;
77
import net.minecraft.entity.Entity;
88
import net.minecraft.tileentity.TileEntity;
@@ -34,7 +34,7 @@ public void setCulled(boolean value) {
3434

3535
@Override
3636
public boolean isCulled() {
37-
if(!EntityCullingModBase.enabled)return false;
37+
if(!EntityCullingMod.enabled)return false;
3838
return culled;
3939
}
4040

@@ -45,7 +45,7 @@ public void setOutOfCamera(boolean value) {
4545

4646
@Override
4747
public boolean isOutOfCamera() {
48-
if(!EntityCullingModBase.enabled)return false;
48+
if(!EntityCullingMod.enabled)return false;
4949
return outOfCamera;
5050
}
5151

‎src/main/java/dev/tr7zw/entityculling/mixin/DebugHudMixin.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77
import org.spongepowered.asm.mixin.injection.Inject;
88
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
99

10-
import dev.tr7zw.entityculling.EntityCullingModBase;
10+
import dev.tr7zw.entityculling.EntityCullingMod;
1111
import net.minecraft.client.gui.GuiOverlayDebug;
1212

1313
@Mixin(GuiOverlayDebug.class)
1414
public class DebugHudMixin {
1515

1616
public DebugHudMixin() {
1717
// This is an ugly hack, but it's fine for now
18-
EntityCullingModBase.instance.onClientTick(null);
18+
EntityCullingMod.instance.onClientTick(null);
1919
}
2020

2121
@Inject(method = "call", at = @At("RETURN"))
2222
public List<String> getLeftText(CallbackInfoReturnable<List<String>> callback) {
2323
List<String> list = callback.getReturnValue();
24-
list.add("[Culling] Last pass: " + EntityCullingModBase.instance.cullTask.lastTime + "ms");
25-
list.add("[Culling] Rendered Block Entities: " + EntityCullingModBase.instance.renderedBlockEntities + " Skipped: " + EntityCullingModBase.instance.skippedBlockEntities);
26-
list.add("[Culling] Rendered Entities: " + EntityCullingModBase.instance.renderedEntities + " Skipped: " + EntityCullingModBase.instance.skippedEntities);
24+
list.add("[Culling] Last pass: " + EntityCullingMod.instance.cullTask.lastTime + "ms");
25+
list.add("[Culling] Rendered Block Entities: " + EntityCullingMod.instance.renderedBlockEntities + " Skipped: " + EntityCullingMod.instance.skippedBlockEntities);
26+
list.add("[Culling] Rendered Entities: " + EntityCullingMod.instance.renderedEntities + " Skipped: " + EntityCullingMod.instance.skippedEntities);
2727
//list.add("[Culling] Ticked Entities: " + lastTickedEntities + " Skipped: " + lastSkippedEntityTicks);
2828

29-
EntityCullingModBase.instance.renderedBlockEntities = 0;
30-
EntityCullingModBase.instance.skippedBlockEntities = 0;
31-
EntityCullingModBase.instance.renderedEntities = 0;
32-
EntityCullingModBase.instance.skippedEntities = 0;
29+
EntityCullingMod.instance.renderedBlockEntities = 0;
30+
EntityCullingMod.instance.skippedBlockEntities = 0;
31+
EntityCullingMod.instance.renderedEntities = 0;
32+
EntityCullingMod.instance.skippedEntities = 0;
3333

3434
return list;
3535
}

‎src/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import org.spongepowered.asm.mixin.injection.Inject;
77
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
88

9-
import dev.tr7zw.entityculling.EntityCullingModBase;
9+
import dev.tr7zw.entityculling.EntityCullingMod;
1010
import dev.tr7zw.entityculling.access.Cullable;
1111
import dev.tr7zw.entityculling.access.EntityRendererInter;
12-
import net.minecraft.client.renderer.EntityRenderer;
1312
import net.minecraft.client.renderer.entity.Render;
1413
import net.minecraft.client.renderer.entity.RenderManager;
1514
import net.minecraft.entity.Entity;
@@ -29,15 +28,15 @@ public void doRenderEntity(Entity entity, double p_doRenderEntity_2_, double d1,
2928
Cullable cullable = (Cullable) entity;
3029
if (!cullable.isForcedVisible() && cullable.isCulled()) {
3130
EntityRendererInter<Entity> entityRenderer = (EntityRendererInter) getEntityRenderObject(entity);
32-
if (EntityCullingModBase.instance.config.renderNametagsThroughWalls && entityRenderer.shadowShouldShowName(entity)) {
31+
if (EntityCullingMod.instance.config.renderNametagsThroughWalls && entityRenderer.shadowShouldShowName(entity)) {
3332
entityRenderer.shadowRenderNameTag(entity, p_doRenderEntity_2_, d1, d2);
3433
//entityRenderer.doRender(entity, entity.posX, entity.posY, entity.posZ, tickDelta, tickDelta);
3534
}
36-
EntityCullingModBase.instance.skippedEntities++;
35+
EntityCullingMod.instance.skippedEntities++;
3736
info.cancel();
3837
return;
3938
}
40-
EntityCullingModBase.instance.renderedEntities++;
39+
EntityCullingMod.instance.renderedEntities++;
4140
cullable.setOutOfCamera(false);
4241
}
4342

0 commit comments

Comments
 (0)