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

BuildCraft 7.1.0

Browse source
This commit is contained in:
Adrian 2015-08-03 18:33:57 +02:00
parent 9a68480932
commit b094426ba5
23 changed files with 35 additions and 39 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: 'checkstyle'
version = "7.0.18"
version = "7.1.0"
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]

1
buildcraft_resources/changelog/7.1.0
View file

@ -31,7 +31,6 @@ Improvements:
* Zone Planners now have a dynamic texture (asie)
* Requesters now support the Comparator (asie)
* Add events for robot interaction and removal (asie)
* Add the Breaker robot that mines stone materials (hea3ven)
* Fix robots not using the correct sides when accessing inventories/tanks (hea3ven)
* Fix loading break ai from nbt (hea3ven)
* Transport:

2
common/buildcraft/BuildCraftCore.java
View file

@ -126,12 +126,12 @@ import buildcraft.core.lib.engines.TileEngineBase;
import buildcraft.core.lib.network.ChannelHandler;
import buildcraft.core.lib.utils.ColorUtils;
import buildcraft.core.lib.utils.NBTUtils;
import buildcraft.core.list.ListOreDictionaryCache;
import buildcraft.core.lib.utils.Utils;
import buildcraft.core.lib.utils.XorShift128Random;
import buildcraft.core.list.ListMatchHandlerClass;
import buildcraft.core.list.ListMatchHandlerFluid;
import buildcraft.core.list.ListMatchHandlerOreDictionary;
import buildcraft.core.list.ListOreDictionaryCache;
import buildcraft.core.list.ListRegistry;
import buildcraft.core.list.ListTooltipHandler;
import buildcraft.core.network.PacketHandlerCore;

8
common/buildcraft/BuildCraftRobotics.java
View file

@ -16,9 +16,7 @@ import java.util.List;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
@ -34,7 +32,6 @@ import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.MinecraftForge;
@ -152,7 +149,6 @@ import buildcraft.robotics.statements.TriggerRobotInStation;
import buildcraft.robotics.statements.TriggerRobotLinked;
import buildcraft.robotics.statements.TriggerRobotSleep;
import buildcraft.silicon.ItemRedstoneChipset;
import buildcraft.transport.ItemPipe;
@Mod(name = "BuildCraft Robotics", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Robotics", dependencies = DefaultProps.DEPENDENCY_CORE)
public class BuildCraftRobotics extends BuildCraftMod {
@ -238,7 +234,9 @@ public class BuildCraftRobotics extends BuildCraftMod {
RedstoneBoardRegistry.instance.registerBoardType(new BCBoardNBT("buildcraft:boardRobotButcher", "butcher", BoardRobotButcher.class, "blue"), 32000);
RedstoneBoardRegistry.instance.registerBoardType(new BCBoardNBT("buildcraft:shovelman", "shovelman", BoardRobotShovelman.class, "blue"), 32000);
RedstoneBoardRegistry.instance.registerBoardType(new BCBoardNBT("buildcraft:boardRobotPump", "pump", BoardRobotPump.class, "blue"), 32000);
RedstoneBoardRegistry.instance.registerBoardType(new BCBoardNBT("buildcraft:boardRobotBreaker", "breaker", BoardRobotBreaker.class, "blue"), 32000);
// TODO: Discuss this one!
//RedstoneBoardRegistry.instance.registerBoardType(new BCBoardNBT("buildcraft:boardRobotBreaker", "breaker", BoardRobotBreaker.class, "blue"), 32000);
// Even more expensive
// These handle complex multi-step operations.

1
common/buildcraft/builders/LibraryDatabase.java
View file

@ -107,7 +107,6 @@ public class LibraryDatabase {
byte[] data = NBTUtils.save(compound);
base.generateUniqueId(data);
File blueprintFile = getBlueprintOutputFile(base);
System.out.println(blueprintFile.getName() + " - " + data.length);
if (!blueprintFile.exists()) {
try {

1
common/buildcraft/builders/TileBlueprintLibrary.java
View file

@ -9,7 +9,6 @@
package buildcraft.builders;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import io.netty.buffer.ByteBuf;

1
common/buildcraft/builders/TileFiller.java
View file

@ -27,7 +27,6 @@ import buildcraft.api.tiles.IControllable;
import buildcraft.api.tiles.IHasWork;
import buildcraft.core.Box;
import buildcraft.core.Box.Kind;
import buildcraft.core.TileMarker;
import buildcraft.core.blueprints.BptBuilderTemplate;
import buildcraft.core.blueprints.BptContext;
import buildcraft.core.builders.TileAbstractBuilder;

1
common/buildcraft/builders/gui/GuiBlueprintLibrary.java
View file

@ -14,7 +14,6 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import buildcraft.BuildCraftBuilders;
import buildcraft.api.library.LibraryAPI;
import buildcraft.builders.TileBlueprintLibrary;
import buildcraft.core.DefaultProps;

1
common/buildcraft/core/list/ContainerListOld.java
View file

@ -17,7 +17,6 @@ import cpw.mods.fml.relauncher.Side;
import buildcraft.BuildCraftCore;
import buildcraft.core.ItemList;
import buildcraft.core.list.ListHandlerOld;
import buildcraft.core.lib.gui.BuildCraftContainer;
import buildcraft.core.lib.network.command.CommandWriter;
import buildcraft.core.lib.network.command.ICommandReceiver;

20
common/buildcraft/core/list/GuiListNew.java
View file

@ -79,6 +79,15 @@ public class GuiListNew extends GuiAdvancedInterface implements IButtonClickEven
}
}
public GuiListNew(EntityPlayer iPlayer) {
super(new ContainerListNew(iPlayer), iPlayer.inventory, TEXTURE_BASE);
xSize = 176;
ySize = 192;
player = iPlayer;
}
private void clearExamplesCache(int lineId) {
Map<ListMatchHandler.Type, List<ItemStack>> exampleList = exampleCache.get(lineId);
if (exampleList != null) {
@ -112,15 +121,6 @@ public class GuiListNew extends GuiAdvancedInterface implements IButtonClickEven
return exampleList.get(type);
}
public GuiListNew(EntityPlayer iPlayer) {
super(new ContainerListNew(iPlayer), iPlayer.inventory, TEXTURE_BASE);
xSize = 176;
ySize = 192;
player = iPlayer;
}
@Override
public void initGui() {
super.initGui();
@ -143,7 +143,7 @@ public class GuiListNew extends GuiAdvancedInterface implements IButtonClickEven
}
for (Object o : buttonList) {
GuiImageButton b = ((GuiImageButton) o);
GuiImageButton b = (GuiImageButton) o;
int lineId = b.id / BUTTON_COUNT;
int buttonId = b.id % BUTTON_COUNT;
if (((ContainerListNew) getContainer()).lines[lineId].getOption(buttonId)) {

8
common/buildcraft/core/list/ListHandlerNew.java
View file

@ -11,7 +11,7 @@ import net.minecraft.nbt.NBTTagList;
import buildcraft.core.lib.inventory.StackHelper;
import buildcraft.core.lib.utils.NBTUtils;
public class ListHandlerNew {
public final class ListHandlerNew {
public static final int WIDTH = 9;
public static final int HEIGHT = 2;
@ -28,7 +28,7 @@ public class ListHandlerNew {
}
public boolean getOption(int id) {
return (id == 0 ? precise : (id == 1 ? byType : byMaterial));
return id == 0 ? precise : (id == 1 ? byType : byMaterial);
}
public void toggleOption(int id) {
@ -143,6 +143,10 @@ public class ListHandlerNew {
}
}
private ListHandlerNew() {
}
public static Line[] getLines(ItemStack item) {
NBTTagCompound data = NBTUtils.getItemData(item);
if (data.hasKey("written") && data.hasKey("lines")) {

6
common/buildcraft/core/list/ListHandlerOld.java
View file

@ -18,7 +18,7 @@ import net.minecraftforge.oredict.OreDictionary;
import buildcraft.core.lib.inventory.StackHelper;
import buildcraft.core.lib.utils.NBTUtils;
public class ListHandlerOld {
public final class ListHandlerOld {
private static final WeakHashMap<ItemStack, StackLine[]> LINE_CACHE = new WeakHashMap<ItemStack, StackLine[]>();
public static class StackLine {
@ -195,6 +195,10 @@ public class ListHandlerOld {
}
}
private ListHandlerOld() {
}
public static void saveLine(ItemStack stack, StackLine line, int index) {
NBTTagCompound nbt = NBTUtils.getItemData(stack);

3
common/buildcraft/core/list/ListMatchHandlerClass.java
View file

@ -1,11 +1,8 @@
package buildcraft.core.list;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Set;
import net.minecraft.creativetab.CreativeTabs;

1
common/buildcraft/core/list/ListOreDictionaryCache.java
View file

@ -5,7 +5,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.oredict.OreDictionary;
public final class ListOreDictionaryCache {

6
common/buildcraft/core/list/ListRegistry.java
View file

@ -4,9 +4,13 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class ListRegistry {
public final class ListRegistry {
private static final List<ListMatchHandler> handlers = new ArrayList<ListMatchHandler>();
private ListRegistry() {
}
public static void registerHandler(ListMatchHandler h) {
if (h != null) {
handlers.add(h);

1
common/buildcraft/core/tablet/GuiTablet.java
View file

@ -107,7 +107,6 @@ public class GuiTablet extends GuiScreen {
} else if (buttonState == 2) {
if (isButton(x, y)) {
buttonState = ENABLE_HIGHLIGHT ? 0 : 1;
System.out.println("PRESS");
} else {
buttonState = 1;
}

1
common/buildcraft/core/tablet/TabletBase.java
View file

@ -59,7 +59,6 @@ public abstract class TabletBase implements ITablet {
return true;
} else {
if (compound.hasKey("programToLaunch")) {
System.out.println("received");
launchProgramInternal(compound.getString("programToLaunch"));
return true;
}

1
common/buildcraft/factory/BlockFloodGate.java
View file

@ -55,7 +55,6 @@ public class BlockFloodGate extends BlockBuildCraft {
// Restart the flood gate if it's a wrench
Item equipped = entityplayer.getCurrentEquippedItem() != null ? entityplayer.getCurrentEquippedItem().getItem() : null;
if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(entityplayer, i, j, k)) {
System.out.println("pre=" + side);
if (side == 1) {
floodGate.rebuildQueue();
} else {

2
common/buildcraft/robotics/EntityRobot.java
View file

@ -34,6 +34,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EntityDamageSource;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
@ -42,7 +43,6 @@ import net.minecraft.util.StringUtils;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
common/buildcraft/robotics/RoboticsProxyClient.java
View file

@ -14,8 +14,8 @@ import cpw.mods.fml.common.Loader;
import net.minecraftforge.client.MinecraftForgeClient;
import buildcraft.BuildCraftRobotics;
import buildcraft.robotics.render.RenderZonePlan;
import buildcraft.robotics.render.RenderRobot;
import buildcraft.robotics.render.RenderZonePlan;
import buildcraft.robotics.render.RobotStationItemRenderer;
public class RoboticsProxyClient extends RoboticsProxy {

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

@ -18,7 +18,6 @@ import cpw.mods.fml.relauncher.Side;
import buildcraft.BuildCraftCore;
import buildcraft.BuildCraftRobotics;
import buildcraft.robotics.ZonePlan;
import buildcraft.core.lib.gui.BuildCraftContainer;
import buildcraft.core.lib.gui.slots.SlotOutput;
import buildcraft.core.lib.network.command.CommandWriter;
@ -27,6 +26,7 @@ import buildcraft.core.lib.network.command.PacketCommand;
import buildcraft.core.lib.render.DynamicTextureBC;
import buildcraft.core.lib.utils.NetworkUtils;
import buildcraft.robotics.TileZonePlan;
import buildcraft.robotics.ZonePlan;
import buildcraft.robotics.map.MapWorld;
public class ContainerZonePlan extends BuildCraftContainer implements ICommandReceiver {

2
common/buildcraft/robotics/gui/GuiZonePlan.java
View file

@ -25,7 +25,6 @@ import net.minecraft.util.ResourceLocation;
import buildcraft.BuildCraftCore;
import buildcraft.api.core.EnumColor;
import buildcraft.core.DefaultProps;
import buildcraft.robotics.ZonePlan;
import buildcraft.core.lib.gui.AdvancedSlot;
import buildcraft.core.lib.gui.GuiAdvancedInterface;
import buildcraft.core.lib.gui.buttons.GuiBetterButton;
@ -38,6 +37,7 @@ import buildcraft.core.lib.render.DynamicTextureBC;
import buildcraft.core.lib.utils.NetworkUtils;
import buildcraft.core.lib.utils.StringUtils;
import buildcraft.robotics.TileZonePlan;
import buildcraft.robotics.ZonePlan;
public class GuiZonePlan extends GuiAdvancedInterface {

1
common/buildcraft/robotics/statements/ActionStationRequestItems.java
View file

@ -11,7 +11,6 @@ package buildcraft.robotics.statements;
import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.api.statements.IStatementParameter;
import buildcraft.api.statements.StatementParameterItemStack;
import buildcraft.core.lib.utils.StringUtils;
import buildcraft.core.statements.StatementParameterItemStackExact;