Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/NovaCraft/NovaCraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.NovaCraft.world.nether.structure.StructureNovaCraftNetherBridgePieces;
import com.NovaCraft.world.nether.structure.MapGenNetherBridgeNovaCraft.Start;
import com.NovaCraft.world.sculkshaft.WorldGenSculkedMineshaftInjector;
import com.NovaCraft.world.sculkshaft.StructureSculkMineshaftPieces;
import com.NovaCraft.world.stronghold.*;
import com.NovaCraft.world.structure.WorldGenRavineInjector;
import com.NovaCraftBlocks.NovaCraftBlocks;
Expand Down Expand Up @@ -159,7 +160,8 @@ public void init(FMLInitializationEvent event) {
}

if (ConfigsStructures.enableSculkInfestedMineshaft) {
MinecraftForge.EVENT_BUS.register(new WorldGenSculkedMineshaftInjector());
StructureSculkMineshaftPieces.registerStructurePieces();
MinecraftForge.TERRAIN_GEN_BUS.register(new WorldGenSculkedMineshaftInjector());
}
MinecraftForge.EVENT_BUS.register(new WorldGenRavineInjector());
GameRegistry.registerWorldGenerator(new MeteorCraterGen(), 0);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.NovaCraft.world.sculkshaft;

import java.util.Iterator;
import java.util.LinkedList;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import com.NovaCraft.config.Configs;
Expand All @@ -27,11 +27,11 @@
public class StructureSculkMineshaftPieces {
public static void registerStructurePieces()
{
MapGenStructureIO.func_143031_a(StructureSculkMineshaftPieces.Corridor.class, "MineshaftCorridor");
MapGenStructureIO.func_143031_a(StructureSculkMineshaftPieces.Cross.class, "MineshaftCorridorCrossing");
MapGenStructureIO.func_143031_a(StructureSculkMineshaftPieces.Room.class, "MineshaftCorridorRoom");
MapGenStructureIO.func_143031_a(StructureSculkMineshaftPieces.Stairs.class, "MineshaftCorridorStairs");
MapGenStructureIO.registerStructure(StructureSculkMineshaftStart.class, "Mineshaft");
MapGenStructureIO.func_143031_a(StructureSculkMineshaftPieces.Corridor.class, "NCSMC");
MapGenStructureIO.func_143031_a(StructureSculkMineshaftPieces.Cross.class, "NCSMX");
MapGenStructureIO.func_143031_a(StructureSculkMineshaftPieces.Room.class, "NCSMR");
MapGenStructureIO.func_143031_a(StructureSculkMineshaftPieces.Stairs.class, "NCSMS");
MapGenStructureIO.registerStructure(StructureSculkMineshaftStart.class, "NCSM");
}

private static StructureComponent getRandomComponent(List list, Random random, int p_78815_2_, int p_78815_3_, int p_78815_4_, int p_78815_5_, int p_78815_6_)
Expand Down Expand Up @@ -774,7 +774,7 @@ public boolean addComponentParts(World world, Random random, StructureBoundingBo

public static class Room extends StructureComponent
{
private List roomsLinkedToTheRoom = new LinkedList();
private List roomsLinkedToTheRoom = new ArrayList();

public Room() {}

Expand Down Expand Up @@ -1006,4 +1006,4 @@ public boolean addComponentParts(World world, Random random, StructureBoundingBo

}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ public StructureSculkMineshaftStart() {
public StructureSculkMineshaftStart(World world, Random rand, int chunkX, int chunkZ) {
super(chunkX, chunkZ);

StructureSculkMineshaftPieces.registerStructurePieces();

StructureSculkMineshaftPieces.Room room = new StructureSculkMineshaftPieces.Room(0, rand, (chunkX << 4) + 2, (chunkZ << 4) + 2);

this.components.add(room);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,38 +1,14 @@
package com.NovaCraft.world.sculkshaft;

import java.lang.reflect.Field;
import net.minecraft.world.WorldServer;
import net.minecraft.world.gen.ChunkProviderGenerate;
import net.minecraft.world.gen.ChunkProviderServer;
import net.minecraft.world.gen.structure.MapGenMineshaft;
import net.minecraftforge.event.world.WorldEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.event.terraingen.InitMapGenEvent;

public class WorldGenSculkedMineshaftInjector {

@SubscribeEvent
public void onWorldLoad(WorldEvent.Load event) {
if (!(event.world instanceof WorldServer)) return;

WorldServer world = (WorldServer) event.world;
ChunkProviderServer cps = world.theChunkProviderServer;

if (!(cps.currentChunkProvider instanceof ChunkProviderGenerate)) return;

ChunkProviderGenerate gen = (ChunkProviderGenerate) cps.currentChunkProvider;

try {
for (Field field : ChunkProviderGenerate.class.getDeclaredFields()) {
field.setAccessible(true);
Object value = field.get(gen);

if (value instanceof MapGenMineshaft) {
field.set(gen, new MapGenSculkMineshaft());
return;
}
}
} catch (Exception e) {
e.printStackTrace();
public void onInitMapGen(InitMapGenEvent event) {
if (event.type == InitMapGenEvent.EventType.MINESHAFT) {
event.newGen = new MapGenSculkMineshaft();
}
}
}