Skip to content

Commit a5a5ff2

Browse files
committed
Cleanup some uses of Dimension
closes #4011
1 parent 5e5f3ec commit a5a5ff2

File tree

5 files changed

+14
-19
lines changed

5 files changed

+14
-19
lines changed

src/main/java/meteordevelopment/meteorclient/systems/modules/render/Breadcrumbs.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ public void onDeactivate() {
7373

7474
@EventHandler
7575
private void onTick(TickEvent.Post event) {
76+
if (!mc.player.isLoaded()) return;
77+
7678
if (lastDimension != mc.world.getDimension()) {
7779
for (Section sec : sections) sectionPool.free(sec);
7880
sections.clear();
@@ -130,9 +132,5 @@ public void set2() {
130132
y2 = (float) mc.player.getY();
131133
z2 = (float) mc.player.getZ();
132134
}
133-
134-
public void render(Render3DEvent event) {
135-
event.renderer.line(x1, y1, z1, x2, y2, z2, color.get());
136-
}
137135
}
138136
}

src/main/java/meteordevelopment/meteorclient/systems/modules/render/LogoutSpots.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import meteordevelopment.meteorclient.utils.render.NametagUtils;
2020
import meteordevelopment.meteorclient.utils.render.color.Color;
2121
import meteordevelopment.meteorclient.utils.render.color.SettingColor;
22-
import meteordevelopment.meteorclient.utils.world.Dimension;
2322
import meteordevelopment.orbit.EventHandler;
2423
import net.minecraft.client.network.PlayerListEntry;
2524
import net.minecraft.entity.Entity;
2625
import net.minecraft.entity.player.PlayerEntity;
26+
import net.minecraft.world.dimension.DimensionType;
2727
import org.joml.Vector3d;
2828

2929
import java.util.ArrayList;
@@ -98,7 +98,7 @@ public class LogoutSpots extends Module {
9898
private final List<PlayerEntity> lastPlayers = new ArrayList<>();
9999

100100
private int timer;
101-
private Dimension lastDimension;
101+
private DimensionType lastDimension;
102102

103103
public LogoutSpots() {
104104
super(Categories.Render, "logout-spots", "Displays a box where another player has logged out at.");
@@ -111,7 +111,7 @@ public void onActivate() {
111111
updateLastPlayers();
112112

113113
timer = 10;
114-
lastDimension = PlayerUtils.getDimension();
114+
lastDimension = mc.world.getDimension();
115115
}
116116

117117
@Override
@@ -170,7 +170,7 @@ private void onTick(TickEvent.Post event) {
170170
timer--;
171171
}
172172

173-
Dimension dimension = PlayerUtils.getDimension();
173+
DimensionType dimension = mc.world.getDimension();
174174
if (dimension != lastDimension) players.clear();
175175
lastDimension = dimension;
176176
}

src/main/java/meteordevelopment/meteorclient/systems/modules/render/VoidESP.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
import meteordevelopment.meteorclient.systems.modules.Categories;
1313
import meteordevelopment.meteorclient.systems.modules.Module;
1414
import meteordevelopment.meteorclient.utils.misc.Pool;
15-
import meteordevelopment.meteorclient.utils.player.PlayerUtils;
1615
import meteordevelopment.meteorclient.utils.render.color.SettingColor;
17-
import meteordevelopment.meteorclient.utils.world.Dimension;
1816
import meteordevelopment.meteorclient.utils.world.Dir;
1917
import meteordevelopment.orbit.EventHandler;
2018
import net.minecraft.block.Block;
@@ -23,6 +21,7 @@
2321
import net.minecraft.util.math.Direction;
2422
import net.minecraft.world.chunk.Chunk;
2523
import net.minecraft.world.chunk.ChunkStatus;
24+
import net.minecraft.world.dimension.DimensionTypes;
2625

2726
import java.util.ArrayList;
2827
import java.util.List;
@@ -102,7 +101,7 @@ public VoidESP() {
102101
@EventHandler
103102
private void onTick(TickEvent.Post event) {
104103
voidHoles.clear();
105-
if (PlayerUtils.getDimension() == Dimension.End) return;
104+
if (mc.world.getDimensionEntry() == DimensionTypes.THE_END) return;
106105

107106
int px = mc.player.getBlockPos().getX();
108107
int pz = mc.player.getBlockPos().getZ();
@@ -114,7 +113,7 @@ private void onTick(TickEvent.Post event) {
114113
if (isHole(blockPos, false)) voidHoles.add(voidHolePool.get().set(blockPos.set(x, mc.world.getBottomY(), z), false));
115114

116115
// Check for nether roof
117-
if (netherRoof.get() && PlayerUtils.getDimension() == Dimension.Nether) {
116+
if (netherRoof.get() && mc.world.getDimensionEntry() == DimensionTypes.THE_NETHER) {
118117
blockPos.set(x, 127, z);
119118
if (isHole(blockPos, true)) voidHoles.add(voidHolePool.get().set(blockPos.set(x, 127, z), true));
120119
}

src/main/java/meteordevelopment/meteorclient/systems/modules/render/blockesp/BlockESP.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
import meteordevelopment.meteorclient.systems.modules.Categories;
1818
import meteordevelopment.meteorclient.systems.modules.Module;
1919
import meteordevelopment.meteorclient.utils.Utils;
20-
import meteordevelopment.meteorclient.utils.player.PlayerUtils;
2120
import meteordevelopment.meteorclient.utils.render.color.RainbowColors;
2221
import meteordevelopment.meteorclient.utils.render.color.SettingColor;
23-
import meteordevelopment.meteorclient.utils.world.Dimension;
2422
import meteordevelopment.orbit.EventHandler;
2523
import net.minecraft.block.Block;
2624
import net.minecraft.util.math.BlockPos;
2725
import net.minecraft.util.math.ChunkPos;
2826
import net.minecraft.world.chunk.Chunk;
27+
import net.minecraft.world.dimension.DimensionType;
2928

3029
import java.util.Iterator;
3130
import java.util.List;
@@ -83,7 +82,7 @@ public class BlockESP extends Module {
8382
private final Set<ESPGroup> groups = new ReferenceOpenHashSet<>();
8483
private final ExecutorService workerThread = Executors.newSingleThreadExecutor();
8584

86-
private Dimension lastDimension;
85+
private DimensionType lastDimension;
8786

8887
public BlockESP() {
8988
super(Categories.Render, "block-esp", "Renders specified blocks through walls.", "search");
@@ -102,7 +101,7 @@ public void onActivate() {
102101
searchChunk(chunk);
103102
}
104103

105-
lastDimension = PlayerUtils.getDimension();
104+
lastDimension = mc.world.getDimension();
106105
}
107106

108107
@Override
@@ -227,10 +226,9 @@ private void onBlockUpdate(BlockUpdateEvent event) {
227226

228227
@EventHandler
229228
private void onPostTick(TickEvent.Post event) {
230-
Dimension dimension = PlayerUtils.getDimension();
229+
DimensionType dimension = mc.world.getDimension();
231230

232231
if (lastDimension != dimension) onActivate();
233-
234232
lastDimension = dimension;
235233
}
236234

src/main/java/meteordevelopment/meteorclient/utils/player/PlayerUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ else if (entity instanceof PlayerEntity player && !Friends.get().isFriend(player
204204
}
205205

206206
// Check for beds if in nether
207-
if (PlayerUtils.getDimension() != Dimension.Overworld) {
207+
if (!mc.world.getDimension().bedWorks()) {
208208
for (BlockEntity blockEntity : Utils.blockEntities()) {
209209
BlockPos bp = blockEntity.getPos();
210210
Vec3d pos = new Vec3d(bp.getX(), bp.getY(), bp.getZ());

0 commit comments

Comments
 (0)