Altitude/CometSkyBlock
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ore gen v2 (#16)

Browse Source 
* Fix typo in island gui

* Add glow for challenges that are completed.

* Enhance ore generators to generate the ore when the block is broken.

* Fix worlds not unloading.

* Fix generating ore for obsidian.
This commit is contained in:
destro174 2024-04-21 18:47:40 +02:00 committed by GitHub
parent 94b3abb0f5
commit c081eb24ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/src/main/java/com/alttd/cometskyblock/listeners/CobbestoneGeneratorListener.java
View File

@ -26,7 +26,7 @@ public class CobbestoneGeneratorListener implements Listener {
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onBockForm(BlockFormEvent blockFormEvent) { public void onBockForm(BlockFormEvent blockFormEvent) {
Block block = blockFormEvent.getNewState().getBlock(); Block block = blockFormEvent.getBlock();
if (block.getType() == Material.OBSIDIAN) if (block.getType() == Material.OBSIDIAN)
return; return;
@ -43,9 +43,11 @@ public class CobbestoneGeneratorListener implements Listener {
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onBlockBreak(BlockBreakEvent event) { public void onBlockBreak(BlockBreakEvent event) {
Block block = event.getBlock(); Block block = event.getBlock();
if(!block.hasMetadata(GENERATOR_METADATA_KEY)) { if(!block.hasMetadata(GENERATOR_METADATA_KEY))
return;
if (block.getType() == Material.OBSIDIAN)
return; return;
}
Island island = Island.getIsland(block.getWorld().getUID()); Island island = Island.getIsland(block.getWorld().getUID());
Material generatedMaterial = plugin.generatorHandler().generateOre(island, block.getType()); Material generatedMaterial = plugin.generatorHandler().generateOre(island, block.getType());

2
plugin/src/main/java/com/alttd/cometskyblock/worldgenerator/MasterWorldGenerator.java
View File

@ -86,6 +86,7 @@ public class MasterWorldGenerator {
return; return;
} }
newIsland.setDifficulty(Difficulty.NORMAL); newIsland.setDifficulty(Difficulty.NORMAL);
newIsland.setKeepSpawnInMemory(false);
newIsland.setGameRule(GameRule.DO_INSOMNIA, false); newIsland.setGameRule(GameRule.DO_INSOMNIA, false);
// TODO Load a schematic into this world? // TODO Load a schematic into this world?
// Currently random islands are generated by CometIslandGenerator() // Currently random islands are generated by CometIslandGenerator()
@ -119,6 +120,7 @@ public class MasterWorldGenerator {
return null; return null;
} }
newIsland.setKeepSpawnInMemory(false);
newIsland.setDifficulty(Difficulty.NORMAL); // TODO - island options to set difficulty newIsland.setDifficulty(Difficulty.NORMAL); // TODO - island options to set difficulty
return newIsland; return newIsland;
} }