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

Updated to 1.5.2 #2

Merged
keenerb merged 2 commits from master into master 2013-05-09 19:28:04 +00:00
Conversation 2 Commits 2 Files Changed 13 +33 -32
13 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
StevenDimDoors/mod_pocketDim/RailTeleporter.java
View File

@@ -94,7 +94,7 @@ public class RailTeleporter extends Teleporter
} }
@Override @Override
public void func_85189_a(long par1) public void removeStalePortalLocations(long par1)
{ {
} }

10
StevenDimDoors/mod_pocketDim/SchematicLoader.java
View File

@@ -207,7 +207,7 @@ public class SchematicLoader
} }
if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorSteel.blockID||blockID==Block.doorWood.blockID) if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorIron.blockID||blockID==Block.doorWood.blockID)
{ {
switch (metadata) switch (metadata)
{ {
@@ -377,7 +377,7 @@ public class SchematicLoader
} }
if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorSteel.blockID||blockID==Block.doorWood.blockID) if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorIron.blockID||blockID==Block.doorWood.blockID)
{ {
switch (metadata) switch (metadata)
{ {
@@ -543,7 +543,7 @@ public class SchematicLoader
} }
if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorSteel.blockID||blockID==Block.doorWood.blockID) if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorIron.blockID||blockID==Block.doorWood.blockID)
{ {
switch (metadata) switch (metadata)
{ {
@@ -707,7 +707,7 @@ public class SchematicLoader
int size = tileEntity.tagCount(); int size = tileEntity.tagCount();
if(blockToReplace==Block.doorSteel.blockID) if(blockToReplace==Block.doorIron.blockID)
{ {
this.sideLinks.add(new Point3D(i+xCooe, j+yCooe, k+zCooe)); this.sideLinks.add(new Point3D(i+xCooe, j+yCooe, k+zCooe));
} }
@@ -737,7 +737,7 @@ public class SchematicLoader
this.transMeta=this.transformMetadata(blockMetaData, link.linkOrientation, blockToReplace); this.transMeta=this.transformMetadata(blockMetaData, link.linkOrientation, blockToReplace);
if(blockToReplace==Block.doorSteel.blockID) if(blockToReplace==Block.doorIron.blockID)
{ {
setBlockDirectly(world,i+xCooe,j+yCooe,k+zCooe,mod_pocketDim.dimDoorID, transMeta ); setBlockDirectly(world,i+xCooe,j+yCooe,k+zCooe,mod_pocketDim.dimDoorID, transMeta );
} }

4
StevenDimDoors/mod_pocketDim/blocks/dimDoor.java
View File

@@ -634,12 +634,12 @@ public class dimDoor extends BlockContainer
*/ */
public int idPicked(World par1World, int par2, int par3, int par4) public int idPicked(World par1World, int par2, int par3, int par4)
{ {
return Item.doorSteel.itemID; return Item.doorIron.itemID;
} }
public int idDropped(int par1, Random par2Random, int par3) public int idDropped(int par1, Random par2Random, int par3)
{ {
return (par1 & 8) != 0 ? 0 : (Item.doorSteel.itemID); return (par1 & 8) != 0 ? 0 : (Item.doorIron.itemID);
} }
/** /**

2
StevenDimDoors/mod_pocketDim/items/ItemChaosDoor.java
View File

@@ -26,7 +26,7 @@ public class ItemChaosDoor extends itemDimDoor
} }
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
} }
@Override @Override

4
StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
View File

@@ -42,7 +42,7 @@ public class ItemRiftBlade extends itemDimDoor
this.weaponDamage =8; this.weaponDamage =8;
// this.iconIndex=5; // this.itemIcon=5;
this.setMaxDamage(500); this.setMaxDamage(500);
this.hasSubtypes=false; this.hasSubtypes=false;
//TODO move to proxy //TODO move to proxy
@@ -290,7 +290,7 @@ public class ItemRiftBlade extends itemDimDoor
} }
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
} }
public int getItemEnchantability() public int getItemEnchantability()

4
StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
View File

@@ -29,7 +29,7 @@ public class ItemStabilizedRiftSignature extends itemLinkSignature
// this.setTextureFile("/PocketBlockTextures.png"); // this.setTextureFile("/PocketBlockTextures.png");
this.setCreativeTab(CreativeTabs.tabTransport); this.setCreativeTab(CreativeTabs.tabTransport);
// this.iconIndex=5; // this.itemIndex=5;
this.setMaxDamage(0); this.setMaxDamage(0);
this.hasSubtypes=true; this.hasSubtypes=true;
//TODO move to proxy //TODO move to proxy
@@ -55,7 +55,7 @@ public class ItemStabilizedRiftSignature extends itemLinkSignature
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
} }

4
StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
View File

@@ -26,13 +26,13 @@ public class ItemStableFabric extends Item
public ItemStableFabric(int par1, int par2) public ItemStableFabric(int par1, int par2)
{ {
super(par1); super(par1);
// this.setIconIndex(Item.doorWood.getIconFromDamage(0)); // this.setitemIcon(Item.doorWood.getIconFromDamage(0));
this.setCreativeTab(CreativeTabs.tabTransport); this.setCreativeTab(CreativeTabs.tabTransport);
} }
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
} }
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)

2
StevenDimDoors/mod_pocketDim/items/itemDimDoor.java
View File

@@ -33,7 +33,7 @@ public class itemDimDoor extends ItemDoor
} }
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
} }

4
StevenDimDoors/mod_pocketDim/items/itemExitDoor.java
View File

@@ -24,12 +24,12 @@ public class itemExitDoor extends itemDimDoor
this.doorMaterial = par2Material; this.doorMaterial = par2Material;
this.setCreativeTab(CreativeTabs.tabTransport); this.setCreativeTab(CreativeTabs.tabTransport);
// this.setIconIndex(Item.doorWood.getIconFromDamage(0)); // this.setitemIcon(Item.doorWood.getIconFromDamage(0));
} }
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
} }

4
StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java
View File

@@ -30,7 +30,7 @@ public class itemLinkSignature extends Item
// this.setTextureFile("/PocketBlockTextures.png"); // this.setTextureFile("/PocketBlockTextures.png");
this.setCreativeTab(CreativeTabs.tabTransport); this.setCreativeTab(CreativeTabs.tabTransport);
// this.iconIndex=5; // this.itemIcon=5;
this.setMaxDamage(0); this.setMaxDamage(0);
this.hasSubtypes=true; this.hasSubtypes=true;
//TODO move to proxy //TODO move to proxy
@@ -56,7 +56,7 @@ public class itemLinkSignature extends Item
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
} }

4
StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java
View File

@@ -30,7 +30,7 @@ public class itemRiftRemover extends Item
// this.setTextureFile("/PocketBlockTextures.png"); // this.setTextureFile("/PocketBlockTextures.png");
this.setCreativeTab(CreativeTabs.tabTransport); this.setCreativeTab(CreativeTabs.tabTransport);
// this.iconIndex=6; // this.itemIcon=6;
this.setMaxDamage(5); this.setMaxDamage(5);
this.hasSubtypes=true; this.hasSubtypes=true;
//TODO move to proxy //TODO move to proxy
@@ -39,7 +39,7 @@ public class itemRiftRemover extends Item
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
} }

8
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View File

@@ -409,12 +409,12 @@ public class mod_pocketDim
{ {
GameRegistry.addRecipe(new ItemStack(itemDimDoor, 1), new Object[] GameRegistry.addRecipe(new ItemStack(itemDimDoor, 1), new Object[]
{ {
" ", "yxy", " ", 'x', Item.enderPearl, 'y', Item.doorSteel " ", "yxy", " ", 'x', Item.enderPearl, 'y', Item.doorIron
}); });
GameRegistry.addRecipe(new ItemStack(itemDimDoor, 1), new Object[] GameRegistry.addRecipe(new ItemStack(itemDimDoor, 1), new Object[]
{ {
" ", "yxy", " ", 'x', this.itemStableFabric, 'y', Item.doorSteel " ", "yxy", " ", 'x', this.itemStableFabric, 'y', Item.doorIron
}); });
} }
@@ -526,7 +526,7 @@ public class mod_pocketDim
this.blocksImmuneToRift.add(this.chaosDoorID); this.blocksImmuneToRift.add(this.chaosDoorID);
this.blocksImmuneToRift.add(this.blockRiftID); this.blocksImmuneToRift.add(this.blockRiftID);
this.blocksImmuneToRift.add(this.transientDoorID); this.blocksImmuneToRift.add(this.transientDoorID);
this.blocksImmuneToRift.add(Block.blockSteel.blockID); this.blocksImmuneToRift.add(Block.blockIron.blockID);
this.blocksImmuneToRift.add(Block.blockDiamond.blockID); this.blocksImmuneToRift.add(Block.blockDiamond.blockID);
this.blocksImmuneToRift.add(Block.blockEmerald.blockID); this.blocksImmuneToRift.add(Block.blockEmerald.blockID);
this.blocksImmuneToRift.add(Block.blockGold.blockID); this.blocksImmuneToRift.add(Block.blockGold.blockID);
@@ -625,7 +625,7 @@ public class mod_pocketDim
this.metadataFlipList.add(Block.torchWood.blockID); this.metadataFlipList.add(Block.torchWood.blockID);
this.metadataFlipList.add(Block.torchRedstoneIdle.blockID); this.metadataFlipList.add(Block.torchRedstoneIdle.blockID);
this.metadataFlipList.add(Block.torchRedstoneActive.blockID); this.metadataFlipList.add(Block.torchRedstoneActive.blockID);
this.metadataFlipList.add(Block.doorSteel.blockID); this.metadataFlipList.add(Block.doorIron.blockID);
this.metadataFlipList.add(Block.doorWood.blockID); this.metadataFlipList.add(Block.doorWood.blockID);
this.metadataFlipList.add(Block.pistonBase.blockID); this.metadataFlipList.add(Block.pistonBase.blockID);
this.metadataFlipList.add(Block.pistonStickyBase.blockID); this.metadataFlipList.add(Block.pistonStickyBase.blockID);

13
StevenDimDoors/mod_pocketDimClient/RiftFX.java
View File

@@ -96,18 +96,19 @@ public class RiftFX extends EntityFX
float f9 = f8 + 0.0624375F; float f9 = f8 + 0.0624375F;
float f10 = 0.1F * this.particleScale; float f10 = 0.1F * this.particleScale;
if (this.particleTextureIndex != null) if (this.particleIcon != null)
{ {
f6 = this.particleTextureIndex.getMinU(); f6 = this.particleIcon.getMinU();
f7 = this.particleTextureIndex.getMaxU(); f7 = this.particleIcon.getMaxU();
f8 = this.particleTextureIndex.getMinV(); f8 = this.particleIcon.getMinV();
f9 = this.particleTextureIndex.getMaxV(); f9 = this.particleIcon.getMaxV();
} }
float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX);
float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY);
float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ);
float f14 = .0F; float f14 = 0F;
try try
{ {