Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@gemsb
gemsb committed Aug 25, 2024
1 parent e6242e0 commit 208617c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 36 deletions.
4 changes: 0 additions & 4 deletions src/main/java/net/ugi/sculk_depths/block/custom/PedestalBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,6 @@ protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, Worl
return ItemActionResult.FAIL;
}

//todo check if this runs twice
System.out.println("checkthis^");


if (stack.getItem() == ModItems.ENERGY_ESSENCE && !state.get(ModProperties.HAS_ENERGY_ESSENCE)){
stack.decrementUnlessCreative(1,player);
world.playSound(null, pos, SoundEvents.BLOCK_AMETHYST_BLOCK_RESONATE, SoundCategory.BLOCKS, 1.0f, 1.0f);
Expand Down
34 changes: 2 additions & 32 deletions src/main/java/net/ugi/sculk_depths/portal/GenerateStructureAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@ public static boolean generateStructure(World originalWorld, RegistryKey<World>
ChunkPos chunkPos2 = new ChunkPos(ChunkSectionPos.getSectionCoord(blockBox.getMaxX()), ChunkSectionPos.getSectionCoord(blockBox.getMaxZ()));
ChunkPos[] chunkPosArray = ChunkPos.stream(chunkPos, chunkPos2).toArray(ChunkPos[]::new);
return generate(serverWorld, structureStart, chunkPosArray);
/* originalWorld.getRegistryManager()// gets the dynamic registry manager
.getOptional(RegistryKeys.STRUCTURE)// gets an optional wrapped structure registry from it
.flatMap(registry-> // if it exists, map it to:
registry.getEntry(SculkDepths.identifier("portal_structure")))// an optional registry entry reference. thats the end of the mapping function
.ifPresent(structure_-> {// if the value is present at all, do something with the remapped value
System.out.println("0");
GenerateStructureAPI.generateStructure(originalWorld, ModDimensions.SCULK_DEPTHS_LEVEL_KEY, structure_, pos);
});*/
}
public static boolean generateStructure(World originalWorld, RegistryKey<World> targetWorldKey, RegistryKey<Structure> structure, BlockPos pos){
return generateStructure(originalWorld, targetWorldKey, structure.getValue(), pos);
Expand All @@ -66,21 +58,13 @@ public static boolean generateStructure(World originalWorld, RegistryKey<World>


public static boolean generateStructurePartial(World originalWorld, RegistryKey<World> targetWorldKey, Identifier structure, StructureStart structureStart, ChunkPos[] chunkPosArray){
Date date = new Date();
long timeMilli1 = date.getTime();

if(originalWorld.isClient)return false;
if(structureStart == null)return false;
Optional<RegistryEntry.Reference<Structure>> structureReference = originalWorld.getRegistryManager().get(RegistryKeys.STRUCTURE).getEntry(structure);
if(structureReference.isEmpty()) return false;
ServerWorld serverWorld = originalWorld.getServer().getWorld(targetWorldKey);
boolean x = generate( serverWorld, structureStart, chunkPosArray);

date = new Date();
long timeMilli2 = date.getTime();
System.out.println("delta: " + (float)(timeMilli2-timeMilli1));
System.out.println("stop structure: " + timeMilli2);
return x;
return generate( serverWorld, structureStart, chunkPosArray);
}
public static boolean generateStructurePartial(World originalWorld, RegistryKey<World> targetWorldKey, RegistryKey<Structure> structure, StructureStart structureStart, ChunkPos[] chunkPosArray){
return generateStructurePartial(originalWorld, targetWorldKey, structure.getValue(), structureStart, chunkPosArray);
Expand All @@ -89,7 +73,6 @@ public static boolean generateStructurePartial(World originalWorld, RegistryKey
public static StructureStart structureStart (World originalWorld, RegistryKey<World> targetWorldKey, Identifier structureKey, BlockPos pos){
if(originalWorld.isClient)return null;
RegistryEntry.Reference<Structure> structure = originalWorld.getRegistryManager().get(RegistryKeys.STRUCTURE).getEntry(structureKey).get();
System.out.println("1");
ServerWorld serverWorld = originalWorld.getServer().getWorld(targetWorldKey);
ChunkGenerator chunkGenerator = serverWorld.getChunkManager().getChunkGenerator();
Structure structure2 = structure.value();
Expand All @@ -99,7 +82,7 @@ public static StructureStart structureStart (World originalWorld, RegistryKey<W
chunkGenerator.getBiomeSource(),
serverWorld.getChunkManager().getNoiseConfig(),
serverWorld.getStructureTemplateManager(),
originalWorld.getServer().getWorld(World.OVERWORLD).getSeed(),//maybe fix rotation
originalWorld.getServer().getWorld(World.OVERWORLD).getSeed(),
new ChunkPos(pos),
0,
serverWorld,
Expand All @@ -114,14 +97,8 @@ public static StructureStart structureStart (World originalWorld, RegistryKey<W
private static boolean generate(ServerWorld serverWorld, StructureStart structureStart, ChunkPos[] chunkPosArray){
ChunkGenerator chunkGenerator = serverWorld.getChunkManager().getChunkGenerator();
if(!structureStart.hasChildren()){
System.out.println("false1");
return false;
}else {
//forceLoadNearbyChunks(chunkPosArray, serverWorld);
/* if(FalseOnUnloadedPos(serverWorld, chunkPos, chunkPos2)){
System.out.println("unloaded pos");
return false;
}*/
for (ChunkPos chunkPosx : chunkPosArray) {
structureStart.place(
serverWorld,
Expand All @@ -137,13 +114,6 @@ private static boolean generate(ServerWorld serverWorld, StructureStart structur
}
}

private static boolean FalseOnUnloadedPos(ServerWorld world, ChunkPos pos1, ChunkPos pos2) {
if (ChunkPos.stream(pos1, pos2).anyMatch(pos -> !world.canSetBlock(pos.getStartPos()))) {
return false;
}
return true;
}

public static void forceLoadNearbyChunks(ChunkPos[] chunkPosArray, ServerWorld world) {
for (ChunkPos chunkPos : chunkPosArray) {
world.setChunkForced(chunkPos.x, chunkPos.z, true);
Expand Down

0 comments on commit 208617c

Please sign in to comment.