moar fixy thingies

This commit is contained in:
Progwml6 committed 2014-01-30 20:34:22 -05:00
1 parent 4326ff3c64
commit bb98f77de4
26 files changed
+173 -139

No files matched your search

@@ -42,7 +42,7 @@ public class ConveyorBase extends MantleBlock
}
@Override
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
public void func_149670_a (World world, int x, int y, int z, Entity entity)
{
if (!world.isBlockIndirectlyGettingPowered(x, y, z))
{
@@ -94,7 +94,7 @@ public class ConveyorBase extends MantleBlock
}
@Override
public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack)
public void func_149689_a (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack)
{
int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) + (entity.isSneaking() ? 4 : 0) & 7;
int meta = world.getBlockMetadata(x, y, z) & 8;
@@ -94,9 +94,9 @@ public class EquipBlock extends InventoryBlock
}
}
public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack)
public void func_149689_a (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack)
{
super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack);
super.func_149689_a(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack);
int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
int newMeta = 0;
@@ -120,7 +120,7 @@ public class EquipBlock extends InventoryBlock
}
@Override
public void breakBlock (World par1World, int x, int y, int z, int par5, int meta)
public void func_149749_a (World par1World, int x, int y, int z, int par5, int meta)
{
TileEntity te = par1World.getBlockTileEntity(x, y, z);
@@ -165,7 +165,7 @@ public class EquipBlock extends InventoryBlock
}
}
super.breakBlock(par1World, x, y, z, par5, meta);
super.func_149749_a(par1World, x, y, z, par5, meta);
}
public int getLightValue (IBlockAccess world, int x, int y, int z)
@@ -17,7 +17,7 @@ public class GlueBlock extends TConstructBlock {
}
@Override
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
public void func_149670_a (World world, int x, int y, int z, Entity entity)
{
entity.motionX *= 0.1;
entity.motionZ *= 0.1;
@@ -303,7 +303,7 @@ public class LavaTankBlock extends BlockContainer
}
@Override
public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase living, ItemStack stack)
public void func_149689_a (World world, int x, int y, int z, EntityLivingBase living, ItemStack stack)
{
if (stack.hasTagCompound())
{
@@ -8,6 +8,7 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
public class StencilTableLogic extends InventoryLogic implements ISidedInventory
@@ -120,4 +121,16 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory
{
return false;
}
@Override
public String func_145825_b ()
{
return StatCollector.translateToLocal("toolstation.PatternShaper");
}
@Override
public boolean func_145818_k_ ()
{
return true;
}
}
@@ -193,5 +193,17 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag);
}
@Override
public String func_145825_b ()
{
return this.func_145825_b();
}
@Override
public boolean func_145818_k_ ()
{
return false;
}
}
@@ -41,7 +41,7 @@ public class SlimeGel extends TConstructBlock
}
@Override
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
public void func_149670_a (World world, int x, int y, int z, Entity entity)
{
if (entity.motionY < 0)
{
@@ -91,8 +91,8 @@ public class BarricadeBlock extends MantleBlock
if (meta % 4 != 3)
{
world.func_147465_d(x, y, z, this, meta + 1, 3);
this.onBlockPlacedBy(world, x, y, z, player, stack);
this.onPostBlockPlaced(world, x, y, z, meta);
this.func_149689_a(world, x, y, z, player, stack);
this.func_149714_e(world, x, y, z, meta);
Block var9 = this;
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.field_149762_H.getStepSound(), (var9.field_149762_H.getVolume() + 1.0F) / 2.0F, var9.field_149762_H.getPitch() * 0.8F);
@@ -234,11 +234,11 @@ public class Landmine extends MantleBlock
{
if (par6 > 0)
{
par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this);
par1World.notifyBlocksOfNeighborChange(par2, par3 - 1, par4, this);
par1World.func_147459_d(par2, par3, par4, this);
par1World.func_147459_d(par2, par3 - 1, par4, this);
}
super.breakBlock(par1World, par2, par3, par4, par5, par6);
super.func_149749_a(par1World, par2, par3, par4, par5, par6);
}
/**
@@ -34,7 +34,7 @@ public class Punji extends MantleBlock
}
@Override
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
public void func_149670_a (World world, int x, int y, int z, Entity entity)
{
if (entity instanceof EntityLivingBase)
{
@@ -279,7 +279,7 @@ public abstract class NewContainerGui extends GuiScreen
while (iterator.hasNext())
{
String s = (String) iterator.next();
int l = this.field_146289_q.getStringfield_146294_l(s);
int l = this.field_146289_q.getStringWidth(s);
if (l > k)
{
@@ -492,7 +492,7 @@ public abstract class NewContainerGui extends GuiScreen
protected void mouseClicked (int mouseX, int mouseY, int mouseButton)
{
super.mouseClicked(mouseX, mouseY, mouseButton);
boolean flag = mouseButton == this.field_146297_k.gameSettings.keyBindPickBlock.keyCode + 100;
boolean flag = mouseButton == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100;
Slot slot = this.getSlotAtPosition(mouseX, mouseY);
long l = Minecraft.getSystemTime();
this.field_94074_J = this.field_94072_H == slot && l - this.field_94070_G < 250L && this.field_94073_I == mouseButton;
@@ -517,7 +517,7 @@ public abstract class NewContainerGui extends GuiScreen
if (this.field_146297_k.gameSettings.touchscreen && flag1 && this.field_146297_k.thePlayer.inventory.getItemStack() == null)
{
this.field_146297_k.displayGuiScreen((GuiScreen) null);
this.field_146297_k.func_147108_a((GuiScreen) null);
return;
}
@@ -540,7 +540,7 @@ public abstract class NewContainerGui extends GuiScreen
{
if (this.field_146297_k.thePlayer.inventory.getItemStack() == null)
{
if (mouseButton == this.field_146297_k.gameSettings.keyBindPickBlock.keyCode + 100)
if (mouseButton == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100)
{
this.handleMouseClick(slot, k1, mouseButton, 3);
}
@@ -662,7 +662,7 @@ public abstract class NewContainerGui extends GuiScreen
if (this.field_94074_J && slot != null && par3 == 0 && this.container.func_94530_a((ItemStack) null, slot))
{
if (isShiftKeyDown())
if (func_146272_n())
{
if (slot != null && slot.inventory != null && this.field_94075_K != null)
{
@@ -764,7 +764,7 @@ public abstract class NewContainerGui extends GuiScreen
}
else if (this.field_146297_k.thePlayer.inventory.getItemStack() != null)
{
if (par3 == this.field_146297_k.gameSettings.keyBindPickBlock.keyCode + 100)
if (par3 == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100)
{
this.handleMouseClick(slot, j1, par3, 3);
}
@@ -830,7 +830,7 @@ public abstract class NewContainerGui extends GuiScreen
*/
protected void keyTyped (char par1, int par2)
{
if (par2 == 1 || par2 == this.field_146297_k.gameSettings.field_151445_Q.keyCode)
if (par2 == 1 || par2 == this.field_146297_k.gameSettings.field_151445_Q.func_151463_i())
{
this.field_146297_k.thePlayer.closeScreen();
}
@@ -839,13 +839,13 @@ public abstract class NewContainerGui extends GuiScreen
if (this.mainSlot != null && this.mainSlot.getHasStack())
{
if (par2 == this.field_146297_k.gameSettings.keyBindPickBlock.keyCode)
if (par2 == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i())
{
this.handleMouseClick(this.mainSlot, this.mainSlot.slotNumber, 0, 3);
}
else if (par2 == this.field_146297_k.gameSettings.keyBindDrop.keyCode)
else if (par2 == this.field_146297_k.gameSettings.keyBindDrop.func_151463_i())
{
this.handleMouseClick(this.mainSlot, this.mainSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4);
this.handleMouseClick(this.mainSlot, this.mainSlot.slotNumber, func_146271_m() ? 1 : 0, 4);
}
}
}
@@ -199,7 +199,7 @@ public class PartCrafterGui extends NewContainerGui
@Override
protected void mouseClicked (int mouseX, int mouseY, int clickNum)
{
boolean flag = clickNum == this.field_146297_k.gameSettings.keyBindPickBlock.keyCode + 100;
boolean flag = clickNum == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100;
Slot slot = this.getSlotAtPosition(mouseX, mouseY);
long l = Minecraft.getSystemTime();
this.field_94074_J = this.field_94072_H == slot && l - this.field_94070_G < 250L && this.field_94073_I == clickNum;
@@ -249,7 +249,7 @@ public class PartCrafterGui extends NewContainerGui
{
if (this.field_146297_k.thePlayer.inventory.getItemStack() == null)
{
if (clickNum == this.field_146297_k.gameSettings.keyBindPickBlock.keyCode + 100)
if (clickNum == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100)
{
this.handleMouseClick(slot, k1, clickNum, 3);
}
@@ -464,7 +464,7 @@ public class ToolStationGui extends NewContainerGui
protected void keyTyped (char par1, int keyCode)
{
if (keyCode == 1 || (!active && keyCode == this.field_146297_k.gameSettings.field_151445_Q.keyCode))
if (keyCode == 1 || (!active && keyCode == this.field_146297_k.gameSettings.field_151445_Q.func_151463_i()))
{
logic.setToolname("");
updateServer("");
+18 -27
View File
@@ -133,8 +133,7 @@ public class TContent implements IFuelHandler
TRepo.tankAir = new TankAirBlock(Material.field_151584_j).func_149722_s().func_149663_c("tconstruct.tank.air");
//Traps
TRepo.landmine = new BlockLandmine().func_149711_c(0.5F).func_149752_b(0F).func_149672_a(Block.field_149777_j).func_149647_a(CreativeTabs.tabRedstone)
.func_149663_c("landmine");
TRepo.landmine = new BlockLandmine().func_149711_c(0.5F).func_149752_b(0F).func_149672_a(Block.field_149777_j).func_149647_a(CreativeTabs.tabRedstone).func_149663_c("landmine");
TRepo.punji = new Punji().func_149663_c("trap.punji");
TRepo.barricadeOak = new BarricadeBlock(Blocks.log, 0).func_149663_c("trap.barricade.oak");
TRepo.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).func_149663_c("trap.barricade.spruce");
@@ -353,8 +352,7 @@ public class TContent implements IFuelHandler
TRepo.blueSlimeFluid = new Fluid("slime.blue");
if (!FluidRegistry.registerFluid(TRepo.blueSlimeFluid))
TRepo.blueSlimeFluid = FluidRegistry.getFluid("slime.blue");
TRepo.slimePool = new SlimeFluid(TRepo.blueSlimeFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep)
.func_149663_c("liquid.slime");
TRepo.slimePool = new SlimeFluid(TRepo.blueSlimeFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep).func_149663_c("liquid.slime");
GameRegistry.registerBlock(TRepo.slimePool, "liquid.slime");
TRepo.blueSlimeFluid.setBlock(TRepo.slimePool);
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.blueSlimeFluid, 1000), new ItemStack(TRepo.buckets, 1, 24), new ItemStack(Items.bucket)));
@@ -363,8 +361,7 @@ public class TContent implements IFuelHandler
TRepo.glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200);
if (!FluidRegistry.registerFluid(TRepo.glueFluid))
TRepo.glueFluid = FluidRegistry.getFluid("glue");
TRepo.glueFluidBlock = new GlueFluid(TRepo.glueFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep)
.func_149663_c("liquid.glue");
TRepo.glueFluidBlock = new GlueFluid(TRepo.glueFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep).func_149663_c("liquid.glue");
GameRegistry.registerBlock(TRepo.glueFluidBlock, "liquid.glue");
TRepo.glueFluid.setBlock(TRepo.glueFluidBlock);
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.glueFluid, 1000), new ItemStack(TRepo.buckets, 1, 26), new ItemStack(Items.bucket)));
@@ -401,8 +398,7 @@ public class TContent implements IFuelHandler
String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" };
TRepo.oreBerry = (OreberryBush) new OreberryBush(berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).func_149663_c("ore.berries.one");
String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" };
TRepo.oreBerrySecond = (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" })
.func_149663_c("ore.berries.two");
TRepo.oreBerrySecond = (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).func_149663_c("ore.berries.two");
String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" };
TRepo.oreSlag = new MetalOre(Material.field_151576_e, 10.0F, oreTypes).func_149663_c("tconstruct.stoneore");
@@ -426,8 +422,8 @@ public class TContent implements IFuelHandler
TRepo.clearGlass = new GlassBlockConnected("clear", false).func_149663_c("GlassBlock");
TRepo.clearGlass.field_149762_H = Block.field_149778_k;
TRepo.glassPane = new GlassPaneConnected("clear", false);
TRepo.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray",
"light_gray", "cyan", "purple", "blue", "brown", "green", "red", "black").func_149663_c("GlassBlock.StainedClear");
TRepo.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue",
"brown", "green", "red", "black").func_149663_c("GlassBlock.StainedClear");
TRepo.stainedGlassClear.field_149762_H = Block.field_149778_k;
TRepo.stainedGlassClearPane = new GlassPaneStained();
@@ -837,22 +833,17 @@ public class TContent implements IFuelHandler
{
HashMap<String, Achievement> achievements = TAchievements.achievements;
achievements.put("tconstruct.beginner", new Achievement("" + 2741, "tconstruct.beginner", 0, 0, TRepo.manualBook, null).setIndependent() );
achievements.put("tconstruct.pattern", new Achievement("" + 2742, "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct.beginner")) );
achievements.put("tconstruct.tinkerer",
new Achievement("" + 2743, "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct.pattern")) );
achievements.put("tconstruct.preparedFight",
new Achievement("" + 2744, "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")));
achievements.put("tconstruct.proTinkerer", new Achievement("" + 2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial()
);
achievements.put("tconstruct.smelteryMaker", new Achievement("" + 2746, "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct.beginner")) );
achievements.put("tconstruct.enemySlayer",
new Achievement("" + 2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")) );
achievements.put("tconstruct.dualConvenience", new Achievement("" + 2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer"))
.setSpecial() );
achievements.put("tconstruct.doingItWrong",
new Achievement("" + 2749, "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct.smelteryMaker")) );
achievements.put("tconstruct.betterCrafting",
new Achievement("" + 2750, "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct.beginner")) );
achievements.put("tconstruct.beginner", new Achievement("" + 2741, "tconstruct.beginner", 0, 0, TRepo.manualBook, null).setIndependent());
achievements.put("tconstruct.pattern", new Achievement("" + 2742, "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct.beginner")));
achievements.put("tconstruct.tinkerer", new Achievement("" + 2743, "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct.pattern")));
achievements.put("tconstruct.preparedFight", new Achievement("" + 2744, "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")));
achievements.put("tconstruct.proTinkerer",
new Achievement("" + 2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial());
achievements.put("tconstruct.smelteryMaker", new Achievement("" + 2746, "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct.beginner")));
achievements.put("tconstruct.enemySlayer", new Achievement("" + 2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")));
achievements.put("tconstruct.dualConvenience",
new Achievement("" + 2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")).setSpecial());
achievements.put("tconstruct.doingItWrong", new Achievement("" + 2749, "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct.smelteryMaker")));
achievements.put("tconstruct.betterCrafting", new Achievement("" + 2750, "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct.beginner")));
}
}
@@ -36,7 +36,8 @@ public class Knapsack extends CraftingItem
}
}
@Override
//TODO feel fix this so that stuff ticks in backpacks
/*@Override
public void onArmorTickUpdate (World world, EntityPlayer player, ItemStack itemStack)
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
@@ -52,6 +53,6 @@ public class Knapsack extends CraftingItem
}
}
}
}
}*/
}
@@ -64,9 +64,9 @@ public class ItemBlockLandmine extends ItemBlock
return false;
}
if (world.getBlock(x, y, z) == TRepo.landmine)
if (world.func_147439_a(x, y, z) == TRepo.landmine)
{
TRepo.landmine.onBlockPlacedBy(world, x, y, z, player, stack);
TRepo.landmine.func_149689_a(world, x, y, z, player, stack);
TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z);
if (te == null)
@@ -77,7 +77,7 @@ public class ItemBlockLandmine extends ItemBlock
te.triggerType = stack.getItemDamage();
world.setBlockTileEntity(x, y, z, te);
TRepo.landmine.onPostBlockPlaced(world, x, y, z, metadata);
TRepo.landmine.func_149714_e(world, x, y, z, metadata);
}
return true;
@@ -293,7 +293,7 @@ public class Hammer extends HarvestTool
Block localBlock = world.func_147439_a(xPos, yPos, zPos);
int localMeta = world.getBlockMetadata(xPos, yPos, zPos);
int hlvl = MinecraftForge.getBlockHarvestLevel(localBlock, meta, getHarvestType());
float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.getBlockHardness(world, xPos, yPos, zPos);
float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.func_149712_f(world, xPos, yPos, zPos);
if (hlvl <= toolLevel && localHardness - 1.5 <= blockHardness)
{
@@ -42,7 +42,7 @@ public class Hatchet extends HarvestTool
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
}
static Material[] materials = { Material.field_151575_d, Material.field_151584_j, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A, Material.pumpkin };
static Material[] materials = { Material.field_151575_d, Material.field_151584_j, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A};//TODO find this//, Material.pumpkin };
@Override
public Item getHeadItem ()
@@ -63,7 +63,7 @@ public class LumberAxe extends HarvestTool
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
}
static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A, Material.pumpkin };
static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A};//TODO find this//, Material.pumpkin };
/* Lumber axe specific */
@@ -47,7 +47,7 @@ public class Mattock extends DualHarvestTool
return "shovel";
}
static Material[] axeMaterials = { Material.field_151575_d, Material.field_151570_A, Material.pumpkin, Material.field_151585_k, Material.field_151582_l };
static Material[] axeMaterials = { Material.field_151575_d, Material.field_151570_A};//TODO find this//, Material.pumpkin, Material.field_151585_k, Material.field_151582_l };
static Material[] shovelMaterials = { Material.field_151577_b, Material.field_151578_c, Material.field_151571_B };
@Override
@@ -40,7 +40,7 @@ public class Scythe extends Weapon
return materials;
}
static Material[] materials = new Material[] { Material.field_151569_G, Material.field_151570_A, Material.pumpkin, Material.field_151585_k, Material.field_151582_l, Material.field_151584_j };
static Material[] materials = new Material[] { Material.field_151569_G, Material.field_151570_A};//TODO find this//, Material.pumpkin, Material.field_151585_k, Material.field_151582_l, Material.field_151584_j };
@Override
public Item getHeadItem ()
@@ -506,7 +506,7 @@ public class AbilityHelper
{
Block block = Blocks.tilledField;
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.getfield_149762_H(),
(block.field_149762_H.getVolume() + 1.0F) / 2.0F, block.field_149762_H.getPitch() * 0.8F);
(block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.getPitch() * 0.8F);
if (world.isRemote)
{
@@ -50,7 +50,7 @@ public abstract class HarvestTool extends ToolCore
{
WorldHelper.setBlockToAir(world, x, y, z);
if (!player.capabilities.isCreativeMode)
onBlockDestroyed(stack, world, block, x, y, z, player);
func_150894_a(stack, world, block, x, y, z, player);
if (!world.isRemote)
world.playAuxSFX(2001, x, y, z, block.getBlockID() + (meta << 12));
return true;
@@ -25,9 +25,10 @@ import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.relauncher.Side;
public class TPacketHandler implements IPacketHandler
public class TPacketHandler// implements IPacketHandler
{
//1.7 uses netty... commenting this out as it might be needed for reference updating to new packets
/*
@Override
public void onPacketData (NetworkManager manager, Packet250CustomPayload packet, Player player)
{
@@ -182,5 +183,5 @@ public class TPacketHandler implements IPacketHandler
return (Entity) o;
}
return null;
}
}*/
}
@@ -7,14 +7,16 @@ import tconstruct.TConstruct;
import tconstruct.common.TRepo;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraft.world.gen.structure.MapGenStructureIO;
import net.minecraft.world.gen.structure.MapGenVillage;
import net.minecraft.world.gen.structure.StructureBoundingBox;
import net.minecraft.world.gen.structure.StructureComponent;
import net.minecraft.world.gen.structure.StructureVillagePieces;
import net.minecraft.world.gen.structure.StructureVillagePieces.Start;
public class ComponentSmeltery extends MapGenVillage
public class ComponentSmeltery extends StructureComponent
{
private int averageGroundLevel = -1;
@@ -59,18 +61,18 @@ public class ComponentSmeltery extends MapGenVillage
* maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace)
*/
this.fillWithBlocks(world, sbb, 1, 0, 0, 7, 0, 6, Blocks.stonebrick, Blocks.stonebrick, false); //Base
this.fillWithBlocks(world, sbb, 0, 0, 1, 0, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false);
this.fillWithBlocks(world, sbb, 8, 0, 1, 8, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false);
this.fillWithBlocks(world, sbb, 0, 1, 0, 9, 3, 7, 0, 0, false);
this.func_151549_a(world, sbb, 1, 0, 0, 7, 0, 6, Blocks.stonebrick, Blocks.stonebrick, false); //Base
this.func_151549_a(world, sbb, 0, 0, 1, 0, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false);
this.func_151549_a(world, sbb, 8, 0, 1, 8, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false);
this.func_151549_a(world, sbb, 0, 1, 0, 9, 3, 7, Blocks.air, Blocks.air, false);
this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TRepo.smeltery, 2, TRepo.smeltery, 2, false); //Basin
this.fillWithBlocks(world, sbb, 3, 1, 2, 5, 2, 4, 0, 0, false);
this.func_151549_a(world, sbb, 3, 1, 2, 5, 2, 4, Blocks.air, Blocks.air, false);
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 0, 1, 1, 2, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 2, 1, 1, 4, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 0, 7, 1, 2, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 2, 7, 1, 4, sbb);
this.func_151550_a(world, TRepo.searedBlock, 0, 1, 1, 2, sbb);
this.func_151550_a(world, TRepo.searedBlock, 2, 1, 1, 4, sbb);
this.func_151550_a(world, TRepo.searedBlock, 0, 7, 1, 2, sbb);
this.func_151550_a(world, TRepo.searedBlock, 2, 7, 1, 4, sbb);
for (int l = 1; l < 6; ++l)
{
@@ -119,4 +121,18 @@ public class ComponentSmeltery extends MapGenVillage
int l2 = this.getBiomeSpecificBlockMetadata(replaceBlockID, replaceBlockMeta);
super.fillWithMetadataBlocks(par1World, par2StructureBoundingBox, minX, minY, minZ, maxX, maxY, maxZ, i2, j2, k2, l2, alwaysReplace);
}
@Override
protected void func_143012_a (NBTTagCompound var1)
{
// TODO Auto-generated method stub
}
@Override
protected void func_143011_b (NBTTagCompound var1)
{
// TODO Auto-generated method stub
}
}
@@ -18,7 +18,7 @@ import net.minecraft.world.gen.structure.StructureVillagePieces.Start;
import net.minecraft.world.gen.structure.MapGenStructureIO;
public class ComponentToolWorkshop extends MapGenVillage
public class ComponentToolWorkshop extends StructureComponent
{
private int averageGroundLevel = -1;
@@ -63,81 +63,81 @@ public class ComponentToolWorkshop extends MapGenVillage
* maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace)
*/
this.fillWithBlocks(world, sbb, 0, 0, 0, 6, 0, 6, Blocks.cobblestone, Blocks.cobblestone, false); //Base
this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.fence, Blocks.fence, false);
this.fillWithBlocks(world, sbb, 1, 0, 1, 5, 0, 5, Blocks.planks, Blocks.planks, false);
this.fillWithBlocks(world, sbb, 2, 0, 2, 4, 0, 4, Blocks.wool, Blocks.wool, false);
this.func_151549_a(world, sbb, 0, 0, 0, 6, 0, 6, Blocks.cobblestone, Blocks.cobblestone, false); //Base
this.func_151549_a(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.fence, Blocks.fence, false);
this.func_151549_a(world, sbb, 1, 0, 1, 5, 0, 5, Blocks.planks, Blocks.planks, false);
this.func_151549_a(world, sbb, 2, 0, 2, 4, 0, 4, Blocks.wool, Blocks.wool, false);
//this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.log, Blocks.log, false);
//this.func_151549_a(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.log, Blocks.log, false);
this.fillWithBlocks(world, sbb, 0, 1, 0, 0, 4, 0, Blocks.log, Blocks.log, false); //Edges
this.fillWithBlocks(world, sbb, 0, 1, 6, 0, 4, 6, Blocks.log, Blocks.log, false);
this.fillWithBlocks(world, sbb, 6, 1, 0, 6, 4, 0, Blocks.log, Blocks.log, false);
this.fillWithBlocks(world, sbb, 6, 1, 6, 6, 4, 6, Blocks.log, Blocks.log, false);
this.func_151549_a(world, sbb, 0, 1, 0, 0, 4, 0, Blocks.log, Blocks.log, false); //Edges
this.func_151549_a(world, sbb, 0, 1, 6, 0, 4, 6, Blocks.log, Blocks.log, false);
this.func_151549_a(world, sbb, 6, 1, 0, 6, 4, 0, Blocks.log, Blocks.log, false);
this.func_151549_a(world, sbb, 6, 1, 6, 6, 4, 6, Blocks.log, Blocks.log, false);
this.fillWithBlocks(world, sbb, 0, 1, 1, 0, 1, 5, Blocks.planks, Blocks.planks, false); //Walls
this.fillWithBlocks(world, sbb, 1, 1, 0, 5, 1, 0, Blocks.planks, Blocks.planks, false);
this.fillWithBlocks(world, sbb, 6, 1, 1, 6, 1, 5, Blocks.planks, Blocks.planks, false);
this.fillWithBlocks(world, sbb, 1, 1, 6, 5, 1, 6, Blocks.planks, Blocks.planks, false);
this.func_151549_a(world, sbb, 0, 1, 1, 0, 1, 5, Blocks.planks, Blocks.planks, false); //Walls
this.func_151549_a(world, sbb, 1, 1, 0, 5, 1, 0, Blocks.planks, Blocks.planks, false);
this.func_151549_a(world, sbb, 6, 1, 1, 6, 1, 5, Blocks.planks, Blocks.planks, false);
this.func_151549_a(world, sbb, 1, 1, 6, 5, 1, 6, Blocks.planks, Blocks.planks, false);
this.fillWithBlocks(world, sbb, 0, 3, 1, 0, 3, 5, Blocks.planks, Blocks.planks, false);
this.fillWithBlocks(world, sbb, 1, 3, 0, 5, 3, 0, Blocks.planks, Blocks.planks, false);
this.fillWithBlocks(world, sbb, 6, 3, 1, 6, 3, 5, Blocks.planks, Blocks.planks, false);
this.fillWithBlocks(world, sbb, 1, 3, 6, 5, 3, 6, Blocks.planks, Blocks.planks, false);
this.func_151549_a(world, sbb, 0, 3, 1, 0, 3, 5, Blocks.planks, Blocks.planks, false);
this.func_151549_a(world, sbb, 1, 3, 0, 5, 3, 0, Blocks.planks, Blocks.planks, false);
this.func_151549_a(world, sbb, 6, 3, 1, 6, 3, 5, Blocks.planks, Blocks.planks, false);
this.func_151549_a(world, sbb, 1, 3, 6, 5, 3, 6, Blocks.planks, Blocks.planks, false);
this.fillWithBlocks(world, sbb, 0, 4, 1, 0, 4, 5, Blocks.log, Blocks.log, false);
this.fillWithBlocks(world, sbb, 1, 4, 0, 5, 4, 0, Blocks.log, Blocks.log, false);
this.fillWithBlocks(world, sbb, 6, 4, 1, 6, 4, 5, Blocks.log, Blocks.log, false);
this.fillWithBlocks(world, sbb, 1, 4, 6, 5, 4, 6, Blocks.log, Blocks.log, false);
this.func_151549_a(world, sbb, 0, 4, 1, 0, 4, 5, Blocks.log, Blocks.log, false);
this.func_151549_a(world, sbb, 1, 4, 0, 5, 4, 0, Blocks.log, Blocks.log, false);
this.func_151549_a(world, sbb, 6, 4, 1, 6, 4, 5, Blocks.log, Blocks.log, false);
this.func_151549_a(world, sbb, 1, 4, 6, 5, 4, 6, Blocks.log, Blocks.log, false);
this.fillWithBlocks(world, sbb, 1, 1, 1, 5, 5, 5, 0, 0, false);
this.fillWithBlocks(world, sbb, 1, 4, 1, 5, 4, 5, Blocks.planks, Blocks.planks, false);
this.func_151549_a(world, sbb, 1, 1, 1, 5, 5, 5, Blocks.air, Blocks.air, false);
this.func_151549_a(world, sbb, 1, 4, 1, 5, 4, 5, Blocks.planks, Blocks.planks, false);
//world, blockID, metadata, x, y, z, bounds
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 1, 2, 0, sbb);//Glass and door
this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 2, 2, 0, sbb);
this.placeDoorAtCurrentPosition(world, sbb, random, 3, 1, 0, this.getMetadataWithOffset(Blocks.wooden_door, 1));
this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 4, 2, 0, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 5, 2, 0, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 1, 2, 0, sbb);//Glass and door
this.func_151550_a(world, Blocks.planks, 0, 2, 2, 0, sbb);
this.placeDoorAtCurrentPosition(world, sbb, random, 3, 1, 0, this.func_151555_a(Blocks.wooden_door, 1));
this.func_151550_a(world, Blocks.planks, 0, 4, 2, 0, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 5, 2, 0, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 1, 2, 6, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 2, 2, 6, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 3, 2, 6, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 4, 2, 6, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 5, 2, 6, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 1, 2, 6, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 2, 2, 6, sbb);
this.func_151550_a(world, Blocks.planks, 0, 3, 2, 6, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 4, 2, 6, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 5, 2, 6, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 1, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 2, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 0, 2, 3, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 4, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 5, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 0, 2, 1, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 0, 2, 2, sbb);
this.func_151550_a(world, Blocks.planks, 0, 0, 2, 3, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 0, 2, 4, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 0, 2, 5, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 1, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 2, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 6, 2, 3, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 4, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 5, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 6, 2, 1, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 6, 2, 2, sbb);
this.func_151550_a(world, Blocks.planks, 0, 6, 2, 3, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 6, 2, 4, sbb);
this.func_151550_a(world, Blocks.glass_pane, 0, 6, 2, 5, sbb);
int i = this.getMetadataWithOffset(Blocks.ladder, 3); //Ladders
this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 1, 5, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 2, 5, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 3, 5, sbb);
this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 4, 5, sbb);
int i = this.func_151555_a(Blocks.ladder, 3); //Ladders
this.func_151550_a(world, Blocks.ladder, i, 3, 1, 5, sbb);
this.func_151550_a(world, Blocks.ladder, i, 3, 2, 5, sbb);
this.func_151550_a(world, Blocks.ladder, i, 3, 3, 5, sbb);
this.func_151550_a(world, Blocks.ladder, i, 3, 4, 5, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 0, 1, 1, 1, sbb); //Inside
this.func_151550_a(world, TRepo.toolStationWood, 0, 1, 1, 1, sbb); //Inside
this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TRepo.tinkerHousePatterns.getItems(random), TRepo.tinkerHousePatterns.getCount(random));
//this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 5, 1, 1, 2, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 1, 1, 1, 3, sbb);
//this.func_151550_a(world, TRepo.toolStationWood, 5, 1, 1, 2, sbb);
this.func_151550_a(world, TRepo.toolStationWood, 1, 1, 1, 3, sbb);
this.generateStructureCraftingStationContents(world, sbb, random, 1, 1, 4, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random));
// this.placeBlockAtCurrentPosition(world, TRepo.craftingStationWood, 0, 1, 1, 4, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 10, 1, 1, 5, sbb);
// this.func_151550_a(world, TRepo.craftingStationWood, 0, 1, 1, 4, sbb);
this.func_151550_a(world, TRepo.toolStationWood, 10, 1, 1, 5, sbb);
//ChestGenHooks info = ChestGenHooks.getInfo("TinkerHouse");
this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random));
//this.placeBlockAtCurrentPosition(world, Block.chest, i, 4, 1, 5, sbb);
i = this.getMetadataWithOffset(Blocks.piston, 3);
this.placeBlockAtCurrentPosition(world, Blocks.piston, i, 5, 1, 5, sbb);
//this.func_151550_a(world, Block.chest, i, 4, 1, 5, sbb);
i = this.func_151555_a(Blocks.piston, 3);
this.func_151550_a(world, Blocks.piston, i, 5, 1, 5, sbb);
for (int l = 0; l < 6; ++l)
{
@@ -159,7 +159,7 @@ public class ComponentToolWorkshop extends MapGenVillage
int posY = this.getYWithOffset(y);
int posZ = this.getZWithOffset(x, z);
if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlock(posX, posY, posZ) != Blocks.chest)
if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.func_147439_a(posX, posY, posZ) != Blocks.chest)
{
world.func_147465_d(posX, posY, posZ, TRepo.craftingStationWood, 5, 2);
CraftingStationLogic logic = (CraftingStationLogic) world.func_147438_o(posX, posY, posZ);
@@ -183,7 +183,7 @@ public class ComponentToolWorkshop extends MapGenVillage
int posY = this.getYWithOffset(y);
int posZ = this.getZWithOffset(x, z);
if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlock(posX, posY, posZ) != Blocks.chest)
if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.func_147439_a(posX, posY, posZ) != Blocks.chest)
{
world.func_147465_d(posX, posY, posZ, TRepo.toolStationWood, 5, 2);
PatternChestLogic logic = (PatternChestLogic) world.func_147438_o(posX, posY, posZ);