Fixed a bug with shift clicking.
Added Quartz Knife Gui. You can now make name presses with the quartz knife. Added Inscriber Recipes. Fixed Bug with Spatial Dim Registrations.
This commit is contained in:
@@ -127,6 +127,7 @@ import appeng.recipes.RecipeHandler;
|
||||
import appeng.recipes.game.ShapedRecipe;
|
||||
import appeng.recipes.game.ShapelessRecipe;
|
||||
import appeng.recipes.handlers.Grind;
|
||||
import appeng.recipes.handlers.Inscriber;
|
||||
import appeng.recipes.handlers.Macerator;
|
||||
import appeng.recipes.handlers.Pulverizer;
|
||||
import appeng.recipes.handlers.Shaped;
|
||||
@@ -176,6 +177,7 @@ public class Registration
|
||||
recipeRegistery.addNewCraftHandler( "macerator", Macerator.class );
|
||||
|
||||
recipeRegistery.addNewCraftHandler( "smelt", Smelt.class );
|
||||
recipeRegistery.addNewCraftHandler( "inscriber", Inscriber.class );
|
||||
|
||||
recipeRegistery.addNewCraftHandler( "shaped", Shaped.class );
|
||||
recipeRegistery.addNewCraftHandler( "shapeless", Shapeless.class );
|
||||
|
||||
+19
-7
@@ -39,6 +39,12 @@ public class WorldSettings extends Configuration
|
||||
compass = new CompassService( AEFolder );
|
||||
(new Thread( compass, "AE Compass Service" )).start();
|
||||
|
||||
for (int dimID : get( "DimensionManager", "StorageCells", new int[0] ).getIntList())
|
||||
{
|
||||
storageCellDims.add( dimID );
|
||||
DimensionManager.registerDimension( dimID, AEConfig.instance.storageProviderID );
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
lastGridStorage = Long.parseLong( get( "Counters", "lastGridStorage", 0 ).getString() );
|
||||
@@ -51,6 +57,19 @@ public class WorldSettings extends Configuration
|
||||
}
|
||||
}
|
||||
|
||||
public void shutdown()
|
||||
{
|
||||
save();
|
||||
|
||||
for (Integer dimID : storageCellDims)
|
||||
DimensionManager.unregisterDimension( dimID );
|
||||
|
||||
storageCellDims.clear();
|
||||
|
||||
compass.kill();
|
||||
instance = null;
|
||||
}
|
||||
|
||||
List<Integer> storageCellDims = new ArrayList();
|
||||
|
||||
public void addStorageCellDim(int newDim)
|
||||
@@ -118,13 +137,6 @@ public class WorldSettings extends Configuration
|
||||
save();
|
||||
}
|
||||
|
||||
public void shutdown()
|
||||
{
|
||||
save();
|
||||
compass.kill();
|
||||
instance = null;
|
||||
}
|
||||
|
||||
private WeakHashMap<GridStorageSearch, WeakReference<GridStorageSearch>> loadedStorage = new WeakHashMap();
|
||||
|
||||
public WorldCoord getStoredSize(int dim)
|
||||
|
||||
@@ -44,6 +44,7 @@ import appeng.container.implementations.ContainerNetworkStatus;
|
||||
import appeng.container.implementations.ContainerNetworkTool;
|
||||
import appeng.container.implementations.ContainerPriority;
|
||||
import appeng.container.implementations.ContainerQNB;
|
||||
import appeng.container.implementations.ContainerQuartzKnife;
|
||||
import appeng.container.implementations.ContainerSecurity;
|
||||
import appeng.container.implementations.ContainerSkyChest;
|
||||
import appeng.container.implementations.ContainerSpatialIOPort;
|
||||
@@ -55,6 +56,7 @@ import appeng.container.implementations.ContainerWirelessTerm;
|
||||
import appeng.helpers.IInterfaceHost;
|
||||
import appeng.helpers.IPriorityHost;
|
||||
import appeng.helpers.WirelessTerminalGuiObject;
|
||||
import appeng.items.contents.QuartzKnifeObj;
|
||||
import appeng.parts.automation.PartFormationPlane;
|
||||
import appeng.parts.automation.PartLevelEmitter;
|
||||
import appeng.parts.misc.PartStorageBus;
|
||||
@@ -100,6 +102,8 @@ public enum GuiBridge implements IGuiHandler
|
||||
|
||||
GUI_NETWORK_TOOL(ContainerNetworkTool.class, INetworkTool.class, true, null),
|
||||
|
||||
GUI_QUARTZ_KNIFE(ContainerQuartzKnife.class, QuartzKnifeObj.class, true, null),
|
||||
|
||||
GUI_DRIVE(ContainerDrive.class, TileDrive.class, false, SecurityPermissions.BUILD),
|
||||
|
||||
GUI_VIBRATIONCHAMBER(ContainerVibrationChamber.class, TileVibrationChamber.class, false, null),
|
||||
|
||||
@@ -17,6 +17,7 @@ import appeng.api.util.IConfigureableObject;
|
||||
import appeng.container.implementations.ContainerCellWorkbench;
|
||||
import appeng.container.implementations.ContainerLevelEmitter;
|
||||
import appeng.container.implementations.ContainerPriority;
|
||||
import appeng.container.implementations.ContainerQuartzKnife;
|
||||
import appeng.container.implementations.ContainerSecurity;
|
||||
import appeng.core.sync.AppEngPacket;
|
||||
import appeng.core.sync.network.INetworkInfo;
|
||||
@@ -40,7 +41,13 @@ public class PacketValueConfig extends AppEngPacket
|
||||
{
|
||||
Container c = player.openContainer;
|
||||
|
||||
if ( Name.equals( "TileSecurity.ToggleOption" ) && c instanceof ContainerSecurity )
|
||||
if ( Name.equals( "QuartzKnife.Name" ) && c instanceof ContainerQuartzKnife )
|
||||
{
|
||||
ContainerQuartzKnife qk = (ContainerQuartzKnife) c;
|
||||
qk.setName( Value );
|
||||
return;
|
||||
}
|
||||
else if ( Name.equals( "TileSecurity.ToggleOption" ) && c instanceof ContainerSecurity )
|
||||
{
|
||||
ContainerSecurity sc = (ContainerSecurity) c;
|
||||
sc.toggleSetting( Value, player );
|
||||
|
||||
Reference in New Issue
Block a user