Skip to content

Commit

Permalink
feat: clean up cyclops cave gen / dragon cave gen
Browse files Browse the repository at this point in the history
- increase client dragon for some entities (in theory all entities should be increased to 8 or sth)
- better biome checking for dragon caves
- seperate dangerous generation check between surface, underground and ocean
Co-authored-by: TheBv <[email protected]>
  • Loading branch information
SiverDX authored and TheBv committed Dec 26, 2023
1 parent 18e13ab commit 8afdefa
Show file tree
Hide file tree
Showing 45 changed files with 494 additions and 633 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

10 changes: 4 additions & 6 deletions src/main/java/com/github/alexthe666/iceandfire/IceAndFire.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.github.alexthe666.iceandfire.message.*;
import com.github.alexthe666.iceandfire.recipe.IafRecipeRegistry;
import com.github.alexthe666.iceandfire.recipe.IafRecipeSerializers;
import com.github.alexthe666.iceandfire.world.IafPlacementFilterRegistry;
import com.github.alexthe666.iceandfire.world.IafProcessors;
import com.github.alexthe666.iceandfire.world.IafWorldRegistry;
import net.minecraft.core.Registry;
Expand Down Expand Up @@ -82,9 +83,7 @@ public class IceAndFire {
channel = channel.clientAcceptedVersions(version::equals);
version = PROTOCOL_VERSION;
version.getClass();
NETWORK_WRAPPER = channel.serverAcceptedVersions(version::equals).networkProtocolVersion(() -> {
return PROTOCOL_VERSION;
}).simpleChannel();
NETWORK_WRAPPER = channel.serverAcceptedVersions(version::equals).networkProtocolVersion(() -> PROTOCOL_VERSION).simpleChannel();
}

public IceAndFire() {
Expand Down Expand Up @@ -114,6 +113,7 @@ public IceAndFire() {
IafBlockRegistry.BLOCKS.register(modBus);
IafEntityRegistry.ENTITIES.register(modBus);
IafTileEntityRegistry.TYPES.register(modBus);
IafPlacementFilterRegistry.PLACEMENT_MODIFIER_TYPES.register(modBus);
IafWorldRegistry.FEATURES.register(modBus);
IafWorldRegistry.STRUCTURES.register(modBus);
IafContainerRegistry.CONTAINERS.register(modBus);
Expand Down Expand Up @@ -213,9 +213,7 @@ private void setup(final FMLCommonSetupEvent event) {
}

private void setupClient(final FMLClientSetupEvent event) {
event.enqueueWork(() -> {
PROXY.clientInit();
});
event.enqueueWork(() -> PROXY.clientInit());
}

private void setupComplete(final FMLLoadCompleteEvent event) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ public EntityDeathWorm(EntityType<EntityDeathWorm> type, Level worldIn) {
super(type, worldIn);
setPathfindingMalus(BlockPathTypes.OPEN, 2.0f); // FIXME :: Death worms are trying to go upwards -> figure out why (or if this really helps)
IHasCustomizableAttributes.applyAttributesForEntity(type, this);
setPathfindingMalus(BlockPathTypes.WATER, 4.0f);
setPathfindingMalus(BlockPathTypes.WATER_BORDER, 4.0f);
this.lookHelper = new IAFLookHelper(this);
this.noCulling = true;
this.maxUpStep = 1;
Expand Down
Loading

0 comments on commit 8afdefa

Please sign in to comment.