Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
only worked on the first world in each mc session
Browse files Browse the repository at this point in the history
  • Loading branch information
19MisterX98 committed Dec 13, 2020
1 parent 980a7ec commit 49da52b
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 15 deletions.
5 changes: 3 additions & 2 deletions src/main/java/misterx/diamondgen/StartGen.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@
import kaptainwutax.seedutils.mc.seed.ChunkSeeds;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.BlockPos;

import java.util.Random;

public class StartGen {
public SimOreGen simOreGen = new SimOreGen();
public ClientWorld world = MinecraftClient.getInstance().world;
public PlayerEntity player = MinecraftClient.getInstance().player;
public ChunkGenerated chunkList = new ChunkGenerated();
private long currentSeed = 0L;
public long currentSeed = 0L;

StartGen(long seed) {
this.currentSeed = seed;
}
public void setCurrentSeed(long seed) {this.currentSeed = seed;}

public void getStartingPos(int BlockX, int BlockZ) {
if(!chunkList.Check(BlockX,BlockZ)) {
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/misterx/diamondgen/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,30 @@

public class Util {
private static final MinecraftClient client = MinecraftClient.getInstance();
private static final PlayerEntity player = MinecraftClient.getInstance().player;

public static int distanceToPlayer(BlockPos posOre) {
assert player != null;
BlockPos posPlayer = player.getBlockPos();
int x = Math.abs(Math.abs(posOre.getX())-Math.abs(posPlayer.getX()));
int z = Math.abs(Math.abs(posOre.getZ())-Math.abs(posPlayer.getZ()));
return x + z;
if(client.player != null) {
BlockPos posPlayer = client.player.getBlockPos();
int x = Math.abs(Math.abs(posOre.getX()) - Math.abs(posPlayer.getX()));
int z = Math.abs(Math.abs(posOre.getZ()) - Math.abs(posPlayer.getZ()));
return x + z;
}
return 1001;
}
public static void reload() {
int renderdistance = client.options.viewDistance;

int playerChunkX = (int) (Math.round(player.getX()) >> 4);
int playerChunkZ = (int) (Math.round(player.getZ()) >> 4);
int playerChunkX = (int) (Math.round(client.player.getX()) >> 4);
int playerChunkZ = (int) (Math.round(client.player.getZ()) >> 4);
for(int i = playerChunkX - renderdistance;i < playerChunkX + renderdistance; i++) {
for(int j = playerChunkZ - renderdistance;j < playerChunkZ + renderdistance; j++) {
DiamondGen.gen.getStartingPos(i << 4,j<<4);
}
}
}
public static boolean isOpaque(BlockPos pos) {
if(client.world != null) {
return client.world.getBlockState(pos).isOpaque();
if(DiamondGen.gen.world != null) {
return DiamondGen.gen.world.getBlockState(pos).isOpaque();
}
return false;
}
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/misterx/diamondgen/mixin/ClientWorldMixin.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package misterx.diamondgen.mixin;

import misterx.diamondgen.DiamondGen;
import net.minecraft.client.world.ClientWorld;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(ClientWorld.class)
public class ClientWorldMixin {

@Inject(method = "disconnect", at = @At("HEAD"))
private void disconnect(CallbackInfo ci) {
DiamondGen.clear(DiamondGen.gen.currentSeed);
}
}
6 changes: 3 additions & 3 deletions src/main/resources/diamondgen.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"package": "misterx.diamondgen.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [

],
"client": [
"ClientPlayerEntityMixin",
"ClientPlayNetworkHandlerMixin",
"ClientWorldMixin",
"DummyProfilerMixin",
"GameRendererMixin",
"ClientPlayerEntityMixin"
"GameRendererMixin"
],
"server": [
],
Expand Down

0 comments on commit 49da52b

Please sign in to comment.