mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
Inital update to 1.4.6, Version bumped to 6.5
This commit is contained in:
1 parent
420e04f1b9
commit
a2f4a0d2dd
70 files changed
+761
-744
No files matched your search
+71
-68
@@ -1,83 +1,84 @@
|
||||
#Main Forge Access Transformer configuration file
|
||||
# RailLogic.getNAdjacentTracks
|
||||
public all.a(Lall;)I #MD:RailLogic/func_73650_a
|
||||
public als.a(Lals;)I #MD:RailLogic/func_73650_a
|
||||
# Tessellator
|
||||
public-f bao.a #FD:Tessellator/field_78398_a #instance
|
||||
public bao.u #FD:Tessellator/field_78409_u #drawMode
|
||||
public bao.v #FD:Tessellator/field_78408_v #xOffset
|
||||
public bao.w #FD:Tessellator/field_78407_w #yOffset
|
||||
public bao.x #FD:Tessellator/field_78417_x #zOffset
|
||||
public bao.z #FD:Tessellator/field_78415_z #isDrawing
|
||||
public-f baz.a #FD:Tessellator/field_78398_a #instance
|
||||
public baz.u #FD:Tessellator/field_78409_u #drawMode
|
||||
public baz.v #FD:Tessellator/field_78408_v #xOffset
|
||||
public baz.w #FD:Tessellator/field_78407_w #yOffset
|
||||
public baz.x #FD:Tessellator/field_78417_x #zOffset
|
||||
public baz.z #FD:Tessellator/field_78415_z #isDrawing
|
||||
# ItemPickaxe
|
||||
public ut.<init>(ILul;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f ut.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
|
||||
public uy.<init>(ILuq;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f uy.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
|
||||
# ItemAxe
|
||||
public ui.<init>(ILul;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f ui.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst
|
||||
public un.<init>(ILuq;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f un.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst
|
||||
# ItemSpade
|
||||
public ve.<init>(ILul;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f ve.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst
|
||||
public vj.<init>(ILuq;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f vj.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst
|
||||
# ItemTool
|
||||
public tu.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial
|
||||
public tu.cl #FD:ItemTool/field_77865_bY #damageVsEntity
|
||||
public tw.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial
|
||||
public tw.co #FD:ItemTool/field_77865_bY #damageVsEntity
|
||||
# EntityEnderman
|
||||
public qd.d #FD:EntityEnderman/field_70827_d #carriableBlocks
|
||||
# RenderGlobal
|
||||
public bak.h #FD:RenderGlobal/field_72769_h #theWorld
|
||||
public bak.i #FD:RenderGlobal/field_72770_i #renderEngine
|
||||
public bak.q #FD:RenderGlobal/field_72777_q #mc
|
||||
public bak.r #FD:RenderGlobal/field_72776_r #globalRenderBlocks
|
||||
public bak.E #FD:RenderGlobal/field_72738_E #damagedBlocks
|
||||
public bav.h #FD:RenderGlobal/field_72769_h #theWorld
|
||||
public bav.i #FD:RenderGlobal/field_72770_i #renderEngine
|
||||
public bav.q #FD:RenderGlobal/field_72777_q #mc
|
||||
public bav.r #FD:RenderGlobal/field_72776_r #globalRenderBlocks
|
||||
public bav.E #FD:RenderGlobal/field_72738_E #damagedBlocks
|
||||
# SoundManager
|
||||
public bek.a #FD:SoundManager/field_77381_a #sndSystem
|
||||
public bek.b #FD:SoundManager/field_77379_b #soundPoolSounds
|
||||
public bek.c #FD:SoundManager/field_77380_c #soundPoolStreaming
|
||||
public bek.d #FD:SoundManager/field_77377_d #soundPoolMusic
|
||||
public bev.a #FD:SoundManager/field_77381_a #sndSystem
|
||||
public bev.b #FD:SoundManager/field_77379_b #soundPoolSounds
|
||||
public bev.c #FD:SoundManager/field_77380_c #soundPoolStreaming
|
||||
public bev.d #FD:SoundManager/field_77377_d #soundPoolMusic
|
||||
# EntityMinecart
|
||||
protected py.* #FD:EntityMinecart/* # All private -> protected
|
||||
public py.h()Z #MD:EntityMinecart/func_70490_h #isMinecartPowered
|
||||
# Block
|
||||
public amj.<init>(ILagb;)V #MD:Block/<init>(ILnet/minecraft/src/Material;) #Constructor
|
||||
public amj.<init>(IILagb;)V #MD:Block/<init>(IILnet/minecraft/src/Material;) #Constructor
|
||||
public amj.r()Lamj; #MD:Block/func_71912_p #setRequiresSelfNotify
|
||||
public amj.a(Lamn;)Lamj; #MD:Block/func_71884_a #setStepSound
|
||||
public amj.b(F)Lamj; #MD:Block/func_71894_b #setResistance
|
||||
public amj.c(F)Lamj; #MD:Block/func_71848_c #setHardness
|
||||
public amj.h(I)Lamj; #MD:Block/func_71868_h #setLightOpacity
|
||||
public amj.a(F)Lamj; #MD:Block/func_71900_a #setLightValue
|
||||
public amj.s()Lamj; #MD:Block/func_71875_q #setBlockUnbreakable
|
||||
public amj.b(Z)Lamj; #MD:Block/func_71907_b #setTickRandomly
|
||||
public amj.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
|
||||
public amq.<init>(ILagi;)V #MD:Block/<init>(ILnet/minecraft/src/Material;) #Constructor
|
||||
public amq.<init>(IILagi;)V #MD:Block/<init>(IILnet/minecraft/src/Material;) #Constructor
|
||||
public amq.r()Lamq; #MD:Block/func_71912_p #setRequiresSelfNotify
|
||||
public amq.a(Lamu;)Lamq; #MD:Block/func_71884_a #setStepSound
|
||||
public amq.b(F)Lamq; #MD:Block/func_71894_b #setResistance
|
||||
public amq.c(F)Lamq; #MD:Block/func_71848_c #setHardness
|
||||
public amq.h(I)Lamq; #MD:Block/func_71868_h #setLightOpacity
|
||||
public amq.a(F)Lamq; #MD:Block/func_71900_a #setLightValue
|
||||
public amq.s()Lamq; #MD:Block/func_71875_q #setBlockUnbreakable
|
||||
public amq.b(Z)Lamq; #MD:Block/func_71907_b #setTickRandomly
|
||||
public amq.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
|
||||
# NetServerHandler
|
||||
public iv.g #FD:NetServerHandler/field_72572_g #playerInAirTime
|
||||
# TileEntity
|
||||
public anq.k #FD:TileEntity/field_70331_k #worldObj
|
||||
public any.k #FD:TileEntity/field_70331_k #worldObj
|
||||
# BlockLeavesBase
|
||||
public amr.c #FD:BlockLeavesBase/field_72131_c #graphicsLevel
|
||||
public amy.c #FD:BlockLeavesBase/field_72131_c #graphicsLevel
|
||||
# Item
|
||||
public uk.<init>(I)V #MD:Item/<init>(I) #Constructor
|
||||
public uk.e(I)Luk; #MD:Item/func_77656_e #setMaxDamage
|
||||
public-f uk.f(Lum;)I #MD:Item/func_77650_f #getIconIndex
|
||||
public up.<init>(I)V #MD:Item/<init>(I) #Constructor
|
||||
public up.e(I)Lup; #MD:Item/func_77656_e #setMaxDamage
|
||||
public-f up.h(Lur;)I #MD:Item/func_77650_f #getIconIndex
|
||||
# RailLogic
|
||||
public all #CL:RailLogic
|
||||
public all.a(Lall;)I #MD:RailLogic/func_73650_a #getNAdjacentTiles
|
||||
public als #CL:RailLogic
|
||||
public als.a(Lals;)I #MD:RailLogic/func_73650_a #getNAdjacentTiles
|
||||
# EntityPlayer
|
||||
public qx.a(Lpx;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld
|
||||
public qx.i()V #MD:EntityPlayer/func_71053_j #closeScreen
|
||||
# EntityPlayerMP
|
||||
public ayk.a(Lpx;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
|
||||
public ays.a(Lpx;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
|
||||
# World Gen Chests Related
|
||||
public in.T #FD:WorldServer/field_73069_S #bonusChestContent
|
||||
public aci.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents
|
||||
public adm.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple
|
||||
public adn.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents
|
||||
public adn.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents
|
||||
public adx.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents
|
||||
public aeb.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents
|
||||
public aeg.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents
|
||||
public afh.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents
|
||||
public kw.* #FD:WeightedRandomChestContent/* #all
|
||||
public in.S #FD:WorldServer/field_73069_S #bonusChestContent
|
||||
public acp.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents
|
||||
public adt.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple
|
||||
public adu.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents
|
||||
public adu.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents
|
||||
public aee.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents
|
||||
public aei.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents
|
||||
public aen.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents
|
||||
public afo.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents
|
||||
# AnvilChunkLoader.chunkSaveLocation
|
||||
public aaf.d #FD:AnvilChunkLoader/field_75825_d
|
||||
public aam.d #FD:AnvilChunkLoader/field_75825_d
|
||||
# ChunkProviderServer.currentChunkLoader
|
||||
public im.e #FD:ChunkProviderServer/field_73247_e
|
||||
# PlayerManager
|
||||
@@ -85,27 +86,29 @@ public ik.a(IIZ)Lil; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher
|
||||
# PlayerInstance
|
||||
public il #CL:PlayerInstance
|
||||
# World
|
||||
public-f xv.C #FD:World/field_72982_D #villageCollectionObj
|
||||
public xv.H #FD:World/field_72993_I #activeChunkSet
|
||||
public-f yc.B #FD:World/field_72982_D #villageCollectionObj
|
||||
public yc.G #FD:World/field_72993_I #activeChunkSet
|
||||
# EntityLiving
|
||||
public md.bc #FD:EntityLiving/field_70728_aV #experienceValue
|
||||
public md.bd #FD:EntityLiving/field_70728_aV #experienceValue
|
||||
# GuiFlatPresets
|
||||
public atz.a(Ljava/lang/String;ILyr;Ljava/util/List;[Lace;)V #MD:GuiFlatPresets/func_82294_a
|
||||
public atz.a(Ljava/lang/String;ILyr;[Lace;)V #MD:GuiFlatPresets/func_82297_a
|
||||
public aug.a(Ljava/lang/String;ILyy;Ljava/util/List;[Lacl;)V #MD:GuiFlatPresets/func_82294_a
|
||||
public aug.a(Ljava/lang/String;ILyy;[Lacl;)V #MD:GuiFlatPresets/func_82297_a
|
||||
# BiomeGenBase
|
||||
public yr.*() #MD:BiomeGenBase/* #Everything protected->public
|
||||
public yy.*() #MD:BiomeGenBase/* #Everything protected->public
|
||||
# MapGenVillage
|
||||
public-f aev.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes
|
||||
public-f afc.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes
|
||||
# ShapedRecipes
|
||||
public+f wk.d #FD:ShapedRecipes/field_77574_d #recipeItems
|
||||
public+f wk.b #FD:ShapedRecipes/field_77576_b #recipeWidth
|
||||
public+f wk.c #FD:ShapedRecipes/field_77577_c #recipeHeight
|
||||
public+f wq.d #FD:ShapedRecipes/field_77574_d #recipeItems
|
||||
public+f wq.b #FD:ShapedRecipes/field_77576_b #recipeWidth
|
||||
public+f wq.c #FD:ShapedRecipes/field_77577_c #recipeHeight
|
||||
# ShapelessRecipes
|
||||
public wl.b #FD:ShapelessRecipes/field_77579_b #recipeItems
|
||||
public wr.b #FD:ShapelessRecipes/field_77579_b #recipeItems
|
||||
# GuiContainer
|
||||
protected auy.a(Lsq;)V #MD:GuiContainer/func_74192_a #drawSlotInventory
|
||||
protected avf.a(Lsr;)V #MD:GuiContainer/func_74192_a #drawSlotInventory
|
||||
# BlockButton
|
||||
protected aiy.o(Lxv;III)V #MD:BlockButton/func_82535_o #checkActivation
|
||||
protected-f aiy.a #FD:BlockButton/field_82537_a #sensible
|
||||
protected ajf.o(Lyc;III)V #MD:BlockButton/func_82535_o #checkActivation
|
||||
protected-f ajf.a #FD:BlockButton/field_82537_a #sensible
|
||||
# BiomeDecorator
|
||||
public yv.* #FD:EntityMinecart/* # All private -> protected
|
||||
public py.* #FD:EntityMinecart/* # All private -> protected
|
||||
# CreativeTabs
|
||||
public-f tj.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final
|
||||
@@ -2,6 +2,7 @@ package net.minecraftforge.common;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.WeightedRandomChestContent;
|
||||
import net.minecraft.world.WorldServer;
|
||||
@@ -42,6 +43,15 @@ public class ChestGenHooks
|
||||
addInfo(STRONGHOLD_CROSSING, ComponentStrongholdRoomCrossing.strongholdRoomCrossingChestContents, 1, 5);
|
||||
addInfo(VILLAGE_BLACKSMITH, ComponentVillageHouse2.villageBlacksmithChestContents, 3, 9);
|
||||
addInfo(BONUS_CHEST, WorldServer.bonusChestContent, 10, 10);
|
||||
|
||||
ItemStack book = new ItemStack(Item.field_92053_bW, 1, 0);
|
||||
WeightedRandomChestContent tmp = new WeightedRandomChestContent(book, 1, 1, 1);
|
||||
getInfo(MINESHAFT_CORRIDOR ).addItem(tmp);
|
||||
getInfo(PYRAMID_DESERT_CHEST).addItem(tmp);
|
||||
getInfo(PYRAMID_JUNGLE_CHEST).addItem(tmp);
|
||||
getInfo(STRONGHOLD_CORRIDOR ).addItem(tmp);
|
||||
getInfo(STRONGHOLD_LIBRARY ).addItem(new WeightedRandomChestContent(book, 1, 5, 2));
|
||||
getInfo(STRONGHOLD_CROSSING ).addItem(tmp);
|
||||
}
|
||||
|
||||
private static void addInfo(String category, WeightedRandomChestContent[] items, int min, int max)
|
||||
@@ -103,7 +113,7 @@ public class ChestGenHooks
|
||||
}
|
||||
|
||||
//shortcut functions, See the non-static versions below
|
||||
public static WeightedRandomChestContent[] getItems(String category){ return getInfo(category).getItems(); }
|
||||
public static WeightedRandomChestContent[] getItems(String category, Random rnd){ return getInfo(category).getItems(rnd); }
|
||||
public static int getCount(String category, Random rand){ return getInfo(category).getCount(rand); }
|
||||
public static void addItem(String category, WeightedRandomChestContent item){ getInfo(category).addItem(item); }
|
||||
public static void removeItem(String category, ItemStack item){ getInfo(category).removeItem(item); }
|
||||
@@ -151,7 +161,7 @@ public class ChestGenHooks
|
||||
while(itr.hasNext())
|
||||
{
|
||||
WeightedRandomChestContent cont = itr.next();
|
||||
if (item.isItemEqual(cont.itemStack) || (item.getItemDamage() == -1 && item.itemID == cont.itemStack.itemID))
|
||||
if (item.isItemEqual(cont.theItemId) || (item.getItemDamage() == -1 && item.itemID == cont.theItemId.itemID))
|
||||
{
|
||||
itr.remove();
|
||||
}
|
||||
@@ -163,9 +173,25 @@ public class ChestGenHooks
|
||||
*
|
||||
* @return The random objects
|
||||
*/
|
||||
public WeightedRandomChestContent[] getItems()
|
||||
public WeightedRandomChestContent[] getItems(Random rnd)
|
||||
{
|
||||
return contents.toArray(new WeightedRandomChestContent[contents.size()]);
|
||||
ArrayList<WeightedRandomChestContent> ret = new ArrayList<WeightedRandomChestContent>();
|
||||
|
||||
for (WeightedRandomChestContent orig : contents)
|
||||
{
|
||||
Item item = orig.theItemId.getItem();
|
||||
|
||||
if (item != null)
|
||||
{
|
||||
WeightedRandomChestContent n = item.getChestGenBase(this, rnd, orig);
|
||||
if (n != null)
|
||||
{
|
||||
ret.add(n);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ret.toArray(new WeightedRandomChestContent[ret.size()]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -32,7 +32,7 @@ public class ForgeInternalHandler
|
||||
Entity entity = event.entity;
|
||||
if (entity.getClass().equals(EntityItem.class))
|
||||
{
|
||||
ItemStack stack = ((EntityItem)entity).item;
|
||||
ItemStack stack = ((EntityItem)entity).getDataWatcher().getWatchableObjectItemStack(10);
|
||||
|
||||
if (stack == null)
|
||||
{
|
||||
|
||||
@@ -10,9 +10,9 @@ public class ForgeVersion
|
||||
//This number is incremented every time we remove deprecated code/major API changes, never reset
|
||||
public static final int majorVersion = 6;
|
||||
//This number is incremented every minecraft release, never reset
|
||||
public static final int minorVersion = 4;
|
||||
public static final int minorVersion = 5;
|
||||
//This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version
|
||||
public static final int revisionVersion = 2;
|
||||
public static final int revisionVersion = 0;
|
||||
//This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
|
||||
public static final int buildVersion = 0;
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package net.minecraftforge.event.terraingen;
|
||||
|
||||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.world.biome.BiomeDecorator;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
import net.minecraftforge.event.*;
|
||||
@@ -44,7 +43,7 @@ public class BiomeEvent extends Event
|
||||
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static class BiomeColor extends BiomeEvent
|
||||
public static class BiomeColor extends BiomeEvent
|
||||
{
|
||||
public final int originalColor;
|
||||
public int newColor;
|
||||
|
||||
Reference in new issue
Block a user