Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update forge to 604

Browse source 
Revert Sengir's build.xml
Fix Icon registration in Core to use the Item atlas
This commit is contained in:
Krapht 2013-03-22 21:52:35 +01:00
parent 8192c8d792
commit eb6f7832b8
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.xml
View file

@ -18,8 +18,8 @@
<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
<property name="mc.version" value="1.5.1"/>
<property name="forge.version" value="7.7.0.600"/>
<property name="project.version" value="3.5a"/>
<property name="forge.version" value="7.7.0.604"/>
<property name="project.version" value="3.4.3"/>
<property name="forge.name" value="minecraftforge-src-${mc.version}-${forge.version}.zip"/>

4
buildcraft_resources/build.xml
View file

@ -16,8 +16,8 @@
<property name="clientsrc.dir" value="${mcp.dir}/src/minecraft"/>
<property name="mc.version" value="1.4.7"/>
<property name="forge.version" value="7.7.0.600"/>
<property name="bc.version" value="3.5a"/>
<property name="forge.version" value="6.6.0.507"/>
<property name="bc.version" value="3.4.4fc"/>
<property name="bc.version.full" value="${bc.version}"/>
<echo message="Starting build for ${bc.version.full}"/>

7
common/buildcraft/BuildCraftCore.java
View file

@ -14,6 +14,7 @@ import java.util.logging.Logger;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFluid;
import net.minecraft.client.Minecraft;
import net.minecraft.command.CommandHandler;
import net.minecraft.entity.EntityList;
import net.minecraft.item.Item;
@ -320,11 +321,11 @@ public class BuildCraftCore {
@ForgeSubscribe
@SideOnly(Side.CLIENT)
public void textureHook(TextureStitchEvent.Pre event){
//if ("items".equals(event.map.field_94253_b)){
if (event.map == Minecraft.getMinecraft().renderEngine.textureMapItems) {
//if (event.map.textureType == 1) { 'TODO Replace above
iconProvider = new CoreIconProvider();
iconProvider.registerIcons(event.map);
//}
//TODO: this needs un-privating in TextureMap
}
}
public void loadRecipes() {