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

Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft

Browse source
This commit is contained in:
asiekierka 2015-02-26 23:17:44 +01:00
parent 2389f1e67b 9cd089bdc0
commit d6dce9ee44
878 changed files with 4649 additions and 2266 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/buildcraft/api/blueprints/BlueprintDeployer.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/BuilderAPI.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/BuildingPermission.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/IBuilderContext.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/ISchematicRegistry.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/ITileBuilder.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/MappingNotFoundException.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/MappingRegistry.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/Schematic.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/SchematicBlock.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/SchematicBlockBase.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

15
api/buildcraft/api/blueprints/SchematicEntity.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
@ -26,7 +26,6 @@ import net.minecraftforge.common.util.Constants;
import buildcraft.api.core.Position;
public class SchematicEntity extends Schematic {
public Class<? extends Entity> entity;
/**
@ -43,6 +42,7 @@ public class SchematicEntity extends Schematic {
* Schematic.
*/
public ItemStack[] storedRequirements = new ItemStack[0];
public BuildingPermission defaultPermission = BuildingPermission.ALL;
@Override
public void getRequirementsForPlacement(IBuilderContext context, LinkedList<ItemStack> requirements) {
@ -154,13 +154,11 @@ public class SchematicEntity extends Schematic {
rqs.add(ItemStack.loadItemStackFromNBT(sub));
} else {
// TODO: requirement can't be retreived, this blueprint is
// only useable in creative
defaultPermission = BuildingPermission.CREATIVE_ONLY;
}
} catch (Throwable t) {
t.printStackTrace();
// TODO: requirement can't be retreived, this blueprint is
// only useable in creative
defaultPermission = BuildingPermission.CREATIVE_ONLY;
}
}
@ -215,4 +213,9 @@ public class SchematicEntity extends Schematic {
public int buildTime() {
return 5;
}
@Override
public BuildingPermission getBuildingPermission() {
return defaultPermission;
}
}

2
api/buildcraft/api/blueprints/SchematicFactory.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/SchematicFluid.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/SchematicMask.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/SchematicTile.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/blueprints/Translation.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

4
api/buildcraft/api/blueprints/package-info.java
View file

@ -1,12 +1,12 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
* Please check the contents of the license, which should be located
* as "LICENSE.API" in the BuildCraft source code distribution.
*/
@API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blueprints")
@API(apiVersion = "1.2", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blueprints")
package buildcraft.api.blueprints;
import cpw.mods.fml.common.API;

2
api/buildcraft/api/boards/IRedstoneBoard.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/boards/RedstoneBoardNBT.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

3
api/buildcraft/api/boards/RedstoneBoardRegistry.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
@ -19,6 +19,7 @@ public abstract class RedstoneBoardRegistry {
public abstract void registerBoardClass(RedstoneBoardNBT<?> redstoneBoardNBT, float probability);
@Deprecated
public abstract void createRandomBoard(NBTTagCompound nbt);
public abstract RedstoneBoardNBT getRedstoneBoard(NBTTagCompound nbt);

2
api/buildcraft/api/boards/RedstoneBoardRobot.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/boards/RedstoneBoardRobotNBT.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/boards/package-info.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

4
api/buildcraft/api/core/BCLog.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
@ -27,7 +27,7 @@ public final class BCLog {
public static void initLog() {
logger.info("Starting BuildCraft " + getVersion());
logger.info("Copyright (c) SpaceToad, 2011-2014");
logger.info("Copyright (c) SpaceToad, 2011-2015");
logger.info("http://www.mod-buildcraft.com");
}

4
api/buildcraft/api/core/BlockIndex.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
/**
* This class is a comparable container for block positions. TODO: should this be merged with position?
* This class is a comparable container for integer block positions.
*/
public class BlockIndex implements Comparable<BlockIndex> {

2
api/buildcraft/api/core/BuildCraftAPI.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/EnumColor.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/IAreaProvider.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/IBox.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/ICoreProxy.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/IIconProvider.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/IInvSlot.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/ISerializable.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* BuildCraft is distributed under the terms of the Minecraft Mod Public

2
api/buildcraft/api/core/IWorldProperty.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/IZone.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/JavaTools.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/Position.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/SafeTimeTracker.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/StackKey.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/package-info.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/core/render/ICullable.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* BuildCraft is distributed under the terms of the Minecraft Mod Public

2
api/buildcraft/api/core/render/ITextureStates.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* BuildCraft is distributed under the terms of the Minecraft Mod Public

2
api/buildcraft/api/events/BlockInteractionEvent.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/events/BlockPlacedDownEvent.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/events/PipePlacedEvent.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/events/RobotPlacementEvent.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/events/package-info.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/facades/FacadeType.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/facades/IFacadeItem.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/facades/package-info.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/filler/FillerManager.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

16
api/buildcraft/api/filler/IFillerPattern.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
@ -8,17 +8,7 @@
*/
package buildcraft.api.filler;
import net.minecraft.util.IIcon;
import buildcraft.api.statements.IStatement;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public interface IFillerPattern {
String getUniqueTag();
@SideOnly(Side.CLIENT)
IIcon getIcon();
String getDisplayName();
public interface IFillerPattern extends IStatement {
}

2
api/buildcraft/api/filler/IFillerRegistry.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

4
api/buildcraft/api/filler/package-info.java
View file

@ -1,12 +1,12 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
* Please check the contents of the license, which should be located
* as "LICENSE.API" in the BuildCraft source code distribution.
*/
@API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|filler")
@API(apiVersion = "3.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|filler")
package buildcraft.api.filler;
import cpw.mods.fml.common.API;

2
api/buildcraft/api/fuels/BuildcraftFuelRegistry.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/fuels/ICoolant.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/fuels/ICoolantManager.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/fuels/IFuel.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/fuels/IFuelManager.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/fuels/ISolidCoolant.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/fuels/package-info.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/gates/GateExpansionController.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/gates/GateExpansions.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/gates/IGate.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/gates/IGateExpansion.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/gates/package-info.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/package-info.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/power/IEngine.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/power/ILaserTarget.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/power/ILaserTargetBlock.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/power/IRedstoneEngine.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/power/IRedstoneEngineReceiver.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/power/package-info.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

3
api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
@ -13,6 +13,7 @@ public final class BuildcraftRecipeRegistry {
public static IAssemblyRecipeManager assemblyTable;
public static IIntegrationRecipeManager integrationTable;
public static IRefineryRecipeManager refinery;
public static IProgrammingRecipeManager programmingTable;
private BuildcraftRecipeRegistry() {
}

2
api/buildcraft/api/recipes/CraftingResult.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/recipes/IAssemblyRecipeManager.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/recipes/IFlexibleCrafter.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/recipes/IFlexibleRecipe.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/recipes/IFlexibleRecipeViewable.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/recipes/IIntegrationRecipe.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/recipes/IIntegrationRecipeManager.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

37
api/buildcraft/api/recipes/IProgrammingRecipe.java Normal file
View file

@ -0,0 +1,37 @@
package buildcraft.api.recipes;
import java.util.List;
import net.minecraft.item.ItemStack;
public interface IProgrammingRecipe {
String getId();
/**
* Get a list (size at least width*height) of ItemStacks representing options.
* @param width The width of the Programming Table panel.
* @param height The height of the Programming Table panel.
* @return
*/
List<ItemStack> getOptions(int width, int height);
/**
* Get the energy cost of a given option ItemStack.
* @param option
* @return
*/
int getEnergyCost(ItemStack option);
/**
* @param input The input stack.
* @return Whether this recipe applies to the given input stack.
*/
boolean canCraft(ItemStack input);
/**
* Craft the input ItemStack with the given option into an output ItemStack.
* @param input
* @param option
* @return The output ItemStack.
*/
ItemStack craft(ItemStack input, ItemStack option);
}

23
api/buildcraft/api/recipes/IProgrammingRecipeManager.java Normal file
View file

@ -0,0 +1,23 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
* Please check the contents of the license, which should be located
* as "LICENSE.API" in the BuildCraft source code distribution.
*/
package buildcraft.api.recipes;
import java.util.Collection;
public interface IProgrammingRecipeManager {
void addRecipe(IProgrammingRecipe recipe);
void removeRecipe(String id);
void removeRecipe(IProgrammingRecipe recipe);
IProgrammingRecipe getRecipe(String id);
Collection<IProgrammingRecipe> getRecipes();
}

2
api/buildcraft/api/recipes/IRefineryRecipeManager.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

4
api/buildcraft/api/recipes/package-info.java
View file

@ -1,12 +1,12 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
* Please check the contents of the license, which should be located
* as "LICENSE.API" in the BuildCraft source code distribution.
*/
@API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes")
@API(apiVersion = "2.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes")
package buildcraft.api.recipes;
import cpw.mods.fml.common.API;

22
api/buildcraft/api/robots/AIRobot.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
@ -148,7 +148,7 @@ public class AIRobot {
}
public final void writeToNBT(NBTTagCompound nbt) {
nbt.setString("class", getClass().getCanonicalName());
nbt.setString("aiName", RobotManager.getAIRobotName(getClass()));
NBTTagCompound data = new NBTTagCompound();
writeSelfToNBT(data);
@ -169,7 +169,14 @@ public class AIRobot {
NBTTagCompound sub = nbt.getCompoundTag("delegateAI");
try {
delegateAI = (AIRobot) Class.forName(sub.getString("class")).getConstructor(EntityRobotBase.class)
Class<?> aiRobotClass = null;
if (sub.hasKey("class")) {
// Migration support for 6.4.x
aiRobotClass = RobotManager.getAIRobotByLegacyClassName(sub.getString("class"));
} else {
aiRobotClass = RobotManager.getAIRobotByName(sub.getString("aiName"));
}
delegateAI = (AIRobot) aiRobotClass.getConstructor(EntityRobotBase.class)
.newInstance(robot);
if (delegateAI.canLoadFromNBT()) {
@ -186,7 +193,14 @@ public class AIRobot {
AIRobot ai = null;
try {
ai = (AIRobot) Class.forName(nbt.getString("class")).getConstructor(EntityRobotBase.class)
Class<?> aiRobotClass = null;
if (nbt.hasKey("class")) {
// Migration support for 6.4.x
aiRobotClass = RobotManager.getAIRobotByLegacyClassName(nbt.getString("class"));
} else {
aiRobotClass = RobotManager.getAIRobotByName(nbt.getString("aiName"));
}
ai = (AIRobot) aiRobotClass.getConstructor(EntityRobotBase.class)
.newInstance(robot);
ai.loadFromNBT(nbt);
} catch (Throwable e) {

2
api/buildcraft/api/robots/EntityRobotBase.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/robots/IDockingStation.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/robots/IRequestProvider.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/robots/IRobotRegistry.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

14
api/buildcraft/api/robots/ResourceId.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.
@ -47,7 +47,7 @@ public abstract class ResourceId {
nbt.setTag("index", indexNBT);
nbt.setByte("side", (byte) side.ordinal());
nbt.setInteger("localId", localId);
nbt.setString("class", getClass().getCanonicalName());
nbt.setString("resourceName", RobotManager.getResourceIdName(getClass()));
}
protected void readFromNBT(NBTTagCompound nbt) {
@ -58,9 +58,15 @@ public abstract class ResourceId {
public static ResourceId load(NBTTagCompound nbt) {
try {
Class clas = Class.forName(nbt.getString("class"));
Class cls = null;
if (nbt.hasKey("class")) {
// Migration support for 6.4.x
cls = RobotManager.getResourceIdByLegacyClassName(nbt.getString("class"));
} else {
cls = RobotManager.getResourceIdByName("resourceName");
}
ResourceId id = (ResourceId) clas.newInstance();
ResourceId id = (ResourceId) cls.newInstance();
id.readFromNBT(nbt);
return id;

80
api/buildcraft/api/robots/RobotManager.java Normal file
View file

@ -0,0 +1,80 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* BuildCraft is distributed under the terms of the Minecraft Mod Public
* License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.api.robots;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
public abstract class RobotManager {
public static ArrayList<Class<? extends AIRobot>> aiRobots = new ArrayList<Class<? extends AIRobot>>();
private static Map<Class<? extends AIRobot>, String> aiRobotsNames =
new HashMap<Class<? extends AIRobot>, String>();
private static Map<String, Class<? extends AIRobot>> aiRobotsByNames =
new HashMap<String, Class<? extends AIRobot>>();
private static Map<String, Class<? extends AIRobot>> aiRobotsByLegacyClassNames =
new HashMap<String, Class<? extends AIRobot>>();
private static Map<Class<? extends ResourceId>, String> resourceIdNames =
new HashMap<Class<? extends ResourceId>, String>();
private static Map<String, Class<? extends ResourceId>> resourceIdByNames =
new HashMap<String, Class<? extends ResourceId>>();
private static Map<String, Class<? extends ResourceId>> resourceIdLegacyClassNames =
new HashMap<String, Class<? extends ResourceId>>();
public static void registerAIRobot(Class<? extends AIRobot> aiRobot, String name) {
registerAIRobot(aiRobot, name, null);
}
public static void registerAIRobot(Class<? extends AIRobot> aiRobot, String name, String legacyClassName) {
aiRobots.add(aiRobot);
aiRobotsByNames.put(name, aiRobot);
aiRobotsNames.put(aiRobot, name);
if (legacyClassName != null) {
aiRobotsByLegacyClassNames.put(legacyClassName, aiRobot);
}
}
public static Class<?> getAIRobotByName(String aiRobotName) {
return aiRobotsByNames.get(aiRobotName);
}
public static String getAIRobotName(Class<? extends AIRobot> aiRobotClass) {
return aiRobotsNames.get(aiRobotClass);
}
public static Class<?> getAIRobotByLegacyClassName(String aiRobotLegacyClassName) {
return aiRobotsByLegacyClassNames.get(aiRobotLegacyClassName);
}
public static void registerResourceId(Class<? extends ResourceId> resourceId, String name) {
registerResourceId(resourceId, name, null);
}
public static void registerResourceId(Class<? extends ResourceId> resourceId, String name, String legacyClassName) {
resourceIdByNames.put(name, resourceId);
resourceIdNames.put(resourceId, name);
if (legacyClassName != null) {
resourceIdLegacyClassNames.put(legacyClassName, resourceId);
}
}
public static Class<?> getResourceIdByName(String resourceIdName) {
return resourceIdByNames.get(resourceIdName);
}
public static String getResourceIdName(Class<? extends ResourceId> resouceIdClass) {
return resourceIdNames.get(resouceIdClass);
}
public static Class<?> getResourceIdByLegacyClassName(String resourceIdLegacyClassName) {
return resourceIdLegacyClassNames.get(resourceIdLegacyClassName);
}
}

2
api/buildcraft/api/robots/StackRequest.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/robots/package-info.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/statements/ActionState.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/statements/IActionExternal.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/statements/IActionInternal.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/statements/IActionProvider.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

2
api/buildcraft/api/statements/IActionReceptor.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License.

Some files were not shown because too many files have changed in this diff Show more