Compare commits

...
9 Commits
Author SHA1 Message Date
Space Toad 83248d65c2 merged with ref 198 2011-12-28 21:26:44 +00:00
Space Toad dda9f474af bumbed version number 2011-12-28 21:22:07 +00:00
Space Toad b7e940da22 tagged 1.2.4 2011-12-28 21:20:04 +00:00
LexManos df3449534f Changed Block.setBurnRate to public and Block.setBurnProperties
Re-added bounce functions to BlockFire for non-forge mods.
Should fix Optifine compatibility.
2011-12-24 05:07:55 +00:00
LexManos 906cb8ee39 Fixed a re-name that somehow missed the commit.
Serverside chanceToEncourageFire -> getFireSpreadSpeed
2011-12-24 00:35:41 +00:00
Eloraam d541e492c4 Fixed some rendering issues. 2011-12-23 00:23:01 +00:00
Eloraam d7d0f241ff Another mapping update. 2011-12-22 20:11:38 +00:00
LexManos c8fca39895 Updated mapping for last commit 2011-12-22 02:17:40 +00:00
Eloraam dd1eb6924d Mapping updates. 2011-12-21 23:09:18 +00:00
18 changed files with 186 additions and 123 deletions

No files matched your search

+23 -23
View File
@@ -368,7 +368,7 @@
"field_35484_b","ocean","b","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
"field_35485_c","plains","c","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
"field_4249_h","desert","d","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
"field_35483_e","hills","e","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
"field_35483_e","extremeHills","e","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
"field_4253_d","forest","f","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
"field_4250_g","taiga","g","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
"field_4255_b","swampland","h","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
@@ -2306,10 +2306,10 @@
"field_27028_b","lightningState","b","I","I","EntityLightningBolt","su","net/minecraft/src","0"
"field_27029_a","boltVertex","a","J","J","EntityLightningBolt","su","net/minecraft/src","0"
"field_27030_c","boltLivingTime","c","I","I","EntityLightningBolt","su","net/minecraft/src","0"
"field_35596_a","metaId","a","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
"field_35594_b","minItemStack","b","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
"field_35595_c","maxItemStack","c","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
"field_35593_e","itemWeight","e","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
"field_35596_a","itemID","a","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
"field_35594_b","itemMetadata","b","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
"field_35595_c","minItemStack","c","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
"field_35593_e","maxItemStack","e","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
"field_1202_a","posX","a","I","I","WorldBlockPositionType","agf","net/minecraft/src","0"
"field_1201_b","posY","b","I","I","WorldBlockPositionType","agf","net/minecraft/src","0"
"field_1207_c","posZ","c","I","I","WorldBlockPositionType","agf","net/minecraft/src","0"
@@ -2346,7 +2346,7 @@
"field_40666_e","profilingMap","e","Ljava/util/Map;","Ljava/util/Map;","Profiler","pf","net/minecraft/src","0"
"field_35473_a","heightShift","a","I","I","World","ry","net/minecraft/src","0"
"field_35471_b","xShift","b","I","I","World","ry","net/minecraft/src","0"
"field_35472_c","worldYMax","c","I","I","World","ry","net/minecraft/src","0"
"field_35472_c","worldHeight","c","I","I","World","ry","net/minecraft/src","0"
"field_35469_d","worldMaxY","d","I","I","World","ry","net/minecraft/src","0"
"field_35470_e","seaLevel","e","I","I","World","ry","net/minecraft/src","0"
"field_4214_a","scheduledUpdatesAreImmediate","f","Z","Z","World","ry","net/minecraft/src","0"
@@ -2717,7 +2717,7 @@
"field_27085_k","distanceStatType","g","LIStatType;","Lun;","StatBase","px","net/minecraft/src","0"
"field_40073_a","entityDragonObj","a","LEntityDragonBase;","Ladh;","DragonPart","vc","net/minecraft/src","0"
"field_40072_b","name","b","Ljava/lang/String;","Ljava/lang/String;","DragonPart","vc","net/minecraft/src","0"
"field_35590_d","field_35590_d","d","I","I","WeightedRandomChoice","abt","net/minecraft/src","0"
"field_35590_d","itemWeight","d","I","I","WeightedRandomChoice","abt","net/minecraft/src","0"
"field_1100_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesWeapons","kj","net/minecraft/src","0"
"field_1099_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesWeapons","kj","net/minecraft/src","0"
"field_40704_a","sectionPercentage","a","D","D","ProfilerResult","afx","net/minecraft/src","0"
@@ -2843,7 +2843,7 @@
"field_4176_b","field_4176_b","b","LNoiseGeneratorOctaves;","Leb;","ChunkProviderHell","jv","net/minecraft/src","0"
"field_4164_n","worldObj","o","LWorld;","Lry;","ChunkProviderHell","jv","net/minecraft/src","0"
"field_4163_o","field_4163_o","p","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0"
"field_40378_c","field_40378_c","c","LMapGenNetherBridge;","Led;","ChunkProviderHell","jv","net/minecraft/src","0"
"field_40378_c","genNetherBridge","c","LMapGenNetherBridge;","Led;","ChunkProviderHell","jv","net/minecraft/src","0"
"field_4162_p","field_4162_p","q","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0"
"field_4161_q","gravelNoise","r","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0"
"field_4160_r","field_4160_r","s","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0"
@@ -2982,7 +2982,7 @@
"field_837_a","name","a","Ljava/lang/String;","Ljava/lang/String;","InventoryLargeChest","adv","net/minecraft/src","0"
"field_836_b","upperChest","b","LIInventory;","Lde;","InventoryLargeChest","adv","net/minecraft/src","0"
"field_838_c","lowerChest","c","LIInventory;","Lde;","InventoryLargeChest","adv","net/minecraft/src","0"
"field_1306_a","field_1306_a","a","I","I","MapGenBase","bz","net/minecraft/src","0"
"field_1306_a","range","a","I","I","MapGenBase","bz","net/minecraft/src","0"
"field_1305_b","rand","b","Ljava/util/Random;","Ljava/util/Random;","MapGenBase","bz","net/minecraft/src","0"
"field_35625_d","worldObj","c","LWorld;","Lry;","MapGenBase","bz","net/minecraft/src","0"
"field_455_a","signEntityClass","a","Ljava/lang/Class;","Ljava/lang/Class;","BlockSign","mr","net/minecraft/src","0"
@@ -3440,7 +3440,7 @@
"field_40388_a","field_40388_a","a","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0"
"field_40386_b","field_40386_b","b","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0"
"field_40392_m","endWorld","m","LWorld;","Lry;","ChunkProviderEnd","a","net/minecraft/src","0"
"field_40389_n","field_40389_n","n","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0"
"field_40389_n","densities","n","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0"
"field_40390_o","field_40390_o","o","[LBiomeGenBase;","[Lsr;","ChunkProviderEnd","a","net/minecraft/src","0"
"field_40387_c","field_40387_c","c","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0"
"field_40384_d","field_40384_d","d","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0"
@@ -3800,17 +3800,17 @@
"field_35525_s","temperature","y","F","F","BiomeGenBase","kb","net/minecraft/src","1"
"field_35524_t","rainfall","z","F","F","BiomeGenBase","kb","net/minecraft/src","1"
"field_40461_A","waterColorMultiplier","A","I","I","BiomeGenBase","kb","net/minecraft/src","1"
"field_35523_u","decorator","B","LBiomeDecorator;","Lgo;","BiomeGenBase","kb","net/minecraft/src","1"
"field_35523_u","biomeDecorator","B","LBiomeDecorator;","Lgo;","BiomeGenBase","kb","net/minecraft/src","1"
"field_25058_r","spawnableMonsterList","C","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1"
"field_25057_s","spawnableCreatureList","D","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1"
"field_25056_t","spawnableWaterCreatureList","E","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1"
"field_27051_u","enableSnow","K","Z","Z","BiomeGenBase","kb","net/minecraft/src","1"
"field_27050_v","enableRain","L","Z","Z","BiomeGenBase","kb","net/minecraft/src","1"
"field_35529_y","biomeID","F","I","I","BiomeGenBase","kb","net/minecraft/src","1"
"field_35528_z","treeGenerator","G","LWorldGenTrees;","Lxs;","BiomeGenBase","kb","net/minecraft/src","1"
"field_35515_A","bigTreeGenerator","H","LWorldGenBigTree;","Lim;","BiomeGenBase","kb","net/minecraft/src","1"
"field_35516_B","forestGenerator","I","LWorldGenForest;","Ll;","BiomeGenBase","kb","net/minecraft/src","1"
"field_35517_C","swampTreeGenerator","J","LWorldGenSwamp;","Lbk;","BiomeGenBase","kb","net/minecraft/src","1"
"field_35528_z","worldGenTrees","G","LWorldGenTrees;","Lxs;","BiomeGenBase","kb","net/minecraft/src","1"
"field_35515_A","worldGenBigTree","H","LWorldGenBigTree;","Lim;","BiomeGenBase","kb","net/minecraft/src","1"
"field_35516_B","worldGenForest","I","LWorldGenForest;","Ll;","BiomeGenBase","kb","net/minecraft/src","1"
"field_35517_C","worldGenSwamp","J","LWorldGenSwamp;","Lbk;","BiomeGenBase","kb","net/minecraft/src","1"
"field_40334_a","tableInventory","a","LIInventory;","Llp;","ContainerEnchantment","iq","net/minecraft/src","1"
"field_40338_h","worldPointer","h","LWorld;","Lfi;","ContainerEnchantment","iq","net/minecraft/src","1"
"field_40339_i","field_40339_i","i","I","I","ContainerEnchantment","iq","net/minecraft/src","1"
@@ -4786,7 +4786,7 @@
"field_482_d","zCoord","n","I","I","TileEntity","oh","net/minecraft/src","1"
"field_31006_h","tileEntityInvalid","o","Z","Z","TileEntity","oh","net/minecraft/src","1"
"field_35165_n","blockMetadata","p","I","I","TileEntity","oh","net/minecraft/src","1"
"field_35166_o","field_35166_o","q","LBlock;","Ltl;","TileEntity","oh","net/minecraft/src","1"
"field_35166_o","blockType","q","LBlock;","Ltl;","TileEntity","oh","net/minecraft/src","1"
"field_659_a","numAdjacentSources","a","I","I","BlockFlowing","nx","net/minecraft/src","1"
"field_658_b","isOptimalFlowDirection","b","[Z","[Z","BlockFlowing","nx","net/minecraft/src","1"
"field_660_c","flowCost","c","[I","[I","BlockFlowing","nx","net/minecraft/src","1"
@@ -4909,7 +4909,7 @@
"field_748_m","heightLimitLimit","m","I","I","WorldGenBigTree","im","net/minecraft/src","1"
"field_747_n","leafDistanceLimit","n","I","I","WorldGenBigTree","im","net/minecraft/src","1"
"field_746_o","leafNodes","o","[[I","[[I","WorldGenBigTree","im","net/minecraft/src","1"
"field_271_a","cropID","a","I","I","ItemSeeds","ql","net/minecraft/src","1"
"field_271_a","blockType","a","I","I","ItemSeeds","ql","net/minecraft/src","1"
"field_40253_bQ","field_40253_bQ","b","I","I","ItemSeeds","ql","net/minecraft/src","1"
"field_40269_f","field_40269_f","f","LEntityPlayer;","Lgz;","SlotBrewingStandPotion","lj","net/minecraft/src","1"
"field_40270_a","field_40270_a","a","LContainerBrewingStand;","Lje;","SlotBrewingStandPotion","lj","net/minecraft/src","1"
@@ -5041,7 +5041,7 @@
"field_35096_j","generic","j","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1"
"field_35097_k","explosion","k","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1"
"field_35094_l","magic","l","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1"
"field_35092_n","isBlockable","n","Z","Z","DamageSource","po","net/minecraft/src","1"
"field_35092_n","isUnblockable","n","Z","Z","DamageSource","po","net/minecraft/src","1"
"field_35093_o","isDamageAllowedInCreativeMode","o","Z","Z","DamageSource","po","net/minecraft/src","1"
"field_35100_p","hungerDamage","p","F","F","DamageSource","po","net/minecraft/src","1"
"field_40278_q","fireDamage","q","Z","Z","DamageSource","po","net/minecraft/src","1"
@@ -5075,10 +5075,10 @@
"field_27018_b","lightningState","b","I","I","EntityLightningBolt","d","net/minecraft/src","1"
"field_27019_a","boltVertex","a","J","J","EntityLightningBolt","d","net/minecraft/src","1"
"field_27020_c","boltLivingTime","c","I","I","EntityLightningBolt","d","net/minecraft/src","1"
"field_35489_a","metaId","a","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
"field_35487_b","minItemStack","b","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
"field_35488_c","maxItemStack","c","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
"field_35486_e","itemWeight","e","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
"field_35489_a","itemID","a","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
"field_35487_b","itemMetadata","b","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
"field_35488_c","minItemStack","c","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
"field_35486_e","maxItemStack","e","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
"field_20017_a","windowId","a","I","I","Packet103SetSlot","hx","net/minecraft/src","1"
"field_20016_b","itemSlot","b","I","I","Packet103SetSlot","hx","net/minecraft/src","1"
"field_20018_c","myItemStack","c","LItemStack;","Ljb;","Packet103SetSlot","hx","net/minecraft/src","1"
@@ -5402,7 +5402,7 @@
"field_975_h","playerList","h","Ljava/util/ArrayList;","Ljava/util/ArrayList;","NetworkListenThread","ep","net/minecraft/src","1"
"field_980_c","mcServer","c","LMinecraftServer;","LMinecraftServer;","NetworkListenThread","ep","net/minecraft/src","1"
"field_35506_i","field_35506_i","i","Ljava/util/HashMap;","Ljava/util/HashMap;","NetworkListenThread","ep","net/minecraft/src","1"
"field_35483_d","field_35483_d","d","I","I","WeightedRandomChoice","cp","net/minecraft/src","1"
"field_35483_d","itemWeight","d","I","I","WeightedRandomChoice","cp","net/minecraft/src","1"
"field_20114_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesWeapons","wp","net/minecraft/src","1"
"field_20113_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesWeapons","wp","net/minecraft/src","1"
"field_35373_a","field_35373_a","a","I","I","ComponentVillageHouse3","gi","net/minecraft/src","1"
Can't render this file because it is too large.
+21 -21
View File
@@ -9,7 +9,7 @@
"func_594_b","displaySavingString","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IProgressUpdate","rz","net/minecraft/src","0"
"func_595_d","displayLoadingString","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IProgressUpdate","rz","net/minecraft/src","0"
"func_593_a","setLoadingProgress","a","(I)V","(I)V","IProgressUpdate","rz","net/minecraft/src","0"
"func_40156_a","func_40156_a","a","(LDragonPart;LDamageSource;I)Z","(Lvc;Lpm;I)Z","EntityDragonBase","adh","net/minecraft/src","0"
"func_40156_a","attackEntityFromPart","a","(LDragonPart;LDamageSource;I)Z","(Lvc;Lpm;I)Z","EntityDragonBase","adh","net/minecraft/src","0"
"func_40155_e","func_40155_e","e","(LDamageSource;I)Z","(Lpm;I)Z","EntityDragonBase","adh","net/minecraft/src","0"
"func_407_b","multiplyVelocity","d","(F)LEntityFX;","(F)Lwc;","EntityFX","wc","net/minecraft/src","0"
"func_405_d","func_405_d","e","(F)LEntityFX;","(F)Lwc;","EntityFX","wc","net/minecraft/src","0"
@@ -778,7 +778,7 @@
"func_22329_a","func_22329_a","a","(III)I","(III)I","PathPoint","mo","net/minecraft/src","0"
"func_1180_a","distanceTo","a","(LPathPoint;)F","(Lmo;)F","PathPoint","mo","net/minecraft/src","0"
"func_1179_a","isAssigned","a","()Z","()Z","PathPoint","mo","net/minecraft/src","0"
"func_35374_a","func_35374_a","a","(F)V","(F)V","ContainerCreative","afp","net/minecraft/src","0"
"func_35374_a","scrollTo","a","(F)V","(F)V","ContainerCreative","afp","net/minecraft/src","0"
"func_441_c","setSlimeSize","b","(I)V","(I)V","EntitySlime","aed","net/minecraft/src","0"
"func_25027_v","getSlimeSize","aF","()I","()I","EntitySlime","aed","net/minecraft/src","0"
"func_40135_ac","func_40135_ac","ax","()Ljava/lang/String;","()Ljava/lang/String;","EntitySlime","aed","net/minecraft/src","0"
@@ -909,7 +909,7 @@
"func_35621_a","saveMapToFileWithBackup","a","(LNBTTagCompound;Ljava/io/File;)V","(Lik;Ljava/io/File;)V","CompressedStreamTools","vx","net/minecraft/src","0"
"func_35620_b","saveMapToFile","b","(LNBTTagCompound;Ljava/io/File;)V","(Lik;Ljava/io/File;)V","CompressedStreamTools","vx","net/minecraft/src","0"
"func_35622_a","writeMapToFileUncompressed","a","(Ljava/io/File;)LNBTTagCompound;","(Ljava/io/File;)Lik;","CompressedStreamTools","vx","net/minecraft/src","0"
"func_1141_a","writeMapUncompressed","a","(Ljava/io/DataInput;)LNBTTagCompound;","(Ljava/io/DataInput;)Lik;","CompressedStreamTools","vx","net/minecraft/src","0"
"func_1141_a","read","a","(Ljava/io/DataInput;)LNBTTagCompound;","(Ljava/io/DataInput;)Lik;","CompressedStreamTools","vx","net/minecraft/src","0"
"func_1139_a","writeTo","a","(LNBTTagCompound;Ljava/io/DataOutput;)V","(Lik;Ljava/io/DataOutput;)V","CompressedStreamTools","vx","net/minecraft/src","0"
"func_35651_a","func_35651_a","a","(II)LBiomeGenBase;","(II)Lsr;","BiomeCacheBlock","cq","net/minecraft/src","0"
"func_35650_b","func_35650_b","b","(II)F","(II)F","BiomeCacheBlock","cq","net/minecraft/src","0"
@@ -1246,7 +1246,7 @@
"func_40298_a","setTextureOffset","a","(Ljava/lang/String;II)V","(Ljava/lang/String;II)V","ModelBase","al","net/minecraft/src","0"
"func_40297_a","func_40297_a","a","(Ljava/lang/String;)LTextureOffset;","(Ljava/lang/String;)Lsx;","ModelBase","al","net/minecraft/src","0"
"func_4066_a","renderGameOverlay","a","(FZII)V","(FZII)V","GuiIngame","qd","net/minecraft/src","0"
"func_41039_c","func_41039_c","c","()V","()V","GuiIngame","qd","net/minecraft/src","0"
"func_41039_c","renderBossHealth","c","()V","()V","GuiIngame","qd","net/minecraft/src","0"
"func_4063_a","renderPumpkinBlur","a","(II)V","(II)V","GuiIngame","qd","net/minecraft/src","0"
"func_4064_a","renderVignette","a","(FII)V","(FII)V","GuiIngame","qd","net/minecraft/src","0"
"func_4065_b","renderPortalOverlay","b","(FII)V","(FII)V","GuiIngame","qd","net/minecraft/src","0"
@@ -1278,7 +1278,7 @@
"func_542_c","func_542_c","f","(II)LChunk;","(II)Lzx;","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0"
"func_541_a","saveExtraChunkData","a","(LChunk;)V","(Lzx;)V","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0"
"func_540_b","saveChunk","b","(LChunk;)V","(Lzx;)V","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0"
"func_26002_a","func_26002_a","a","([B)V","([B)V","ChunkBlockMap","aig","net/minecraft/src","0"
"func_26002_a","removeUnknownBlockIDs","a","([B)V","([B)V","ChunkBlockMap","aig","net/minecraft/src","0"
"func_22154_d","createSessionLock","e","()V","()V","SaveHandler","e","net/minecraft/src","0"
"func_22153_a","getSaveDirectory","a","()Ljava/io/File;","()Ljava/io/File;","SaveHandler","e","net/minecraft/src","0"
"func_177_a","renderCow","a","(LEntityCow;DDDFF)V","(Ladr;DDDFF)V","RenderCow","lj","net/minecraft/src","0"
@@ -1748,10 +1748,10 @@
"func_35535_a","causeArrowDamage","a","(LEntityArrow;LEntity;)LDamageSource;","(Lro;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0"
"func_35530_a","causeFireballDamage","a","(LEntityFireball;LEntity;)LDamageSource;","(Laad;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0"
"func_35524_a","causeThrownDamage","a","(LEntity;LEntity;)LDamageSource;","(Lia;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0"
"func_40542_b","func_40542_b","b","(LEntity;LEntity;)LDamageSource;","(Lia;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0"
"func_40542_b","causeIndirectMagicDamage","b","(LEntity;LEntity;)LDamageSource;","(Lia;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0"
"func_40547_b","isProjectile","b","()Z","()Z","DamageSource","pm","net/minecraft/src","0"
"func_40544_c","setProjectile","c","()LDamageSource;","()Lpm;","DamageSource","pm","net/minecraft/src","0"
"func_35534_b","unblockable","d","()Z","()Z","DamageSource","pm","net/minecraft/src","0"
"func_35534_b","isUnblockable","d","()Z","()Z","DamageSource","pm","net/minecraft/src","0"
"func_35533_c","getHungerDamage","e","()F","()F","DamageSource","pm","net/minecraft/src","0"
"func_35529_d","canHarmInCreative","f","()Z","()Z","DamageSource","pm","net/minecraft/src","0"
"func_35526_e","getSourceOfDamage","g","()LEntity;","()Lia;","DamageSource","pm","net/minecraft/src","0"
@@ -1807,7 +1807,7 @@
"func_4080_j","updateBlocksAndPlayCaveSounds","f","()V","()V","World","ry","net/minecraft/src","0"
"func_22136_c","scheduleBlockUpdate","a","(IIIII)V","(IIIII)V","World","ry","net/minecraft/src","0"
"func_700_a","tickUpdates","a","(Z)Z","(Z)Z","World","ry","net/minecraft/src","0"
"func_674_a","entityJoinedWorld","a","(LEntity;)Z","(Lia;)Z","World","ry","net/minecraft/src","0"
"func_674_a","spawnEntityInWorld","a","(LEntity;)Z","(Lia;)Z","World","ry","net/minecraft/src","0"
"func_607_d","setEntityDead","b","(LEntity;)V","(Lia;)V","World","ry","net/minecraft/src","0"
"func_606_b","obtainEntitySkin","c","(LEntity;)V","(Lia;)V","World","ry","net/minecraft/src","0"
"func_678_c","releaseEntitySkin","d","(LEntity;)V","(Lia;)V","World","ry","net/minecraft/src","0"
@@ -2187,7 +2187,7 @@
"func_1108_b","floor_double","c","(D)I","(D)I","MathHelper","me","net/minecraft/src","0"
"func_35599_c","floor_double_long","d","(D)J","(D)J","MathHelper","me","net/minecraft/src","0"
"func_1112_e","abs","e","(F)F","(F)F","MathHelper","me","net/minecraft/src","0"
"func_35597_a","abs_int","a","(I)I","(I)I","MathHelper","me","net/minecraft/src","0"
"func_35597_a","abs","a","(I)I","(I)I","MathHelper","me","net/minecraft/src","0"
"func_41084_a","clamp_int","a","(III)I","(III)I","MathHelper","me","net/minecraft/src","0"
"func_1107_a","abs_max","a","(DD)D","(DD)D","MathHelper","me","net/minecraft/src","0"
"func_1111_a","bucketInt","a","(II)I","(II)I","MathHelper","me","net/minecraft/src","0"
@@ -2873,7 +2873,7 @@
"func_438_a","displaySavingString","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IProgressUpdate","xk","net/minecraft/src","1"
"func_439_b","displayLoadingString","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IProgressUpdate","xk","net/minecraft/src","1"
"func_437_a","setLoadingProgress","a","(I)V","(I)V","IProgressUpdate","xk","net/minecraft/src","1"
"func_40136_a","func_40136_a","a","(LDragonPart;LDamageSource;I)Z","(Led;Lpo;I)Z","EntityDragonBase","ui","net/minecraft/src","1"
"func_40136_a","attackEntityFromPart","a","(LDragonPart;LDamageSource;I)Z","(Led;Lpo;I)Z","EntityDragonBase","ui","net/minecraft/src","1"
"func_40137_e","func_40137_e","e","(LDamageSource;I)Z","(Lpo;I)Z","EntityDragonBase","ui","net/minecraft/src","1"
"func_444_a","getBlockId","a","(III)I","(III)I","IBlockAccess","wy","net/minecraft/src","1"
"func_451_k","getBlockTileEntity","b","(III)LTileEntity;","(III)Loh;","IBlockAccess","wy","net/minecraft/src","1"
@@ -2904,7 +2904,7 @@
"func_28129_i","setIsTranslucent","o","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1"
"func_31058_n","setNoHarvest","e","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1"
"func_4052_f","setBurning","f","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1"
"func_4051_e","getBurning","g","()Z","()Z","Material","lg","net/minecraft/src","1"
"func_4051_e","getCanBurn","g","()Z","()Z","Material","lg","net/minecraft/src","1"
"func_27089_f","setIsGroundCover","h","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1"
"func_27090_g","getIsGroundCover","i","()Z","()Z","Material","lg","net/minecraft/src","1"
"func_28128_h","getIsOpaque","j","()Z","()Z","Material","lg","net/minecraft/src","1"
@@ -3051,7 +3051,7 @@
"func_35197_c","canEat","b","(Z)Z","(Z)Z","EntityPlayer","gz","net/minecraft/src","1"
"func_35206_W","mustHeal","ab","()Z","()Z","EntityPlayer","gz","net/minecraft/src","1"
"func_35201_a","setItemInUse","a","(LItemStack;I)V","(Ljb;I)V","EntityPlayer","gz","net/minecraft/src","1"
"func_35200_c","func_35200_c","d","(III)Z","(III)Z","EntityPlayer","gz","net/minecraft/src","1"
"func_35200_c","canPlayerEdit","d","(III)Z","(III)Z","EntityPlayer","gz","net/minecraft/src","1"
"func_40107_e","func_40107_e","e","(I)V","(I)V","EntityPlayer","gz","net/minecraft/src","1"
"func_41031_d","copyPlayer","c","(LEntityPlayer;)V","(Lgz;)V","EntityPlayer","gz","net/minecraft/src","1"
"func_41040_a","func_41040_a","a","([Ljava/lang/String;)LItemColored;","([Ljava/lang/String;)Lwm;","ItemColored","wm","net/minecraft/src","1"
@@ -3066,7 +3066,7 @@
"func_25055_a","getSpawnableList","a","(LEnumCreatureType;)Ljava/util/List;","(Lla;)Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1"
"func_27049_c","getEnableSnow","b","()Z","()Z","BiomeGenBase","kb","net/minecraft/src","1"
"func_27048_d","canSpawnLightningBolt","c","()Z","()Z","BiomeGenBase","kb","net/minecraft/src","1"
"func_4078_a","getBiome","d","()F","()F","BiomeGenBase","kb","net/minecraft/src","1"
"func_4078_a","getSpawningChance","d","()F","()F","BiomeGenBase","kb","net/minecraft/src","1"
"func_35510_e","getIntRainfall","e","()I","()I","BiomeGenBase","kb","net/minecraft/src","1"
"func_35509_f","getIntTemperature","f","()I","()I","BiomeGenBase","kb","net/minecraft/src","1"
"func_35513_a","func_35513_a","a","(LWorld;Ljava/util/Random;II)V","(Lfi;Ljava/util/Random;II)V","BiomeGenBase","kb","net/minecraft/src","1"
@@ -3386,8 +3386,8 @@
"func_435_a","update","a","(LGuiStatsComponent;)V","(Lkp;)V","GuiStatsComponent","kp","net/minecraft/src","1"
"func_770_a","loadGzippedCompoundFromOutputStream","a","(Ljava/io/InputStream;)LNBTTagCompound;","(Ljava/io/InputStream;)Lng;","CompressedStreamTools","ax","net/minecraft/src","1"
"func_769_a","writeGzippedCompoundToOutputStream","a","(LNBTTagCompound;Ljava/io/OutputStream;)V","(Lng;Ljava/io/OutputStream;)V","CompressedStreamTools","ax","net/minecraft/src","1"
"func_40515_a","func_40515_a","a","([B)LNBTTagCompound;","([B)Lng;","CompressedStreamTools","ax","net/minecraft/src","1"
"func_40516_a","func_40516_a","a","(LNBTTagCompound;)[B","(Lng;)[B","CompressedStreamTools","ax","net/minecraft/src","1"
"func_40515_a","loadMapFromByteArray","a","([B)LNBTTagCompound;","([B)Lng;","CompressedStreamTools","ax","net/minecraft/src","1"
"func_40516_a","writeMapToByteArray","a","(LNBTTagCompound;)[B","(Lng;)[B","CompressedStreamTools","ax","net/minecraft/src","1"
"func_774_a","read","a","(Ljava/io/DataInput;)LNBTTagCompound;","(Ljava/io/DataInput;)Lng;","CompressedStreamTools","ax","net/minecraft/src","1"
"func_771_a","writeTo","a","(LNBTTagCompound;Ljava/io/DataOutput;)V","(Lng;Ljava/io/DataOutput;)V","CompressedStreamTools","ax","net/minecraft/src","1"
"func_35700_a","func_35700_a","a","(II)LBiomeGenBase;","(II)Lkb;","BiomeCacheBlock","tb","net/minecraft/src","1"
@@ -4085,10 +4085,10 @@
"func_35073_a","causeArrowDamage","a","(LEntityArrow;LEntity;)LDamageSource;","(Lrk;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1"
"func_35082_a","causeFireballDamage","a","(LEntityFireball;LEntity;)LDamageSource;","(Lch;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1"
"func_35081_a","causeThrownDamage","a","(LEntity;LEntity;)LDamageSource;","(Lrn;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1"
"func_40271_b","func_40271_b","b","(LEntity;LEntity;)LDamageSource;","(Lrn;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1"
"func_40271_b","causeIndirectMagicDamage","b","(LEntity;LEntity;)LDamageSource;","(Lrn;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1"
"func_40275_b","isProjectile","b","()Z","()Z","DamageSource","po","net/minecraft/src","1"
"func_40273_c","setProjectile","c","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1"
"func_35083_b","unblockable","d","()Z","()Z","DamageSource","po","net/minecraft/src","1"
"func_35083_b","isUnblockable","d","()Z","()Z","DamageSource","po","net/minecraft/src","1"
"func_35074_c","getHungerDamage","e","()F","()F","DamageSource","po","net/minecraft/src","1"
"func_35077_d","canHarmInCreative","f","()Z","()Z","DamageSource","po","net/minecraft/src","1"
"func_35079_e","getSourceOfDamage","g","()LEntity;","()Lrn;","DamageSource","po","net/minecraft/src","1"
@@ -4164,7 +4164,7 @@
"func_491_a","playRecord","a","(Ljava/lang/String;III)V","(Ljava/lang/String;III)V","World","fi","net/minecraft/src","1"
"func_514_a","spawnParticle","a","(Ljava/lang/String;DDDDDD)V","(Ljava/lang/String;DDDDDD)V","World","fi","net/minecraft/src","1"
"func_27073_a","addLightningBolt","a","(LEntity;)Z","(Lrn;)Z","World","fi","net/minecraft/src","1"
"func_526_a","entityJoinedWorld","b","(LEntity;)Z","(Lrn;)Z","World","fi","net/minecraft/src","1"
"func_526_a","spawnEntityInWorld","b","(LEntity;)Z","(Lrn;)Z","World","fi","net/minecraft/src","1"
"func_479_b","obtainEntitySkin","c","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1"
"func_531_c","releaseEntitySkin","d","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1"
"func_22085_d","removePlayerForLogoff","e","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1"
@@ -4445,7 +4445,7 @@
"func_584_b","floor_double","b","(D)I","(D)I","MathHelper","in","net/minecraft/src","1"
"func_35477_c","floor_double_long","c","(D)J","(D)J","MathHelper","in","net/minecraft/src","1"
"func_587_e","abs","e","(F)F","(F)F","MathHelper","in","net/minecraft/src","1"
"func_35475_a","getUnsigned","a","(I)I","(I)I","MathHelper","in","net/minecraft/src","1"
"func_35475_a","abs","a","(I)I","(I)I","MathHelper","in","net/minecraft/src","1"
"func_41051_a","func_41051_a","a","(III)I","(III)I","MathHelper","in","net/minecraft/src","1"
"func_581_a","abs_max","a","(DD)D","(DD)D","MathHelper","in","net/minecraft/src","1"
"func_35476_a","getRandomIntegerInRange","a","(Ljava/util/Random;II)I","(Ljava/util/Random;II)I","MathHelper","in","net/minecraft/src","1"
@@ -4547,7 +4547,7 @@
"func_21134_a","matches","a","(LInventoryCrafting;)Z","(Lmc;)Z","IRecipe","dz","net/minecraft/src","1"
"func_21136_b","getCraftingResult","b","(LInventoryCrafting;)LItemStack;","(Lmc;)Ljb;","IRecipe","dz","net/minecraft/src","1"
"func_20165_a","getRecipeSize","a","()I","()I","IRecipe","dz","net/minecraft/src","1"
"func_4062_a","func_4062_a","a","(II[B)V","(II[B)V","ChunkProviderHell","pp","net/minecraft/src","1"
"func_4062_a","generateNetherTerrain","a","(II[B)V","(II[B)V","ChunkProviderHell","pp","net/minecraft/src","1"
"func_4061_b","func_4061_b","b","(II[B)V","(II[B)V","ChunkProviderHell","pp","net/minecraft/src","1"
"func_4060_a","func_4060_a","a","([DIIIIII)[D","([DIIIIII)[D","ChunkProviderHell","pp","net/minecraft/src","1"
"func_35556_d","dropChunk","d","(II)V","(II)V","ChunkProvider","nt","net/minecraft/src","1"
@@ -4715,7 +4715,7 @@
"func_41028_k","getTimeSinceHit","k","()I","()I","EntityBoat","gh","net/minecraft/src","1"
"func_41026_d","setForwardDirection","d","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1"
"func_41029_m","getForwardDirection","l","()I","()I","EntityBoat","gh","net/minecraft/src","1"
"func_28025_b","isACube","b","()Z","()Z","Block","tl","net/minecraft/src","1"
"func_28025_b","renderAsNormalBlock","b","()Z","()Z","Block","tl","net/minecraft/src","1"
"func_259_a","canPlaceBlockAt","c","(LWorld;III)Z","(Lfi;III)Z","Block","tl","net/minecraft/src","1"
"func_220_f","canBlockStay","f","(LWorld;III)Z","(Lfi;III)Z","Block","tl","net/minecraft/src","1"
"func_221_a","updateTick","a","(LWorld;IIILjava/util/Random;)V","(Lfi;IIILjava/util/Random;)V","Block","tl","net/minecraft/src","1"
Can't render this file because it is too large.
@@ -106,6 +106,7 @@ public class ForgeHooksClient {
Tessellator.instance=t;
}
static IRenderContextHandler unbindContext=null;
protected static void bindTexture(String name, int sub) {
Integer n;
n=textures.get(name);
@@ -115,12 +116,20 @@ public class ForgeHooksClient {
textures.put(name,n);
}
if(!inWorld) {
if(unbindContext!=null) {
unbindContext.afterRenderContext();
unbindContext=null;
}
if(Tessellator.instance.isDrawing) {
int mode=Tessellator.instance.drawMode;
Tessellator.instance.draw();
Tessellator.instance.startDrawing(mode);
}
GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n);
unbindContext=renderHandlers.get(new TesKey(n,sub));
if(unbindContext!=null) {
unbindContext.beforeRenderContext();
}
return;
}
bindTessellator(n,sub);
@@ -133,6 +142,10 @@ public class ForgeHooksClient {
if(Tessellator.instance.isDrawing) {
int mode=Tessellator.instance.drawMode;
Tessellator.instance.draw();
if(unbindContext!=null) {
unbindContext.afterRenderContext();
unbindContext=null;
}
Tessellator.instance.startDrawing(mode);
}
GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
@@ -269,7 +269,7 @@ public class ForgeHooks {
public static final int majorVersion=1;
public static final int minorVersion=2;
public static final int revisionVersion=3;
public static final int revisionVersion=4;
static {
System.out.printf("MinecraftForge V%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion);
}
@@ -321,7 +321,7 @@
+ * @param encouragement How much the block encourages fire to spread
+ * @param flammability how easy a block is to catch fire
+ */
+ protected static void setBurnRate(int id, int encouragement, int flammability)
+ public static void setBurnProperties(int id, int encouragement, int flammability)
+ {
+ blockFireSpreadSpeed[id] = encouragement;
+ blockFlammability[id] = flammability;
@@ -38,7 +38,7 @@
- float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
- entityitem.delayBeforeCanPickup = 10;
- world.entityJoinedWorld(entityitem);
- world.spawnEntityInWorld(entityitem);
+ tr.add(new ItemStack(Item.seeds));
}
}
@@ -20,20 +20,21 @@
setTickOnLoad(true);
}
@@ -39,12 +39,6 @@
@@ -38,11 +38,10 @@
setBurnRate(Block.cloth.blockID, 30, 60);
setBurnRate(Block.vine.blockID, 15, 100);
}
- private void setBurnRate(int i, int j, int k)
- {
-
+
private void setBurnRate(int i, int j, int k)
{
- chanceToEncourageFire[i] = j;
- abilityToCatchFire[i] = k;
- }
-
+ Block.setBurnProperties(i, j, k);
}
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int i, int j, int k)
{
return null;
@@ -77,11 +71,9 @@
@@ -77,11 +76,9 @@
public void updateTick(World world, int i, int j, int k, Random random)
{
@@ -48,7 +49,7 @@
if(!canPlaceBlockAt(world, i, j, k))
{
world.setBlockWithNotify(i, j, k, 0);
@@ -99,23 +91,23 @@
@@ -99,23 +96,23 @@
world.scheduleBlockUpdate(i, j, k, blockID, tickRate());
if(!flag && !func_263_h(world, i, j, k))
{
@@ -80,14 +81,22 @@
for(int i1 = i - 1; i1 <= i + 1; i1++)
{
for(int j1 = k - 1; j1 <= k + 1; j1++)
@@ -155,9 +147,14 @@
@@ -155,9 +152,23 @@
}
- private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1)
+ private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1, int face)
+ /*
+ * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
+ */
+ @Deprecated
private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1)
{
- int j1 = abilityToCatchFire[world.getBlockId(i, j, k)];
+ tryToCatchBlockOnFire(world, i, j, k, l, random, i1, 0);
+ }
+
+ private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1, int face)
+ {
+ Block block = Block.blocksList[world.getBlockId(i, j, k)];
+ int j1 = 0;
+ if (block != null)
@@ -97,7 +106,7 @@
if(random.nextInt(l) < j1)
{
boolean flag = world.getBlockId(i, j, k) == Block.tnt.blockID;
@@ -182,27 +179,27 @@
@@ -182,27 +193,27 @@
private boolean func_263_h(World world, int i, int j, int k)
{
@@ -131,7 +140,7 @@
}
private int getChanceOfNeighborsEncouragingFire(World world, int i, int j, int k)
@@ -213,12 +210,12 @@
@@ -213,12 +224,12 @@
return 0;
} else
{
@@ -150,19 +159,24 @@
return l;
}
}
@@ -228,14 +225,25 @@
@@ -227,15 +238,43 @@
{
return false;
}
- public boolean canBlockCatchFire(IBlockAccess iblockaccess, int i, int j, int k)
- {
- return chanceToEncourageFire[iblockaccess.getBlockId(i, j, k)] > 0;
- }
- public int getChanceToEncourageFire(World world, int i, int j, int k, int l)
+ public boolean canBlockCatchFire(IBlockAccess world, int i, int j, int k, int face)
-
+
+ /*
+ * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
+ */
+ @Deprecated
public boolean canBlockCatchFire(IBlockAccess iblockaccess, int i, int j, int k)
{
- int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)];
- return chanceToEncourageFire[iblockaccess.getBlockId(i, j, k)] > 0;
+ return canBlockCatchFire(iblockaccess, i, j, k, 0);
}
+ public boolean canBlockCatchFire(IBlockAccess world, int i, int j, int k, int face)
+ {
+ Block block = Block.blocksList[world.getBlockId(i, j, k)];
+ if (block != null)
+ {
@@ -171,6 +185,16 @@
+ return false;
+ }
+
+ /*
+ * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
+ */
+ @Deprecated
public int getChanceToEncourageFire(World world, int i, int j, int k, int l)
{
- int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)];
+ return getChanceToEncourageFire(world, i, j, k, l, 0);
+ }
+
+ public int getChanceToEncourageFire(World world, int i, int j, int k, int l, int face)
+ {
+ int i1 = 0;
@@ -182,7 +206,7 @@
if(i1 > l)
{
return i1;
@@ -247,12 +255,12 @@
@@ -247,12 +286,12 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
{
@@ -197,7 +221,7 @@
{
world.setBlockWithNotify(i, j, k, 0);
return;
@@ -268,7 +276,7 @@
@@ -268,7 +307,7 @@
{
return;
}
@@ -206,7 +230,7 @@
{
world.setBlockWithNotify(i, j, k, 0);
return;
@@ -285,7 +293,7 @@
@@ -285,7 +324,7 @@
{
world.playSoundEffect((float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, "fire.fire", 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F);
}
@@ -215,7 +239,7 @@
{
for(int l = 0; l < 3; l++)
{
@@ -297,7 +305,7 @@
@@ -297,7 +336,7 @@
} else
{
@@ -224,7 +248,7 @@
{
for(int i1 = 0; i1 < 2; i1++)
{
@@ -308,7 +316,7 @@
@@ -308,7 +347,7 @@
}
}
@@ -233,7 +257,7 @@
{
for(int j1 = 0; j1 < 2; j1++)
{
@@ -319,7 +327,7 @@
@@ -319,7 +358,7 @@
}
}
@@ -242,7 +266,7 @@
{
for(int k1 = 0; k1 < 2; k1++)
{
@@ -330,7 +338,7 @@
@@ -330,7 +369,7 @@
}
}
@@ -251,7 +275,7 @@
{
for(int l1 = 0; l1 < 2; l1++)
{
@@ -341,7 +349,7 @@
@@ -341,7 +380,7 @@
}
}
@@ -11,7 +11,7 @@
- double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
- EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0));
- entityitem.delayBeforeCanPickup = 10;
- world.entityJoinedWorld(entityitem);
- world.spawnEntityInWorld(entityitem);
- world.setBlockWithNotify(i, j, k, 0);
+
+ dropBlockAsItem(world,i,j,k,l,0);
@@ -30,7 +30,7 @@
public void dropPlayerItem(ItemStack itemstack)
@@ -548,6 +561,8 @@
worldObj.entityJoinedWorld(entityitem);
worldObj.spawnEntityInWorld(entityitem);
}
+ /* FORGE: This isnt called anymore
@@ -107,7 +107,7 @@
+ return;
+ }
+
if(!damagesource.unblockable() && func_35162_ad())
if(!damagesource.isUnblockable() && func_35162_ad())
{
i = 1 + i >> 1;
@@ -825,7 +898,9 @@
@@ -137,7 +137,7 @@
+ * others.
+ */
+ public boolean isBlockNormalCube(World world, int i, int j, int k) {
+ return blockMaterial.getIsOpaque() && isACube();
+ return blockMaterial.getIsOpaque() && renderAsNormalBlock();
+ }
+
+ /* FORGE: Return true if the block is solid on the given side. This
@@ -267,7 +267,7 @@
+ * @param face The face that the fire is coming from
+ * @return A number that is used to determine the speed of fire growth around the block
+ */
+ public int chanceToEncourageFire(World world, int x, int y, int z, int metadata, int face)
+ public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, int face)
+ {
+ return blockFireSpreadSpeed[blockID];
+ }
@@ -304,7 +304,7 @@
+ * @param encouragement How much the block encourages fire to spread
+ * @param flammability how easy a block is to catch fire
+ */
+ protected static void setBurnRate(int id, int encouragement, int flammability)
+ public static void setBurnProperties(int id, int encouragement, int flammability)
+ {
+ blockFireSpreadSpeed[id] = encouragement;
+ blockFlammability[id] = flammability;
@@ -40,7 +40,7 @@
- float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
- entityitem.delayBeforeCanPickup = 10;
- world.entityJoinedWorld(entityitem);
- world.spawnEntityInWorld(entityitem);
+ tr.add(new ItemStack(Item.seeds));
}
}
@@ -20,20 +20,21 @@
setTickOnLoad(true);
}
@@ -39,12 +39,6 @@
@@ -38,11 +38,10 @@
setBurnRate(Block.cloth.blockID, 30, 60);
setBurnRate(Block.vine.blockID, 15, 100);
}
- private void setBurnRate(int i, int j, int k)
- {
-
+
private void setBurnRate(int i, int j, int k)
{
- chanceToEncourageFire[i] = j;
- abilityToCatchFire[i] = k;
- }
-
+ Block.setBurnProperties(i, j, k);
}
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int i, int j, int k)
{
return null;
@@ -77,11 +71,9 @@
@@ -77,11 +76,9 @@
public void updateTick(World world, int i, int j, int k, Random random)
{
@@ -48,7 +49,7 @@
if(!canPlaceBlockAt(world, i, j, k))
{
world.setBlockWithNotify(i, j, k, 0);
@@ -99,23 +91,23 @@
@@ -99,23 +96,23 @@
world.scheduleBlockUpdate(i, j, k, blockID, tickRate());
if(!flag && !func_268_g(world, i, j, k))
{
@@ -80,14 +81,24 @@
for(int i1 = i - 1; i1 <= i + 1; i1++)
{
for(int j1 = k - 1; j1 <= k + 1; j1++)
@@ -155,9 +147,14 @@
@@ -154,10 +151,24 @@
}
}
- private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1)
+ private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1, int face)
-
+
+ /*
+ * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
+ */
+ @Deprecated
private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1)
{
- int j1 = abilityToCatchFire[world.getBlockId(i, j, k)];
+ tryToCatchBlockOnFire(world, i, j, k, l, random, i1, 0);
+ }
+
+ private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1, int face)
+ {
+ Block block = Block.blocksList[world.getBlockId(i, j, k)];
+ int j1 = 0;
+ if (block != null)
@@ -97,7 +108,7 @@
if(random.nextInt(l) < j1)
{
boolean flag = world.getBlockId(i, j, k) == Block.tnt.blockID;
@@ -182,27 +179,27 @@
@@ -182,27 +193,27 @@
private boolean func_268_g(World world, int i, int j, int k)
{
@@ -131,7 +142,7 @@
}
private int getChanceOfNeighborsEncouragingFire(World world, int i, int j, int k)
@@ -213,12 +210,12 @@
@@ -213,12 +224,12 @@
return 0;
} else
{
@@ -150,19 +161,24 @@
return l;
}
}
@@ -228,14 +225,24 @@
@@ -227,15 +238,43 @@
{
return false;
}
- public boolean canBlockCatchFire(IBlockAccess iblockaccess, int i, int j, int k)
- {
- return chanceToEncourageFire[iblockaccess.getBlockId(i, j, k)] > 0;
- }
-
- public int getChanceToEncourageFire(World world, int i, int j, int k, int l)
+ public boolean canBlockCatchFire(IBlockAccess world, int i, int j, int k, int face)
+
+ /*
+ * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
+ */
+ @Deprecated
public boolean canBlockCatchFire(IBlockAccess iblockaccess, int i, int j, int k)
{
- int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)];
- return chanceToEncourageFire[iblockaccess.getBlockId(i, j, k)] > 0;
+ return canBlockCatchFire(iblockaccess, i, j, k, 0);
}
+ public boolean canBlockCatchFire(IBlockAccess world, int i, int j, int k, int face)
+ {
+ Block block = Block.blocksList[world.getBlockId(i, j, k)];
+ if (block != null)
+ {
@@ -171,18 +187,28 @@
+ return false;
+ }
+
+ /*
+ * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
+ */
+ @Deprecated
public int getChanceToEncourageFire(World world, int i, int j, int k, int l)
{
- int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)];
+ return getChanceToEncourageFire(world, i, j, k, l, 0);
+ }
+
+ public int getChanceToEncourageFire(World world, int i, int j, int k, int l, int face)
+ {
+ int i1 = 0;
+ Block block = Block.blocksList[world.getBlockId(i, j, k)];
+ if (block != null)
+ {
+ i1 = block.chanceToEncourageFire(world, i, j, k, world.getBlockMetadata(i, j, k), face);
+ i1 = block.getFireSpreadSpeed(world, i, j, k, world.getBlockMetadata(i, j, k), face);
+ }
if(i1 > l)
{
return i1;
@@ -247,12 +254,12 @@
@@ -247,12 +286,12 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
{
@@ -197,7 +223,7 @@
{
world.setBlockWithNotify(i, j, k, 0);
return;
@@ -268,7 +275,7 @@
@@ -268,7 +307,7 @@
{
return;
}
@@ -11,7 +11,7 @@
- double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
- EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0));
- entityitem.delayBeforeCanPickup = 10;
- world.entityJoinedWorld(entityitem);
- world.spawnEntityInWorld(entityitem);
- world.setBlockWithNotify(i, j, k, 0);
+ dropBlockAsItem(world,i,j,k,l,0);
entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1);
@@ -30,7 +30,7 @@
public void dropPlayerItem(ItemStack itemstack)
@@ -493,6 +506,8 @@
worldObj.entityJoinedWorld(entityitem);
worldObj.spawnEntityInWorld(entityitem);
}
+ /* FORGE: This isnt called anymore
@@ -109,7 +109,7 @@
+ return;
+ }
+
if(!damagesource.unblockable() && func_35180_G())
if(!damagesource.isUnblockable() && func_35180_G())
{
i = 1 + i >> 1;
@@ -770,7 +843,9 @@
@@ -19,6 +19,6 @@
+ return customBucket;
+ }
+
if(!entityplayer.func_35200_c(i, j, k))
if(!entityplayer.canPlayerEdit(i, j, k))
{
return itemstack;
@@ -12,8 +12,8 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
{
- if(!entityplayer.func_35200_c(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
- if(!entityplayer.canPlayerEdit(i, j, k))
+ if(entityplayer!=null && !entityplayer.canPlayerEdit(i, j, k))
{
return false;
}
@@ -154,7 +154,7 @@
- return false;
- } else
- {
- return block.blockMaterial.getIsOpaque() && block.isACube();
- return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock();
- }
+ if(block == null) return false;
+ return block.isBlockNormalCube(this,i,j,k);
+1 -1
View File
@@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH%
cd forge
sh package.sh 1.2.2
sh package.sh 1.2.4
pause