renme config class, add blocks/items devmode startup check

This commit is contained in:
Sen 2025-06-01 14:51:22 +02:00
parent 141c1b1f5c
commit ee3bf79c4c
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
98 changed files with 1463 additions and 928 deletions

View file

@ -4,8 +4,8 @@ import common.block.foliage.BlockTallGrass;
import common.entity.animal.EntitySheep; import common.entity.animal.EntitySheep;
import common.init.BlockRegistry; import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -88,7 +88,7 @@ public class EntityAIEatGrass extends EntityAIBase
State state = this.entityWorld.getState(blockpos); State state = this.entityWorld.getState(blockpos);
if (state.getBlock() == Blocks.tallgrass && state.getValue(BlockTallGrass.TYPE) == BlockTallGrass.EnumType.GRASS) if (state.getBlock() == Blocks.tallgrass && state.getValue(BlockTallGrass.TYPE) == BlockTallGrass.EnumType.GRASS)
{ {
if (Config.mobGrief) if (Vars.mobGrief)
{ {
this.entityWorld.destroyBlock(blockpos, false); this.entityWorld.destroyBlock(blockpos, false);
} }
@ -101,7 +101,7 @@ public class EntityAIEatGrass extends EntityAIBase
if (this.entityWorld.getState(blockpos1).getBlock() == Blocks.grass) if (this.entityWorld.getState(blockpos1).getBlock() == Blocks.grass)
{ {
if (Config.mobGrief) if (Vars.mobGrief)
{ {
this.entityWorld.playAuxSFX(2001, blockpos1, BlockRegistry.getIdFromBlock(Blocks.grass)); this.entityWorld.playAuxSFX(2001, blockpos1, BlockRegistry.getIdFromBlock(Blocks.grass));
this.entityWorld.setState(blockpos1, Blocks.dirt.getState(), 2); this.entityWorld.setState(blockpos1, Blocks.dirt.getState(), 2);

View file

@ -6,9 +6,9 @@ import common.entity.item.EntityXp;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal; import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.model.ParticleType; import common.model.ParticleType;
import common.rng.Random; import common.rng.Random;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityAIMate extends EntityAIBase public class EntityAIMate extends EntityAIBase
@ -158,7 +158,7 @@ public class EntityAIMate extends EntityAIBase
this.theWorld.spawnParticle(ParticleType.HEART, this.theAnimal.posX + d3, this.theAnimal.posY + d4, this.theAnimal.posZ + d5, d0, d1, d2); this.theWorld.spawnParticle(ParticleType.HEART, this.theAnimal.posX + d3, this.theAnimal.posY + d4, this.theAnimal.posZ + d5, d0, d1, d2);
} }
if (entityplayer != null && Config.breedingXP) // FIX xp if (entityplayer != null && Vars.breedingXP) // FIX xp
{ {
this.theWorld.spawnEntityInWorld(new EntityXp(this.theWorld, this.theAnimal.posX, this.theAnimal.posY, this.theAnimal.posZ, random.zrange(7) + 1)); this.theWorld.spawnEntityInWorld(new EntityXp(this.theWorld, this.theAnimal.posX, this.theAnimal.posY, this.theAnimal.posZ, random.zrange(7) + 1));
} }

View file

@ -6,12 +6,12 @@ import common.block.Block;
import common.collect.Maps; import common.collect.Maps;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.item.ItemStack; import common.item.ItemStack;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.ExtMath; import common.util.ExtMath;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -79,7 +79,7 @@ public class EntityAITakePlace extends EntityAIBase
public boolean shouldExecute() public boolean shouldExecute()
{ {
if(!Config.mobGrief || this.entity.getAttackTarget() != null) if(!Vars.mobGrief || this.entity.getAttackTarget() != null)
return false; return false;
if(this.entity.getHeldItem() == null) { if(this.entity.getHeldItem() == null) {
this.place = false; this.place = false;

View file

@ -4,11 +4,11 @@ import common.attributes.Attribute;
import common.attributes.AttributeInstance; import common.attributes.AttributeInstance;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.IEntityOwnable; import common.entity.types.IEntityOwnable;
import common.init.Config;
import common.pathfinding.PathEntity; import common.pathfinding.PathEntity;
import common.pathfinding.PathPoint; import common.pathfinding.PathPoint;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.ExtMath; import common.util.ExtMath;
import common.vars.Vars;
public abstract class EntityAITarget extends EntityAIBase public abstract class EntityAITarget extends EntityAIBase
{ {
@ -99,7 +99,7 @@ public abstract class EntityAITarget extends EntityAIBase
} }
} }
return Config.mobAttacks; return Vars.mobAttacks;
} }
// } // }
} }
@ -146,7 +146,7 @@ public abstract class EntityAITarget extends EntityAIBase
{ {
return false; return false;
} }
else if (!Config.infight && target.getClass() == attacker.getClass()) else if (!Vars.infight && target.getClass() == attacker.getClass())
{ {
return false; return false;
} }
@ -174,7 +174,7 @@ public abstract class EntityAITarget extends EntityAIBase
return false; return false;
// } // }
} }
else if (!Config.mobAttacks) else if (!Vars.mobAttacks)
{ {
return false; return false;
} }

View file

@ -24,7 +24,6 @@ import common.entity.item.EntityItem;
import common.entity.item.EntityXp; import common.entity.item.EntityXp;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
@ -43,6 +42,7 @@ import common.util.Facing;
import common.util.HitPosition; import common.util.HitPosition;
import common.util.Vec3; import common.util.Vec3;
import common.util.HitPosition.ObjectType; import common.util.HitPosition.ObjectType;
import common.vars.Vars;
import common.world.Explosion; import common.world.Explosion;
import common.world.IBlockAccess; import common.world.IBlockAccess;
import common.world.IWorldAccess; import common.world.IWorldAccess;
@ -600,7 +600,7 @@ public class Block {
} }
public static void spawnAsEntity(World worldIn, BlockPos pos, ItemStack stack) { public static void spawnAsEntity(World worldIn, BlockPos pos, ItemStack stack) {
if(!worldIn.client && Config.blockDrop) { if(!worldIn.client && Vars.blockDrop) {
float f = 0.5F; float f = 0.5F;
double d0 = (double)(worldIn.rand.floatv() * f) + (double)(1.0F - f) * 0.5D; double d0 = (double)(worldIn.rand.floatv() * f) + (double)(1.0F - f) * 0.5D;
double d1 = (double)(worldIn.rand.floatv() * f) + (double)(1.0F - f) * 0.5D; double d1 = (double)(worldIn.rand.floatv() * f) + (double)(1.0F - f) * 0.5D;
@ -612,7 +612,7 @@ public class Block {
} }
protected void dropXpOnBlockBreak(World worldIn, BlockPos pos, int amount) { protected void dropXpOnBlockBreak(World worldIn, BlockPos pos, int amount) {
if(!worldIn.client && Config.blockXP) { if(!worldIn.client && Vars.blockXP) {
while(amount > 0) { while(amount > 0) {
int i = EntityXp.getXPSplit(amount); int i = EntityXp.getXPSplit(amount);
amount -= i; amount -= i;

View file

@ -3,9 +3,9 @@ package common.block;
import common.block.natural.BlockFire; import common.block.natural.BlockFire;
import common.entity.item.EntityFalling; import common.entity.item.EntityFalling;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -31,7 +31,7 @@ public class BlockFalling extends Block {
} }
public void updateTick(AWorldServer world, BlockPos pos, State state, Random rand) { public void updateTick(AWorldServer world, BlockPos pos, State state, Random rand) {
if(Config.blockGravity) if(Vars.blockGravity)
this.checkFallable(world, pos); this.checkFallable(world, pos);
} }

View file

@ -6,13 +6,13 @@ import common.block.Material;
import common.entity.item.EntityFalling; import common.entity.item.EntityFalling;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.model.Model; import common.model.Model;
import common.model.ModelProvider; import common.model.ModelProvider;
import common.model.ParticleType; import common.model.ParticleType;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -100,7 +100,7 @@ public class BlockDragonEgg extends Block
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(Config.blockGravity) if(Vars.blockGravity)
this.checkFall(worldIn, pos); this.checkFall(worldIn, pos);
} }
@ -168,7 +168,7 @@ public class BlockDragonEgg extends Block
else else
{ {
worldIn.setBlockToAir(pos); worldIn.setBlockToAir(pos);
if(!Config.blockGravity) { if(!Vars.blockGravity) {
BlockPos blockpos2; BlockPos blockpos2;
for(blockpos2 = blockpos; BlockFalling.canFallInto(worldIn, blockpos2) && blockpos2.getY() > 0; blockpos2 = blockpos2.down()) { for(blockpos2 = blockpos; BlockFalling.canFallInto(worldIn, blockpos2) && blockpos2.getY() > 0; blockpos2 = blockpos2.down()) {
} }

View file

@ -4,13 +4,13 @@ import common.biome.Biome;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.model.Model; import common.model.Model;
import common.model.ModelProvider; import common.model.ModelProvider;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -27,10 +27,10 @@ public class BlockBlackenedSoil extends Block
{ {
if (worldIn.getLightFromNeighbors(pos.up()) < 2 && worldIn.getState(pos.up()).getBlock().getLightOpacity() > 6) if (worldIn.getLightFromNeighbors(pos.up()) < 2 && worldIn.getState(pos.up()).getBlock().getLightOpacity() > 6)
{ {
if(Config.darkSoilDecay) if(Vars.darkSoilDecay)
worldIn.setState(pos, Blocks.blackened_dirt.getState()); worldIn.setState(pos, Blocks.blackened_dirt.getState());
} }
else if (Config.darkSoilSpread && worldIn.getLightFromNeighbors(pos.up()) >= 1) else if (Vars.darkSoilSpread && worldIn.getLightFromNeighbors(pos.up()) >= 1)
{ {
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {

View file

@ -2,11 +2,11 @@ package common.block.foliage;
import common.block.Block; import common.block.Block;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.model.Model; import common.model.Model;
import common.model.ModelProvider; import common.model.ModelProvider;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -22,7 +22,7 @@ public class BlockBlueShroom extends BlockBush
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if (Config.blueShroomGrowth > 0 && rand.chance(Config.blueShroomGrowth)) if (Vars.blueShroomGrowth > 0 && rand.chance(Vars.blueShroomGrowth))
{ {
int i = 5; int i = 5;
int j = 4; int j = 4;

View file

@ -5,7 +5,6 @@ import common.block.Material;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.Entity; import common.entity.Entity;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.item.CheatTab; import common.item.CheatTab;
import common.model.BlockLayer; import common.model.BlockLayer;
import common.model.Model; import common.model.Model;
@ -16,6 +15,7 @@ import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -48,7 +48,7 @@ public class BlockCactus extends Block
{ {
BlockPos blockpos = pos.up(); BlockPos blockpos = pos.up();
if (Config.cactusHeight > 0 && worldIn.isAirBlock(blockpos)) if (Vars.cactusHeight > 0 && worldIn.isAirBlock(blockpos))
{ {
int i; int i;
@ -57,7 +57,7 @@ public class BlockCactus extends Block
; ;
} }
if (i < Config.cactusHeight) if (i < Vars.cactusHeight)
{ {
int j = ((Integer)state.getValue(AGE)).intValue(); int j = ((Integer)state.getValue(AGE)).intValue();
@ -136,7 +136,7 @@ public class BlockCactus extends Block
*/ */
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, State state, Entity entityIn) public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, State state, Entity entityIn)
{ {
if(worldIn.client || Config.cactusDamage) if(worldIn.client || Vars.cactusDamage)
entityIn.attackEntityFrom(DamageSource.cactus, 1); entityIn.attackEntityFrom(DamageSource.cactus, 1);
} }

View file

@ -6,7 +6,6 @@ import common.block.Material;
import common.color.DyeColor; import common.color.DyeColor;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.Item; import common.item.Item;
import common.item.ItemStack; import common.item.ItemStack;
@ -20,6 +19,7 @@ import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -42,7 +42,7 @@ public class BlockCocoa extends BlockDirectional implements IGrowable
{ {
this.dropBlock(worldIn, pos, state); this.dropBlock(worldIn, pos, state);
} }
else if (Config.cocoaGrowth > 0 && worldIn.rand.chance(Config.cocoaGrowth)) else if (Vars.cocoaGrowth > 0 && worldIn.rand.chance(Vars.cocoaGrowth))
{ {
int i = ((Integer)state.getValue(AGE)).intValue(); int i = ((Integer)state.getValue(AGE)).intValue();

View file

@ -3,7 +3,6 @@ package common.block.foliage;
import common.block.Block; import common.block.Block;
import common.block.SoundType; import common.block.SoundType;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
@ -14,6 +13,7 @@ import common.properties.IProperty;
import common.properties.PropertyInteger; import common.properties.PropertyInteger;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -46,7 +46,7 @@ public class BlockCrops extends BlockBush implements IGrowable
{ {
super.updateTick(worldIn, pos, state, rand); super.updateTick(worldIn, pos, state, rand);
if (Config.cropGrowth > 0 && worldIn.getLightFromNeighbors(pos.up()) >= 9) if (Vars.cropGrowth > 0 && worldIn.getLightFromNeighbors(pos.up()) >= 9)
{ {
int i = ((Integer)state.getValue(AGE)).intValue(); int i = ((Integer)state.getValue(AGE)).intValue();
@ -54,7 +54,7 @@ public class BlockCrops extends BlockBush implements IGrowable
{ {
float f = getGrowthChance(this, worldIn, pos); float f = getGrowthChance(this, worldIn, pos);
if (rand.chance((int)((float)(Config.cropGrowth - 1) / f) + 1)) if (rand.chance((int)((float)(Vars.cropGrowth - 1) / f) + 1))
{ {
worldIn.setState(pos, state.withProperty(AGE, Integer.valueOf(i + 1)), 2); worldIn.setState(pos, state.withProperty(AGE, Integer.valueOf(i + 1)), 2);
} }

View file

@ -10,7 +10,6 @@ import common.color.Colorizer;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.item.CheatTab; import common.item.CheatTab;
@ -27,6 +26,7 @@ import common.util.BlockPos;
import common.util.Facing; import common.util.Facing;
import common.util.Identifyable; import common.util.Identifyable;
import common.util.Facing.Axis; import common.util.Facing.Axis;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -50,7 +50,7 @@ public class BlockDoublePlant extends BlockBush implements IGrowable
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(Config.plantDry && worldIn.getTemperatureC(pos) >= 50.0f) if(Vars.plantDry && worldIn.getTemperatureC(pos) >= 50.0f)
{ {
boolean upper = state.getValue(HALF) == EnumBlockHalf.UPPER; boolean upper = state.getValue(HALF) == EnumBlockHalf.UPPER;
if(!upper) if(!upper)

View file

@ -6,7 +6,6 @@ import common.block.natural.BlockDirt;
import common.entity.Entity; import common.entity.Entity;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.item.Item; import common.item.Item;
import common.model.Model; import common.model.Model;
@ -17,6 +16,7 @@ import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -59,18 +59,18 @@ public class BlockFarmland extends Block
if (!this.hasWater(worldIn, pos) && !worldIn.isRainingAt(pos.up(), true)) if (!this.hasWater(worldIn, pos) && !worldIn.isRainingAt(pos.up(), true))
{ {
if(Config.cropDrying) { if(Vars.cropDrying) {
if (i > 0) if (i > 0)
{ {
worldIn.setState(pos, state.withProperty(MOISTURE, Integer.valueOf(i - 1)), 2); worldIn.setState(pos, state.withProperty(MOISTURE, Integer.valueOf(i - 1)), 2);
} }
else if (Config.cropDecay && !this.hasCrops(worldIn, pos)) else if (Vars.cropDecay && !this.hasCrops(worldIn, pos))
{ {
worldIn.setState(pos, Blocks.dirt.getState()); worldIn.setState(pos, Blocks.dirt.getState());
} }
} }
} }
else if (Config.cropSoaking && i < 7) else if (Vars.cropSoaking && i < 7)
{ {
worldIn.setState(pos, state.withProperty(MOISTURE, Integer.valueOf(7)), 2); worldIn.setState(pos, state.withProperty(MOISTURE, Integer.valueOf(7)), 2);
} }
@ -83,9 +83,9 @@ public class BlockFarmland extends Block
{ {
if (entityIn instanceof EntityLiving) if (entityIn instanceof EntityLiving)
{ {
if (!worldIn.client && Config.cropTrampling && worldIn.rand.floatv() < fallDistance - 0.5F) if (!worldIn.client && Vars.cropTrampling && worldIn.rand.floatv() < fallDistance - 0.5F)
{ {
if (Config.mobGrief) if (Vars.mobGrief)
worldIn.setState(pos, Blocks.dirt.getState()); worldIn.setState(pos, Blocks.dirt.getState());
} }

View file

@ -7,7 +7,6 @@ import java.util.function.Predicate;
import common.collect.Filter; import common.collect.Filter;
import common.collect.Lists; import common.collect.Lists;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.item.ItemStack; import common.item.ItemStack;
@ -18,6 +17,7 @@ import common.properties.PropertyEnum;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Identifyable; import common.util.Identifyable;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -33,7 +33,7 @@ public abstract class BlockFlower extends BlockBush
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(Config.flowerDry && worldIn.getTemperatureC(pos) >= 50.0f) if(Vars.flowerDry && worldIn.getTemperatureC(pos) >= 50.0f)
{ {
worldIn.setState(pos, worldIn.rand.chance(3) ? Blocks.air.getState() : worldIn.setState(pos, worldIn.rand.chance(3) ? Blocks.air.getState() :
Blocks.tallgrass.getState().withProperty(BlockTallGrass.TYPE, BlockTallGrass.EnumType.DEAD_BUSH)); Blocks.tallgrass.getState().withProperty(BlockTallGrass.TYPE, BlockTallGrass.EnumType.DEAD_BUSH));

View file

@ -6,7 +6,6 @@ import common.block.Material;
import common.block.natural.BlockDirt; import common.block.natural.BlockDirt;
import common.color.Colorizer; import common.color.Colorizer;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.model.BlockLayer; import common.model.BlockLayer;
@ -16,6 +15,7 @@ import common.properties.IProperty;
import common.properties.PropertyBool; import common.properties.PropertyBool;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -65,12 +65,12 @@ public class BlockGrass extends Block implements IGrowable
// { // {
if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getState(pos.up()).getBlock().getLightOpacity() > 2) if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getState(pos.up()).getBlock().getLightOpacity() > 2)
{ {
if(Config.grassDecay) if(Vars.grassDecay)
worldIn.setState(pos, Blocks.dirt.getState()); worldIn.setState(pos, Blocks.dirt.getState());
} }
else if(worldIn.getTemperatureC(pos) < 50.0f) else if(worldIn.getTemperatureC(pos) < 50.0f)
{ {
if (Config.grassSpread && worldIn.getLightFromNeighbors(pos.up()) >= 9) if (Vars.grassSpread && worldIn.getLightFromNeighbors(pos.up()) >= 9)
{ {
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
@ -86,7 +86,7 @@ public class BlockGrass extends Block implements IGrowable
} }
} }
else { else {
if(Config.grassDry) if(Vars.grassDry)
worldIn.setState(pos, worldIn.rand.chance(20) ? Blocks.dirt.getState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.COARSE_DIRT) : worldIn.setState(pos, worldIn.rand.chance(20) ? Blocks.dirt.getState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.COARSE_DIRT) :
Blocks.dirt.getState()); Blocks.dirt.getState());
} }

View file

@ -9,7 +9,6 @@ import common.collect.Lists;
import common.color.Colorizer; import common.color.Colorizer;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.WoodType; import common.init.WoodType;
import common.item.CheatTab; import common.item.CheatTab;
@ -25,6 +24,7 @@ import common.properties.PropertyEnum;
import common.rng.Random; import common.rng.Random;
import common.tileentity.TileEntity; import common.tileentity.TileEntity;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.AWorldClient; import common.world.AWorldClient;
import common.world.State; import common.world.State;
@ -100,15 +100,15 @@ public class BlockLeaves extends BlockLeavesBase
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(Config.seasonLeaves && state.getValue(TYPE) != worldIn.getLeavesGen(pos)) { if(Vars.seasonLeaves && state.getValue(TYPE) != worldIn.getLeavesGen(pos)) {
worldIn.setState(pos, state.withProperty(TYPE, worldIn.getLeavesGen(pos)), 2); worldIn.setState(pos, state.withProperty(TYPE, worldIn.getLeavesGen(pos)), 2);
} }
if(Config.leafDry && worldIn.getTemperatureC(pos) >= 50.0f) { if(Vars.leafDry && worldIn.getTemperatureC(pos) >= 50.0f) {
worldIn.setState(pos, worldIn.rand.chance(40) ? Blocks.air.getState() : Blocks.dry_leaves.getState()); worldIn.setState(pos, worldIn.rand.chance(40) ? Blocks.air.getState() : Blocks.dry_leaves.getState());
} }
// if (!worldIn.client) // if (!worldIn.client)
// { // {
else if (Config.leavesDecay && ((Boolean)state.getValue(DECAY)).booleanValue()) else if (Vars.leavesDecay && ((Boolean)state.getValue(DECAY)).booleanValue())
{ {
int i = 4; int i = 4;
int j = i + 1; int j = i + 1;

View file

@ -4,11 +4,11 @@ import common.biome.IBiome;
import common.block.Block; import common.block.Block;
import common.block.natural.BlockDirt; import common.block.natural.BlockDirt;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.model.Model; import common.model.Model;
import common.model.ModelProvider; import common.model.ModelProvider;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -24,7 +24,7 @@ public class BlockMushroom extends BlockBush implements IGrowable
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if (Config.shroomGrowth > 0 && rand.chance(Config.shroomGrowth)) if (Vars.shroomGrowth > 0 && rand.chance(Vars.shroomGrowth))
{ {
int i = 5; int i = 5;
int j = 4; int j = 4;

View file

@ -4,7 +4,6 @@ import common.block.Block;
import common.block.Material; import common.block.Material;
import common.block.natural.BlockDirt; import common.block.natural.BlockDirt;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.model.Model; import common.model.Model;
@ -14,6 +13,7 @@ import common.properties.IProperty;
import common.properties.PropertyBool; import common.properties.PropertyBool;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.AWorldClient; import common.world.AWorldClient;
import common.world.State; import common.world.State;
@ -47,10 +47,10 @@ public class BlockMycelium extends Block
// { // {
if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getState(pos.up()).getBlock().getLightOpacity() > 2) if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getState(pos.up()).getBlock().getLightOpacity() > 2)
{ {
if(Config.mycelDecay) if(Vars.mycelDecay)
worldIn.setState(pos, Blocks.dirt.getState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT)); worldIn.setState(pos, Blocks.dirt.getState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT));
} }
else if(Config.mycelSpread) else if(Vars.mycelSpread)
{ {
if (worldIn.getLightFromNeighbors(pos.up()) >= 9) if (worldIn.getLightFromNeighbors(pos.up()) >= 9)
{ {

View file

@ -3,7 +3,6 @@ package common.block.foliage;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.Item; import common.item.Item;
import common.model.BlockLayer; import common.model.BlockLayer;
@ -15,6 +14,7 @@ import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -35,14 +35,14 @@ public class BlockReed extends Block
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(Config.reedDry && worldIn.getTemperatureC(pos) >= 50.0f) if(Vars.reedDry && worldIn.getTemperatureC(pos) >= 50.0f)
{ {
worldIn.destroyBlock(pos, true); worldIn.destroyBlock(pos, true);
return; return;
} }
if (worldIn.getState(pos.down()).getBlock() == Blocks.reeds || this.checkForDrop(worldIn, pos, state)) if (worldIn.getState(pos.down()).getBlock() == Blocks.reeds || this.checkForDrop(worldIn, pos, state))
{ {
if (Config.reedHeight > 0 && worldIn.isAirBlock(pos.up())) if (Vars.reedHeight > 0 && worldIn.isAirBlock(pos.up()))
{ {
int i; int i;
@ -51,7 +51,7 @@ public class BlockReed extends Block
; ;
} }
if (i < Config.reedHeight) if (i < Vars.reedHeight)
{ {
int j = ((Integer)state.getValue(AGE)).intValue(); int j = ((Integer)state.getValue(AGE)).intValue();

View file

@ -5,7 +5,6 @@ import java.util.List;
import common.biome.IBiome; import common.biome.IBiome;
import common.collect.Lists; import common.collect.Lists;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.WoodType; import common.init.WoodType;
import common.item.CheatTab; import common.item.CheatTab;
import common.model.Model; import common.model.Model;
@ -14,6 +13,7 @@ import common.properties.IProperty;
import common.properties.PropertyInteger; import common.properties.PropertyInteger;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -46,7 +46,7 @@ public class BlockSapling extends BlockBush implements IGrowable
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(Config.saplingDry && worldIn.getTemperatureC(pos) >= 50.0f) if(Vars.saplingDry && worldIn.getTemperatureC(pos) >= 50.0f)
{ {
worldIn.setState(pos, worldIn.rand.chance(25) ? Blocks.air.getState() : worldIn.setState(pos, worldIn.rand.chance(25) ? Blocks.air.getState() :
Blocks.tallgrass.getState().withProperty(BlockTallGrass.TYPE, BlockTallGrass.EnumType.DEAD_BUSH)); Blocks.tallgrass.getState().withProperty(BlockTallGrass.TYPE, BlockTallGrass.EnumType.DEAD_BUSH));
@ -56,7 +56,7 @@ public class BlockSapling extends BlockBush implements IGrowable
// { // {
super.updateTick(worldIn, pos, state, rand); super.updateTick(worldIn, pos, state, rand);
if (Config.treeGrowth > 0 && worldIn.getLightFromNeighbors(pos.up()) >= 9 && rand.chance(Config.treeGrowth)) if (Vars.treeGrowth > 0 && worldIn.getLightFromNeighbors(pos.up()) >= 9 && rand.chance(Vars.treeGrowth))
{ {
this.grow(worldIn, pos, state, rand); this.grow(worldIn, pos, state, rand);
} }

View file

@ -4,7 +4,6 @@ import java.util.function.Predicate;
import common.block.Block; import common.block.Block;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
@ -18,6 +17,7 @@ import common.properties.PropertyInteger;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -77,11 +77,11 @@ public class BlockStem extends BlockBush implements IGrowable
{ {
super.updateTick(worldIn, pos, state, rand); super.updateTick(worldIn, pos, state, rand);
if (Config.stemGrowth > 0 && worldIn.getLightFromNeighbors(pos.up()) >= 9) if (Vars.stemGrowth > 0 && worldIn.getLightFromNeighbors(pos.up()) >= 9)
{ {
float f = BlockCrops.getGrowthChance(this, worldIn, pos); float f = BlockCrops.getGrowthChance(this, worldIn, pos);
if (rand.chance((int)((float)(Config.stemGrowth - 1) / f) + 1)) if (rand.chance((int)((float)(Vars.stemGrowth - 1) / f) + 1))
{ {
int i = ((Integer)state.getValue(AGE)).intValue(); int i = ((Integer)state.getValue(AGE)).intValue();

View file

@ -6,7 +6,6 @@ import common.block.Material;
import common.color.Colorizer; import common.color.Colorizer;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
@ -20,6 +19,7 @@ import common.rng.Random;
import common.tileentity.TileEntity; import common.tileentity.TileEntity;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Identifyable; import common.util.Identifyable;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -40,7 +40,7 @@ public class BlockTallGrass extends BlockBush implements IGrowable
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(Config.tallgrassDry && worldIn.getTemperatureC(pos) >= 50.0f && state.getValue(TYPE) != EnumType.DEAD_BUSH) if(Vars.tallgrassDry && worldIn.getTemperatureC(pos) >= 50.0f && state.getValue(TYPE) != EnumType.DEAD_BUSH)
{ {
worldIn.setState(pos, state.getValue(TYPE) == EnumType.GRASS || worldIn.rand.chance(20) ? Blocks.air.getState() : worldIn.setState(pos, state.getValue(TYPE) == EnumType.GRASS || worldIn.rand.chance(20) ? Blocks.air.getState() :
this.getState().withProperty(TYPE, EnumType.DEAD_BUSH)); this.getState().withProperty(TYPE, EnumType.DEAD_BUSH));

View file

@ -6,7 +6,6 @@ import common.color.Colorizer;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.item.ItemShears; import common.item.ItemShears;
@ -22,6 +21,7 @@ import common.tileentity.TileEntity;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -244,14 +244,14 @@ public class BlockVine extends Block
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(Config.vineDry && worldIn.getTemperatureC(pos) >= 50.0f) if(Vars.vineDry && worldIn.getTemperatureC(pos) >= 50.0f)
{ {
worldIn.setBlockToAir(pos); worldIn.setBlockToAir(pos);
return; return;
} }
// if (!worldIn.client) // if (!worldIn.client)
// { // {
if (Config.vineGrowth > 0 && worldIn.rand.chance(Config.vineGrowth)) if (Vars.vineGrowth > 0 && worldIn.rand.chance(Vars.vineGrowth))
{ {
int i = 4; int i = 4;
int j = 5; int j = 5;

View file

@ -3,7 +3,6 @@ package common.block.foliage;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
@ -14,6 +13,7 @@ import common.properties.IProperty;
import common.properties.PropertyInteger; import common.properties.PropertyInteger;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -47,10 +47,10 @@ public class BlockWart extends BlockBush
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(Config.wartGrowth > 0) { if(Vars.wartGrowth > 0) {
int i = ((Integer)state.getValue(AGE)).intValue(); int i = ((Integer)state.getValue(AGE)).intValue();
if (i < 3 && rand.chance(Config.wartGrowth)) if (i < 3 && rand.chance(Vars.wartGrowth))
{ {
state = state.withProperty(AGE, Integer.valueOf(i + 1)); state = state.withProperty(AGE, Integer.valueOf(i + 1));
worldIn.setState(pos, state, 2); worldIn.setState(pos, state, 2);

View file

@ -7,10 +7,10 @@ import common.block.Block;
import common.block.Material; import common.block.Material;
import common.block.artificial.BlockDoor; import common.block.artificial.BlockDoor;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -33,7 +33,7 @@ public class BlockDynamicLiquid extends BlockLiquid
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if(!Config.liquidPhysics) if(!Vars.liquidPhysics)
return; return;
int i = ((Integer)state.getValue(LEVEL)).intValue(); int i = ((Integer)state.getValue(LEVEL)).intValue();
int j = 1; int j = 1;
@ -76,10 +76,10 @@ public class BlockDynamicLiquid extends BlockLiquid
} }
} }
if (this.adjacentSourceBlocks >= 2 && ((Config.mergeWater && this.material == Material.WATER) if (this.adjacentSourceBlocks >= 2 && ((Vars.mergeWater && this.material == Material.WATER)
|| (Config.mergeLava && this.material == Material.LAVA) || (Vars.mergeLava && this.material == Material.LAVA)
|| (this.infinite && Config.mergeInfinite && this.material != Material.WATER && this.material != Material.LAVA) || (this.infinite && Vars.mergeInfinite && this.material != Material.WATER && this.material != Material.LAVA)
|| (!this.infinite && Config.mergeFinite && this.material != Material.WATER && this.material != Material.LAVA))) || (!this.infinite && Vars.mergeFinite && this.material != Material.WATER && this.material != Material.LAVA)))
{ {
State iblockstate1 = worldIn.getState(pos.down()); State iblockstate1 = worldIn.getState(pos.down());

View file

@ -5,7 +5,6 @@ import common.block.Material;
import common.color.Colorizer; import common.color.Colorizer;
import common.entity.Entity; import common.entity.Entity;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.FluidRegistry; import common.init.FluidRegistry;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.Item; import common.item.Item;
@ -19,6 +18,7 @@ import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Facing; import common.util.Facing;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
import common.world.IBlockAccess; import common.world.IBlockAccess;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.AWorldClient; import common.world.AWorldClient;
@ -315,7 +315,7 @@ public abstract class BlockLiquid extends Block
public boolean checkForMixing(World worldIn, BlockPos pos, State state) public boolean checkForMixing(World worldIn, BlockPos pos, State state)
{ {
if(worldIn.client || !Config.liquidPhysics) if(worldIn.client || !Vars.liquidPhysics)
return true; return true;
if (this.material == Material.LAVA) if (this.material == Material.LAVA)
{ {

View file

@ -3,10 +3,10 @@ package common.block.liquid;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -44,9 +44,9 @@ public class BlockStaticLiquid extends BlockLiquid
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if (Config.lavaFire && this.material == Material.LAVA) if (Vars.lavaFire && this.material == Material.LAVA)
{ {
if (Config.fire) if (Vars.fire)
{ {
int i = rand.zrange(3); int i = rand.zrange(3);

View file

@ -4,10 +4,10 @@ import common.biome.Biome;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.item.CheatTab; import common.item.CheatTab;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -22,7 +22,7 @@ public class BlockBlackenedDirt extends Block
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if (Config.darkDirtSpread) if (Vars.darkDirtSpread)
{ {
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {

View file

@ -5,7 +5,6 @@ import java.util.Map;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.FlammabilityRegistry; import common.init.FlammabilityRegistry;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.model.BlockLayer; import common.model.BlockLayer;
@ -20,6 +19,7 @@ import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IBlockAccess; import common.world.IBlockAccess;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.AWorldClient; import common.world.AWorldClient;
@ -110,7 +110,7 @@ public class BlockFire extends Block
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if (Config.fire) if (Vars.fire)
{ {
if (!this.canPlaceBlockAt(worldIn, pos)) if (!this.canPlaceBlockAt(worldIn, pos))
{ {

View file

@ -2,12 +2,12 @@ package common.block.natural;
import common.block.BlockFalling; import common.block.BlockFalling;
import common.block.Material; import common.block.Material;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.rng.Random; import common.rng.Random;
import common.vars.Vars;
import common.world.State; import common.world.State;
public class BlockGravel extends BlockFalling public class BlockGravel extends BlockFalling
@ -19,7 +19,7 @@ public class BlockGravel extends BlockFalling
public Item getItemDropped(State state, Random rand, int fortune) public Item getItemDropped(State state, Random rand, int fortune)
{ {
int chance = Config.flintChance; int chance = Vars.flintChance;
if(chance <= 0) if(chance <= 0)
return ItemRegistry.getItemFromBlock(this); return ItemRegistry.getItemFromBlock(this);
fortune *= 3; fortune *= 3;

View file

@ -5,12 +5,12 @@ import common.block.Material;
import common.enchantment.EnchantmentHelper; import common.enchantment.EnchantmentHelper;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.ItemStack; import common.item.ItemStack;
import common.rng.Random; import common.rng.Random;
import common.tileentity.TileEntity; import common.tileentity.TileEntity;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.LightType; import common.world.LightType;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -48,7 +48,7 @@ public class BlockIce extends BlockTranslucent {
} }
public void updateTick(AWorldServer world, BlockPos pos, State state, Random rand) { public void updateTick(AWorldServer world, BlockPos pos, State state, Random rand) {
if(Config.iceMelt && (world.getLightFor(LightType.BLOCK, pos) > 11 - this.getLightOpacity() || !world.canFreezeAt(pos))) { if(Vars.iceMelt && (world.getLightFor(LightType.BLOCK, pos) > 11 - this.getLightOpacity() || !world.canFreezeAt(pos))) {
if(world.doesWaterVaporize(pos)) { if(world.doesWaterVaporize(pos)) {
world.setBlockToAir(pos); world.setBlockToAir(pos);
} }

View file

@ -2,13 +2,13 @@ package common.block.natural;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.item.ItemStack; import common.item.ItemStack;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -86,7 +86,7 @@ public class BlockOre extends Block
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, State state, float chance, int fortune) public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, State state, float chance, int fortune)
{ {
if(!worldIn.client && this.smeltItem != null && Config.cleanCut) { if(!worldIn.client && this.smeltItem != null && Vars.cleanCut) {
if (worldIn.rand.floatv() <= chance) if (worldIn.rand.floatv() <= chance)
{ {
spawnAsEntity(worldIn, pos, this.smeltItem.copy()); spawnAsEntity(worldIn, pos, this.smeltItem.copy());

View file

@ -4,7 +4,6 @@ import common.block.Block;
import common.block.Material; import common.block.Material;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
@ -19,6 +18,7 @@ import common.tileentity.TileEntity;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IBlockAccess; import common.world.IBlockAccess;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.LightType; import common.world.LightType;
@ -138,7 +138,7 @@ public class BlockSnow extends Block
public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand)
{ {
if (Config.snowMelt && (worldIn.getLightFor(LightType.BLOCK, pos) > 11 || !worldIn.canFreezeAt(pos))) if (Vars.snowMelt && (worldIn.getLightFor(LightType.BLOCK, pos) > 11 || !worldIn.canFreezeAt(pos)))
{ {
this.dropBlockAsItem(worldIn, pos, worldIn.getState(pos), 0); this.dropBlockAsItem(worldIn, pos, worldIn.getState(pos), 0);
worldIn.setBlockToAir(pos); worldIn.setBlockToAir(pos);

View file

@ -2,12 +2,12 @@ package common.block.natural;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.LightType; import common.world.LightType;
import common.world.State; import common.world.State;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -28,7 +28,7 @@ public class BlockSnowBlock extends Block {
} }
public void updateTick(AWorldServer world, BlockPos pos, State state, Random rand) { public void updateTick(AWorldServer world, BlockPos pos, State state, Random rand) {
if(Config.snowFullMelt && (world.getLightFor(LightType.BLOCK, pos) > 11 || !world.canFreezeAt(pos))) { if(Vars.snowFullMelt && (world.getLightFor(LightType.BLOCK, pos) > 11 || !world.canFreezeAt(pos))) {
this.dropBlockAsItem(world, pos, world.getState(pos), 0); this.dropBlockAsItem(world, pos, world.getState(pos), 0);
world.setBlockToAir(pos); world.setBlockToAir(pos);
} }

View file

@ -8,7 +8,6 @@ import common.entity.Entity;
import common.entity.animal.EntityOcelot; import common.entity.animal.EntityOcelot;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.inventory.Container; import common.inventory.Container;
@ -28,6 +27,7 @@ import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -443,7 +443,7 @@ public class BlockChest extends BlockContainer
if (ilockablecontainer != null) if (ilockablecontainer != null)
{ {
ItemStack stack = Config.locking ? playerIn.getHeldItem() : null; ItemStack stack = Vars.locking ? playerIn.getHeldItem() : null;
if(stack != null && stack.getItem() == Items.key) { if(stack != null && stack.getItem() == Items.key) {
if(ilockablecontainer.isLocked()) { if(ilockablecontainer.isLocked()) {
if(stack.hasDisplayName() && stack.getDisplayName().equals(ilockablecontainer.getLockCode().code())) { if(stack.hasDisplayName() && stack.getDisplayName().equals(ilockablecontainer.getLockCode().code())) {

View file

@ -2,9 +2,9 @@ package common.block.tech;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.init.Config;
import common.item.CheatTab; import common.item.CheatTab;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -16,13 +16,13 @@ public class BlockCore extends Block {
public void onBlockRemoved(AWorldServer world, BlockPos pos, State state) public void onBlockRemoved(AWorldServer world, BlockPos pos, State state)
{ {
if(Config.loaders) if(Vars.loaders)
world.removeLoader(pos); world.removeLoader(pos);
} }
public void onBlockAdded(AWorldServer world, BlockPos pos, State state) public void onBlockAdded(AWorldServer world, BlockPos pos, State state)
{ {
if(Config.loaders) if(Vars.loaders)
world.addLoader(pos); world.addLoader(pos);
} }
} }

View file

@ -10,7 +10,6 @@ import common.collect.Lists;
import common.entity.Entity; import common.entity.Entity;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.CheatTab; import common.item.CheatTab;
import common.item.ItemStack; import common.item.ItemStack;
@ -26,6 +25,7 @@ import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IWorldAccess; import common.world.IWorldAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -121,7 +121,7 @@ public class BlockPistonBase extends Block
{ {
int i = 1; int i = 1;
if (i + this.toMove.size() > Config.pistonLimit) if (i + this.toMove.size() > Vars.pistonLimit)
{ {
return false; return false;
} }
@ -139,7 +139,7 @@ public class BlockPistonBase extends Block
++i; ++i;
if (i + this.toMove.size() > Config.pistonLimit) if (i + this.toMove.size() > Vars.pistonLimit)
{ {
return false; return false;
} }
@ -195,7 +195,7 @@ public class BlockPistonBase extends Block
return true; return true;
} }
if (this.toMove.size() >= Config.pistonLimit) if (this.toMove.size() >= Vars.pistonLimit)
{ {
return false; return false;
} }

View file

@ -3,7 +3,6 @@ package common.block.tile;
import common.block.BlockContainer; import common.block.BlockContainer;
import common.block.Material; import common.block.Material;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.Item; import common.item.Item;
import common.rng.Random; import common.rng.Random;
@ -12,6 +11,7 @@ import common.tileentity.TileEntitySign;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.IBlockAccess; import common.world.IBlockAccess;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -28,7 +28,7 @@ public class BlockSign extends BlockContainer
public boolean onBlockActivated(World worldIn, BlockPos pos, State state, EntityNPC playerIn, Facing side, float hitX, float hitY, float hitZ) public boolean onBlockActivated(World worldIn, BlockPos pos, State state, EntityNPC playerIn, Facing side, float hitX, float hitY, float hitZ)
{ {
if (!worldIn.client && Config.editSigns) if (!worldIn.client && Vars.editSigns)
{ {
TileEntity tileentity = worldIn.getTileEntity(pos); TileEntity tileentity = worldIn.getTileEntity(pos);

View file

@ -3,10 +3,10 @@ package common.enchantment;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.Entity; import common.entity.Entity;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.item.ItemArmor; import common.item.ItemArmor;
import common.item.ItemStack; import common.item.ItemStack;
import common.rng.Random; import common.rng.Random;
import common.vars.Vars;
public class EnchantmentThorns extends Enchantment public class EnchantmentThorns extends Enchantment
{ {
@ -57,7 +57,7 @@ public class EnchantmentThorns extends Enchantment
Random random = user.getRNG(); Random random = user.getRNG();
ItemStack itemstack = EnchantmentHelper.getEnchantedItem(Enchantment.thorns, user); ItemStack itemstack = EnchantmentHelper.getEnchantedItem(Enchantment.thorns, user);
if ((user.worldObj.client || Config.damageThorns) && isHurting(level, random)) if ((user.worldObj.client || Vars.damageThorns) && isHurting(level, random))
{ {
if (attacker != null) if (attacker != null)
{ {

View file

@ -19,7 +19,6 @@ import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.BlockRegistry; import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.EntityRegistry; import common.init.EntityRegistry;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.SoundEvent; import common.init.SoundEvent;
@ -37,6 +36,7 @@ import common.util.HitPosition;
import common.util.PortalType; import common.util.PortalType;
import common.util.Position; import common.util.Position;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
import common.world.Explosion; import common.world.Explosion;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -270,7 +270,7 @@ public abstract class Entity
protected void checkPortal() { protected void checkPortal() {
if(this.inPortal != null) { if(this.inPortal != null) {
if(this.vehicle == null && this.passenger == null && Config.portals) { if(this.vehicle == null && this.passenger == null && Vars.portals) {
int current = this.worldObj.dimension.getDimensionId(); int current = this.worldObj.dimension.getDimensionId();
int dest = UniverseRegistry.getPortalDest(current, this.inPortal); int dest = UniverseRegistry.getPortalDest(current, this.inPortal);
if(dest != current) { if(dest != current) {
@ -325,7 +325,7 @@ public abstract class Entity
} }
else else
{ {
if (Config.damageFire && this.fire % 20 == 0) if (Vars.damageFire && this.fire % 20 == 0)
{ {
this.attackEntityFrom(DamageSource.onFire, 1); this.attackEntityFrom(DamageSource.onFire, 1);
} }
@ -361,7 +361,7 @@ public abstract class Entity
if(!this.worldObj.client && this.worldObj.dimension.getType() != DimType.SPACE) { if(!this.worldObj.client && this.worldObj.dimension.getType() != DimType.SPACE) {
// this.worldObj.profiler.start("descent"); // this.worldObj.profiler.start("descent");
int current = this.worldObj.dimension.getDimensionId(); int current = this.worldObj.dimension.getDimensionId();
int dim = Config.voidPortal ? UniverseRegistry.getPortalDest(current, PortalType.VOID) : current; int dim = Vars.voidPortal ? UniverseRegistry.getPortalDest(current, PortalType.VOID) : current;
if(dim == current) { // && (!(this.isPlayer()) || !((EntityNPCMP)this).creative)) { if(dim == current) { // && (!(this.isPlayer()) || !((EntityNPCMP)this).creative)) {
this.kill(); this.kill();
} }
@ -371,7 +371,7 @@ public abstract class Entity
// } // }
else if(this.vehicle == null && this.passenger == null) { else if(this.vehicle == null && this.passenger == null) {
Entity ent = this.travelToDimension(dim, Entity ent = this.travelToDimension(dim,
new BlockPos(this.posX, (float)ExtMath.clampi(Config.portalHeight, 0, 16384), this.posZ), new BlockPos(this.posX, (float)ExtMath.clampi(Vars.portalHeight, 0, 16384), this.posZ),
this.rotYaw, this.rotPitch, PortalType.VOID); this.rotYaw, this.rotPitch, PortalType.VOID);
ent.ignoreFall = true; ent.ignoreFall = true;
} }
@ -397,7 +397,7 @@ public abstract class Entity
{ {
if (!this.isImmuneToFire()) if (!this.isImmuneToFire())
{ {
if(Config.damageLava) if(Vars.damageLava)
this.attackEntityFrom(DamageSource.hotLiquid, 4); this.attackEntityFrom(DamageSource.hotLiquid, 4);
this.setFire(15); this.setFire(15);
} }
@ -407,7 +407,7 @@ public abstract class Entity
{ {
if (!this.isImmuneToFire()) if (!this.isImmuneToFire())
{ {
if(Config.damageMolten) if(Vars.damageMolten)
this.attackEntityFrom(DamageSource.molten, 2); this.attackEntityFrom(DamageSource.molten, 2);
this.setFire(10); this.setFire(10);
} }
@ -929,7 +929,7 @@ public abstract class Entity
*/ */
protected void dealFireDamage(int amount) protected void dealFireDamage(int amount)
{ {
if(!this.isImmuneToFire() && Config.damageFire) if(!this.isImmuneToFire() && Vars.damageFire)
this.attackEntityFrom(DamageSource.inFire, amount); this.attackEntityFrom(DamageSource.inFire, amount);
} }
@ -1296,7 +1296,7 @@ public abstract class Entity
public void addKnockback(double x, double y, double z) public void addKnockback(double x, double y, double z)
{ {
float mult = this.worldObj.client ? 1.0f : Config.knockback; float mult = this.worldObj.client ? 1.0f : Vars.knockback;
this.addVelocity(x * mult, y * mult, z * mult); this.addVelocity(x * mult, y * mult, z * mult);
} }
@ -2113,7 +2113,7 @@ public abstract class Entity
*/ */
public void onStruckByLightning(EntityLightning bolt) public void onStruckByLightning(EntityLightning bolt)
{ {
if((this.worldObj.client || Config.damageLightning) && bolt.damage > 0) if((this.worldObj.client || Vars.damageLightning) && bolt.damage > 0)
this.attackEntityFrom(DamageSource.causeLightningDamage(bolt.summoner), this.worldObj.rand.range(bolt.damage, ((bolt.damage * 3) / 2))); this.attackEntityFrom(DamageSource.causeLightningDamage(bolt.summoner), this.worldObj.rand.range(bolt.damage, ((bolt.damage * 3) / 2)));
if(bolt.fire) { if(bolt.fire) {
++this.fire; ++this.fire;

View file

@ -12,13 +12,13 @@ import common.attributes.Attribute;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal; import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.Item; import common.item.Item;
import common.item.ItemStack; import common.item.ItemStack;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.ExtMath; import common.util.ExtMath;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityChicken extends EntityAnimal public class EntityChicken extends EntityAnimal
@ -37,7 +37,7 @@ public class EntityChicken extends EntityAnimal
{ {
super(worldIn); super(worldIn);
this.setSize(0.4F, 0.7F); this.setSize(0.4F, 0.7F);
this.timeUntilNextEgg = worldIn.client || Config.eggTimer <= 0 ? 1000 : this.rand.excl(Config.eggTimer, Config.eggTimer * 2); this.timeUntilNextEgg = worldIn.client || Vars.eggTimer <= 0 ? 1000 : this.rand.excl(Vars.eggTimer, Vars.eggTimer * 2);
this.tasks.addTask(0, new EntityAISwimming(this)); this.tasks.addTask(0, new EntityAISwimming(this));
this.tasks.addTask(1, new EntityAIPanic(this, 1.4D)); this.tasks.addTask(1, new EntityAIPanic(this, 1.4D));
this.tasks.addTask(2, new EntityAIMate(this, 1.0D)); this.tasks.addTask(2, new EntityAIMate(this, 1.0D));
@ -86,11 +86,11 @@ public class EntityChicken extends EntityAnimal
this.wingRotation += this.wingRotDelta * 2.0F; this.wingRotation += this.wingRotDelta * 2.0F;
if (!this.worldObj.client && Config.eggTimer > 0 && !this.isChild() && !this.isChickenJockey() && --this.timeUntilNextEgg <= 0) if (!this.worldObj.client && Vars.eggTimer > 0 && !this.isChild() && !this.isChickenJockey() && --this.timeUntilNextEgg <= 0)
{ {
this.playSound(SoundEvent.PLOP, 1.0F); this.playSound(SoundEvent.PLOP, 1.0F);
this.dropItem(Items.egg, 1); this.dropItem(Items.egg, 1);
this.timeUntilNextEgg = this.rand.excl(Config.eggTimer, Config.eggTimer * 2); this.timeUntilNextEgg = this.rand.excl(Vars.eggTimer, Vars.eggTimer * 2);
} }
} }

View file

@ -10,11 +10,11 @@ import common.entity.npc.Alignment;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.IEntityMultiPart; import common.entity.types.IEntityMultiPart;
import common.init.Config;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.model.ParticleType; import common.model.ParticleType;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
import common.world.AWorldClient; import common.world.AWorldClient;
import common.world.World; import common.world.World;
@ -129,7 +129,7 @@ public class EntityDragon extends EntityLiving implements IEntityMultiPart
this.rotYaw = ExtMath.wrapf(this.rotYaw); this.rotYaw = ExtMath.wrapf(this.rotYaw);
// if (this.isAIDisabled() || // if (this.isAIDisabled() ||
if(!this.worldObj.client && !Config.mobTick) // ) if(!this.worldObj.client && !Vars.mobTick) // )
{ {
this.animTime = 0.5F; this.animTime = 0.5F;
} }
@ -282,7 +282,7 @@ public class EntityDragon extends EntityLiving implements IEntityMultiPart
{ {
this.collideWithEntities(this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.dragonPartWing1.getEntityBoundingBox().expand(4.0D, 2.0D, 4.0D).offset(0.0D, -2.0D, 0.0D))); this.collideWithEntities(this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.dragonPartWing1.getEntityBoundingBox().expand(4.0D, 2.0D, 4.0D).offset(0.0D, -2.0D, 0.0D)));
this.collideWithEntities(this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.dragonPartWing2.getEntityBoundingBox().expand(4.0D, 2.0D, 4.0D).offset(0.0D, -2.0D, 0.0D))); this.collideWithEntities(this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.dragonPartWing2.getEntityBoundingBox().expand(4.0D, 2.0D, 4.0D).offset(0.0D, -2.0D, 0.0D)));
if(Config.damageMobs) if(Vars.damageMobs)
this.attackEntitiesInList(this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.dragonPartHead.getEntityBoundingBox().expand(1.0D, 1.0D, 1.0D))); this.attackEntitiesInList(this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.dragonPartHead.getEntityBoundingBox().expand(1.0D, 1.0D, 1.0D)));
} }

View file

@ -21,7 +21,6 @@ import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal; import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
@ -38,6 +37,7 @@ import common.tags.TagObject;
import java.util.List; import java.util.List;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.ExtMath; import common.util.ExtMath;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityHorse extends EntityAnimal implements IInvBasic public class EntityHorse extends EntityAnimal implements IInvBasic
@ -425,7 +425,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
if (i > 0) if (i > 0)
{ {
if(Config.damageFall) { if(Vars.damageFall) {
this.attackEntityFrom(DamageSource.fall, i); this.attackEntityFrom(DamageSource.fall, i);
if (this.passenger != null) if (this.passenger != null)

View file

@ -21,13 +21,13 @@ import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal; import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.EntityTameable; import common.entity.types.EntityTameable;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.Item; import common.item.Item;
import common.item.ItemStack; import common.item.ItemStack;
import common.pathfinding.PathNavigateGround; import common.pathfinding.PathNavigateGround;
import common.tags.TagObject; import common.tags.TagObject;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityOcelot extends EntityTameable public class EntityOcelot extends EntityTameable
@ -177,7 +177,7 @@ public class EntityOcelot extends EntityTameable
public boolean attackEntityAsMob(Entity entityIn) public boolean attackEntityAsMob(Entity entityIn)
{ {
if(!this.worldObj.client && !Config.damageMobs) if(!this.worldObj.client && !Vars.damageMobs)
return false; return false;
return entityIn.attackEntityFrom(DamageSource.causeMobDamage(this), 3); return entityIn.attackEntityFrom(DamageSource.causeMobDamage(this), 3);
} }

View file

@ -26,7 +26,6 @@ import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.BlockRegistry; import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
@ -41,6 +40,7 @@ import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -227,7 +227,7 @@ public class EntityRabbit extends EntityAnimal {
} }
public boolean attackEntityAsMob(Entity entityIn) { public boolean attackEntityAsMob(Entity entityIn) {
if(!this.worldObj.client && !Config.damageMobs) if(!this.worldObj.client && !Vars.damageMobs)
return false; return false;
if(this.getRabbitType() == 99) { if(this.getRabbitType() == 99) {
// this.playSound("mob.attack", 1.0F, (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F); // this.playSound("mob.attack", 1.0F, (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F);
@ -302,7 +302,7 @@ public class EntityRabbit extends EntityAnimal {
public Object onInitialSpawn(Object livingdata) { public Object onInitialSpawn(Object livingdata) {
livingdata = super.onInitialSpawn(livingdata); livingdata = super.onInitialSpawn(livingdata);
int type = Config.killerBunnyChance > 0 && this.rand.chance(Config.killerBunnyChance) ? 99 : this.rand.zrange(TYPES); int type = Vars.killerBunnyChance > 0 && this.rand.chance(Vars.killerBunnyChance) ? 99 : this.rand.zrange(TYPES);
boolean typeSet = false; boolean typeSet = false;
if(livingdata instanceof EntityRabbit.RabbitTypeData) { if(livingdata instanceof EntityRabbit.RabbitTypeData) {
type = ((EntityRabbit.RabbitTypeData)livingdata).typeData; type = ((EntityRabbit.RabbitTypeData)livingdata).typeData;
@ -334,7 +334,7 @@ public class EntityRabbit extends EntityAnimal {
this.foodCooldown = this.rand.excl(10, this.isChild() ? 20 : 50); this.foodCooldown = this.rand.excl(10, this.isChild() ? 20 : 50);
if(this.isChild()) if(this.isChild())
this.grow(this.rand.range(250, 350)); this.grow(this.rand.range(250, 350));
if(Config.rabbitMateChance > 0 && this.rand.chance(Config.rabbitMateChance) && this.getGrowingAge() == 0 && !this.isInLove() && if(Vars.rabbitMateChance > 0 && this.rand.chance(Vars.rabbitMateChance) && this.getGrowingAge() == 0 && !this.isInLove() &&
!this.worldObj.getEntitiesWithinAABB(EntityRabbit.class, this.getEntityBoundingBox().expand(15.0f, 15.0f, 15.0f), new Predicate<EntityRabbit>() { !this.worldObj.getEntitiesWithinAABB(EntityRabbit.class, this.getEntityBoundingBox().expand(15.0f, 15.0f, 15.0f), new Predicate<EntityRabbit>() {
public boolean test(EntityRabbit entity) { public boolean test(EntityRabbit entity) {
return entity != EntityRabbit.this && entity.getGrowingAge() == 0; return entity != EntityRabbit.this && entity.getGrowingAge() == 0;
@ -423,7 +423,7 @@ public class EntityRabbit extends EntityAnimal {
public boolean shouldExecute() { public boolean shouldExecute() {
if(this.runDelay <= 0) { if(this.runDelay <= 0) {
if(!Config.mobGrief) if(!Vars.mobGrief)
return false; return false;
this.foodFound = false; this.foodFound = false;
this.isHungry = this.entity.canEatMore(); this.isHungry = this.entity.canEatMore();
@ -456,10 +456,10 @@ public class EntityRabbit extends EntityAnimal {
(double)this.destinationBlock.getZ() + 0.5D, 10.0F, (float)this.entity.getVerticalFaceSpeed()); (double)this.destinationBlock.getZ() + 0.5D, 10.0F, (float)this.entity.getVerticalFaceSpeed());
if(this.getIsAboveDestination()) { if(this.getIsAboveDestination()) {
World world = this.entity.worldObj; World world = this.entity.worldObj;
BlockPos pos = Config.rabidRabbits ? this.destinationBlock : this.destinationBlock.up(); BlockPos pos = Vars.rabidRabbits ? this.destinationBlock : this.destinationBlock.up();
State state = world.getState(pos); State state = world.getState(pos);
// Block block = iblockstate.getBlock(); // Block block = iblockstate.getBlock();
if(this.foodFound && canEat(state) && Config.mobGrief) // block instanceof BlockCarrot && ((Integer)iblockstate.getValue(BlockCarrot.AGE)).intValue() == 7) { if(this.foodFound && canEat(state) && Vars.mobGrief) // block instanceof BlockCarrot && ((Integer)iblockstate.getValue(BlockCarrot.AGE)).intValue() == 7) {
this.entity.consumeBlock(pos, state); this.entity.consumeBlock(pos, state);
this.foodFound = false; this.foodFound = false;
this.runDelay = 10; this.runDelay = 10;
@ -483,7 +483,7 @@ public class EntityRabbit extends EntityAnimal {
private static boolean canEat(State state) { private static boolean canEat(State state) {
Block block = state.getBlock(); Block block = state.getBlock();
if(Config.rabidRabbits) if(Vars.rabidRabbits)
return block != Blocks.bedrock; return block != Blocks.bedrock;
return block == Blocks.carrot || block == Blocks.potato || block == Blocks.wheat || block == Blocks.brown_mushroom || return block == Blocks.carrot || block == Blocks.potato || block == Blocks.wheat || block == Blocks.brown_mushroom ||
block == Blocks.flower || block == Blocks.blue_mushroom || block == Blocks.flower || block == Blocks.blue_mushroom ||

View file

@ -24,7 +24,6 @@ import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal; import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.EntityTameable; import common.entity.types.EntityTameable;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.Item; import common.item.Item;
@ -34,6 +33,7 @@ import common.model.ParticleType;
import common.pathfinding.PathNavigateGround; import common.pathfinding.PathNavigateGround;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.ExtMath; import common.util.ExtMath;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityWolf extends EntityTameable public class EntityWolf extends EntityTameable
@ -348,7 +348,7 @@ public class EntityWolf extends EntityTameable
public boolean attackEntityAsMob(Entity entityIn) public boolean attackEntityAsMob(Entity entityIn)
{ {
if(!this.worldObj.client && !Config.damageMobs) if(!this.worldObj.client && !Vars.damageMobs)
return false; return false;
boolean flag = entityIn.attackEntityFrom(DamageSource.causeMobDamage(this), ((int)this.getEntityAttribute(Attribute.ATTACK_DAMAGE).getAttributeValue())); boolean flag = entityIn.attackEntityFrom(DamageSource.causeMobDamage(this), ((int)this.getEntityAttribute(Attribute.ATTACK_DAMAGE).getAttributeValue()));

View file

@ -6,10 +6,10 @@ import common.entity.Entity;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.EntityWeatherEffect; import common.entity.types.EntityWeatherEffect;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.vars.Vars;
import common.world.AWorldClient; import common.world.AWorldClient;
import common.world.World; import common.world.World;
@ -65,7 +65,7 @@ public class EntityLightning extends EntityWeatherEffect
this.boltVertex = this.rand.longv(); this.boltVertex = this.rand.longv();
BlockPos blockpos = new BlockPos(this); BlockPos blockpos = new BlockPos(this);
if (!this.worldObj.client && this.fire && Config.fire && this.worldObj.isAreaLoaded(blockpos, 10) && this.worldObj.getState(blockpos).getBlock() == Blocks.air && Blocks.fire.canPlaceBlockAt(this.worldObj, blockpos)) if (!this.worldObj.client && this.fire && Vars.fire && this.worldObj.isAreaLoaded(blockpos, 10) && this.worldObj.getState(blockpos).getBlock() == Blocks.air && Blocks.fire.canPlaceBlockAt(this.worldObj, blockpos))
{ {
this.worldObj.setState(blockpos, Blocks.fire.getState()); this.worldObj.setState(blockpos, Blocks.fire.getState());
} }

View file

@ -10,7 +10,6 @@ import common.entity.EntityType;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.item.Item; import common.item.Item;
@ -19,6 +18,7 @@ import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityBoat extends Entity public class EntityBoat extends Entity
@ -137,7 +137,7 @@ public class EntityBoat extends Entity
this.passenger.mountEntity(this); this.passenger.mountEntity(this);
} }
if (/* !flag && */ Config.objectDrop) if (/* !flag && */ Vars.objectDrop)
{ {
this.dropItemWithOffset(Items.boat, 1, 0.0F); this.dropItemWithOffset(Items.boat, 1, 0.0F);
} }
@ -417,7 +417,7 @@ public class EntityBoat extends Entity
{ {
this.setDead(); this.setDead();
if (Config.objectDrop) if (Vars.objectDrop)
{ {
for (int j1 = 0; j1 < 3; ++j1) for (int j1 = 0; j1 < 3; ++j1)
{ {
@ -548,7 +548,7 @@ public class EntityBoat extends Entity
{ {
this.setDead(); this.setDead();
if (Config.objectDrop) if (Vars.objectDrop)
{ {
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
{ {

View file

@ -9,7 +9,6 @@ import common.entity.EntityType;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.BlockRegistry; import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.Item; import common.item.Item;
import common.item.ItemStack; import common.item.ItemStack;
@ -19,6 +18,7 @@ import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -188,7 +188,7 @@ public abstract class EntityCart extends Entity implements IWorldNameable
{ {
this.setDead(); this.setDead();
if (Config.objectDrop) if (Vars.objectDrop)
{ {
ItemStack itemstack = new ItemStack(Items.minecart, 1); ItemStack itemstack = new ItemStack(Items.minecart, 1);

View file

@ -4,7 +4,6 @@ import common.collect.Lists;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.Entity; import common.entity.Entity;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Config;
import common.inventory.Container; import common.inventory.Container;
import common.inventory.InventoryHelper; import common.inventory.InventoryHelper;
import common.item.ItemStack; import common.item.ItemStack;
@ -14,6 +13,7 @@ import common.tileentity.ILockableContainer;
import common.tileentity.Passcode; import common.tileentity.Passcode;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.PortalType; import common.util.PortalType;
import common.vars.Vars;
import common.world.World; import common.world.World;
public abstract class EntityCartContainer extends EntityCart implements ILockableContainer public abstract class EntityCartContainer extends EntityCart implements ILockableContainer
@ -40,7 +40,7 @@ public abstract class EntityCartContainer extends EntityCart implements ILockabl
{ {
super.killMinecart(source); super.killMinecart(source);
if (Config.objectDrop) if (Vars.objectDrop)
{ {
InventoryHelper.dropInventoryItems(this.worldObj, this, this); InventoryHelper.dropInventoryItems(this.worldObj, this, this);
} }

View file

@ -4,12 +4,12 @@ import common.block.tech.BlockChest;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.inventory.Container; import common.inventory.Container;
import common.inventory.ContainerChest; import common.inventory.ContainerChest;
import common.inventory.InventoryPlayer; import common.inventory.InventoryPlayer;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -29,7 +29,7 @@ public class EntityChestCart extends EntityCartContainer
{ {
super.killMinecart(source); super.killMinecart(source);
if (Config.objectDrop) if (Vars.objectDrop)
{ {
this.dropItemWithOffset(ItemRegistry.getItemFromBlock(Blocks.chest), 1, 0.0F); this.dropItemWithOffset(ItemRegistry.getItemFromBlock(Blocks.chest), 1, 0.0F);
} }

View file

@ -12,12 +12,12 @@ import common.entity.EntityType;
import common.entity.types.IObjectData; import common.entity.types.IObjectData;
import common.init.BlockRegistry; import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.item.ItemStack; import common.item.ItemStack;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -138,7 +138,7 @@ public class EntityFalling extends Entity implements IObjectData
((BlockFalling)block).onEndFalling(this.worldObj, blockpos1); ((BlockFalling)block).onEndFalling(this.worldObj, blockpos1);
} }
} }
else if (this.shouldDropItem && Config.objectDrop) else if (this.shouldDropItem && Vars.objectDrop)
{ {
this.entityDropItem(new ItemStack(block, 1, block.damageDropped(this.fallTile)), 0.0F); this.entityDropItem(new ItemStack(block, 1, block.damageDropped(this.fallTile)), 0.0F);
} }
@ -147,7 +147,7 @@ public class EntityFalling extends Entity implements IObjectData
} }
else if (this.fallTime > 100 && !this.worldObj.client && (blockpos1.getY() < -World.MAX_SIZE_Y + 1 || blockpos1.getY() > World.MAX_SIZE_Y) || this.fallTime > 600) else if (this.fallTime > 100 && !this.worldObj.client && (blockpos1.getY() < -World.MAX_SIZE_Y + 1 || blockpos1.getY() > World.MAX_SIZE_Y) || this.fallTime > 600)
{ {
if (this.shouldDropItem && Config.objectDrop) if (this.shouldDropItem && Vars.objectDrop)
{ {
this.entityDropItem(new ItemStack(block, 1, block.damageDropped(this.fallTile)), 0.0F); this.entityDropItem(new ItemStack(block, 1, block.damageDropped(this.fallTile)), 0.0F);
} }
@ -172,14 +172,14 @@ public class EntityFalling extends Entity implements IObjectData
boolean flag = block == Blocks.anvil; boolean flag = block == Blocks.anvil;
DamageSource damagesource = flag ? DamageSource.anvil : DamageSource.fallingBlock; DamageSource damagesource = flag ? DamageSource.anvil : DamageSource.fallingBlock;
if(this.worldObj.client || (flag ? Config.damageAcme : Config.damageSquish)) { if(this.worldObj.client || (flag ? Vars.damageAcme : Vars.damageSquish)) {
for (Entity entity : list) for (Entity entity : list)
{ {
entity.attackEntityFrom(damagesource, Math.min(ExtMath.floorf((float)i * this.fallHurtAmount), this.fallHurtMax)); entity.attackEntityFrom(damagesource, Math.min(ExtMath.floorf((float)i * this.fallHurtAmount), this.fallHurtMax));
} }
} }
if (flag && (this.worldObj.client || Config.anvilFallDecay) && (double)this.rand.floatv() < 0.05000000074505806D + (double)i * 0.05D) if (flag && (this.worldObj.client || Vars.anvilFallDecay) && (double)this.rand.floatv() < 0.05000000074505806D + (double)i * 0.05D)
{ {
int j = ((Integer)this.fallTile.getValue(BlockAnvil.DAMAGE)).intValue(); int j = ((Integer)this.fallTile.getValue(BlockAnvil.DAMAGE)).intValue();
++j; ++j;

View file

@ -6,7 +6,6 @@ import java.util.function.Predicate;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.inventory.Container; import common.inventory.Container;
import common.inventory.ContainerHopper; import common.inventory.ContainerHopper;
@ -15,6 +14,7 @@ import common.tags.TagObject;
import common.tileentity.IHopper; import common.tileentity.IHopper;
import common.tileentity.TileEntityHopper; import common.tileentity.TileEntityHopper;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -158,7 +158,7 @@ public class EntityHopperCart extends EntityCartContainer implements IHopper
if (this.collectItems()) if (this.collectItems())
{ {
this.setTransferTicker(Config.hopperCartDelay); this.setTransferTicker(Vars.hopperCartDelay);
this.markDirty(); this.markDirty();
} }
} }
@ -192,7 +192,7 @@ public class EntityHopperCart extends EntityCartContainer implements IHopper
{ {
super.killMinecart(source); super.killMinecart(source);
if (Config.objectDrop) if (Vars.objectDrop)
{ {
this.dropItemWithOffset(ItemRegistry.getItemFromBlock(Blocks.hopper), 1, 0.0F); this.dropItemWithOffset(ItemRegistry.getItemFromBlock(Blocks.hopper), 1, 0.0F);
} }

View file

@ -8,7 +8,6 @@ import common.entity.EntityType;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.ItemStack; import common.item.ItemStack;
@ -18,6 +17,7 @@ import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.PortalType; import common.util.PortalType;
import common.vars.Vars;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -63,7 +63,7 @@ public class EntityItem extends Entity
public void fall(float distance, float damageMultiplier) public void fall(float distance, float damageMultiplier)
{ {
if(!this.worldObj.client && Config.itemFallDamage && distance >= 1.0f && this.getEntityItem().getItem().isFragile()) { if(!this.worldObj.client && Vars.itemFallDamage && distance >= 1.0f && this.getEntityItem().getItem().isFragile()) {
// for(int z = 0; z < 8; z++) { // for(int z = 0; z < 8; z++) {
((AWorldServer)this.worldObj).spawnParticle(ParticleType.ITEM_CRACK, this.posX, this.posY, this.posZ, ((AWorldServer)this.worldObj).spawnParticle(ParticleType.ITEM_CRACK, this.posX, this.posY, this.posZ,
8, this.rand.gaussian() * 0.15D, this.rand.doublev() * 0.2D, this.rand.gaussian() * 0.15D, 0.1f, 8, this.rand.gaussian() * 0.15D, this.rand.doublev() * 0.2D, this.rand.gaussian() * 0.15D, 0.1f,
@ -308,7 +308,7 @@ public class EntityItem extends Entity
*/ */
protected void dealFireDamage(int amount) protected void dealFireDamage(int amount)
{ {
if(Config.itemBurn) if(Vars.itemBurn)
this.attackEntityFrom(DamageSource.inFire, amount); this.attackEntityFrom(DamageSource.inFire, amount);
} }

View file

@ -4,9 +4,9 @@ import common.entity.DamageSource;
import common.entity.Entity; import common.entity.Entity;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.EntityThrowable; import common.entity.types.EntityThrowable;
import common.init.Config;
import common.model.ParticleType; import common.model.ParticleType;
import common.util.HitPosition; import common.util.HitPosition;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityOrb extends EntityThrowable public class EntityOrb extends EntityThrowable
@ -52,7 +52,7 @@ public class EntityOrb extends EntityThrowable
// return; // return;
// } // }
if(Config.telefrag) { if(Vars.telefrag) {
x = pos.entity.posX; x = pos.entity.posX;
y = pos.entity.posY; y = pos.entity.posY;
z = pos.entity.posZ; z = pos.entity.posZ;
@ -92,8 +92,8 @@ public class EntityOrb extends EntityThrowable
entitylivingbase.setPositionAndUpdate(x, y, z); entitylivingbase.setPositionAndUpdate(x, y, z);
entitylivingbase.fallDistance = 0.0F; entitylivingbase.fallDistance = 0.0F;
if(Config.orbDamageSelf > 0) if(Vars.orbDamageSelf > 0)
entitylivingbase.attackEntityFrom(DamageSource.fall, Config.orbDamageSelf); entitylivingbase.attackEntityFrom(DamageSource.fall, Vars.orbDamageSelf);
} }
} }
// else if (entitylivingbase != null) // else if (entitylivingbase != null)
@ -109,13 +109,13 @@ public class EntityOrb extends EntityThrowable
if (pos.entity != null) if (pos.entity != null)
{ {
if(Config.telefrag) { if(Vars.telefrag) {
pos.entity.attackEntityFrom(DamageSource.causeTeleFragDamage(this, entitylivingbase), 10000); pos.entity.attackEntityFrom(DamageSource.causeTeleFragDamage(this, entitylivingbase), 10000);
if(!this.worldObj.client) if(!this.worldObj.client)
this.worldObj.playAuxSFX(1017, pos.entity.getPosition(), 0); this.worldObj.playAuxSFX(1017, pos.entity.getPosition(), 0);
} }
else if(Config.knockOrb) { else if(Vars.knockOrb) {
pos.entity.attackEntityFrom(DamageSource.causeThrownDamage(this, entitylivingbase), Config.orbDamageOther); pos.entity.attackEntityFrom(DamageSource.causeThrownDamage(this, entitylivingbase), Vars.orbDamageOther);
} }
} }
} }

View file

@ -5,12 +5,12 @@ import common.entity.DamageSource;
import common.entity.Entity; import common.entity.Entity;
import common.entity.projectile.EntityArrow; import common.entity.projectile.EntityArrow;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.ItemStack; import common.item.ItemStack;
import common.model.ParticleType; import common.model.ParticleType;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.Explosion; import common.world.Explosion;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -92,7 +92,7 @@ public class EntityTntCart extends EntityCart
super.killMinecart(source); super.killMinecart(source);
double d0 = this.motionX * this.motionX + this.motionZ * this.motionZ; double d0 = this.motionX * this.motionX + this.motionZ * this.motionZ;
if (!source.isExplosion() && Config.objectDrop) if (!source.isExplosion() && Vars.objectDrop)
{ {
this.entityDropItem(new ItemStack(Blocks.tnt, 1), 0.0F); this.entityDropItem(new ItemStack(Blocks.tnt, 1), 0.0F);
} }

View file

@ -7,13 +7,13 @@ import common.entity.Entity;
import common.entity.EntityType; import common.entity.EntityType;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.IObjectData; import common.entity.types.IObjectData;
import common.init.Config;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.model.ParticleType; import common.model.ParticleType;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.PortalType; import common.util.PortalType;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityXp extends Entity implements IObjectData public class EntityXp extends Entity implements IObjectData
@ -263,7 +263,7 @@ public class EntityXp extends Entity implements IObjectData
*/ */
protected void dealFireDamage(int amount) protected void dealFireDamage(int amount)
{ {
if(Config.xpOrbBurn) if(Vars.xpOrbBurn)
this.attackEntityFrom(DamageSource.inFire, amount); this.attackEntityFrom(DamageSource.inFire, amount);
} }
@ -320,7 +320,7 @@ public class EntityXp extends Entity implements IObjectData
{ {
if (this.delayBeforeCanPickup == 0 && entityIn.xpCooldown == 0) if (this.delayBeforeCanPickup == 0 && entityIn.xpCooldown == 0)
{ {
entityIn.xpCooldown = Config.xpDelay; entityIn.xpCooldown = Vars.xpDelay;
this.worldObj.playSoundAtEntity(entityIn, SoundEvent.ORB, 0.1F); this.worldObj.playSoundAtEntity(entityIn, SoundEvent.ORB, 0.1F);
entityIn.onItemPickup(this, this.xpValue); entityIn.onItemPickup(this, this.xpValue);
entityIn.addExperience(this.xpValue); entityIn.addExperience(this.xpValue);

View file

@ -3,11 +3,11 @@ package common.entity.npc;
import common.ai.AIFlyingBoxAttack; import common.ai.AIFlyingBoxAttack;
import common.attributes.Attribute; import common.attributes.Attribute;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.init.Config;
import common.item.ItemStack; import common.item.ItemStack;
import common.model.ParticleType; import common.model.ParticleType;
import common.rng.Random; import common.rng.Random;
import common.tags.TagObject; import common.tags.TagObject;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityGargoyle extends EntityFlyingNPC public class EntityGargoyle extends EntityFlyingNPC
@ -112,7 +112,7 @@ public class EntityGargoyle extends EntityFlyingNPC
if (j1 <= 0) if (j1 <= 0)
{ {
this.worldObj.newExplosion(this, this.posX, this.posY + (double)this.getEyeHeight(), this.posZ, 7.0F, false, this.worldObj.newExplosion(this, this.posX, this.posY + (double)this.getEyeHeight(), this.posZ, 7.0F, false,
Config.mobGrief, false); Vars.mobGrief, false);
// this.worldObj.broadcastSound(1013, new BlockPos(this), 0); // this.worldObj.broadcastSound(1013, new BlockPos(this), 0);
} }

View file

@ -5,12 +5,12 @@ import common.attributes.Attribute;
import common.entity.Entity; import common.entity.Entity;
import common.entity.effect.EntityLightning; import common.entity.effect.EntityLightning;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.ItemStack; import common.item.ItemStack;
import common.rng.Random; import common.rng.Random;
import common.tags.TagObject; import common.tags.TagObject;
import common.vars.Vars;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -224,7 +224,7 @@ public class EntityHaunter extends EntityNPC {
public void onStruckByLightning(EntityLightning lightningBolt) public void onStruckByLightning(EntityLightning lightningBolt)
{ {
// super.onStruckByLightning(lightningBolt); // super.onStruckByLightning(lightningBolt);
if(!this.worldObj.client && Config.chargeHaunter) { if(!this.worldObj.client && Vars.chargeHaunter) {
// int power = this.getPower(); // int power = this.getPower();
// if(++power < 256) // if(++power < 256)
// this.dataWatcher.updateObject(24, (byte)power); // this.dataWatcher.updateObject(24, (byte)power);
@ -256,7 +256,7 @@ public class EntityHaunter extends EntityNPC {
{ {
if (!this.worldObj.client) if (!this.worldObj.client)
{ {
boolean flag = Config.mobGrief; boolean flag = Vars.mobGrief;
float f = 1.0F + (float)(this.isCharged() ? this.rand.range(3, 5) : 0) / 8.0f; float f = 1.0F + (float)(this.isCharged() ? this.rand.range(3, 5) : 0) / 8.0f;
this.worldObj.createAltExplosion(this, this.posX, this.posY, this.posZ, (float)this.rand.range(3, 5) * f, flag); this.worldObj.createAltExplosion(this, this.posX, this.posY, this.posZ, (float)this.rand.range(3, 5) * f, flag);
this.setDead(); this.setDead();

View file

@ -43,7 +43,6 @@ import common.entity.projectile.EntityPotion;
import common.entity.projectile.EntitySnowball; import common.entity.projectile.EntitySnowball;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.IEntityMultiPart; import common.entity.types.IEntityMultiPart;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.init.NameRegistry; import common.init.NameRegistry;
@ -95,6 +94,7 @@ import common.util.Facing;
import common.util.PortalType; import common.util.PortalType;
import common.util.Vec3; import common.util.Vec3;
import common.util.WorldPos; import common.util.WorldPos;
import common.vars.Vars;
import common.village.MerchantRecipeList; import common.village.MerchantRecipeList;
import common.world.AWorldClient; import common.world.AWorldClient;
import common.world.World; import common.world.World;
@ -595,7 +595,7 @@ public abstract class EntityNPC extends EntityLiving
{ {
super.onLivingUpdate(); super.onLivingUpdate();
if(!this.worldObj.client && /* this.canPickUpLoot() && */ !this.noPickup && Config.mobGrief) { if(!this.worldObj.client && /* this.canPickUpLoot() && */ !this.noPickup && Vars.mobGrief) {
for(EntityItem entityitem : this.worldObj.getEntitiesWithinAABB(EntityItem.class, this.getEntityBoundingBox().expand(1.0D, 0.0D, 1.0D))) { for(EntityItem entityitem : this.worldObj.getEntitiesWithinAABB(EntityItem.class, this.getEntityBoundingBox().expand(1.0D, 0.0D, 1.0D))) {
if(!entityitem.dead && entityitem.getEntityItem() != null && !entityitem.cannotPickup()) { if(!entityitem.dead && entityitem.getEntityItem() != null && !entityitem.cannotPickup()) {
this.updateEquipmentIfNeeded(entityitem); this.updateEquipmentIfNeeded(entityitem);
@ -680,7 +680,7 @@ public abstract class EntityNPC extends EntityLiving
public boolean attackEntityAsMob(Entity entityIn) public boolean attackEntityAsMob(Entity entityIn)
{ {
if(!this.worldObj.client && !Config.damageMobs) if(!this.worldObj.client && !Vars.damageMobs)
return false; return false;
int f = (int)this.getEntityAttribute(Attribute.ATTACK_DAMAGE).getAttributeValue(); int f = (int)this.getEntityAttribute(Attribute.ATTACK_DAMAGE).getAttributeValue();
int i = 0; int i = 0;
@ -893,7 +893,7 @@ public abstract class EntityNPC extends EntityLiving
public void setAttackedBy(EntityLiving livingBase) public void setAttackedBy(EntityLiving livingBase)
{ {
if(livingBase != null && /* livingBase.isPlayer() && */ this.isEntityAlive() && /* !this.isPeaceful() && */ this.getAttackedBy() != livingBase && if(livingBase != null && /* livingBase.isPlayer() && */ this.isEntityAlive() && /* !this.isPeaceful() && */ this.getAttackedBy() != livingBase &&
Config.mobAttacks) { Vars.mobAttacks) {
this.worldObj.setEntityState(this, (byte)13); this.worldObj.setEntityState(this, (byte)13);
} }
super.setAttackedBy(livingBase); super.setAttackedBy(livingBase);
@ -1697,7 +1697,7 @@ public abstract class EntityNPC extends EntityLiving
} }
} }
super.onUpdate(); super.onUpdate();
if(!this.worldObj.client && Config.regeneration && this.shouldHeal()) { if(!this.worldObj.client && Vars.regeneration && this.shouldHeal()) {
++this.healTimer; ++this.healTimer;
if(this.healTimer >= 80) { if(this.healTimer >= 80) {
@ -1716,8 +1716,8 @@ public abstract class EntityNPC extends EntityLiving
// } // }
protected boolean shouldHeal() { protected boolean shouldHeal() {
return this.canRegenerateHealth() && Config.healChance > 0 && this.getHealth() > 0 && this.getHealth() < this.getMaxHealth() return this.canRegenerateHealth() && Vars.healChance > 0 && this.getHealth() > 0 && this.getHealth() < this.getMaxHealth()
&& this.rand.chance(Config.healChance); && this.rand.chance(Vars.healChance);
} }
public byte[] getSkin() { public byte[] getSkin() {
@ -2156,7 +2156,7 @@ public abstract class EntityNPC extends EntityLiving
public boolean isTicked() public boolean isTicked()
{ {
return (!this.worldObj.client && (Config.mobTick || this.connection != null)) || this.client != null; return (!this.worldObj.client && (Vars.mobTick || this.connection != null)) || this.client != null;
} }
public void openEditSign(TileEntitySign signTile) public void openEditSign(TileEntitySign signTile)
@ -2876,7 +2876,7 @@ public abstract class EntityNPC extends EntityLiving
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
this.motionY = 0.10000000149011612D; this.motionY = 0.10000000149011612D;
if (this.worldObj.client || (!Config.keepInventory && Config.playerDrop)) if (this.worldObj.client || (!Vars.keepInventory && Vars.playerDrop))
{ {
this.inventory.dropAllItems(); this.inventory.dropAllItems();
} }
@ -3719,7 +3719,7 @@ public abstract class EntityNPC extends EntityLiving
public void attackTargetEntityWithCurrentItem(Entity targetEntity) public void attackTargetEntityWithCurrentItem(Entity targetEntity)
{ {
if(!this.worldObj.client) { if(!this.worldObj.client) {
if(/* !this.creative && */ this.sinceLastAttack < Config.attackDelay) if(/* !this.creative && */ this.sinceLastAttack < Vars.attackDelay)
return; return;
this.sinceLastAttack = 0; this.sinceLastAttack = 0;
} }
@ -3770,7 +3770,7 @@ public abstract class EntityNPC extends EntityLiving
double d0 = targetEntity.motionX; double d0 = targetEntity.motionX;
double d1 = targetEntity.motionY; double d1 = targetEntity.motionY;
double d2 = targetEntity.motionZ; double d2 = targetEntity.motionZ;
boolean flag2 = (this.worldObj.client || Config.attack) && targetEntity.attackEntityFrom(DamageSource.causeMobDamage(this), f); boolean flag2 = (this.worldObj.client || Vars.attack) && targetEntity.attackEntityFrom(DamageSource.causeMobDamage(this), f);
if (flag2) if (flag2)
{ {

View file

@ -7,7 +7,6 @@ import common.biome.Biome;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.Entity; import common.entity.Entity;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.model.ParticleType; import common.model.ParticleType;
import common.pathfinding.PathNavigateGround; import common.pathfinding.PathNavigateGround;
@ -15,6 +14,7 @@ import common.rng.Random;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.ExtMath; import common.util.ExtMath;
import common.vars.Vars;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -258,7 +258,7 @@ public class EntitySlime extends EntityNPC
{ {
int i = 1; int i = 1;
if (!this.worldObj.client && this.getHeight() >= 0.5f && this.getHealth() <= 0 && Config.mobs && Config.spawnSplitSlime) if (!this.worldObj.client && this.getHeight() >= 0.5f && this.getHealth() <= 0 && Vars.mobs && Vars.spawnSplitSlime)
{ {
int j = this.rand.range(2, 4); int j = this.rand.range(2, 4);
float size = this.getHeight() / 2.0f; float size = this.getHeight() / 2.0f;
@ -320,7 +320,7 @@ public class EntitySlime extends EntityNPC
{ {
double i = this.width * 2.0f; double i = this.width * 2.0f;
if ((this.worldObj.client || Config.damageMobs) && this.canEntityBeSeen(p_175451_1_) if ((this.worldObj.client || Vars.damageMobs) && this.canEntityBeSeen(p_175451_1_)
&& this.getDistanceSqToEntity(p_175451_1_) < 0.6D * i * 0.6D * i && this.getDistanceSqToEntity(p_175451_1_) < 0.6D * i * 0.6D * i
&& this.canAttack(p_175451_1_) && p_175451_1_.attackEntityFrom(DamageSource.causeMobDamage(this), this.rand.range(1, 3))) && this.canAttack(p_175451_1_) && p_175451_1_.attackEntityFrom(DamageSource.causeMobDamage(this), this.rand.range(1, 3)))
{ {
@ -521,7 +521,7 @@ public class EntitySlime extends EntityNPC
public boolean shouldExecute() public boolean shouldExecute()
{ {
EntityLiving entitylivingbase = this.slime.getAttackTarget(); EntityLiving entitylivingbase = this.slime.getAttackTarget();
return entitylivingbase == null ? false : (!entitylivingbase.isEntityAlive() ? false : Config.mobAttacks); return entitylivingbase == null ? false : (!entitylivingbase.isEntityAlive() ? false : Vars.mobAttacks);
} }
public void startExecuting() public void startExecuting()
@ -533,7 +533,7 @@ public class EntitySlime extends EntityNPC
public boolean continueExecuting() public boolean continueExecuting()
{ {
EntityLiving entitylivingbase = this.slime.getAttackTarget(); EntityLiving entitylivingbase = this.slime.getAttackTarget();
return entitylivingbase == null ? false : (!entitylivingbase.isEntityAlive() ? false : (!Config.mobAttacks ? false : --this.attackTimer > 0)); return entitylivingbase == null ? false : (!entitylivingbase.isEntityAlive() ? false : (!Vars.mobAttacks ? false : --this.attackTimer > 0));
} }
public void updateTask() public void updateTask()

View file

@ -9,10 +9,10 @@ import common.attributes.AttributeModifier;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.animal.EntityChicken; import common.entity.animal.EntityChicken;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.ExtMath; import common.util.ExtMath;
import common.vars.Vars;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -53,7 +53,7 @@ public class EntityZombie extends EntityNPC
entitylivingbase = (EntityLiving)source.getEntity(); entitylivingbase = (EntityLiving)source.getEntity();
} }
if (entitylivingbase != null && /* this.worldObj.getDifficulty() == Difficulty.HARD && */ (double)this.rand.floatv() < this.getEntityAttribute(Attribute.REINFORCEMENT_CHANCE).getAttributeValue() && Config.mobs && Config.spawnMoreZombie) if (entitylivingbase != null && /* this.worldObj.getDifficulty() == Difficulty.HARD && */ (double)this.rand.floatv() < this.getEntityAttribute(Attribute.REINFORCEMENT_CHANCE).getAttributeValue() && Vars.mobs && Vars.spawnMoreZombie)
{ {
int i = ExtMath.floord(this.posX); int i = ExtMath.floord(this.posX);
int j = ExtMath.floord(this.posY); int j = ExtMath.floord(this.posY);
@ -141,7 +141,7 @@ public class EntityZombie extends EntityNPC
{ {
super.onKillEntity(entityLivingIn); super.onKillEntity(entityLivingIn);
if (/* (this.worldObj.getDifficulty() == Difficulty.NORMAL || this.worldObj.getDifficulty() == Difficulty.HARD) && */ entityLivingIn instanceof EntityNPC && !(entityLivingIn.isPlayer()) && Config.convertZombie) if (/* (this.worldObj.getDifficulty() == Difficulty.NORMAL || this.worldObj.getDifficulty() == Difficulty.HARD) && */ entityLivingIn instanceof EntityNPC && !(entityLivingIn.isPlayer()) && Vars.convertZombie)
{ {
// if (this.worldObj.getDifficulty() != Difficulty.HARD && this.rand.chance()) // if (this.worldObj.getDifficulty() != Difficulty.HARD && this.rand.chance())
// { // {

View file

@ -13,7 +13,6 @@ import common.entity.types.IObjectData;
import common.entity.types.IProjectile; import common.entity.types.IProjectile;
import common.init.BlockRegistry; import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.ItemStack; import common.item.ItemStack;
@ -24,6 +23,7 @@ import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.HitPosition; import common.util.HitPosition;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -324,7 +324,7 @@ public class EntityArrow extends Entity implements IProjectile, IObjectData
movingobjectposition.entity.setFire(5); movingobjectposition.entity.setFire(5);
} }
if ((this.worldObj.client || Config.damageArrow) && movingobjectposition.entity.attackEntityFrom(damagesource, l)) if ((this.worldObj.client || Vars.damageArrow) && movingobjectposition.entity.attackEntityFrom(damagesource, l))
{ {
if (movingobjectposition.entity instanceof EntityLiving) if (movingobjectposition.entity instanceof EntityLiving)
{ {

View file

@ -3,10 +3,10 @@ package common.entity.projectile;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.npc.EntityGargoyle; import common.entity.npc.EntityGargoyle;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.potion.Potion; import common.potion.Potion;
import common.potion.PotionEffect; import common.potion.PotionEffect;
import common.util.HitPosition; import common.util.HitPosition;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityBox extends EntityProjectile public class EntityBox extends EntityProjectile
@ -71,7 +71,7 @@ public class EntityBox extends EntityProjectile
{ {
if (movingObject.entity != null) if (movingObject.entity != null)
{ {
if(Config.damageFlyingBox) { if(Vars.damageFlyingBox) {
if (this.shootingEntity != null) if (this.shootingEntity != null)
{ {
if (movingObject.entity.attackEntityFrom(DamageSource.causeMobDamage(this.shootingEntity), if (movingObject.entity.attackEntityFrom(DamageSource.causeMobDamage(this.shootingEntity),

View file

@ -9,13 +9,13 @@ import common.entity.EntityType;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.IObjectData; import common.entity.types.IObjectData;
import common.entity.types.IProjectile; import common.entity.types.IProjectile;
import common.init.Config;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.HitPosition; import common.util.HitPosition;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityBullet extends Entity implements IProjectile, IObjectData public class EntityBullet extends Entity implements IProjectile, IObjectData
@ -234,7 +234,7 @@ public class EntityBullet extends Entity implements IProjectile, IObjectData
damagesource = DamageSource.causeShotDamage(this, this.shootingEntity); damagesource = DamageSource.causeShotDamage(this, this.shootingEntity);
} }
if ((this.worldObj.client || Config.damageBullet) && movingobjectposition.entity.attackEntityFrom(damagesource, l)) if ((this.worldObj.client || Vars.damageBullet) && movingobjectposition.entity.attackEntityFrom(damagesource, l))
{ {
if (movingobjectposition.entity instanceof EntityLiving) if (movingobjectposition.entity instanceof EntityLiving)
{ {

View file

@ -5,12 +5,12 @@ import common.entity.EntityType;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.EntityThrowable; import common.entity.types.EntityThrowable;
import common.entity.types.IObjectData; import common.entity.types.IObjectData;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.model.ParticleType; import common.model.ParticleType;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.HitPosition; import common.util.HitPosition;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityDynamite extends EntityThrowable implements IObjectData public class EntityDynamite extends EntityThrowable implements IObjectData
@ -36,7 +36,7 @@ public class EntityDynamite extends EntityThrowable implements IObjectData
protected void onImpact(HitPosition pos) protected void onImpact(HitPosition pos)
{ {
if (pos.entity != null && Config.knockDynamite) if (pos.entity != null && Vars.knockDynamite)
{ {
pos.entity.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 0); pos.entity.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 0);
} }

View file

@ -4,11 +4,11 @@ import common.entity.DamageSource;
import common.entity.animal.EntityChicken; import common.entity.animal.EntityChicken;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.EntityThrowable; import common.entity.types.EntityThrowable;
import common.init.Config;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.model.ParticleType; import common.model.ParticleType;
import common.util.HitPosition; import common.util.HitPosition;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityEgg extends EntityThrowable public class EntityEgg extends EntityThrowable
@ -33,12 +33,12 @@ public class EntityEgg extends EntityThrowable
*/ */
protected void onImpact(HitPosition p_70184_1_) protected void onImpact(HitPosition p_70184_1_)
{ {
if (p_70184_1_.entity != null && Config.knockEgg) if (p_70184_1_.entity != null && Vars.knockEgg)
{ {
p_70184_1_.entity.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 0); p_70184_1_.entity.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 0);
} }
if (!this.worldObj.client && this.rand.chance(8) && Config.mobs && Config.spawnEggChicken) if (!this.worldObj.client && this.rand.chance(8) && Vars.mobs && Vars.spawnEggChicken)
{ {
int i = this.rand.chance(1, 4, 32); int i = this.rand.chance(1, 4, 32);

View file

@ -3,9 +3,9 @@ package common.entity.projectile;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.HitPosition; import common.util.HitPosition;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityFireCharge extends EntityProjectile public class EntityFireCharge extends EntityProjectile
@ -43,7 +43,7 @@ public class EntityFireCharge extends EntityProjectile
{ {
if (movingObject.entity != null) if (movingObject.entity != null)
{ {
boolean flag = Config.damageFireball && boolean flag = Vars.damageFireball &&
movingObject.entity.attackEntityFrom(DamageSource.causeFireballDamage(this, this.shootingEntity), 6); movingObject.entity.attackEntityFrom(DamageSource.causeFireballDamage(this, this.shootingEntity), 6);
if (flag) if (flag)
@ -62,7 +62,7 @@ public class EntityFireCharge extends EntityProjectile
if (this.shootingEntity != null && this.shootingEntity instanceof EntityLiving) // && !(this.shootingEntity.isPlayer())) if (this.shootingEntity != null && this.shootingEntity instanceof EntityLiving) // && !(this.shootingEntity.isPlayer()))
{ {
flag1 = Config.mobGrief; flag1 = Vars.mobGrief;
} }
if (flag1) if (flag1)

View file

@ -2,9 +2,9 @@ package common.entity.projectile;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.HitPosition; import common.util.HitPosition;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntityFireball extends EntityProjectile public class EntityFireball extends EntityProjectile
@ -36,13 +36,13 @@ public class EntityFireball extends EntityProjectile
{ {
if (!this.worldObj.client) if (!this.worldObj.client)
{ {
if (Config.damageFireball && movingObject.entity != null) if (Vars.damageFireball && movingObject.entity != null)
{ {
movingObject.entity.attackEntityFrom(DamageSource.causeFireballDamage(this, this.shootingEntity), 8); movingObject.entity.attackEntityFrom(DamageSource.causeFireballDamage(this, this.shootingEntity), 8);
this.applyEnchantments(this.shootingEntity, movingObject.entity); this.applyEnchantments(this.shootingEntity, movingObject.entity);
} }
boolean flag = Config.mobGrief; boolean flag = Vars.mobGrief;
this.worldObj.newExplosion(this.shootingEntity, this.posX, this.posY, this.posZ, (float)this.explosionPower, flag, false, true); this.worldObj.newExplosion(this.shootingEntity, this.posX, this.posY, this.posZ, (float)this.explosionPower, flag, false, true);
this.setDead(); this.setDead();
} }

View file

@ -13,7 +13,6 @@ import common.entity.npc.EntityNPC;
import common.entity.types.IObjectData; import common.entity.types.IObjectData;
import common.init.BlockRegistry; import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.ItemStack; import common.item.ItemStack;
@ -24,6 +23,7 @@ import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.HitPosition; import common.util.HitPosition;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -316,10 +316,10 @@ public class EntityHook extends Entity implements IObjectData
{ {
if (movingobjectposition.entity != null) if (movingobjectposition.entity != null)
{ {
if (this.worldObj.client || !Config.knockHook || movingobjectposition.entity.attackEntityFrom( if (this.worldObj.client || !Vars.knockHook || movingobjectposition.entity.attackEntityFrom(
DamageSource.causeThrownDamage(this, this.angler), 0) || !Config.hookCheckDamage) DamageSource.causeThrownDamage(this, this.angler), 0) || !Vars.hookCheckDamage)
{ {
if(this.worldObj.client || Config.hookEntity) // && (!(movingobjectposition.entity.isPlayer()) if(this.worldObj.client || Vars.hookEntity) // && (!(movingobjectposition.entity.isPlayer())
// || !((EntityNPC)movingobjectposition.entity).creative))) // || !((EntityNPC)movingobjectposition.entity).creative)))
this.caughtEntity = movingobjectposition.entity; this.caughtEntity = movingobjectposition.entity;
} }
@ -586,7 +586,7 @@ public class EntityHook extends Entity implements IObjectData
entityitem.motionY = d3 * d9 + (double)ExtMath.sqrtd(d7) * 0.08D; entityitem.motionY = d3 * d9 + (double)ExtMath.sqrtd(d7) * 0.08D;
entityitem.motionZ = d5 * d9; entityitem.motionZ = d5 * d9;
this.worldObj.spawnEntityInWorld(entityitem); this.worldObj.spawnEntityInWorld(entityitem);
if(Config.fishingXP) if(Vars.fishingXP)
this.angler.worldObj.spawnEntityInWorld(new EntityXp(this.angler.worldObj, this.angler.posX, this.angler.posY + 0.5D, this.angler.posZ + 0.5D, this.rand.roll(6))); this.angler.worldObj.spawnEntityInWorld(new EntityXp(this.angler.worldObj, this.angler.posX, this.angler.posY + 0.5D, this.angler.posZ + 0.5D, this.rand.roll(6)));
i = 1; i = 1;
} }

View file

@ -3,9 +3,9 @@ package common.entity.projectile;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.EntityThrowable; import common.entity.types.EntityThrowable;
import common.init.Config;
import common.model.ParticleType; import common.model.ParticleType;
import common.util.HitPosition; import common.util.HitPosition;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class EntitySnowball extends EntityThrowable public class EntitySnowball extends EntityThrowable
@ -39,7 +39,7 @@ public class EntitySnowball extends EntityThrowable
// i = 3; // i = 3;
// } // }
if(Config.knockSnowball) if(Vars.knockSnowball)
p_70184_1_.entity.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 0); p_70184_1_.entity.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 0);
} }

View file

@ -37,7 +37,6 @@ import common.entity.npc.EntityNPC;
import common.entity.projectile.EntityArrow; import common.entity.projectile.EntityArrow;
import common.init.BlockRegistry; import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.EntityRegistry; import common.init.EntityRegistry;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
@ -62,6 +61,7 @@ import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
import common.world.AWorldServer; import common.world.AWorldServer;
@ -253,7 +253,7 @@ public abstract class EntityLiving extends Entity
if (this.isEntityAlive()) if (this.isEntityAlive())
{ {
if ((this.worldObj.client || Config.damageWall) && this.isEntityInsideOpaqueBlock()) if ((this.worldObj.client || Vars.damageWall) && this.isEntityInsideOpaqueBlock())
{ {
this.attackEntityFrom(DamageSource.inWall, 1); this.attackEntityFrom(DamageSource.inWall, 1);
} }
@ -365,7 +365,7 @@ public abstract class EntityLiving extends Entity
} }
if(!this.worldObj.client) { if(!this.worldObj.client) {
if(!this.firstEffectUpdate && Config.radiation) { // && if(!this.firstEffectUpdate && Vars.radiation) { // &&
// (!(this.isPlayer()) || !((EntityNPCMP)this).creative)) { // (!(this.isPlayer()) || !((EntityNPCMP)this).creative)) {
float radiation = this.radiation + (float)this.attributes.getAttributeInstance(Attribute.RADIATION).getAttributeValue(); float radiation = this.radiation + (float)this.attributes.getAttributeInstance(Attribute.RADIATION).getAttributeValue();
radiation -= (float)this.attributes.getAttributeInstance(Attribute.RADIATION_RESISTANCE).getAttributeValue(); radiation -= (float)this.attributes.getAttributeInstance(Attribute.RADIATION_RESISTANCE).getAttributeValue();
@ -427,7 +427,7 @@ public abstract class EntityLiving extends Entity
if (this.deathTime == 20) if (this.deathTime == 20)
{ {
if (!this.worldObj.client && (this.recentlyHit > 0 || this.isPlayer()) && this.canDropLoot() && Config.mobXP) if (!this.worldObj.client && (this.recentlyHit > 0 || this.isPlayer()) && this.canDropLoot() && Vars.mobXP)
{ {
int i = this.getExperiencePoints(this.playerAttacker); int i = this.getExperiencePoints(this.playerAttacker);
@ -983,7 +983,7 @@ public abstract class EntityLiving extends Entity
else else
{ {
this.lastDamage = amount; this.lastDamage = amount;
this.hurtResistance = this.hurtCooldown = Config.hurtDelay; this.hurtResistance = this.hurtCooldown = Vars.hurtDelay;
this.damageEntity(source, amount); this.damageEntity(source, amount);
this.hurtTime = this.maxHurtTime = 10; this.hurtTime = this.maxHurtTime = 10;
} }
@ -1122,7 +1122,7 @@ public abstract class EntityLiving extends Entity
i = EnchantmentHelper.getLootingModifier((EntityLiving)entity); i = EnchantmentHelper.getLootingModifier((EntityLiving)entity);
} }
if (this.canDropLoot() && Config.dropLoot) if (this.canDropLoot() && Vars.dropLoot)
{ {
this.dropFewItems(this.recentlyHit > 0, i); this.dropFewItems(this.recentlyHit > 0, i);
// this.dropEquipment(this.recentlyHit > 0, i); // this.dropEquipment(this.recentlyHit > 0, i);
@ -1157,7 +1157,7 @@ public abstract class EntityLiving extends Entity
{ {
this.isAirBorne = true; this.isAirBorne = true;
float div = ExtMath.sqrtd(xfactor * xfactor + zfactor * zfactor); float div = ExtMath.sqrtd(xfactor * xfactor + zfactor * zfactor);
float mult = 0.4F * Config.knockback; float mult = 0.4F * Vars.knockback;
this.motionX /= 2.0D; this.motionX /= 2.0D;
this.motionY /= 2.0D; this.motionY /= 2.0D;
this.motionZ /= 2.0D; this.motionZ /= 2.0D;
@ -1236,7 +1236,7 @@ public abstract class EntityLiving extends Entity
if (i > 0) if (i > 0)
{ {
if(Config.damageFall) { if(Vars.damageFall) {
this.playSound(i > 4 ? SoundEvent.FALL_BIG : SoundEvent.FALL_SMALL, 1.0F); this.playSound(i > 4 ? SoundEvent.FALL_BIG : SoundEvent.FALL_SMALL, 1.0F);
this.attackEntityFrom(DamageSource.fall, i); this.attackEntityFrom(DamageSource.fall, i);
} }
@ -1482,7 +1482,7 @@ public abstract class EntityLiving extends Entity
public void kill() public void kill()
{ {
if(this.worldObj.client || Config.damageVoid) if(this.worldObj.client || Vars.damageVoid)
this.attackEntityFrom(DamageSource.outOfWorld, Integer.MAX_VALUE); this.attackEntityFrom(DamageSource.outOfWorld, Integer.MAX_VALUE);
} }
@ -2735,7 +2735,7 @@ public abstract class EntityLiving extends Entity
// } // }
public boolean isTicked() { public boolean isTicked() {
return !this.worldObj.client && /* !this.isAIDisabled() && */ Config.mobTick; return !this.worldObj.client && /* !this.isAIDisabled() && */ Vars.mobTick;
} }
// public void setNoAI(boolean disable) { // public void setNoAI(boolean disable) {

View file

@ -3,7 +3,7 @@ package common.entity.types;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.EntityType; import common.entity.EntityType;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Config; import common.vars.Vars;
import common.world.World; import common.world.World;
public abstract class EntityWaterMob extends EntityLiving public abstract class EntityWaterMob extends EntityLiving
@ -71,7 +71,7 @@ public abstract class EntityWaterMob extends EntityLiving
// int i = this.getAir(); // int i = this.getAir();
super.onEntityUpdate(); super.onEntityUpdate();
if (this.isEntityAlive() && (this.worldObj.client || Config.waterMobDry) && !this.isInLiquid() && this.rand.chance(30)) if (this.isEntityAlive() && (this.worldObj.client || Vars.waterMobDry) && !this.isInLiquid() && this.rand.chance(30))
{ {
// --i; // --i;
// this.setAir(i); // this.setAir(i);

View file

@ -1,364 +1,442 @@
package common.init; package common.init;
import common.block.Block; import java.lang.reflect.Field;
import common.block.artificial.BlockBed; import java.lang.reflect.Modifier;
import common.block.artificial.BlockPortal; import java.util.Collections;
import common.block.artificial.BlockSlab; import java.util.Comparator;
import common.block.artificial.BlockStainedGlass; import java.util.List;
import common.block.artificial.BlockStainedGlassPane; import java.util.Set;
import common.block.foliage.BlockBlackenedSoil;
import common.block.foliage.BlockBush; import common.block.*;
import common.block.foliage.BlockCactus; import common.block.artificial.*;
import common.block.foliage.BlockDeadBush; import common.block.foliage.*;
import common.block.foliage.BlockDoublePlant; import common.block.liquid.*;
import common.block.foliage.BlockDryLeaves; import common.block.natural.*;
import common.block.foliage.BlockFlower; import common.block.tech.*;
import common.block.foliage.BlockGrass; import common.block.tile.*;
import common.block.foliage.BlockLeaves; import common.block.tile.BlockBanner.BlockBannerHanging;
import common.block.foliage.BlockMycelium; import common.block.tile.BlockBanner.BlockBannerStanding;
import common.block.foliage.BlockReed; import common.collect.Lists;
import common.block.foliage.BlockTallGrass; import common.collect.Sets;
import common.block.liquid.BlockDynamicLiquid; import common.util.Util;
import common.block.liquid.BlockStaticLiquid;
import common.block.natural.BlockFire;
import common.block.natural.BlockOre;
import common.block.natural.BlockSand;
import common.block.tech.BlockBeacon;
import common.block.tech.BlockCauldron;
import common.block.tech.BlockChest;
import common.block.tech.BlockDaylightDetector;
import common.block.tech.BlockHopper;
import common.block.tech.BlockPistonBase;
import common.block.tech.BlockPistonHead;
import common.block.tech.BlockPistonMoving;
import common.block.tech.BlockRedstoneComparator;
import common.block.tech.BlockRedstoneRepeater;
import common.block.tech.BlockRedstoneWire;
import common.block.tech.BlockTianReactor;
import common.block.tech.BlockTripWireHook;
import common.block.tile.BlockSkull;
public abstract class Blocks { public abstract class Blocks {
public static final Block air = get("air"); public static final BlockDoor acacia_door = get("acacia_door");
public static final Block stone = get("stone"); public static final BlockFence acacia_fence = get("acacia_fence");
public static final Block blackened_stone = get("blackened_stone"); public static final BlockFenceGate acacia_fence_gate = get("acacia_fence_gate");
public static final BlockGrass grass = (BlockGrass)get("grass"); public static final BlockLeaves acacia_leaves = get("acacia_leaves");
public static final BlockBlackenedSoil blackened_soil = (BlockBlackenedSoil)get("blackened_soil"); public static final BlockLog acacia_log = get("acacia_log");
public static final Block dirt = get("dirt"); public static final Block acacia_planks = get("acacia_planks");
public static final Block blackened_dirt = get("blackened_dirt"); public static final BlockSapling acacia_sapling = get("acacia_sapling");
public static final Block cobblestone = get("cobblestone"); public static final BlockSlab acacia_slab = get("acacia_slab");
public static final Block blackened_cobble = get("blackened_cobble"); public static final BlockStairs acacia_stairs = get("acacia_stairs");
public static final Block oak_planks = get("oak_planks"); public static final BlockStaticLiquid acid = get("acid");
public static final Block spruce_planks = get("spruce_planks"); public static final BlockRailPowered activator_rail = get("activator_rail");
public static final Block birch_planks = get("birch_planks"); public static final BlockAir air = get("air");
public static final Block maple_planks = get("maple_planks"); public static final Block aluminium_block = get("aluminium_block");
public static final Block jungle_planks = get("jungle_planks"); public static final BlockOre aluminium_ore = get("aluminium_ore");
public static final Block acacia_planks = get("acacia_planks"); public static final Block antimony_block = get("antimony_block");
public static final Block dark_oak_planks = get("dark_oak_planks"); public static final BlockOre antimony_ore = get("antimony_ore");
public static final Block cherry_planks = get("cherry_planks"); public static final BlockAnvil anvil = get("anvil");
public static final Block oak_sapling = get("oak_sapling"); public static final Block ardite_block = get("ardite_block");
public static final Block spruce_sapling = get("spruce_sapling"); public static final BlockOre ardite_ore = get("ardite_ore");
public static final Block birch_sapling = get("birch_sapling"); public static final Block arsenic_block = get("arsenic_block");
public static final Block jungle_sapling = get("jungle_sapling"); public static final BlockOre arsenic_ore = get("arsenic_ore");
public static final Block acacia_sapling = get("acacia_sapling"); public static final Block ash = get("ash");
public static final Block dark_oak_sapling = get("dark_oak_sapling"); public static final BlockWorkbench assembly_unit = get("assembly_unit");
public static final Block cherry_sapling = get("cherry_sapling"); public static final BlockBannerStanding banner = get("banner");
public static final Block maple_sapling = get("maple_sapling"); public static final BlockBeacon beacon = get("beacon");
public static final Block bedrock = get("bedrock"); public static final BlockBedrock bedrock = get("bedrock");
public static final BlockDynamicLiquid flowing_water = (BlockDynamicLiquid)get("flowing_water"); public static final BlockDoor birch_door = get("birch_door");
public static final BlockStaticLiquid water = (BlockStaticLiquid)get("water"); public static final BlockFence birch_fence = get("birch_fence");
public static final BlockDynamicLiquid flowing_lava = (BlockDynamicLiquid)get("flowing_lava"); public static final BlockFenceGate birch_fence_gate = get("birch_fence_gate");
public static final BlockStaticLiquid lava = (BlockStaticLiquid)get("lava"); public static final BlockLeaves birch_leaves = get("birch_leaves");
public static final BlockDynamicLiquid flowing_goo = (BlockDynamicLiquid)get("flowing_goo"); public static final BlockLog birch_log = get("birch_log");
public static final BlockStaticLiquid goo = (BlockStaticLiquid)get("goo"); public static final Block birch_planks = get("birch_planks");
public static final BlockSand sand = (BlockSand)get("sand"); public static final BlockSapling birch_sapling = get("birch_sapling");
public static final Block gravel = get("gravel"); public static final BlockSlab birch_slab = get("birch_slab");
public static final BlockOre gold_ore = (BlockOre)get("gold_ore"); public static final BlockStairs birch_stairs = get("birch_stairs");
public static final BlockOre iron_ore = (BlockOre)get("iron_ore"); public static final Block bismuth_block = get("bismuth_block");
public static final BlockOre coal_ore = (BlockOre)get("coal_ore"); public static final BlockOre bismuth_ore = get("bismuth_ore");
public static final BlockOre lead_ore = (BlockOre)get("lead_ore"); public static final BlockBed black_bed = get("black_bed");
public static final BlockOre copper_ore = (BlockOre)get("copper_ore"); public static final Block black_brick = get("black_brick");
public static final Block oak_log = get("oak_log"); public static final BlockFence black_brick_fence = get("black_brick_fence");
public static final Block spruce_log = get("spruce_log"); public static final BlockSlab black_brick_slab = get("black_brick_slab");
public static final Block birch_log = get("birch_log"); public static final BlockStairs black_brick_stairs = get("black_brick_stairs");
public static final Block jungle_log = get("jungle_log"); public static final BlockTintedFire black_fire = get("black_fire");
public static final Block acacia_log = get("acacia_log"); public static final Block black_metal_block = get("black_metal_block");
public static final Block dark_oak_log = get("dark_oak_log"); public static final BlockOre black_metal_ore = get("black_metal_ore");
public static final Block cherry_log = get("cherry_log"); public static final BlockQuartz black_quartz_block = get("black_quartz_block");
public static final Block maple_log = get("maple_log"); public static final BlockOre black_quartz_ore = get("black_quartz_ore");
public static final Block tian_log = get("tian_log"); public static final BlockSlab black_quartz_slab = get("black_quartz_slab");
public static final Block blackwood_log = get("blackwood_log"); public static final BlockStairs black_quartz_stairs = get("black_quartz_stairs");
public static final Block oak_slab = get("oak_slab"); public static final Block blackened_cobble = get("blackened_cobble");
public static final Block spruce_slab = get("spruce_slab"); public static final BlockBlackenedDirt blackened_dirt = get("blackened_dirt");
public static final Block birch_slab = get("birch_slab"); public static final BlockBlackenedSoil blackened_soil = get("blackened_soil");
public static final Block jungle_slab = get("jungle_slab"); public static final BlockBlackenedStone blackened_stone = get("blackened_stone");
public static final Block acacia_slab = get("acacia_slab"); public static final BlockDoor blackwood_door = get("blackwood_door");
public static final Block dark_oak_slab = get("dark_oak_slab"); public static final BlockFence blackwood_fence = get("blackwood_fence");
public static final Block cherry_slab = get("cherry_slab"); public static final BlockFenceGate blackwood_fence_gate = get("blackwood_fence_gate");
public static final Block maple_slab = get("maple_slab"); public static final BlockLeaves blackwood_leaves = get("blackwood_leaves");
public static final Block cobblestone_slab = get("cobblestone_slab"); public static final BlockLog blackwood_log = get("blackwood_log");
public static final Block brick_slab = get("brick_slab"); public static final Block blackwood_planks = get("blackwood_planks");
public static final Block blood_brick_slab = get("blood_brick_slab"); public static final BlockSapling blackwood_sapling = get("blackwood_sapling");
public static final Block quartz_slab = get("quartz_slab"); public static final BlockSlab blackwood_slab = get("blackwood_slab");
public static final BlockDryLeaves dry_leaves = (BlockDryLeaves)get("dry_leaves"); public static final BlockStairs blackwood_stairs = get("blackwood_stairs");
public static final Block sponge = get("sponge"); public static final BlockStaticLiquid blood = get("blood");
public static final Block glass = get("glass"); public static final Block blood_brick = get("blood_brick");
public static final BlockOre lapis_ore = (BlockOre)get("lapis_ore"); public static final BlockFence blood_brick_fence = get("blood_brick_fence");
public static final Block lapis_block = get("lapis_block"); public static final BlockSlab blood_brick_slab = get("blood_brick_slab");
public static final Block dispenser = get("dispenser"); public static final BlockStairs blood_brick_stairs = get("blood_brick_stairs");
public static final Block sandstone = get("sandstone"); public static final BlockBlueShroom blue_mushroom = get("blue_mushroom");
public static final Block noteblock = get("noteblock"); public static final BlockBookshelf bookshelf = get("bookshelf");
public static final BlockBed red_bed = (BlockBed)get("red_bed"); public static final BlockBrewingStand brewing_stand = get("brewing_stand");
public static final Block golden_rail = get("golden_rail"); public static final Block brick_block = get("brick_block");
public static final Block detector_rail = get("detector_rail"); public static final BlockSlab brick_slab = get("brick_slab");
public static final BlockPistonBase sticky_piston = (BlockPistonBase)get("sticky_piston"); public static final BlockStairs brick_stairs = get("brick_stairs");
public static final Block web = get("web"); public static final BlockMushroom brown_mushroom = get("brown_mushroom");
public static final BlockTallGrass tallgrass = (BlockTallGrass)get("tallgrass"); public static final BlockHugeMushroom brown_mushroom_block = get("brown_mushroom_block");
public static final BlockDeadBush deadbush = (BlockDeadBush)get("deadbush"); public static final BlockCactus cactus = get("cactus");
public static final BlockPistonBase piston = (BlockPistonBase)get("piston"); public static final BlockCake cake = get("cake");
public static final BlockPistonHead piston_head = (BlockPistonHead)get("piston_head"); public static final Block calcium_block = get("calcium_block");
public static final Block wool = get("wool"); public static final BlockOre calcium_ore = get("calcium_ore");
public static final BlockPistonMoving piston_extension = (BlockPistonMoving)get("piston_extension"); public static final BlockCarpet carpet = get("carpet");
public static final BlockFlower flower = (BlockFlower)get("flower"); public static final BlockCarrot carrot = get("carrot");
public static final BlockBush brown_mushroom = (BlockBush)get("brown_mushroom"); public static final BlockCauldron cauldron = get("cauldron");
public static final BlockBush red_mushroom = (BlockBush)get("red_mushroom"); public static final Block cell_rock = get("cell_rock");
public static final Block gold_block = get("gold_block"); public static final BlockDoor cherry_door = get("cherry_door");
public static final Block iron_block = get("iron_block"); public static final BlockFence cherry_fence = get("cherry_fence");
// public static final BlockSlab double_stone_slab = get("double_stone_slab"); public static final BlockFenceGate cherry_fence_gate = get("cherry_fence_gate");
// public static final BlockSlab stone_slab = get("stone_slab"); public static final BlockLeaves cherry_leaves = get("cherry_leaves");
public static final Block brick_block = get("brick_block"); public static final BlockLog cherry_log = get("cherry_log");
public static final Block tnt = get("tnt"); public static final Block cherry_planks = get("cherry_planks");
public static final Block bookshelf = get("bookshelf"); public static final BlockSapling cherry_sapling = get("cherry_sapling");
public static final Block mossy_cobblestone = get("mossy_cobblestone"); public static final BlockSlab cherry_slab = get("cherry_slab");
public static final Block obsidian = get("obsidian"); public static final BlockStairs cherry_stairs = get("cherry_stairs");
public static final Block torch = get("torch"); public static final BlockChest chest = get("chest");
public static final BlockFire fire = (BlockFire)get("fire"); public static final Block chrome_block = get("chrome_block");
public static final BlockFire black_fire = (BlockFire)get("black_fire"); public static final BlockOre chrome_ore = get("chrome_ore");
public static final BlockFire soul_fire = (BlockFire)get("soul_fire"); public static final Block cinnabar_block = get("cinnabar_block");
public static final Block mob_spawner = get("mob_spawner"); public static final BlockOre cinnabar_ore = get("cinnabar_ore");
public static final Block oak_stairs = get("oak_stairs"); public static final BlockClay clay = get("clay");
public static final BlockChest chest = (BlockChest)get("chest"); public static final Block coal_block = get("coal_block");
public static final BlockRedstoneWire redstone = (BlockRedstoneWire)get("redstone"); public static final BlockOre coal_ore = get("coal_ore");
public static final BlockOre diamond_ore = (BlockOre)get("diamond_ore"); public static final Block cobalt_block = get("cobalt_block");
public static final Block diamond_block = get("diamond_block"); public static final BlockOre cobalt_ore = get("cobalt_ore");
public static final Block workbench = get("workbench"); public static final Block cobblestone = get("cobblestone");
public static final Block construction_table = get("construction_table"); public static final BlockSlab cobblestone_slab = get("cobblestone_slab");
public static final Block assembly_unit = get("assembly_unit"); public static final BlockStairs cobblestone_stairs = get("cobblestone_stairs");
public static final Block wheat = get("wheat"); public static final BlockWall cobblestone_wall = get("cobblestone_wall");
public static final Block farmland = get("farmland"); public static final BlockCocoa cocoa = get("cocoa");
public static final Block furnace = get("furnace"); public static final BlockRedstoneComparator comparator = get("comparator");
public static final Block lit_furnace = get("lit_furnace"); public static final BlockWorkbench construction_table = get("construction_table");
public static final Block sign = get("sign"); public static final Block copper_block = get("copper_block");
public static final Block oak_door = get("oak_door"); public static final BlockOre copper_ore = get("copper_ore");
public static final Block spruce_door = get("spruce_door"); public static final BlockCore core = get("core");
public static final Block birch_door = get("birch_door"); public static final BlockDoor dark_oak_door = get("dark_oak_door");
public static final Block jungle_door = get("jungle_door"); public static final BlockFence dark_oak_fence = get("dark_oak_fence");
public static final Block acacia_door = get("acacia_door"); public static final BlockFenceGate dark_oak_fence_gate = get("dark_oak_fence_gate");
public static final Block dark_oak_door = get("dark_oak_door"); public static final BlockLeaves dark_oak_leaves = get("dark_oak_leaves");
public static final Block ladder = get("ladder"); public static final BlockLog dark_oak_log = get("dark_oak_log");
public static final Block rail = get("rail"); public static final Block dark_oak_planks = get("dark_oak_planks");
public static final Block cobblestone_stairs = get("cobblestone_stairs"); public static final BlockSapling dark_oak_sapling = get("dark_oak_sapling");
public static final Block wall_sign = get("wall_sign"); public static final BlockSlab dark_oak_slab = get("dark_oak_slab");
public static final Block lever = get("lever"); public static final BlockStairs dark_oak_stairs = get("dark_oak_stairs");
public static final Block stone_pressure_plate = get("stone_pressure_plate"); public static final BlockDaylightDetector daylight_detector = get("daylight_detector");
public static final Block iron_door = get("iron_door"); public static final BlockDaylightDetector daylight_detector_inverted = get("daylight_detector_inverted");
public static final Block wooden_pressure_plate = get("wooden_pressure_plate"); public static final BlockDeadBush deadbush = get("deadbush");
public static final Block redstone_ore = get("redstone_ore"); public static final BlockRailDetector detector_rail = get("detector_rail");
public static final Block lit_redstone_ore = get("lit_redstone_ore"); public static final Block diamond_block = get("diamond_block");
public static final Block unlit_redstone_torch = get("unlit_redstone_torch"); public static final BlockOre diamond_ore = get("diamond_ore");
public static final Block redstone_torch = get("redstone_torch"); public static final BlockDirt dirt = get("dirt");
public static final Block stone_button = get("stone_button"); public static final BlockDispenser dispenser = get("dispenser");
public static final Block snow_layer = get("snow_layer"); public static final BlockDoublePlant double_plant = get("double_plant");
public static final Block ice = get("ice"); public static final BlockDragonEgg dragon_egg = get("dragon_egg");
public static final Block snow = get("snow"); public static final BlockDropper dropper = get("dropper");
public static final BlockCactus cactus = (BlockCactus)get("cactus"); public static final BlockDryLeaves dry_leaves = get("dry_leaves");
public static final Block clay = get("clay"); public static final Block emerald_block = get("emerald_block");
public static final BlockReed reeds = (BlockReed)get("reeds"); public static final BlockOre emerald_ore = get("emerald_ore");
public static final Block jukebox = get("jukebox"); public static final BlockEnchantmentTable enchanting_table = get("enchanting_table");
public static final Block oak_fence = get("oak_fence"); public static final BlockFarmland farmland = get("farmland");
public static final Block spruce_fence = get("spruce_fence"); public static final BlockFire fire = get("fire");
public static final Block birch_fence = get("birch_fence"); public static final BlockFloorPortal floor_portal = get("floor_portal");
public static final Block jungle_fence = get("jungle_fence"); public static final Block floor_tiles = get("floor_tiles");
public static final Block dark_oak_fence = get("dark_oak_fence"); public static final Block floor_tiles_black = get("floor_tiles_black");
public static final Block acacia_fence = get("acacia_fence"); public static final Block floor_tiles_red = get("floor_tiles_red");
public static final Block pumpkin = get("pumpkin"); public static final Block floor_tiles_white = get("floor_tiles_white");
public static final Block hellrock = get("hellrock"); public static final BlockBaseFlower flower = get("flower");
public static final Block soul_sand = get("soul_sand"); public static final BlockFlowerPot flower_pot = get("flower_pot");
public static final Block glowstone = get("glowstone"); public static final BlockDynamicLiquid flowing_acid = get("flowing_acid");
public static final BlockPortal portal = (BlockPortal)get("portal"); public static final BlockDynamicLiquid flowing_blood = get("flowing_blood");
public static final Block lit_pumpkin = get("lit_pumpkin"); public static final BlockDynamicLiquid flowing_goo = get("flowing_goo");
public static final Block cake = get("cake"); public static final BlockDynamicLiquid flowing_hydrogen = get("flowing_hydrogen");
public static final BlockRedstoneRepeater repeater = (BlockRedstoneRepeater)get("repeater"); public static final BlockDynamicLiquid flowing_lava = get("flowing_lava");
public static final BlockRedstoneRepeater powered_repeater = (BlockRedstoneRepeater)get("powered_repeater"); public static final BlockDynamicLiquid flowing_magma = get("flowing_magma");
public static final Block trapdoor = get("trapdoor"); public static final BlockDynamicLiquid flowing_mercury = get("flowing_mercury");
public static final Block stonebrick = get("stonebrick"); public static final BlockDynamicLiquid flowing_nukage = get("flowing_nukage");
public static final Block brown_mushroom_block = get("brown_mushroom_block"); public static final BlockDynamicLiquid flowing_slime = get("flowing_slime");
public static final Block red_mushroom_block = get("red_mushroom_block"); public static final BlockDynamicLiquid flowing_water = get("flowing_water");
public static final Block iron_bars = get("iron_bars"); public static final BlockFurnace furnace = get("furnace");
public static final Block glass_pane = get("glass_pane"); public static final BlockGlass glass = get("glass");
public static final Block melon_block = get("melon_block"); public static final BlockPane glass_pane = get("glass_pane");
public static final Block pumpkin_stem = get("pumpkin_stem"); public static final BlockGlowstone glowstone = get("glowstone");
public static final Block melon_stem = get("melon_stem"); public static final Block gold_block = get("gold_block");
public static final Block vine = get("vine"); public static final BlockOre gold_ore = get("gold_ore");
public static final Block oak_fence_gate = get("oak_fence_gate"); public static final BlockRailPowered golden_rail = get("golden_rail");
public static final Block spruce_fence_gate = get("spruce_fence_gate"); public static final BlockStaticLiquid goo = get("goo");
public static final Block birch_fence_gate = get("birch_fence_gate"); public static final BlockGrass grass = get("grass");
public static final Block jungle_fence_gate = get("jungle_fence_gate"); public static final BlockGravel gravel = get("gravel");
public static final Block dark_oak_fence_gate = get("dark_oak_fence_gate"); public static final Block gyriyn_block = get("gyriyn_block");
public static final Block acacia_fence_gate = get("acacia_fence_gate"); public static final BlockOre gyriyn_ore = get("gyriyn_ore");
public static final Block brick_stairs = get("brick_stairs"); public static final BlockHardenedClay hardened_clay = get("hardened_clay");
public static final Block stonebrick_stairs = get("stonebrick_stairs"); public static final BlockHay hay_block = get("hay_block");
public static final BlockMycelium mycelium = (BlockMycelium)get("mycelium"); public static final BlockPressurePlateWeighted heavy_weighted_pressure_plate = get("heavy_weighted_pressure_plate");
public static final Block waterlily = get("waterlily"); public static final BlockHellRock hellrock = get("hellrock");
public static final Block blood_brick = get("blood_brick"); public static final BlockHopper hopper = get("hopper");
public static final Block blood_brick_fence = get("blood_brick_fence"); public static final BlockStaticLiquid hydrogen = get("hydrogen");
public static final Block blood_brick_stairs = get("blood_brick_stairs"); public static final BlockIce ice = get("ice");
public static final Block black_brick = get("black_brick"); public static final Block iodine_block = get("iodine_block");
public static final Block black_brick_fence = get("black_brick_fence"); public static final BlockOre iodine_ore = get("iodine_ore");
public static final Block black_brick_stairs = get("black_brick_stairs"); public static final BlockPane iron_bars = get("iron_bars");
public static final Block soul_wart = get("soul_wart"); public static final Block iron_block = get("iron_block");
public static final Block enchanting_table = get("enchanting_table"); public static final BlockDoor iron_door = get("iron_door");
public static final Block brewing_stand = get("brewing_stand"); public static final BlockOre iron_ore = get("iron_ore");
public static final BlockCauldron cauldron = (BlockCauldron)get("cauldron"); public static final BlockTrapDoor iron_trapdoor = get("iron_trapdoor");
public static final Block floor_portal = get("floor_portal"); public static final BlockJukebox jukebox = get("jukebox");
public static final Block portal_frame = get("portal_frame"); public static final BlockDoor jungle_door = get("jungle_door");
public static final Block cell_rock = get("cell_rock"); public static final BlockFence jungle_fence = get("jungle_fence");
public static final Block dragon_egg = get("dragon_egg"); public static final BlockFenceGate jungle_fence_gate = get("jungle_fence_gate");
public static final Block redstone_lamp = get("redstone_lamp"); public static final BlockLeaves jungle_leaves = get("jungle_leaves");
public static final Block lit_redstone_lamp = get("lit_redstone_lamp"); public static final BlockLog jungle_log = get("jungle_log");
// public static final BlockSlab double_wooden_slab = get("double_wooden_slab"); public static final Block jungle_planks = get("jungle_planks");
// public static final BlockSlab wooden_slab = get("wooden_slab"); public static final BlockSapling jungle_sapling = get("jungle_sapling");
public static final Block cocoa = get("cocoa"); public static final BlockSlab jungle_slab = get("jungle_slab");
public static final Block sandstone_stairs = get("sandstone_stairs"); public static final BlockStairs jungle_stairs = get("jungle_stairs");
public static final BlockOre emerald_ore = (BlockOre)get("emerald_ore"); public static final BlockLadder ladder = get("ladder");
public static final Block warp_chest = get("warp_chest"); public static final Block lamp = get("lamp");
public static final BlockTripWireHook tripwire_hook = (BlockTripWireHook)get("tripwire_hook"); public static final Block lapis_block = get("lapis_block");
public static final Block string = get("string"); public static final BlockOre lapis_ore = get("lapis_ore");
public static final Block emerald_block = get("emerald_block"); public static final BlockStaticLiquid lava = get("lava");
public static final Block spruce_stairs = get("spruce_stairs"); public static final Block lead_block = get("lead_block");
public static final Block birch_stairs = get("birch_stairs"); public static final BlockOre lead_ore = get("lead_ore");
public static final Block jungle_stairs = get("jungle_stairs"); public static final BlockLever lever = get("lever");
public static final BlockBeacon beacon = (BlockBeacon)get("beacon"); public static final BlockPressurePlateWeighted light_weighted_pressure_plate = get("light_weighted_pressure_plate");
public static final Block cobblestone_wall = get("cobblestone_wall"); public static final BlockFurnace lit_furnace = get("lit_furnace");
public static final Block flower_pot = get("flower_pot"); public static final BlockPumpkin lit_pumpkin = get("lit_pumpkin");
public static final Block carrot = get("carrot"); public static final BlockRedstoneLight lit_redstone_lamp = get("lit_redstone_lamp");
public static final Block potato = get("potato"); public static final BlockRedstoneOre lit_redstone_ore = get("lit_redstone_ore");
public static final Block wooden_button = get("wooden_button"); public static final Block lithium_block = get("lithium_block");
public static final BlockSkull skull = (BlockSkull)get("skull"); public static final BlockOre lithium_ore = get("lithium_ore");
public static final Block anvil = get("anvil"); public static final BlockStaticLiquid magma = get("magma");
public static final Block trapped_chest = get("trapped_chest"); public static final Block magnesium_block = get("magnesium_block");
public static final Block light_weighted_pressure_plate = get("light_weighted_pressure_plate"); public static final BlockOre magnesium_ore = get("magnesium_ore");
public static final Block heavy_weighted_pressure_plate = get("heavy_weighted_pressure_plate"); public static final Block manganese_block = get("manganese_block");
public static final BlockRedstoneComparator comparator = (BlockRedstoneComparator)get("comparator"); public static final BlockOre manganese_ore = get("manganese_ore");
public static final BlockRedstoneComparator powered_comparator = (BlockRedstoneComparator)get("powered_comparator"); public static final BlockDoor maple_door = get("maple_door");
public static final BlockDaylightDetector daylight_detector = (BlockDaylightDetector)get("daylight_detector"); public static final BlockFence maple_fence = get("maple_fence");
public static final BlockDaylightDetector daylight_detector_inverted = (BlockDaylightDetector)get("daylight_detector_inverted"); public static final BlockFenceGate maple_fence_gate = get("maple_fence_gate");
public static final Block redstone_block = get("redstone_block"); public static final BlockLeaves maple_leaves = get("maple_leaves");
public static final BlockOre quartz_ore = (BlockOre)get("quartz_ore"); public static final BlockLog maple_log = get("maple_log");
public static final BlockHopper hopper = (BlockHopper)get("hopper"); public static final Block maple_planks = get("maple_planks");
public static final Block quartz_block = get("quartz_block"); public static final BlockSapling maple_sapling = get("maple_sapling");
public static final Block black_quartz_block = get("black_quartz_block"); public static final BlockSlab maple_slab = get("maple_slab");
public static final Block quartz_stairs = get("quartz_stairs"); public static final BlockStairs maple_stairs = get("maple_stairs");
public static final Block black_quartz_stairs = get("black_quartz_stairs"); public static final BlockMelon melon_block = get("melon_block");
public static final Block activator_rail = get("activator_rail"); public static final BlockStem melon_stem = get("melon_stem");
public static final Block dropper = get("dropper"); public static final BlockStaticLiquid mercury = get("mercury");
public static final Block stained_hardened_clay = get("stained_hardened_clay"); public static final BlockMobSpawner mob_spawner = get("mob_spawner");
public static final Block iron_trapdoor = get("iron_trapdoor"); public static final BlockTreasure moon_cheese = get("moon_cheese");
public static final Block hay_block = get("hay_block"); public static final Block moon_rock = get("moon_rock");
public static final Block carpet = get("carpet"); public static final Block mossy_cobblestone = get("mossy_cobblestone");
public static final Block hardened_clay = get("hardened_clay"); public static final BlockMycelium mycelium = get("mycelium");
public static final Block coal_block = get("coal_block"); public static final Block neodymium_block = get("neodymium_block");
public static final Block packed_ice = get("packed_ice"); public static final BlockOre neodymium_ore = get("neodymium_ore");
public static final Block acacia_stairs = get("acacia_stairs"); public static final Block neptunium_block = get("neptunium_block");
public static final Block dark_oak_stairs = get("dark_oak_stairs"); public static final BlockOre neptunium_ore = get("neptunium_ore");
public static final Block slime_block = get("slime_block"); public static final Block nichun_block = get("nichun_block");
public static final BlockDoublePlant double_plant = (BlockDoublePlant)get("double_plant"); public static final BlockOre nichun_ore = get("nichun_ore");
public static final BlockStainedGlass stained_glass = (BlockStainedGlass)get("stained_glass"); public static final Block nickel_block = get("nickel_block");
public static final BlockStainedGlassPane stained_glass_pane = (BlockStainedGlassPane)get("stained_glass_pane"); public static final BlockOre nickel_ore = get("nickel_ore");
public static final Block banner = get("banner"); public static final BlockNote noteblock = get("noteblock");
public static final Block wall_banner = get("wall_banner"); public static final BlockStaticLiquid nukage = get("nukage");
public static final BlockNuke nuke = get("nuke");
public static final BlockLeaves oak_leaves = (BlockLeaves)get("oak_leaves"); public static final BlockDoor oak_door = get("oak_door");
public static final BlockLeaves spruce_leaves = (BlockLeaves)get("spruce_leaves"); public static final BlockFence oak_fence = get("oak_fence");
public static final BlockLeaves birch_leaves = (BlockLeaves)get("birch_leaves"); public static final BlockFenceGate oak_fence_gate = get("oak_fence_gate");
public static final BlockLeaves jungle_leaves = (BlockLeaves)get("jungle_leaves"); public static final BlockLeaves oak_leaves = get("oak_leaves");
public static final BlockLeaves acacia_leaves = (BlockLeaves)get("acacia_leaves"); public static final BlockLog oak_log = get("oak_log");
public static final BlockLeaves dark_oak_leaves = (BlockLeaves)get("dark_oak_leaves"); public static final Block oak_planks = get("oak_planks");
public static final BlockLeaves cherry_leaves = (BlockLeaves)get("cherry_leaves"); public static final BlockSapling oak_sapling = get("oak_sapling");
public static final BlockLeaves maple_leaves = (BlockLeaves)get("maple_leaves"); public static final BlockSlab oak_slab = get("oak_slab");
public static final BlockLeaves tian_leaves = (BlockLeaves)get("tian_leaves"); public static final BlockStairs oak_stairs = get("oak_stairs");
public static final BlockLeaves blackwood_leaves = (BlockLeaves)get("blackwood_leaves"); public static final BlockObsidian obsidian = get("obsidian");
public static final Block cherry_stairs = get("cherry_stairs"); public static final BlockPackedIce packed_ice = get("packed_ice");
public static final Block maple_stairs = get("maple_stairs"); public static final Block palladium_block = get("palladium_block");
public static final Block cherry_door = get("cherry_door"); public static final BlockOre palladium_ore = get("palladium_ore");
public static final Block maple_door = get("maple_door"); public static final Block pentagram = get("pentagram");
public static final Block cherry_fence = get("cherry_fence"); public static final Block phosphor_block = get("phosphor_block");
public static final Block maple_fence = get("maple_fence"); public static final BlockOre phosphor_ore = get("phosphor_ore");
public static final Block cherry_fence_gate = get("cherry_fence_gate"); public static final BlockPistonBase piston = get("piston");
public static final Block maple_fence_gate = get("maple_fence_gate"); public static final BlockPistonMoving piston_extension = get("piston_extension");
public static final Block nuke = get("nuke"); public static final BlockPistonHead piston_head = get("piston_head");
// public static final BlockVerticalSlab stone_vslab = get("stone_vslab"); public static final Block platinum_block = get("platinum_block");
// public static final BlockVerticalSlab stone_vslab2 = get("stone_vslab2"); public static final BlockOre platinum_ore = get("platinum_ore");
// public static final BlockVerticalSlab wooden_vslab = get("wooden_vslab"); public static final Block plutonium_block = get("plutonium_block");
// public static final BlockVerticalSlab wooden_vslab2 = get("wooden_vslab2"); public static final BlockOre plutonium_ore = get("plutonium_ore");
public static final BlockOre thetium_ore = (BlockOre)get("thetium_ore"); public static final BlockPortal portal = get("portal");
public static final BlockOre ardite_ore = (BlockOre)get("ardite_ore"); public static final BlockPortalFrame portal_frame = get("portal_frame");
public static final BlockOre gyriyn_ore = (BlockOre)get("gyriyn_ore"); public static final Block potassium_block = get("potassium_block");
public static final BlockOre nichun_ore = (BlockOre)get("nichun_ore"); public static final BlockOre potassium_ore = get("potassium_ore");
public static final BlockOre ruby_ore = (BlockOre)get("ruby_ore"); public static final BlockPotato potato = get("potato");
public static final BlockOre cinnabar_ore = (BlockOre)get("cinnabar_ore"); public static final BlockRedstoneComparator powered_comparator = get("powered_comparator");
public static final Block lamp = get("lamp"); public static final BlockRedstoneRepeater powered_repeater = get("powered_repeater");
public static final Block praseodymium_block = get("praseodymium_block");
public static final Block copper_block = get("copper_block"); public static final BlockOre praseodymium_ore = get("praseodymium_ore");
public static final Block tin_block = get("tin_block"); public static final BlockPumpkin pumpkin = get("pumpkin");
public static final Block aluminium_block = get("aluminium_block"); public static final BlockStem pumpkin_stem = get("pumpkin_stem");
public static final Block lead_block = get("lead_block"); public static final BlockBed purple_bed = get("purple_bed");
public static final BlockQuartz quartz_block = get("quartz_block");
public static final Block tian = get("tian"); public static final BlockOre quartz_ore = get("quartz_ore");
public static final Block tian_soil = get("tian_soil"); public static final BlockSlab quartz_slab = get("quartz_slab");
public static final BlockBush blue_mushroom = (BlockBush)get("blue_mushroom"); public static final BlockStairs quartz_stairs = get("quartz_stairs");
public static final BlockTianReactor tian_reactor = (BlockTianReactor)get("tian_reactor"); public static final Block radium_block = get("radium_block");
public static final Block red_button = get("red_button"); public static final BlockOre radium_ore = get("radium_ore");
public static final Block moon_rock = get("moon_rock"); public static final BlockRail rail = get("rail");
public static final Block moon_cheese = get("moon_cheese"); public static final BlockBed red_bed = get("red_bed");
public static final Block rock = get("rock"); public static final BlockButton red_button = get("red_button");
public static final Block ash = get("ash"); public static final BlockMushroom red_mushroom = get("red_mushroom");
public static final Block core = get("core"); public static final BlockHugeMushroom red_mushroom_block = get("red_mushroom_block");
public static final BlockRedstoneWire redstone = get("redstone");
public static final BlockCompressedPowered redstone_block = get("redstone_block");
public static final BlockRedstoneLight redstone_lamp = get("redstone_lamp");
public static final BlockRedstoneOre redstone_ore = get("redstone_ore");
public static final BlockRedstoneTorch redstone_torch = get("redstone_torch");
public static final BlockReed reeds = get("reeds");
public static final BlockRedstoneRepeater repeater = get("repeater");
public static final BlockRock rock = get("rock");
public static final Block ruby_block = get("ruby_block");
public static final BlockOre ruby_ore = get("ruby_ore");
public static final BlockSand sand = get("sand");
public static final BlockSandStone sandstone = get("sandstone");
public static final BlockSlab sandstone_slab = get("sandstone_slab");
public static final BlockStairs sandstone_stairs = get("sandstone_stairs");
public static final Block selenium_block = get("selenium_block");
public static final BlockOre selenium_ore = get("selenium_ore");
public static final BlockStandingSign sign = get("sign");
public static final Block silicon_block = get("silicon_block");
public static final BlockOre silicon_ore = get("silicon_ore");
public static final Block silver_block = get("silver_block");
public static final BlockOre silver_ore = get("silver_ore");
public static final BlockSkull skull = get("skull");
public static final BlockStaticLiquid slime = get("slime");
public static final BlockSlime slime_block = get("slime_block");
public static final BlockSnowBlock snow = get("snow");
public static final BlockSnow snow_layer = get("snow_layer");
public static final Block sodium_block = get("sodium_block");
public static final BlockOre sodium_ore = get("sodium_ore");
public static final BlockSoulFire soul_fire = get("soul_fire");
public static final BlockSoulSand soul_sand = get("soul_sand");
public static final BlockWart soul_wart = get("soul_wart");
public static final Block sponge = get("sponge");
public static final BlockDoor spruce_door = get("spruce_door");
public static final BlockFence spruce_fence = get("spruce_fence");
public static final BlockFenceGate spruce_fence_gate = get("spruce_fence_gate");
public static final BlockLeaves spruce_leaves = get("spruce_leaves");
public static final BlockLog spruce_log = get("spruce_log");
public static final Block spruce_planks = get("spruce_planks");
public static final BlockSapling spruce_sapling = get("spruce_sapling");
public static final BlockSlab spruce_slab = get("spruce_slab");
public static final BlockStairs spruce_stairs = get("spruce_stairs");
public static final BlockStainedGlass stained_glass = get("stained_glass");
public static final BlockStainedGlassPane stained_glass_pane = get("stained_glass_pane");
public static final BlockColored stained_hardened_clay = get("stained_hardened_clay");
public static final BlockPistonBase sticky_piston = get("sticky_piston");
public static final BlockStone stone = get("stone");
public static final BlockButton stone_button = get("stone_button");
public static final BlockPressurePlate stone_pressure_plate = get("stone_pressure_plate");
public static final BlockSlab stone_slab = get("stone_slab");
public static final BlockStairs stone_stairs = get("stone_stairs");
public static final BlockStoneBrick stonebrick = get("stonebrick");
public static final BlockSlab stonebrick_slab = get("stonebrick_slab");
public static final BlockStairs stonebrick_stairs = get("stonebrick_stairs");
public static final BlockTripWire string = get("string");
public static final Block sulfur_block = get("sulfur_block");
public static final BlockOre sulfur_ore = get("sulfur_ore");
public static final BlockTallGrass tallgrass = get("tallgrass");
public static final Block thetium_block = get("thetium_block");
public static final BlockOre thetium_ore = get("thetium_ore");
public static final Block tian = get("tian");
public static final BlockDoor tian_door = get("tian_door");
public static final BlockFence tian_fence = get("tian_fence");
public static final BlockFenceGate tian_fence_gate = get("tian_fence_gate");
public static final BlockLeaves tian_leaves = get("tian_leaves");
public static final BlockLog tian_log = get("tian_log");
public static final Block tian_planks = get("tian_planks");
public static final BlockTianReactor tian_reactor = get("tian_reactor");
public static final BlockSapling tian_sapling = get("tian_sapling");
public static final BlockSlab tian_slab = get("tian_slab");
public static final BlockTianSoil tian_soil = get("tian_soil");
public static final BlockStairs tian_stairs = get("tian_stairs");
public static final Block tin_block = get("tin_block");
public static final BlockOre tin_ore = get("tin_ore");
public static final Block titanium_block = get("titanium_block");
public static final BlockOre titanium_ore = get("titanium_ore");
public static final BlockTNT tnt = get("tnt");
public static final BlockTorch torch = get("torch");
public static final BlockTrapDoor trapdoor = get("trapdoor");
public static final BlockChest trapped_chest = get("trapped_chest");
public static final BlockTripWireHook tripwire_hook = get("tripwire_hook");
public static final Block tungsten_block = get("tungsten_block");
public static final BlockOre tungsten_ore = get("tungsten_ore");
public static final BlockRedstoneTorch unlit_redstone_torch = get("unlit_redstone_torch");
public static final Block uranium_block = get("uranium_block");
public static final BlockOre uranium_ore = get("uranium_ore");
public static final Block vanadium_block = get("vanadium_block");
public static final BlockOre vanadium_ore = get("vanadium_ore");
public static final BlockVine vine = get("vine");
public static final BlockBannerHanging wall_banner = get("wall_banner");
public static final BlockWallSign wall_sign = get("wall_sign");
public static final BlockWarpChest warp_chest = get("warp_chest");
public static final BlockStaticLiquid water = get("water");
public static final BlockLilyPad waterlily = get("waterlily");
public static final BlockWeb web = get("web");
public static final BlockCrops wheat = get("wheat");
public static final BlockBed white_bed = get("white_bed");
public static final BlockButton wooden_button = get("wooden_button");
public static final BlockPressurePlate wooden_pressure_plate = get("wooden_pressure_plate");
public static final BlockColored wool = get("wool");
public static final BlockWorkbench workbench = get("workbench");
public static final Block zinc_block = get("zinc_block");
public static final BlockOre zinc_ore = get("zinc_ore");
public static final BlockSlab stone_slab = (BlockSlab)get("stone_slab"); private static <T extends Block> T get(String id) {
public static final BlockSlab sandstone_slab = (BlockSlab)get("sandstone_slab");
public static final BlockSlab stonebrick_slab = (BlockSlab)get("stonebrick_slab");
public static final BlockDynamicLiquid flowing_blood = (BlockDynamicLiquid)get("flowing_blood");
public static final BlockStaticLiquid blood = (BlockStaticLiquid)get("blood");
public static final BlockDynamicLiquid flowing_mercury = (BlockDynamicLiquid)get("flowing_mercury");
public static final BlockStaticLiquid mercury = (BlockStaticLiquid)get("mercury");
public static final BlockDynamicLiquid flowing_magma = (BlockDynamicLiquid)get("flowing_magma");
public static final BlockStaticLiquid magma = (BlockStaticLiquid)get("magma");
public static final BlockDynamicLiquid flowing_hydrogen = (BlockDynamicLiquid)get("flowing_hydrogen");
public static final BlockStaticLiquid hydrogen = (BlockStaticLiquid)get("hydrogen");
private static Block get(String id) {
if(!BlockRegistry.REGISTRY.containsKey(id)) if(!BlockRegistry.REGISTRY.containsKey(id))
throw new RuntimeException("Block " + id + " does not exist!"); throw new RuntimeException("Block " + id + " existiert nicht");
return BlockRegistry.REGISTRY.getObject(id); return (T)BlockRegistry.REGISTRY.getObject(id);
} }
// static { static {
// for(Field field : Blocks.class.getDeclaredFields()) { if(Util.DEVMODE) {
// if(Block.class.isAssignableFrom(field.getType())) { Set<Block> blocks = Sets.newHashSet(BlockRegistry.REGISTRY);
// if(!BlockRegistry.REGISTRY.containsKey(field.getName())) { for(Field field : Blocks.class.getDeclaredFields()) {
// throw new RuntimeException("Block " + field.getName() + " does not exist!"); if(Modifier.isStatic(field.getModifiers()) && Modifier.isFinal(field.getModifiers()) && Block.class.isAssignableFrom(field.getType()))
// } try {
// Block block = BlockRegistry.REGISTRY.getObject(field.getName()); blocks.remove(field.get(null));
// try { }
// field.set(null, block); catch(IllegalArgumentException | IllegalAccessException e) {
// } Util.throwUnchecked(e);
// catch(IllegalArgumentException | IllegalAccessException e) { }
// throw new RuntimeException(e); }
// } if(!blocks.isEmpty()) {
// } List<Block> list = Lists.newArrayList(BlockRegistry.REGISTRY);
// } Collections.sort(list, Comparator.comparing(block -> BlockRegistry.REGISTRY.getNameForObject(block)));
// } for(Block block : list) {
String name = BlockRegistry.REGISTRY.getNameForObject(block);
System.err.printf("\tpublic static final %s %s = get(\"%s\");\n", block.getClass().getSimpleName(), name, name);
}
throw new RuntimeException("^^^ " + Blocks.class.getCanonicalName() + ": Blockliste ist unvollständig, Bitte neuen Quellcode einfügen ^^^");
}
}
}
} }

View file

@ -1,219 +1,678 @@
package common.init; package common.init;
import common.item.Item; import java.lang.reflect.Field;
import common.item.ItemAmmo; import java.lang.reflect.Modifier;
import common.item.ItemArmor; import java.util.Collections;
import common.item.ItemBow; import java.util.Comparator;
import common.item.ItemEnchantedBook; import java.util.Iterator;
import common.item.ItemFishingRod; import java.util.List;
import common.item.ItemPotion; import java.util.Set;
import common.item.ItemShears;
import common.collect.Lists;
import common.collect.Sets;
import common.item.*;
import common.util.Util;
public abstract class Items { public abstract class Items {
public static final Item acacia_door = get("acacia_door"); public static final ItemDoor acacia_door = get("acacia_door");
public static final Item ahrd_fragment = get("ahrd_fragment"); public static final ItemFence acacia_fence = get("acacia_fence");
public static final Item aluminium_ingot = get("aluminium_ingot"); public static final ItemBlock acacia_fence_gate = get("acacia_fence_gate");
public static final Item apple = get("apple"); public static final ItemLeaves acacia_leaves = get("acacia_leaves");
public static final Item arrow = get("arrow"); public static final ItemBlock acacia_log = get("acacia_log");
public static final Item baked_potato = get("baked_potato"); public static final ItemBlock acacia_planks = get("acacia_planks");
public static final Item banner = get("banner"); public static final ItemBlock acacia_sapling = get("acacia_sapling");
public static final Item beef = get("beef"); public static final ItemSlab acacia_slab = get("acacia_slab");
public static final Item birch_door = get("birch_door"); public static final ItemBlock acacia_stairs = get("acacia_stairs");
public static final Item blaze_powder = get("blaze_powder"); public static final ItemBucket acid_bucket = get("acid_bucket");
public static final Item blaze_rod = get("blaze_rod"); public static final ItemBlock activator_rail = get("activator_rail");
public static final Item bloodbrick = get("bloodbrick"); public static final Item ahrd_fragment = get("ahrd_fragment");
public static final Item boat = get("boat"); public static final ItemMetalBlock aluminium_block = get("aluminium_block");
public static final ItemAmmo bolt = (ItemAmmo)get("bolt"); public static final ItemMetal aluminium_ingot = get("aluminium_ingot");
public static final Item boltgun = get("boltgun"); public static final ItemMetalBlock aluminium_ore = get("aluminium_ore");
public static final Item bone = get("bone"); public static final ItemMetalBlock antimony_block = get("antimony_block");
public static final Item book = get("book"); public static final ItemMetalBlock antimony_ore = get("antimony_ore");
public static final ItemBow bow = (ItemBow)get("bow"); public static final ItemMetal antimony_powder = get("antimony_powder");
public static final Item bowl = get("bowl"); public static final ItemAnvilBlock anvil = get("anvil");
public static final Item bread = get("bread"); public static final ItemFood apple = get("apple");
public static final Item brewing_stand = get("brewing_stand"); public static final ItemBlock ardite_block = get("ardite_block");
public static final Item brick = get("brick"); public static final ItemArmor ardite_boots = get("ardite_boots");
public static final Item bucket = get("bucket"); public static final ItemArmor ardite_chestplate = get("ardite_chestplate");
public static final Item cake = get("cake"); public static final ItemArmor ardite_helmet = get("ardite_helmet");
public static final Item camera = get("camera"); public static final ItemArmor ardite_leggings = get("ardite_leggings");
public static final Item carrot = get("carrot"); public static final ItemBlock ardite_ore = get("ardite_ore");
public static final Item carrot_on_a_stick = get("carrot_on_a_stick"); public static final ItemSword ardite_sword = get("ardite_sword");
public static final Item cauldron = get("cauldron"); public static final Item arrow = get("arrow");
public static final Item chain = get("chain"); public static final ItemMetalBlock arsenic_block = get("arsenic_block");
public static final ItemArmor chain_boots = (ItemArmor)get("chain_boots"); public static final ItemMetalBlock arsenic_ore = get("arsenic_ore");
public static final ItemArmor chain_chestplate = (ItemArmor)get("chain_chestplate"); public static final ItemMetal arsenic_powder = get("arsenic_powder");
public static final ItemArmor chain_helmet = (ItemArmor)get("chain_helmet"); public static final ItemBlock ash = get("ash");
public static final ItemArmor chain_leggings = (ItemArmor)get("chain_leggings"); public static final ItemBlock assembly_unit = get("assembly_unit");
public static final Item charge_crystal = get("charge_crystal"); public static final ItemFood baked_potato = get("baked_potato");
public static final Item charged_orb = get("charged_orb"); public static final ItemBanHammer banhammer = get("banhammer");
public static final Item cherry_door = get("cherry_door"); public static final ItemBanner banner = get("banner");
public static final Item chest_minecart = get("chest_minecart"); public static final ItemBlock beacon = get("beacon");
public static final Item chick_magnet = get("chick_magnet"); public static final ItemBlock bedrock = get("bedrock");
public static final Item chicken = get("chicken"); public static final ItemFood beef = get("beef");
public static final Item cinnabar = get("cinnabar"); public static final ItemDoor birch_door = get("birch_door");
public static final Item clay_ball = get("clay_ball"); public static final ItemFence birch_fence = get("birch_fence");
public static final Item coal = get("coal"); public static final ItemBlock birch_fence_gate = get("birch_fence_gate");
public static final Item cobalt_ingot = get("cobalt_ingot"); public static final ItemLeaves birch_leaves = get("birch_leaves");
public static final Item comparator = get("comparator"); public static final ItemBlock birch_log = get("birch_log");
public static final Item cooked_beef = get("cooked_beef"); public static final ItemBlock birch_planks = get("birch_planks");
public static final Item cooked_chicken = get("cooked_chicken"); public static final ItemBlock birch_sapling = get("birch_sapling");
public static final Item cooked_fish = get("cooked_fish"); public static final ItemSlab birch_slab = get("birch_slab");
public static final Item cooked_porkchop = get("cooked_porkchop"); public static final ItemBlock birch_stairs = get("birch_stairs");
public static final Item cookie = get("cookie"); public static final ItemMetalBlock bismuth_block = get("bismuth_block");
public static final Item copper_ingot = get("copper_ingot"); public static final ItemMetal bismuth_ingot = get("bismuth_ingot");
public static final Item dark_oak_door = get("dark_oak_door"); public static final ItemMetalBlock bismuth_ore = get("bismuth_ore");
public static final Item diamond = get("diamond"); public static final ItemBed black_bed = get("black_bed");
public static final Item diamond_axe = get("diamond_axe"); public static final ItemBlock black_brick = get("black_brick");
public static final ItemArmor diamond_boots = (ItemArmor)get("diamond_boots"); public static final ItemFence black_brick_fence = get("black_brick_fence");
public static final ItemArmor diamond_chestplate = (ItemArmor)get("diamond_chestplate"); public static final ItemSlab black_brick_slab = get("black_brick_slab");
public static final ItemArmor diamond_helmet = (ItemArmor)get("diamond_helmet"); public static final ItemBlock black_brick_stairs = get("black_brick_stairs");
public static final Item diamond_hoe = get("diamond_hoe"); public static final ItemMetalBlock black_metal_block = get("black_metal_block");
public static final Item diamond_horse_armor = get("diamond_horse_armor"); public static final ItemMetal black_metal_ingot = get("black_metal_ingot");
public static final ItemArmor diamond_leggings = (ItemArmor)get("diamond_leggings"); public static final ItemMetalBlock black_metal_ore = get("black_metal_ore");
public static final Item diamond_pickaxe = get("diamond_pickaxe"); public static final Item black_quartz = get("black_quartz");
public static final ItemShears diamond_shears = (ItemShears)get("diamond_shears"); public static final ItemMultiTexture black_quartz_block = get("black_quartz_block");
public static final Item diamond_shovel = get("diamond_shovel"); public static final ItemBlock black_quartz_ore = get("black_quartz_ore");
public static final Item diamond_sword = get("diamond_sword"); public static final ItemSlab black_quartz_slab = get("black_quartz_slab");
public static final Item die = get("die"); public static final ItemBlock black_quartz_stairs = get("black_quartz_stairs");
public static final Item dye = get("dye"); public static final Item blackbrick = get("blackbrick");
public static final Item dynamite = get("dynamite"); public static final ItemBlock blackened_cobble = get("blackened_cobble");
public static final Item egg = get("egg"); public static final ItemBlock blackened_dirt = get("blackened_dirt");
public static final Item emerald = get("emerald"); public static final ItemBlock blackened_soil = get("blackened_soil");
public static final ItemEnchantedBook enchanted_book = (ItemEnchantedBook)get("enchanted_book"); public static final ItemBlock blackened_stone = get("blackened_stone");
public static final Item experience_bottle = get("experience_bottle"); public static final ItemDoor blackwood_door = get("blackwood_door");
public static final Item feather = get("feather"); public static final ItemFence blackwood_fence = get("blackwood_fence");
public static final Item fermented_spider_eye = get("fermented_spider_eye"); public static final ItemBlock blackwood_fence_gate = get("blackwood_fence_gate");
public static final Item fire_charge = get("fire_charge"); public static final ItemLeaves blackwood_leaves = get("blackwood_leaves");
public static final Item firework_charge = get("firework_charge"); public static final ItemBlock blackwood_log = get("blackwood_log");
public static final Item fireworks = get("fireworks"); public static final ItemBlock blackwood_planks = get("blackwood_planks");
public static final Item fish = get("fish"); public static final ItemBlock blackwood_sapling = get("blackwood_sapling");
public static final ItemFishingRod fishing_rod = (ItemFishingRod)get("fishing_rod"); public static final ItemSlab blackwood_slab = get("blackwood_slab");
public static final Item flint = get("flint"); public static final ItemBlock blackwood_stairs = get("blackwood_stairs");
public static final Item flint_and_steel = get("flint_and_steel"); public static final Item blaze_powder = get("blaze_powder");
public static final Item flower_pot = get("flower_pot"); public static final ItemRod blaze_rod = get("blaze_rod");
public static final Item ghast_tear = get("ghast_tear"); public static final ItemBlock blood_brick = get("blood_brick");
public static final Item ghi_fragment = get("ghi_fragment"); public static final ItemFence blood_brick_fence = get("blood_brick_fence");
public static final Item glass_bottle = get("glass_bottle"); public static final ItemSlab blood_brick_slab = get("blood_brick_slab");
public static final Item glowstone_dust = get("glowstone_dust"); public static final ItemBlock blood_brick_stairs = get("blood_brick_stairs");
public static final Item gold_axe = get("gold_axe"); public static final ItemBucket blood_bucket = get("blood_bucket");
public static final ItemArmor gold_boots = (ItemArmor)get("gold_boots"); public static final Item bloodbrick = get("bloodbrick");
public static final ItemArmor gold_chestplate = (ItemArmor)get("gold_chestplate"); public static final ItemBlock blue_mushroom = get("blue_mushroom");
public static final ItemArmor gold_helmet = (ItemArmor)get("gold_helmet"); public static final ItemBoat boat = get("boat");
public static final Item gold_hoe = get("gold_hoe"); public static final ItemAmmo bolt = get("bolt");
public static final Item gold_horse_armor = get("gold_horse_armor"); public static final ItemBoltgun boltgun = get("boltgun");
public static final Item gold_ingot = get("gold_ingot"); public static final ItemStick bone = get("bone");
public static final ItemArmor gold_leggings = (ItemArmor)get("gold_leggings"); public static final ItemBook book = get("book");
public static final Item gold_nugget = get("gold_nugget"); public static final ItemBlock bookshelf = get("bookshelf");
public static final Item gold_pickaxe = get("gold_pickaxe"); public static final ItemBow bow = get("bow");
public static final Item gold_shovel = get("gold_shovel"); public static final ItemSmall bowl = get("bowl");
public static final Item gold_sword = get("gold_sword"); public static final ItemFood bread = get("bread");
public static final Item golden_apple = get("golden_apple"); public static final ItemReed brewing_stand = get("brewing_stand");
public static final Item golden_carrot = get("golden_carrot"); public static final Item brick = get("brick");
public static final Item gunpowder = get("gunpowder"); public static final ItemBlock brick_block = get("brick_block");
public static final Item hopper_minecart = get("hopper_minecart"); public static final ItemSlab brick_slab = get("brick_slab");
public static final Item info_wand = get("info_wand"); public static final ItemBlock brick_stairs = get("brick_stairs");
public static final Item iron_axe = get("iron_axe"); public static final ItemBlock brown_mushroom = get("brown_mushroom");
public static final ItemArmor iron_boots = (ItemArmor)get("iron_boots"); public static final ItemHugeMushroom brown_mushroom_block = get("brown_mushroom_block");
public static final ItemArmor iron_chestplate = (ItemArmor)get("iron_chestplate"); public static final ItemBucket bucket = get("bucket");
public static final Item iron_door = get("iron_door"); public static final ItemFlintAndSteel burning_soul = get("burning_soul");
public static final ItemArmor iron_helmet = (ItemArmor)get("iron_helmet"); public static final ItemBlock cactus = get("cactus");
public static final Item iron_hoe = get("iron_hoe"); public static final ItemReed cake = get("cake");
public static final Item iron_horse_armor = get("iron_horse_armor"); public static final ItemMetalBlock calcium_block = get("calcium_block");
public static final Item iron_ingot = get("iron_ingot"); public static final ItemMetalBlock calcium_ore = get("calcium_ore");
public static final Item titanium_ingot = get("titanium_ingot"); public static final ItemMetal calcium_powder = get("calcium_powder");
public static final ItemArmor iron_leggings = (ItemArmor)get("iron_leggings"); public static final ItemCamera camera = get("camera");
public static final Item iron_pickaxe = get("iron_pickaxe"); public static final ItemCloth carpet = get("carpet");
public static final ItemShears iron_shears = (ItemShears)get("iron_shears"); public static final ItemSeedFood carrot = get("carrot");
public static final Item iron_shovel = get("iron_shovel"); public static final ItemCarrotOnAStick carrot_on_a_stick = get("carrot_on_a_stick");
public static final Item iron_sword = get("iron_sword"); public static final ItemReed cauldron = get("cauldron");
public static final Item jungle_door = get("jungle_door"); public static final ItemBlock cell_rock = get("cell_rock");
public static final Item key = get("key"); public static final ItemMagnetic chain = get("chain");
public static final Item lead = get("lead"); public static final ItemArmor chain_boots = get("chain_boots");
public static final Item lead_ingot = get("lead_ingot"); public static final ItemArmor chain_chestplate = get("chain_chestplate");
public static final Item leather = get("leather"); public static final ItemArmor chain_helmet = get("chain_helmet");
public static final ItemArmor leather_boots = (ItemArmor)get("leather_boots"); public static final ItemArmor chain_leggings = get("chain_leggings");
public static final ItemArmor leather_chestplate = (ItemArmor)get("leather_chestplate"); public static final ItemEffect charge_crystal = get("charge_crystal");
public static final ItemArmor leather_helmet = (ItemArmor)get("leather_helmet"); public static final ItemChargedOrb charged_orb = get("charged_orb");
public static final ItemArmor leather_leggings = (ItemArmor)get("leather_leggings"); public static final ItemDoor cherry_door = get("cherry_door");
public static final Item lightning_wand = get("lightning_wand"); public static final ItemFence cherry_fence = get("cherry_fence");
public static final Item magma_cream = get("magma_cream"); public static final ItemBlock cherry_fence_gate = get("cherry_fence_gate");
public static final Item magnet = get("magnet"); public static final ItemLeaves cherry_leaves = get("cherry_leaves");
public static final Item maple_door = get("maple_door"); public static final ItemBlock cherry_log = get("cherry_log");
public static final Item melon = get("melon"); public static final ItemBlock cherry_planks = get("cherry_planks");
public static final Item melon_stem = get("melon_stem"); public static final ItemBlock cherry_sapling = get("cherry_sapling");
public static final Item milk_bucket = get("milk_bucket"); public static final ItemSlab cherry_slab = get("cherry_slab");
public static final Item minecart = get("minecart"); public static final ItemBlock cherry_stairs = get("cherry_stairs");
public static final Item mushroom_stew = get("mushroom_stew"); public static final ItemChest chest = get("chest");
public static final Item name_tag = get("name_tag"); public static final ItemMinecart chest_minecart = get("chest_minecart");
public static final Item navigator = get("navigator"); public static final ItemMagnet chick_magnet = get("chick_magnet");
public static final Item neodymium_ingot = get("neodymium_ingot"); public static final ItemFood chicken = get("chicken");
public static final Item nickel_ingot = get("nickel_ingot"); public static final ItemMetalBlock chrome_block = get("chrome_block");
public static final Item nieh_fragment = get("nieh_fragment"); public static final ItemMetal chrome_ingot = get("chrome_ingot");
public static final Item oak_door = get("oak_door"); public static final ItemMetalBlock chrome_ore = get("chrome_ore");
public static final Item orb = get("orb"); public static final Item cinnabar = get("cinnabar");
public static final Item paper = get("paper"); public static final ItemBlock cinnabar_block = get("cinnabar_block");
public static final Item poisonous_potato = get("poisonous_potato"); public static final ItemBlock cinnabar_ore = get("cinnabar_ore");
public static final Item porkchop = get("porkchop"); public static final ItemBlock clay = get("clay");
public static final Item portal_frame = get("portal_frame"); public static final Item clay_ball = get("clay_ball");
public static final Item potato = get("potato"); public static final ItemArmor cloth_boots = get("cloth_boots");
public static final ItemPotion potion = (ItemPotion)get("potion"); public static final ItemArmor cloth_chestplate = get("cloth_chestplate");
public static final Item pumpkin_pie = get("pumpkin_pie"); public static final ItemArmor cloth_helmet = get("cloth_helmet");
public static final Item pumpkin_stem = get("pumpkin_stem"); public static final ItemArmor cloth_leggings = get("cloth_leggings");
public static final Item quartz = get("quartz"); public static final ItemCoal coal = get("coal");
public static final Item record_11 = get("record_11"); public static final ItemBlock coal_block = get("coal_block");
public static final Item record_13 = get("record_13"); public static final ItemBlock coal_ore = get("coal_ore");
public static final Item record_blocks = get("record_blocks"); public static final ItemMetalBlock cobalt_block = get("cobalt_block");
public static final Item record_cat = get("record_cat"); public static final ItemMetal cobalt_ingot = get("cobalt_ingot");
public static final Item record_chirp = get("record_chirp"); public static final ItemMetalBlock cobalt_ore = get("cobalt_ore");
public static final Item record_delay = get("record_delay"); public static final ItemBlock cobblestone = get("cobblestone");
public static final Item record_extend = get("record_extend"); public static final ItemSlab cobblestone_slab = get("cobblestone_slab");
public static final Item record_far = get("record_far"); public static final ItemBlock cobblestone_stairs = get("cobblestone_stairs");
public static final Item record_mall = get("record_mall"); public static final ItemWall cobblestone_wall = get("cobblestone_wall");
public static final Item record_mellohi = get("record_mellohi"); public static final ItemReed comparator = get("comparator");
public static final Item record_stal = get("record_stal"); public static final ItemBlock construction_table = get("construction_table");
public static final Item record_strad = get("record_strad"); public static final ItemFood cooked_beef = get("cooked_beef");
public static final Item record_wait = get("record_wait"); public static final ItemFood cooked_chicken = get("cooked_chicken");
public static final Item record_ward = get("record_ward"); public static final ItemFishFood cooked_fish = get("cooked_fish");
public static final Item redstone = get("redstone"); public static final ItemFood cooked_porkchop = get("cooked_porkchop");
public static final Item reeds = get("reeds"); public static final ItemFood cookie = get("cookie");
public static final Item repeater = get("repeater"); public static final ItemMetalBlock copper_block = get("copper_block");
public static final Item rotten_flesh = get("rotten_flesh"); public static final ItemMetal copper_ingot = get("copper_ingot");
public static final Item ruby = get("ruby"); public static final ItemMetalBlock copper_ore = get("copper_ore");
public static final Item saddle = get("saddle"); public static final ItemBlock core = get("core");
public static final Item sign = get("sign"); public static final ItemFlintAndSteel dark_lighter = get("dark_lighter");
public static final Item skull = get("skull"); public static final ItemDoor dark_oak_door = get("dark_oak_door");
public static final Item slime_ball = get("slime_ball"); public static final ItemFence dark_oak_fence = get("dark_oak_fence");
public static final Item snowball = get("snowball"); public static final ItemBlock dark_oak_fence_gate = get("dark_oak_fence_gate");
public static final Item soul_wart = get("soul_wart"); public static final ItemLeaves dark_oak_leaves = get("dark_oak_leaves");
public static final Item speckled_melon = get("speckled_melon"); public static final ItemBlock dark_oak_log = get("dark_oak_log");
public static final Item spider_eye = get("spider_eye"); public static final ItemBlock dark_oak_planks = get("dark_oak_planks");
public static final Item spruce_door = get("spruce_door"); public static final ItemBlock dark_oak_sapling = get("dark_oak_sapling");
public static final Item stick = get("stick"); public static final ItemSlab dark_oak_slab = get("dark_oak_slab");
public static final Item stone_axe = get("stone_axe"); public static final ItemBlock dark_oak_stairs = get("dark_oak_stairs");
public static final Item stone_hoe = get("stone_hoe"); public static final ItemBlock daylight_detector = get("daylight_detector");
public static final Item stone_pickaxe = get("stone_pickaxe"); public static final ItemBlock deadbush = get("deadbush");
public static final Item stone_shovel = get("stone_shovel"); public static final ItemBlock detector_rail = get("detector_rail");
public static final Item stone_sword = get("stone_sword"); public static final Item diamond = get("diamond");
public static final Item string = get("string"); public static final ItemAxe diamond_axe = get("diamond_axe");
public static final Item sugar = get("sugar"); public static final ItemBlock diamond_block = get("diamond_block");
public static final Item thi_fragment = get("thi_fragment"); public static final ItemArmor diamond_boots = get("diamond_boots");
public static final Item tin_ingot = get("tin_ingot"); public static final ItemArmor diamond_chestplate = get("diamond_chestplate");
public static final Item tnt_minecart = get("tnt_minecart"); public static final ItemArmor diamond_helmet = get("diamond_helmet");
public static final Item wand = get("wand"); public static final ItemHoe diamond_hoe = get("diamond_hoe");
public static final Item water_bucket = get("water_bucket"); public static final ItemHorseArmor diamond_horse_armor = get("diamond_horse_armor");
public static final Item wheat = get("wheat"); public static final ItemArmor diamond_leggings = get("diamond_leggings");
public static final Item wheats = get("wheats"); public static final ItemBlock diamond_ore = get("diamond_ore");
public static final Item wood_axe = get("wood_axe"); public static final ItemPickaxe diamond_pickaxe = get("diamond_pickaxe");
public static final Item wood_hoe = get("wood_hoe"); public static final ItemShears diamond_shears = get("diamond_shears");
public static final Item wood_pickaxe = get("wood_pickaxe"); public static final ItemShovel diamond_shovel = get("diamond_shovel");
public static final Item wood_shovel = get("wood_shovel"); public static final ItemSword diamond_sword = get("diamond_sword");
public static final Item wood_sword = get("wood_sword"); public static final ItemDie die = get("die");
public static final Item writable_book = get("writable_book"); public static final ItemMultiTexture dirt = get("dirt");
public static final Item written_book = get("written_book"); public static final ItemDispenser dispenser = get("dispenser");
public static final ItemDoublePlant double_plant = get("double_plant");
public static final ItemBlock dragon_egg = get("dragon_egg");
public static final ItemDispenser dropper = get("dropper");
public static final ItemBlock dry_leaves = get("dry_leaves");
public static final ItemDye dye = get("dye");
public static final ItemDynamite dynamite = get("dynamite");
public static final ItemEgg egg = get("egg");
public static final Item emerald = get("emerald");
public static final ItemBlock emerald_block = get("emerald_block");
public static final ItemBlock emerald_ore = get("emerald_ore");
public static final ItemEnchantedBook enchanted_book = get("enchanted_book");
public static final ItemBlock enchanting_table = get("enchanting_table");
public static final ItemExpBottle experience_bottle = get("experience_bottle");
public static final ItemExterminator exterminator = get("exterminator");
public static final ItemBlock farmland = get("farmland");
public static final Item feather = get("feather");
public static final Item fermented_spider_eye = get("fermented_spider_eye");
public static final ItemFireball fire_charge = get("fire_charge");
public static final ItemFireworkCharge firework_charge = get("firework_charge");
public static final ItemFirework fireworks = get("fireworks");
public static final ItemFishFood fish = get("fish");
public static final ItemFishingRod fishing_rod = get("fishing_rod");
public static final Item flint = get("flint");
public static final ItemFlintAndSteel flint_and_steel = get("flint_and_steel");
public static final ItemBlock floor_tiles = get("floor_tiles");
public static final ItemBlock floor_tiles_black = get("floor_tiles_black");
public static final ItemBlock floor_tiles_red = get("floor_tiles_red");
public static final ItemBlock floor_tiles_white = get("floor_tiles_white");
public static final ItemMultiTexture flower = get("flower");
public static final ItemReed flower_pot = get("flower_pot");
public static final ItemBlock furnace = get("furnace");
public static final ItemTiny ghast_tear = get("ghast_tear");
public static final Item ghi_fragment = get("ghi_fragment");
public static final ItemBlock glass = get("glass");
public static final ItemGlassBottle glass_bottle = get("glass_bottle");
public static final ItemBlock glass_pane = get("glass_pane");
public static final ItemBlock glowstone = get("glowstone");
public static final Item glowstone_dust = get("glowstone_dust");
public static final ItemAxe gold_axe = get("gold_axe");
public static final ItemMetalBlock gold_block = get("gold_block");
public static final ItemArmor gold_boots = get("gold_boots");
public static final ItemArmor gold_chestplate = get("gold_chestplate");
public static final ItemArmor gold_helmet = get("gold_helmet");
public static final ItemHoe gold_hoe = get("gold_hoe");
public static final ItemHorseArmor gold_horse_armor = get("gold_horse_armor");
public static final ItemMetal gold_ingot = get("gold_ingot");
public static final ItemArmor gold_leggings = get("gold_leggings");
public static final ItemNugget gold_nugget = get("gold_nugget");
public static final ItemMetalBlock gold_ore = get("gold_ore");
public static final ItemPickaxe gold_pickaxe = get("gold_pickaxe");
public static final ItemShears gold_shears = get("gold_shears");
public static final ItemShovel gold_shovel = get("gold_shovel");
public static final ItemSword gold_sword = get("gold_sword");
public static final ItemAppleGold golden_apple = get("golden_apple");
public static final ItemFood golden_carrot = get("golden_carrot");
public static final ItemBlock golden_rail = get("golden_rail");
public static final ItemBucket goo_bucket = get("goo_bucket");
public static final ItemColored grass = get("grass");
public static final ItemBlock gravel = get("gravel");
public static final Item gunpowder = get("gunpowder");
public static final ItemAxe gyriyn_axe = get("gyriyn_axe");
public static final ItemBlock gyriyn_block = get("gyriyn_block");
public static final ItemHoe gyriyn_hoe = get("gyriyn_hoe");
public static final ItemBlock gyriyn_ore = get("gyriyn_ore");
public static final ItemPickaxe gyriyn_pickaxe = get("gyriyn_pickaxe");
public static final ItemShovel gyriyn_shovel = get("gyriyn_shovel");
public static final ItemBlock hardened_clay = get("hardened_clay");
public static final ItemBlock hay_block = get("hay_block");
public static final ItemPressurePlate heavy_weighted_pressure_plate = get("heavy_weighted_pressure_plate");
public static final ItemBlock hellrock = get("hellrock");
public static final ItemBlock hopper = get("hopper");
public static final ItemMinecart hopper_minecart = get("hopper_minecart");
public static final ItemBucket hydrogen_bucket = get("hydrogen_bucket");
public static final ItemBlock ice = get("ice");
public static final ItemInfoWand info_wand = get("info_wand");
public static final ItemMetalBlock iodine_block = get("iodine_block");
public static final ItemMetalBlock iodine_ore = get("iodine_ore");
public static final ItemMetal iodine_powder = get("iodine_powder");
public static final ItemAxe iron_axe = get("iron_axe");
public static final ItemBlock iron_bars = get("iron_bars");
public static final ItemMetalBlock iron_block = get("iron_block");
public static final ItemArmor iron_boots = get("iron_boots");
public static final ItemArmor iron_chestplate = get("iron_chestplate");
public static final ItemDoor iron_door = get("iron_door");
public static final ItemArmor iron_helmet = get("iron_helmet");
public static final ItemHoe iron_hoe = get("iron_hoe");
public static final ItemHorseArmor iron_horse_armor = get("iron_horse_armor");
public static final ItemMetal iron_ingot = get("iron_ingot");
public static final ItemArmor iron_leggings = get("iron_leggings");
public static final ItemMetalBlock iron_ore = get("iron_ore");
public static final ItemPickaxe iron_pickaxe = get("iron_pickaxe");
public static final ItemShears iron_shears = get("iron_shears");
public static final ItemShovel iron_shovel = get("iron_shovel");
public static final ItemSword iron_sword = get("iron_sword");
public static final ItemBlock iron_trapdoor = get("iron_trapdoor");
public static final ItemBlock jukebox = get("jukebox");
public static final ItemDoor jungle_door = get("jungle_door");
public static final ItemFence jungle_fence = get("jungle_fence");
public static final ItemBlock jungle_fence_gate = get("jungle_fence_gate");
public static final ItemLeaves jungle_leaves = get("jungle_leaves");
public static final ItemBlock jungle_log = get("jungle_log");
public static final ItemBlock jungle_planks = get("jungle_planks");
public static final ItemBlock jungle_sapling = get("jungle_sapling");
public static final ItemSlab jungle_slab = get("jungle_slab");
public static final ItemBlock jungle_stairs = get("jungle_stairs");
public static final ItemKey key = get("key");
public static final ItemBlock ladder = get("ladder");
public static final ItemBlock lamp = get("lamp");
public static final ItemBlock lapis_block = get("lapis_block");
public static final ItemBlock lapis_ore = get("lapis_ore");
public static final ItemBucket lava_bucket = get("lava_bucket");
public static final ItemLead lead = get("lead");
public static final ItemMetalBlock lead_block = get("lead_block");
public static final ItemMetal lead_ingot = get("lead_ingot");
public static final ItemMetalBlock lead_ore = get("lead_ore");
public static final Item leather = get("leather");
public static final ItemArmor leather_boots = get("leather_boots");
public static final ItemArmor leather_chestplate = get("leather_chestplate");
public static final ItemArmor leather_helmet = get("leather_helmet");
public static final ItemArmor leather_leggings = get("leather_leggings");
public static final ItemBlock lever = get("lever");
public static final ItemPressurePlate light_weighted_pressure_plate = get("light_weighted_pressure_plate");
public static final ItemLightning lightning_wand = get("lightning_wand");
public static final ItemBlock lit_furnace = get("lit_furnace");
public static final ItemBlock lit_pumpkin = get("lit_pumpkin");
public static final ItemMetalBlock lithium_block = get("lithium_block");
public static final ItemMetal lithium_ingot = get("lithium_ingot");
public static final ItemMetalBlock lithium_ore = get("lithium_ore");
public static final ItemBucket magma_bucket = get("magma_bucket");
public static final Item magma_cream = get("magma_cream");
public static final ItemMetalBlock magnesium_block = get("magnesium_block");
public static final ItemMetalBlock magnesium_ore = get("magnesium_ore");
public static final ItemMetal magnesium_powder = get("magnesium_powder");
public static final ItemMagnet magnet = get("magnet");
public static final ItemMetalBlock manganese_block = get("manganese_block");
public static final ItemMetal manganese_ingot = get("manganese_ingot");
public static final ItemMetalBlock manganese_ore = get("manganese_ore");
public static final ItemDoor maple_door = get("maple_door");
public static final ItemFence maple_fence = get("maple_fence");
public static final ItemBlock maple_fence_gate = get("maple_fence_gate");
public static final ItemLeaves maple_leaves = get("maple_leaves");
public static final ItemBlock maple_log = get("maple_log");
public static final ItemBlock maple_planks = get("maple_planks");
public static final ItemBlock maple_sapling = get("maple_sapling");
public static final ItemSlab maple_slab = get("maple_slab");
public static final ItemBlock maple_stairs = get("maple_stairs");
public static final ItemFood melon = get("melon");
public static final ItemBlock melon_block = get("melon_block");
public static final ItemSeeds melon_stem = get("melon_stem");
public static final ItemBucket mercury_bucket = get("mercury_bucket");
public static final ItemBucketMilk milk_bucket = get("milk_bucket");
public static final ItemMinecart minecart = get("minecart");
public static final ItemBlock mob_spawner = get("mob_spawner");
public static final ItemBlock moon_cheese = get("moon_cheese");
public static final ItemBlock moon_rock = get("moon_rock");
public static final ItemBlock mossy_cobblestone = get("mossy_cobblestone");
public static final ItemSoup mushroom_stew = get("mushroom_stew");
public static final ItemBlock mycelium = get("mycelium");
public static final ItemNameTag name_tag = get("name_tag");
public static final ItemSpaceNavigator navigator = get("navigator");
public static final ItemMetalBlock neodymium_block = get("neodymium_block");
public static final ItemMetal neodymium_ingot = get("neodymium_ingot");
public static final ItemMetalBlock neodymium_ore = get("neodymium_ore");
public static final ItemMetalBlock neptunium_block = get("neptunium_block");
public static final ItemMetal neptunium_ingot = get("neptunium_ingot");
public static final ItemMetalBlock neptunium_ore = get("neptunium_ore");
public static final ItemAxe nichun_axe = get("nichun_axe");
public static final ItemBlock nichun_block = get("nichun_block");
public static final ItemArmor nichun_boots = get("nichun_boots");
public static final ItemArmor nichun_chestplate = get("nichun_chestplate");
public static final ItemArmor nichun_helmet = get("nichun_helmet");
public static final ItemHoe nichun_hoe = get("nichun_hoe");
public static final ItemArmor nichun_leggings = get("nichun_leggings");
public static final ItemBlock nichun_ore = get("nichun_ore");
public static final ItemPickaxe nichun_pickaxe = get("nichun_pickaxe");
public static final ItemShovel nichun_shovel = get("nichun_shovel");
public static final ItemSword nichun_sword = get("nichun_sword");
public static final ItemMetalBlock nickel_block = get("nickel_block");
public static final ItemMetal nickel_ingot = get("nickel_ingot");
public static final ItemMetalBlock nickel_ore = get("nickel_ore");
public static final Item nieh_fragment = get("nieh_fragment");
public static final ItemBlock noteblock = get("noteblock");
public static final ItemBucket nukage_bucket = get("nukage_bucket");
public static final ItemBlock nuke = get("nuke");
public static final ItemDoor oak_door = get("oak_door");
public static final ItemFence oak_fence = get("oak_fence");
public static final ItemBlock oak_fence_gate = get("oak_fence_gate");
public static final ItemLeaves oak_leaves = get("oak_leaves");
public static final ItemBlock oak_log = get("oak_log");
public static final ItemBlock oak_planks = get("oak_planks");
public static final ItemBlock oak_sapling = get("oak_sapling");
public static final ItemSlab oak_slab = get("oak_slab");
public static final ItemBlock oak_stairs = get("oak_stairs");
public static final ItemBlock obsidian = get("obsidian");
public static final ItemFragile orb = get("orb");
public static final ItemBlock packed_ice = get("packed_ice");
public static final ItemMetalBlock palladium_block = get("palladium_block");
public static final ItemMetal palladium_ingot = get("palladium_ingot");
public static final ItemMetalBlock palladium_ore = get("palladium_ore");
public static final Item paper = get("paper");
public static final ItemBlock pentagram = get("pentagram");
public static final ItemMetalBlock phosphor_block = get("phosphor_block");
public static final ItemMetalBlock phosphor_ore = get("phosphor_ore");
public static final ItemMetal phosphor_powder = get("phosphor_powder");
public static final ItemPiston piston = get("piston");
public static final ItemMetalBlock platinum_block = get("platinum_block");
public static final ItemMetal platinum_ingot = get("platinum_ingot");
public static final ItemMetalBlock platinum_ore = get("platinum_ore");
public static final ItemMetalBlock plutonium_block = get("plutonium_block");
public static final ItemMetal plutonium_ingot = get("plutonium_ingot");
public static final ItemMetalBlock plutonium_ore = get("plutonium_ore");
public static final ItemFood poisonous_potato = get("poisonous_potato");
public static final ItemFood porkchop = get("porkchop");
public static final ItemBlock portal_frame = get("portal_frame");
public static final ItemMetalBlock potassium_block = get("potassium_block");
public static final ItemMetalBlock potassium_ore = get("potassium_ore");
public static final ItemMetal potassium_powder = get("potassium_powder");
public static final ItemSeedFood potato = get("potato");
public static final ItemPotion potion = get("potion");
public static final ItemMetalBlock praseodymium_block = get("praseodymium_block");
public static final ItemMetal praseodymium_ingot = get("praseodymium_ingot");
public static final ItemMetalBlock praseodymium_ore = get("praseodymium_ore");
public static final ItemBlock pumpkin = get("pumpkin");
public static final ItemFood pumpkin_pie = get("pumpkin_pie");
public static final ItemSeeds pumpkin_stem = get("pumpkin_stem");
public static final ItemBed purple_bed = get("purple_bed");
public static final Item quartz = get("quartz");
public static final ItemMultiTexture quartz_block = get("quartz_block");
public static final ItemBlock quartz_ore = get("quartz_ore");
public static final ItemSlab quartz_slab = get("quartz_slab");
public static final ItemBlock quartz_stairs = get("quartz_stairs");
public static final ItemMetalBlock radium_block = get("radium_block");
public static final ItemMetal radium_ingot = get("radium_ingot");
public static final ItemMetalBlock radium_ore = get("radium_ore");
public static final ItemBlock rail = get("rail");
public static final ItemRecord record_11 = get("record_11");
public static final ItemRecord record_13 = get("record_13");
public static final ItemRecord record_blocks = get("record_blocks");
public static final ItemRecord record_cat = get("record_cat");
public static final ItemRecord record_chirp = get("record_chirp");
public static final ItemRecord record_delay = get("record_delay");
public static final ItemRecord record_extend = get("record_extend");
public static final ItemRecord record_far = get("record_far");
public static final ItemRecord record_mall = get("record_mall");
public static final ItemRecord record_mellohi = get("record_mellohi");
public static final ItemRecord record_stal = get("record_stal");
public static final ItemRecord record_strad = get("record_strad");
public static final ItemRecord record_wait = get("record_wait");
public static final ItemRecord record_ward = get("record_ward");
public static final ItemBucket recursive_acid_bucket = get("recursive_acid_bucket");
public static final ItemBucket recursive_blood_bucket = get("recursive_blood_bucket");
public static final ItemBucket recursive_bucket = get("recursive_bucket");
public static final ItemBucket recursive_goo_bucket = get("recursive_goo_bucket");
public static final ItemBucket recursive_hydrogen_bucket = get("recursive_hydrogen_bucket");
public static final ItemBucket recursive_lava_bucket = get("recursive_lava_bucket");
public static final ItemBucket recursive_magma_bucket = get("recursive_magma_bucket");
public static final ItemBucket recursive_mercury_bucket = get("recursive_mercury_bucket");
public static final ItemBucket recursive_nukage_bucket = get("recursive_nukage_bucket");
public static final ItemBucket recursive_slime_bucket = get("recursive_slime_bucket");
public static final ItemBucket recursive_water_bucket = get("recursive_water_bucket");
public static final ItemBed red_bed = get("red_bed");
public static final ItemButton red_button = get("red_button");
public static final ItemBlock red_mushroom = get("red_mushroom");
public static final ItemHugeMushroom red_mushroom_block = get("red_mushroom_block");
public static final ItemRedstone redstone = get("redstone");
public static final ItemBlock redstone_block = get("redstone_block");
public static final ItemBlock redstone_lamp = get("redstone_lamp");
public static final ItemBlock redstone_ore = get("redstone_ore");
public static final ItemBlock redstone_torch = get("redstone_torch");
public static final ItemReed reeds = get("reeds");
public static final ItemReed repeater = get("repeater");
public static final ItemMultiTexture rock = get("rock");
public static final ItemFood rotten_flesh = get("rotten_flesh");
public static final Item ruby = get("ruby");
public static final ItemBlock ruby_block = get("ruby_block");
public static final ItemBlock ruby_ore = get("ruby_ore");
public static final ItemSaddle saddle = get("saddle");
public static final ItemMultiTexture sand = get("sand");
public static final ItemMultiTexture sandstone = get("sandstone");
public static final ItemSlab sandstone_slab = get("sandstone_slab");
public static final ItemBlock sandstone_stairs = get("sandstone_stairs");
public static final ItemMetalBlock selenium_block = get("selenium_block");
public static final ItemMetalBlock selenium_ore = get("selenium_ore");
public static final ItemMetal selenium_powder = get("selenium_powder");
public static final ItemSign sign = get("sign");
public static final ItemMetalBlock silicon_block = get("silicon_block");
public static final ItemMetal silicon_ingot = get("silicon_ingot");
public static final ItemMetalBlock silicon_ore = get("silicon_ore");
public static final ItemMetalBlock silver_block = get("silver_block");
public static final ItemMetal silver_ingot = get("silver_ingot");
public static final ItemMetalBlock silver_ore = get("silver_ore");
public static final ItemSkull skull = get("skull");
public static final Item slime_ball = get("slime_ball");
public static final ItemBlock slime_block = get("slime_block");
public static final ItemBucket slime_bucket = get("slime_bucket");
public static final ItemBlock snow = get("snow");
public static final ItemSnow snow_layer = get("snow_layer");
public static final ItemSnowball snowball = get("snowball");
public static final ItemMetalBlock sodium_block = get("sodium_block");
public static final ItemMetalBlock sodium_ore = get("sodium_ore");
public static final ItemMetal sodium_powder = get("sodium_powder");
public static final ItemBlock soul_sand = get("soul_sand");
public static final ItemSeeds soul_wart = get("soul_wart");
public static final Item speckled_melon = get("speckled_melon");
public static final ItemFood spider_eye = get("spider_eye");
public static final ItemBlock sponge = get("sponge");
public static final ItemDoor spruce_door = get("spruce_door");
public static final ItemFence spruce_fence = get("spruce_fence");
public static final ItemBlock spruce_fence_gate = get("spruce_fence_gate");
public static final ItemLeaves spruce_leaves = get("spruce_leaves");
public static final ItemBlock spruce_log = get("spruce_log");
public static final ItemBlock spruce_planks = get("spruce_planks");
public static final ItemBlock spruce_sapling = get("spruce_sapling");
public static final ItemSlab spruce_slab = get("spruce_slab");
public static final ItemBlock spruce_stairs = get("spruce_stairs");
public static final ItemCloth stained_glass = get("stained_glass");
public static final ItemCloth stained_glass_pane = get("stained_glass_pane");
public static final ItemCloth stained_hardened_clay = get("stained_hardened_clay");
public static final ItemStick stick = get("stick");
public static final ItemPiston sticky_piston = get("sticky_piston");
public static final ItemBlock stone = get("stone");
public static final ItemAxe stone_axe = get("stone_axe");
public static final ItemButton stone_button = get("stone_button");
public static final ItemHoe stone_hoe = get("stone_hoe");
public static final ItemPickaxe stone_pickaxe = get("stone_pickaxe");
public static final ItemPressurePlate stone_pressure_plate = get("stone_pressure_plate");
public static final ItemShovel stone_shovel = get("stone_shovel");
public static final ItemSlab stone_slab = get("stone_slab");
public static final ItemBlock stone_stairs = get("stone_stairs");
public static final ItemSword stone_sword = get("stone_sword");
public static final ItemMultiTexture stonebrick = get("stonebrick");
public static final ItemSlab stonebrick_slab = get("stonebrick_slab");
public static final ItemBlock stonebrick_stairs = get("stonebrick_stairs");
public static final ItemReed string = get("string");
public static final Item sugar = get("sugar");
public static final ItemMetalBlock sulfur_block = get("sulfur_block");
public static final ItemMetalBlock sulfur_ore = get("sulfur_ore");
public static final ItemMetal sulfur_powder = get("sulfur_powder");
public static final ItemColored tallgrass = get("tallgrass");
public static final ItemAxe thetium_axe = get("thetium_axe");
public static final ItemBlock thetium_block = get("thetium_block");
public static final ItemArmor thetium_boots = get("thetium_boots");
public static final ItemArmor thetium_chestplate = get("thetium_chestplate");
public static final ItemArmor thetium_helmet = get("thetium_helmet");
public static final ItemHoe thetium_hoe = get("thetium_hoe");
public static final ItemArmor thetium_leggings = get("thetium_leggings");
public static final ItemBlock thetium_ore = get("thetium_ore");
public static final ItemPickaxe thetium_pickaxe = get("thetium_pickaxe");
public static final ItemShovel thetium_shovel = get("thetium_shovel");
public static final ItemSword thetium_sword = get("thetium_sword");
public static final Item thi_fragment = get("thi_fragment");
public static final ItemBlock tian = get("tian");
public static final ItemDoor tian_door = get("tian_door");
public static final ItemFence tian_fence = get("tian_fence");
public static final ItemBlock tian_fence_gate = get("tian_fence_gate");
public static final ItemLeaves tian_leaves = get("tian_leaves");
public static final ItemBlock tian_log = get("tian_log");
public static final ItemBlock tian_planks = get("tian_planks");
public static final ItemBlock tian_reactor = get("tian_reactor");
public static final ItemBlock tian_sapling = get("tian_sapling");
public static final ItemSlab tian_slab = get("tian_slab");
public static final ItemBlock tian_soil = get("tian_soil");
public static final ItemBlock tian_stairs = get("tian_stairs");
public static final ItemMetalBlock tin_block = get("tin_block");
public static final ItemMetal tin_ingot = get("tin_ingot");
public static final ItemMetalBlock tin_ore = get("tin_ore");
public static final ItemMetalBlock titanium_block = get("titanium_block");
public static final ItemMetal titanium_ingot = get("titanium_ingot");
public static final ItemMetalBlock titanium_ore = get("titanium_ore");
public static final ItemTNT tnt = get("tnt");
public static final ItemMinecart tnt_minecart = get("tnt_minecart");
public static final ItemBlock torch = get("torch");
public static final ItemBlock trapdoor = get("trapdoor");
public static final ItemChest trapped_chest = get("trapped_chest");
public static final ItemBlock tripwire_hook = get("tripwire_hook");
public static final ItemMetalBlock tungsten_block = get("tungsten_block");
public static final ItemMetal tungsten_ingot = get("tungsten_ingot");
public static final ItemMetalBlock tungsten_ore = get("tungsten_ore");
public static final ItemMetalBlock uranium_block = get("uranium_block");
public static final ItemMetal uranium_ingot = get("uranium_ingot");
public static final ItemMetalBlock uranium_ore = get("uranium_ore");
public static final ItemMetalBlock vanadium_block = get("vanadium_block");
public static final ItemMetal vanadium_ingot = get("vanadium_ingot");
public static final ItemMetalBlock vanadium_ore = get("vanadium_ore");
public static final ItemColored vine = get("vine");
public static final ItemEditWand wand = get("wand");
public static final ItemBlock warp_chest = get("warp_chest");
public static final ItemBucket water_bucket = get("water_bucket");
public static final ItemLilyPad waterlily = get("waterlily");
public static final ItemWeatherToken weather_token_chilled = get("weather_token_chilled");
public static final ItemWeatherToken weather_token_clear = get("weather_token_clear");
public static final ItemWeatherToken weather_token_cold = get("weather_token_cold");
public static final ItemWeatherToken weather_token_fire = get("weather_token_fire");
public static final ItemWeatherToken weather_token_fog = get("weather_token_fog");
public static final ItemWeatherToken weather_token_frost = get("weather_token_frost");
public static final ItemWeatherToken weather_token_hail = get("weather_token_hail");
public static final ItemWeatherToken weather_token_hailstorm = get("weather_token_hailstorm");
public static final ItemWeatherToken weather_token_hot = get("weather_token_hot");
public static final ItemWeatherToken weather_token_ice = get("weather_token_ice");
public static final ItemWeatherToken weather_token_iceage = get("weather_token_iceage");
public static final ItemWeatherToken weather_token_inferno = get("weather_token_inferno");
public static final ItemWeatherToken weather_token_rain = get("weather_token_rain");
public static final ItemWeatherToken weather_token_snow = get("weather_token_snow");
public static final ItemWeatherToken weather_token_snowstorm = get("weather_token_snowstorm");
public static final ItemWeatherToken weather_token_storm = get("weather_token_storm");
public static final ItemWeatherToken weather_token_thunder = get("weather_token_thunder");
public static final ItemBlock web = get("web");
public static final ItemSeeds wheat = get("wheat");
public static final Item wheats = get("wheats");
public static final ItemBed white_bed = get("white_bed");
public static final ItemAxe wood_axe = get("wood_axe");
public static final ItemHoe wood_hoe = get("wood_hoe");
public static final ItemPickaxe wood_pickaxe = get("wood_pickaxe");
public static final ItemShovel wood_shovel = get("wood_shovel");
public static final ItemSword wood_sword = get("wood_sword");
public static final ItemButton wooden_button = get("wooden_button");
public static final ItemPressurePlate wooden_pressure_plate = get("wooden_pressure_plate");
public static final ItemCloth wool = get("wool");
public static final ItemBlock workbench = get("workbench");
public static final Item writable_book = get("writable_book");
public static final Item written_book = get("written_book");
public static final ItemMetalBlock zinc_block = get("zinc_block");
public static final ItemMetal zinc_ingot = get("zinc_ingot");
public static final ItemMetalBlock zinc_ore = get("zinc_ore");
private static Item get(String id) { private static <T extends Item> T get(String id) {
if(!ItemRegistry.REGISTRY.containsKey(id)) if(!ItemRegistry.REGISTRY.containsKey(id))
throw new RuntimeException("Item " + id + " does not exist!"); throw new RuntimeException("Gegenstand " + id + " existiert nicht");
return ItemRegistry.REGISTRY.getObject(id); return (T)ItemRegistry.REGISTRY.getObject(id);
}
static {
if(Util.DEVMODE) {
Set<Item> items = Sets.newHashSet(ItemRegistry.REGISTRY);
for(Field field : Items.class.getDeclaredFields()) {
if(Modifier.isStatic(field.getModifiers()) && Modifier.isFinal(field.getModifiers()) && Item.class.isAssignableFrom(field.getType()))
try {
items.remove(field.get(null));
}
catch(IllegalArgumentException | IllegalAccessException e) {
Util.throwUnchecked(e);
}
}
for(Iterator<Item> iter = items.iterator(); iter.hasNext();) {
Item item = iter.next();
if(item instanceof ItemNpcSpawner || item instanceof ItemMonsterPlacer)
iter.remove();
}
if(!items.isEmpty()) {
List<Item> list = Lists.newArrayList(ItemRegistry.REGISTRY);
Collections.sort(list, Comparator.comparing(item -> ItemRegistry.REGISTRY.getNameForObject(item)));
for(Item item : list) {
if(item instanceof ItemNpcSpawner || item instanceof ItemMonsterPlacer)
continue;
String name = ItemRegistry.REGISTRY.getNameForObject(item);
System.err.printf("\tpublic static final %s %s = get(\"%s\");\n", item.getClass().getSimpleName(), name, name);
}
throw new RuntimeException("^^^ " + Items.class.getCanonicalName() + ": Gegenstandsliste ist unvollständig, Bitte neuen Quellcode einfügen ^^^");
}
}
} }
} }

View file

@ -8,10 +8,10 @@ import common.enchantment.Enchantment;
import common.enchantment.EnchantmentHelper; import common.enchantment.EnchantmentHelper;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.Items; import common.init.Items;
import common.item.ItemStack; import common.item.ItemStack;
import common.util.BlockPos; import common.util.BlockPos;
import common.vars.Vars;
import common.world.State; import common.world.State;
import common.world.World; import common.world.World;
@ -99,7 +99,7 @@ public class ContainerRepair extends Container
ContainerRepair.this.maximumCost = 0; ContainerRepair.this.maximumCost = 0;
State iblockstate = worldIn.getState(blockPosIn); State iblockstate = worldIn.getState(blockPosIn);
if (/* !playerIn.creative && */ !worldIn.client && Config.anvilRepairDecay && iblockstate.getBlock() == Blocks.anvil && playerIn.getRNG().floatv() < 0.12F) if (/* !playerIn.creative && */ !worldIn.client && Vars.anvilRepairDecay && iblockstate.getBlock() == Blocks.anvil && playerIn.getRNG().floatv() < 0.12F)
{ {
int l = ((Integer)iblockstate.getValue(BlockAnvil.DAMAGE)).intValue(); int l = ((Integer)iblockstate.getValue(BlockAnvil.DAMAGE)).intValue();
++l; ++l;
@ -365,7 +365,7 @@ public class ContainerRepair extends Container
if (newStack != null) if (newStack != null)
{ {
if(!this.theWorld.client && Config.repairXP) { if(!this.theWorld.client && Vars.repairXP) {
int cost = newStack.getRepairCost(); int cost = newStack.getRepairCost();
if (repStack != null && cost < repStack.getRepairCost()) if (repStack != null && cost < repStack.getRepairCost())

View file

@ -2,10 +2,10 @@ package common.inventory;
import common.entity.item.EntityXp; import common.entity.item.EntityXp;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Config;
import common.init.SmeltingRegistry; import common.init.SmeltingRegistry;
import common.item.ItemStack; import common.item.ItemStack;
import common.util.ExtMath; import common.util.ExtMath;
import common.vars.Vars;
public class SlotFurnaceOutput extends Slot public class SlotFurnaceOutput extends Slot
{ {
@ -64,7 +64,7 @@ public class SlotFurnaceOutput extends Slot
{ {
// stack.onCrafting(this.thePlayer.worldObj, this.thePlayer, this.smelted); // stack.onCrafting(this.thePlayer.worldObj, this.thePlayer, this.smelted);
if (!this.thePlayer.worldObj.client && Config.smeltingXP) if (!this.thePlayer.worldObj.client && Vars.smeltingXP)
{ {
int xp = this.smelted; int xp = this.smelted;
float smeltXp = SmeltingRegistry.getExperience(stack); float smeltXp = SmeltingRegistry.getExperience(stack);

View file

@ -11,7 +11,7 @@ import common.collect.Maps;
import common.entity.DamageSource; import common.entity.DamageSource;
import common.entity.projectile.EntityPotion; import common.entity.projectile.EntityPotion;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Config; import common.vars.Vars;
public enum Potion { public enum Potion {
SPEED("speed", "Schnelligkeit", "Trank der Schnelligkeit", false, 8171462, new PotionModifier(Attribute.MOVEMENT_SPEED, "PotSpd", 0.2, true)), SPEED("speed", "Schnelligkeit", "Trank der Schnelligkeit", false, 8171462, new PotionModifier(Attribute.MOVEMENT_SPEED, "PotSpd", 0.2, true)),
@ -34,7 +34,7 @@ public enum Potion {
public void onImpact(EntityPotion potion, EntityLiving thrower, EntityLiving entity, int amp, double effect) { public void onImpact(EntityPotion potion, EntityLiving thrower, EntityLiving entity, int amp, double effect) {
if(entity.arePotionsInverted()) { if(entity.arePotionsInverted()) {
if(Config.damagePotion) { if(Vars.damagePotion) {
int dmg = (int)(effect * (double)(6 << amp) + 0.5D); int dmg = (int)(effect * (double)(6 << amp) + 0.5D);
if(potion == null) if(potion == null)
entity.attackEntityFrom(DamageSource.magic, dmg); entity.attackEntityFrom(DamageSource.magic, dmg);
@ -54,7 +54,7 @@ public enum Potion {
public void onImpact(EntityPotion potion, EntityLiving thrower, EntityLiving entity, int amp, double effect) { public void onImpact(EntityPotion potion, EntityLiving thrower, EntityLiving entity, int amp, double effect) {
if(!entity.arePotionsInverted()) { if(!entity.arePotionsInverted()) {
if(Config.damagePotion) { if(Vars.damagePotion) {
int dmg = (int)(effect * (double)(6 << amp) + 0.5D); int dmg = (int)(effect * (double)(6 << amp) + 0.5D);
if(potion == null) if(potion == null)
entity.attackEntityFrom(DamageSource.magic, dmg); entity.attackEntityFrom(DamageSource.magic, dmg);
@ -117,7 +117,7 @@ public enum Potion {
POISON("poison", "Vergiftung", "Trank der Vergiftung", true, 5149489) { POISON("poison", "Vergiftung", "Trank der Vergiftung", true, 5149489) {
public void onUpdate(EntityLiving entity, int duration, int amp) { public void onUpdate(EntityLiving entity, int duration, int amp) {
int j = 25 >> amp; int j = 25 >> amp;
if((j <= 0 || duration % j == 0) && (entity.worldObj.client || Config.damagePoison) && entity.getHealth() > 1) if((j <= 0 || duration % j == 0) && (entity.worldObj.client || Vars.damagePoison) && entity.getHealth() > 1)
entity.attackEntityFrom(DamageSource.magic, 1); entity.attackEntityFrom(DamageSource.magic, 1);
} }
@ -145,7 +145,7 @@ public enum Potion {
}, },
RADIATION("radiation", "Strahlung", "Radioaktiver Trank", true, 0x00ff00) { RADIATION("radiation", "Strahlung", "Radioaktiver Trank", true, 0x00ff00) {
public void onUpdate(EntityLiving entity, int duration, int amp) { public void onUpdate(EntityLiving entity, int duration, int amp) {
if(entity.ticksExisted % 20 == 0 && (entity.worldObj.client || Config.damageRadiation)) // && entityLivingBaseIn.getHealth() > 1.0F) if(entity.ticksExisted % 20 == 0 && (entity.worldObj.client || Vars.damageRadiation)) // && entityLivingBaseIn.getHealth() > 1.0F)
entity.attackEntityFrom(DamageSource.radiation, 1 + amp); entity.attackEntityFrom(DamageSource.radiation, 1 + amp);
} }
}; };

View file

@ -10,7 +10,6 @@ import common.collect.Lists;
import common.entity.Entity; import common.entity.Entity;
import common.entity.item.EntityItem; import common.entity.item.EntityItem;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Config;
import common.inventory.Container; import common.inventory.Container;
import common.inventory.ContainerHopper; import common.inventory.ContainerHopper;
import common.inventory.IInventory; import common.inventory.IInventory;
@ -22,6 +21,7 @@ import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Facing; import common.util.Facing;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class TileEntityHopper extends TileEntityLockable implements IHopper, ITickable public class TileEntityHopper extends TileEntityLockable implements IHopper, ITickable
@ -256,7 +256,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi
if (flag) if (flag)
{ {
this.setTransferCooldown(Config.hopperDelay); this.setTransferCooldown(Vars.hopperDelay);
this.markDirty(); this.markDirty();
return true; return true;
} }
@ -600,7 +600,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi
if (tileentityhopper.mayTransfer()) if (tileentityhopper.mayTransfer())
{ {
tileentityhopper.setTransferCooldown(Config.hopperDelay); tileentityhopper.setTransferCooldown(Vars.hopperDelay);
} }
inventoryIn.markDirty(); inventoryIn.markDirty();

View file

@ -3,7 +3,6 @@ package common.tileentity;
import common.entity.Entity; import common.entity.Entity;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.EntityRegistry; import common.init.EntityRegistry;
import common.model.ParticleType; import common.model.ParticleType;
import common.network.Packet; import common.network.Packet;
@ -11,6 +10,7 @@ import common.packet.SPacketUpdateTileEntity;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.vars.Vars;
import common.world.World; import common.world.World;
public class TileEntityMobSpawner extends TileEntity implements ITickable public class TileEntityMobSpawner extends TileEntity implements ITickable
@ -77,7 +77,7 @@ public class TileEntityMobSpawner extends TileEntity implements ITickable
} }
else else
{ {
if(!Config.mobs || !Config.spawners) { if(!Vars.mobs || !Vars.spawners) {
return; return;
} }

View file

@ -17,6 +17,7 @@ public abstract class Util {
private static final long START = getTime(); private static final long START = getTime();
private static final int MIN_JAVA_FEATURE = 21; private static final int MIN_JAVA_FEATURE = 21;
public static final boolean WINDOWS = System.getProperty("os.name").toLowerCase(Locale.US).contains("win"); public static final boolean WINDOWS = System.getProperty("os.name").toLowerCase(Locale.US).contains("win");
public static final boolean DEVMODE = System.getProperty("runtime.devmode") != null;
public static final int PROTOCOL = Version.MAJOR << 16 | Version.MINOR << 8 | Version.PATCH; public static final int PROTOCOL = Version.MAJOR << 16 | Version.MINOR << 8 | Version.PATCH;
public static final String VERSION = "v" + Version.MAJOR + "." + Version.MINOR + "." + Version.PATCH + Version.RELEASE; public static final String VERSION = "v" + Version.MAJOR + "." + Version.MINOR + "." + Version.PATCH + Version.RELEASE;

View file

@ -1,8 +1,8 @@
package common.init; package common.vars;
import common.util.Var; import common.util.Var;
public abstract class Config { public abstract class Vars {
@Var(name = "fireTick") @Var(name = "fireTick")
public static boolean fire = true; public static boolean fire = true;
@Var(name = "mobGriefing") @Var(name = "mobGriefing")

View file

@ -15,7 +15,6 @@ import common.entity.item.EntityTnt;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Config;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.model.ParticleType; import common.model.ParticleType;
import common.rng.Random; import common.rng.Random;
@ -23,6 +22,7 @@ import common.util.BlockPos;
import common.util.BoundingBox; import common.util.BoundingBox;
import common.util.ExtMath; import common.util.ExtMath;
import common.util.Vec3; import common.util.Vec3;
import common.vars.Vars;
public class Explosion public class Explosion
{ {
@ -179,7 +179,7 @@ public class Explosion
} }
} }
if(worldObj.client || Config.damageExplosion) { if(worldObj.client || Vars.damageExplosion) {
List<Entity> list = worldObj.getEntitiesWithinAABB(Entity.class, new BoundingBox(explosionX - (5.0 + (double)d), explosionY - (5.0 + (double)d), List<Entity> list = worldObj.getEntitiesWithinAABB(Entity.class, new BoundingBox(explosionX - (5.0 + (double)d), explosionY - (5.0 + (double)d),
explosionZ - (5.0 + (double)d), explosionX + 5.0 + (double)d, explosionY + 5.0 + (double)d, explosionZ + 5.0 + (double)d)); explosionZ - (5.0 + (double)d), explosionX + 5.0 + (double)d, explosionY + 5.0 + (double)d, explosionZ + 5.0 + (double)d));
@ -244,7 +244,7 @@ public class Explosion
d9 = d9 / d13; d9 = d9 / d13;
double d14 = (double)this.worldObj.getBlockDensity(vec3, entity.getEntityBoundingBox()); double d14 = (double)this.worldObj.getBlockDensity(vec3, entity.getEntityBoundingBox());
double d10 = (1.0D - d12) * d14; double d10 = (1.0D - d12) * d14;
if(this.worldObj.client || Config.damageExplosion) if(this.worldObj.client || Vars.damageExplosion)
entity.attackEntityFrom(DamageSource.causeExplosionDamage(this), ((int)((d10 * d10 + d10) / 2.0D * 8.0D * (double)f3 + 1.0D))); entity.attackEntityFrom(DamageSource.causeExplosionDamage(this), ((int)((d10 * d10 + d10) / 2.0D * 8.0D * (double)f3 + 1.0D)));
double d11 = EnchantmentProtection.getKnockbackFactor(entity, d10); double d11 = EnchantmentProtection.getKnockbackFactor(entity, d10);
entity.motionX += d5 * d11; entity.motionX += d5 * d11;

View file

@ -39,7 +39,6 @@ import common.future.Futures;
import common.future.ListenableFuture; import common.future.ListenableFuture;
import common.future.ListenableFutureTask; import common.future.ListenableFutureTask;
import common.future.ThreadFactoryBuilder; import common.future.ThreadFactoryBuilder;
import common.init.Config;
import common.init.EntityRegistry; import common.init.EntityRegistry;
import common.init.Registry; import common.init.Registry;
import common.init.UniverseRegistry; import common.init.UniverseRegistry;
@ -91,6 +90,7 @@ import common.util.Position;
import common.util.Util; import common.util.Util;
import common.util.Var; import common.util.Var;
import common.util.WorldPos; import common.util.WorldPos;
import common.vars.Vars;
import common.world.World; import common.world.World;
import server.biome.GenBiome; import server.biome.GenBiome;
import server.clipboard.ReorderRegistry; import server.clipboard.ReorderRegistry;
@ -100,8 +100,8 @@ import server.command.FixedExecutor;
import server.network.HandshakeHandler; import server.network.HandshakeHandler;
import server.network.Player; import server.network.Player;
import server.network.User; import server.network.User;
import server.util.SVar; import server.vars.SVar;
import server.util.ServerConfig; import server.vars.SVars;
import server.world.Converter; import server.world.Converter;
import server.world.Region; import server.world.Region;
import server.world.WorldServer; import server.world.WorldServer;
@ -258,7 +258,7 @@ public final class Server implements IThreadListener {
} }
private Server() { private Server() {
for(Class<?> clazz : new Class[] {Config.class, ServerConfig.class}) { for(Class<?> clazz : new Class[] {Vars.class, SVars.class}) {
for(Field field : clazz.getDeclaredFields()) { for(Field field : clazz.getDeclaredFields()) {
if(field.isAnnotationPresent(Var.class)) { if(field.isAnnotationPresent(Var.class)) {
if(!Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers())) if(!Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers()))
@ -277,7 +277,7 @@ public final class Server implements IThreadListener {
for(WorldServer world : Server.this.getWorlds()) { for(WorldServer world : Server.this.getWorlds()) {
world.updatePhysics(); world.updatePhysics();
} }
Server.this.sendPacket(new SPacketWorld(WorldServer.clampGravity(), ServerConfig.dayCycle, ServerConfig.timeFlow)); Server.this.sendPacket(new SPacketWorld(WorldServer.clampGravity(), SVars.dayCycle, SVars.timeFlow));
} }
}, "daylightCycle", "timeFlow", "gravity"); }, "daylightCycle", "timeFlow", "gravity");
this.setCallback(new Runnable() { this.setCallback(new Runnable() {
@ -289,12 +289,12 @@ public final class Server implements IThreadListener {
}, "viewDistance"); }, "viewDistance");
this.setCallback(new Runnable() { this.setCallback(new Runnable() {
public void run() { public void run() {
Server.this.bind(ServerConfig.port); Server.this.bind(SVars.port);
} }
}, "port"); }, "port");
this.setCallback(new Runnable() { this.setCallback(new Runnable() {
public void run() { public void run() {
if((!ServerConfig.password.isEmpty() && ServerConfig.password.length() < 8) || ServerConfig.password.length() > IPlayer.MAX_PASS_LENGTH) if((!SVars.password.isEmpty() && SVars.password.length() < 8) || SVars.password.length() > IPlayer.MAX_PASS_LENGTH)
Log.IO.warn("Passwort muss aus 8-" + IPlayer.MAX_PASS_LENGTH + " Zeichen bestehen, Login wird nicht möglich sein"); Log.IO.warn("Passwort muss aus 8-" + IPlayer.MAX_PASS_LENGTH + " Zeichen bestehen, Login wird nicht möglich sein");
} }
}, "password"); }, "password");
@ -439,11 +439,11 @@ public final class Server implements IThreadListener {
} }
WorldServer.loadWarps(dim, this.warps); WorldServer.loadWarps(dim, this.warps);
} }
if(ServerConfig.port >= 0) if(SVars.port >= 0)
this.bind(ServerConfig.port); this.bind(SVars.port);
else else
Log.SYSTEM.warn("Kein Port definiert, verwende 'sv port <1024-32767>' um einen Hosting-Port festzulegen"); Log.SYSTEM.warn("Kein Port definiert, verwende 'sv port <1024-32767>' um einen Hosting-Port festzulegen");
if(ServerConfig.accessRequired && ServerConfig.password.length() < 8) if(SVars.accessRequired && SVars.password.length() < 8)
Log.SYSTEM.warn("Kein Passwort definiert, verwende 'sv password <8-" + IPlayer.MAX_PASS_LENGTH + " Zeichen>' um ein Zugangspasswort festzulegen"); Log.SYSTEM.warn("Kein Passwort definiert, verwende 'sv password <8-" + IPlayer.MAX_PASS_LENGTH + " Zeichen>' um ein Zugangspasswort festzulegen");
Thread con = new Thread(new Runnable() { Thread con = new Thread(new Runnable() {
private final BufferedReader reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(System.in))); private final BufferedReader reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(System.in)));
@ -515,7 +515,7 @@ public final class Server implements IThreadListener {
public void preload(WorldServer world, int bx, int bz) { public void preload(WorldServer world, int bx, int bz) {
int done = 0; int done = 0;
int total = ServerConfig.distance * 2 + 1; int total = SVars.distance * 2 + 1;
total *= total; total *= total;
Log.TICK.info("Generiere und lade Welt"); Log.TICK.info("Generiere und lade Welt");
// WorldServer world = this.getWorld(Config.spawnDim); // WorldServer world = this.getWorld(Config.spawnDim);
@ -523,8 +523,8 @@ public final class Server implements IThreadListener {
bx = bx >> 4; bx = bx >> 4;
bz = bz >> 4; bz = bz >> 4;
long last = System.currentTimeMillis(); long last = System.currentTimeMillis();
for(int x = -ServerConfig.distance; x <= ServerConfig.distance; x++) { for(int x = -SVars.distance; x <= SVars.distance; x++) {
for(int z = -ServerConfig.distance; z <= ServerConfig.distance; z++) { for(int z = -SVars.distance; z <= SVars.distance; z++) {
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
if(time - last > 1000L) { if(time - last > 1000L) {
Log.TICK.info("Bereite Spawnbereich vor" + ": " + (done * 100 / total) + "%"); Log.TICK.info("Bereite Spawnbereich vor" + ": " + (done * 100 / total) + "%");
@ -610,7 +610,7 @@ public final class Server implements IThreadListener {
this.sendPacket(new SPacketPlayerListItem((List)this.getPlayers())); this.sendPacket(new SPacketPlayerListItem((List)this.getPlayers()));
this.pingTimer = 0; this.pingTimer = 0;
} }
if(ServerConfig.saveInterval > 0 && ++this.saveTimer >= ServerConfig.saveInterval) { if(SVars.saveInterval > 0 && ++this.saveTimer >= SVars.saveInterval) {
this.saveAllPlayerData(false); this.saveAllPlayerData(false);
this.saveAllWorlds(false); this.saveAllWorlds(false);
this.saveTimer = 0; this.saveTimer = 0;
@ -761,7 +761,7 @@ public final class Server implements IThreadListener {
WorldServer world = this.getWorld(origin.getDimension()); WorldServer world = this.getWorld(origin.getDimension());
world = world == null ? this.space : world; world = world == null ? this.space : world;
BlockPos pos = origin; BlockPos pos = origin;
int radius = ServerConfig.spawnRadius; int radius = SVars.spawnRadius;
if(radius > 0) { if(radius > 0) {
pos = world.getTopSolidOrLiquidBlock(pos.add( pos = world.getTopSolidOrLiquidBlock(pos.add(
ExtMath.clampi(world.rand.excl(-radius, radius), -World.MAX_SIZE + 1, World.MAX_SIZE - 1), 0, ExtMath.clampi(world.rand.excl(-radius, radius), -World.MAX_SIZE + 1, World.MAX_SIZE - 1), 0,
@ -782,10 +782,10 @@ public final class Server implements IThreadListener {
Player conn = new Player(this, connection, loginUser); Player conn = new Player(this, connection, loginUser);
if(tag != null) if(tag != null)
conn.readTags(tag); conn.readTags(tag);
if(ServerConfig.compression >= 0) { if(SVars.compression >= 0) {
connection.sendPacket(new RPacketEnableCompression(ServerConfig.compression), new ChannelFutureListener() { connection.sendPacket(new RPacketEnableCompression(SVars.compression), new ChannelFutureListener() {
public void operationComplete(ChannelFuture future) throws Exception { public void operationComplete(ChannelFuture future) throws Exception {
connection.setCompressionTreshold(ServerConfig.compression); connection.setCompressionTreshold(SVars.compression);
} }
}); });
} }
@ -817,7 +817,7 @@ public final class Server implements IThreadListener {
conn.sendPacket(new SPacketJoinGame(player.getId(), world.dimension, EntityRegistry.getEntityID(player), tag == null)); conn.sendPacket(new SPacketJoinGame(player.getId(), world.dimension, EntityRegistry.getEntityID(player), tag == null));
conn.sendPacket(new SPacketHeldItemChange(player.inventory.currentItem)); conn.sendPacket(new SPacketHeldItemChange(player.inventory.currentItem));
conn.sendPacket(new SPacketWorld(WorldServer.clampGravity(), conn.sendPacket(new SPacketWorld(WorldServer.clampGravity(),
ServerConfig.dayCycle, ServerConfig.timeFlow)); SVars.dayCycle, SVars.timeFlow));
// conn.initializeStats(); // conn.initializeStats();
this.sendPacket(new SPacketPlayerListItem(false, conn)); this.sendPacket(new SPacketPlayerListItem(false, conn));
@ -948,7 +948,7 @@ public final class Server implements IThreadListener {
// this.movePlayerToSpawn(nplayer); // this.movePlayerToSpawn(nplayer);
} }
world.loadChunk((int)nplayer.posX >> 4, (int)nplayer.posZ >> 4); world.loadChunk((int)nplayer.posX >> 4, (int)nplayer.posZ >> 4);
if(bed != null ? ServerConfig.checkBed : ServerConfig.spawnRadius >= 0) { if(bed != null ? SVars.checkBed : SVars.spawnRadius >= 0) {
while(!world.getCollidingBoundingBoxes(nplayer, nplayer.getEntityBoundingBox()).isEmpty() && nplayer.posY < 512.0D) { while(!world.getCollidingBoundingBoxes(nplayer, nplayer.getEntityBoundingBox()).isEmpty() && nplayer.posY < 512.0D) {
nplayer.setPosition(nplayer.posX, nplayer.posY + 1.0D, nplayer.posZ); nplayer.setPosition(nplayer.posX, nplayer.posY + 1.0D, nplayer.posZ);
} }
@ -1205,7 +1205,7 @@ public final class Server implements IThreadListener {
if(this.endpoint != null) if(this.endpoint != null)
this.terminateEndpoint("Wechsele auf Port " + port); this.terminateEndpoint("Wechsele auf Port " + port);
// throw new IllegalStateException("Eingangspunkt bereits gesetzt"); // throw new IllegalStateException("Eingangspunkt bereits gesetzt");
Log.NETWORK.info("Öffne Port %d auf 0.0.0.0 (Timeout %ds)", port, ServerConfig.timeout); Log.NETWORK.info("Öffne Port %d auf 0.0.0.0 (Timeout %ds)", port, SVars.timeout);
this.endpoint = ((ServerBootstrap)((ServerBootstrap)(new ServerBootstrap()).channel(NioServerSocketChannel.class)).childHandler(new ChannelInitializer<Channel>() { this.endpoint = ((ServerBootstrap)((ServerBootstrap)(new ServerBootstrap()).channel(NioServerSocketChannel.class)).childHandler(new ChannelInitializer<Channel>() {
protected void initChannel(Channel channel) throws Exception { protected void initChannel(Channel channel) throws Exception {
try { try {
@ -1213,7 +1213,7 @@ public final class Server implements IThreadListener {
} }
catch(ChannelException e) { catch(ChannelException e) {
} }
channel.pipeline().addLast((String)"timeout", (ChannelHandler)(new ReadTimeoutHandler(ServerConfig.timeout))) channel.pipeline().addLast((String)"timeout", (ChannelHandler)(new ReadTimeoutHandler(SVars.timeout)))
.addLast((String)"splitter", (ChannelHandler)(new PacketSplitter())) .addLast((String)"splitter", (ChannelHandler)(new PacketSplitter()))
.addLast((String)"decoder", (ChannelHandler)(new PacketDecoder(true))) .addLast((String)"decoder", (ChannelHandler)(new PacketDecoder(true)))
.addLast((String)"prepender", (ChannelHandler)(new PacketPrepender())) .addLast((String)"prepender", (ChannelHandler)(new PacketPrepender()))

View file

@ -368,11 +368,8 @@ public abstract class GenBiome implements IBiome {
BlockFlower.EnumFlowerType blockflower$enumflowertype = this.pickRandomFlower(rand, blockpos1); BlockFlower.EnumFlowerType blockflower$enumflowertype = this.pickRandomFlower(rand, blockpos1);
BlockFlower blockflower = blockflower$enumflowertype.getBlockType().getBlock(); BlockFlower blockflower = blockflower$enumflowertype.getBlockType().getBlock();
if (blockflower != Blocks.air) this.yellowFlowerGen.setGeneratedBlock(blockflower, blockflower$enumflowertype);
{ this.yellowFlowerGen.generate(world, rand, blockpos1);
this.yellowFlowerGen.setGeneratedBlock(blockflower, blockflower$enumflowertype);
this.yellowFlowerGen.generate(world, rand, blockpos1);
}
} }
} }

View file

@ -13,7 +13,7 @@ import server.command.UserPolicy;
import server.network.Player; import server.network.Player;
import server.network.User; import server.network.User;
import server.util.Form; import server.util.Form;
import server.util.ServerConfig; import server.vars.SVars;
public class CommandPasswd extends Command { public class CommandPasswd extends Command {
public CommandPasswd() { public CommandPasswd() {
@ -39,8 +39,8 @@ public class CommandPasswd extends Command {
protected void init() { protected void init() {
this.checkField = user != exec ? null : this.addPassword("Aktuelles Passwort", 0, IPlayer.MAX_PASS_LENGTH, ""); this.checkField = user != exec ? null : this.addPassword("Aktuelles Passwort", 0, IPlayer.MAX_PASS_LENGTH, "");
this.passwordField = this.addPassword("Neues Passwort", ServerConfig.minPassLength, IPlayer.MAX_PASS_LENGTH, ""); this.passwordField = this.addPassword("Neues Passwort", SVars.minPassLength, IPlayer.MAX_PASS_LENGTH, "");
this.confirmField = this.addPassword("Passwort bestätigen", ServerConfig.minPassLength, IPlayer.MAX_PASS_LENGTH, ""); this.confirmField = this.addPassword("Passwort bestätigen", SVars.minPassLength, IPlayer.MAX_PASS_LENGTH, "");
} }
public String getTitle() { public String getTitle() {

View file

@ -10,7 +10,7 @@ import server.command.RunException;
import server.network.Player; import server.network.Player;
import server.network.User; import server.network.User;
import server.util.Form; import server.util.Form;
import server.util.ServerConfig; import server.vars.SVars;
public class CommandRegister extends Command { public class CommandRegister extends Command {
public CommandRegister() { public CommandRegister() {
@ -35,8 +35,8 @@ public class CommandRegister extends Command {
private Field confirmField; private Field confirmField;
protected void init() { protected void init() {
this.passwordField = this.addPassword("Passwort", ServerConfig.minPassLength, IPlayer.MAX_PASS_LENGTH, ""); this.passwordField = this.addPassword("Passwort", SVars.minPassLength, IPlayer.MAX_PASS_LENGTH, "");
this.confirmField = this.addPassword("Passwort bestätigen", ServerConfig.minPassLength, IPlayer.MAX_PASS_LENGTH, ""); this.confirmField = this.addPassword("Passwort bestätigen", SVars.minPassLength, IPlayer.MAX_PASS_LENGTH, "");
} }
public String getTitle() { public String getTitle() {

View file

@ -11,8 +11,8 @@ import server.command.CommandEnvironment;
import server.command.Executor; import server.command.Executor;
import server.command.RunException; import server.command.RunException;
import server.command.StringCompleter; import server.command.StringCompleter;
import server.util.SVar; import server.vars.SVar;
import server.util.ValueType; import server.vars.ValueType;
public class CommandSv extends Command { public class CommandSv extends Command {
public CommandSv() { public CommandSv() {

View file

@ -27,7 +27,7 @@ import common.packet.RPacketResponse;
import common.packet.RPacketServerConfig; import common.packet.RPacketServerConfig;
import common.util.EncryptUtil; import common.util.EncryptUtil;
import server.Server; import server.Server;
import server.util.ServerConfig; import server.vars.SVars;
public class LoginHandler implements ILoginHandler public class LoginHandler implements ILoginHandler
{ {
@ -100,12 +100,12 @@ public class LoginHandler implements ILoginHandler
if(this.server.getPlayer(this.loginUser) != null) if(this.server.getPlayer(this.loginUser) != null)
return "Nutzername '" + this.loginUser + "' ist bereits vergeben"; return "Nutzername '" + this.loginUser + "' ist bereits vergeben";
User user = this.server.getUser(this.loginUser); User user = this.server.getUser(this.loginUser);
if(ServerConfig.authenticate) { if(SVars.authenticate) {
if(user == null) { if(user == null) {
if(!ServerConfig.register) if(!SVars.register)
return "Anmeldung neuer Accounts ist auf diesem Server deaktiviert (Whitelisted)"; return "Anmeldung neuer Accounts ist auf diesem Server deaktiviert (Whitelisted)";
if(ServerConfig.playerLimit > 0 && this.server.getPlayers().size() >= ServerConfig.playerLimit) if(SVars.playerLimit > 0 && this.server.getPlayers().size() >= SVars.playerLimit)
return String.format("Der Server ist voll (%d/%d)!", this.server.getPlayers().size(), ServerConfig.playerLimit); return String.format("Der Server ist voll (%d/%d)!", this.server.getPlayers().size(), SVars.playerLimit);
if(this.loginKey != null) { if(this.loginKey != null) {
this.server.addUser(user = new User(this.loginUser)); this.server.addUser(user = new User(this.loginUser));
user.setPubkey(this.loginKey); user.setPubkey(this.loginKey);
@ -113,9 +113,9 @@ public class LoginHandler implements ILoginHandler
} }
else { else {
if(this.loginPass == null || this.loginPass.length() == 0) if(this.loginPass == null || this.loginPass.length() == 0)
return "Ein neues Passwort ist erforderlich um diesen Server zu betreten (mindestens " + ServerConfig.minPassLength + " Zeichen)"; return "Ein neues Passwort ist erforderlich um diesen Server zu betreten (mindestens " + SVars.minPassLength + " Zeichen)";
if(this.loginPass.length() < ServerConfig.minPassLength) if(this.loginPass.length() < SVars.minPassLength)
return "Passwort ist zu kurz, mindestens " + ServerConfig.minPassLength + " Zeichen"; return "Passwort ist zu kurz, mindestens " + SVars.minPassLength + " Zeichen";
this.server.addUser(user = new User(this.loginUser)); this.server.addUser(user = new User(this.loginUser));
user.setPasswordHash(EncryptUtil.hashPassword(this.loginPass)); user.setPasswordHash(EncryptUtil.hashPassword(this.loginPass));
Log.NETWORK.info(this.loginUser + " registrierte sich mit Passwort"); Log.NETWORK.info(this.loginUser + " registrierte sich mit Passwort");
@ -129,15 +129,15 @@ public class LoginHandler implements ILoginHandler
Log.NETWORK.info(this.loginUser + " loggte sich mit " + (this.loginKey != null ? "Pubkey" : "Passwort") + " ein"); Log.NETWORK.info(this.loginUser + " loggte sich mit " + (this.loginKey != null ? "Pubkey" : "Passwort") + " ein");
} }
} }
if(ServerConfig.playerLimit > 0 && this.server.getPlayers().size() >= ServerConfig.playerLimit && (user == null || !user.isAdmin())) if(SVars.playerLimit > 0 && this.server.getPlayers().size() >= SVars.playerLimit && (user == null || !user.isAdmin()))
return String.format("Der Server ist voll (%d/%d)!", this.server.getPlayers().size(), ServerConfig.playerLimit); return String.format("Der Server ist voll (%d/%d)!", this.server.getPlayers().size(), SVars.playerLimit);
return null; return null;
} }
public void sendLoginPacket() { public void sendLoginPacket() {
if(this.state != LoginState.INIT) if(this.state != LoginState.INIT)
throw new IllegalStateException("Unerwartetes Handshake-Paket"); throw new IllegalStateException("Unerwartetes Handshake-Paket");
if(ServerConfig.encrypt) { if(SVars.encrypt) {
this.state = LoginState.ENCRYPT; this.state = LoginState.ENCRYPT;
this.loginToken = new byte[4]; this.loginToken = new byte[4];
TOKEN_RNG.nextBytes(this.loginToken); TOKEN_RNG.nextBytes(this.loginToken);
@ -145,7 +145,7 @@ public class LoginHandler implements ILoginHandler
} }
else { else {
this.state = LoginState.PASSWORD; this.state = LoginState.PASSWORD;
this.netManager.sendPacket(new RPacketServerConfig(ServerConfig.accessRequired, ServerConfig.authenticate, ServerConfig.authenticate && ServerConfig.passwordAuth, false)); this.netManager.sendPacket(new RPacketServerConfig(SVars.accessRequired, SVars.authenticate, SVars.authenticate && SVars.passwordAuth, false));
} }
} }
@ -166,19 +166,19 @@ public class LoginHandler implements ILoginHandler
this.state = LoginState.PASSWORD; this.state = LoginState.PASSWORD;
this.netManager.sendPacket(new RPacketResponse(packet.getToken(this.server.getPrivateKey())), new GenericFutureListener < Future <? super Void >> () { this.netManager.sendPacket(new RPacketResponse(packet.getToken(this.server.getPrivateKey())), new GenericFutureListener < Future <? super Void >> () {
public void operationComplete(Future <? super Void > u) throws Exception { public void operationComplete(Future <? super Void > u) throws Exception {
LoginHandler.this.netManager.sendPacket(new RPacketServerConfig(ServerConfig.accessRequired, ServerConfig.authenticate, ServerConfig.authenticate && ServerConfig.passwordAuth, LoginHandler.this.netManager.sendPacket(new RPacketServerConfig(SVars.accessRequired, SVars.authenticate, SVars.authenticate && SVars.passwordAuth,
ServerConfig.authenticate && ServerConfig.pubkeyAuth)); SVars.authenticate && SVars.pubkeyAuth));
} }
}); });
} }
private boolean checkAccess(String access) { private boolean checkAccess(String access) {
if(ServerConfig.accessRequired) { if(SVars.accessRequired) {
if(ServerConfig.password.length() < 8) { if(SVars.password.length() < 8) {
this.closeConnection("Es ist kein Zugangspasswort für diesen Server konfiguriert"); this.closeConnection("Es ist kein Zugangspasswort für diesen Server konfiguriert");
return false; return false;
} }
if(!ServerConfig.password.equals(access)) { if(!SVars.password.equals(access)) {
this.closeConnection("Falsches Zugangspasswort"); this.closeConnection("Falsches Zugangspasswort");
return false; return false;
} }
@ -192,13 +192,13 @@ public class LoginHandler implements ILoginHandler
this.loginUser = packet.getUser(); this.loginUser = packet.getUser();
if(this.loginUser.isEmpty() || !IPlayer.isValidUser(this.loginUser)) if(this.loginUser.isEmpty() || !IPlayer.isValidUser(this.loginUser))
throw new IllegalStateException("Ungültiger Nutzername!"); throw new IllegalStateException("Ungültiger Nutzername!");
if(!ServerConfig.passwordAuth && ServerConfig.authenticate) { if(!SVars.passwordAuth && SVars.authenticate) {
this.closeConnection("Dieser Server " + (ServerConfig.pubkeyAuth && ServerConfig.encrypt ? "benötigt einen öffentlichen Schlüssel zur Authentifizierung" : "hat keine Authentifizierungsmethode konfiguriert")); this.closeConnection("Dieser Server " + (SVars.pubkeyAuth && SVars.encrypt ? "benötigt einen öffentlichen Schlüssel zur Authentifizierung" : "hat keine Authentifizierungsmethode konfiguriert"));
return; return;
} }
if(!this.checkAccess(packet.getAccess())) if(!this.checkAccess(packet.getAccess()))
return; return;
if(ServerConfig.authenticate) if(SVars.authenticate)
this.loginPass = packet.getPassword(); this.loginPass = packet.getPassword();
this.state = LoginState.AUTHENTICATED; this.state = LoginState.AUTHENTICATED;
} }
@ -209,13 +209,13 @@ public class LoginHandler implements ILoginHandler
this.loginUser = packet.getUser(); this.loginUser = packet.getUser();
if(this.loginUser.isEmpty() || !IPlayer.isValidUser(this.loginUser)) if(this.loginUser.isEmpty() || !IPlayer.isValidUser(this.loginUser))
throw new IllegalStateException("Ungültiger Nutzername!"); throw new IllegalStateException("Ungültiger Nutzername!");
if((!ServerConfig.pubkeyAuth || !ServerConfig.encrypt) && ServerConfig.authenticate) { if((!SVars.pubkeyAuth || !SVars.encrypt) && SVars.authenticate) {
this.closeConnection("Dieser Server " + (ServerConfig.passwordAuth ? "benötigt ein Passwort zur Authentifizierung" : "hat keine Authentifizierungsmethode konfiguriert")); this.closeConnection("Dieser Server " + (SVars.passwordAuth ? "benötigt ein Passwort zur Authentifizierung" : "hat keine Authentifizierungsmethode konfiguriert"));
return; return;
} }
if(!this.checkAccess(packet.getAccess())) if(!this.checkAccess(packet.getAccess()))
return; return;
if(ServerConfig.authenticate) { if(SVars.authenticate) {
this.loginKey = packet.getKey(); this.loginKey = packet.getKey();
this.loginToken = new byte[32]; this.loginToken = new byte[32];
TOKEN_RNG.nextBytes(this.loginToken); TOKEN_RNG.nextBytes(this.loginToken);

View file

@ -129,7 +129,7 @@ import server.clipboard.RotationValue;
import server.clipboard.Vector; import server.clipboard.Vector;
import server.command.Executor; import server.command.Executor;
import server.util.Form; import server.util.Form;
import server.util.ServerConfig; import server.vars.SVars;
import server.world.ChunkServer; import server.world.ChunkServer;
import server.world.Region; import server.world.Region;
import server.world.WorldServer; import server.world.WorldServer;
@ -274,11 +274,11 @@ public class Player extends User implements ICrafting, Executor, IPlayer
public void onEntityDeath() { public void onEntityDeath() {
this.entity.sendDeathMessage(); this.entity.sendDeathMessage();
if (!ServerConfig.keepInventory && ServerConfig.playerDrop) if (!SVars.keepInventory && SVars.playerDrop)
{ {
this.entity.inventory.dropAllItems(); this.entity.inventory.dropAllItems();
} }
if(ServerConfig.skullDrop) { if(SVars.skullDrop) {
ItemStack stack = new ItemStack(Items.skull, 1, 0); ItemStack stack = new ItemStack(Items.skull, 1, 0);
this.entity.dropItem(stack, true, false); this.entity.dropItem(stack, true, false);
} }
@ -303,8 +303,8 @@ public class Player extends User implements ICrafting, Executor, IPlayer
// this.removeStat(StatRegistry.timeSinceDeathStat); // this.removeStat(StatRegistry.timeSinceDeathStat);
this.entity.resetCombat(); this.entity.resetCombat();
if(ServerConfig.respawnTime > 0) if(SVars.respawnTime > 0)
this.respawnTimer = ExtMath.clampi(ServerConfig.respawnTime, 2, 20); this.respawnTimer = ExtMath.clampi(SVars.respawnTime, 2, 20);
} }
public boolean isInEditor() { public boolean isInEditor() {
@ -457,7 +457,7 @@ public class Player extends User implements ICrafting, Executor, IPlayer
public void clonePlayer(EntityNPC oldPlayer) public void clonePlayer(EntityNPC oldPlayer)
{ {
if(ServerConfig.keepInventory) if(SVars.keepInventory)
this.entity.inventory.copyInventory(oldPlayer.inventory); this.entity.inventory.copyInventory(oldPlayer.inventory);
this.entity.experienceLevel = oldPlayer.experienceLevel; this.entity.experienceLevel = oldPlayer.experienceLevel;
this.entity.experienceTotal = oldPlayer.experienceTotal; this.entity.experienceTotal = oldPlayer.experienceTotal;
@ -2453,7 +2453,7 @@ public class Player extends User implements ICrafting, Executor, IPlayer
this.characters.add(new TagObject()); this.characters.add(new TagObject());
WorldServer world = this.server.getWorld(packetIn.getAuxData()); WorldServer world = this.server.getWorld(packetIn.getAuxData());
world = world == null ? this.server.getSpace() : world; world = world == null ? this.server.getSpace() : world;
WorldPos origin = new WorldPos(world.rand.range(-ServerConfig.originRadius, ServerConfig.originRadius), 64, world.rand.range(-ServerConfig.originRadius, ServerConfig.originRadius), WorldPos origin = new WorldPos(world.rand.range(-SVars.originRadius, SVars.originRadius), 64, world.rand.range(-SVars.originRadius, SVars.originRadius),
world.dimension.getDimensionId()); world.dimension.getDimensionId());
this.entity.setOrigin(origin); this.entity.setOrigin(origin);
Position pos = this.server.getRandomSpawnPosition(origin); Position pos = this.server.getRandomSpawnPosition(origin);

View file

@ -1,4 +1,4 @@
package server.util; package server.vars;
import java.lang.reflect.Field; import java.lang.reflect.Field;

View file

@ -1,9 +1,9 @@
package server.util; package server.vars;
import common.init.Config;
import common.util.Var; import common.util.Var;
import common.vars.Vars;
public abstract class ServerConfig extends Config { public abstract class SVars extends Vars {
@Var(name = "tickSpawning") @Var(name = "tickSpawning")
public static boolean tickSpawn = true; public static boolean tickSpawn = true;
@Var(name = "genSpawning") @Var(name = "genSpawning")

View file

@ -1,4 +1,4 @@
package server.util; package server.vars;
public enum ValueType { public enum ValueType {
STRING, BOOLEAN, INTEGER, FLOAT; STRING, BOOLEAN, INTEGER, FLOAT;

View file

@ -16,7 +16,7 @@ import common.util.ExtMath;
import common.world.World; import common.world.World;
import server.biome.GenBiome; import server.biome.GenBiome;
import server.biome.RngSpawn; import server.biome.RngSpawn;
import server.util.ServerConfig; import server.vars.SVars;
public abstract class Spawner { public abstract class Spawner {
private static final int MOB_COUNT_DIV = (int)Math.pow(17.0D, 2.0D); private static final int MOB_COUNT_DIV = (int)Math.pow(17.0D, 2.0D);
@ -53,7 +53,7 @@ public abstract class Spawner {
// } // }
CHUNKS.clear(); CHUNKS.clear();
int locs = 0; int locs = 0;
int range = Math.max(ServerConfig.mobSpawnDist, 1); int range = Math.max(SVars.mobSpawnDist, 1);
for(EntityNPC player : world.players) { for(EntityNPC player : world.players) {
// if(Config.spectatorSpawning || !player.isSpectator()) { // if(Config.spectatorSpawning || !player.isSpectator()) {
int x = ExtMath.floord(player.posX / 16.0D); int x = ExtMath.floord(player.posX / 16.0D);
@ -75,14 +75,14 @@ public abstract class Spawner {
} }
// boolean animals = (time % Math.max(Config.animalSpawnDelay, 1)) == 0; // boolean animals = (time % Math.max(Config.animalSpawnDelay, 1)) == 0;
int spawned = 0; int spawned = 0;
int mobSpread = Math.max(ServerConfig.spawnGroupDist, 1); int mobSpread = Math.max(SVars.spawnGroupDist, 1);
// double spawnDist = (double)Config.mobSpawnDistance; // double spawnDist = (double)Config.mobSpawnDistance;
double playerDist = (double)ServerConfig.mobPlayerDist; double playerDist = (double)SVars.mobPlayerDist;
// BlockPos spawn = world.isPrimary() ? Server.getSpawnPoint() : null; // BlockPos spawn = world.isPrimary() ? Server.getSpawnPoint() : null;
// for(EnumCreatureType type : EnumCreatureType.values()) { // for(EnumCreatureType type : EnumCreatureType.values()) {
// if((!type.isPeaceful() || peaceful) && (type.isPeaceful() || hostile) && (!type.isAnimal() || animals)) { // if((!type.isPeaceful() || peaceful) && (type.isPeaceful() || hostile) && (!type.isAnimal() || animals)) {
int cur = world.countEntities(EntityLiving.class); int cur = world.countEntities(EntityLiving.class);
int max = ServerConfig.maxMobs * locs / MOB_COUNT_DIV; int max = SVars.maxMobs * locs / MOB_COUNT_DIV;
if(cur <= max) { if(cur <= max) {
typeLabel: typeLabel:
for(ChunkPos coord : CHUNKS) { for(ChunkPos coord : CHUNKS) {
@ -98,7 +98,7 @@ public abstract class Spawner {
if(!block.isNormalCube()) { if(!block.isNormalCube()) {
int group = 0; int group = 0;
Object data = null; Object data = null;
for(int n = 0; n < ServerConfig.spawnGroups; ++n) { for(int n = 0; n < SVars.spawnGroups; ++n) {
int mx = x; int mx = x;
int my = y; int my = y;
int mz = z; int mz = z;

View file

@ -79,7 +79,7 @@ import server.biome.GenBiome;
import server.biome.RngSpawn; import server.biome.RngSpawn;
import server.clipboard.ClipboardBlock; import server.clipboard.ClipboardBlock;
import server.network.Player; import server.network.Player;
import server.util.ServerConfig; import server.vars.SVars;
import server.village.VillageCollection; import server.village.VillageCollection;
import server.worldgen.BiomeGenLayered; import server.worldgen.BiomeGenLayered;
import server.worldgen.BiomeGenPerlin; import server.worldgen.BiomeGenPerlin;
@ -180,7 +180,7 @@ public final class WorldServer extends AWorldServer {
private long time; private long time;
public static float clampGravity() { public static float clampGravity() {
return ExtMath.clampf(ServerConfig.gravity, -10.0f, 10.0f); return ExtMath.clampf(SVars.gravity, -10.0f, 10.0f);
} }
private BiomeGenerator createBiomeGenerator(Random rand) { private BiomeGenerator createBiomeGenerator(Random rand) {
@ -290,8 +290,8 @@ public final class WorldServer extends AWorldServer {
this.updateViewRadius(); this.updateViewRadius();
this.chunkDir = new File(new File("chunk"), dim.getDimensionName()); this.chunkDir = new File(new File("chunk"), dim.getDimensionName());
this.chunkDir.mkdirs(); this.chunkDir.mkdirs();
if(!ServerConfig.seed.isEmpty()) if(!SVars.seed.isEmpty())
this.rand.setSeed((long)ServerConfig.seed.hashCode() ^ ~((long)dim.getDimensionName().hashCode())); this.rand.setSeed((long)SVars.seed.hashCode() ^ ~((long)dim.getDimensionName().hashCode()));
this.seed = this.rand.longv(); this.seed = this.rand.longv();
this.dimension.setSeed(this.seed); this.dimension.setSeed(this.seed);
TagObject tag = null; TagObject tag = null;
@ -321,7 +321,7 @@ public final class WorldServer extends AWorldServer {
// ... // ...
} }
else { else {
Log.TICK.info("Startwert für %s: %d" + (ServerConfig.seed.isEmpty() ? "" : " von Basiswert '%s'"), this.dimension.getFormattedName(false), this.seed, ServerConfig.seed); Log.TICK.info("Startwert für %s: %d" + (SVars.seed.isEmpty() ? "" : " von Basiswert '%s'"), this.dimension.getFormattedName(false), this.seed, SVars.seed);
} }
if(this.exterminated) if(this.exterminated)
this.weather = Weather.CLEAR; this.weather = Weather.CLEAR;
@ -449,7 +449,7 @@ public final class WorldServer extends AWorldServer {
} }
public void updatePhysics() { public void updatePhysics() {
this.setTimeFactor(ServerConfig.timeFlow); this.setTimeFactor(SVars.timeFlow);
this.setGravity(clampGravity()); this.setGravity(clampGravity());
} }
@ -457,7 +457,7 @@ public final class WorldServer extends AWorldServer {
this.updateWeather(false); this.updateWeather(false);
this.biomeGen.cleanupCache(); this.biomeGen.cleanupCache();
// this.profiler.start("mobSpawner"); // this.profiler.start("mobSpawner");
if(this.mobs && ServerConfig.mobs && ServerConfig.tickSpawn) { if(this.mobs && SVars.mobs && SVars.tickSpawn) {
Spawner.spawn(this); Spawner.spawn(this);
} }
// this.profiler.next("chunkSource"); // this.profiler.next("chunkSource");
@ -481,7 +481,7 @@ public final class WorldServer extends AWorldServer {
// this.info.tick(); // this.info.tick();
this.time += 1L; this.time += 1L;
// this.dataModified = true; // this.dataModified = true;
if(ServerConfig.dayCycle) // { if(SVars.dayCycle) // {
this.daytime += this.timeFactor; this.daytime += this.timeFactor;
// if(this.dimension.getType().dayCycle) // if(this.dimension.getType().dayCycle)
// this.season = this.getSeasonByTime(); // this.season = this.getSeasonByTime();
@ -588,7 +588,7 @@ public final class WorldServer extends AWorldServer {
} }
protected void updateBlocks() { protected void updateBlocks() {
this.setActivePlayerChunksAndCheckLight(ServerConfig.distance); this.setActivePlayerChunksAndCheckLight(SVars.distance);
int i = 0; int i = 0;
int j = 0; int j = 0;
@ -605,7 +605,7 @@ public final class WorldServer extends AWorldServer {
// this.profiler.next("tickChunk"); // this.profiler.next("tickChunk");
chunk.update(false); chunk.update(false);
// this.profiler.next("thunder"); // this.profiler.next("thunder");
int l2 = ServerConfig.boltChance; int l2 = SVars.boltChance;
if(l2 > 0 && this.rand.zrange(l2) == 0 && this.isThundering()) { if(l2 > 0 && this.rand.zrange(l2) == 0 && this.isThundering()) {
this.updateLCG = this.updateLCG * 3 + 1013904223; this.updateLCG = this.updateLCG * 3 + 1013904223;
@ -618,7 +618,7 @@ public final class WorldServer extends AWorldServer {
} }
// this.profiler.next("iceandsnow"); // this.profiler.next("iceandsnow");
l2 = ServerConfig.weatherTick; l2 = SVars.weatherTick;
for(int z = 0; z < l2; z++) { for(int z = 0; z < l2; z++) {
if(this.rand.zrange(16) == 0) { if(this.rand.zrange(16) == 0) {
@ -631,9 +631,9 @@ public final class WorldServer extends AWorldServer {
this.setState(blockpos1, Blocks.ice.getState()); this.setState(blockpos1, Blocks.ice.getState());
} }
if(this.snow && this.isRaining() && this.canSnowAt(blockpos2, true, ServerConfig.snowStack)) { if(this.snow && this.isRaining() && this.canSnowAt(blockpos2, true, SVars.snowStack)) {
State layer = ServerConfig.snowStack ? this.getState(blockpos2) : null; State layer = SVars.snowStack ? this.getState(blockpos2) : null;
this.setState(blockpos2, ServerConfig.snowStack && layer.getBlock() == Blocks.snow_layer this.setState(blockpos2, SVars.snowStack && layer.getBlock() == Blocks.snow_layer
? (Blocks.snow_layer.getState().withProperty(BlockSnow.LAYERS, ? (Blocks.snow_layer.getState().withProperty(BlockSnow.LAYERS,
Math.min(layer.getValue(BlockSnow.LAYERS) + 1, 2))) : Blocks.snow_layer.getState()); Math.min(layer.getValue(BlockSnow.LAYERS) + 1, 2))) : Blocks.snow_layer.getState());
} }
@ -642,8 +642,8 @@ public final class WorldServer extends AWorldServer {
this.getState(blockpos1).getBlock().fillWithRain(this, blockpos1); this.getState(blockpos1).getBlock().fillWithRain(this, blockpos1);
} }
if(ServerConfig.igniteChance > 0 && ServerConfig.fire && !this.isRaining() && if(SVars.igniteChance > 0 && SVars.fire && !this.isRaining() &&
this.rand.chance(this.hasDownfall() ? Math.max(1, ServerConfig.igniteChance / 3) : ServerConfig.igniteChance) this.rand.chance(this.hasDownfall() ? Math.max(1, SVars.igniteChance / 3) : SVars.igniteChance)
&& this.canPlaceFireAt(blockpos2)) { && this.canPlaceFireAt(blockpos2)) {
this.setState(blockpos2, Blocks.fire.getState()); this.setState(blockpos2, Blocks.fire.getState());
} }
@ -651,7 +651,7 @@ public final class WorldServer extends AWorldServer {
} }
// this.profiler.next("tickBlocks"); // this.profiler.next("tickBlocks");
l2 = ServerConfig.randomTick; l2 = SVars.randomTick;
if(l2 > 0) { if(l2 > 0) {
this.toTick.addAll(chunk.getStorage()); this.toTick.addAll(chunk.getStorage());
@ -754,7 +754,7 @@ public final class WorldServer extends AWorldServer {
public void updateEntities() { public void updateEntities() {
if(this.players.isEmpty()) { if(this.players.isEmpty()) {
if(this.emptyTicks++ >= ServerConfig.unloadTicks) { if(this.emptyTicks++ >= SVars.unloadTicks) {
return; return;
} }
} }
@ -770,7 +770,7 @@ public final class WorldServer extends AWorldServer {
} }
public boolean shouldUnload() { public boolean shouldUnload() {
return this.emptyTicks >= ServerConfig.unloadTicks && this.loaderList.isEmpty(); return this.emptyTicks >= SVars.unloadTicks && this.loaderList.isEmpty();
} }
public boolean tickUpdates(boolean p_72955_1_) { public boolean tickUpdates(boolean p_72955_1_) {
@ -1073,7 +1073,7 @@ public final class WorldServer extends AWorldServer {
this.effects.add(entity); this.effects.add(entity);
this.server.sendNear(entity.posX, entity.posY, entity.posZ, 512.0D, this.dimension.getDimensionId(), this.server.sendNear(entity.posX, entity.posY, entity.posZ, 512.0D, this.dimension.getDimensionId(),
new SPacketSpawnGlobalEntity(entity, 1, entity.color)); new SPacketSpawnGlobalEntity(entity, 1, entity.color));
if(fire && ServerConfig.fire) { if(fire && SVars.fire) {
BlockPos pos = new BlockPos(entity); BlockPos pos = new BlockPos(entity);
if(this.isAreaLoaded(pos, 10)) { if(this.isAreaLoaded(pos, 10)) {
if(this.getState(pos).getBlock() == Blocks.air && Blocks.fire.canPlaceBlockAt(this, pos)) if(this.getState(pos).getBlock() == Blocks.air && Blocks.fire.canPlaceBlockAt(this, pos))
@ -1182,9 +1182,9 @@ public final class WorldServer extends AWorldServer {
float prevRain = this.rain; float prevRain = this.rain;
float prevFog = this.fog; float prevFog = this.fog;
if(ServerConfig.weather && ServerConfig.weatherChance > 0) { if(SVars.weather && SVars.weatherChance > 0) {
// int time = dim.getWeatherTime(); // int time = dim.getWeatherTime();
if(this.rand.chance(ServerConfig.weatherChance)) { if(this.rand.chance(SVars.weatherChance)) {
Weather nweather = Weather.pick(this.getBaseTemperature(), this.rand); Weather nweather = Weather.pick(this.getBaseTemperature(), this.rand);
if(nweather != this.weather) { if(nweather != this.weather) {
// dim.setWeatherTime(this.rand.zrange(Config.weatherFlow) + Config.weatherFlow); // dim.setWeatherTime(this.rand.zrange(Config.weatherFlow) + Config.weatherFlow);
@ -1535,7 +1535,7 @@ public final class WorldServer extends AWorldServer {
liquid.generate(this, this.grng, pos); liquid.generate(this, this.grng, pos);
} }
} }
if(this.mobs && ServerConfig.mobs && ServerConfig.genSpawn) { if(this.mobs && SVars.mobs && SVars.genSpawn) {
Spawner.generate(this, biome, bx + 8, bz + 8, 16, 16, this.grng); Spawner.generate(this, biome, bx + 8, bz + 8, 16, 16, this.grng);
} }
// if(this.snow) { // if(this.snow) {
@ -1984,7 +1984,7 @@ public final class WorldServer extends AWorldServer {
} }
public void updateViewRadius() { public void updateViewRadius() {
int radius = ExtMath.clampi(ServerConfig.distance, 3, 128); int radius = ExtMath.clampi(SVars.distance, 3, 128);
if(radius != this.viewRadius) { if(radius != this.viewRadius) {
int diff = radius - this.viewRadius; int diff = radius - this.viewRadius;
@ -2018,7 +2018,7 @@ public final class WorldServer extends AWorldServer {
this.viewRadius = radius; this.viewRadius = radius;
} }
this.trackDistance = ServerConfig.distance * 16 - 16; this.trackDistance = SVars.distance * 16 - 16;
} }
public void trackEntity(Entity entityIn) { public void trackEntity(Entity entityIn) {

View file

@ -16,7 +16,7 @@ import common.rng.Random;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Facing; import common.util.Facing;
import server.util.ServerConfig; import server.vars.SVars;
import server.world.WorldServer; import server.world.WorldServer;
import server.worldgen.LootConstants; import server.worldgen.LootConstants;
@ -671,7 +671,7 @@ public class StructureScattered
} }
} }
if (!this.hasMage && ServerConfig.mobs && ServerConfig.spawnHutMage) if (!this.hasMage && SVars.mobs && SVars.spawnHutMage)
{ {
int l1 = this.getXWithOffset(2, 5); int l1 = this.getXWithOffset(2, 5);
int i2 = this.getYWithOffset(2); int i2 = this.getYWithOffset(2);

View file

@ -20,7 +20,7 @@ import common.tags.TagObject;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Facing; import common.util.Facing;
import common.world.State; import common.world.State;
import server.util.ServerConfig; import server.vars.SVars;
import server.world.WorldServer; import server.world.WorldServer;
import server.worldgen.BiomeGenerator; import server.worldgen.BiomeGenerator;
import server.worldgen.LootConstants; import server.worldgen.LootConstants;
@ -1604,7 +1604,7 @@ public class StructureVillage
protected void spawnVillagers(WorldServer worldIn, StructureBoundingBox p_74893_2_, int p_74893_3_, int p_74893_4_, int p_74893_5_, int p_74893_6_) protected void spawnVillagers(WorldServer worldIn, StructureBoundingBox p_74893_2_, int p_74893_3_, int p_74893_4_, int p_74893_5_, int p_74893_6_)
{ {
if (this.villagersSpawned < p_74893_6_ && ServerConfig.mobs && ServerConfig.spawnVillager) if (this.villagersSpawned < p_74893_6_ && SVars.mobs && SVars.spawnVillager)
{ {
for (int i = this.villagersSpawned; i < p_74893_6_; ++i) for (int i = this.villagersSpawned; i < p_74893_6_; ++i)
{ {
@ -1921,7 +1921,7 @@ public class StructureVillage
protected void spawnVillager(WorldServer worldIn, StructureBoundingBox p_74893_2_, int x, int y, int z) protected void spawnVillager(WorldServer worldIn, StructureBoundingBox p_74893_2_, int x, int y, int z)
{ {
if (!this.villagerSpawned && ServerConfig.mobs && ServerConfig.spawnCagedVillager) if (!this.villagerSpawned && SVars.mobs && SVars.spawnCagedVillager)
{ {
int j = this.getXWithOffset(x, z); int j = this.getXWithOffset(x, z);
int k = this.getYWithOffset(y); int k = this.getYWithOffset(y);