GloopMaster/TinkersConstruct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistency

Browse Source
This commit is contained in:
mDiyo 2013-05-20 16:13:06 -07:00
parent 5bf2eac646
commit 128457d55c
10 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mods/tinker/resources/manuals/materials.xml
View File

@ -224,10 +224,6 @@ Natural Abilities:
<text>Tool Rod</text>
<icon>toolrod</icon>
</item>
<item>
<text>Crossbar</text>
<icon>crossbar</icon>
</item>
</page>
<page type="toolpage">
@ -441,7 +437,7 @@ Class: Lethal Joke Weapon</text>
<page type="materialstats">
<title>Steel</title>
<icon>steelsword</icon>
<text>An Iron alloy. The method for obtaining this is unknown.</text>
<text>An Iron alloy. The method for obtaining this is unknown. Enemy chainmail seems to be made of it.</text>
<material>
<main>steelingot</main>
</material>

2
mods/tinker/tconstruct/TConstruct.java
View File

@ -37,7 +37,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry;
* @dependencies: IC2 API
*/
@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.3.14", dependencies = "required-after:Forge@[7.7.1.675,)")
@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.dev.37", dependencies = "required-after:Forge@[7.7.1.675,)")
@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.util.network.TPacketHandler.class)
public class TConstruct
{

4
mods/tinker/tconstruct/blocks/OreberryBush.java
View File

@ -198,8 +198,8 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
int meta = world.getBlockMetadata(x, y, z);
if (meta >= 12)
{
/*if (world.isRemote)
return true;*/
if (world.isRemote)
return true;
world.setBlock(x, y, z, blockID, meta - 4, 3);
AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.oreBerries, 1, meta % 4 + itemMeat));

7
mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java
View File

@ -379,10 +379,17 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
if (activeLavaTank == null || useTime > 0)
return;
if (!worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z))
{
fuelGague = 0;
return;
}
TileEntity tankContainer = worldObj.getBlockTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z);
if (tankContainer == null)
{
fuelGague = 0;
return;
}
if (tankContainer instanceof ITankContainer)
{

2
mods/tinker/tconstruct/client/gui/GuiManual.java
View File

@ -845,7 +845,7 @@ public class GuiManual extends GuiScreen
if (material.shoddy() > 0)
{
this.fontRenderer.drawString("Mining Aspect level: " + material.shoddy(), localWidth, localHeight + 120 + 10 * offset, 0);
this.fontRenderer.drawString("Stonebound level: " + material.shoddy(), localWidth, localHeight + 120 + 10 * offset, 0);
offset++;
}
else if (material.shoddy() < 0)

15
mods/tinker/tconstruct/client/gui/PartCrafterGui.java
View File

@ -95,7 +95,13 @@ public class PartCrafterGui extends NewContainerGui
this.fontRenderer.drawString("Handle Modifier: " + topEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215);
this.fontRenderer.drawString("Mining Speed: " + topEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215);
this.fontRenderer.drawString("Mining Level: " + getHarvestLevelName(topEnum.harvestLevel()), xSize + 8, offset + 49, 16777215);
this.fontRenderer.drawString("Base Attack: " + topEnum.attack(), xSize + 8, offset + 60, 16777215);
int attack = topEnum.attack();
String heart = attack == 2 ? " Heart" : " Hearts";
if (attack % 2 == 0)
this.fontRenderer.drawString("Attack: " + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff);
else
this.fontRenderer.drawString("Attack: " + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff);
}
offset = 90;
@ -106,7 +112,12 @@ public class PartCrafterGui extends NewContainerGui
this.fontRenderer.drawString("Handle Modifier: " + bottomEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215);
this.fontRenderer.drawString("Mining Speed: " + bottomEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215);
this.fontRenderer.drawString("Mining Level: " + getHarvestLevelName(bottomEnum.harvestLevel()), xSize + 8, offset + 49, 16777215);
this.fontRenderer.drawString("Base Attack: " + bottomEnum.attack(), xSize + 8, offset + 60, 16777215);
int attack = bottomEnum.attack();
String heart = attack == 2 ? " Heart" : " Hearts";
if (attack % 2 == 0)
this.fontRenderer.drawString("Attack: " + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff);
else
this.fontRenderer.drawString("Attack: " + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff);
}
if (!hasTop && !hasBottom)

16
mods/tinker/tconstruct/common/TContent.java
View File

@ -646,6 +646,22 @@ public class TContent implements IFuelHandler
Smeltery.addMelting(new ItemStack(oreBerries, 4, 3), metalBlock.blockID, 5, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 3)); //Tin
Smeltery.addMelting(new ItemStack(oreBerries, 4, 4), metalBlock.blockID, 6, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 4)); //Aluminum
//Vanilla Armor
Smeltery.addMelting(new ItemStack(Item.helmetIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 5, 0));
Smeltery.addMelting(new ItemStack(Item.plateIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 8, 0));
Smeltery.addMelting(new ItemStack(Item.legsIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 7, 0));
Smeltery.addMelting(new ItemStack(Item.bootsIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 4, 0));
Smeltery.addMelting(new ItemStack(Item.helmetGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 5, 1));
Smeltery.addMelting(new ItemStack(Item.plateGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 8, 1));
Smeltery.addMelting(new ItemStack(Item.legsGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 7, 1));
Smeltery.addMelting(new ItemStack(Item.bootsGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 4, 1));
Smeltery.addMelting(new ItemStack(Item.helmetChain, 1, 0), this.metalBlock.blockID, 9, 700, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12));
Smeltery.addMelting(new ItemStack(Item.plateChain, 1, 0), this.metalBlock.blockID, 9, 700, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 12));
Smeltery.addMelting(new ItemStack(Item.legsChain, 1, 0), this.metalBlock.blockID, 9, 700, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 12));
Smeltery.addMelting(new ItemStack(Item.bootsChain, 1, 0), this.metalBlock.blockID, 9, 700, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12));
/* Detailing */
Detailing chiseling = TConstructRegistry.getChiselDetailing();
chiseling.addDetailing(Block.stone, 0, Block.stoneBrick, 0, chisel);

22
mods/tinker/tconstruct/util/PHConstruct.java
View File

@ -197,12 +197,12 @@ public class PHConstruct
aluminumuMinY = config.get("Worldgen", "Aluminum Underground Min Y", 0).getInt(0);
aluminumuMaxY = config.get("Worldgen", "Aluminum Underground Max Y", 64).getInt(64);
ironsRarity = config.get("Worldgen", "Iron Surface Rarity", 200).getInt(200);
goldsRarity = config.get("Worldgen", "Gold Surface Rarity", 700).getInt(700);
coppersRarity = config.get("Worldgen", "Copper Surface Rarity", 80).getInt(80);
tinsRarity = config.get("Worldgen", "Tin Surface Rarity", 80).getInt(80);
ironsRarity = config.get("Worldgen", "Iron Surface Rarity", 400).getInt(400);
goldsRarity = config.get("Worldgen", "Gold Surface Rarity", 900).getInt(900);
coppersRarity = config.get("Worldgen", "Copper Surface Rarity", 100).getInt(100);
tinsRarity = config.get("Worldgen", "Tin Surface Rarity", 100).getInt(100);
aluminumsRarity = config.get("Worldgen", "Aluminum Surface Rarity", 70).getInt(70);
cobaltsRarity = config.get("Worldgen", "Cobalt Surface Rarity", 1500).getInt(1500);
cobaltsRarity = config.get("Worldgen", "Cobalt Surface Rarity", 2000).getInt(2000);
ironBushDensity = config.get("Worldgen", "Iron Bush Density", 1).getInt(1);
goldBushDensity = config.get("Worldgen", "Gold Bush Density", 1).getInt(1);
@ -211,12 +211,12 @@ public class PHConstruct
aluminumBushDensity = config.get("Worldgen", "Aluminum Bush Density", 2).getInt(2);
silverBushDensity = config.get("Worldgen", "Silver Bush Density", 1).getInt(1);
ironBushRarity = config.get("Worldgen", "Iron Bush Rarity", 2).getInt(2);
goldBushRarity = config.get("Worldgen", "Gold Bush Rarity", 4).getInt(4);
copperBushRarity = config.get("Worldgen", "Copper Bush Rarity", 1).getInt(1);
tinBushRarity = config.get("Worldgen", "Tin Bush Rarity", 1).getInt(1);
aluminumBushRarity = config.get("Worldgen", "Aluminum Bush Rarity", 1).getInt(1);
silverBushRarity = config.get("Worldgen", "Silver Bush Rarity", 2).getInt(2);
ironBushRarity = config.get("Worldgen", "Iron Bush Rarity", 5).getInt(5);
goldBushRarity = config.get("Worldgen", "Gold Bush Rarity", 8).getInt(8);
copperBushRarity = config.get("Worldgen", "Copper Bush Rarity", 3).getInt(3);
tinBushRarity = config.get("Worldgen", "Tin Bush Rarity", 3).getInt(3);
aluminumBushRarity = config.get("Worldgen", "Aluminum Bush Rarity", 2).getInt(2);
silverBushRarity = config.get("Worldgen", "Silver Bush Rarity", 8).getInt(8);
copperBushMinY = config.get("Worldgen", "Copper Bush Min Y", 20).getInt(20);
copperBushMaxY = config.get("Worldgen", "Copper Bush Max Y", 60).getInt(60);

BIN
mods/tinker/textures/items/unstable_heart.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 407 B

2
test/XinStick.java
View File

@ -37,7 +37,7 @@ public class XinStick extends Item
spawnEntity(player.posX, player.posY+1, player.posZ, creeper, world, player);
spawnEntity(player.posX, player.posY+1, player.posZ, pig, world, player);
creeper.mountEntity(pig);*/
spawnEntity(player.posX, player.posY+1, player.posZ, new SlimeClone(world, player.username), world, player);
spawnEntity(player.posX, player.posY+1, player.posZ, new SlimeClone(world, "Etho"), world, player);
//System.out.println("Health! "+player.getHealth());
//healPlayer(player);
//removeChunk(world, player.posX, player.posZ);