mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-18 19:39:12 +00:00
run repo through formatter
This commit is contained in:
1 parent
5585d680a3
commit
ffaea7d4b7
140 files changed
+1050
-892
No files matched your search
@@ -59,10 +59,10 @@ public class TConstruct
|
||||
|
||||
//The name of the enum is accompanied by numbers because I have no idea what will happen if another mod will try to add the same enum, just to be safe
|
||||
//public static EnumCreatureType creatureTypePlayer = EnumHelper.addCreatureType("PLAYER_5821443", EntityPlayer.class, 0, Material.air, true);
|
||||
|
||||
|
||||
//The packet pipeline
|
||||
public static final PacketPipeline packetPipeline = new PacketPipeline();
|
||||
|
||||
|
||||
public TConstruct()
|
||||
{
|
||||
LoggerConfig fml = new LoggerConfig(FMLCommonHandler.instance().getFMLLogger().getName(), Level.ALL, true);
|
||||
@@ -88,7 +88,7 @@ public class TConstruct
|
||||
@EventHandler
|
||||
public void preInit (FMLPreInitializationEvent event)
|
||||
{
|
||||
|
||||
|
||||
PHConstruct.initProps(event.getSuggestedConfigurationFile());
|
||||
TConstructRegistry.materialTab = new TabTools("TConstructMaterials");
|
||||
TConstructRegistry.toolTab = new TabTools("TConstructTools");
|
||||
@@ -99,7 +99,7 @@ public class TConstruct
|
||||
chiselDetailing = new Detailing();
|
||||
|
||||
content = new TContent();
|
||||
|
||||
|
||||
recipes = new TRecipes();
|
||||
|
||||
events = new TEventHandler();
|
||||
@@ -141,10 +141,10 @@ public class TConstruct
|
||||
playerTracker = new TPlayerHandler();
|
||||
//GameRegistry.registerPlayerTracker(playerTracker);
|
||||
FMLCommonHandler.instance().bus().register(playerTracker);
|
||||
|
||||
|
||||
if (event.getSide() == Side.CLIENT)
|
||||
{
|
||||
FMLCommonHandler.instance().bus().register(new TControls());
|
||||
FMLCommonHandler.instance().bus().register(new TControls());
|
||||
}
|
||||
|
||||
PluginController.getController().preInit();
|
||||
@@ -153,14 +153,14 @@ public class TConstruct
|
||||
@EventHandler
|
||||
public void init (FMLInitializationEvent event)
|
||||
{
|
||||
packetPipeline.initalise();
|
||||
packetPipeline.initalise();
|
||||
if (event.getSide() == Side.CLIENT)
|
||||
{
|
||||
//MinecraftForge.EVENT_BUS.register(new EventCloakRender());
|
||||
}
|
||||
|
||||
DimensionBlacklist.getBadBimensions();
|
||||
GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool,2), 2);
|
||||
GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool, 2), 2);
|
||||
|
||||
PluginController.getController().init();
|
||||
|
||||
|
||||
@@ -5,24 +5,27 @@ import net.minecraft.stats.Achievement;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraftforge.common.AchievementPage;
|
||||
|
||||
public class TAchievements {
|
||||
|
||||
//Add achievements in here before the load executes(end of TC's init event)
|
||||
public static HashMap<String, Achievement> achievements = new HashMap<String, Achievement>();
|
||||
|
||||
//Warning: Will be null until after the init stage
|
||||
public static AchievementPage achievementPage = null;
|
||||
|
||||
public static void init(){
|
||||
Achievement[] achs = new Achievement[achievements.values().size()];
|
||||
|
||||
for(int i = 0; i < achs.length; i++){
|
||||
achs[i] = (Achievement)achievements.values().toArray()[i];
|
||||
}
|
||||
|
||||
achievementPage = new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achs);
|
||||
|
||||
AchievementPage.registerAchievementPage(achievementPage);
|
||||
}
|
||||
|
||||
public class TAchievements
|
||||
{
|
||||
|
||||
//Add achievements in here before the load executes(end of TC's init event)
|
||||
public static HashMap<String, Achievement> achievements = new HashMap<String, Achievement>();
|
||||
|
||||
//Warning: Will be null until after the init stage
|
||||
public static AchievementPage achievementPage = null;
|
||||
|
||||
public static void init ()
|
||||
{
|
||||
Achievement[] achs = new Achievement[achievements.values().size()];
|
||||
|
||||
for (int i = 0; i < achs.length; i++)
|
||||
{
|
||||
achs[i] = (Achievement) achievements.values().toArray()[i];
|
||||
}
|
||||
|
||||
achievementPage = new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achs);
|
||||
|
||||
AchievementPage.registerAchievementPage(achievementPage);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -24,17 +24,17 @@ public class BlockFalling extends Block
|
||||
super(p_i45405_1_);
|
||||
}
|
||||
|
||||
public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
|
||||
public void onBlockAdded (World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
|
||||
{
|
||||
p_149726_1_.scheduleBlockUpdate(p_149726_2_, p_149726_3_, p_149726_4_, this, this.tickRate(p_149726_1_));
|
||||
}
|
||||
|
||||
public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
|
||||
public void onNeighborBlockChange (World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
|
||||
{
|
||||
p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, this.tickRate(p_149695_1_));
|
||||
}
|
||||
|
||||
public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
|
||||
public void updateTick (World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
|
||||
{
|
||||
if (!p_149674_1_.isRemote)
|
||||
{
|
||||
@@ -42,7 +42,7 @@ public class BlockFalling extends Block
|
||||
}
|
||||
}
|
||||
|
||||
private void func_149830_m(World p_149830_1_, int p_149830_2_, int p_149830_3_, int p_149830_4_)
|
||||
private void func_149830_m (World p_149830_1_, int p_149830_2_, int p_149830_3_, int p_149830_4_)
|
||||
{
|
||||
if (func_149831_e(p_149830_1_, p_149830_2_, p_149830_3_ - 1, p_149830_4_) && p_149830_3_ >= 0)
|
||||
{
|
||||
@@ -74,14 +74,16 @@ public class BlockFalling extends Block
|
||||
}
|
||||
}
|
||||
|
||||
protected void func_149829_a(EntityFallingBlock p_149829_1_) {}
|
||||
protected void func_149829_a (EntityFallingBlock p_149829_1_)
|
||||
{
|
||||
}
|
||||
|
||||
public int tickRate(World p_149738_1_)
|
||||
public int tickRate (World p_149738_1_)
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
|
||||
public static boolean func_149831_e(World p_149831_0_, int p_149831_1_, int p_149831_2_, int p_149831_3_)
|
||||
public static boolean func_149831_e (World p_149831_0_, int p_149831_1_, int p_149831_2_, int p_149831_3_)
|
||||
{
|
||||
Block block = p_149831_0_.getBlock(p_149831_1_, p_149831_2_, p_149831_3_);
|
||||
|
||||
@@ -98,9 +100,11 @@ public class BlockFalling extends Block
|
||||
//TODO: King, take a look here when doing liquids!
|
||||
//Material material = block.blockMaterial;
|
||||
//return material == Material.water ? true : material == Material.lava;
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public void func_149828_a(World p_149828_1_, int p_149828_2_, int p_149828_3_, int p_149828_4_, int p_149828_5_) {}
|
||||
public void func_149828_a (World p_149828_1_, int p_149828_2_, int p_149828_3_, int p_149828_4_, int p_149828_5_)
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -458,10 +458,10 @@ public class BlockLandmine extends BlockContainer
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static enum Sensitivity
|
||||
{
|
||||
everything, mobs, players;
|
||||
everything, mobs, players;
|
||||
}
|
||||
|
||||
protected int getMineState (World par1World, int par2, int par3, int par4)
|
||||
|
||||
@@ -15,13 +15,13 @@ public class BloodBlock extends TConstructFluid
|
||||
{
|
||||
super(fluid, material, texture);
|
||||
}
|
||||
|
||||
|
||||
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
|
||||
{
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20*15, 0));
|
||||
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 20*5, 1));
|
||||
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20 * 15, 0));
|
||||
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 20 * 5, 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -101,11 +101,11 @@ public class ConveyorBase extends MantleBlock
|
||||
world.setBlockMetadataWithNotify(x, y, z, face | meta, 2);
|
||||
}
|
||||
|
||||
public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
|
||||
public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
|
||||
{
|
||||
if (side == 1)
|
||||
return false;
|
||||
return super. shouldSideBeRendered(world, x, y, z, side);
|
||||
return super.shouldSideBeRendered(world, x, y, z, side);
|
||||
}
|
||||
|
||||
public IIcon[] icons;
|
||||
|
||||
@@ -101,10 +101,11 @@ public class CraftingStationBlock extends InventoryBlock
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World arg0, int arg1) {
|
||||
return new CraftingStationLogic();
|
||||
}
|
||||
@Override
|
||||
public TileEntity createNewTileEntity (World arg0, int arg1)
|
||||
{
|
||||
return new CraftingStationLogic();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity func_149915_a (World arg0, int arg1)
|
||||
|
||||
@@ -585,10 +585,10 @@ public class GlassBlockConnected extends MantleBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
{
|
||||
Block b = par1IBlockAccess.getBlock(par2, par3, par4);
|
||||
return b == (Block) this ? false : super. shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5);
|
||||
return b == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -31,10 +31,10 @@ public class GlassBlockStained extends TConstructBlock
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
|
||||
public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
|
||||
{
|
||||
Block block = world.getBlock(x, y, z);
|
||||
return block == this ? false : super. shouldSideBeRendered(world, x, y, z, side);
|
||||
return block == this ? false : super.shouldSideBeRendered(world, x, y, z, side);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -37,8 +37,8 @@ public class GlassPaneConnected extends GlassBlockConnected
|
||||
{
|
||||
if (par5 == 0 || par5 == 1)
|
||||
{
|
||||
return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15]
|
||||
: par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15] : getSideTextureIndex();
|
||||
return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15] : par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15]
|
||||
: getSideTextureIndex();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -10,11 +10,12 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class GlueBlock extends TConstructBlock {
|
||||
public class GlueBlock extends TConstructBlock
|
||||
{
|
||||
|
||||
public GlueBlock()
|
||||
{
|
||||
super(Material.ground, 4.0f, new String[]{"glue"});
|
||||
super(Material.ground, 4.0f, new String[] { "glue" });
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -23,19 +24,26 @@ public class GlueBlock extends TConstructBlock {
|
||||
entity.motionX *= 0.1;
|
||||
entity.motionZ *= 0.1;
|
||||
|
||||
if (entity instanceof EntityLivingBase) {
|
||||
EntityLivingBase lvb = (EntityLivingBase)entity;
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
EntityLivingBase lvb = (EntityLivingBase) entity;
|
||||
// Well you'd feel ill too standing on glue...
|
||||
if (lvb.isPotionActive(Potion.hunger)) {
|
||||
if (lvb.isPotionActive(Potion.hunger))
|
||||
{
|
||||
lvb.getActivePotionEffect(Potion.hunger).duration = 20;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4));
|
||||
}
|
||||
|
||||
// Glue is sticky stuff
|
||||
if (lvb.isPotionActive(Potion.moveSlowdown)) {
|
||||
if (lvb.isPotionActive(Potion.moveSlowdown))
|
||||
{
|
||||
lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,8 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.BlockFluidFinite;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class GlueFluid extends BlockFluidFinite {
|
||||
public class GlueFluid extends BlockFluidFinite
|
||||
{
|
||||
|
||||
IIcon stillIcon;
|
||||
IIcon flowIcon;
|
||||
@@ -41,23 +42,31 @@ public class GlueFluid extends BlockFluidFinite {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
|
||||
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
|
||||
{
|
||||
entity.motionX *= 0.1;
|
||||
entity.motionZ *= 0.1;
|
||||
|
||||
if (entity instanceof EntityLivingBase) {
|
||||
EntityLivingBase lvb = (EntityLivingBase)entity;
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
EntityLivingBase lvb = (EntityLivingBase) entity;
|
||||
// Well you'd feel ill too standing in glue...
|
||||
if (lvb.isPotionActive(Potion.hunger)) {
|
||||
if (lvb.isPotionActive(Potion.hunger))
|
||||
{
|
||||
lvb.getActivePotionEffect(Potion.hunger).duration = 20;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4));
|
||||
}
|
||||
|
||||
// Glue is sticky stuff
|
||||
if (lvb.isPotionActive(Potion.moveSlowdown)) {
|
||||
if (lvb.isPotionActive(Potion.moveSlowdown))
|
||||
{
|
||||
lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ public class LavaTankBlock extends BlockContainer
|
||||
//if (side == 0 && world.getBlockMetadata(x, y, z) == 0)
|
||||
//return super. shouldSideBeRendered(world, x, y, z, side);
|
||||
Block b = world.getBlock(x, y, z);
|
||||
return b == (Block)this ? false : super. shouldSideBeRendered(world, x, y, z, side);
|
||||
return b == (Block) this ? false : super.shouldSideBeRendered(world, x, y, z, side);
|
||||
//return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -172,17 +172,17 @@ public class MeatBlock extends BlockWood
|
||||
par3List.add(new ItemStack(b, 1, i));
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public boolean canSustainLeaves (World world, int x, int y, int z)
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean isWood (World world, int x, int y, int z)
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
// @Override
|
||||
// public boolean canSustainLeaves (World world, int x, int y, int z)
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean isWood (World world, int x, int y, int z)
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
|
||||
public boolean isBeaconBase (World worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ)
|
||||
{
|
||||
|
||||
@@ -110,6 +110,7 @@ public class MultiBrick extends TConstructBlock
|
||||
entity.fallDistance = 0;
|
||||
}
|
||||
}
|
||||
|
||||
//TODO getCollisionBoundingBoxFromPool
|
||||
@Override
|
||||
public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
|
||||
|
||||
@@ -22,6 +22,7 @@ public class MultiBrickFancy extends TConstructBlock
|
||||
{
|
||||
super(Material.rock, 3f, blockTextures);
|
||||
}
|
||||
|
||||
//TODO getBlockHardness
|
||||
@Override
|
||||
public float getBlockHardness (World world, int x, int y, int z)
|
||||
|
||||
@@ -326,9 +326,9 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
|
||||
{
|
||||
return EnumPlantType.Cave;
|
||||
}
|
||||
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void setGraphicsLevel(boolean p_150122_1_)
|
||||
public void setGraphicsLevel (boolean p_150122_1_)
|
||||
{
|
||||
this.field_150121_P = p_150122_1_;
|
||||
this.field_150127_b = (p_150122_1_ ? 0 : 1);
|
||||
|
||||
@@ -30,7 +30,7 @@ public class OreberryBushEssence extends OreberryBush implements IPlantable
|
||||
{
|
||||
if (meta < 12)
|
||||
{
|
||||
world.setBlock(x, y, z,(Block) this, meta + 4, 3);
|
||||
world.setBlock(x, y, z, (Block) this, meta + 4, 3);
|
||||
}
|
||||
}
|
||||
/*else if (meta < 8)
|
||||
|
||||
@@ -34,12 +34,13 @@ public class PaneBase extends Block
|
||||
this.folder = folder;
|
||||
}
|
||||
|
||||
public final boolean canPaneConnectToBlock(Block p_150098_1_)
|
||||
public final boolean canPaneConnectToBlock (Block p_150098_1_)
|
||||
{
|
||||
return p_150098_1_.func_149730_j() || p_150098_1_ == this || p_150098_1_ == Blocks.glass || p_150098_1_ == Blocks.stained_glass || p_150098_1_ == Blocks.stained_glass_pane || p_150098_1_ instanceof BlockPane;
|
||||
return p_150098_1_.func_149730_j() || p_150098_1_ == this || p_150098_1_ == Blocks.glass || p_150098_1_ == Blocks.stained_glass || p_150098_1_ == Blocks.stained_glass_pane
|
||||
|| p_150098_1_ instanceof BlockPane;
|
||||
}
|
||||
|
||||
public boolean canConnectTo(IBlockAccess world, int x, int y, int z, ForgeDirection dir)
|
||||
|
||||
public boolean canConnectTo (IBlockAccess world, int x, int y, int z, ForgeDirection dir)
|
||||
{
|
||||
return canPaneConnectToBlock(world.getBlock(x, y, z)) || world.isSideSolid(x, y, z, dir.getOpposite(), false);
|
||||
}
|
||||
@@ -94,7 +95,7 @@ public class PaneBase extends Block
|
||||
return PaneRender.model;
|
||||
}
|
||||
|
||||
public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, int k, int l)
|
||||
public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, int k, int l)
|
||||
{
|
||||
Block b = iblockaccess.getBlock(i, j, k);
|
||||
if (b instanceof PaneBase || b instanceof BlockPane)
|
||||
@@ -103,7 +104,7 @@ public class PaneBase extends Block
|
||||
}
|
||||
else
|
||||
{
|
||||
return super. shouldSideBeRendered(iblockaccess, i, j, k, l);
|
||||
return super.shouldSideBeRendered(iblockaccess, i, j, k, l);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@ public class SearedBlock extends InventoryBlock
|
||||
this.texturePrefix = texture;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity (World world, int metadata)
|
||||
{
|
||||
@@ -168,7 +167,7 @@ public class SearedBlock extends InventoryBlock
|
||||
}
|
||||
else if (logic.isStackInSlot(0))
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new SmelteryEvent.ItemRemovedFromCasting(logic, x, y, z, logic.getStackInSlot(0), player));
|
||||
MinecraftForge.EVENT_BUS.post(new SmelteryEvent.ItemRemovedFromCasting(logic, x, y, z, logic.getStackInSlot(0), player));
|
||||
ItemStack stack = logic.decrStackSize(0, 1);
|
||||
if (stack != null)
|
||||
addItemToInventory(player, world, x, y, z, stack);
|
||||
|
||||
@@ -136,7 +136,7 @@ public class SlimeExplosive extends TConstructBlock
|
||||
if (entityarrow.isBurning())
|
||||
{
|
||||
this.primeTnt(par1World, par2, par3, par4, 1, entityarrow.shootingEntity instanceof EntityLivingBase ? (EntityLivingBase) entityarrow.shootingEntity : null);
|
||||
WorldHelper.setBlockToAir(par1World,par2, par3, par4);
|
||||
WorldHelper.setBlockToAir(par1World, par2, par3, par4);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,8 @@ public class SoilBlock extends TConstructBlock
|
||||
@Override
|
||||
public void onEntityWalking (World world, int x, int y, int z, Entity entity)
|
||||
{
|
||||
if (entity instanceof EntityLivingBase){
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
if (((EntityLivingBase) entity).getCreatureAttribute() == EnumCreatureAttribute.UNDEAD)
|
||||
{
|
||||
int metadata = world.getBlockMetadata(x, y, z);
|
||||
|
||||
@@ -84,9 +84,8 @@ public class StoneTorch extends MantleBlock
|
||||
*/
|
||||
public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4)
|
||||
{
|
||||
return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true)
|
||||
|| par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) || par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true)
|
||||
|| canPlaceTorchOn(par1World, par2, par3 - 1, par4);
|
||||
return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true)
|
||||
|| par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) || canPlaceTorchOn(par1World, par2, par3 - 1, par4);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -19,9 +19,9 @@ public class TConstructBlock extends MantleBlock
|
||||
public String[] textureNames;
|
||||
public IIcon[] icons;
|
||||
|
||||
public TConstructBlock( Material material, float hardness, String[] tex)
|
||||
public TConstructBlock(Material material, float hardness, String[] tex)
|
||||
{
|
||||
super( material);
|
||||
super(material);
|
||||
setHardness(hardness);
|
||||
this.setCreativeTab(TConstructRegistry.blockTab);
|
||||
textureNames = tex;
|
||||
|
||||
@@ -33,6 +33,7 @@ public class TConstructFluid extends BlockFluidClassic
|
||||
{
|
||||
return alpha ? 1 : 0;
|
||||
}
|
||||
|
||||
//TODO registerBlockIcons
|
||||
@Override
|
||||
public void registerBlockIcons (IIconRegister iconRegister)
|
||||
|
||||
@@ -116,7 +116,8 @@ public class ToolStationBlock extends InventoryBlock
|
||||
{
|
||||
int metadata = world.getBlockMetadata(x, y, z);
|
||||
if (metadata == 5)
|
||||
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ);
|
||||
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125,
|
||||
(double) z + this.maxZ);
|
||||
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ);
|
||||
}
|
||||
|
||||
@@ -218,6 +219,6 @@ public class ToolStationBlock extends InventoryBlock
|
||||
@Override
|
||||
public TileEntity createNewTileEntity (World var1, int var2)
|
||||
{
|
||||
return createTileEntity(var1,var2);
|
||||
return createTileEntity(var1, var2);
|
||||
}
|
||||
}
|
||||
@@ -44,7 +44,7 @@ public class SmelteryScan extends TankLayerScan
|
||||
protected boolean checkServant (int x, int y, int z)
|
||||
{
|
||||
Block block = world.getBlock(x, y, z);
|
||||
if (block == null || world.getBlock( x, y, z) == Blocks.air || !isValidBlock(x, y, z))
|
||||
if (block == null || world.getBlock(x, y, z) == Blocks.air || !isValidBlock(x, y, z))
|
||||
return false;
|
||||
|
||||
if (!block.hasTileEntity(world.getBlockMetadata(x, y, z)))
|
||||
@@ -130,7 +130,7 @@ public class SmelteryScan extends TankLayerScan
|
||||
{
|
||||
super.readNetworkNBT(tags);
|
||||
|
||||
NBTTagList tanks = tags.getTagList("Tanks",11);
|
||||
NBTTagList tanks = tags.getTagList("Tanks", 11);
|
||||
if (tanks != null)
|
||||
{
|
||||
lavaTanks.clear();
|
||||
|
||||
@@ -436,13 +436,13 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
public void closeInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,7 @@ import tconstruct.TConstruct;
|
||||
|
||||
public class CastingChannelLogic extends TileEntity implements IFluidTank, IFluidHandler, IActiveLogic
|
||||
{
|
||||
public final static int fillMax = TConstruct.ingotLiquidValue*5;
|
||||
public final static int fillMax = TConstruct.ingotLiquidValue * 5;
|
||||
public final static int outputMax = TConstruct.ingotLiquidValue;
|
||||
public FluidStack liquid;
|
||||
public ForgeDirection lastProvider;
|
||||
|
||||
@@ -434,13 +434,13 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
public void closeInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -120,13 +120,13 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent
|
||||
public void closeInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -139,13 +139,13 @@ public class DryingRackLogic extends InventoryLogic
|
||||
public void closeInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -703,32 +703,31 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
Block eastBlock = worldObj.getBlock(x + 1, y, z);
|
||||
Block westBlock = worldObj.getBlock(x - 1, y, z);
|
||||
|
||||
if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air)
|
||||
&& (eastBlock == null || eastBlock == Blocks.air) && (westBlock == null || westBlock == Blocks.air))
|
||||
if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air) && (eastBlock == null || eastBlock == Blocks.air)
|
||||
&& (westBlock == null || westBlock == Blocks.air))
|
||||
{
|
||||
checkValidStructure(x, y, z);
|
||||
}
|
||||
|
||||
else if ((northBlock != null && !(northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air)
|
||||
&& (eastBlock == null || eastBlock == Blocks.air) && (westBlock == null || westBlock == Blocks.air)))
|
||||
else if ((northBlock != null && !(northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air) && (eastBlock == null || eastBlock == Blocks.air) && (westBlock == null || westBlock == Blocks.air)))
|
||||
{
|
||||
checkValidStructure(x, y, z - 1);
|
||||
}
|
||||
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock != null && !(southBlock == Blocks.air))
|
||||
&& (eastBlock == null || eastBlock == Blocks.air) && (westBlock == null || westBlock == Blocks.air))
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock != null && !(southBlock == Blocks.air)) && (eastBlock == null || eastBlock == Blocks.air)
|
||||
&& (westBlock == null || westBlock == Blocks.air))
|
||||
{
|
||||
checkValidStructure(x, y, z + 1);
|
||||
}
|
||||
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air)
|
||||
&& (eastBlock != null && !(eastBlock == Blocks.air)) && (westBlock == null || westBlock == Blocks.air))
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air) && (eastBlock != null && !(eastBlock == Blocks.air))
|
||||
&& (westBlock == null || westBlock == Blocks.air))
|
||||
{
|
||||
checkValidStructure(x - 1, y, z);
|
||||
}
|
||||
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air)
|
||||
&& (eastBlock == null || eastBlock == Blocks.air) && (westBlock != null && !(westBlock == Blocks.air)))
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air) && (eastBlock == null || eastBlock == Blocks.air)
|
||||
&& (westBlock != null && !(westBlock == Blocks.air)))
|
||||
{
|
||||
checkValidStructure(x + 1, y, z);
|
||||
}
|
||||
|
||||
@@ -131,7 +131,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
|
||||
//DELETE
|
||||
public void updateEntity ()
|
||||
{
|
||||
WorldHelper.setBlockToAir(worldObj,xCoord, yCoord, zCoord);
|
||||
WorldHelper.setBlockToAir(worldObj, xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
//Keep TE regardless of metadata
|
||||
@@ -200,13 +200,12 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
|
||||
|
||||
@Override
|
||||
public void closeInventory ()
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -69,7 +69,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
public void readFromNBT (NBTTagCompound par1NBTTagCompound)
|
||||
{
|
||||
super.readFromNBT(par1NBTTagCompound);
|
||||
NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items",9);
|
||||
NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items", 9);
|
||||
this.inventory = new ItemStack[this.getSizeInventory()];
|
||||
|
||||
for (int i = 0; i < nbttaglist.tagCount(); ++i)
|
||||
@@ -263,5 +263,4 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -124,11 +124,11 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
|
||||
|
||||
@Override
|
||||
public void closeInventory ()
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -123,7 +123,7 @@ public class SlimeGrass extends MantleBlock
|
||||
Block block = par1World.getBlock(posX, posY, posZ);
|
||||
if (block == Blocks.dirt)
|
||||
{
|
||||
par1World.setBlock(posX, posY, posZ,(Block) this, 1, 3);
|
||||
par1World.setBlock(posX, posY, posZ, (Block) this, 1, 3);
|
||||
return;
|
||||
}
|
||||
int blockMeta = par1World.getBlockMetadata(posX, posY, posZ);
|
||||
|
||||
@@ -151,8 +151,9 @@ public class SlimeLeaves extends BlockLeaves
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] func_150125_e() {
|
||||
return new String[]{"slime"};
|
||||
}
|
||||
@Override
|
||||
public String[] func_150125_e ()
|
||||
{
|
||||
return new String[] { "slime" };
|
||||
}
|
||||
}
|
||||
@@ -116,7 +116,6 @@ public class SlimeTallGrass extends BlockBush implements IShearable
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isShearable (ItemStack item, IBlockAccess world, int x, int y, int z)
|
||||
{
|
||||
|
||||
@@ -60,8 +60,8 @@ public class Punji extends MantleBlock
|
||||
if (stack != null && stack == new ItemStack(TRepo.punji))
|
||||
{
|
||||
world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3);
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName,
|
||||
(this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName, (this.stepSound.getVolume() + 1.0F) / 2.0F,
|
||||
this.stepSound.getPitch() * 0.8F);
|
||||
player.swingItem();
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
{
|
||||
|
||||
@@ -49,12 +49,12 @@ public class TClientEvents
|
||||
initSounds = true;
|
||||
try
|
||||
{
|
||||
/* SoundManager soundmanager = event.manager;
|
||||
soundmanager.addSound("tinker:frypan_hit.ogg");
|
||||
soundmanager.addSound("tinker:little_saw.ogg");
|
||||
soundmanager.addSound("tinker:launcher_clank.ogg");
|
||||
TConstruct.logger.info("Successfully loaded sounds.");
|
||||
*/
|
||||
/* SoundManager soundmanager = event.manager;
|
||||
soundmanager.addSound("tinker:frypan_hit.ogg");
|
||||
soundmanager.addSound("tinker:little_saw.ogg");
|
||||
soundmanager.addSound("tinker:launcher_clank.ogg");
|
||||
TConstruct.logger.info("Successfully loaded sounds.");
|
||||
*/
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -243,7 +243,7 @@ public class TClientEvents
|
||||
}
|
||||
|
||||
double zLevel = 0;
|
||||
|
||||
|
||||
/*@SubscribeEvent
|
||||
public void fovModifier(FOVUpdateEvent event)
|
||||
{
|
||||
|
||||
@@ -947,11 +947,12 @@ public class TProxyClient extends TProxyCommon
|
||||
{
|
||||
//MinecraftForgeClient.registerItemRenderer(TRepo.armorPattern.itemID, new RenderArmorCast());
|
||||
}
|
||||
|
||||
private static IIcon getIcon(IIcon icon)
|
||||
|
||||
private static IIcon getIcon (IIcon icon)
|
||||
{
|
||||
if (icon != null) return icon;
|
||||
return ((TextureMap)Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
|
||||
if (icon != null)
|
||||
return icon;
|
||||
return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -154,5 +154,4 @@ public class BarricadeRender implements ISimpleBlockRenderingHandler
|
||||
return model;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -63,7 +63,7 @@ public class BlockSkinRenderHelper
|
||||
float f7;
|
||||
int i1;
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
|
||||
{
|
||||
if (render.renderMinY <= 0.0D)
|
||||
{
|
||||
@@ -178,7 +178,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
|
||||
{
|
||||
if (render.renderMaxY >= 1.0D)
|
||||
{
|
||||
@@ -284,7 +284,7 @@ public class BlockSkinRenderHelper
|
||||
|
||||
IIcon icon;
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
|
||||
{
|
||||
if (render.renderMinZ <= 0.0D)
|
||||
{
|
||||
@@ -401,7 +401,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
|
||||
{
|
||||
if (render.renderMaxZ >= 1.0D)
|
||||
{
|
||||
@@ -518,7 +518,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
|
||||
{
|
||||
if (render.renderMinX <= 0.0D)
|
||||
{
|
||||
@@ -635,7 +635,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
|
||||
{
|
||||
if (render.renderMaxX >= 1.0D)
|
||||
{
|
||||
@@ -794,7 +794,7 @@ public class BlockSkinRenderHelper
|
||||
|
||||
int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
|
||||
tessellator.setColorOpaque_F(f10, f13, f16);
|
||||
@@ -802,7 +802,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
|
||||
tessellator.setColorOpaque_F(f7, f8, f9);
|
||||
@@ -812,7 +812,7 @@ public class BlockSkinRenderHelper
|
||||
|
||||
IIcon icon;
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
|
||||
tessellator.setColorOpaque_F(f11, f14, f17);
|
||||
@@ -821,7 +821,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
|
||||
tessellator.setColorOpaque_F(f11, f14, f17);
|
||||
@@ -830,7 +830,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
|
||||
tessellator.setColorOpaque_F(f12, f15, f18);
|
||||
@@ -839,7 +839,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
|
||||
tessellator.setColorOpaque_F(f12, f15, f18);
|
||||
@@ -904,7 +904,7 @@ public class BlockSkinRenderHelper
|
||||
float f7;
|
||||
int i1;
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
|
||||
{
|
||||
if (render.renderMinY <= 0.0D)
|
||||
{
|
||||
@@ -1019,7 +1019,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
|
||||
{
|
||||
if (render.renderMaxY >= 1.0D)
|
||||
{
|
||||
@@ -1123,7 +1123,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
|
||||
{
|
||||
if (render.renderMinZ <= 0.0D)
|
||||
{
|
||||
@@ -1239,7 +1239,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
|
||||
{
|
||||
if (render.renderMaxZ >= 1.0D)
|
||||
{
|
||||
@@ -1355,7 +1355,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
|
||||
{
|
||||
if (render.renderMinX <= 0.0D)
|
||||
{
|
||||
@@ -1471,7 +1471,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
|
||||
{
|
||||
if (render.renderMaxX >= 1.0D)
|
||||
{
|
||||
@@ -1630,7 +1630,7 @@ public class BlockSkinRenderHelper
|
||||
|
||||
int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
|
||||
tessellator.setColorOpaque_F(f10, f13, f16);
|
||||
@@ -1638,7 +1638,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
|
||||
tessellator.setColorOpaque_F(f7, f8, f9);
|
||||
@@ -1648,7 +1648,7 @@ public class BlockSkinRenderHelper
|
||||
|
||||
IIcon icon;
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
|
||||
tessellator.setColorOpaque_F(f11, f14, f17);
|
||||
@@ -1657,7 +1657,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
|
||||
tessellator.setColorOpaque_F(f11, f14, f17);
|
||||
@@ -1666,7 +1666,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
|
||||
tessellator.setColorOpaque_F(f12, f15, f18);
|
||||
@@ -1675,7 +1675,7 @@ public class BlockSkinRenderHelper
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
|
||||
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
|
||||
tessellator.setColorOpaque_F(f12, f15, f18);
|
||||
@@ -1686,7 +1686,9 @@ public class BlockSkinRenderHelper
|
||||
|
||||
return flag;
|
||||
}
|
||||
public static float getAmbientOcclusionLightValue(IBlockAccess access, int x, int y, int z){
|
||||
|
||||
public static float getAmbientOcclusionLightValue (IBlockAccess access, int x, int y, int z)
|
||||
{
|
||||
return access.getBlock(x, y, z).getAmbientOcclusionLightValue();
|
||||
}
|
||||
}
|
||||
@@ -84,6 +84,6 @@ public class DryingRackSpecialRender extends TileEntitySpecialRenderer
|
||||
@Override
|
||||
public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8)
|
||||
{
|
||||
this.render((DryingRackLogic) logic, var2, var4, var6, var8);
|
||||
this.render((DryingRackLogic) logic, var2, var4, var6, var8);
|
||||
}
|
||||
}
|
||||
@@ -59,7 +59,7 @@ public class RenderLiquid
|
||||
flag1 = false;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
|
||||
{
|
||||
if (render.renderMinY <= 0.0D)
|
||||
{
|
||||
@@ -174,7 +174,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
|
||||
{
|
||||
if (render.renderMaxY >= 1.0D)
|
||||
{
|
||||
@@ -278,7 +278,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
|
||||
{
|
||||
if (render.renderMinZ <= 0.0D)
|
||||
{
|
||||
@@ -395,7 +395,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
|
||||
{
|
||||
if (render.renderMaxZ >= 1.0D)
|
||||
{
|
||||
@@ -512,7 +512,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
|
||||
{
|
||||
if (render.renderMinX <= 0.0D)
|
||||
{
|
||||
@@ -629,7 +629,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
|
||||
{
|
||||
if (render.renderMaxX >= 1.0D)
|
||||
{
|
||||
@@ -793,7 +793,7 @@ public class RenderLiquid
|
||||
|
||||
int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
|
||||
tessellator.setColorOpaque_F(f10, f13, f16);
|
||||
@@ -801,7 +801,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
|
||||
tessellator.setColorOpaque_F(f7, f8, f9);
|
||||
@@ -809,7 +809,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
|
||||
tessellator.setColorOpaque_F(f11, f14, f17);
|
||||
@@ -818,7 +818,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
|
||||
tessellator.setColorOpaque_F(f11, f14, f17);
|
||||
@@ -827,7 +827,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
|
||||
tessellator.setColorOpaque_F(f12, f15, f18);
|
||||
@@ -836,7 +836,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
|
||||
tessellator.setColorOpaque_F(f12, f15, f18);
|
||||
@@ -893,7 +893,7 @@ public class RenderLiquid
|
||||
flag1 = false;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
|
||||
{
|
||||
if (render.renderMinY <= 0.0D)
|
||||
{
|
||||
@@ -1008,7 +1008,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
|
||||
{
|
||||
if (render.renderMaxY >= 1.0D)
|
||||
{
|
||||
@@ -1023,10 +1023,10 @@ public class RenderLiquid
|
||||
render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
|
||||
render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
|
||||
render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
|
||||
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
|
||||
if ((!flag4) && (!flag2))
|
||||
{
|
||||
@@ -1112,7 +1112,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
|
||||
{
|
||||
if (render.renderMinZ <= 0.0D)
|
||||
{
|
||||
@@ -1127,10 +1127,10 @@ public class RenderLiquid
|
||||
render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
|
||||
render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
|
||||
render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
|
||||
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
|
||||
if ((!flag2) && (!flag4))
|
||||
{
|
||||
@@ -1228,7 +1228,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
|
||||
{
|
||||
if (render.renderMaxZ >= 1.0D)
|
||||
{
|
||||
@@ -1243,10 +1243,10 @@ public class RenderLiquid
|
||||
render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
|
||||
render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
|
||||
render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
|
||||
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
|
||||
if ((!flag2) && (!flag4))
|
||||
{
|
||||
@@ -1344,7 +1344,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
|
||||
{
|
||||
if (render.renderMinX <= 0.0D)
|
||||
{
|
||||
@@ -1359,10 +1359,10 @@ public class RenderLiquid
|
||||
render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
|
||||
render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
|
||||
render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
|
||||
boolean flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
|
||||
if ((!flag5) && (!flag2))
|
||||
{
|
||||
@@ -1460,7 +1460,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
|
||||
{
|
||||
if (render.renderMaxX >= 1.0D)
|
||||
{
|
||||
@@ -1476,9 +1476,9 @@ public class RenderLiquid
|
||||
render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
|
||||
render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
|
||||
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
|
||||
boolean flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
|
||||
boolean flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
|
||||
|
||||
if ((!flag2) && (!flag4))
|
||||
{
|
||||
@@ -1618,7 +1618,7 @@ public class RenderLiquid
|
||||
|
||||
int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
|
||||
tessellator.setColorOpaque_F(f10, f13, f16);
|
||||
@@ -1626,7 +1626,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
|
||||
tessellator.setColorOpaque_F(f7, f8, f9);
|
||||
@@ -1634,7 +1634,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
|
||||
tessellator.setColorOpaque_F(f11, f14, f17);
|
||||
@@ -1643,7 +1643,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
|
||||
tessellator.setColorOpaque_F(f11, f14, f17);
|
||||
@@ -1652,7 +1652,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
|
||||
tessellator.setColorOpaque_F(f12, f15, f18);
|
||||
@@ -1661,7 +1661,7 @@ public class RenderLiquid
|
||||
flag = true;
|
||||
}
|
||||
|
||||
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
|
||||
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
|
||||
{
|
||||
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
|
||||
tessellator.setColorOpaque_F(f12, f15, f18);
|
||||
|
||||
@@ -250,21 +250,21 @@ public class SearedRender implements ISimpleBlockRenderingHandler
|
||||
}
|
||||
|
||||
float yMin = 0F;
|
||||
Block uBlock= world.getBlock(x, y - 1, z);
|
||||
Block uBlock = world.getBlock(x, y - 1, z);
|
||||
int uMeta = world.getBlockMetadata(x, y - 1, z);
|
||||
if (uBlock== TRepo.searedBlock && uMeta == 0)
|
||||
if (uBlock == TRepo.searedBlock && uMeta == 0)
|
||||
{
|
||||
yMin = -0.125F;
|
||||
}
|
||||
else if (uBlock== TRepo.searedBlock && uMeta == 2)
|
||||
else if (uBlock == TRepo.searedBlock && uMeta == 2)
|
||||
{
|
||||
yMin = -0.75F;
|
||||
}
|
||||
else if (uBlock== TRepo.lavaTank)
|
||||
else if (uBlock == TRepo.lavaTank)
|
||||
{
|
||||
yMin = -1F;
|
||||
}
|
||||
else if (uBlock== TRepo.castingChannel)
|
||||
else if (uBlock == TRepo.castingChannel)
|
||||
{
|
||||
yMin = -0.5F;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
|
||||
public static int smelteryModel = RenderingRegistry.getNextAvailableRenderId();
|
||||
|
||||
@Override
|
||||
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
|
||||
public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
|
||||
{
|
||||
if (modelID == smelteryModel)
|
||||
{
|
||||
@@ -146,9 +146,9 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
|
||||
|
||||
//TODO is this needed???
|
||||
//if (blockToRender.itemID < 4096) //Block
|
||||
// {
|
||||
Block liquidBlock = BlockUtils.getBlockFromItemStack(blockToRender);
|
||||
BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY, posZ + i / 3, renderer, world);
|
||||
// {
|
||||
Block liquidBlock = BlockUtils.getBlockFromItemStack(blockToRender);
|
||||
BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY, posZ + i / 3, renderer, world);
|
||||
//}
|
||||
|
||||
/*else //No items, only blocks
|
||||
|
||||
@@ -74,7 +74,7 @@ public class FancyItemRender extends Render
|
||||
|
||||
block = BlockUtils.getBlockFromItem(itemstack.getItem());
|
||||
|
||||
if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c,1))
|
||||
if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c, 1))
|
||||
{
|
||||
;
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ public class ArrowRender extends Render
|
||||
int i;
|
||||
|
||||
Block block = null;
|
||||
block = BlockUtils.getBlockFromItem(itemstack.getItem());
|
||||
block = BlockUtils.getBlockFromItem(itemstack.getItem());
|
||||
|
||||
if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType()))
|
||||
{
|
||||
@@ -141,7 +141,7 @@ public class ArrowRender extends Render
|
||||
|
||||
if (this.renderWithColor)
|
||||
{
|
||||
int l =itemstack.getItem().getColorFromItemStack(itemstack, 0);
|
||||
int l = itemstack.getItem().getColorFromItemStack(itemstack, 0);
|
||||
f8 = (float) (l >> 16 & 255) / 255.0F;
|
||||
float f9 = (float) (l >> 8 & 255) / 255.0F;
|
||||
f5 = (float) (l & 255) / 255.0F;
|
||||
|
||||
@@ -54,7 +54,7 @@ public class DaggerRenderCustom extends Render
|
||||
GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f);
|
||||
float scale = 1.35f;
|
||||
GL11.glScalef(scale, scale, scale);
|
||||
ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c,1);
|
||||
ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c, 1);
|
||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
@@ -289,7 +289,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui
|
||||
ArrayList list = new ArrayList();
|
||||
if (liquid.fluidID == -37)
|
||||
{
|
||||
list.add("\u00A7f"+(StatCollector.translateToLocal("gui.smeltery1")));
|
||||
list.add("\u00A7f" + (StatCollector.translateToLocal("gui.smeltery1")));
|
||||
list.add("mB: " + liquid.amount);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -143,7 +143,6 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
|
||||
}
|
||||
|
||||
|
||||
/*protected void keyTyped(char par1, int par2)
|
||||
{
|
||||
if (par2 == TControls.armorKey.keyCode)
|
||||
|
||||
@@ -217,8 +217,8 @@ public class CraftingStationGui extends GuiContainer
|
||||
offset++;
|
||||
fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
fontRendererObj.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset
|
||||
* 10, 0xffffff);
|
||||
fontRendererObj.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10,
|
||||
0xffffff);
|
||||
offset++;
|
||||
offset++;
|
||||
}
|
||||
|
||||
@@ -245,7 +245,7 @@ public abstract class NewContainerGui extends GuiScreen
|
||||
{
|
||||
if (k == 0)
|
||||
{
|
||||
list.set(k, par1ItemStack.getRarity().rarityColor + (String)list.get(k));
|
||||
list.set(k, par1ItemStack.getRarity().rarityColor + (String) list.get(k));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -34,7 +34,7 @@ public class PartCrafterGui extends NewContainerGui
|
||||
logic = partlogic;
|
||||
drawChestPart = container instanceof PartCrafterChestContainer;
|
||||
|
||||
title = "\u00A7n"+(StatCollector.translateToLocal("gui.partcrafter1"));
|
||||
title = "\u00A7n" + (StatCollector.translateToLocal("gui.partcrafter1"));
|
||||
}
|
||||
|
||||
protected void drawGuiContainerForegroundLayer (int par1, int par2)
|
||||
|
||||
@@ -266,7 +266,7 @@ public class SmelteryGui extends NewContainerGui
|
||||
ArrayList list = new ArrayList();
|
||||
if (liquid.fluidID == -37)
|
||||
{
|
||||
list.add("\u00A7f"+StatCollector.translateToLocal("gui.smeltery1"));
|
||||
list.add("\u00A7f" + StatCollector.translateToLocal("gui.smeltery1"));
|
||||
list.add("mB: " + liquid.amount);
|
||||
}
|
||||
else
|
||||
@@ -441,7 +441,7 @@ public class SmelteryGui extends NewContainerGui
|
||||
int sizeY = liquidSize;
|
||||
if (mouseX >= leftX && mouseX <= leftX + sizeX && mouseY >= topY && mouseY < topY + sizeY)
|
||||
{
|
||||
//TODO Update fluid stuff
|
||||
//TODO Update fluid stuff
|
||||
fluidToBeBroughtUp = liquid.fluidID;
|
||||
|
||||
/*Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
@@ -472,7 +472,7 @@ public class SmelteryGui extends NewContainerGui
|
||||
packet.length = bos.size();
|
||||
|
||||
PacketDispatcher.sendPacketToServer(packet);*/
|
||||
|
||||
|
||||
TConstruct.packetPipeline.sendToServer(new PacketSmeltery(logic.getWorld().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ public class StencilTableGui extends GuiContainer
|
||||
packet.length = bos.size();
|
||||
|
||||
PacketDispatcher.sendPacketToServer(packet);*/
|
||||
|
||||
|
||||
TConstruct.packetPipeline.sendToServer(new PacketStencilTable(logic.xCoord, logic.yCoord, logic.zCoord, stack));
|
||||
}
|
||||
}
|
||||
@@ -85,7 +85,7 @@ public class ToolForgeGui extends ToolStationGui
|
||||
setSlotType(0);
|
||||
iconX = new int[] { 0, 1, 2, 13 };
|
||||
iconY = new int[] { 13, 13, 13, 13 };
|
||||
title = "\u00A7n"+StatCollector.translateToLocal("gui.toolforge1");
|
||||
title = "\u00A7n" + StatCollector.translateToLocal("gui.toolforge1");
|
||||
body = StatCollector.translateToLocal("gui.toolforge2");
|
||||
}
|
||||
|
||||
|
||||
@@ -296,8 +296,8 @@ public class ToolStationGui extends NewContainerGui
|
||||
offset++;
|
||||
fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
fontRendererObj
|
||||
.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff);
|
||||
fontRendererObj.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10,
|
||||
0xffffff);
|
||||
offset++;
|
||||
offset++;
|
||||
}
|
||||
@@ -492,7 +492,7 @@ public class ToolStationGui extends NewContainerGui
|
||||
packet.length = bos.size();
|
||||
|
||||
PacketDispatcher.sendPacketToServer(packet);*/
|
||||
|
||||
|
||||
TConstruct.packetPipeline.sendToServer(new PacketToolStation(logic.xCoord, logic.yCoord, logic.zCoord, name));
|
||||
}
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ public class BlockCastPage extends BookPage
|
||||
String ingr = new String("Ingredients");
|
||||
if (isTranslatable)
|
||||
ingr = StatCollector.translateToLocal(ingr);
|
||||
manual.fonts.drawString( ingr + ":", localWidth + 120, localHeight + 32, 0);
|
||||
manual.fonts.drawString(ingr + ":", localWidth + 120, localHeight + 32, 0);
|
||||
manual.fonts.drawString("- " + icons[1].getDisplayName(), localWidth + 120, localHeight + 42, 0);
|
||||
if (icons[2] != null)
|
||||
manual.fonts.drawString("- " + icons[2].getDisplayName(), localWidth + 120, localHeight + 50, 0);
|
||||
|
||||
@@ -140,7 +140,7 @@ public class MaterialPage extends BookPage
|
||||
|
||||
manual.fonts.drawString(durability + ": " + material.durability(), localWidth, localHeight + 40, 0);
|
||||
manual.fonts.drawString(handleModifier + ": " + material.handleDurability() + "x", localWidth, localHeight + 50, 0);
|
||||
manual.fonts.drawString(fullToolDurability+ ": " + (int) (material.durability() * material.handleDurability()), localWidth, localHeight + 60, 0);
|
||||
manual.fonts.drawString(fullToolDurability + ": " + (int) (material.durability() * material.handleDurability()), localWidth, localHeight + 60, 0);
|
||||
|
||||
manual.fonts.drawString(miningSpeed + ": " + material.toolSpeed() / 100f, localWidth, localHeight + 80, 0);
|
||||
manual.fonts.drawString(miningLevel + ": " + material.harvestLevel() + " (" + PartCrafterGui.getHarvestLevelName(material.harvestLevel()) + ")", localWidth, localHeight + 90, 0);
|
||||
|
||||
@@ -34,7 +34,7 @@ public class TProxyCommon implements IGuiHandler
|
||||
public static int armorGuiID = 101;
|
||||
public static int knapsackGuiID = 102;
|
||||
|
||||
// public static int manualGuiID = -1;// moved to Mantle
|
||||
// public static int manualGuiID = -1;// moved to Mantle
|
||||
|
||||
@Override
|
||||
public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z)
|
||||
|
||||
@@ -270,12 +270,11 @@ public class TRepo
|
||||
|
||||
public static Fluid[] fluids = new Fluid[27];
|
||||
public static Block[] fluidBlocks = new Block[26];
|
||||
|
||||
|
||||
//recipe stuff
|
||||
public static boolean thaumcraftAvailable;
|
||||
public static boolean initRecipes;
|
||||
public static Item[] patternOutputs;
|
||||
public static FluidStack[] liquids;
|
||||
|
||||
|
||||
}
|
||||
@@ -709,7 +709,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
|
||||
|
||||
if (getSizeInventory() > 0)
|
||||
{
|
||||
NBTTagList var2 = par1NBTTagCompound.getTagList("Items",9);
|
||||
NBTTagList var2 = par1NBTTagCompound.getTagList("Items", 9);
|
||||
this.cargoItems = new ItemStack[this.getSizeInventory()];
|
||||
|
||||
for (int var3 = 0; var3 < var2.tagCount(); ++var3)
|
||||
|
||||
@@ -40,13 +40,13 @@ public class FakeBlockEntity extends Entity implements IEntityAdditionalSpawnDat
|
||||
@Override
|
||||
public void writeSpawnData (ByteBuf buffer)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readSpawnData (ByteBuf additionalData)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -217,13 +217,13 @@ public class ContainerLandmine extends Container
|
||||
{
|
||||
if (par2 == 0)
|
||||
{
|
||||
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(),false);
|
||||
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(), false);
|
||||
inventoryplayer.setItemStack((ItemStack) null);
|
||||
}
|
||||
|
||||
if (par2 == 1)
|
||||
{
|
||||
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack().splitStack(1),false);
|
||||
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack().splitStack(1), false);
|
||||
|
||||
if (inventoryplayer.getItemStack().stackSize == 0)
|
||||
{
|
||||
@@ -238,7 +238,7 @@ public class ContainerLandmine extends Container
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
Object localObject2;
|
||||
|
||||
slot2 = (Slot) this.inventorySlots.get(par1);
|
||||
@@ -249,7 +249,7 @@ public class ContainerLandmine extends Container
|
||||
|
||||
if (itemstack1 != null)
|
||||
{
|
||||
localObject2 = ((ItemStack)itemstack1).getItem();
|
||||
localObject2 = ((ItemStack) itemstack1).getItem();
|
||||
itemstack = itemstack1.copy();
|
||||
|
||||
if (slot2 != null && slot2.getStack() != null && slot2.getStack().getItem() == localObject2)
|
||||
@@ -372,8 +372,8 @@ public class ContainerLandmine extends Container
|
||||
inventoryplayer.setItemStack(itemstack1);
|
||||
}
|
||||
}
|
||||
else if (itemstack1 == itemstack4 && itemstack4.getMaxStackSize() > 1
|
||||
&& (!itemstack1.getHasSubtypes() || itemstack1.getItemDamage() == itemstack4.getItemDamage()) && ItemStack.areItemStackTagsEqual(itemstack1, itemstack4))
|
||||
else if (itemstack1 == itemstack4 && itemstack4.getMaxStackSize() > 1 && (!itemstack1.getHasSubtypes() || itemstack1.getItemDamage() == itemstack4.getItemDamage())
|
||||
&& ItemStack.areItemStackTagsEqual(itemstack1, itemstack4))
|
||||
{
|
||||
k1 = itemstack1.stackSize;
|
||||
|
||||
@@ -460,7 +460,7 @@ public class ContainerLandmine extends Container
|
||||
{
|
||||
itemstack1 = slot2.decrStackSize(par2 == 0 ? 1 : slot2.getStack().stackSize);
|
||||
slot2.onPickupFromSlot(par4EntityPlayer, itemstack1);
|
||||
par4EntityPlayer.dropPlayerItemWithRandomChoice(itemstack1,false);
|
||||
par4EntityPlayer.dropPlayerItemWithRandomChoice(itemstack1, false);
|
||||
}
|
||||
}
|
||||
else if (par3 == 6 && par1 >= 0)
|
||||
|
||||
@@ -143,7 +143,7 @@ public class CraftingStationContainer extends Container
|
||||
|
||||
if (itemstack != null)
|
||||
{
|
||||
par1EntityPlayer.dropPlayerItemWithRandomChoice(itemstack,false);
|
||||
par1EntityPlayer.dropPlayerItemWithRandomChoice(itemstack, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ public class FrypanContainer extends Container
|
||||
|
||||
public FrypanContainer(EntityPlayer player, FrypanLogic frypan)
|
||||
{
|
||||
InventoryPlayer inventoryplayer = player.inventory;
|
||||
InventoryPlayer inventoryplayer = player.inventory;
|
||||
logic = frypan;
|
||||
this.addSlotToContainer(new Slot(frypan, 1, 26, 45));
|
||||
for (int y = 0; y < 2; y++)
|
||||
|
||||
@@ -6,25 +6,30 @@ import net.minecraft.item.*;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import tconstruct.achievements.TAchievements;
|
||||
|
||||
public class SlotFrypan extends Slot{
|
||||
public class SlotFrypan extends Slot
|
||||
{
|
||||
|
||||
public EntityPlayer player;
|
||||
|
||||
public SlotFrypan(IInventory par1IInventory, int par2, int par3, int par4, EntityPlayer player) {
|
||||
super(par1IInventory, par2, par3, par4);
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void putStack(ItemStack par1ItemStack){
|
||||
public EntityPlayer player;
|
||||
|
||||
public SlotFrypan(IInventory par1IInventory, int par2, int par3, int par4, EntityPlayer player)
|
||||
{
|
||||
super(par1IInventory, par2, par3, par4);
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void putStack (ItemStack par1ItemStack)
|
||||
{
|
||||
super.putStack(par1ItemStack);
|
||||
if(par1ItemStack != null && par1ItemStack.getItem() != null && par1ItemStack.getItem() instanceof ItemFood && par1ItemStack.hasTagCompound()){
|
||||
NBTTagCompound stackTagCompound = par1ItemStack.getTagCompound();
|
||||
if(stackTagCompound == null || !stackTagCompound.getBoolean("frypanKill")){
|
||||
return;
|
||||
}
|
||||
player.addStat(TAchievements.achievements.get("tconstruct.dualConvenience"), 1);
|
||||
if (par1ItemStack != null && par1ItemStack.getItem() != null && par1ItemStack.getItem() instanceof ItemFood && par1ItemStack.hasTagCompound())
|
||||
{
|
||||
NBTTagCompound stackTagCompound = par1ItemStack.getTagCompound();
|
||||
if (stackTagCompound == null || !stackTagCompound.getBoolean("frypanKill"))
|
||||
{
|
||||
return;
|
||||
}
|
||||
player.addStat(TAchievements.achievements.get("tconstruct.dualConvenience"), 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -19,7 +19,7 @@ public class ArmorPattern extends CraftingItem implements ItemBlocklike
|
||||
|
||||
public ArmorPattern(int id, String patternType, String folder)
|
||||
{
|
||||
super( patternName, getPatternNames(patternType), folder, "tinker", TConstructRegistry.materialTab);
|
||||
super(patternName, getPatternNames(patternType), folder, "tinker", TConstructRegistry.materialTab);
|
||||
this.setHasSubtypes(true);
|
||||
this.setMaxDamage(0);
|
||||
this.setContainerItem(this);
|
||||
|
||||
@@ -140,13 +140,16 @@ public class FilledBucket extends ItemBucket
|
||||
}
|
||||
else
|
||||
{
|
||||
try {
|
||||
try
|
||||
{
|
||||
int metadata = 0;
|
||||
if (TRepo.fluidBlocks[type] instanceof BlockFluidFinite)
|
||||
metadata = 7;
|
||||
|
||||
world.setBlock(clickX, clickY, clickZ, TRepo.fluidBlocks[type], metadata, 3); //TODO: Merge liquids
|
||||
} catch (ArrayIndexOutOfBoundsException ex) {
|
||||
}
|
||||
catch (ArrayIndexOutOfBoundsException ex)
|
||||
{
|
||||
TConstruct.logger.warn("AIOBE occured when placing bucket into world; " + ex);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ public class GoldenHead extends ItemFood
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
{
|
||||
list.add("\u00a75\u00a7o"+StatCollector.translateToLocal("goldenhead1.tooltip"));
|
||||
list.add("\u00a75\u00a7o"+StatCollector.translateToLocal("goldenhead2.tooltip"));
|
||||
list.add("\u00a75\u00a7o" + StatCollector.translateToLocal("goldenhead1.tooltip"));
|
||||
list.add("\u00a75\u00a7o" + StatCollector.translateToLocal("goldenhead2.tooltip"));
|
||||
}
|
||||
}
|
||||
@@ -29,10 +29,10 @@ public class MetalPattern extends Pattern
|
||||
private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign",
|
||||
"knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem" };
|
||||
|
||||
public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)
|
||||
public void getSubItems (Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)
|
||||
{
|
||||
for (int i = 0; i < patternName.length; i++)
|
||||
if (!(patternName[i].equals("")))
|
||||
p_150895_3_.add(new ItemStack(p_150895_1_, 1, i));
|
||||
p_150895_3_.add(new ItemStack(p_150895_1_, 1, i));
|
||||
}
|
||||
}
|
||||
@@ -147,6 +147,6 @@ public class Pattern extends CraftingItem implements IPattern
|
||||
@Override
|
||||
public ItemStack getPatternOutput (ItemStack stack, ItemStack input, MaterialSet set)
|
||||
{
|
||||
return TConstructRegistry.getPartMapping((Item)this, stack.getItemDamage(), set.materialID);
|
||||
return TConstructRegistry.getPartMapping((Item) this, stack.getItemDamage(), set.materialID);
|
||||
}
|
||||
}
|
||||
@@ -17,12 +17,12 @@ public class StrangeFood extends SpecialFood
|
||||
{
|
||||
super(new int[] { 2, 2 }, new float[] { 1f, 1f }, new String[] { "edibleslime", "edibleblood" }, new String[] { "food/edibleslime", "food/edibleblood" });
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onFoodEaten (ItemStack stack, World world, EntityPlayer player)
|
||||
{
|
||||
if (stack.getItemDamage() == 1)
|
||||
player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20*15, 0));
|
||||
player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20 * 15, 0));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -19,7 +19,7 @@ public class HeartCanister extends CraftingItem
|
||||
|
||||
public HeartCanister()
|
||||
{
|
||||
super(new String[] { "empty", "miniheart.red", "heart" }, new String[] { "canister_empty", "miniheart_red", "canister_heart" }, "", "tinker", TConstructRegistry.materialTab );
|
||||
super(new String[] { "empty", "miniheart.red", "heart" }, new String[] { "canister_empty", "miniheart_red", "canister_heart" }, "", "tinker", TConstructRegistry.materialTab);
|
||||
this.setMaxStackSize(10);
|
||||
}
|
||||
|
||||
|
||||
@@ -38,8 +38,7 @@ public class BarricadeItem extends ItemBlock
|
||||
{
|
||||
side = 1;
|
||||
}
|
||||
else if (b != Blocks.vine && b != Blocks.tallgrass && b != Blocks.deadbush
|
||||
&& (b == null || !b.canPlaceBlockAt(world, x, y, z)))
|
||||
else if (b != Blocks.vine && b != Blocks.tallgrass && b != Blocks.deadbush && (b == null || !b.canPlaceBlockAt(world, x, y, z)))
|
||||
{
|
||||
if (side == 0)
|
||||
{
|
||||
@@ -94,8 +93,8 @@ public class BarricadeItem extends ItemBlock
|
||||
|
||||
if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata))
|
||||
{
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName,
|
||||
(block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F);
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName, (block.stepSound.getVolume() + 1.0F) / 2.0F,
|
||||
block.stepSound.getPitch() * 0.8F);
|
||||
--stack.stackSize;
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ public class HamboneItemBlock extends ItemBlock
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
{
|
||||
list.add("\u00A74"+StatCollector.translateToLocal("hambone1.tooltip"));
|
||||
list.add("\u00A74" + StatCollector.translateToLocal("hambone1.tooltip"));
|
||||
list.add(StatCollector.translateToLocal("hambone2.tooltip"));
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ public class ItemBlockLandmine extends ItemBlock
|
||||
break;
|
||||
}
|
||||
|
||||
par3List.add(StatCollector.translateToLocal("landmine5.tooltip") + interaction);
|
||||
par3List.add(StatCollector.translateToLocal("landmine5.tooltip") + interaction);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,7 +3,6 @@ package tconstruct.items.blocks;
|
||||
import net.minecraft.block.Block;
|
||||
import mantle.blocks.abstracts.MultiItemBlock;
|
||||
|
||||
|
||||
public class SlimeSaplingItemBlock extends MultiItemBlock
|
||||
{
|
||||
public static final String blockTypes[] = { "bluegreen" };
|
||||
|
||||
@@ -14,12 +14,11 @@ public class SlimeTallGrassItem extends MultiItemBlock
|
||||
|
||||
public SlimeTallGrassItem(Block b)
|
||||
{
|
||||
super(b,"block.slime", blockTypes );
|
||||
super(b, "block.slime", blockTypes);
|
||||
setMaxDamage(0);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIconFromDamage (int meta)
|
||||
{
|
||||
|
||||
@@ -21,8 +21,6 @@ public class SmelteryItemBlock extends MultiItemBlock
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
|
||||
@@ -16,7 +16,7 @@ public class SoilSlabItem extends MultiItemBlock
|
||||
|
||||
public SoilSlabItem(Block b)
|
||||
{
|
||||
super(b, "block.soil.slab", blockTypes );
|
||||
super(b, "block.soil.slab", blockTypes);
|
||||
setMaxDamage(0);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
@@ -27,7 +27,7 @@ public class SoilSlabItem extends MultiItemBlock
|
||||
{
|
||||
switch (stack.getItemDamage())
|
||||
{
|
||||
case 3:
|
||||
case 3:
|
||||
list.add(StatCollector.translateToLocal("craftedsoil.slab1.tooltip"));
|
||||
break;
|
||||
case 4:
|
||||
|
||||
@@ -10,8 +10,8 @@ import net.minecraft.util.StatCollector;
|
||||
|
||||
public class SpeedSlabItem extends MultiItemBlock
|
||||
{
|
||||
public static final String blockTypes[] = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", "brownstone.smooth.brick", "brownstone.smooth.road",
|
||||
"brownstone.smooth.fancy", "brownstone.smooth.chiseled" };
|
||||
public static final String blockTypes[] = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", "brownstone.smooth.brick", "brownstone.smooth.road", "brownstone.smooth.fancy",
|
||||
"brownstone.smooth.chiseled" };
|
||||
|
||||
public SpeedSlabItem(Block b)
|
||||
{
|
||||
|
||||
@@ -5,8 +5,7 @@ import mantle.blocks.abstracts.MultiItemBlock;
|
||||
|
||||
public class StainedGlassClearPaneItem extends MultiItemBlock
|
||||
{
|
||||
public static final String blockTypes[] = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan",
|
||||
"purple", "blue", "brown", "green", "red", "black" };
|
||||
public static final String blockTypes[] = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" };
|
||||
|
||||
public StainedGlassClearPaneItem(Block b)
|
||||
{
|
||||
|
||||
@@ -247,7 +247,7 @@ public class Battleaxe extends HarvestTool
|
||||
return false;
|
||||
|
||||
World world = player.worldObj;
|
||||
final Block wood = world.getBlock(x,y,z);
|
||||
final Block wood = world.getBlock(x, y, z);
|
||||
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
|
||||
final int meta = world.getBlockMetadata(x, y, z);
|
||||
for (int yPos = y + 1; yPos < y + 9; yPos++)
|
||||
|
||||
@@ -68,7 +68,7 @@ public class Hammer extends HarvestTool
|
||||
return materials;
|
||||
}
|
||||
|
||||
static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material. anvil };
|
||||
static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil };
|
||||
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
|
||||
@@ -42,7 +42,7 @@ public class Hatchet extends HarvestTool
|
||||
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
|
||||
}
|
||||
|
||||
static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus};//TODO find this//, Material.pumpkin };
|
||||
static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus };//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.wood, Material.vine, Material.circuits, Material.cactus};//TODO find this//, Material.pumpkin };
|
||||
static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus };//TODO find this//, Material.pumpkin };
|
||||
|
||||
/* Lumber axe specific */
|
||||
|
||||
@@ -139,7 +139,8 @@ public class LumberAxe extends HarvestTool
|
||||
return false;
|
||||
|
||||
World world = player.worldObj;
|
||||
final Block wood = world.getBlock(x, y, z);;
|
||||
final Block wood = world.getBlock(x, y, z);
|
||||
;
|
||||
if (wood == null)
|
||||
{
|
||||
return super.onBlockStartBreak(stack, x, y, z, player);
|
||||
|
||||
@@ -47,7 +47,7 @@ public class Mattock extends DualHarvestTool
|
||||
return "shovel";
|
||||
}
|
||||
|
||||
static Material[] axeMaterials = { Material.wood, Material.cactus};//TODO find this//, Material.pumpkin, Material.plants, Material.vine };
|
||||
static Material[] axeMaterials = { Material.wood, Material.cactus };//TODO find this//, Material.pumpkin, Material.plants, Material.vine };
|
||||
static Material[] shovelMaterials = { Material.grass, Material.ground, Material.clay };
|
||||
|
||||
@Override
|
||||
|
||||
@@ -40,7 +40,7 @@ public class Scythe extends Weapon
|
||||
return materials;
|
||||
}
|
||||
|
||||
static Material[] materials = new Material[] { Material.web, Material.cactus};//TODO find this//, Material.pumpkin, Material.plants, Material.vine, Material.leaves };
|
||||
static Material[] materials = new Material[] { Material.web, Material.cactus };//TODO find this//, Material.pumpkin, Material.plants, Material.vine, Material.leaves };
|
||||
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
|
||||
@@ -512,13 +512,13 @@ public class TConstructRegistry
|
||||
* 5: Has rotational TileEntity data
|
||||
* 6: Custom placement logic
|
||||
*/
|
||||
|
||||
|
||||
//moved to TMech
|
||||
//public static HashMap<ItemStack, Integer> drawbridgeState = new HashMap<ItemStack, Integer>();
|
||||
/* Blocks that are interchangable with each other. Ex: Still and flowing water */
|
||||
// static HashMap<Block, Block> interchangableBlockMapping = new HashMap<Block, Block> ();
|
||||
// static HashMap<Block, Block> interchangableBlockMapping = new HashMap<Block, Block> ();
|
||||
/*Blocks that place items, and vice versa */
|
||||
// public static HashBiMap<Block, Item> blockToItemMapping;
|
||||
// public static HashBiMap<Block, Item> blockToItemMapping;
|
||||
|
||||
static void initializeDrawbridgeState ()
|
||||
{
|
||||
|
||||
@@ -111,7 +111,8 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte
|
||||
stack.setTagCompound(tags);
|
||||
data = new NBTTagCompound();
|
||||
tags.setTag(SET_NAME, data);
|
||||
data.setDouble("damageReduction", baseProtection); }
|
||||
data.setDouble("damageReduction", baseProtection);
|
||||
}
|
||||
|
||||
data = tags.getCompoundTag(SET_NAME);
|
||||
|
||||
|
||||
@@ -39,8 +39,8 @@ public abstract class ArmorMod extends ToolMod
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
protected NBTTagCompound getAttributeTag(String attributeType, String modifierName, double amount, boolean flat, UUID uuid)
|
||||
|
||||
protected NBTTagCompound getAttributeTag (String attributeType, String modifierName, double amount, boolean flat, UUID uuid)
|
||||
{
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
tag.setString("AttributeName", attributeType);
|
||||
|
||||
@@ -103,7 +103,6 @@ public class TConstructClientRegistry
|
||||
recipeIcons.put(name, recipe);
|
||||
}
|
||||
|
||||
|
||||
//Gui
|
||||
public static void addToolButton (ToolGuiElement element)
|
||||
{
|
||||
|
||||
@@ -180,7 +180,7 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank
|
||||
@Override
|
||||
public void readNetworkNBT (NBTTagCompound tags)
|
||||
{
|
||||
NBTTagList liquidTag = tags.getTagList("Liquids",9);
|
||||
NBTTagList liquidTag = tags.getTagList("Liquids", 9);
|
||||
fluidlist.clear();
|
||||
|
||||
for (int iter = 0; iter < liquidTag.tagCount(); iter++)
|
||||
|
||||
@@ -13,7 +13,6 @@ import mantle.blocks.iface.IFacingLogic;
|
||||
import mantle.blocks.iface.IMasterLogic;
|
||||
import mantle.blocks.iface.IServantLogic;
|
||||
|
||||
|
||||
public class TankLayerScan extends LogicComponent
|
||||
{
|
||||
protected TileEntity master;
|
||||
@@ -497,7 +496,7 @@ public class TankLayerScan extends LogicComponent
|
||||
public void readFromNBT (NBTTagCompound tags)
|
||||
{
|
||||
super.readFromNBT(tags);
|
||||
NBTTagList layerAir = tags.getTagList("AirLayer",11);
|
||||
NBTTagList layerAir = tags.getTagList("AirLayer", 11);
|
||||
if (layerAir != null)
|
||||
{
|
||||
layerAirCoords.clear();
|
||||
@@ -516,7 +515,7 @@ public class TankLayerScan extends LogicComponent
|
||||
|
||||
for (int i = 0; i < blocks.tagCount(); ++i)
|
||||
{
|
||||
int[] coord = blocks.func_150306_c(i);
|
||||
int[] coord = blocks.func_150306_c(i);
|
||||
blockCoords.add(new CoordTuple(coord[0], coord[1], coord[2]));
|
||||
}
|
||||
}
|
||||
@@ -561,7 +560,7 @@ public class TankLayerScan extends LogicComponent
|
||||
NBTTagList air = new NBTTagList();
|
||||
for (CoordTuple coord : airCoords)
|
||||
{
|
||||
air.appendTag(new NBTTagIntArray( new int[] { coord.x, coord.y, coord.z }));
|
||||
air.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z }));
|
||||
}
|
||||
tags.setTag("Air", air);
|
||||
tags.setInteger("structureTop", structureTop);
|
||||
|
||||
@@ -42,6 +42,7 @@ public class Smeltery
|
||||
{
|
||||
addMelting(new ItemStack(item, 1, metadata), item, metadata, temperature, output);
|
||||
}
|
||||
|
||||
/** Adds mappings between a block and its liquid
|
||||
* Example: Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0));
|
||||
*
|
||||
|
||||
@@ -5,38 +5,44 @@ import mantle.blocks.abstracts.InventoryLogic;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SmelteryEvent extends Event {
|
||||
public class SmelteryEvent extends Event
|
||||
{
|
||||
|
||||
public InventoryLogic component;
|
||||
public int x, y, z;
|
||||
|
||||
public SmelteryEvent(InventoryLogic component, int x, int y, int z)
|
||||
{
|
||||
this.component = component;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
}
|
||||
|
||||
public static class ItemInsertedIntoCasting extends SmelteryEvent
|
||||
{
|
||||
public ItemStack item;
|
||||
public EntityPlayer player;
|
||||
|
||||
public ItemInsertedIntoCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player)
|
||||
{
|
||||
super(component, x, y, z);
|
||||
this.item = item;
|
||||
this.player = player;
|
||||
}
|
||||
}
|
||||
|
||||
public static class ItemRemovedFromCasting extends SmelteryEvent
|
||||
{
|
||||
public ItemStack item;
|
||||
public EntityPlayer player;
|
||||
|
||||
public ItemRemovedFromCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player)
|
||||
{
|
||||
super(component, x, y, z);
|
||||
this.item = item;
|
||||
this.player = player;
|
||||
}
|
||||
}
|
||||
|
||||
public InventoryLogic component;
|
||||
public int x, y, z;
|
||||
|
||||
public SmelteryEvent(InventoryLogic component, int x, int y, int z){
|
||||
this.component = component;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
}
|
||||
|
||||
public static class ItemInsertedIntoCasting extends SmelteryEvent {
|
||||
public ItemStack item;
|
||||
public EntityPlayer player;
|
||||
|
||||
public ItemInsertedIntoCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) {
|
||||
super(component, x, y, z);
|
||||
this.item = item;
|
||||
this.player = player;
|
||||
}
|
||||
}
|
||||
|
||||
public static class ItemRemovedFromCasting extends SmelteryEvent {
|
||||
public ItemStack item;
|
||||
public EntityPlayer player;
|
||||
|
||||
public ItemRemovedFromCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) {
|
||||
super(component, x, y, z);
|
||||
this.item = item;
|
||||
this.player = player;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loaded 100 of 140 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user