apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Finishing Textures

Browse Source
This commit is contained in:
StevenRS11
2013-11-06 19:30:39 -05:00
parent bef91e2ce6
commit 51ee6d9c5e
45 changed files with 112 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
StevenDimDoors/mod_pocketDim/EventHookContainer.java
View File

@@ -36,15 +36,15 @@ public class EventHookContainer
@ForgeSubscribe
public void onSoundLoad(SoundLoadEvent event)
{
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/monk.ogg");
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/crack.ogg");
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/tearing.ogg");
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/rift.ogg");
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftStart.ogg");
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftEnd.ogg");
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftClose.ogg");
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftDoor.ogg");
event.manager.soundPoolMusic.addSound("mods/DimDoors/sfx/creepy.ogg");
event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/monk.ogg");
event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/crack.ogg");
event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/tearing.ogg");
event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/rift.ogg");
event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/riftStart.ogg");
event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/riftEnd.ogg");
event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/riftClose.ogg");
event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/riftDoor.ogg");
event.manager.soundPoolMusic.addSound(mod_pocketDim.modid+":/sfx/creepy.ogg");
}
@SideOnly(Side.CLIENT)

5
StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
View File

@@ -9,6 +9,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
@@ -389,7 +390,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
if (canUse && entity instanceof EntityPlayer)
{
// Dont check for non-player entites
canUse = isEntityFacingDoor(metadata, (EntityLiving) entity);
canUse = isEntityFacingDoor(metadata, (EntityLivingBase) entity);
}
if (canUse)
{
@@ -421,7 +422,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
return (metadata & 4) != 0;
}
protected static boolean isEntityFacingDoor(int metadata, EntityLiving entity)
protected static boolean isEntityFacingDoor(int metadata, EntityLivingBase entity)
{
// Although any entity has the proper fields for this check,
// we should only apply it to living entities since things

3
StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
View File

@@ -11,6 +11,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
@@ -39,7 +40,7 @@ public class TransientDoor extends BaseDimDoor
if (canUse && entity instanceof EntityLiving)
{
// Don't check for non-living entities since it might not work right
canUse = BaseDimDoor.isEntityFacingDoor(metadata, (EntityLiving) entity);
canUse = BaseDimDoor.isEntityFacingDoor(metadata, (EntityLivingBase) entity);
}
if (canUse)
{

5
StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
View File

@@ -398,11 +398,6 @@ public class DDTeleporter
if (player != null)
{
newWorld.getChunkProvider().loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4);
if(difDest)
{
newWorld.getPlayerManager().addPlayer(player);
}
// Tell Forge we're moving its players so everyone else knows.
// Let's try doing this down here in case this is what's killing NEI.
GameRegistry.onPlayerChangedDimension((EntityPlayer)entity);

11
StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
View File

@@ -2,6 +2,7 @@ package StevenDimDoors.mod_pocketDim.ticking;
import java.util.List;
import net.minecraft.entity.DataWatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityFlying;
import net.minecraft.entity.EntityLiving;
@@ -36,7 +37,6 @@ public class MobMonolith extends EntityFlying implements IMob
public MobMonolith(World par1World)
{
super(par1World);
this.texture="/mods/DimDoors/textures/mobs/Monolith0.png";
this.setSize(3F, 9.0F);
this.noClip=true;
this.scaleFactor= (float) ((rand.nextDouble()/2)+1);
@@ -88,10 +88,6 @@ public class MobMonolith extends EntityFlying implements IMob
{
this.setDead();
}
byte b0 = this.dataWatcher.getWatchableObjectByte(16);
this.texture="/mods/DimDoors/textures/mobs/Monolith"+b0+".png";
super.onEntityUpdate();
if (this.isEntityAlive() && this.isEntityInsideOpaqueBlock())
@@ -290,4 +286,9 @@ public class MobMonolith extends EntityFlying implements IMob
this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() &&
!this.worldObj.isAnyLiquid(this.boundingBox);
}
public DataWatcher getDataWatcher()
{
return this.dataWatcher;
}
}