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

removed herobrine??!

Browse source
This commit is contained in:
Sen 2025-07-11 00:00:43 +02:00
parent 560bc1399a
commit 3a38411e13
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
242 changed files with 749 additions and 1407 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/src/main/java/server/biome/BiomeJungle.java
View file

@ -2,7 +2,7 @@ package server.biome;
import common.biome.Biome;
import common.entity.animal.EntityChicken;
import common.entity.animal.EntityOcelot;
import common.entity.animal.EntityCat;
import common.init.Blocks;
import common.init.WoodType;
import common.rng.Random;
@ -45,7 +45,7 @@ public class BiomeJungle extends GenBiome
if (!edge)
{
this.mobs.add(new RngSpawn(EntityOcelot.class, 2, 1, 1));
this.mobs.add(new RngSpawn(EntityCat.class, 2, 1, 1));
}
this.mobs.add(new RngSpawn(EntityChicken.class, 10, 4, 4));

32
server/src/main/java/server/biome/BiomeMushroom.java
View file

@ -1,24 +1,22 @@
package server.biome;
import common.biome.Biome;
import common.entity.animal.EntityMooshroom;
import common.entity.npc.EntityDwarf;
import common.init.Blocks;
import common.rng.WeightedList;
public class BiomeMushroom extends GenBiome
{
public BiomeMushroom()
{
super(Biome.MUSHROOMPLAINS);
this.treesPerChunk = -100;
this.flowersPerChunk = -100;
this.grassPerChunk = -100;
this.mushroomsPerChunk = 1;
this.bigMushroomsPerChunk = 1;
this.topBlock = Blocks.mycelium.getState();
}
protected void addMobs(WeightedList<RngSpawn> mobs) {
mobs.add(new RngSpawn(EntityMooshroom.class, 8, 4, 8));
}
public class BiomeMushroom extends GenBiome {
public BiomeMushroom() {
super(Biome.MUSHROOMPLAINS);
this.treesPerChunk = -100;
this.flowersPerChunk = -100;
this.grassPerChunk = -100;
this.mushroomsPerChunk = 1;
this.bigMushroomsPerChunk = 1;
this.topBlock = Blocks.mycelium.getState();
}
protected void addMobs(WeightedList<RngSpawn> mobs) {
mobs.add(new RngSpawn(EntityDwarf.class, 8, 4, 8));
}
}

3
server/src/main/java/server/biome/BiomeTian.java
View file

@ -6,6 +6,7 @@ import common.entity.animal.EntityBat;
import common.entity.animal.EntityMouse;
import common.entity.animal.EntityRabbit;
import common.entity.npc.EntityCultivator;
import common.entity.npc.EntityMerfolk;
import common.init.Blocks;
import common.init.WoodType;
import common.rng.Random;
@ -42,8 +43,8 @@ public class BiomeTian extends GenBiome
}
protected void addMobs(WeightedList<RngSpawn> mobs) {
// mobs.add(new Biome.RngSpawn(EntityHaunter.class, 50, 4, 4));
mobs.add(new RngSpawn(EntityCultivator.class, 50, 1, 1));
mobs.add(new RngSpawn(EntityMerfolk.class, 10, 4, 4));
mobs.add(new RngSpawn(EntityRabbit.class, 10, 3, 10));
mobs.add(new RngSpawn(EntityBat.class, 10, 8, 8));
mobs.add(new RngSpawn(EntityMouse.class, 10, 8, 8));

5
server/src/main/java/server/biome/BiomeWater.java
View file

@ -1,7 +1,7 @@
package server.biome;
import common.biome.Biome;
import common.entity.animal.EntitySquid;
import common.entity.npc.EntityMerfolk;
import common.rng.WeightedList;
public class BiomeWater extends GenBiome {
@ -11,10 +11,11 @@ public class BiomeWater extends GenBiome {
super(base);
this.river = river;
this.disableBeach();
if(!this.river)
this.mobs.add(new RngSpawn(EntityMerfolk.class, 10, 4, 4));
}
protected void addMobs(WeightedList<RngSpawn> mobs) {
mobs.add(new RngSpawn(EntitySquid.class, 10, 4, 4));
}
public Temperature getTempCategory() {

2
server/src/main/java/server/biome/GenBiome.java
View file

@ -13,7 +13,6 @@ import common.entity.animal.EntityMouse;
import common.entity.animal.EntityPig;
import common.entity.animal.EntityRabbit;
import common.entity.animal.EntitySheep;
import common.entity.animal.EntitySquid;
import common.entity.npc.EntityArachnoid;
import common.entity.npc.EntityHaunter;
import common.entity.npc.EntityMage;
@ -224,7 +223,6 @@ public abstract class GenBiome implements IBiome {
mobs.add(new RngSpawn(EntitySlime.class, 100, 4, 4));
// mobs.add(new Biome.RngSpawn(EntityEnder....class, 10, 1, 4));
mobs.add(new RngSpawn(EntityMage.class, 5, 1, 1));
mobs.add(new RngSpawn(EntitySquid.class, 10, 4, 4));
mobs.add(new RngSpawn(EntityBat.class, 10, 8, 8));
mobs.add(new RngSpawn(EntityMouse.class, 10, 8, 8));
}

10
server/src/main/java/server/world/Converter.java
View file

@ -98,12 +98,10 @@ import common.entity.animal.EntityBat;
import common.entity.animal.EntityChicken;
import common.entity.animal.EntityCow;
import common.entity.animal.EntityHorse;
import common.entity.animal.EntityMooshroom;
import common.entity.animal.EntityOcelot;
import common.entity.animal.EntityCat;
import common.entity.animal.EntityPig;
import common.entity.animal.EntityRabbit;
import common.entity.animal.EntitySheep;
import common.entity.animal.EntitySquid;
import common.entity.animal.EntityWolf;
import common.entity.item.EntityBoat;
import common.entity.item.EntityMinecart;
@ -363,12 +361,10 @@ public abstract class Converter {
mapEntity(EntityBat.class, "Bat", "bat");
mapEntity(EntityPig.class, "Pig", "pig");
mapEntity(EntitySheep.class, "Sheep", "sheep");
mapEntity(EntityCow.class, "Cow", "cow");
mapEntity(EntityCow.class, "Cow", "cow", "MushroomCow", "mooshroom");
mapEntity(EntityChicken.class, "Chicken", "chicken");
mapEntity(EntitySquid.class, "Squid", "squid");
mapEntity(EntityWolf.class, "Wolf", "wolf");
mapEntity(EntityMooshroom.class, "MushroomCow", "mooshroom");
mapEntity(EntityOcelot.class, "Ozelot", "ocelot");
mapEntity(EntityCat.class, "Ozelot", "ocelot");
mapEntity(EntityHorse.class, "EntityHorse", "horse");
mapEntity(EntityRabbit.class, "Rabbit", "rabbit");

6
server/src/main/java/server/world/Spawner.java
View file

@ -5,8 +5,8 @@ import java.util.Set;
import common.block.Block;
import common.collect.Sets;
import common.entity.npc.EntityNPC;
import common.entity.npc.EntityWaterNPC;
import common.entity.types.EntityLiving;
import common.entity.types.EntityWaterMob;
import common.init.Blocks;
import common.rng.Random;
import common.rng.WeightedList;
@ -121,7 +121,7 @@ public abstract class Spawner {
cmax = m + entry.min + world.rand.zrange(1 + entry.max - entry.min);
}
if(world.canCreatureTypeSpawnHere(entry, mpos)
&& canSpawnAt(EntityWaterMob.class.isAssignableFrom(entry.type), world, mpos)) {
&& canSpawnAt(EntityWaterNPC.class.isAssignableFrom(entry.type), world, mpos)) {
EntityLiving entity;
try {
entity = entry.type.getConstructor(World.class).newInstance(world);
@ -178,7 +178,7 @@ public abstract class Spawner {
boolean flag = false;
for(int m = 0; !flag && m < 4; ++m) {
BlockPos pos = world.getTopSolidOrLiquidBlock(new BlockPos(mx, 0, mz));
if(canSpawnAt(EntityWaterMob.class.isAssignableFrom(entry.type), world, pos)) {
if(canSpawnAt(EntityWaterNPC.class.isAssignableFrom(entry.type), world, pos)) {
EntityLiving entity;
try {
entity = entry.type.getConstructor(World.class).newInstance(world);