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

Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.2.x

Browse source
This commit is contained in:
asiekierka 2014-11-16 14:39:44 +01:00
commit 00405f79ca
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -12,6 +12,8 @@ Please open an issue for a bug report only if:
**If you are not sure if a bug report is valid, please use the "Ask Help!" subforum.**
Please only use **official BuildCraft releases** for any kind of bug reports unless otherwise told to do by the BuildCraft team. Custom builds (for instance from Jenkins) are unsupported, often buggy and will **not** get any support from the developers.
Please check if the bug has been reported beforehand. Also, provide the version of BuildCraft used - if it's a version compiled from source, link to the commit/tree you complied from.
Please mention if you are using MCPC+, Cauldron, OptiFine, FastCraft or any other mods which optimize or otherwise severely modify the functioning of the Minecraft engine. That is very helpful when trying to reproduce a bug.

2
common/buildcraft/core/InterModComms.java
View file

@ -64,7 +64,7 @@ public final class InterModComms {
} else if (m.key.equals("remove-refinery-recipe")) {
processRefineryRecipeRemoveIMC(event, m);
} else {
BCLog.logger.warn("Received an IMC message with unknown key ('%s') from %s!", new Object[]{m.key, m.getSender()});
BCLog.logger.warn(String.format("Received an IMC message with unknown key ('%s') from %s!", new Object[]{m.key, m.getSender()}));
}
}
}

7
common/buildcraft/core/ItemList.java Executable file → Normal file
View file

@ -12,6 +12,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
@ -76,14 +77,14 @@ public class ItemList extends ItemBuildCraft {
stacks[slot].stackSize = 1;
}
if (slot == 0) {
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT && slot == 0) {
relatedItems.clear();
ores.clear();
if (stack == null) {
isOre = false;
} else {
setLists();
setClientPreviewLists();
}
}
}
@ -149,7 +150,7 @@ public class ItemList extends ItemBuildCraft {
return false;
}
private void setLists() {
private void setClientPreviewLists() {
Item baseItem = stacks [0].getItem();
int[] oreIds = OreDictionary.getOreIDs(stacks[0]);

4
common/buildcraft/core/robots/EntityRobot.java
View file

@ -159,6 +159,7 @@ public class EntityRobot extends EntityRobotBase implements
preventEntitySpawning = false;
noClip = true;
isImmuneToFire = true;
this.func_110163_bv(); // persistenceRequired = true
dataWatcher.addObject(12, Float.valueOf(0));
dataWatcher.addObject(13, Float.valueOf(0));
@ -536,6 +537,9 @@ public class EntityRobot extends EntityRobotBase implements
} else {
tank = null;
}
// Restore robot persistence on pre-6.1.9 robots
this.func_110163_bv();
}
@Override