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

BuildCraft 7.0.17, fix #2904, fix minor bugs

Browse source
This commit is contained in:
Adrian 2015-07-23 18:58:24 +02:00
parent e0c6ac68ad
commit bc8583d0db
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency
apply plugin: 'maven' // for uploading to a maven repo apply plugin: 'maven' // for uploading to a maven repo
apply plugin: 'checkstyle' apply plugin: 'checkstyle'
version = "7.0.16" version = "7.0.17"
group= "com.mod-buildcraft" group= "com.mod-buildcraft"
archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]

3
buildcraft_resources/changelog/7.0.17
View file

@ -4,9 +4,12 @@ Improvements:
Bugs fixed: Bugs fixed:
* [#2904] Crash on corrupt facade (asie)
* [#2892] Disconnect on large-resolution Zone Planner fullscreen (asie) * [#2892] Disconnect on large-resolution Zone Planner fullscreen (asie)
* [#2891] Boxes ignoring the south and east boundaries when rounding (hea3ven) * [#2891] Boxes ignoring the south and east boundaries when rounding (hea3ven)
* Accidentally setting an area in the Zone Planner GUI upon pressing fullscreen (asie) * Accidentally setting an area in the Zone Planner GUI upon pressing fullscreen (asie)
* Compact Lens->Filter "diodes" not acting correctly (asie)
* Gate Copiers not clearing correctly (asie)
* Paintbrush not being re-dyeable if not fully used (asie) * Paintbrush not being re-dyeable if not fully used (asie)
* Robots going to unreachable stations passing through walls (hea3ven) * Robots going to unreachable stations passing through walls (hea3ven)
* Stripes Pipe "breaking" fluid blocks (asie) * Stripes Pipe "breaking" fluid blocks (asie)

2
buildcraft_resources/versions.txt
View file

@ -1,3 +1,3 @@
1.6.4:BuildCraft:4.2.2 1.6.4:BuildCraft:4.2.2
1.7.2:BuildCraft:6.0.16 1.7.2:BuildCraft:6.0.16
1.7.10:BuildCraft:7.0.16 1.7.10:BuildCraft:7.0.17

4
common/buildcraft/robotics/gui/ContainerZonePlan.java
View file

@ -129,8 +129,8 @@ public class ContainerZonePlan extends BuildCraftContainer implements ICommandRe
MapWorld w = BuildCraftRobotics.manager.getWorld(map.getWorldObj()); MapWorld w = BuildCraftRobotics.manager.getWorld(map.getWorldObj());
int startX = cx - width * blocksPerPixel / 2; int startX = cx - width * blocksPerPixel / 2;
int startZ = cz - height * blocksPerPixel / 2; int startZ = cz - height * blocksPerPixel / 2;
int mapStartX = (map.chunkStartX << 4); int mapStartX = map.chunkStartX << 4;
int mapStartZ = (map.chunkStartZ << 4); int mapStartZ = map.chunkStartZ << 4;
for (int i = 0; i < width; ++i) { for (int i = 0; i < width; ++i) {
for (int j = 0; j < height; ++j) { for (int j = 0; j < height; ++j) {

4
common/buildcraft/transport/ItemFacade.java
View file

@ -156,7 +156,9 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug
public String getItemStackDisplayName(ItemStack itemstack) { public String getItemStackDisplayName(ItemStack itemstack) {
switch (getFacadeType(itemstack)) { switch (getFacadeType(itemstack)) {
case Basic: case Basic:
return super.getItemStackDisplayName(itemstack) + ": " + getFacadeStateDisplayName(getFacadeStates(itemstack)[0]); FacadeState[] states = getFacadeStates(itemstack);
String displayName = states.length > 0 ? getFacadeStateDisplayName(states[0]) : "CORRUPT";
return super.getItemStackDisplayName(itemstack) + ": " + displayName;
case Phased: case Phased:
return StringUtils.localize("item.FacadePhased.name"); return StringUtils.localize("item.FacadePhased.name");
default: default:

5
common/buildcraft/transport/ItemGateCopier.java
View file

@ -75,7 +75,10 @@ public class ItemGateCopier extends ItemBuildCraft {
player.addChatMessage(new ChatComponentTranslation("chat.gateCopier.clear")); player.addChatMessage(new ChatComponentTranslation("chat.gateCopier.clear"));
return true; return true;
} }
data = new NBTTagCompound();
stack.setTagCompound(data);
gate.writeStatementsToNBT(data); gate.writeStatementsToNBT(data);
data.setByte("material", (byte) gate.material.ordinal()); data.setByte("material", (byte) gate.material.ordinal());
data.setByte("logic", (byte) gate.logic.ordinal()); data.setByte("logic", (byte) gate.logic.ordinal());