Dead things, teleports, smoothing, oh my!

This commit is contained in:
Alex Spinks committed 2015-08-22 22:45:08 +01:00
1 parent 947685bb5d
commit 280ae8e30b
15 files changed
+277 -6

No files matched your search

@@ -0,0 +1,18 @@
package fox.spiteful.avaritia.blocks;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlockWithMetadata;
import net.minecraft.item.ItemStack;
public class ItemBlockWithMetadataUnderp extends ItemBlockWithMetadata {
public ItemBlockWithMetadataUnderp(Block block) {
super(block, block);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
int meta = stack.getItemDamage();
return this.field_150939_a.getUnlocalizedName() + meta;
}
}
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import fox.spiteful.avaritia.blocks.LudicrousBlocks;
import fox.spiteful.avaritia.compat.Compat;
import fox.spiteful.avaritia.compat.botania.alfheim.AlfheimBlocks;
import fox.spiteful.avaritia.compat.botania.alfheim.AlfheimEvents;
import fox.spiteful.avaritia.compat.nei.NotEnough;
import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
@@ -35,6 +36,8 @@ public class Tsundere {
AlfheimEvents alfevents = new AlfheimEvents();
FMLCommonHandler.instance().bus().register(alfevents);
MinecraftForge.EVENT_BUS.register(alfevents);
AlfheimBlocks.alfheimify();
BotaniaAPI.registerSubTile("asgardandelion", SubTileCheaty.class);
BotaniaAPI.registerSubTileSignature(SubTileCheaty.class, new Signature("asgardandelion"));
@@ -0,0 +1,13 @@
package fox.spiteful.avaritia.compat.botania.alfheim;
import net.minecraft.block.Block;
import cpw.mods.fml.common.registry.GameRegistry;
import fox.spiteful.avaritia.blocks.ItemBlockWithMetadataUnderp;
public class AlfheimBlocks {
public static Block deadrock;
public static void alfheimify() {
deadrock = GameRegistry.registerBlock(new BlockDeadrock(), ItemBlockWithMetadataUnderp.class, "Alf_Deadrock");
}
}
@@ -0,0 +1,25 @@
package fox.spiteful.avaritia.compat.botania.alfheim;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.Teleporter;
import net.minecraft.world.WorldServer;
public class BasicTeleporter extends Teleporter {
public BasicTeleporter(WorldServer world) {
super(world);
}
@Override
public boolean makePortal(Entity entity){
return true;
}
@Override
public void placeInPortal(Entity entity, double x, double y, double z, float yaw){
int newX = MathHelper.floor_double(entity.posX);
int newY = MathHelper.floor_double(entity.posY);
int newZ = MathHelper.floor_double(entity.posZ);
entity.setLocationAndAngles(newX, newY, newZ, entity.rotationYaw, 0.0F);
}
}
@@ -0,0 +1,67 @@
package fox.spiteful.avaritia.compat.botania.alfheim;
import java.util.List;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class BlockDeadrock extends Block implements ILexiconable {
private static final int TYPES = 5;
IIcon[] icons;
public BlockDeadrock() {
super(Material.rock);
setHardness(2.0F);
setResistance(10.0F);
setStepSound(soundTypeStone);
setBlockName("alfheim_deadrock");
}
@Override
public int damageDropped(int par1) {
return par1;
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for(int i = 0; i < TYPES; i++)
par3List.add(new ItemStack(par1, 1, i));
}
@Override
public void registerBlockIcons(IIconRegister ir) {
icons = new IIcon[TYPES];
for(int i = 0; i < TYPES; i++)
icons[i] = ir.registerIcon("avaritia:deadrock"+i);
}
@Override
public IIcon getIcon(int par1, int par2) {
return icons[Math.min(TYPES - 1, par2)];
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
int meta = world.getBlockMetadata(x, y, z);
return new ItemStack(this, 1, meta);
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
int meta = world.getBlockMetadata(x, y, z);
//return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks;
return null;
}
}
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import vazkii.botania.common.block.ModBlocks;
import net.minecraft.block.Block;
@@ -18,6 +19,10 @@ import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
public class ChunkProviderAlfheim implements IChunkProvider {
public static final int CITYRADIUS = 400;
public static final int FLATRADIUS = CITYRADIUS + 20;
public static final int HILLRADIUS = FLATRADIUS + 250;
public final long seed;
public Random rand;
public final World world;
@@ -66,16 +71,39 @@ public class ChunkProviderAlfheim implements IChunkProvider {
for(int x = 0; x<=15; x++) {
for(int z = 0; z<=15; z++) {
double height = this.noise.getJordanDefault(chunkX * 16 + x, chunkZ * 16 + z);
int threshold = MathHelper.floor_double(64 + height * 64);
int blockX = chunkX * 16 + x;
int blockZ = chunkZ * 16 + z;
double dist = Math.sqrt(blockX*blockX + blockZ*blockZ);
int threshold = 64;
if (dist > FLATRADIUS) {
double mix = (dist - FLATRADIUS) / (double)(HILLRADIUS - FLATRADIUS);
mix = Math.max(0, Math.min(1, mix));
mix = mix * mix * (3 - (2 * mix));
double height = this.noise.getJordanDefault(chunkX * 16 + x, chunkZ * 16 + z);
threshold = MathHelper.floor_double(64 + mix * height * 64);
}
/*if (dist < CITYRADIUS) {
threshold += 4;
}*/
for(int y = 0; y<254; y++) {
int pos = y | z << 8 | x << 12;
if (y <= threshold) {
blocks[pos] = ModBlocks.livingrock;
meta[pos] = 0;
if (y < threshold - (15 + this.rand.nextInt(3))) {
// INTERIOR
blocks[pos] = ModBlocks.livingrock;
meta[pos] = 0;
} else {
// CRUST
blocks[pos] = AlfheimBlocks.deadrock;
meta[pos] = 0;
}
}
}
}
@@ -0,0 +1,102 @@
package fox.spiteful.avaritia.compat.botania.alfheim;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.DimensionManager;
public class TeleportHelper {
public static void travelToDimension(Entity ent, int x, int y, int z, int dim){
if(ent instanceof EntityPlayerMP){
MinecraftServer minecraftserver = MinecraftServer.getServer();
WorldServer newWorldServer = minecraftserver.worldServerForDimension(dim);
minecraftserver.getConfigurationManager().transferPlayerToDimension((EntityPlayerMP)ent, dim, new BasicTeleporter(newWorldServer));
((EntityPlayer)ent).setPositionAndUpdate(x+0.5, y+0.5, z+0.5);
return;
}
if (!ent.worldObj.isRemote && !ent.isDead)
{
ent.worldObj.theProfiler.startSection("changeDimension");
MinecraftServer minecraftserver = MinecraftServer.getServer();
int j = ent.dimension;
WorldServer worldserver = minecraftserver.worldServerForDimension(j);
WorldServer worldserver1 = minecraftserver.worldServerForDimension(dim);
ent.dimension = dim;
if (j == 1 && dim == 1)
{
worldserver1 = minecraftserver.worldServerForDimension(0);
ent.dimension = 0;
}
ent.worldObj.removeEntity(ent);
ent.isDead = false;
ent.worldObj.theProfiler.startSection("reposition");
minecraftserver.getConfigurationManager().transferEntityToWorld(ent, j, worldserver, worldserver1);
ent.worldObj.theProfiler.endStartSection("reloading");
Entity entity = EntityList.createEntityByName(EntityList.getEntityString(ent), worldserver1);
if (entity != null)
{
entity.copyDataFrom(ent, true);
if (j == 1 && dim == 1)
{
entity.setLocationAndAngles(x+0.5, y+0.5, z+0.5, entity.rotationYaw, entity.rotationPitch);
}
worldserver1.spawnEntityInWorld(entity);
entity.setPosition(x+0.5, y+0.5, z+0.5);
}
ent.isDead = true;
ent.worldObj.theProfiler.endSection();
worldserver.resetUpdateEntityTick();
worldserver1.resetUpdateEntityTick();
ent.worldObj.theProfiler.endSection();
}
}
public static void travelToOrFromAlfheim(EntityPlayer player) {
if (DimensionManager.getWorld(0) == player.worldObj) {
// overworld to alfheim
travelToDimension(player, 0, 85, 0, WorldProviderAlfheim.dimensionID);
} else {
// alfheim to overworld
sendPlayerHome(player);
}
}
public static void sendPlayerHome(EntityPlayer player) {
World world = DimensionManager.getWorld(0);
ChunkCoordinates coord = player.getBedLocation(0);
if (coord == null) {
coord = world.getSpawnPoint();
}
coord = forceLocation(world, coord);
if (coord == null) {
coord = world.getSpawnPoint();
}
travelToDimension(player, coord.posX, coord.posY, coord.posZ, 0);
while (!world.getCollidingBoundingBoxes(player, player.boundingBox).isEmpty())
{
player.setPositionAndUpdate(player.posX, player.posY + 1.0D, player.posZ);
}
}
public static ChunkCoordinates forceLocation(World world, ChunkCoordinates coord) {
return null;
}
}
@@ -5,6 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import fox.spiteful.avaritia.FieldHelper;
import fox.spiteful.avaritia.Lumberjack;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.Timer;
import net.minecraft.util.Vec3;
import net.minecraft.world.WorldProvider;
@@ -118,4 +119,10 @@ public class WorldProviderAlfheim extends WorldProvider {
{
return 0.6f;
}
@Override
public ChunkCoordinates getEntrancePortalLocation()
{
return new ChunkCoordinates(0, 85, 0);
}
}
@@ -9,6 +9,7 @@ import fox.spiteful.avaritia.Avaritia;
import fox.spiteful.avaritia.Lumberjack;
import fox.spiteful.avaritia.compat.botania.alfheim.ApocalypseCloudRenderer;
import fox.spiteful.avaritia.compat.botania.alfheim.ApocalypseSkyRenderer;
import fox.spiteful.avaritia.compat.botania.alfheim.TeleportHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -55,11 +56,13 @@ public class ItemMorvInABox extends Item {
p.setCloudRenderer(new ApocalypseCloudRenderer());
Lumberjack.info(p.getCloudRenderer());
//}*/
if (DimensionManager.getWorld(0) == world) {
/*if (DimensionManager.getWorld(0) == world) {
player.travelToDimension(13);
} else {
player.travelToDimension(0);
}
}*/
TeleportHelper.travelToOrFromAlfheim(player);
return stack;
}
}