morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

smol changes

Browse Source
This commit is contained in:
misterx
2022-02-01 17:12:58 +01:00
committed by Cloudburst
parent 40c13104c3
commit a1a2ab36eb
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/anticope/rejects/events/PlayerRespawnEvent.java Normal file
View File

@@ -0,0 +1,9 @@
package anticope.rejects.events;
public class PlayerRespawnEvent {
private static final PlayerRespawnEvent INSTANCE = new PlayerRespawnEvent();
public static PlayerRespawnEvent get() {
return INSTANCE;
}
}

8
src/main/java/anticope/rejects/mixin/ClientPlayNetworkHandlerMixin.java
View File

@@ -1,9 +1,11 @@
package anticope.rejects.mixin; package anticope.rejects.mixin;
import anticope.rejects.events.ChunkPosDataEvent; import anticope.rejects.events.ChunkPosDataEvent;
import anticope.rejects.events.PlayerRespawnEvent;
import meteordevelopment.meteorclient.MeteorClient; import meteordevelopment.meteorclient.MeteorClient;
import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -17,4 +19,10 @@ public class ClientPlayNetworkHandlerMixin {
public void onChunkData(ChunkDataS2CPacket packet, CallbackInfo ci) { public void onChunkData(ChunkDataS2CPacket packet, CallbackInfo ci) {
MeteorClient.EVENT_BUS.post(ChunkPosDataEvent.get(packet.getX(), packet.getZ())); MeteorClient.EVENT_BUS.post(ChunkPosDataEvent.get(packet.getX(), packet.getZ()));
} }
//called on dimension change too
@Inject(method = "onPlayerRespawn", at = @At("TAIL"))
public void onPlayerRespawn(PlayerRespawnS2CPacket packet, CallbackInfo ci) {
MeteorClient.EVENT_BUS.post(PlayerRespawnEvent.get());
}
} }

33
src/main/java/anticope/rejects/modules/OreSim.java
View File

@@ -2,26 +2,20 @@ package anticope.rejects.modules;
import anticope.rejects.MeteorRejectsAddon; import anticope.rejects.MeteorRejectsAddon;
import anticope.rejects.events.ChunkPosDataEvent; import anticope.rejects.events.ChunkPosDataEvent;
import anticope.rejects.events.PlayerRespawnEvent;
import anticope.rejects.events.SeedChangedEvent; import anticope.rejects.events.SeedChangedEvent;
import anticope.rejects.utils.Ore;
import anticope.rejects.utils.seeds.Seed; import anticope.rejects.utils.seeds.Seed;
import anticope.rejects.utils.seeds.Seeds; import anticope.rejects.utils.seeds.Seeds;
import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.events.render.Render3DEvent;
import meteordevelopment.meteorclient.events.world.ChunkDataEvent;
import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.events.world.TickEvent;
import meteordevelopment.meteorclient.settings.EnumSetting; import meteordevelopment.meteorclient.settings.EnumSetting;
import meteordevelopment.meteorclient.settings.IntSetting; import meteordevelopment.meteorclient.settings.IntSetting;
import meteordevelopment.meteorclient.settings.Setting; import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.settings.SettingGroup; import meteordevelopment.meteorclient.settings.SettingGroup;
import meteordevelopment.meteorclient.systems.modules.Module; import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.systems.modules.Modules;
import meteordevelopment.meteorclient.systems.modules.movement.Scaffold;
import meteordevelopment.meteorclient.systems.modules.world.Nuker;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.orbit.EventHandler; import meteordevelopment.orbit.EventHandler;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BufferRenderer;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.world.ClientWorld; import net.minecraft.client.world.ClientWorld;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -32,12 +26,10 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.world.Heightmap; import net.minecraft.world.Heightmap;
import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.WorldChunk;
import net.minecraft.world.gen.random.ChunkRandom; import net.minecraft.world.gen.random.ChunkRandom;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.BitSet; import java.util.BitSet;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@@ -46,8 +38,8 @@ import java.util.Random;
public class OreSim extends Module { public class OreSim extends Module {
private final HashMap<Long, HashMap<Ore, HashSet<Vec3d>>> chunkRenderers = new HashMap<>(); private final HashMap<Long, HashMap<Ore, HashSet<Vec3d>>> chunkRenderers = new HashMap<>();
Long worldSeed = null; private Long worldSeed = null;
List<Ore> oreConfig; private List<Ore> oreConfig;
private ChunkPos prevOffset = new ChunkPos(0, 0); private ChunkPos prevOffset = new ChunkPos(0, 0);
public enum Version { public enum Version {
@@ -136,7 +128,7 @@ public class OreSim extends Module {
} }
@EventHandler @EventHandler
public void onTick(TickEvent.Pre event) { private void onTick(TickEvent.Pre event) {
if (airCheck.get() == AirCheck.RECHECK) { if (airCheck.get() == AirCheck.RECHECK) {
if (mc.player == null || mc.world == null) { if (mc.player == null || mc.world == null) {
return; return;
@@ -175,7 +167,7 @@ public class OreSim extends Module {
@Override @Override
public void onActivate() { public void onActivate() {
if (Seeds.get().getSeed() == null) { if (Seeds.get().getSeed() == null) {
error("input a world seed into the seed field in the oresim config"); error("no seed found. To set a seed do .seed <seed>");
this.toggle(); this.toggle();
} }
reload(); reload();
@@ -186,6 +178,11 @@ public class OreSim extends Module {
reload(); reload();
} }
@EventHandler
private void onPlayerRespawn(PlayerRespawnEvent event) {
reload();
}
private void versionChanged() { private void versionChanged() {
this.oreConfig = Ore.getConfig(version.get()); this.oreConfig = Ore.getConfig(version.get());
reload(); reload();
@@ -207,7 +204,7 @@ public class OreSim extends Module {
} }
} }
public void reload() { private void reload() {
Seed seed = Seeds.get().getSeed(); Seed seed = Seeds.get().getSeed();
if (seed == null) return; if (seed == null) return;
worldSeed = seed.seed; worldSeed = seed.seed;
@@ -222,7 +219,7 @@ public class OreSim extends Module {
doMathOnChunk(event.chunkX, event.chunkZ); doMathOnChunk(event.chunkX, event.chunkZ);
} }
public void doMathOnChunk(int chunkX, int chunkZ) { private void doMathOnChunk(int chunkX, int chunkZ) {
long chunkKey = (long) chunkX + ((long) chunkZ << 32); long chunkKey = (long) chunkX + ((long) chunkZ << 32);
ClientWorld world = mc.world; ClientWorld world = mc.world;
@@ -251,7 +248,7 @@ public class OreSim extends Module {
Identifier id = world.getRegistryManager().get(Registry.BIOME_KEY).getId(world.getBiomeAccess().getBiomeForNoiseGen(new BlockPos(chunkX, 0, chunkZ))); Identifier id = world.getRegistryManager().get(Registry.BIOME_KEY).getId(world.getBiomeAccess().getBiomeForNoiseGen(new BlockPos(chunkX, 0, chunkZ)));
if (id == null) { if (id == null) {
System.out.println("Something went wrong, you may have some mods that mess with world generation"); error("Something went wrong, you may have some mods that mess with world generation");
this.toggle(); this.toggle();
return; return;
} }
@@ -260,7 +257,7 @@ public class OreSim extends Module {
for (Ore ore : oreConfig) { for (Ore ore : oreConfig) {
if (dimensionName != ore.dimension) { if (!dimensionName.getPath().equals(ore.dimension.getPath())) {
continue; continue;
} }

11
src/main/java/anticope/rejects/modules/Ore.java → src/main/java/anticope/rejects/utils/Ore.java
View File

@@ -1,5 +1,6 @@
package anticope.rejects.modules; package anticope.rejects.utils;
import anticope.rejects.modules.OreSim;
import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.BoolSetting;
import meteordevelopment.meteorclient.settings.Setting; import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.utils.render.color.Color; import meteordevelopment.meteorclient.utils.render.color.Color;
@@ -183,7 +184,7 @@ public class Ore {
for (Ore ore : ores) { for (Ore ore : ores) {
if (ore.type == Type.EMERALD || ore.type == Type.GOLD_EXTRA) { if (ore.type == Type.EMERALD || ore.type == Type.GOLD_EXTRA) {
ore.index.keySet().forEach(key -> ore.index.put(key, ore.index.get(key) - 3)); ore.index.keySet().forEach(key -> ore.index.put(key, ore.index.get(key) - 3));
} else if (ore.dimension.equals("overworld")) { } else if (ore.dimension == DimensionType.OVERWORLD_ID) {
ore.index.keySet().forEach(key -> ore.index.put(key, ore.index.get(key) - 2)); ore.index.keySet().forEach(key -> ore.index.put(key, ore.index.get(key) - 2));
} else if (ore.type == Type.LDEBRIS) { } else if (ore.type == Type.LDEBRIS) {
ore.minY = 16; ore.minY = 16;
@@ -202,7 +203,7 @@ public class Ore {
return ores; return ores;
} }
protected static List<Ore> getConfig(OreSim.Version version) { public static List<Ore> getConfig(OreSim.Version version) {
return switch (version) { return switch (version) {
case V1_18 -> V1_18(); case V1_18 -> V1_18();
case V1_17_1 -> V1_17_1(); case V1_17_1 -> V1_17_1();
@@ -212,11 +213,11 @@ public class Ore {
}; };
} }
protected enum Type { public enum Type {
DIAMOND, REDSTONE, GOLD, IRON, COAL, EMERALD, SDEBRIS, LDEBRIS, LAPIS, COPPER, QUARTZ, GOLD_NETHER, GOLD_EXTRA DIAMOND, REDSTONE, GOLD, IRON, COAL, EMERALD, SDEBRIS, LDEBRIS, LAPIS, COPPER, QUARTZ, GOLD_NETHER, GOLD_EXTRA
} }
protected enum Generator { public enum Generator {
DEFAULT, EMERALD, NO_SURFACE DEFAULT, EMERALD, NO_SURFACE
} }
} }