sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

add black solar system

Browse source
This commit is contained in:
Sen 2025-04-25 15:14:22 +02:00
parent 5e21c8e8f6
commit 6bf6831360
4 changed files with 78 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/src/game/init/Blocks.java
View file

@ -70,6 +70,8 @@ public abstract class Blocks {
public static final BlockStaticLiquid water = (BlockStaticLiquid)get("water"); public static final BlockStaticLiquid water = (BlockStaticLiquid)get("water");
public static final BlockDynamicLiquid flowing_lava = (BlockDynamicLiquid)get("flowing_lava"); public static final BlockDynamicLiquid flowing_lava = (BlockDynamicLiquid)get("flowing_lava");
public static final BlockStaticLiquid lava = (BlockStaticLiquid)get("lava"); public static final BlockStaticLiquid lava = (BlockStaticLiquid)get("lava");
public static final BlockDynamicLiquid flowing_goo = (BlockDynamicLiquid)get("flowing_goo");
public static final BlockStaticLiquid goo = (BlockStaticLiquid)get("goo");
public static final BlockSand sand = (BlockSand)get("sand"); public static final BlockSand sand = (BlockSand)get("sand");
public static final Block gravel = get("gravel"); public static final Block gravel = get("gravel");
public static final BlockOre gold_ore = (BlockOre)get("gold_ore"); public static final BlockOre gold_ore = (BlockOre)get("gold_ore");

12
java/src/game/init/UniverseRegistry.java
View file

@ -631,6 +631,18 @@ public abstract class UniverseRegistry {
.addOre(Blocks.copper_ore.getState(), 8, 2, 12, 0, 52, false) .addOre(Blocks.copper_ore.getState(), 8, 2, 12, 0, 52, false)
.addOre(Blocks.coal_ore.getState(), 8, 4, 30, 0, 16, false) .addOre(Blocks.coal_ore.getState(), 8, 4, 30, 0, 16, false)
.addOre(Blocks.stone.getState(), 8, 4, 33, 0, 80, false), "girok"); .addOre(Blocks.stone.getState(), 8, 4, 33, 0, 80, false), "girok");
registerGalaxy("Drkthrn", "drkthrn");
registerSector("Blvck", "blvck", "drkthrn");
registerDimension("Ov'rol", new Star(120, "ovrol", 0x000000, 302.0f, 12666.0f, Blocks.goo.getState(), 192), "blvck");
registerDimension("'Schwarzplanet'", new Planet(121, "blackplanet", 0x000000, 0x000000, 0x000000, 4632918508L, 204556L, 12.0f, 0.0f)
.setPerlinGen(Blocks.blackened_stone.getState(), Blocks.goo.getState(), 63)
.setBiomeReplacer(Blocks.blackened_cobble.getState()).setBiome(Biome.blackened)
.enableCaves(Blocks.air.getState()).setDungeons(4).enableMobs()
.setWorldFloor(Blocks.bedrock.getState())
.addLake(Blocks.goo.getState(), null, null, 8, 8, 255, true)
// .addOre(Blocks.PLACEHOLDER_ore.getState(), 0, 2, 3, 0, 12, false)
, "ovrol");
registerDimension("Der Warp", new Semi(-1, "warp", 0x0c001f, 0x0c001f, 0x190033, 285.0f, 3).setCloudTexture("clouds_dense").setCloudHeight(238.0f) registerDimension("Der Warp", new Semi(-1, "warp", 0x0c001f, 0x0c001f, 0x190033, 285.0f, 3).setCloudTexture("clouds_dense").setCloudHeight(238.0f)
.setPerlinGen(Blocks.obsidian.getState(), Blocks.lava.getState(), 63) .setPerlinGen(Blocks.obsidian.getState(), Blocks.lava.getState(), 63)

74
java/src/game/item/ItemMonsterPlacer.java
View file

@ -111,28 +111,28 @@ public class ItemMonsterPlacer extends Item
} }
int amount = Math.min(stack.stackSize, 128); // int amount = Math.min(stack.stackSize, 128);
for(int z = 0; z < amount; z++) { // for(int z = 0; z < amount; z++) {
Entity entity = spawnCreature(worldIn, this.entityId, (double)pos.getX() + 0.5D, (double)pos.getY() + d0, (double)pos.getZ() + 0.5D); Entity entity = spawnCreature(worldIn, this.entityId, (double)pos.getX() + 0.5D, (double)pos.getY() + d0, (double)pos.getZ() + 0.5D);
if (entity != null) if (entity != null)
{ {
// if (entity instanceof EntityLiving) // if (entity instanceof EntityLiving)
// { // {
// ((EntityLiving)entity).disableDespawn(); // ((EntityLiving)entity).disableDespawn();
// } // }
if (entity instanceof EntityLiving && stack.hasDisplayName()) if (entity instanceof EntityLiving && stack.hasDisplayName())
{ {
entity.setCustomNameTag(stack.getDisplayName()); entity.setCustomNameTag(stack.getDisplayName());
} }
// if (!playerIn.creative) // if (!playerIn.creative)
// { // {
--stack.stackSize; --stack.stackSize;
// } // }
}
} }
// }
return true; return true;
} }
@ -173,31 +173,31 @@ public class ItemMonsterPlacer extends Item
if (worldIn.getState(blockpos).getBlock() instanceof BlockLiquid) if (worldIn.getState(blockpos).getBlock() instanceof BlockLiquid)
{ {
int amount = Math.min(itemStackIn.stackSize, 128); // int amount = Math.min(itemStackIn.stackSize, 128);
for(int z = 0; z < amount; z++) { // for(int z = 0; z < amount; z++) {
Entity entity = spawnCreature(worldIn, this.entityId, (double)blockpos.getX() + 0.5D, (double)blockpos.getY() + 0.5D, (double)blockpos.getZ() + 0.5D); Entity entity = spawnCreature(worldIn, this.entityId, (double)blockpos.getX() + 0.5D, (double)blockpos.getY() + 0.5D, (double)blockpos.getZ() + 0.5D);
if (entity != null) if (entity != null)
{ {
// if (entity instanceof EntityLiving) // if (entity instanceof EntityLiving)
// { // {
// ((EntityLiving)entity).disableDespawn(); // ((EntityLiving)entity).disableDespawn();
// } // }
if (entity instanceof EntityLiving && itemStackIn.hasDisplayName()) if (entity instanceof EntityLiving && itemStackIn.hasDisplayName())
{ {
((EntityLiving)entity).setCustomNameTag(itemStackIn.getDisplayName()); ((EntityLiving)entity).setCustomNameTag(itemStackIn.getDisplayName());
} }
// if (!playerIn.creative) // if (!playerIn.creative)
// { // {
--itemStackIn.stackSize; --itemStackIn.stackSize;
// } // }
// if(z == 0) // if(z == 0)
// playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); // playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]);
}
} }
// }
} }
} }

54
java/src/game/item/ItemNpcSpawner.java
View file

@ -78,23 +78,23 @@ public class ItemNpcSpawner extends Item
d0 = 0.5D; d0 = 0.5D;
} }
int amount = Math.min(stack.stackSize, 128); // int amount = Math.min(stack.stackSize, 128);
for(int z = 0; z < amount; z++) { // for(int z = 0; z < amount; z++) {
Entity entity = spawnNpc(worldIn, this.spawned, (double)pos.getX() + 0.5D, (double)pos.getY() + d0, (double)pos.getZ() + 0.5D); Entity entity = spawnNpc(worldIn, this.spawned, (double)pos.getX() + 0.5D, (double)pos.getY() + d0, (double)pos.getZ() + 0.5D);
if (entity != null) if (entity != null)
{ {
if (stack.hasDisplayName()) if (stack.hasDisplayName())
{ {
entity.setCustomNameTag(stack.getDisplayName()); entity.setCustomNameTag(stack.getDisplayName());
} }
// if (!playerIn.creative) // if (!playerIn.creative)
// { // {
--stack.stackSize; --stack.stackSize;
// } // }
}
} }
// }
return true; return true;
} }
@ -132,26 +132,26 @@ public class ItemNpcSpawner extends Item
if (worldIn.getState(blockpos).getBlock() instanceof BlockLiquid) if (worldIn.getState(blockpos).getBlock() instanceof BlockLiquid)
{ {
int amount = Math.min(itemStackIn.stackSize, 128); // int amount = Math.min(itemStackIn.stackSize, 128);
for(int z = 0; z < amount; z++) { // for(int z = 0; z < amount; z++) {
Entity entity = spawnNpc(worldIn, this.spawned, (double)blockpos.getX() + 0.5D, (double)blockpos.getY() + 0.5D, (double)blockpos.getZ() + 0.5D); Entity entity = spawnNpc(worldIn, this.spawned, (double)blockpos.getX() + 0.5D, (double)blockpos.getY() + 0.5D, (double)blockpos.getZ() + 0.5D);
if (entity != null) if (entity != null)
{ {
if (itemStackIn.hasDisplayName()) if (itemStackIn.hasDisplayName())
{ {
((EntityLiving)entity).setCustomNameTag(itemStackIn.getDisplayName()); ((EntityLiving)entity).setCustomNameTag(itemStackIn.getDisplayName());
} }
// if (!playerIn.creative) // if (!playerIn.creative)
// { // {
--itemStackIn.stackSize; --itemStackIn.stackSize;
// } // }
// if(z == 0) // if(z == 0)
// playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); // playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]);
}
} }
// }
} }
} }