Skip to content

Commit

Permalink
more 1.7 work
Browse files Browse the repository at this point in the history
  • Loading branch information
@progwml6
progwml6 committed Dec 31, 2013
1 parent 3bf37fa commit 3c23d27
Show file tree
Hide file tree
Showing 48 changed files with 334 additions and 336 deletions.
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
View file
Expand Up @@ -12,12 +12,12 @@
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
Expand Down
304 changes: 153 additions & 151 deletions src/main/java/tconstruct/blocks/logic/GolemPedestalLogic.java
View file
Expand Up @@ -3,6 +3,8 @@
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
Expand All @@ -24,154 +26,154 @@ public GolemPedestalLogic()
{
cost = new int[512];
souls = new int[512];
cost[Block.planks.blockID] = 0;
cost[Block.wood.blockID] = 32;
cost[Block.cloth.blockID] = 8;
cost[Block.cobblestoneMossy.blockID] = 16;
cost[Block.obsidian.blockID] = 8;
cost[Block.pumpkin.blockID] = 8;
cost[Block.netherrack.blockID] = 64;
cost[Block.slowSand.blockID] = 1;
cost[Block.glowStone.blockID] = 1;
cost[Block.pumpkinLantern.blockID] = 8;
cost[Block.blockDiamond.blockID] = 1;
cost[Block.blockGold.blockID] = 1;
cost[Block.blockIron.blockID] = 1;
cost[Block.blockLapis.blockID] = 1;
cost[Block.jukebox.blockID] = 1;
cost[Block.music.blockID] = 1;
cost[Block.melon.blockID] = 8;
cost[Block.torchRedstoneIdle.blockID] = 6;
cost[Block.torchRedstoneActive.blockID] = cost[Block.torchRedstoneIdle.blockID];
cost[Item.redstone.itemID] = 6;
cost[Item.beefRaw.itemID] = 8;
cost[Item.beefCooked.itemID] = cost[Item.beefRaw.itemID];
cost[Item.porkRaw.itemID] = cost[Item.beefRaw.itemID];
cost[Item.porkCooked.itemID] = cost[Item.beefRaw.itemID];
cost[Item.enderPearl.itemID] = 1;
cost[Item.eyeOfEnder.itemID] = 1;
cost[Item.blazeRod.itemID] = 2;
cost[Block.mushroomBrown.blockID] = 16;
cost[Block.mushroomRed.blockID] = cost[Block.mushroomBrown.blockID];
cost[Block.netherStalk.blockID] = 6;
cost[Item.glowstone.itemID] = 4;
cost[Item.diamond.itemID] = 1;
cost[Item.ingotIron.itemID] = 8;
cost[Item.ingotGold.itemID] = 2;
cost[Item.reed.itemID] = 8;
cost[Item.sugar.itemID] = cost[Item.reed.itemID];
cost[Item.bucketLava.itemID] = 1;
cost[Item.cake.itemID] = 1;
cost[Item.bucketMilk.itemID] = 1;
cost[Item.wheat.itemID] = 32;
cost[Item.bread.itemID] = 8;
cost[Block.plantYellow.blockID] = 32;
cost[Block.plantRed.blockID] = cost[Block.plantYellow.blockID];
cost[Block.dragonEgg.blockID] = 1;
cost[Block.tallGrass.blockID] = 64;
cost[Block.sapling.blockID] = 64;
cost[Item.ghastTear.itemID] = 8;
cost[Item.goldNugget.itemID] = 18;
cost[Item.spiderEye.itemID] = 16;
cost[Item.fermentedSpiderEye.itemID] = 6;
cost[Item.bowlSoup.itemID] = 0;
cost[Item.fishRaw.itemID] = 1;
cost[Item.fishCooked.itemID] = cost[Item.fishRaw.itemID];
cost[Item.magmaCream.itemID] = 2;
cost[Item.blazePowder.itemID] = 4;
cost[Item.speckledMelon.itemID] = 1;
cost[Item.paper.itemID] = 8;
cost[Item.book.itemID] = 2;
cost[Item.egg.itemID] = 4;
cost[Item.slimeBall.itemID] = 2;
cost[Item.saddle.itemID] = 1;
cost[Item.feather.itemID] = 48;
cost[Item.gunpowder.itemID] = 16;
cost[Item.appleRed.itemID] = 8;
cost[Item.appleGold.itemID] = 1;
cost[Item.dyePowder.itemID] = 64;
cost[Item.bone.itemID] = 2;
cost[Item.rottenFlesh.itemID] = 48;
cost[Item.cookie.itemID] = 16;
cost[Item.melon.itemID] = 32;
cost[Item.chickenCooked.itemID] = 8;
cost[Item.chickenRaw.itemID] = cost[Item.chickenCooked.itemID];
cost[Item.silk.itemID] = 64;
cost[Block.cactus.blockID] = 32;
souls[Block.planks.blockID] = 0;
souls[Block.wood.blockID] = 1;
souls[Block.cloth.blockID] = 1;
souls[Block.cobblestoneMossy.blockID] = 1;
souls[Block.obsidian.blockID] = 1;
souls[Block.pumpkin.blockID] = 1;
souls[Block.netherrack.blockID] = 1;
souls[Block.slowSand.blockID] = 1;
souls[Block.glowStone.blockID] = 2;
souls[Block.pumpkinLantern.blockID] = 1;
souls[Block.blockDiamond.blockID] = 27;
souls[Block.blockGold.blockID] = 2;
souls[Block.blockIron.blockID] = 2;
souls[Block.blockLapis.blockID] = 3;
souls[Block.jukebox.blockID] = 3;
souls[Block.music.blockID] = 1;
souls[Block.melon.blockID] = 1;
souls[Block.torchRedstoneIdle.blockID] = 1;
souls[Block.torchRedstoneActive.blockID] = souls[Block.torchRedstoneIdle.blockID];
souls[Item.redstone.itemID] = 1;
souls[Item.beefRaw.itemID] = 1;
souls[Item.beefCooked.itemID] = souls[Item.beefRaw.itemID];
souls[Item.porkRaw.itemID] = souls[Item.beefRaw.itemID];
souls[Item.porkCooked.itemID] = souls[Item.beefRaw.itemID];
souls[Item.enderPearl.itemID] = 1;
souls[Item.eyeOfEnder.itemID] = 2;
souls[Item.blazeRod.itemID] = 2;
souls[Block.mushroomBrown.blockID] = 1;
souls[Block.mushroomRed.blockID] = souls[Block.mushroomBrown.blockID];
souls[Block.netherStalk.blockID] = 1;
souls[Item.glowstone.itemID] = 1;
souls[Item.diamond.itemID] = 3;
souls[Item.ingotIron.itemID] = 1;
souls[Item.ingotGold.itemID] = 1;
souls[Item.reed.itemID] = 1;
souls[Item.sugar.itemID] = souls[Item.reed.itemID];
souls[Item.bucketLava.itemID] = 1;
souls[Item.cake.itemID] = 1;
souls[Item.bucketMilk.itemID] = 1;
souls[Item.wheat.itemID] = 1;
souls[Item.bread.itemID] = 1;
souls[Block.plantYellow.blockID] = 1;
souls[Block.plantRed.blockID] = souls[Block.plantYellow.blockID];
souls[Block.dragonEgg.blockID] = 1;
souls[Block.tallGrass.blockID] = 1;
souls[Block.sapling.blockID] = 1;
souls[Item.ghastTear.itemID] = 1;
souls[Item.goldNugget.itemID] = 1;
souls[Item.spiderEye.itemID] = 1;
souls[Item.fermentedSpiderEye.itemID] = 1;
souls[Item.bowlSoup.itemID] = 1;
souls[Item.fishRaw.itemID] = 1;
souls[Item.fishCooked.itemID] = souls[Item.fishRaw.itemID];
souls[Item.magmaCream.itemID] = 1;
souls[Item.blazePowder.itemID] = 1;
souls[Item.speckledMelon.itemID] = 1;
souls[Item.paper.itemID] = 1;
souls[Item.book.itemID] = 1;
souls[Item.egg.itemID] = 1;
souls[Item.slimeBall.itemID] = 1;
souls[Item.saddle.itemID] = 1;
souls[Item.feather.itemID] = 1;
souls[Item.gunpowder.itemID] = 1;
souls[Item.appleRed.itemID] = 1;
souls[Item.appleGold.itemID] = 3;
souls[Item.dyePowder.itemID] = 1;
souls[Item.bone.itemID] = 1;
souls[Item.rottenFlesh.itemID] = 1;
souls[Item.cookie.itemID] = 1;
souls[Item.melon.itemID] = 1;
souls[Item.chickenCooked.itemID] = 1;
souls[Item.chickenRaw.itemID] = souls[Item.chickenCooked.itemID];
souls[Item.silk.itemID] = 1;
souls[Block.cactus.blockID] = 1;
cost[Blocks.planks] = 0;
cost[Blocks.wood] = 32;
cost[Blocks.cloth] = 8;
cost[Blocks.cobblestoneMossy] = 16;
cost[Blocks.obsidian] = 8;
cost[Blocks.pumpkin] = 8;
cost[Blocks.netherrack] = 64;
cost[Blocks.slowSand] = 1;
cost[Blocks.glowStone] = 1;
cost[Blocks.pumpkinLantern] = 8;
cost[Blocks.blockDiamond] = 1;
cost[Blocks.blockGold] = 1;
cost[Blocks.blockIron] = 1;
cost[Blocks.blockLapis] = 1;
cost[Blocks.jukebox] = 1;
cost[Blocks.music] = 1;
cost[Blocks.melon] = 8;
cost[Blocks.torchRedstoneIdle] = 6;
cost[Blocks.torchRedstoneActive] = cost[Blocks.torchRedstoneIdle];
cost[Items.redstone] = 6;
cost[Items.beefRaw] = 8;
cost[Items.beefCooked] = cost[Items.beefRaw];
cost[Items.porkRaw] = cost[Items.beefRaw];
cost[Items.porkCooked] = cost[Items.beefRaw];
cost[Items.enderPearl] = 1;
cost[Items.eyeOfEnder] = 1;
cost[Items.blazeRod] = 2;
cost[Blocks.mushroomBrown] = 16;
cost[Blocks.mushroomRed] = cost[Blocks.mushroomBrown];
cost[Blocks.netherStalk] = 6;
cost[Items.glowstone] = 4;
cost[Items.diamond] = 1;
cost[Items.ingotIron] = 8;
cost[Items.ingotGold] = 2;
cost[Items.reed] = 8;
cost[Items.sugar] = cost[Items.reed];
cost[Items.bucketLava] = 1;
cost[Items.cake] = 1;
cost[Items.bucketMilk] = 1;
cost[Items.wheat] = 32;
cost[Items.bread] = 8;
cost[Blocks.plantYellow] = 32;
cost[Blocks.plantRed] = cost[Blocks.plantYellow];
cost[Blocks.dragonEgg] = 1;
cost[Blocks.tallGrass] = 64;
cost[Blocks.sapling] = 64;
cost[Items.ghastTear] = 8;
cost[Items.goldNugget] = 18;
cost[Items.spiderEye] = 16;
cost[Items.fermentedSpiderEye] = 6;
cost[Items.bowlSoup] = 0;
cost[Items.fishRaw] = 1;
cost[Items.fishCooked] = cost[Items.fishRaw];
cost[Items.magmaCream] = 2;
cost[Items.blazePowder] = 4;
cost[Items.speckledMelon] = 1;
cost[Items.paper] = 8;
cost[Items.book] = 2;
cost[Items.egg] = 4;
cost[Items.slimeBall] = 2;
cost[Items.saddle] = 1;
cost[Items.feather] = 48;
cost[Items.gunpowder] = 16;
cost[Items.appleRed] = 8;
cost[Items.appleGold] = 1;
cost[Items.dyePowder] = 64;
cost[Items.bone] = 2;
cost[Items.rottenFlesh] = 48;
cost[Items.cookie] = 16;
cost[Items.melon] = 32;
cost[Items.chickenCooked] = 8;
cost[Items.chickenRaw] = cost[Items.chickenCooked];
cost[Items.silk] = 64;
cost[Blocks.cactus] = 32;
souls[Blocks.planks] = 0;
souls[Blocks.wood] = 1;
souls[Blocks.cloth] = 1;
souls[Blocks.cobblestoneMossy] = 1;
souls[Blocks.obsidian] = 1;
souls[Blocks.pumpkin] = 1;
souls[Blocks.netherrack] = 1;
souls[Blocks.slowSand] = 1;
souls[Blocks.glowStone] = 2;
souls[Blocks.pumpkinLantern] = 1;
souls[Blocks.blockDiamond] = 27;
souls[Blocks.blockGold] = 2;
souls[Blocks.blockIron] = 2;
souls[Blocks.blockLapis] = 3;
souls[Blocks.jukebox] = 3;
souls[Blocks.music] = 1;
souls[Blocks.melon] = 1;
souls[Blocks.torchRedstoneIdle] = 1;
souls[Blocks.torchRedstoneActive] = souls[Blocks.torchRedstoneIdle];
souls[Items.redstone] = 1;
souls[Items.beefRaw] = 1;
souls[Items.beefCooked] = souls[Items.beefRaw];
souls[Items.porkRaw] = souls[Items.beefRaw];
souls[Items.porkCooked] = souls[Items.beefRaw];
souls[Items.enderPearl] = 1;
souls[Items.eyeOfEnder] = 2;
souls[Items.blazeRod] = 2;
souls[Blocks.mushroomBrown] = 1;
souls[Blocks.mushroomRed] = souls[Blocks.mushroomBrown];
souls[Blocks.netherStalk] = 1;
souls[Items.glowstone] = 1;
souls[Items.diamond] = 3;
souls[Items.ingotIron] = 1;
souls[Items.ingotGold] = 1;
souls[Items.reed] = 1;
souls[Items.sugar] = souls[Items.reed];
souls[Items.bucketLava] = 1;
souls[Items.cake] = 1;
souls[Items.bucketMilk] = 1;
souls[Items.wheat] = 1;
souls[Items.bread] = 1;
souls[Blocks.plantYellow] = 1;
souls[Blocks.plantRed] = souls[Blocks.plantYellow];
souls[Blocks.dragonEgg] = 1;
souls[Blocks.tallGrass] = 1;
souls[Blocks.sapling] = 1;
souls[Items.ghastTear] = 1;
souls[Items.goldNugget] = 1;
souls[Items.spiderEye] = 1;
souls[Items.fermentedSpiderEye] = 1;
souls[Items.bowlSoup] = 1;
souls[Items.fishRaw] = 1;
souls[Items.fishCooked] = souls[Items.fishRaw];
souls[Items.magmaCream] = 1;
souls[Items.blazePowder] = 1;
souls[Items.speckledMelon] = 1;
souls[Items.paper] = 1;
souls[Items.book] = 1;
souls[Items.egg] = 1;
souls[Items.slimeBall] = 1;
souls[Items.saddle] = 1;
souls[Items.feather] = 1;
souls[Items.gunpowder] = 1;
souls[Items.appleRed] = 1;
souls[Items.appleGold] = 3;
souls[Items.dyePowder] = 1;
souls[Items.bone] = 1;
souls[Items.rottenFlesh] = 1;
souls[Items.cookie] = 1;
souls[Items.melon] = 1;
souls[Items.chickenCooked] = 1;
souls[Items.chickenRaw] = souls[Items.chickenCooked];
souls[Items.silk] = 1;
souls[Blocks.cactus] = 1;
}
}

Expand All @@ -192,14 +194,14 @@ public ItemStack getStackInSlot (int i)
public boolean subtractSoul (int i)
{
TConstruct.logger.info("SUBTRACT WHY");
if (supply == null || supply.itemID >= 512 || cost[supply.itemID] == 0)
if (supply == null || supply.itemID >= 512 || cost[supply] == 0)
{
worldObj.playSoundAtEntity(Minecraft.getMinecraft().thePlayer, "mob.blaze.death", 1.0F, 0.5F);
Minecraft.getMinecraft().thePlayer.addChatMessage("I require more souls...");
return false;
}
int j = cost[supply.itemID];
int k = souls[supply.itemID];
int j = cost[supply];
int k = souls[supply];
int l = (supply.stackSize / j) * k;
TConstruct.logger.info((new StringBuilder()).append("Subtracting amt").append(i).append(" s").append(k).append(" c").append(j).append(" ss").append(supply.stackSize).append(" id")
.append(supply.itemID).append(" sa").append(l).append(" calc").append(Math.ceil((double) i / (double) k)).toString());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/RedwireLogic.java
View file
Expand Up @@ -2,7 +2,7 @@

import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.tileentity.TileEntity;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/TankAirLogic.java
View file
Expand Up @@ -10,7 +10,7 @@
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java
View file
Expand Up @@ -8,7 +8,7 @@
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/tconstruct/blocks/slime/SlimeGel.java
View file
Expand Up @@ -69,10 +69,10 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y,
/**
* returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks)
*/
public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List)
public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List)
{
par3List.add(new ItemStack(par1, 1, 0));
par3List.add(new ItemStack(par1, 1, 1));
par3List.add(new ItemStack(b, 1, 0));
par3List.add(new ItemStack(b, 1, 1));
//par3List.add(new ItemStack(par1, 1, 2));
}

Expand Down

0 comments on commit 3c23d27

Please sign in to comment.