Auto-Sync
This commit is contained in:
parent
5be43903f2
commit
d48f24b73d
7 changed files with 14 additions and 19 deletions
|
@ -5,25 +5,25 @@ rem set parameters:
|
|||
IF NOT "a%1"=="a" (set "com=%1")
|
||||
IF NOT "a%2"=="a" (set "msg=%2")
|
||||
cd ..\
|
||||
git commit %com%%msg%
|
||||
git commit -am "%com%%msg%"
|
||||
git push
|
||||
cd ..\
|
||||
cd Assembly-Line
|
||||
git commit %com%%msg%
|
||||
git commit -am "%com%%msg%"
|
||||
git push
|
||||
cd ..\
|
||||
cd FarmTech
|
||||
git commit %com%%msg%
|
||||
git commit -am "%com%%msg%"
|
||||
git push
|
||||
cd ..\
|
||||
cd Fluid-Mechanics
|
||||
git commit %com%%msg%
|
||||
git commit -am "%com%%msg%"
|
||||
git push
|
||||
cd ..\
|
||||
cd GreaterProtection
|
||||
git commit %com%%msg%
|
||||
git commit -am "%com%%msg%"
|
||||
git push
|
||||
cd ..\
|
||||
cd GSM
|
||||
git commit %com%%msg%
|
||||
git commit -am "%com%%msg%"
|
||||
git push
|
|
@ -5,12 +5,12 @@ import net.minecraftforge.common.ForgeDirection;
|
|||
|
||||
/** Simple way to control the read-out display over several tools when they are used on the
|
||||
* tileEntity
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public interface IToolReadOut
|
||||
{
|
||||
/** Grabs the message displayed to the user on right click of the machine with the given tool
|
||||
*
|
||||
*
|
||||
* @param user
|
||||
* @param side - may not work correctly yet but should give you a side
|
||||
* @return - a string to be displayed to the player for a reading. automatically adds ReadOut:
|
||||
|
|
|
@ -2,14 +2,13 @@ package dark.api;
|
|||
|
||||
import java.util.HashMap;
|
||||
|
||||
import dark.core.prefab.helpers.Pair;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import dark.core.prefab.helpers.Pair;
|
||||
|
||||
/** Recipes for ore processor machines
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public class ProcessorRecipes
|
||||
{
|
||||
|
|
|
@ -16,7 +16,7 @@ import dark.core.common.DarkMain;
|
|||
/** Basic TileEntity Container class designed to be used by generic machines. It is suggested that
|
||||
* each mod using this create there own basic block extending this to reduce need to input config
|
||||
* file each time
|
||||
*
|
||||
*
|
||||
* @author Darkguardsman */
|
||||
public abstract class BlockMachine extends BlockTile implements ITileEntityProvider
|
||||
{
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
package dark.core.prefab;
|
||||
|
||||
import ic2.api.item.IElectricItemManager;
|
||||
import ic2.api.item.ISpecialElectricItem;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.ISidedInventory;
|
||||
|
@ -20,7 +18,6 @@ import net.minecraft.util.AxisAlignedBB;
|
|||
import net.minecraftforge.common.ForgeDirection;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import thermalexpansion.api.item.IChargeableItem;
|
||||
import universalelectricity.compatibility.Compatibility;
|
||||
import universalelectricity.compatibility.TileEntityUniversalElectrical;
|
||||
import universalelectricity.core.electricity.ElectricityPack;
|
||||
import universalelectricity.core.item.IItemElectric;
|
||||
|
@ -42,7 +39,7 @@ import dark.core.prefab.invgui.InvChest;
|
|||
|
||||
/** Prefab for most machines in the CoreMachine set. Provides basic power updates, packet updates,
|
||||
* inventory handling, and other handy methods.
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public abstract class TileEntityMachine extends TileEntityUniversalElectrical implements ISidedInventory, IExternalInv, IDisableable, IPacketReceiver, IPowerLess
|
||||
{
|
||||
|
@ -295,7 +292,7 @@ public abstract class TileEntityMachine extends TileEntityUniversalElectrical im
|
|||
}
|
||||
|
||||
/** Handles reduced data from the main packet method
|
||||
*
|
||||
*
|
||||
* @param id - packet ID
|
||||
* @param dis - data
|
||||
* @param player - player
|
||||
|
|
|
@ -2,7 +2,6 @@ package dark.core.prefab.access;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/** Used by any object that needs to restrict access to it by a set of usernames
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
|
|
|
@ -8,7 +8,7 @@ import dark.core.prefab.access.ISpecialAccess;
|
|||
/** Basic methods to make it easier to construct or interact with a terminal based tile. Recommend to
|
||||
* be used by tiles that want to mimic computer command line like interfaces. As well to restrict
|
||||
* access to the tile in the same way a computer would
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsmsan */
|
||||
public interface ITerminal extends ISpecialAccess, IScroll
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue