tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

More commits

Browse source
This commit is contained in:
Calclavia 2012-10-28 13:51:08 +08:00
parent e8afe5d767
commit e66818447a
2 changed files with 63 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
publish.bat Normal file
View file

@ -0,0 +1,54 @@
::ASSEMBLY LINE BUILDER
@echo off
echo Promotion Type?
set /p PROMOTION=
set /p MODVERSION=<modversion.txt
set /p CurrentBuild=<buildnumber.txt
set /a BUILD_NUMBER=%CurrentBuild%+1
echo %BUILD_NUMBER% >buildnumber.txt
set FILE_NAME=AssemblyLine_v%MODVERSION%.%BUILD_NUMBER%.jar
set API_NAME=AssemblyLine_v%MODVERSION%.%BUILD_NUMBER%_api.zip
set BACKUP_NAME=AssemblyLine_v%MODVERSION%.%BUILD_NUMBER%_backup.zip
echo Starting to build %FILE_NAME%
::BUILD
runtime\bin\python\python_mcp runtime\recompile.py %*
runtime\bin\python\python_mcp runtime\reobfuscate.py %*
::ZIP-UP
cd reobf\minecraft\
"..\..\..\7za.exe" a "..\..\builds\%FILE_NAME%" "*"
cd ..\..\
"..\7za.exe" a "builds\%FILE_NAME%" "mcmod.info"
cd resources\
"..\..\7za.exe" a "..\builds\%FILE_NAME%" "*"
"..\..\7za.exe" a "..\builds\%BACKUP_NAME%" "*" -pcalclavia
cd ..\
cd src\
"..\..\7za.exe" a "..\builds\%BACKUP_NAME%" "*\assemblyline\" -pcalclavia
::"..\..\7za.exe" a "..\builds\%API_NAME%" "*\atomicscience\api\"
cd ..\
::UPDATE INFO FILE %API_NAME%
echo %PROMOTION% %FILE_NAME%>>info.txt
::GENERATE FTP Script
echo open www.calclavia.com>ftpscript.txt
echo al@calclavia.com>>ftpscript.txt
echo f@Gwk%qFJ4kc>>ftpscript.txt
echo binary>>ftpscript.txt
echo put "builds\%FILE_NAME%">>ftpscript.txt
::echo put "builds\%API_NAME%">>ftpscript.txt
echo put info.txt>>ftpscript.txt
echo quit>>ftpscript.txt
ftp.exe -s:ftpscript.txt
del ftpscript.txt
echo Done building %FILE_NAME% for UE %UE_VERSION%
pause

17
src/common/assemblyline/AssemblyLine.java
View file

@ -15,6 +15,7 @@ import assemblyline.interaction.BlockInteraction;
import assemblyline.interaction.ItemMachine;
import assemblyline.interaction.TileEntityEjector;
import assemblyline.interaction.TileEntityMachineInput;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.Mod.Instance;
@ -43,7 +44,7 @@ public class AssemblyLine
public static final String CHANNEL = "AssemblyLine";
public static final Configuration config = new Configuration(new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "UniversalElectricity/ConveyorBelts.cfg"));
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "UniversalElectricity/AssemblyLine.cfg"));
public static int machineID = configurationProperties();
public static int machine2ID;
public static int beltBlockID;
@ -54,11 +55,11 @@ public class AssemblyLine
public static int configurationProperties()
{
config.load();
beltBlockID = Integer.parseInt(config.getBlock(Configuration.CATEGORY_BLOCK, "BeltBlockID", 3003).value);
machineID = Integer.parseInt(config.getBlock(Configuration.CATEGORY_BLOCK, "MachineID", 3005).value);
animationOn = Boolean.parseBoolean(config.get(Configuration.CATEGORY_GENERAL, "BeltAnimationOn", true).value);
config.save();
CONFIGURATION.load();
beltBlockID = Integer.parseInt(CONFIGURATION.getBlock(Configuration.CATEGORY_BLOCK, "BeltBlockID", 3003).value);
machineID = Integer.parseInt(CONFIGURATION.getBlock(Configuration.CATEGORY_BLOCK, "MachineID", 3005).value);
animationOn = Boolean.parseBoolean(CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "BeltAnimationOn", true).value);
CONFIGURATION.save();
return machineID;
}
@ -95,8 +96,8 @@ public class AssemblyLine
{ "III", "MCM", 'I', Item.ingotIron, 'M', "motor", 'C', "basicCircuit" }));
// Rejector
GameRegistry.addRecipe(new ItemStack(blockMachine, 1, 0), new Object[]
{ "WPW", "@R@", '@', "plateSteel", 'R', Item.redstone, 'P', Block.pistonBase, 'C', "basicCircuit", 'W', "copperWire" });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockMachine, 1, 0), new Object[]
{ "WPW", "@R@", '@', "plateSteel", 'R', Item.redstone, 'P', Block.pistonBase, 'C', "basicCircuit", 'W', "copperWire" }));
// Retriever
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(blockMachine, 1, 4), new Object[]