diff --git a/src/main/java/appeng/block/crafting/ItemCraftingStorage.java b/src/main/java/appeng/block/crafting/ItemCraftingStorage.java index 423a4e4d0..091ad44fd 100644 --- a/src/main/java/appeng/block/crafting/ItemCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/ItemCraftingStorage.java @@ -45,6 +45,6 @@ public class ItemCraftingStorage extends AEBaseItemBlock @Override public boolean hasContainerItem( final ItemStack stack ) { - return AEConfig.instance.isFeatureEnabled( AEFeature.EnableDisassemblyCrafting ); + return AEConfig.instance().isFeatureEnabled( AEFeature.ENABLE_DISASSEMBLY_CRAFTING ); } } diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index ffda7d980..8a81d3961 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -94,7 +94,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision @SideOnly( Side.CLIENT ) public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { - if( !AEConfig.instance.enableEffects ) + if( !AEConfig.instance().isEnableEffects() ) { return; } diff --git a/src/main/java/appeng/block/misc/BlockQuartzFixture.java b/src/main/java/appeng/block/misc/BlockQuartzFixture.java index 14fffc649..3809b010a 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzFixture.java +++ b/src/main/java/appeng/block/misc/BlockQuartzFixture.java @@ -135,7 +135,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, @SideOnly( Side.CLIENT ) public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { - if( !AEConfig.instance.enableEffects ) + if( !AEConfig.instance().isEnableEffects() ) { return; } diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index 5e6370841..ecfcbaa80 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -76,7 +76,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr @Override public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { - if( !AEConfig.instance.enableEffects ) + if( !AEConfig.instance().isEnableEffects() ) { return; } diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index d27b2a379..f85176fe8 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -98,7 +98,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock @Override public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { - if( !AEConfig.instance.enableEffects ) + if( !AEConfig.instance().isEnableEffects() ) { return; } diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java index 8e01b7967..298a0af3c 100644 --- a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java @@ -184,7 +184,7 @@ class BlockDefinitionBuilder implements IBlockBuilder @Override public T build() { - if( !AEConfig.instance.areFeaturesEnabled( features ) ) + if( !AEConfig.instance().areFeaturesEnabled( features ) ) { return (T) new TileDefinition( registryName, null, null ); } diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index c173c77c1..d7e2a03ae 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -59,7 +59,7 @@ public class FeatureFactory public FeatureFactory() { - this.defaultFeatures = new AEFeature[] { AEFeature.Core }; + this.defaultFeatures = new AEFeature[] { AEFeature.CORE }; this.bootstrapComponents = new ArrayList<>(); if( Platform.isClient() ) diff --git a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java index 0e5fb0ff9..3e2dd5ed1 100644 --- a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java @@ -147,7 +147,7 @@ class ItemDefinitionBuilder implements IItemBuilder @Override public ItemDefinition build() { - if( !AEConfig.instance.areFeaturesEnabled( features ) ) + if( !AEConfig.instance().areFeaturesEnabled( features ) ) { return new ItemDefinition( registryName, null ); } diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index d90bfe219..bb9beac42 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -149,7 +149,7 @@ public class ClientHelper extends ServerHelper @Override public void spawnEffect( final EffectType effect, final World worldObj, final double posX, final double posY, final double posZ, final Object o ) { - if( AEConfig.instance.enableEffects ) + if( AEConfig.instance().isEnableEffects() ) { switch( effect ) { @@ -354,7 +354,7 @@ public class ClientHelper extends ServerHelper final ItemStack is = player.getHeldItem( hand ); try { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "Item", me.getDwheel() > 0 ? "WheelUp" : "WheelDown" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "Item", me.getDwheel() > 0 ? "WheelUp" : "WheelDown" ) ); me.setCanceled( true ); } catch( final IOException e ) diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index c2b24d114..3a116ec9d 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -313,7 +313,7 @@ public abstract class AEBaseGui extends GuiContainer for( final Slot dr : this.drag_click ) { final PacketInventoryAction p = new PacketInventoryAction( c == 0 ? InventoryAction.PICKUP_OR_SET_DOWN : InventoryAction.PLACE_SINGLE, dr.slotNumber, 0 ); - NetworkHandler.instance.sendToServer( p ); + NetworkHandler.instance().sendToServer( p ); } } } @@ -339,7 +339,7 @@ public abstract class AEBaseGui extends GuiContainer } final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 ); - NetworkHandler.instance.sendToServer( p ); + NetworkHandler.instance().sendToServer( p ); return; } @@ -353,7 +353,7 @@ public abstract class AEBaseGui extends GuiContainer try { - NetworkHandler.instance.sendToServer( ( (SlotPatternTerm) slot ).getRequest( isShiftKeyDown() ) ); + NetworkHandler.instance().sendToServer( ( (SlotPatternTerm) slot ).getRequest( isShiftKeyDown() ) ); } catch( final IOException e ) { @@ -379,7 +379,7 @@ public abstract class AEBaseGui extends GuiContainer } final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 ); - NetworkHandler.instance.sendToServer( p ); + NetworkHandler.instance().sendToServer( p ); return; } @@ -403,7 +403,7 @@ public abstract class AEBaseGui extends GuiContainer ( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack ); final PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 ); - NetworkHandler.instance.sendToServer( p ); + NetworkHandler.instance().sendToServer( p ); return; } } @@ -437,7 +437,7 @@ public abstract class AEBaseGui extends GuiContainer if( action != null ) { final PacketInventoryAction p = new PacketInventoryAction( action, slot.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() ); - NetworkHandler.instance.sendToServer( p ); + NetworkHandler.instance().sendToServer( p ); } return; @@ -490,7 +490,7 @@ public abstract class AEBaseGui extends GuiContainer { ( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack ); final PacketInventoryAction p = new PacketInventoryAction( action, this.getInventorySlots().size(), 0 ); - NetworkHandler.instance.sendToServer( p ); + NetworkHandler.instance().sendToServer( p ); } return; @@ -579,7 +579,7 @@ public abstract class AEBaseGui extends GuiContainer { if( s.getSlotIndex() == j && s.inventory == ( (AEBaseContainer) this.inventorySlots ).getPlayerInv() ) { - NetworkHandler.instance.sendToServer( new PacketSwapSlots( s.slotNumber, theSlot.slotNumber ) ); + NetworkHandler.instance().sendToServer( new PacketSwapSlots( s.slotNumber, theSlot.slotNumber ) ); return true; } } @@ -648,7 +648,7 @@ public abstract class AEBaseGui extends GuiContainer for( int h = 0; h < times; h++ ) { final PacketInventoryAction p = new PacketInventoryAction( direction, inventorySize, 0 ); - NetworkHandler.instance.sendToServer( p ); + NetworkHandler.instance().sendToServer( p ); } } } diff --git a/src/main/java/appeng/client/gui/AEBaseMEGui.java b/src/main/java/appeng/client/gui/AEBaseMEGui.java index 52267c2da..f3fd749f9 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEGui.java +++ b/src/main/java/appeng/client/gui/AEBaseMEGui.java @@ -49,7 +49,7 @@ public abstract class AEBaseMEGui extends AEBaseGui final Slot s = this.getSlot( mouseX, mouseY ); if( s instanceof SlotME ) { - final int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999; + final int BigNumber = AEConfig.instance().useTerminalUseLargeFont() ? 999 : 9999; IAEItemStack myStack = null; @@ -103,7 +103,7 @@ public abstract class AEBaseMEGui extends AEBaseGui final Slot s = this.getSlot( x, y ); if( s instanceof SlotME && stack != null ) { - final int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999; + final int BigNumber = AEConfig.instance().useTerminalUseLargeFont() ? 999 : 9999; IAEItemStack myStack = null; diff --git a/src/main/java/appeng/client/gui/config/AEConfigGui.java b/src/main/java/appeng/client/gui/config/AEConfigGui.java index 33725b9b8..90b5eb01d 100644 --- a/src/main/java/appeng/client/gui/config/AEConfigGui.java +++ b/src/main/java/appeng/client/gui/config/AEConfigGui.java @@ -37,14 +37,14 @@ public class AEConfigGui extends GuiConfig public AEConfigGui( final GuiScreen parent ) { - super( parent, getConfigElements(), AppEng.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath( AEConfig.instance.getFilePath() ) ); + super( parent, getConfigElements(), AppEng.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath( AEConfig.instance().getFilePath() ) ); } private static List getConfigElements() { final List list = new ArrayList(); - for( final String cat : AEConfig.instance.getCategoryNames() ) + for( final String cat : AEConfig.instance().getCategoryNames() ) { if( cat.equals( "versionchecker" ) ) { @@ -56,7 +56,7 @@ public class AEConfigGui extends GuiConfig continue; } - final ConfigCategory cc = AEConfig.instance.getCategory( cat ); + final ConfigCategory cc = AEConfig.instance().getCategory( cat ); if( cc.isChild() ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java b/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java index a26778dd8..dcfc35477 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java @@ -176,15 +176,15 @@ public class GuiCellWorkbench extends GuiUpgradeable { if( btn == this.copyMode ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "CellWorkbench.Action", "CopyMode" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "CellWorkbench.Action", "CopyMode" ) ); } else if( btn == this.partition ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "CellWorkbench.Action", "Partition" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "CellWorkbench.Action", "Partition" ) ); } else if( btn == this.clear ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "CellWorkbench.Action", "Clear" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "CellWorkbench.Action", "Clear" ) ); } else if( btn == this.fuzzyMode ) { @@ -193,7 +193,7 @@ public class GuiCellWorkbench extends GuiUpgradeable FuzzyMode fz = (FuzzyMode) this.fuzzyMode.getCurrentValue(); fz = Platform.rotateEnum( fz, backwards, Settings.FUZZY_MODE.getPossibleValues() ); - NetworkHandler.instance.sendToServer( new PacketValueConfig( "CellWorkbench.Fuzzy", fz.name() ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "CellWorkbench.Fuzzy", fz.name() ) ); } else { diff --git a/src/main/java/appeng/client/gui/implementations/GuiChest.java b/src/main/java/appeng/client/gui/implementations/GuiChest.java index 58b98fa4b..020085f44 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiChest.java +++ b/src/main/java/appeng/client/gui/implementations/GuiChest.java @@ -52,7 +52,7 @@ public class GuiChest extends AEBaseGui if( par1GuiButton == this.priority ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCondenser.java b/src/main/java/appeng/client/gui/implementations/GuiCondenser.java index 49062f3c1..b73711370 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCondenser.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCondenser.java @@ -61,7 +61,7 @@ public class GuiCondenser extends AEBaseGui if( this.mode == btn ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( Settings.CONDENSER_OUTPUT, backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( Settings.CONDENSER_OUTPUT, backwards ) ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java b/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java index a67d80a0c..d120cc436 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java @@ -76,10 +76,10 @@ public class GuiCraftAmount extends AEBaseGui { super.initGui(); - final int a = AEConfig.instance.craftItemsByStackAmounts( 0 ); - final int b = AEConfig.instance.craftItemsByStackAmounts( 1 ); - final int c = AEConfig.instance.craftItemsByStackAmounts( 2 ); - final int d = AEConfig.instance.craftItemsByStackAmounts( 3 ); + final int a = AEConfig.instance().craftItemsByStackAmounts( 0 ); + final int b = AEConfig.instance().craftItemsByStackAmounts( 1 ); + final int c = AEConfig.instance().craftItemsByStackAmounts( 2 ); + final int d = AEConfig.instance().craftItemsByStackAmounts( 3 ); this.buttonList.add( this.plus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 26, 22, 20, "+" + a ) ); this.buttonList.add( this.plus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 26, 28, 20, "+" + b ) ); @@ -224,12 +224,12 @@ public class GuiCraftAmount extends AEBaseGui if( btn == this.originalGuiBtn ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( this.originalGui ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( this.originalGui ) ); } if( btn == this.next ) { - NetworkHandler.instance.sendToServer( new PacketCraftRequest( Integer.parseInt( this.amountToCraft.getText() ), isShiftKeyDown() ) ); + NetworkHandler.instance().sendToServer( new PacketCraftRequest( Integer.parseInt( this.amountToCraft.getText() ), isShiftKeyDown() ) ); } } catch( final NumberFormatException e ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index 51d5121a9..221eb4558 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -552,7 +552,7 @@ public class GuiCraftConfirm extends AEBaseGui { try { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "Terminal.Cpu", backwards ? "Prev" : "Next" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "Terminal.Cpu", backwards ? "Prev" : "Next" ) ); } catch( final IOException e ) { @@ -562,14 +562,14 @@ public class GuiCraftConfirm extends AEBaseGui if( btn == this.cancel ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( this.OriginalGui ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( this.OriginalGui ) ); } if( btn == this.start ) { try { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "Terminal.Start", "Start" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "Terminal.Start", "Start" ) ); } catch( final Throwable e ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index 0d08d0983..d9b5eb08c 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -125,7 +125,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource { try { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "TileCrafting.Cancel", "Cancel" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "TileCrafting.Cancel", "Cancel" ) ); } catch( final IOException e ) { @@ -248,7 +248,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource scheduled = true; } - if( AEConfig.instance.useColoredCraftingStatus && ( active || scheduled ) ) + if( AEConfig.instance().isUseColoredCraftingStatus() && ( active || scheduled ) ) { final int bgColor = ( active ? AEColor.GREEN.blackVariant : AEColor.YELLOW.blackVariant ) | BACKGROUND_ALPHA; final int startX = ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET ) * 2; diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java index 852e4c36e..7023c68cc 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java @@ -108,7 +108,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU { try { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "Terminal.Cpu", backwards ? "Prev" : "Next" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "Terminal.Cpu", backwards ? "Prev" : "Next" ) ); } catch( final IOException e ) { @@ -118,7 +118,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU if( btn == this.originalGuiBtn ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( this.originalGui ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( this.originalGui ) ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java index 36a52eb07..7b4c8c9c2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java @@ -67,7 +67,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable if( s != null ) { final PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, s.slotNumber, 0 ); - NetworkHandler.instance.sendToServer( p ); + NetworkHandler.instance().sendToServer( p ); } } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiDrive.java b/src/main/java/appeng/client/gui/implementations/GuiDrive.java index 74370540d..6967b2613 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiDrive.java +++ b/src/main/java/appeng/client/gui/implementations/GuiDrive.java @@ -52,7 +52,7 @@ public class GuiDrive extends AEBaseGui if( par1GuiButton == this.priority ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java index 2a3c5e788..695c62789 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java +++ b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java @@ -96,11 +96,11 @@ public class GuiFormationPlane extends GuiUpgradeable if( btn == this.priority ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); } else if( btn == this.placeMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.placeMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.placeMode.getSetting(), backwards ) ); } } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java b/src/main/java/appeng/client/gui/implementations/GuiIOPort.java index dc08a3b63..afa75f5c4 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java +++ b/src/main/java/appeng/client/gui/implementations/GuiIOPort.java @@ -113,12 +113,12 @@ public class GuiIOPort extends GuiUpgradeable if( btn == this.fullMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.fullMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.fullMode.getSetting(), backwards ) ); } if( btn == this.operationMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.operationMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.operationMode.getSetting(), backwards ) ); } } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterface.java b/src/main/java/appeng/client/gui/implementations/GuiInterface.java index c438a83c9..69aae4f8a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterface.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterface.java @@ -103,17 +103,17 @@ public class GuiInterface extends GuiUpgradeable if( btn == this.priority ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); } if( btn == this.interfaceMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( Settings.INTERFACE_TERMINAL, backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( Settings.INTERFACE_TERMINAL, backwards ) ); } if( btn == this.BlockMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.BlockMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.BlockMode.getSetting(), backwards ) ); } } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java b/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java index 972640363..18392b430 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java +++ b/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java @@ -88,10 +88,10 @@ public class GuiLevelEmitter extends GuiUpgradeable this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL ); this.craftingMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.CRAFT_VIA_REDSTONE, YesNo.NO ); - final int a = AEConfig.instance.levelByStackAmounts( 0 ); - final int b = AEConfig.instance.levelByStackAmounts( 1 ); - final int c = AEConfig.instance.levelByStackAmounts( 2 ); - final int d = AEConfig.instance.levelByStackAmounts( 3 ); + final int a = AEConfig.instance().levelByStackAmounts( 0 ); + final int b = AEConfig.instance().levelByStackAmounts( 1 ); + final int c = AEConfig.instance().levelByStackAmounts( 2 ); + final int d = AEConfig.instance().levelByStackAmounts( 3 ); this.buttonList.add( this.plus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 17, 22, 20, "+" + a ) ); this.buttonList.add( this.plus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 17, 28, 20, "+" + b ) ); @@ -175,12 +175,12 @@ public class GuiLevelEmitter extends GuiUpgradeable if( btn == this.craftingMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.craftingMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.craftingMode.getSetting(), backwards ) ); } if( btn == this.levelMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.levelMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.levelMode.getSetting(), backwards ) ); } final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000; @@ -224,7 +224,7 @@ public class GuiLevelEmitter extends GuiUpgradeable this.level.setText( Out = Long.toString( result ) ); - NetworkHandler.instance.sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) ); } catch( final NumberFormatException e ) { @@ -265,7 +265,7 @@ public class GuiLevelEmitter extends GuiUpgradeable Out = "0"; } - NetworkHandler.instance.sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) ); } catch( final IOException e ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index 007683d27..f958f5c32 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -168,7 +168,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi { if( btn == this.craftingStatusBtn ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_CRAFTING_STATUS ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( GuiBridge.GUI_CRAFTING_STATUS ) ); } if( btn instanceof GuiImgButton ) @@ -183,17 +183,17 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi if( btn == this.terminalStyleBox ) { - AEConfig.instance.settings.putSetting( iBtn.getSetting(), next ); + AEConfig.instance().getConfigManager().putSetting( iBtn.getSetting(), next ); } else if( btn == this.searchBoxSettings ) { - AEConfig.instance.settings.putSetting( iBtn.getSetting(), next ); + AEConfig.instance().getConfigManager().putSetting( iBtn.getSetting(), next ); } else { try { - NetworkHandler.instance.sendToServer( new PacketValueConfig( iBtn.getSetting().name(), next.name() ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( iBtn.getSetting().name(), next.name() ) ); } catch( final IOException e ) { @@ -223,7 +223,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi Keyboard.enableRepeatEvents( true ); this.maxRows = this.getMaxRows(); - this.perRow = AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 ); + this.perRow = AEConfig.instance().getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 ); final int magicNumber = 114 + 1; final int extraSpace = this.height - magicNumber - this.reservedSpace; @@ -248,7 +248,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi } } - if( AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ) + if( AEConfig.instance().getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ) { this.xSize = this.standardSize + ( ( this.perRow - 9 ) * 18 ); } @@ -284,12 +284,12 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi this.buttonList.add( this.SortDirBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_DIRECTION, this.configSrc.getSetting( Settings.SORT_DIRECTION ) ) ); offset += 20; - this.buttonList.add( this.searchBoxSettings = new GuiImgButton( this.guiLeft - 18, offset, Settings.SEARCH_MODE, AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE ) ) ); + this.buttonList.add( this.searchBoxSettings = new GuiImgButton( this.guiLeft - 18, offset, Settings.SEARCH_MODE, AEConfig.instance().getConfigManager().getSetting( Settings.SEARCH_MODE ) ) ); offset += 20; if( !( this instanceof GuiMEPortableCell ) || this instanceof GuiWirelessTerm ) { - this.buttonList.add( this.terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance.settings.getSetting( Settings.TERMINAL_STYLE ) ) ); + this.buttonList.add( this.terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance().getConfigManager().getSetting( Settings.TERMINAL_STYLE ) ) ); } this.searchField = new MEGuiTextField( this.fontRendererObj, this.guiLeft + Math.max( 80, this.offsetX ), this.guiTop + 4, 90, 12 ); @@ -304,8 +304,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi this.craftingStatusBtn.setHideEdge( 13 ); } - // Enum setting = AEConfig.INSTANCE.getSetting( "Terminal", SearchBoxMode.class, SearchBoxMode.AUTOSEARCH ); - final Enum setting = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE ); + // Enum setting = AEConfig.instance().getSetting( "Terminal", SearchBoxMode.class, SearchBoxMode.AUTOSEARCH ); + final Enum setting = AEConfig.instance().getConfigManager().getSetting( Settings.SEARCH_MODE ); this.searchField.setFocused( SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.JEI_AUTOSEARCH == setting ); if( this.isSubGui() ) @@ -354,7 +354,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi @Override protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) throws IOException { - final Enum searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE ); + final Enum searchMode = AEConfig.instance().getConfigManager().getSetting( Settings.SEARCH_MODE ); if( searchMode != SearchBoxMode.AUTOSEARCH && searchMode != SearchBoxMode.JEI_AUTOSEARCH ) { @@ -438,7 +438,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi int getMaxRows() { - return AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) == TerminalStyle.SMALL ? 6 : Integer.MAX_VALUE; + return AEConfig.instance().getConfigManager().getSetting( Settings.TERMINAL_STYLE ) == TerminalStyle.SMALL ? 6 : Integer.MAX_VALUE; } protected void repositionSlot( final AppEngSlot s ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java b/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java index d43e6741e..96e8d9c10 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java @@ -77,8 +77,8 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource if( btn == this.units ) { - AEConfig.instance.nextPowerUnit( backwards ); - this.units.set( AEConfig.instance.selectedPowerUnit() ); + AEConfig.instance().nextPowerUnit( backwards ); + this.units.set( AEConfig.instance().selectedPowerUnit() ); } } @@ -87,7 +87,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource { super.initGui(); - this.units = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.POWER_UNITS, AEConfig.instance.selectedPowerUnit() ); + this.units = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.POWER_UNITS, AEConfig.instance().selectedPowerUnit() ); this.buttonList.add( this.units ); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java b/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java index 08562e439..83ea41be1 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java +++ b/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java @@ -54,7 +54,7 @@ public class GuiNetworkTool extends AEBaseGui { if( btn == this.tFacades ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "NetworkTool", "Toggle" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "NetworkTool", "Toggle" ) ); } } catch( final IOException e ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java index 4e3586c55..9e9070233 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java @@ -78,22 +78,22 @@ public class GuiPatternTerm extends GuiMEMonitorable if( this.tabCraftButton == btn || this.tabProcessButton == btn ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) ); } if( this.encodeBtn == btn ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) ); } if( this.clearBtn == btn ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "PatternTerminal.Clear", "1" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Clear", "1" ) ); } if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) ); } } catch( final IOException e ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiPriority.java b/src/main/java/appeng/client/gui/implementations/GuiPriority.java index af359624a..66cd0a00f 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPriority.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPriority.java @@ -77,10 +77,10 @@ public class GuiPriority extends AEBaseGui { super.initGui(); - final int a = AEConfig.instance.priorityByStacksAmounts( 0 ); - final int b = AEConfig.instance.priorityByStacksAmounts( 1 ); - final int c = AEConfig.instance.priorityByStacksAmounts( 2 ); - final int d = AEConfig.instance.priorityByStacksAmounts( 3 ); + final int a = AEConfig.instance().priorityByStacksAmounts( 0 ); + final int b = AEConfig.instance().priorityByStacksAmounts( 1 ); + final int c = AEConfig.instance().priorityByStacksAmounts( 2 ); + final int d = AEConfig.instance().priorityByStacksAmounts( 3 ); this.buttonList.add( this.plus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 32, 22, 20, "+" + a ) ); this.buttonList.add( this.plus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 32, 28, 20, "+" + b ) ); @@ -170,7 +170,7 @@ public class GuiPriority extends AEBaseGui if( btn == this.originalGuiBtn ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( this.OriginalGui ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( this.OriginalGui ) ); } final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000; @@ -210,7 +210,7 @@ public class GuiPriority extends AEBaseGui this.priority.setText( out = Long.toString( result ) ); - NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) ); } catch( final NumberFormatException e ) { @@ -251,7 +251,7 @@ public class GuiPriority extends AEBaseGui out = "0"; } - NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) ); } catch( final IOException e ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java b/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java index ad20665bb..3c9b30d13 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java +++ b/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java @@ -81,7 +81,7 @@ public class GuiQuartzKnife extends AEBaseGui { final String Out = this.name.getText(); ( (ContainerQuartzKnife) this.inventorySlots ).setName( Out ); - NetworkHandler.instance.sendToServer( new PacketValueConfig( "QuartzKnife.Name", Out ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "QuartzKnife.Name", Out ) ); } catch( final IOException e ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java b/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java index ce13c017c..98bce1971 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java @@ -86,7 +86,7 @@ public class GuiSecurityStation extends GuiMEMonitorable { try { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "TileSecurityStation.ToggleOption", toggleSetting.name() ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "TileSecurityStation.ToggleOption", toggleSetting.name() ) ); } catch( final IOException e ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java b/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java index f158f7848..98a79527a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java @@ -58,8 +58,8 @@ public class GuiSpatialIOPort extends AEBaseGui if( btn == this.units ) { - AEConfig.instance.nextPowerUnit( backwards ); - this.units.set( AEConfig.instance.selectedPowerUnit() ); + AEConfig.instance().nextPowerUnit( backwards ); + this.units.set( AEConfig.instance().selectedPowerUnit() ); } } @@ -68,7 +68,7 @@ public class GuiSpatialIOPort extends AEBaseGui { super.initGui(); - this.units = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.POWER_UNITS, AEConfig.instance.selectedPowerUnit() ); + this.units = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.POWER_UNITS, AEConfig.instance().selectedPowerUnit() ); this.buttonList.add( this.units ); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java index a2d89d63d..600ab0837 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java @@ -116,23 +116,23 @@ public class GuiStorageBus extends GuiUpgradeable { if( btn == this.partition ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "StorageBus.Action", "Partition" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "StorageBus.Action", "Partition" ) ); } else if( btn == this.clear ) { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "StorageBus.Action", "Clear" ) ); + NetworkHandler.instance().sendToServer( new PacketValueConfig( "StorageBus.Action", "Clear" ) ); } else if( btn == this.priority ) { - NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); + NetworkHandler.instance().sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); } else if( btn == this.rwMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.rwMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.rwMode.getSetting(), backwards ) ); } else if( btn == this.storageFilter ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.storageFilter.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.storageFilter.getSetting(), backwards ) ); } } catch( final IOException e ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java b/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java index 757651626..7e9a85ef8 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java @@ -182,22 +182,22 @@ public class GuiUpgradeable extends AEBaseGui if( btn == this.redstoneMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.redstoneMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.redstoneMode.getSetting(), backwards ) ); } if( btn == this.craftMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.craftMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.craftMode.getSetting(), backwards ) ); } if( btn == this.fuzzyMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.fuzzyMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.fuzzyMode.getSetting(), backwards ) ); } if( btn == this.schedulingMode ) { - NetworkHandler.instance.sendToServer( new PacketConfigButton( this.schedulingMode.getSetting(), backwards ) ); + NetworkHandler.instance().sendToServer( new PacketConfigButton( this.schedulingMode.getSetting(), backwards ) ); } } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiWireless.java b/src/main/java/appeng/client/gui/implementations/GuiWireless.java index b175d9060..7657b43c2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiWireless.java +++ b/src/main/java/appeng/client/gui/implementations/GuiWireless.java @@ -56,8 +56,8 @@ public class GuiWireless extends AEBaseGui if( btn == this.units ) { - AEConfig.instance.nextPowerUnit( backwards ); - this.units.set( AEConfig.instance.selectedPowerUnit() ); + AEConfig.instance().nextPowerUnit( backwards ); + this.units.set( AEConfig.instance().selectedPowerUnit() ); } } @@ -66,7 +66,7 @@ public class GuiWireless extends AEBaseGui { super.initGui(); - this.units = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.POWER_UNITS, AEConfig.instance.selectedPowerUnit() ); + this.units = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.POWER_UNITS, AEConfig.instance().selectedPowerUnit() ); this.buttonList.add( this.units ); } diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index a0b373a50..6494d2609 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -123,14 +123,14 @@ public class ItemRepo this.dsp.ensureCapacity( this.list.size() ); final Enum viewMode = this.sortSrc.getSortDisplay(); - final Enum searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE ); + final Enum searchMode = AEConfig.instance().getConfigManager().getSetting( Settings.SEARCH_MODE ); if( searchMode == SearchBoxMode.JEI_AUTOSEARCH || searchMode == SearchBoxMode.JEI_MANUAL_SEARCH ) { this.updateJEI( this.searchString ); } this.innerSearch = this.searchString; - final boolean terminalSearchToolTips = AEConfig.instance.settings.getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO; + final boolean terminalSearchToolTips = AEConfig.instance().getConfigManager().getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO; // boolean terminalSearchMods = Configuration.INSTANCE.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO; boolean searchMod = false; diff --git a/src/main/java/appeng/client/render/StackSizeRenderer.java b/src/main/java/appeng/client/render/StackSizeRenderer.java index ec1d76664..1030bc3eb 100644 --- a/src/main/java/appeng/client/render/StackSizeRenderer.java +++ b/src/main/java/appeng/client/render/StackSizeRenderer.java @@ -46,16 +46,16 @@ public class StackSizeRenderer { if( is != null ) { - final float scaleFactor = AEConfig.instance.useTerminalUseLargeFont() ? 0.85f : 0.5f; + final float scaleFactor = AEConfig.instance().useTerminalUseLargeFont() ? 0.85f : 0.5f; final float inverseScaleFactor = 1.0f / scaleFactor; - final int offset = AEConfig.instance.useTerminalUseLargeFont() ? 0 : -1; + final int offset = AEConfig.instance().useTerminalUseLargeFont() ? 0 : -1; final boolean unicodeFlag = fontRenderer.getUnicodeFlag(); fontRenderer.setUnicodeFlag( false ); if( is.stackSize == 0 ) { - final String craftLabelText = AEConfig.instance.useTerminalUseLargeFont() ? GuiText.LargeFontCraft.getLocal() : GuiText.SmallFontCraft.getLocal(); + final String craftLabelText = AEConfig.instance().useTerminalUseLargeFont() ? GuiText.LargeFontCraft.getLocal() : GuiText.SmallFontCraft.getLocal(); GlStateManager.disableLighting(); GlStateManager.disableDepth(); GlStateManager.disableBlend(); @@ -95,7 +95,7 @@ public class StackSizeRenderer private String getToBeRenderedStackSize( final long originalSize ) { - if( AEConfig.instance.useTerminalUseLargeFont() ) + if( AEConfig.instance().useTerminalUseLargeFont() ) { return SLIM_CONVERTER.toSlimReadableForm( originalSize ); } diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index 60505a3ab..909ec0122 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -265,7 +265,7 @@ public abstract class AEBaseContainer extends Container { final PacketPartialItem ppi = new PacketPartialItem( page, miniPackets.size(), packet ); page++; - NetworkHandler.instance.sendToServer( ppi ); + NetworkHandler.instance().sendToServer( ppi ); } } catch( final IOException e ) @@ -1103,7 +1103,7 @@ public abstract class AEBaseContainer extends Container { try { - NetworkHandler.instance.sendTo( new PacketInventoryAction( InventoryAction.UPDATE_HAND, 0, AEItemStack.create( p.inventory.getItemStack() ) ), p ); + NetworkHandler.instance().sendTo( new PacketInventoryAction( InventoryAction.UPDATE_HAND, 0, AEItemStack.create( p.inventory.getItemStack() ) ), p ); } catch( final IOException e ) { @@ -1172,7 +1172,7 @@ public abstract class AEBaseContainer extends Container { try { - NetworkHandler.instance.sendTo( new PacketValueConfig( "CustomName", this.getCustomName() ), (EntityPlayerMP) this.getInventoryPlayer().player ); + NetworkHandler.instance().sendTo( new PacketValueConfig( "CustomName", this.getCustomName() ), (EntityPlayerMP) this.getInventoryPlayer().player ); } catch( final IOException e ) { diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/main/java/appeng/container/guisync/SyncData.java index e994ed76b..79751d75b 100644 --- a/src/main/java/appeng/container/guisync/SyncData.java +++ b/src/main/java/appeng/container/guisync/SyncData.java @@ -88,7 +88,7 @@ public class SyncData { if( o instanceof EntityPlayerMP ) { - NetworkHandler.instance.sendTo( new PacketValueConfig( "SyncDat." + this.channel, (String) val ), (EntityPlayerMP) o ); + NetworkHandler.instance().sendTo( new PacketValueConfig( "SyncDat." + this.channel, (String) val ), (EntityPlayerMP) o ); } } else if( this.field.getType().isEnum() ) @@ -99,7 +99,7 @@ public class SyncData { if( o instanceof EntityPlayerMP ) { - NetworkHandler.instance.sendTo( new PacketProgressBar( this.channel, (Long) val ), (EntityPlayerMP) o ); + NetworkHandler.instance().sendTo( new PacketProgressBar( this.channel, (Long) val ), (EntityPlayerMP) o ); } } else if( val instanceof Boolean || val.getClass() == boolean.class ) diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index 17fc515c9..1bbff98a6 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -263,11 +263,11 @@ public class ContainerCraftConfirm extends AEBaseContainer { if( g instanceof EntityPlayer ) { - NetworkHandler.instance.sendTo( a, (EntityPlayerMP) g ); - NetworkHandler.instance.sendTo( b, (EntityPlayerMP) g ); + NetworkHandler.instance().sendTo( a, (EntityPlayerMP) g ); + NetworkHandler.instance().sendTo( b, (EntityPlayerMP) g ); if( c != null ) { - NetworkHandler.instance.sendTo( c, (EntityPlayerMP) g ); + NetworkHandler.instance().sendTo( c, (EntityPlayerMP) g ); } } } @@ -352,7 +352,7 @@ public class ContainerCraftConfirm extends AEBaseContainer this.setAutoStart( false ); if( g != null && originalGui != null && this.getOpenContext() != null ) { - NetworkHandler.instance.sendTo( new PacketSwitchGuis( originalGui ), (EntityPlayerMP) this.getInventoryPlayer().player ); + NetworkHandler.instance().sendTo( new PacketSwitchGuis( originalGui ), (EntityPlayerMP) this.getInventoryPlayer().player ); final TileEntity te = this.getOpenContext().getTile(); Platform.openGUI( this.getInventoryPlayer().player, te, this.getOpenContext().getSide(), originalGui ); diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java index 53450b28d..9c14d0479 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java @@ -117,7 +117,7 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH { try { - NetworkHandler.instance.sendTo( new PacketValueConfig( "CraftingStatus", "Clear" ), (EntityPlayerMP) g ); + NetworkHandler.instance().sendTo( new PacketValueConfig( "CraftingStatus", "Clear" ), (EntityPlayerMP) g ); } catch( final IOException e ) { @@ -208,17 +208,17 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH { if( !a.isEmpty() ) { - NetworkHandler.instance.sendTo( a, (EntityPlayerMP) g ); + NetworkHandler.instance().sendTo( a, (EntityPlayerMP) g ); } if( !b.isEmpty() ) { - NetworkHandler.instance.sendTo( b, (EntityPlayerMP) g ); + NetworkHandler.instance().sendTo( b, (EntityPlayerMP) g ); } if( !c.isEmpty() ) { - NetworkHandler.instance.sendTo( c, (EntityPlayerMP) g ); + NetworkHandler.instance().sendTo( c, (EntityPlayerMP) g ); } } } diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index af4c46022..b3a145b0f 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -186,7 +186,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { try { - NetworkHandler.instance.sendTo( new PacketCompressedNBT( this.data ), (EntityPlayerMP) this.getPlayerInv().player ); + NetworkHandler.instance().sendTo( new PacketCompressedNBT( this.data ), (EntityPlayerMP) this.getPlayerInv().player ); } catch( final IOException e ) { diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java index bb50c9757..f53cbb1ac 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java @@ -192,7 +192,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { try { - NetworkHandler.instance.sendTo( new PacketValueConfig( set.name(), sideLocal.name() ), (EntityPlayerMP) crafter ); + NetworkHandler.instance().sendTo( new PacketValueConfig( set.name(), sideLocal.name() ), (EntityPlayerMP) crafter ); } catch( final IOException e ) { @@ -233,7 +233,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { if( c instanceof EntityPlayer ) { - NetworkHandler.instance.sendTo( piu, (EntityPlayerMP) c ); + NetworkHandler.instance().sendTo( piu, (EntityPlayerMP) c ); } } } @@ -329,14 +329,14 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa } catch( final BufferOverflowException boe ) { - NetworkHandler.instance.sendTo( piu, (EntityPlayerMP) c ); + NetworkHandler.instance().sendTo( piu, (EntityPlayerMP) c ); piu = new PacketMEInventoryUpdate(); piu.appendItem( send ); } } - NetworkHandler.instance.sendTo( piu, (EntityPlayerMP) c ); + NetworkHandler.instance().sendTo( piu, (EntityPlayerMP) c ); } catch( final IOException e ) { diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java index 8ed494ffe..94f5479d9 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java @@ -137,7 +137,7 @@ public class ContainerNetworkStatus extends AEBaseContainer { if( c instanceof EntityPlayer ) { - NetworkHandler.instance.sendTo( piu, (EntityPlayerMP) c ); + NetworkHandler.instance().sendTo( piu, (EntityPlayerMP) c ); } } } diff --git a/src/main/java/appeng/container/implementations/ContainerWireless.java b/src/main/java/appeng/container/implementations/ContainerWireless.java index 311eccc57..000cde8d0 100644 --- a/src/main/java/appeng/container/implementations/ContainerWireless.java +++ b/src/main/java/appeng/container/implementations/ContainerWireless.java @@ -53,8 +53,8 @@ public class ContainerWireless extends AEBaseContainer { final int boosters = this.boosterSlot.getStack() == null ? 0 : this.boosterSlot.getStack().stackSize; - this.setRange( (long) ( 10 * AEConfig.instance.wireless_getMaxRange( boosters ) ) ); - this.setDrain( (long) ( 100 * AEConfig.instance.wireless_getPowerDrain( boosters ) ) ); + this.setRange( (long) ( 10 * AEConfig.instance().wireless_getMaxRange( boosters ) ) ); + this.setDrain( (long) ( 100 * AEConfig.instance().wireless_getPowerDrain( boosters ) ) ); super.detectAndSendChanges(); } diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java index 46e76633c..67675101b 100644 --- a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java @@ -54,7 +54,7 @@ public class ContainerWirelessTerm extends ContainerMEPortableCell } else { - this.setPowerMultiplier( AEConfig.instance.wireless_getDrainRate( this.wirelessTerminalGUIObject.getRange() ) ); + this.setPowerMultiplier( AEConfig.instance().wireless_getDrainRate( this.wirelessTerminalGUIObject.getRange() ) ); } } } diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index a9818e98f..ebef88b0f 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.EnumSet; import java.util.List; +import java.util.stream.Stream; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; @@ -52,73 +53,95 @@ import appeng.util.Platform; public final class AEConfig extends Configuration implements IConfigurableObject, IConfigManagerHost { - public static final double TUNNEL_POWER_LOSS = 0.05; public static final String VERSION = "@version@"; public static final String CHANNEL = "@aechannel@"; public static final String PACKET_CHANNEL = "AE"; - public static AEConfig instance; - public final IConfigManager settings = new ConfigManager( this ); - public final EnumSet featureFlags = EnumSet.noneOf( AEFeature.class ); - public final int[] craftByStacks = { 1, 10, 100, 1000 }; - public final int[] priorityByStacks = { 1, 10, 100, 1000 }; - public final int[] levelByStacks = { 1, 10, 100, 1000 }; - private final double WirelessHighWirelessCount = 64; - private final File configFile; - public int storageBiomeID = -1; - public int storageProviderID = -1; - public int formationPlaneEntityLimit = 128; - public float spawnChargedChance = 0.92f; - public int quartzOresPerCluster = 4; - public int quartzOresClusterAmount = 15; - public final int chargedChange = 4; - public int minMeteoriteDistance = 707; - public int minMeteoriteDistanceSq = this.minMeteoriteDistance * this.minMeteoriteDistance; - public double spatialPowerExponent = 1.35; - public double spatialPowerMultiplier = 1250.0; - public String[] grinderOres = { - // Vanilla Items - "Obsidian", "Ender", "EnderPearl", "Coal", "Iron", "Gold", "Charcoal", "NetherQuartz", - // Common Mod Ores - "Copper", "Tin", "Silver", "Lead", "Bronze", - // AE - "CertusQuartz", "Wheat", "Fluix", - // Other Mod Ores - "Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium", "Zinc" }; - public double oreDoublePercentage = 90.0; - public boolean enableEffects = true; - public boolean useLargeFonts = false; - public boolean useColoredCraftingStatus; - public boolean removeCrashingItemsOnLoad = false; - public int wirelessTerminalBattery = 1600000; - public int entropyManipulatorBattery = 200000; - public int matterCannonBattery = 200000; - public int portableCellBattery = 20000; - public int colorApplicatorBattery = 20000; - public int chargedStaffBattery = 8000; - public boolean disableColoredCableRecipesInJEI = true; - public boolean updatable = false; - public double meteoriteClusterChance = 0.1; - public double meteoriteSpawnChance = 0.3; - public int[] meteoriteDimensionWhitelist = { 0 }; - public int craftingCalculationTimePerTick = 5; - PowerUnits selectedPowerUnit = PowerUnits.AE; - private double WirelessBaseCost = 8; - private double WirelessCostMultiplier = 1; - private double WirelessTerminalDrainMultiplier = 1; - private double WirelessBaseRange = 16; - private double WirelessBoosterRangeMultiplier = 1; - private double WirelessBoosterExp = 1.5; - public AEConfig( final File configFile ) + // Config instance + private static AEConfig instance; + + // Default Grindstone ores + private static final String[] ORES_VANILLA = { "Obsidian", "Ender", "EnderPearl", "Coal", "Iron", "Gold", "Charcoal", "NetherQuartz" }; + private static final String[] ORES_AE = { "CertusQuartz", "Wheat", "Fluix" }; + private static final String[] ORES_COMMON = { "Copper", "Tin", "Silver", "Lead", "Bronze" }; + private static final String[] ORES_MISC = { "Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium", "Zinc" }; + + // Default Energy Conversion Rates + private static final double DEFAULT_IC2_EXCHANGE = 2.0; + private static final double DEFAULT_RF_EXCHANGE = 0.5; + + private final IConfigManager settings = new ConfigManager( this ); + + private final EnumSet featureFlags = EnumSet.noneOf( AEFeature.class ); + private final File configFile; + private boolean updatable = false; + + // Misc + private boolean removeCrashingItemsOnLoad = false; + private int formationPlaneEntityLimit = 128; + private boolean enableEffects = true; + private boolean useLargeFonts = false; + private boolean useColoredCraftingStatus; + private boolean disableColoredCableRecipesInJEI = true; + private int craftingCalculationTimePerTick = 5; + private PowerUnits selectedPowerUnit = PowerUnits.AE; + + // GUI Buttons + private final int[] craftByStacks = { 1, 10, 100, 1000 }; + private final int[] priorityByStacks = { 1, 10, 100, 1000 }; + private final int[] levelByStacks = { 1, 10, 100, 1000 }; + + // Spatial IO/Dimension + private int storageBiomeID = -1; + private int storageProviderID = -1; + private double spatialPowerExponent = 1.35; + private double spatialPowerMultiplier = 1250.0; + + // Grindstone + private String[] grinderOres = Stream.of( ORES_VANILLA, ORES_AE, ORES_COMMON, ORES_MISC ).flatMap( Stream::of ).toArray( String[]::new ); + private double oreDoublePercentage = 90.0; + + // Batteries + private int wirelessTerminalBattery = 1600000; + private int entropyManipulatorBattery = 200000; + private int matterCannonBattery = 200000; + private int portableCellBattery = 20000; + private int colorApplicatorBattery = 20000; + private int chargedStaffBattery = 8000; + + // Certus quartz + private float spawnChargedChance = 0.92f; + private int quartzOresPerCluster = 4; + private int quartzOresClusterAmount = 15; + private int chargedChange = 4; + + // Meteors + private int minMeteoriteDistance = 707; + private int minMeteoriteDistanceSq = this.minMeteoriteDistance * this.minMeteoriteDistance; + private double meteoriteClusterChance = 0.1; + private int meteoriteMaximumSpawnHeight = 180; + private int[] meteoriteDimensionWhitelist = { 0 }; + + // Wireless + private double wirelessBaseCost = 8; + private double wirelessCostMultiplier = 1; + private double wirelessTerminalDrainMultiplier = 1; + private double wirelessBaseRange = 16; + private double wirelessBoosterRangeMultiplier = 1; + private double wirelessBoosterExp = 1.5; + private double wirelessHighWirelessCount = 64; + + // Tunnels + public static final double TUNNEL_POWER_LOSS = 0.05; + + private AEConfig( final File configFile ) { super( configFile ); this.configFile = configFile; MinecraftForge.EVENT_BUS.register( this ); - final double DEFAULT_IC2_EXCHANGE = 2.0; PowerUnits.EU.conversionRatio = this.get( "PowerRatios", "IC2", DEFAULT_IC2_EXCHANGE ).getDouble( DEFAULT_IC2_EXCHANGE ); - final double DEFAULT_RF_EXCHANGE = 0.5; PowerUnits.RF.conversionRatio = this.get( "PowerRatios", "Forge Energy", DEFAULT_RF_EXCHANGE ).getDouble( DEFAULT_RF_EXCHANGE ); final double usageEffective = this.get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 ); @@ -127,7 +150,8 @@ public final class AEConfig extends Configuration implements IConfigurableObject CondenserOutput.MATTER_BALLS.requiredPower = this.get( "Condenser", "MatterBalls", 256 ).getInt( 256 ); CondenserOutput.SINGULARITY.requiredPower = this.get( "Condenser", "Singularity", 256000 ).getInt( 256000 ); - this.removeCrashingItemsOnLoad = this.get( "general", "removeCrashingItemsOnLoad", false, "Will auto-remove items that crash when being loaded from storage. This will destroy those items instead of crashing the game!" ).getBoolean(); + this.removeCrashingItemsOnLoad = this.get( "general", "removeCrashingItemsOnLoad", false, + "Will auto-remove items that crash when being loaded from storage. This will destroy those items instead of crashing the game!" ).getBoolean(); this.grinderOres = this.get( "GrindStone", "grinderOres", this.grinderOres ).getStringList(); this.oreDoublePercentage = this.get( "GrindStone", "oreDoublePercentage", this.oreDoublePercentage ).getDouble( this.oreDoublePercentage ); @@ -136,10 +160,12 @@ public final class AEConfig extends Configuration implements IConfigurableObject this.settings.registerSetting( Settings.TERMINAL_STYLE, TerminalStyle.TALL ); this.settings.registerSetting( Settings.SEARCH_MODE, SearchBoxMode.AUTOSEARCH ); - this.spawnChargedChance = (float) ( 1.0 - this.get( "worldGen", "spawnChargedChance", 1.0 - this.spawnChargedChance ).getDouble( 1.0 - this.spawnChargedChance ) ); + this.spawnChargedChance = (float) ( 1.0 - this.get( "worldGen", "spawnChargedChance", 1.0 - this.spawnChargedChance ).getDouble( + 1.0 - this.spawnChargedChance ) ); this.minMeteoriteDistance = this.get( "worldGen", "minMeteoriteDistance", this.minMeteoriteDistance ).getInt( this.minMeteoriteDistance ); this.meteoriteClusterChance = this.get( "worldGen", "meteoriteClusterChance", this.meteoriteClusterChance ).getDouble( this.meteoriteClusterChance ); - this.meteoriteSpawnChance = this.get( "worldGen", "meteoriteSpawnChance", this.meteoriteSpawnChance ).getDouble( this.meteoriteSpawnChance ); + this.meteoriteMaximumSpawnHeight = this.get( "worldGen", "meteoriteMaximumSpawnHeight", this.meteoriteMaximumSpawnHeight ).getInt( + this.meteoriteMaximumSpawnHeight ); this.meteoriteDimensionWhitelist = this.get( "worldGen", "meteoriteDimensionWhitelist", this.meteoriteDimensionWhitelist ).getIntList(); this.quartzOresPerCluster = this.get( "worldGen", "quartzOresPerCluster", this.quartzOresPerCluster ).getInt( this.quartzOresPerCluster ); @@ -147,16 +173,20 @@ public final class AEConfig extends Configuration implements IConfigurableObject this.minMeteoriteDistanceSq = this.minMeteoriteDistance * this.minMeteoriteDistance; - this.addCustomCategoryComment( "wireless", "Range= WirelessBaseRange + WirelessBoosterRangeMultiplier * Math.pow( boosters, WirelessBoosterExp )\nPowerDrain= WirelessBaseCost + WirelessCostMultiplier * Math.pow( boosters, 1 + boosters / WirelessHighWirelessCount )" ); + this.addCustomCategoryComment( "wireless", + "Range= wirelessBaseRange + wirelessBoosterRangeMultiplier * Math.pow( boosters, wirelessBoosterExp )\nPowerDrain= wirelessBaseCost + wirelessCostMultiplier * Math.pow( boosters, 1 + boosters / wirelessHighWirelessCount )" ); - this.WirelessBaseCost = this.get( "wireless", "WirelessBaseCost", this.WirelessBaseCost ).getDouble( this.WirelessBaseCost ); - this.WirelessCostMultiplier = this.get( "wireless", "WirelessCostMultiplier", this.WirelessCostMultiplier ).getDouble( this.WirelessCostMultiplier ); - this.WirelessBaseRange = this.get( "wireless", "WirelessBaseRange", this.WirelessBaseRange ).getDouble( this.WirelessBaseRange ); - this.WirelessBoosterRangeMultiplier = this.get( "wireless", "WirelessBoosterRangeMultiplier", this.WirelessBoosterRangeMultiplier ).getDouble( this.WirelessBoosterRangeMultiplier ); - this.WirelessBoosterExp = this.get( "wireless", "WirelessBoosterExp", this.WirelessBoosterExp ).getDouble( this.WirelessBoosterExp ); - this.WirelessTerminalDrainMultiplier = this.get( "wireless", "WirelessTerminalDrainMultiplier", this.WirelessTerminalDrainMultiplier ).getDouble( this.WirelessTerminalDrainMultiplier ); + this.wirelessBaseCost = this.get( "wireless", "wirelessBaseCost", this.wirelessBaseCost ).getDouble( this.wirelessBaseCost ); + this.wirelessCostMultiplier = this.get( "wireless", "wirelessCostMultiplier", this.wirelessCostMultiplier ).getDouble( this.wirelessCostMultiplier ); + this.wirelessBaseRange = this.get( "wireless", "wirelessBaseRange", this.wirelessBaseRange ).getDouble( this.wirelessBaseRange ); + this.wirelessBoosterRangeMultiplier = this.get( "wireless", "wirelessBoosterRangeMultiplier", this.wirelessBoosterRangeMultiplier ).getDouble( + this.wirelessBoosterRangeMultiplier ); + this.wirelessBoosterExp = this.get( "wireless", "wirelessBoosterExp", this.wirelessBoosterExp ).getDouble( this.wirelessBoosterExp ); + this.wirelessTerminalDrainMultiplier = this.get( "wireless", "wirelessTerminalDrainMultiplier", this.wirelessTerminalDrainMultiplier ).getDouble( + this.wirelessTerminalDrainMultiplier ); - this.formationPlaneEntityLimit = this.get( "automation", "formationPlaneEntityLimit", this.formationPlaneEntityLimit ).getInt( this.formationPlaneEntityLimit ); + this.formationPlaneEntityLimit = this.get( "automation", "formationPlaneEntityLimit", this.formationPlaneEntityLimit ).getInt( + this.formationPlaneEntityLimit ); this.wirelessTerminalBattery = this.get( "battery", "wirelessTerminal", this.wirelessTerminalBattery ).getInt( this.wirelessTerminalBattery ); this.chargedStaffBattery = this.get( "battery", "chargedStaff", this.chargedStaffBattery ).getInt( this.chargedStaffBattery ); @@ -171,7 +201,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject { if( feature.isVisible() ) { - if( this.get( "Features." + feature.category, feature.name(), feature.defaultValue ).getBoolean( feature.defaultValue ) ) + if( this.get( "Features." + feature.category(), feature.key(), feature.isEnabled() ).getBoolean( feature.isEnabled() ) ) { this.featureFlags.add( feature ); } @@ -188,13 +218,14 @@ public final class AEConfig extends Configuration implements IConfigurableObject final List version = Arrays.asList( "59.0.0", "59.0.1", "59.0.2" ); if( version.contains( imb.getVersion() ) ) { - this.featureFlags.remove( AEFeature.AlphaPass ); + this.featureFlags.remove( AEFeature.ALPHA_PASS ); } } try { - this.selectedPowerUnit = PowerUnits.valueOf( this.get( "Client", "PowerUnit", this.selectedPowerUnit.name(), this.getListComment( this.selectedPowerUnit ) ).getString() ); + this.selectedPowerUnit = PowerUnits.valueOf( + this.get( "Client", "PowerUnit", this.selectedPowerUnit.name(), this.getListComment( this.selectedPowerUnit ) ).getString() ); } catch( final Throwable t ) { @@ -206,22 +237,34 @@ public final class AEConfig extends Configuration implements IConfigurableObject tr.Load( this ); } - if( this.isFeatureEnabled( AEFeature.SpatialIO ) ) + if( this.isFeatureEnabled( AEFeature.SPATIAL_IO ) ) { this.storageBiomeID = this.get( "spatialio", "storageBiomeID", this.storageBiomeID ).getInt( this.storageBiomeID ); this.storageProviderID = this.get( "spatialio", "storageProviderID", this.storageProviderID ).getInt( this.storageProviderID ); - this.spatialPowerMultiplier = this.get( "spatialio", "spatialPowerMultiplier", this.spatialPowerMultiplier ).getDouble( this.spatialPowerMultiplier ); + this.spatialPowerMultiplier = this.get( "spatialio", "spatialPowerMultiplier", this.spatialPowerMultiplier ).getDouble( + this.spatialPowerMultiplier ); this.spatialPowerExponent = this.get( "spatialio", "spatialPowerExponent", this.spatialPowerExponent ).getDouble( this.spatialPowerExponent ); } - if( this.isFeatureEnabled( AEFeature.CraftingCPU ) ) + if( this.isFeatureEnabled( AEFeature.CRAFTING_CPU ) ) { - this.craftingCalculationTimePerTick = this.get( "craftingCPU", "craftingCalculationTimePerTick", this.craftingCalculationTimePerTick ).getInt( this.craftingCalculationTimePerTick ); + this.craftingCalculationTimePerTick = this.get( "craftingCPU", "craftingCalculationTimePerTick", this.craftingCalculationTimePerTick ).getInt( + this.craftingCalculationTimePerTick ); } this.updatable = true; } + public static void init( final File configFile ) + { + instance = new AEConfig( configFile ); + } + + public static AEConfig instance() + { + return instance; + } + private void clientSync() { this.disableColoredCableRecipesInJEI = this.get( "Client", "disableColoredCableRecipesInJEI", true ).getBoolean( true ); @@ -308,17 +351,17 @@ public final class AEConfig extends Configuration implements IConfigurableObject public double wireless_getDrainRate( final double range ) { - return this.WirelessTerminalDrainMultiplier * range; + return this.wirelessTerminalDrainMultiplier * range; } public double wireless_getMaxRange( final int boosters ) { - return this.WirelessBaseRange + this.WirelessBoosterRangeMultiplier * Math.pow( boosters, this.WirelessBoosterExp ); + return this.wirelessBaseRange + this.wirelessBoosterRangeMultiplier * Math.pow( boosters, this.wirelessBoosterExp ); } public double wireless_getPowerDrain( final int boosters ) { - return this.WirelessBaseCost + this.WirelessCostMultiplier * Math.pow( boosters, 1 + boosters / this.WirelessHighWirelessCount ); + return this.wirelessBaseCost + this.wirelessCostMultiplier * Math.pow( boosters, 1 + boosters / this.wirelessHighWirelessCount ); } @Override @@ -340,7 +383,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject @Override public void save() { - if( this.isFeatureEnabled( AEFeature.SpatialIO ) ) + if( this.isFeatureEnabled( AEFeature.SPATIAL_IO ) ) { this.get( "spatialio", "storageBiomeID", this.storageBiomeID ).set( this.storageBiomeID ); this.get( "spatialio", "storageProviderID", this.storageProviderID ).set( this.storageProviderID ); @@ -375,12 +418,13 @@ public final class AEConfig extends Configuration implements IConfigurableObject public boolean useAEVersion( final MaterialType mt ) { - if( this.isFeatureEnabled( AEFeature.WebsiteRecipes ) ) + if( this.isFeatureEnabled( AEFeature.WEBSITE_RECIPES ) ) { return true; } - this.setCategoryComment( "OreCamouflage", "AE2 Automatically uses alternative ores present in your instance of MC to blend better with its surroundings, if you prefer you can disable this selectively using these flags; Its important to note, that some if these items even if enabled may not be craftable in game because other items are overriding their recipes." ); + this.setCategoryComment( "OreCamouflage", + "AE2 Automatically uses alternative ores present in your instance of MC to blend better with its surroundings, if you prefer you can disable this selectively using these flags; Its important to note, that some if these items even if enabled may not be craftable in game because other items are overriding their recipes." ); final Property p = this.get( "OreCamouflage", mt.name(), true ); p.setComment( "OreDictionary Names: " + mt.getOreName() ); @@ -506,4 +550,212 @@ public final class AEConfig extends Configuration implements IConfigurableObject this.selectedPowerUnit = Platform.rotateEnum( this.selectedPowerUnit, backwards, Settings.POWER_UNITS.getPossibleValues() ); this.save(); } + + // Getters + public boolean isRemoveCrashingItemsOnLoad() + { + return removeCrashingItemsOnLoad; + } + + public int getFormationPlaneEntityLimit() + { + return formationPlaneEntityLimit; + } + + public boolean isEnableEffects() + { + return enableEffects; + } + + public boolean isUseLargeFonts() + { + return useLargeFonts; + } + + public boolean isUseColoredCraftingStatus() + { + return useColoredCraftingStatus; + } + + public boolean isDisableColoredCableRecipesInJEI() + { + return disableColoredCableRecipesInJEI; + } + + public int getCraftingCalculationTimePerTick() + { + return craftingCalculationTimePerTick; + } + + public PowerUnits getSelectedPowerUnit() + { + return selectedPowerUnit; + } + + public int[] getCraftByStacks() + { + return craftByStacks; + } + + public int[] getPriorityByStacks() + { + return priorityByStacks; + } + + public int[] getLevelByStacks() + { + return levelByStacks; + } + + public int getStorageBiomeID() + { + return storageBiomeID; + } + + public int getStorageProviderID() + { + return storageProviderID; + } + + public double getSpatialPowerExponent() + { + return spatialPowerExponent; + } + + public double getSpatialPowerMultiplier() + { + return spatialPowerMultiplier; + } + + public String[] getGrinderOres() + { + return grinderOres; + } + + public double getOreDoublePercentage() + { + return oreDoublePercentage; + } + + public int getWirelessTerminalBattery() + { + return wirelessTerminalBattery; + } + + public int getEntropyManipulatorBattery() + { + return entropyManipulatorBattery; + } + + public int getMatterCannonBattery() + { + return matterCannonBattery; + } + + public int getPortableCellBattery() + { + return portableCellBattery; + } + + public int getColorApplicatorBattery() + { + return colorApplicatorBattery; + } + + public int getChargedStaffBattery() + { + return chargedStaffBattery; + } + + public float getSpawnChargedChance() + { + return spawnChargedChance; + } + + public int getQuartzOresPerCluster() + { + return quartzOresPerCluster; + } + + public int getQuartzOresClusterAmount() + { + return quartzOresClusterAmount; + } + + public int getChargedChange() + { + return chargedChange; + } + + public int getMinMeteoriteDistance() + { + return minMeteoriteDistance; + } + + public int getMinMeteoriteDistanceSq() + { + return minMeteoriteDistanceSq; + } + + public double getMeteoriteClusterChance() + { + return meteoriteClusterChance; + } + + public int getMeteoriteMaximumSpawnHeight() + { + return meteoriteMaximumSpawnHeight; + } + + public int[] getMeteoriteDimensionWhitelist() + { + return meteoriteDimensionWhitelist; + } + + public double getWirelessBaseCost() + { + return wirelessBaseCost; + } + + public double getWirelessCostMultiplier() + { + return wirelessCostMultiplier; + } + + public double getWirelessTerminalDrainMultiplier() + { + return wirelessTerminalDrainMultiplier; + } + + public double getWirelessBaseRange() + { + return wirelessBaseRange; + } + + public double getWirelessBoosterRangeMultiplier() + { + return wirelessBoosterRangeMultiplier; + } + + public double getWirelessBoosterExp() + { + return wirelessBoosterExp; + } + + public double getWirelessHighWirelessCount() + { + return wirelessHighWirelessCount; + } + + // Setters keep visibility as low as possible. + + void setStorageBiomeID( int id ) + { + this.storageBiomeID = id; + } + + void setStorageProviderID( int id ) + { + this.storageProviderID = id; + } } diff --git a/src/main/java/appeng/core/AELog.java b/src/main/java/appeng/core/AELog.java index 560d48ab8..1de2d0334 100644 --- a/src/main/java/appeng/core/AELog.java +++ b/src/main/java/appeng/core/AELog.java @@ -69,7 +69,7 @@ public final class AELog */ public static boolean isLogEnabled() { - return AEConfig.instance == null || AEConfig.instance.isFeatureEnabled( AEFeature.Logging ); + return AEConfig.instance() == null || AEConfig.instance().isFeatureEnabled( AEFeature.LOGGING ); } /** @@ -278,7 +278,7 @@ public final class AELog */ public static boolean isDebugLogEnabled() { - return AEConfig.instance.isFeatureEnabled( AEFeature.DebugLogging ); + return AEConfig.instance().isFeatureEnabled( AEFeature.DEBUG_LOGGING ); } // @@ -292,7 +292,7 @@ public final class AELog */ public static void grinder( @Nonnull final String message ) { - if( AEConfig.instance.isFeatureEnabled( AEFeature.GrinderLogging ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.GRINDER_LOGGING ) ) { log( Level.DEBUG, "grinder: " + message ); } @@ -305,7 +305,7 @@ public final class AELog */ public static void integration( @Nonnull final Throwable exception ) { - if( AEConfig.instance.isFeatureEnabled( AEFeature.IntegrationLogging ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.INTEGRATION_LOGGING ) ) { debug( exception ); } @@ -322,7 +322,7 @@ public final class AELog */ public static void blockUpdate( @Nonnull final BlockPos pos, @Nonnull final AEBaseTile aeBaseTile ) { - if( AEConfig.instance.isFeatureEnabled( AEFeature.UpdateLogging ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.UPDATE_LOGGING ) ) { info( BLOCK_UPDATE, aeBaseTile.getClass().getName(), pos ); } @@ -337,7 +337,7 @@ public final class AELog */ public static boolean isCraftingLogEnabled() { - return AEConfig.instance.isFeatureEnabled( AEFeature.CraftingLog ); + return AEConfig.instance().isFeatureEnabled( AEFeature.CRAFTING_LOG ); } /** @@ -366,7 +366,7 @@ public final class AELog */ public static boolean isCraftingDebugLogEnabled() { - return AEConfig.instance.isFeatureEnabled( AEFeature.CraftingLog ) && AEConfig.instance.isFeatureEnabled( AEFeature.DebugLogging ); + return AEConfig.instance().isFeatureEnabled( AEFeature.CRAFTING_LOG ) && AEConfig.instance().isFeatureEnabled( AEFeature.DEBUG_LOGGING ); } /** diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 3b3f91d18..2839c6b41 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -78,10 +78,10 @@ public final class AppEng // depend on version of forge used for build. "after:appliedenergistics2-core;" + "required-after:Forge@[" // require forge. - + net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion - + net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion - + net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion - + net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion + + net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion + + net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion + + net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion + + net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion @Nonnull private static final AppEng INSTANCE = new AppEng(); @@ -141,8 +141,9 @@ public final class AppEng final File recipeFile = new File( this.configDirectory, "CustomRecipes.cfg" ); final Configuration recipeConfiguration = new Configuration( recipeFile ); - AEConfig.instance = new AEConfig( configFile ); - FacadeConfig.instance = new FacadeConfig( facadeFile ); + AEConfig.init( configFile ); + FacadeConfig.init( facadeFile ); + final VersionCheckerConfig versionCheckerConfig = new VersionCheckerConfig( versionFile ); this.customRecipeConfig = new CustomRecipeForgeConfiguration( recipeConfiguration ); this.exportConfig = new ForgeExportConfig( recipeConfiguration ); @@ -150,7 +151,7 @@ public final class AppEng AELog.info( "Pre Initialization ( started )" ); CreativeTab.init(); - if( AEConfig.instance.isFeatureEnabled( AEFeature.Facades ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.FACADES ) ) { CreativeTabFacade.init(); } @@ -174,8 +175,7 @@ public final class AppEng // Instantiate all Plugins List injectables = Lists.newArrayList( - AEApi.instance() - ); + AEApi.instance() ); new PluginLoader().loadPlugins( injectables, event.getAsmData() ); } @@ -226,10 +226,10 @@ public final class AppEng FMLCommonHandler.instance().registerCrashCallable( new IntegrationCrashEnhancement() ); CommonHelper.proxy.postInit(); - AEConfig.instance.save(); + AEConfig.instance().save(); NetworkRegistry.INSTANCE.registerGuiHandler( this, GuiBridge.GUI_Handler ); - NetworkHandler.instance = new NetworkHandler( "AE2" ); + NetworkHandler.init( "AE2" ); AELog.info( "Post Initialization ( ended after " + start.elapsed( TimeUnit.MILLISECONDS ) + "ms )" ); } diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java index 65e2719e3..daf765423 100644 --- a/src/main/java/appeng/core/CreativeTab.java +++ b/src/main/java/appeng/core/CreativeTab.java @@ -62,7 +62,7 @@ public final class CreativeTab extends CreativeTabs final IItems items = definitions.items(); final IMaterials materials = definitions.materials(); - return this.findFirst( blocks.controller(), blocks.chest(), blocks.cellWorkbench(), blocks.fluixBlock(), items.cell1k(), items.networkTool(), materials.fluixCrystal(), materials.certusQuartzCrystal() ); + return this.findFirst( blocks.controller(), blocks.chest(), blocks.cellWorkbench(), blocks.fluixBlock(), items.cell1k(), items.networkTool(), materials.fluixCrystal(), materials.certusQuartzCrystal(), materials.skyDust() ); } private ItemStack findFirst( final IItemDefinition... choices ) diff --git a/src/main/java/appeng/core/FacadeConfig.java b/src/main/java/appeng/core/FacadeConfig.java index 98d0f7450..b45d0bd31 100644 --- a/src/main/java/appeng/core/FacadeConfig.java +++ b/src/main/java/appeng/core/FacadeConfig.java @@ -33,7 +33,8 @@ import net.minecraftforge.common.config.Configuration; public class FacadeConfig extends Configuration { - public static FacadeConfig instance; + private static FacadeConfig instance; + private final Pattern replacementPattern; public FacadeConfig( final File facadeFile ) @@ -42,6 +43,16 @@ public class FacadeConfig extends Configuration this.replacementPattern = Pattern.compile( "[^a-zA-Z0-9]" ); } + public static void init( final File configFile ) + { + instance = new FacadeConfig( configFile ); + } + + public static FacadeConfig instance() + { + return instance; + } + public boolean checkEnabled( final Block id, final int metadata, final boolean automatic ) { if( id == null ) diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index acd73d82f..dc9039de5 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -149,42 +149,42 @@ public final class Registration private void registerSpatial( final boolean force ) { - if( !AEConfig.instance.isFeatureEnabled( AEFeature.SpatialIO ) ) + if( !AEConfig.instance().isFeatureEnabled( AEFeature.SPATIAL_IO ) ) { return; } - final AEConfig config = AEConfig.instance; + final AEConfig config = AEConfig.instance(); if( this.storageBiome == null ) { - if( force && config.storageBiomeID == -1 ) + if( force && config.getStorageBiomeID() == -1 ) { - config.storageBiomeID = Platform.findEmpty( Biome.REGISTRY, 0, 256 ); - if( config.storageBiomeID == -1 ) + config.setStorageBiomeID( Platform.findEmpty( Biome.REGISTRY, 0, 256 ) ); + if( config.getStorageBiomeID() == -1 ) { throw new IllegalStateException( "Biome Array is full, please free up some Biome ID's or disable spatial." ); } this.storageBiome = new BiomeGenStorage(); - Biome.registerBiome( config.storageBiomeID, "appliedenergistics2:storage_biome", this.storageBiome ); + Biome.registerBiome( config.getStorageBiomeID(), "appliedenergistics2:storage_biome", this.storageBiome ); config.save(); } - if( !force && config.storageBiomeID != -1 ) + if( !force && config.getStorageBiomeID() != -1 ) { this.storageBiome = new BiomeGenStorage(); - Biome.registerBiome( config.storageBiomeID, "appliedenergistics2:storage_biome", this.storageBiome ); + Biome.registerBiome( config.getStorageBiomeID(), "appliedenergistics2:storage_biome", this.storageBiome ); } } - if( config.storageProviderID != -1 ) + if( config.getStorageProviderID() != -1 ) { - storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.storageProviderID, StorageWorldProvider.class, false ); + storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.getStorageProviderID(), StorageWorldProvider.class, false ); } - if( config.storageProviderID == -1 && force ) + if( config.getStorageProviderID() == -1 && force ) { final Set ids = new HashSet<>(); for( DimensionType type : DimensionType.values() ) @@ -192,14 +192,14 @@ public final class Registration ids.add( type.getId() ); } - config.storageProviderID = -11; + config.setStorageProviderID( -11 ); - while( ids.contains( config.storageProviderID ) ) + while( ids.contains( config.getStorageProviderID() ) ) { - config.storageProviderID--; + config.setStorageProviderID( config.getStorageProviderID() - 1 ); } - storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.storageProviderID, StorageWorldProvider.class, false ); + storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.getStorageProviderID(), StorageWorldProvider.class, false ); config.save(); } @@ -264,10 +264,9 @@ public final class Registration MinecraftForge.EVENT_BUS.register( TickHandler.INSTANCE ); - MinecraftForge.EVENT_BUS.register( new PartPlacement() ); - if( AEConfig.instance.isFeatureEnabled( AEFeature.ChestLoot ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.CHEST_LOOT ) ) { MinecraftForge.EVENT_BUS.register( new ChestLoot() ); } @@ -285,8 +284,7 @@ public final class Registration registries.cell().addCellHandler( new BasicCellHandler() ); registries.cell().addCellHandler( new CreativeCellHandler() ); - api.definitions().materials().matterBall().maybeStack( 1 ).ifPresent( ammoStack -> - { + api.definitions().materials().matterBall().maybeStack( 1 ).ifPresent( ammoStack -> { final double weight = 32; registries.matterCannon().registerAmmo( ammoStack, weight ); @@ -294,17 +292,17 @@ public final class Registration this.recipeHandler.injectRecipes(); - final PlayerStatsRegistration registration = new PlayerStatsRegistration( MinecraftForge.EVENT_BUS, AEConfig.instance ); + final PlayerStatsRegistration registration = new PlayerStatsRegistration( MinecraftForge.EVENT_BUS, AEConfig.instance() ); registration.registerAchievementHandlers(); registration.registerAchievements(); - if( AEConfig.instance.isFeatureEnabled( AEFeature.EnableDisassemblyCrafting ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.ENABLE_DISASSEMBLY_CRAFTING ) ) { GameRegistry.addRecipe( new DisassembleRecipe() ); RecipeSorter.register( "appliedenergistics2:disassemble", DisassembleRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless" ); } - if( AEConfig.instance.isFeatureEnabled( AEFeature.EnableFacadeCrafting ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.ENABLE_FACADE_CRAFTING ) ) { definitions.items().facade().maybeItem().ifPresent( facadeItem -> { GameRegistry.addRecipe( new FacadeRecipe( (ItemFacade) facadeItem ) ); @@ -398,24 +396,23 @@ public final class Registration // Inscriber Upgrades.SPEED.registerItem( blocks.inscriber(), 3 ); - items.wirelessTerminal().maybeItem().ifPresent( terminal -> - { + items.wirelessTerminal().maybeItem().ifPresent( terminal -> { registries.wireless().registerWirelessHandler( (IWirelessTermHandler) terminal ); } ); // add villager trading to black smiths for a few basic materials - if( AEConfig.instance.isFeatureEnabled( AEFeature.VillagerTrading ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.VILLAGER_TRADING ) ) { // TODO: VILLAGER TRADING // VillagerRegistry.instance().getRegisteredVillagers()..registerVillageTradeHandler( 3, new AETrading() ); } - if( AEConfig.instance.isFeatureEnabled( AEFeature.CertusQuartzWorldGen ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.CERTUS_QUARTZ_WORLD_GEN ) ) { GameRegistry.registerWorldGenerator( new QuartzWorldGen(), 0 ); } - if( AEConfig.instance.isFeatureEnabled( AEFeature.MeteoriteWorldGen ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.METEORITE_WORLD_GEN ) ) { GameRegistry.registerWorldGenerator( new MeteoriteWorldGen(), 0 ); } @@ -470,7 +467,7 @@ public final class Registration } // whitelist from config - for( final int dimension : AEConfig.instance.meteoriteDimensionWhitelist ) + for( final int dimension : AEConfig.instance().getMeteoriteDimensionWhitelist() ) { registries.worldgen().enableWorldGenForDimension( WorldGenType.METEORITES, dimension ); } diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 57cf42c5c..c4429a7c2 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -203,20 +203,22 @@ public final class ApiBlocks implements IBlocks { // this.quartzOre = new BlockDefinition( "ore.quartz", new OreQuartz() ); this.quartzOre = registry.block( "quartz_ore", BlockQuartzOre::new ) + .features( AEFeature.CERTUS_ORE ) .postInit( ( block, item ) -> { OreDictionary.registerOre( "oreCertusQuartz", new ItemStack( block ) ); } ) .build(); this.quartzOreCharged = registry.block( "charged_quartz_ore", BlockChargedQuartzOre::new ) + .features( AEFeature.CERTUS_ORE, AEFeature.CHARGED_CERTUS_ORE ) .postInit( ( block, item ) -> { OreDictionary.registerOre( "oreCertusQuartz", new ItemStack( block ) ); } ) .build(); - this.matrixFrame = registry.block( "matrix_frame", BlockMatrixFrame::new ).features( AEFeature.SpatialIO ).build(); + this.matrixFrame = registry.block( "matrix_frame", BlockMatrixFrame::new ).features( AEFeature.SPATIAL_IO ).build(); - FeatureFactory deco = registry.features( AEFeature.DecorativeQuartzBlocks ); + FeatureFactory deco = registry.features( AEFeature.DECORATIVE_QUARTZ_BLOCKS ); this.quartzBlock = deco.block( "quartz_block", BlockQuartz::new ).build(); this.quartzPillar = deco.block( "quartz_pillar", BlockQuartzPillar::new ).build(); this.chiseledQuartzBlock = deco.block( "chiseled_quartz_block", BlockChiseledQuartz::new ).build(); @@ -233,11 +235,11 @@ public final class ApiBlocks implements IBlocks } ) .build(); this.quartzVibrantGlass = deco.block( "quartz_vibrant_glass", BlockQuartzLamp::new ) - .addFeatures( AEFeature.DecorativeLights ) + .addFeatures( AEFeature.DECORATIVE_LIGHTS ) .useCustomItemModel() .build(); this.quartzFixture = registry.block( "quartz_fixture", BlockQuartzFixture::new ) - .features( AEFeature.DecorativeLights ) + .features( AEFeature.DECORATIVE_LIGHTS ) .useCustomItemModel() .build(); @@ -248,32 +250,33 @@ public final class ApiBlocks implements IBlocks this.skyStoneSmallBrick = deco.block( "sky_stone_small_brick", () -> new BlockSkyStone( SkystoneType.SMALL_BRICK ) ).build(); this.skyStoneChest = registry.block( "sky_stone_chest", () -> new BlockSkyChest( SkyChestType.STONE ) ) - .features( AEFeature.SkyStoneChests ) + .features( AEFeature.SKY_STONE_CHESTS ) .rendering( new SkyChestRenderingCustomizer( SkyChestType.STONE ) ) .build(); this.smoothSkyStoneChest = registry.block( "smooth_sky_stone_chest", () -> new BlockSkyChest( SkyChestType.BLOCK ) ) - .features( AEFeature.SkyStoneChests ) + .features( AEFeature.SKY_STONE_CHESTS ) .rendering( new SkyChestRenderingCustomizer( SkyChestType.BLOCK ) ) .build(); this.skyCompass = registry.block( "sky_compass", BlockSkyCompass::new ) - .features( AEFeature.MeteoriteCompass ) + .features( AEFeature.METEORITE_COMPASS ) .rendering( new SkyCompassRendering() ) .build(); - this.grindstone = registry.block( "grindstone", BlockGrinder::new ).features( AEFeature.GrindStone ).build(); + this.grindstone = registry.block( "grindstone", BlockGrinder::new ).features( AEFeature.GRIND_STONE ).build(); this.crank = registry.block( "crank", BlockCrank::new ) - .features( AEFeature.GrindStone ) + .features( AEFeature.GRIND_STONE ) .rendering( new CrankRendering() ) .build(); this.inscriber = registry.block( "inscriber", BlockInscriber::new ) - .features( AEFeature.Inscriber ) + .features( AEFeature.INSCRIBER ) .rendering( new InscriberRendering() ) .build(); this.wirelessAccessPoint = registry.block( "wireless_access_point", BlockWireless::new ) - .features( AEFeature.WirelessAccessTerminal ) + .features( AEFeature.WIRELESS_ACCESS_TERMINAL ) .rendering( new WirelessRendering() ) .build(); this.charger = registry.block( "charger", BlockCharger::new ) + .features( AEFeature.CHARGER ) .rendering( new BlockRenderingCustomizer() { @Override @@ -284,67 +287,71 @@ public final class ApiBlocks implements IBlocks } } ) .build(); - this.tinyTNT = registry.block( "tiny_tnt", BlockTinyTNT::new ).features( AEFeature.TinyTNT ) + this.tinyTNT = registry.block( "tiny_tnt", BlockTinyTNT::new ) + .features( AEFeature.TINY_TNT ) .postInit( ( block, item ) -> { BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( item, new DispenserBehaviorTinyTNT() ); } ) .build(); this.securityStation = registry.block( "security_station", BlockSecurityStation::new ) - .features( AEFeature.Security ) + .features( AEFeature.SECURITY ) .rendering( new SecurityStationRendering() ) .build(); this.quantumRing = registry.block( "quantum_ring", BlockQuantumRing::new ) - .features( AEFeature.QuantumNetworkBridge ) + .features( AEFeature.QUANTUM_NETWORK_BRIDGE ) .rendering( new QuantumBridgeRendering() ) .build(); this.quantumLink = registry.block( "quantum_link", BlockQuantumLinkChamber::new ) - .features( AEFeature.QuantumNetworkBridge ) + .features( AEFeature.QUANTUM_NETWORK_BRIDGE ) .rendering( new QuantumBridgeRendering() ) .build(); this.spatialPylon = registry.block( "spatial_pylon", BlockSpatialPylon::new ) - .features( AEFeature.SpatialIO ) + .features( AEFeature.SPATIAL_IO ) .useCustomItemModel() .rendering( new SpatialPylonRendering() ) .build(); - this.spatialIOPort = registry.block( "spatial_io_port", BlockSpatialIOPort::new ).features( AEFeature.SpatialIO ).build(); + this.spatialIOPort = registry.block( "spatial_io_port", BlockSpatialIOPort::new ).features( AEFeature.SPATIAL_IO ).build(); this.controller = registry.block( "controller", BlockController::new ) - .features( AEFeature.Channels ) + .features( AEFeature.CHANNELS ) .useCustomItemModel() .rendering( new ControllerRendering() ) .build(); this.drive = registry.block( "drive", BlockDrive::new ) - .features( AEFeature.StorageCells, AEFeature.MEDrive ) + .features( AEFeature.STORAGE_CELLS, AEFeature.ME_DRIVE ) .useCustomItemModel() .rendering( new DriveRendering() ) .build(); this.chest = registry.block( "chest", BlockChest::new ) - .features( AEFeature.StorageCells, AEFeature.MEChest ) + .features( AEFeature.STORAGE_CELLS, AEFeature.ME_CHEST ) .useCustomItemModel() .rendering( new ChestRendering() ) .build(); - this.iface = registry.block( "interface", BlockInterface::new ).build(); - this.cellWorkbench = registry.block( "cell_workbench", BlockCellWorkbench::new ).features( AEFeature.StorageCells ).build(); - this.iOPort = registry.block( "io_port", BlockIOPort::new ).features( AEFeature.StorageCells, AEFeature.IOPort ).build(); - this.condenser = registry.block( "condenser", BlockCondenser::new ).build(); - this.energyAcceptor = registry.block( "energy_acceptor", BlockEnergyAcceptor::new ).build(); - this.vibrationChamber = registry.block( "vibration_chamber", BlockVibrationChamber::new ).features( AEFeature.PowerGen ).build(); - this.quartzGrowthAccelerator = registry.block( "quartz_growth_accelerator", BlockQuartzGrowthAccelerator::new ).build(); + this.iface = registry.block( "interface", BlockInterface::new ).features( AEFeature.INTERFACE ).build(); + this.cellWorkbench = registry.block( "cell_workbench", BlockCellWorkbench::new ).features( AEFeature.STORAGE_CELLS ).build(); + this.iOPort = registry.block( "io_port", BlockIOPort::new ).features( AEFeature.STORAGE_CELLS, AEFeature.IO_PORT ).build(); + this.condenser = registry.block( "condenser", BlockCondenser::new ).features( AEFeature.CONDENSER ).build(); + this.energyAcceptor = registry.block( "energy_acceptor", BlockEnergyAcceptor::new ).features( AEFeature.ENERGY_ACCEPTOR ).build(); + this.vibrationChamber = registry.block( "vibration_chamber", BlockVibrationChamber::new ).features( AEFeature.POWER_GEN ).build(); + this.quartzGrowthAccelerator = registry.block( "quartz_growth_accelerator", BlockQuartzGrowthAccelerator::new ) + .features( AEFeature.CRYSTAL_GROWTH_ACCELERATOR ) + .build(); this.energyCell = registry.block( "energy_cell", BlockEnergyCell::new ) + .features( AEFeature.ENERGY_CELLS ) .item( AEBaseItemBlockChargeable::new ) .rendering( new BlockEnergyCellRendering( new ResourceLocation( AppEng.MOD_ID, "energy_cell" ) ) ) .build(); this.energyCellDense = registry.block( "dense_energy_cell", BlockDenseEnergyCell::new ) - .features( AEFeature.DenseEnergyCells ) + .features( AEFeature.ENERGY_CELLS, AEFeature.DENSE_ENERGY_CELLS ) .item( AEBaseItemBlockChargeable::new ) .rendering( new BlockEnergyCellRendering( new ResourceLocation( AppEng.MOD_ID, "dense_energy_cell" ) ) ) .build(); this.energyCellCreative = registry.block( "creative_energy_cell", BlockCreativeEnergyCell::new ) - .features( AEFeature.Creative ) + .features( AEFeature.CREATIVE ) .item( AEBaseItemBlockChargeable::new ) .build(); - FeatureFactory crafting = registry.features( AEFeature.CraftingCPU ); + FeatureFactory crafting = registry.features( AEFeature.CRAFTING_CPU ); this.craftingUnit = crafting.block( "crafting_unit", () -> new BlockCraftingUnit( CraftingUnitType.UNIT ) ) .rendering( new CraftingCubeRendering( "crafting_unit", CraftingUnitType.UNIT ) ) .useCustomItemModel() @@ -378,12 +385,13 @@ public final class ApiBlocks implements IBlocks .useCustomItemModel() .build(); - this.molecularAssembler = registry.block( "molecular_assembler", BlockMolecularAssembler::new ).features( AEFeature.MolecularAssembler ).build(); - this.lightDetector = registry.block( "light_detector", BlockLightDetector::new ).features( AEFeature.LightDetector ) + this.molecularAssembler = registry.block( "molecular_assembler", BlockMolecularAssembler::new ).features( AEFeature.MOLECULAR_ASSEMBLER ).build(); + this.lightDetector = registry.block( "light_detector", BlockLightDetector::new ) + .features( AEFeature.LIGHT_DETECTOR ) .useCustomItemModel() .build(); this.paint = registry.block( "paint", BlockPaint::new ) - .features( AEFeature.PaintBalls ) + .features( AEFeature.PAINT_BALLS ) .rendering( new PaintRendering() ) .build(); @@ -398,7 +406,8 @@ public final class ApiBlocks implements IBlocks this.multiPart = registry.block( "cable_bus", BlockCableBus::new ) .rendering( new CableBusRendering( partModels ) ) - .postInit( (block, item) -> { + .postInit( ( block, item ) -> + { ( (BlockCableBus) block ).setupTile(); } ) .build(); @@ -413,19 +422,19 @@ public final class ApiBlocks implements IBlocks this.quartzPillarSlab = makeSlab( "quartz_pillar_slab", "quartz_pillar_double_slab", registry, this.quartzPillar() ); this.itemGen = registry.block( "debug_item_gen", BlockItemGen::new ) - .features( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) + .features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ) .useCustomItemModel() .build(); this.chunkLoader = registry.block( "debug_chunk_loader", BlockChunkloader::new ) - .features( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) + .features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ) .useCustomItemModel() .build(); this.phantomNode = registry.block( "debug_phantom_node", BlockPhantomNode::new ) - .features( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) + .features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ) .useCustomItemModel() .build(); this.cubeGenerator = registry.block( "debug_cube_gen", BlockCubeGenerator::new ) - .features( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) + .features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ) .useCustomItemModel() .build(); } @@ -440,7 +449,7 @@ public final class ApiBlocks implements IBlocks Block block = blockDef.maybeBlock().get(); IBlockDefinition slabDef = registry.block( slabId, () -> new BlockSlabCommon.Half( block ) ) - .features( AEFeature.DecorativeQuartzBlocks ) + .features( AEFeature.DECORATIVE_QUARTZ_BLOCKS ) .disableItem() .build(); @@ -453,7 +462,7 @@ public final class ApiBlocks implements IBlocks // Reigster the double slab variant as well IBlockDefinition doubleSlabDef = registry.block( doubleSlabId, () -> new BlockSlabCommon.Double( slabBlock, block ) ) - .features( AEFeature.DecorativeQuartzBlocks ) + .features( AEFeature.DECORATIVE_QUARTZ_BLOCKS ) .disableItem() .build(); @@ -463,7 +472,7 @@ public final class ApiBlocks implements IBlocks // Make the slab item IItemDefinition itemDef = registry.item( slabId, () -> new ItemSlab( slabBlock, slabBlock, doubleSlabBlock ) ) - .features( AEFeature.DecorativeQuartzBlocks ) + .features( AEFeature.DECORATIVE_QUARTZ_BLOCKS ) .build(); Verify.verify( itemDef.maybeItem().isPresent() ); @@ -475,7 +484,7 @@ public final class ApiBlocks implements IBlocks private static IBlockDefinition makeStairs( String registryName, FeatureFactory registry, IBlockDefinition block ) { return registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) ) - .features( AEFeature.DecorativeQuartzBlocks ) + .features( AEFeature.DECORATIVE_QUARTZ_BLOCKS ) .rendering( new BlockRenderingCustomizer() { @Override diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java index 5e778883b..cdd85a5dc 100644 --- a/src/main/java/appeng/core/api/definitions/ApiItems.java +++ b/src/main/java/appeng/core/api/definitions/ApiItems.java @@ -125,85 +125,113 @@ public final class ApiItems implements IItems public ApiItems( FeatureFactory registry ) { - FeatureFactory certusTools = registry.features( AEFeature.CertusQuartzTools ); - this.certusQuartzAxe = certusTools.item( "certus_quartz_axe", () -> new ToolQuartzAxe( AEFeature.CertusQuartzTools ) ).addFeatures( AEFeature.QuartzAxe ).build(); - this.certusQuartzHoe = certusTools.item( "certus_quartz_hoe", () -> new ToolQuartzHoe( AEFeature.CertusQuartzTools ) ).addFeatures( AEFeature.QuartzHoe ).build(); - this.certusQuartzShovel = certusTools.item( "certus_quartz_spade", () -> new ToolQuartzSpade( AEFeature.CertusQuartzTools ) ).addFeatures( AEFeature.QuartzSpade ).build(); - this.certusQuartzPick = certusTools.item( "certus_quartz_pickaxe", () -> new ToolQuartzPickaxe( AEFeature.CertusQuartzTools ) ).addFeatures( AEFeature.QuartzPickaxe ).build(); - this.certusQuartzSword = certusTools.item( "certus_quartz_sword", () -> new ToolQuartzSword( AEFeature.CertusQuartzTools ) ).addFeatures( AEFeature.QuartzSword ).build(); - this.certusQuartzWrench = certusTools.item( "certus_quartz_wrench", ToolQuartzWrench::new ).addFeatures( AEFeature.QuartzWrench ).build(); - this.certusQuartzKnife = certusTools.item( "certus_quartz_cutting_knife", () -> new ToolQuartzCuttingKnife( AEFeature.CertusQuartzTools ) ).addFeatures( AEFeature.QuartzKnife ).build(); + FeatureFactory certusTools = registry.features( AEFeature.CERTUS_QUARTZ_TOOLS ); + this.certusQuartzAxe = certusTools.item( "certus_quartz_axe", () -> new ToolQuartzAxe( AEFeature.CERTUS_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_AXE ) + .build(); + this.certusQuartzHoe = certusTools.item( "certus_quartz_hoe", () -> new ToolQuartzHoe( AEFeature.CERTUS_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_HOE ) + .build(); + this.certusQuartzShovel = certusTools.item( "certus_quartz_spade", () -> new ToolQuartzSpade( AEFeature.CERTUS_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_SPADE ) + .build(); + this.certusQuartzPick = certusTools.item( "certus_quartz_pickaxe", () -> new ToolQuartzPickaxe( AEFeature.CERTUS_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_PICKAXE ) + .build(); + this.certusQuartzSword = certusTools.item( "certus_quartz_sword", () -> new ToolQuartzSword( AEFeature.CERTUS_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_SWORD ) + .build(); + this.certusQuartzWrench = certusTools.item( "certus_quartz_wrench", ToolQuartzWrench::new ).addFeatures( AEFeature.QUARTZ_WRENCH ).build(); + this.certusQuartzKnife = certusTools.item( "certus_quartz_cutting_knife", () -> new ToolQuartzCuttingKnife( AEFeature.CERTUS_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_KNIFE ) + .build(); - FeatureFactory netherTools = registry.features( AEFeature.NetherQuartzTools ); - this.netherQuartzAxe = netherTools.item( "nether_quartz_axe", () -> new ToolQuartzAxe( AEFeature.NetherQuartzTools ) ).addFeatures( AEFeature.QuartzAxe ).build(); - this.netherQuartzHoe = netherTools.item( "nether_quartz_hoe", () -> new ToolQuartzHoe( AEFeature.NetherQuartzTools ) ).addFeatures( AEFeature.QuartzHoe ).build(); - this.netherQuartzShovel = netherTools.item( "nether_quartz_spade", () -> new ToolQuartzSpade( AEFeature.NetherQuartzTools ) ).addFeatures( AEFeature.QuartzSpade ).build(); - this.netherQuartzPick = netherTools.item( "nether_quartz_pickaxe", () -> new ToolQuartzPickaxe( AEFeature.NetherQuartzTools ) ).addFeatures( AEFeature.QuartzPickaxe ).build(); - this.netherQuartzSword = netherTools.item( "nether_quartz_sword", () -> new ToolQuartzSword( AEFeature.NetherQuartzTools ) ).addFeatures( AEFeature.QuartzSword ).build(); - this.netherQuartzWrench = netherTools.item( "nether_quartz_wrench", ToolQuartzWrench::new ).addFeatures( AEFeature.QuartzWrench ).build(); - this.netherQuartzKnife = netherTools.item( "nether_quartz_cutting_knife", () -> new ToolQuartzCuttingKnife( AEFeature.NetherQuartzTools ) ).addFeatures( AEFeature.QuartzKnife ).build(); + FeatureFactory netherTools = registry.features( AEFeature.NETHER_QUARTZ_TOOLS ); + this.netherQuartzAxe = netherTools.item( "nether_quartz_axe", () -> new ToolQuartzAxe( AEFeature.NETHER_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_AXE ) + .build(); + this.netherQuartzHoe = netherTools.item( "nether_quartz_hoe", () -> new ToolQuartzHoe( AEFeature.NETHER_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_HOE ) + .build(); + this.netherQuartzShovel = netherTools.item( "nether_quartz_spade", () -> new ToolQuartzSpade( AEFeature.NETHER_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_SPADE ) + .build(); + this.netherQuartzPick = netherTools.item( "nether_quartz_pickaxe", () -> new ToolQuartzPickaxe( AEFeature.NETHER_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_PICKAXE ) + .build(); + this.netherQuartzSword = netherTools.item( "nether_quartz_sword", () -> new ToolQuartzSword( AEFeature.NETHER_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_SWORD ) + .build(); + this.netherQuartzWrench = netherTools.item( "nether_quartz_wrench", ToolQuartzWrench::new ).addFeatures( AEFeature.QUARTZ_WRENCH ).build(); + this.netherQuartzKnife = netherTools.item( "nether_quartz_cutting_knife", () -> new ToolQuartzCuttingKnife( AEFeature.NETHER_QUARTZ_TOOLS ) ) + .addFeatures( AEFeature.QUARTZ_KNIFE ) + .build(); - FeatureFactory powerTools = registry.features( AEFeature.PoweredTools ); + FeatureFactory powerTools = registry.features( AEFeature.POWERED_TOOLS ); this.entropyManipulator = powerTools.item( "entropy_manipulator", ToolEntropyManipulator::new ) - .addFeatures( AEFeature.EntropyManipulator ) + .addFeatures( AEFeature.ENTROPY_MANIPULATOR ) .dispenserBehavior( DispenserBlockTool::new ) .build(); - this.wirelessTerminal = powerTools.item( "wireless_terminal", ToolWirelessTerminal::new ).addFeatures( AEFeature.WirelessAccessTerminal ).build(); - this.chargedStaff = powerTools.item( "charged_staff", ToolChargedStaff::new ).addFeatures( AEFeature.ChargedStaff ).build(); + this.wirelessTerminal = powerTools.item( "wireless_terminal", ToolWirelessTerminal::new ).addFeatures( AEFeature.WIRELESS_ACCESS_TERMINAL ).build(); + this.chargedStaff = powerTools.item( "charged_staff", ToolChargedStaff::new ).addFeatures( AEFeature.CHARGED_STAFF ).build(); this.massCannon = powerTools.item( "matter_cannon", ToolMatterCannon::new ) - .addFeatures( AEFeature.MatterCannon ) + .addFeatures( AEFeature.MATTER_CANNON ) .dispenserBehavior( DispenserMatterCannon::new ) .build(); - this.portableCell = powerTools.item( "portable_cell", ToolPortableCell::new ).addFeatures( AEFeature.PortableCell, AEFeature.StorageCells ).build(); + this.portableCell = powerTools.item( "portable_cell", ToolPortableCell::new ).addFeatures( AEFeature.PORTABLE_CELL, AEFeature.STORAGE_CELLS ).build(); this.colorApplicator = powerTools.item( "color_applicator", ToolColorApplicator::new ) - .addFeatures( AEFeature.ColorApplicator ) + .addFeatures( AEFeature.COLOR_APPLICATOR ) .dispenserBehavior( DispenserBlockTool::new ) .rendering( new ToolColorApplicatorRendering() ) .build(); this.biometricCard = registry.item( "biometric_card", ToolBiometricCard::new ) .rendering( new ToolBiometricCardRendering() ) - .features( AEFeature.Security ).build(); - this.memoryCard = registry.item( "memory_card", ToolMemoryCard::new ).build(); - this.networkTool = registry.item( "network_tool", ToolNetworkTool::new ).features( AEFeature.NetworkTool ).build(); + .features( AEFeature.SECURITY ) + .build(); + this.memoryCard = registry.item( "memory_card", ToolMemoryCard::new ).features( AEFeature.MEMORY_CARD ).build(); + this.networkTool = registry.item( "network_tool", ToolNetworkTool::new ).features( AEFeature.NETWORK_TOOL ).build(); - this.cellCreative = registry.item( "creative_storage_cell", ItemCreativeStorageCell::new ).features( AEFeature.StorageCells, AEFeature.Creative ).build(); - this.viewCell = registry.item( "view_cell", ItemViewCell::new ).build(); + this.cellCreative = registry.item( "creative_storage_cell", ItemCreativeStorageCell::new ) + .features( AEFeature.STORAGE_CELLS, AEFeature.CREATIVE ) + .build(); + this.viewCell = registry.item( "view_cell", ItemViewCell::new ).features( AEFeature.VIEW_CELL ).build(); - FeatureFactory storageCells = registry.features( AEFeature.StorageCells ); + FeatureFactory storageCells = registry.features( AEFeature.STORAGE_CELLS ); this.cell1k = storageCells.item( "storage_cell_1k", () -> new ItemBasicStorageCell( MaterialType.Cell1kPart, 1 ) ).build(); this.cell4k = storageCells.item( "storage_cell_4k", () -> new ItemBasicStorageCell( MaterialType.Cell4kPart, 4 ) ).build(); this.cell16k = storageCells.item( "storage_cell_16k", () -> new ItemBasicStorageCell( MaterialType.Cell16kPart, 16 ) ).build(); this.cell64k = storageCells.item( "storage_cell_64k", () -> new ItemBasicStorageCell( MaterialType.Cell64kPart, 64 ) ).build(); - FeatureFactory spatialCells = registry.features( AEFeature.SpatialIO ); + FeatureFactory spatialCells = registry.features( AEFeature.SPATIAL_IO ); this.spatialCell2 = spatialCells.item( "spatial_storage_cell_2_cubed", () -> new ItemSpatialStorageCell( 2 ) ).build(); this.spatialCell16 = spatialCells.item( "spatial_storage_cell_16_cubed", () -> new ItemSpatialStorageCell( 16 ) ).build(); this.spatialCell128 = spatialCells.item( "spatial_storage_cell_128_cubed", () -> new ItemSpatialStorageCell( 128 ) ).build(); this.facade = registry.item( "facade", ItemFacade::new ) - .features( AEFeature.Facades ) + .features( AEFeature.FACADES ) .creativeTab( CreativeTabFacade.instance ) .rendering( new FacadeRendering() ) .build(); this.crystalSeed = registry.item( "crystal_seed", ItemCrystalSeed::new ) + .features( AEFeature.CRYSTAL_SEEDS ) .rendering( new ItemCrystalSeedRendering() ) .build(); // rv1 this.encodedPattern = registry.item( "encoded_pattern", ItemEncodedPattern::new ) - .features( AEFeature.Patterns ) + .features( AEFeature.PATTERNS ) .rendering( new ItemEncodedPatternRendering() ) .build(); this.paintBall = registry.item( "paint_ball", ItemPaintBall::new ) - .features( AEFeature.PaintBalls ) + .features( AEFeature.PAINT_BALLS ) .rendering( new ItemPaintBallRendering() ) .build(); this.coloredPaintBall = registry.colored( this.paintBall, 0 ); this.coloredLumenPaintBall = registry.colored( this.paintBall, 20 ); - FeatureFactory debugTools = registry.features( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ); + FeatureFactory debugTools = registry.features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ); this.toolEraser = debugTools.item( "debug_eraser", ToolEraser::new ).build(); this.toolMeteoritePlacer = debugTools.item( "debug_meteorite_placer", ToolMeteoritePlacer::new ).build(); this.toolDebugCard = debugTools.item( "debug_card", ToolDebugCard::new ).build(); diff --git a/src/main/java/appeng/core/features/AEFeature.java b/src/main/java/appeng/core/features/AEFeature.java index 86c15ccb0..b75f1161d 100644 --- a/src/main/java/appeng/core/features/AEFeature.java +++ b/src/main/java/appeng/core/features/AEFeature.java @@ -24,7 +24,7 @@ public enum AEFeature // stuff that has no reason for ever being turned off, or that // is just flat out required by tons of // important stuff. - Core( null ) + CORE( "Core", null ) { @Override public boolean isVisible() @@ -33,124 +33,162 @@ public enum AEFeature } }, - CertusQuartzWorldGen( Constants.CATEGORY_WORLD ), - MeteoriteWorldGen( Constants.CATEGORY_WORLD ), - DecorativeLights( Constants.CATEGORY_WORLD ), - DecorativeQuartzBlocks( Constants.CATEGORY_WORLD ), - SkyStoneChests( Constants.CATEGORY_WORLD ), - SpawnPressesInMeteorites( Constants.CATEGORY_WORLD ), - GrindStone( Constants.CATEGORY_WORLD ), - Flour( Constants.CATEGORY_WORLD ), - Inscriber( Constants.CATEGORY_WORLD ), - ChestLoot( Constants.CATEGORY_WORLD ), - VillagerTrading( Constants.CATEGORY_WORLD ), - TinyTNT( Constants.CATEGORY_WORLD ), + CERTUS_QUARTZ_WORLD_GEN( "CertusQuartzWorldGen", Constants.CATEGORY_WORLD ), + METEORITE_WORLD_GEN( "MeteoriteWorldGen", Constants.CATEGORY_WORLD ), + DECORATIVE_LIGHTS( "DecorativeLights", Constants.CATEGORY_WORLD ), + DECORATIVE_QUARTZ_BLOCKS( "DecorativeQuartzBlocks", Constants.CATEGORY_WORLD ), + SKY_STONE_CHESTS( "SkyStoneChests", Constants.CATEGORY_WORLD ), + SPAWN_PRESSES_IN_METEORITES( "SpawnPressesInMeteorites", Constants.CATEGORY_WORLD ), + GRIND_STONE( "GrindStone", Constants.CATEGORY_WORLD ), + FLOUR( "Flour", Constants.CATEGORY_WORLD ), + INSCRIBER( "Inscriber", Constants.CATEGORY_WORLD ), + CHARGER( "Charger", Constants.CATEGORY_WORLD ), + CRYSTAL_GROWTH_ACCELERATOR( "CrystalGrowthAccelerator", Constants.CATEGORY_WORLD ), + CHEST_LOOT( "ChestLoot", Constants.CATEGORY_WORLD ), + VILLAGER_TRADING( "VillagerTrading", Constants.CATEGORY_WORLD ), + TINY_TNT( "TinyTNT", Constants.CATEGORY_WORLD ), + CERTUS_ORE( "CertusOre", Constants.CATEGORY_WORLD ), + CHARGED_CERTUS_ORE( "ChargedCertusOre", Constants.CATEGORY_WORLD ), - PoweredTools( Constants.CATEGORY_TOOLS_CLASSIFICATIONS ), - CertusQuartzTools( Constants.CATEGORY_TOOLS_CLASSIFICATIONS ), - NetherQuartzTools( Constants.CATEGORY_TOOLS_CLASSIFICATIONS ), + POWERED_TOOLS( "PoweredTools", Constants.CATEGORY_TOOLS_CLASSIFICATIONS ), + CERTUS_QUARTZ_TOOLS( "CertusQuartzTools", Constants.CATEGORY_TOOLS_CLASSIFICATIONS ), + NETHER_QUARTZ_TOOLS( "NetherQuartzTools", Constants.CATEGORY_TOOLS_CLASSIFICATIONS ), - QuartzHoe( Constants.CATEGORY_TOOLS ), - QuartzSpade( Constants.CATEGORY_TOOLS ), - QuartzSword( Constants.CATEGORY_TOOLS ), - QuartzPickaxe( Constants.CATEGORY_TOOLS ), - QuartzAxe( Constants.CATEGORY_TOOLS ), - QuartzKnife( Constants.CATEGORY_TOOLS ), - QuartzWrench( Constants.CATEGORY_TOOLS ), - ChargedStaff( Constants.CATEGORY_TOOLS ), - EntropyManipulator( Constants.CATEGORY_TOOLS ), - MatterCannon( Constants.CATEGORY_TOOLS ), - WirelessAccessTerminal( Constants.CATEGORY_TOOLS ), - ColorApplicator( Constants.CATEGORY_TOOLS ), - MeteoriteCompass( Constants.CATEGORY_TOOLS ), + QUARTZ_HOE( "QuartzHoe", Constants.CATEGORY_TOOLS ), + QUARTZ_SPADE( "QuartzSpade", Constants.CATEGORY_TOOLS ), + QUARTZ_SWORD( "QuartzSword", Constants.CATEGORY_TOOLS ), + QUARTZ_PICKAXE( "QuartzPickaxe", Constants.CATEGORY_TOOLS ), + QUARTZ_AXE( "QuartzAxe", Constants.CATEGORY_TOOLS ), + QUARTZ_KNIFE( "QuartzKnife", Constants.CATEGORY_TOOLS ), + QUARTZ_WRENCH( "QuartzWrench", Constants.CATEGORY_TOOLS ), + CHARGED_STAFF( "ChargedStaff", Constants.CATEGORY_TOOLS ), + ENTROPY_MANIPULATOR( "EntropyManipulator", Constants.CATEGORY_TOOLS ), + MATTER_CANNON( "MatterCannon", Constants.CATEGORY_TOOLS ), + WIRELESS_ACCESS_TERMINAL( "WirelessAccessTerminal", Constants.CATEGORY_TOOLS ), + COLOR_APPLICATOR( "ColorApplicator", Constants.CATEGORY_TOOLS ), + METEORITE_COMPASS( "MeteoriteCompass", Constants.CATEGORY_TOOLS ), - PowerGen( Constants.CATEGORY_NETWORK_FEATURES ), - Security( Constants.CATEGORY_NETWORK_FEATURES ), - SpatialIO( Constants.CATEGORY_NETWORK_FEATURES ), - QuantumNetworkBridge( Constants.CATEGORY_NETWORK_FEATURES ), - Channels( Constants.CATEGORY_NETWORK_FEATURES ), + POWER_GEN( "PowerGen", Constants.CATEGORY_NETWORK_FEATURES ), + SECURITY( "Security", Constants.CATEGORY_NETWORK_FEATURES ), + SPATIAL_IO( "SpatialIO", Constants.CATEGORY_NETWORK_FEATURES ), + QUANTUM_NETWORK_BRIDGE( "QuantumNetworkBridge", Constants.CATEGORY_NETWORK_FEATURES ), + CHANNELS( "Channels", Constants.CATEGORY_NETWORK_FEATURES ), - LevelEmitter( Constants.CATEGORY_NETWORK_BUSES ), - CraftingTerminal( Constants.CATEGORY_NETWORK_BUSES ), - StorageMonitor( Constants.CATEGORY_NETWORK_BUSES ), - P2PTunnel( Constants.CATEGORY_NETWORK_BUSES ), - FormationPlane( Constants.CATEGORY_NETWORK_BUSES ), - AnnihilationPlane( Constants.CATEGORY_NETWORK_BUSES ), - IdentityAnnihilationPlane( Constants.CATEGORY_NETWORK_BUSES ), - ImportBus( Constants.CATEGORY_NETWORK_BUSES ), - ExportBus( Constants.CATEGORY_NETWORK_BUSES ), - StorageBus( Constants.CATEGORY_NETWORK_BUSES ), - PartConversionMonitor( Constants.CATEGORY_NETWORK_BUSES ), + INTERFACE( "Interface", Constants.CATEGORY_NETWORK_BUSES ), + LEVEL_EMITTER( "LevelEmitter", Constants.CATEGORY_NETWORK_BUSES ), + CRAFTING_TERMINAL( "CraftingTerminal", Constants.CATEGORY_NETWORK_BUSES ), + TERMINAL( "Terminal", Constants.CATEGORY_NETWORK_BUSES ), + STORAGE_MONITOR( "StorageMonitor", Constants.CATEGORY_NETWORK_BUSES ), + P2P_TUNNEL( "P2PTunnel", Constants.CATEGORY_NETWORK_BUSES ), + FORMATION_PLANE( "FormationPlane", Constants.CATEGORY_NETWORK_BUSES ), + ANNIHILATION_PLANE( "AnnihilationPlane", Constants.CATEGORY_NETWORK_BUSES ), + IDENTITY_ANNIHILATION_PLANE( "IdentityAnnihilationPlane", Constants.CATEGORY_NETWORK_BUSES ), + IMPORT_BUS( "ImportBus", Constants.CATEGORY_NETWORK_BUSES ), + EXPORT_BUS( "ExportBus", Constants.CATEGORY_NETWORK_BUSES ), + STORAGE_BUS( "StorageBus", Constants.CATEGORY_NETWORK_BUSES ), + PART_CONVERSION_MONITOR( "PartConversionMonitor", Constants.CATEGORY_NETWORK_BUSES ), + TOGGLE_BUS( "ToggleBus", Constants.CATEGORY_NETWORK_BUSES ), + PANELS( "Panels", Constants.CATEGORY_NETWORK_BUSES ), + QUARTZ_FIBER( "QuartzFiber", Constants.CATEGORY_NETWORK_BUSES ), + CABLE_ANCHOR( "CableAnchor", Constants.CATEGORY_NETWORK_BUSES ), - PortableCell( Constants.CATEGORY_PORTABLE_CELL ), + PORTABLE_CELL( "PortableCell", Constants.CATEGORY_PORTABLE_CELL ), - StorageCells( Constants.CATEGORY_STORAGE ), - MEChest( Constants.CATEGORY_STORAGE ), - MEDrive( Constants.CATEGORY_STORAGE ), - IOPort( Constants.CATEGORY_STORAGE ), + STORAGE_CELLS( "StorageCells", Constants.CATEGORY_STORAGE ), + ME_CHEST( "MEChest", Constants.CATEGORY_STORAGE ), + ME_DRIVE( "MEDrive", Constants.CATEGORY_STORAGE ), + IO_PORT( "IOPort", Constants.CATEGORY_STORAGE ), + CONDENSER( "Condenser", Constants.CATEGORY_STORAGE ), - NetworkTool( Constants.CATEGORY_NETWORK_TOOL ), + NETWORK_TOOL( "NetworkTool", Constants.CATEGORY_NETWORK_TOOL ), + MEMORY_CARD( "MemoryCard", Constants.CATEGORY_NETWORK_TOOL ), - DenseEnergyCells( Constants.CATEGORY_HIGHER_CAPACITY ), - DenseCables( Constants.CATEGORY_HIGHER_CAPACITY ), + GLASS_CABLES( "GlassCables", Constants.CATEGORY_CABLES ), + COVERED_CABLES( "CoveredCables", Constants.CATEGORY_CABLES ), + SMART_CABLES( "SmartCables", Constants.CATEGORY_CABLES ), - P2PTunnelRF( Constants.CATEGORY_P2P_TUNNELS ), - P2PTunnelME( Constants.CATEGORY_P2P_TUNNELS ), - P2PTunnelItems( Constants.CATEGORY_P2P_TUNNELS ), - P2PTunnelRedstone( Constants.CATEGORY_P2P_TUNNELS ), - P2PTunnelEU( Constants.CATEGORY_P2P_TUNNELS ), - P2PTunnelLiquids( Constants.CATEGORY_P2P_TUNNELS ), - P2PTunnelLight( Constants.CATEGORY_P2P_TUNNELS ), - P2PTunnelOpenComputers( Constants.CATEGORY_P2P_TUNNELS ), - P2PTunnelPressure( Constants.CATEGORY_P2P_TUNNELS ), + ENERGY_CELLS( "EnergyCells", Constants.CATEGORY_ENERGY ), + ENERGY_ACCEPTOR( "EnergyAcceptor", Constants.CATEGORY_ENERGY ), - MassCannonBlockDamage( Constants.CATEGORY_BLOCK_FEATURES ), - TinyTNTBlockDamage( Constants.CATEGORY_BLOCK_FEATURES ), + DENSE_ENERGY_CELLS( "DenseEnergyCells", Constants.CATEGORY_HIGHER_CAPACITY ), + DENSE_CABLES( "DenseCables", Constants.CATEGORY_HIGHER_CAPACITY ), - Facades( Constants.CATEGORY_FACADES ), + P2P_TUNNEL_RF( "P2PTunnelRF", Constants.CATEGORY_P2P_TUNNELS ), + P2P_TUNNEL_ME( "P2PTunnelME", Constants.CATEGORY_P2P_TUNNELS ), + P2P_TUNNEL_ITEMS( "P2PTunnelItems", Constants.CATEGORY_P2P_TUNNELS ), + P2P_TUNNEL_REDSTONE( "P2PTunnelRedstone", Constants.CATEGORY_P2P_TUNNELS ), + P2P_TUNNEL_EU( "P2PTunnelEU", Constants.CATEGORY_P2P_TUNNELS ), + P2P_TUNNEL_LIQUIDS( "P2PTunnelLiquids", Constants.CATEGORY_P2P_TUNNELS ), + P2P_TUNNEL_LIGHT( "P2PTunnelLight", Constants.CATEGORY_P2P_TUNNELS ), + P2P_TUNNEL_OPEN_COMPUTERS( "P2PTunnelOpenComputers", Constants.CATEGORY_P2P_TUNNELS ), + P2P_TUNNEL_PRESSURE( "P2PTunnelPressure", Constants.CATEGORY_P2P_TUNNELS ), - UnsupportedDeveloperTools( Constants.CATEGORY_MISC, false ), - Creative( Constants.CATEGORY_MISC ), - GrinderLogging( Constants.CATEGORY_MISC, false ), - Logging( Constants.CATEGORY_MISC ), - IntegrationLogging( Constants.CATEGORY_MISC, false ), - WebsiteRecipes( Constants.CATEGORY_MISC, false ), - LogSecurityAudits( Constants.CATEGORY_MISC, false ), - Achievements( Constants.CATEGORY_MISC ), - UpdateLogging( Constants.CATEGORY_MISC, false ), - PacketLogging( Constants.CATEGORY_MISC, false ), - CraftingLog( Constants.CATEGORY_MISC, false ), - LightDetector( Constants.CATEGORY_MISC ), - DebugLogging( Constants.CATEGORY_MISC, false ), + MASS_CANNON_BLOCK_DAMAGE( "MassCannonBlockDamage", Constants.CATEGORY_BLOCK_FEATURES ), + TINY_TNT_BLOCK_DAMAGE( "TinyTNTBlockDamage", Constants.CATEGORY_BLOCK_FEATURES ), - EnableFacadeCrafting( Constants.CATEGORY_CRAFTING ), - InWorldSingularity( Constants.CATEGORY_CRAFTING ), - InWorldFluix( Constants.CATEGORY_CRAFTING ), - InWorldPurification( Constants.CATEGORY_CRAFTING ), - InterfaceTerminal( Constants.CATEGORY_CRAFTING ), - EnableDisassemblyCrafting( Constants.CATEGORY_CRAFTING ), + FACADES( "Facades", Constants.CATEGORY_FACADES ), - AlphaPass( Constants.CATEGORY_RENDERING ), - PaintBalls( Constants.CATEGORY_TOOLS ), + UNSUPPORTED_DEVELOPER_TOOLS( "UnsupportedDeveloperTools", Constants.CATEGORY_MISC, false ), + CREATIVE( "Creative", Constants.CATEGORY_MISC ), + GRINDER_LOGGING( "GrinderLogging", Constants.CATEGORY_MISC, false ), + LOGGING( "Logging", Constants.CATEGORY_MISC ), + INTEGRATION_LOGGING( "IntegrationLogging", Constants.CATEGORY_MISC, false ), + WEBSITE_RECIPES( "WebsiteRecipes", Constants.CATEGORY_MISC, false ), + LOG_SECURITY_AUDITS( "LogSecurityAudits", Constants.CATEGORY_MISC, false ), + ACHIEVEMENTS( "Achievements", Constants.CATEGORY_MISC ), + UPDATE_LOGGING( "UpdateLogging", Constants.CATEGORY_MISC, false ), + PACKET_LOGGING( "PacketLogging", Constants.CATEGORY_MISC, false ), + CRAFTING_LOG( "CraftingLog", Constants.CATEGORY_MISC, false ), + LIGHT_DETECTOR( "LightDetector", Constants.CATEGORY_MISC ), + DEBUG_LOGGING( "DebugLogging", Constants.CATEGORY_MISC, false ), - MolecularAssembler( Constants.CATEGORY_CRAFTING_FEATURES ), - Patterns( Constants.CATEGORY_CRAFTING_FEATURES ), - CraftingCPU( Constants.CATEGORY_CRAFTING_FEATURES ), + ENABLE_FACADE_CRAFTING( "EnableFacadeCrafting", Constants.CATEGORY_CRAFTING ), + IN_WORLD_SINGULARITY( "InWorldSingularity", Constants.CATEGORY_CRAFTING ), + IN_WORLD_FLUIX( "InWorldFluix", Constants.CATEGORY_CRAFTING ), + IN_WORLD_PURIFICATION( "InWorldPurification", Constants.CATEGORY_CRAFTING ), + INTERFACE_TERMINAL( "InterfaceTerminal", Constants.CATEGORY_CRAFTING ), + ENABLE_DISASSEMBLY_CRAFTING( "EnableDisassemblyCrafting", Constants.CATEGORY_CRAFTING ), - ChunkLoggerTrace( Constants.CATEGORY_COMMANDS, false ); + ALPHA_PASS( "AlphaPass", Constants.CATEGORY_RENDERING ), + PAINT_BALLS( "PaintBalls", Constants.CATEGORY_TOOLS ), - public final String category; - public final boolean defaultValue; + MOLECULAR_ASSEMBLER( "MolecularAssembler", Constants.CATEGORY_CRAFTING_FEATURES ), + PATTERNS( "Patterns", Constants.CATEGORY_CRAFTING_FEATURES ), + CRAFTING_CPU( "CraftingCPU", Constants.CATEGORY_CRAFTING_FEATURES ), - AEFeature( final String cat ) + BASIC_CARDS( "BasicCards", Constants.CATEGORY_UPGRADES ), + ADVANCED_CARDS( "AdvancedCards", Constants.CATEGORY_UPGRADES ), + VIEW_CELL( "ViewCell", Constants.CATEGORY_UPGRADES ), + + PROCESSORS( "Processors", Constants.CATEGORY_MATERIALS ), + PRINTED_CIRCUITS( "PrintedCircuits", Constants.CATEGORY_MATERIALS ), + PRESSES( "Presses", Constants.CATEGORY_MATERIALS ), + CRYSTAL_SEEDS( "CrystalSeeds", Constants.CATEGORY_MATERIALS ), + PURE_CRYSTALS( "PureCrystals", Constants.CATEGORY_MATERIALS ), + CERTUS( "Certus", Constants.CATEGORY_MATERIALS ), + FLUIX( "Fluix", Constants.CATEGORY_MATERIALS ), + SILICON( "Silicon", Constants.CATEGORY_MATERIALS ), + DUSTS( "Dusts", Constants.CATEGORY_MATERIALS ), + NUGGETS( "Nuggets", Constants.CATEGORY_MATERIALS ), + MATTER_BALL( "MatterBall", Constants.CATEGORY_MATERIALS ), + CORES( "Cores", Constants.CATEGORY_MATERIALS ), + + CHUNK_LOGGER_TRACE( "ChunkLoggerTrace", Constants.CATEGORY_COMMANDS, false ); + + private final String key; + private final String category; + private final boolean enabled; + + AEFeature( final String key, final String cat ) { - this( cat, true ); + this( key, cat, true ); } - AEFeature( final String cat, final boolean defaultValue ) + AEFeature( final String key, final String cat, final boolean enabled ) { + this.key = key; this.category = cat; - this.defaultValue = defaultValue; + this.enabled = enabled; } /** @@ -163,6 +201,21 @@ public enum AEFeature return true; } + public String key() + { + return key; + } + + public String category() + { + return category; + } + + public boolean isEnabled() + { + return enabled; + } + private enum Constants { ; @@ -177,6 +230,7 @@ public enum AEFeature private static final String CATEGORY_BLOCK_FEATURES = "BlockFeatures"; private static final String CATEGORY_CRAFTING_FEATURES = "CraftingFeatures"; private static final String CATEGORY_STORAGE = "Storage"; + private static final String CATEGORY_CABLES = "Cables"; private static final String CATEGORY_HIGHER_CAPACITY = "HigherCapacity"; private static final String CATEGORY_NETWORK_FEATURES = "NetworkFeatures"; private static final String CATEGORY_COMMANDS = "Commands"; @@ -184,5 +238,8 @@ public enum AEFeature private static final String CATEGORY_FACADES = "Facades"; private static final String CATEGORY_NETWORK_TOOL = "NetworkTool"; private static final String CATEGORY_PORTABLE_CELL = "PortableCell"; + private static final String CATEGORY_ENERGY = "Energy"; + private static final String CATEGORY_UPGRADES = "Upgrades"; + private static final String CATEGORY_MATERIALS = "Materials"; } } diff --git a/src/main/java/appeng/core/features/MaterialStackSrc.java b/src/main/java/appeng/core/features/MaterialStackSrc.java index 546534ea9..294211f52 100644 --- a/src/main/java/appeng/core/features/MaterialStackSrc.java +++ b/src/main/java/appeng/core/features/MaterialStackSrc.java @@ -30,12 +30,14 @@ import appeng.items.materials.MaterialType; public class MaterialStackSrc implements IStackSrc { private final MaterialType src; + private final boolean enabled; - public MaterialStackSrc( final MaterialType src ) + public MaterialStackSrc( final MaterialType src, boolean enabled ) { Preconditions.checkNotNull( src ); this.src = src; + this.enabled = enabled; } @Override @@ -59,6 +61,6 @@ public class MaterialStackSrc implements IStackSrc @Override public boolean isEnabled() { - return true; + return this.enabled; } } diff --git a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java index af4109523..57d995af5 100644 --- a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java +++ b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java @@ -204,7 +204,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene { final ItemStack extra = is.copy(); extra.stackSize = ratio - 1; - this.addRecipe( item, is, extra, (float) ( AEConfig.instance.oreDoublePercentage / 100.0 ), 8 ); + this.addRecipe( item, is, extra, (float) ( AEConfig.instance().getOreDoublePercentage() / 100.0 ), 8 ); } else { @@ -256,7 +256,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene { final ItemStack extra = is.copy(); extra.stackSize = ratio - 1; - this.addRecipe( d.getKey(), is, extra, (float) ( AEConfig.instance.oreDoublePercentage / 100.0 ), 8 ); + this.addRecipe( d.getKey(), is, extra, (float) ( AEConfig.instance().getOreDoublePercentage() / 100.0 ), 8 ); } else { @@ -279,7 +279,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene { if( name.startsWith( "ore" ) || name.startsWith( "crystal" ) || name.startsWith( "gem" ) || name.startsWith( "ingot" ) || name.startsWith( "dust" ) ) { - for( final String ore : AEConfig.instance.grinderOres ) + for( final String ore : AEConfig.instance().getGrinderOres() ) { if( name.equals( "ore" + ore ) ) { diff --git a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java index 0e36f8577..0e70c8bf1 100644 --- a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java +++ b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java @@ -87,7 +87,7 @@ public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmo this.considerItem( name, item, "Sodium", 22.9897 ); this.considerItem( name, item, "Magnesium", 24.305 ); this.considerItem( name, item, "Aluminum", 26.9815 ); - this.considerItem( name, item, "Silicon", 28.0855 ); + this.considerItem( name, item, "SILICON", 28.0855 ); this.considerItem( name, item, "Phosphorus", 30.9738 ); this.considerItem( name, item, "Sulfur", 32.065 ); this.considerItem( name, item, "Potassium", 39.0983 ); diff --git a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java index 61ebfe8c9..7a03bbd77 100644 --- a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java +++ b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java @@ -32,7 +32,7 @@ import appeng.core.features.AEFeature; /** * Registers any items a player is picking up or is crafting. * Registered items are added to the player stats. - * This will only happen if the {@link AEFeature#Achievements} feature is enabled. + * This will only happen if the {@link AEFeature#ACHIEVEMENTS} feature is enabled. */ public class PlayerStatsRegistration { @@ -43,7 +43,7 @@ public class PlayerStatsRegistration private final EventBus bus; /** - * is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the + * is true if the {@link appeng.core.features.AEFeature#ACHIEVEMENTS} is enabled in the * * @param config */ @@ -55,12 +55,12 @@ public class PlayerStatsRegistration * * @param bus {@see #bus} * @param config {@link appeng.core.AEConfig} which is used to determine if the - * {@link appeng.core.features.AEFeature#Achievements} is enabled + * {@link appeng.core.features.AEFeature#ACHIEVEMENTS} is enabled */ public PlayerStatsRegistration( final EventBus bus, final AEConfig config ) { this.bus = bus; - this.isAchievementFeatureEnabled = config.isFeatureEnabled( AEFeature.Achievements ); + this.isAchievementFeatureEnabled = config.isFeatureEnabled( AEFeature.ACHIEVEMENTS ); } /** diff --git a/src/main/java/appeng/core/sync/AppEngPacket.java b/src/main/java/appeng/core/sync/AppEngPacket.java index 759e96f56..bdc35c1cb 100644 --- a/src/main/java/appeng/core/sync/AppEngPacket.java +++ b/src/main/java/appeng/core/sync/AppEngPacket.java @@ -71,9 +71,9 @@ public abstract class AppEngPacket implements Packet throw new IllegalArgumentException( "Sorry AE2 made a " + this.p.array().length + " byte packet by accident!" ); } - final FMLProxyPacket pp = new FMLProxyPacket( this.p, NetworkHandler.instance.getChannel() ); + final FMLProxyPacket pp = new FMLProxyPacket( this.p, NetworkHandler.instance().getChannel() ); - if( AEConfig.instance.isFeatureEnabled( AEFeature.PacketLogging ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.PACKET_LOGGING ) ) { AELog.info( this.getClass().getName() + " : " + pp.payload().readableBytes() ); } diff --git a/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java index 48250dbe7..fe82075b2 100644 --- a/src/main/java/appeng/core/sync/network/NetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/NetworkHandler.java @@ -37,7 +37,7 @@ import appeng.core.worlddata.WorldData; public class NetworkHandler { - public static NetworkHandler instance; + private static NetworkHandler instance; private final FMLEventChannel ec; private final String myChannelName; @@ -55,6 +55,16 @@ public class NetworkHandler this.serveHandler = this.createServerSide(); } + public static void init( final String channelName ) + { + instance = new NetworkHandler( channelName ); + } + + public static NetworkHandler instance() + { + return instance; + } + private IPacketHandler createClientSide() { try diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java b/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java index bd8b4a98f..863c7bbf4 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java +++ b/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java @@ -70,7 +70,7 @@ public class PacketCompassRequest extends AppEngPacket implements ICompassCallba @Override public void calculatedDirection( final boolean hasResult, final boolean spin, final double radians, final double dist ) { - NetworkHandler.instance.sendTo( new PacketCompassResponse( this, hasResult, spin, radians ), (EntityPlayerMP) this.talkBackTo ); + NetworkHandler.instance().sendTo( new PacketCompassResponse( this, hasResult, spin, radians ), (EntityPlayerMP) this.talkBackTo ); } @Override diff --git a/src/main/java/appeng/core/sync/packets/PacketLightning.java b/src/main/java/appeng/core/sync/packets/PacketLightning.java index 3d6ec3723..359faf429 100644 --- a/src/main/java/appeng/core/sync/packets/PacketLightning.java +++ b/src/main/java/appeng/core/sync/packets/PacketLightning.java @@ -73,7 +73,7 @@ public class PacketLightning extends AppEngPacket { try { - if( Platform.isClient() && AEConfig.instance.enableEffects ) + if( Platform.isClient() && AEConfig.instance().isEnableEffects() ) { final LightningFX fx = new LightningFX( ClientHelper.proxy.getWorld(), this.x, this.y, this.z, 0.0f, 0.0f, 0.0f ); Minecraft.getMinecraft().effectRenderer.addEffect( fx ); diff --git a/src/main/java/appeng/core/worlddata/DimensionData.java b/src/main/java/appeng/core/worlddata/DimensionData.java index e0b89427e..a15b33954 100644 --- a/src/main/java/appeng/core/worlddata/DimensionData.java +++ b/src/main/java/appeng/core/worlddata/DimensionData.java @@ -113,7 +113,7 @@ final class DimensionData implements IWorldDimensionData, IOnWorldStartable, IOn this.storageCellDimensionIDs.add( newStorageCellID ); DimensionManager.registerDimension( newStorageCellID, AppEng.instance().getRegistration().getStorageDimensionType() ); - NetworkHandler.instance.sendToAll( new PacketNewStorageDimension( newStorageCellID ) ); + NetworkHandler.instance().sendToAll( new PacketNewStorageDimension( newStorageCellID ) ); final String[] values = new String[this.storageCellDimensionIDs.size()]; @@ -164,7 +164,7 @@ final class DimensionData implements IWorldDimensionData, IOnWorldStartable, IOn { for( final TickHandler.PlayerColor pc : TickHandler.INSTANCE.getPlayerColors().values() ) { - NetworkHandler.instance.sendToAll( pc.getPacket() ); + NetworkHandler.instance().sendToAll( pc.getPacket() ); } } } diff --git a/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java index ae757862a..4f65eba8e 100644 --- a/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java +++ b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java @@ -64,7 +64,7 @@ public final class BlockChargedQuartzOre extends BlockQuartzOre @SideOnly( Side.CLIENT ) public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { - if( !AEConfig.instance.enableEffects ) + if( !AEConfig.instance().isEnableEffects() ) { return; } diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java b/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java index 3daa1dee1..c04f34363 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java @@ -45,7 +45,7 @@ public class BlockQuartzLamp extends BlockQuartzGlass @SideOnly( Side.CLIENT ) public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { - if( !AEConfig.instance.enableEffects ) + if( !AEConfig.instance().isEnableEffects() ) { return; } diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index ef2eafde9..ccd95cbda 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -64,12 +64,12 @@ public final class EntityChargedQuartz extends AEBaseEntityItem { super.onUpdate(); - if( !AEConfig.instance.isFeatureEnabled( AEFeature.InWorldFluix ) ) + if( !AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_FLUIX ) ) { return; } - if( Platform.isClient() && this.delay > 30 && AEConfig.instance.enableEffects ) + if( Platform.isClient() && this.delay > 30 && AEConfig.instance().isEnableEffects() ) { CommonHelper.proxy.spawnEffect( EffectType.Lightning, this.worldObj, this.posX, this.posY, this.posZ, null ); this.delay = 0; diff --git a/src/main/java/appeng/entity/EntityGrowingCrystal.java b/src/main/java/appeng/entity/EntityGrowingCrystal.java index 65a68a1cc..3bfad4336 100644 --- a/src/main/java/appeng/entity/EntityGrowingCrystal.java +++ b/src/main/java/appeng/entity/EntityGrowingCrystal.java @@ -59,7 +59,7 @@ public final class EntityGrowingCrystal extends EntityItem { super.onUpdate(); - if( !AEConfig.instance.isFeatureEnabled( AEFeature.InWorldPurification ) ) + if( !AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_PURIFICATION ) ) { return; } diff --git a/src/main/java/appeng/entity/EntitySingularity.java b/src/main/java/appeng/entity/EntitySingularity.java index f4d6c0a2f..36eb8dcc9 100644 --- a/src/main/java/appeng/entity/EntitySingularity.java +++ b/src/main/java/appeng/entity/EntitySingularity.java @@ -74,7 +74,7 @@ public final class EntitySingularity extends AEBaseEntityItem return; } - if( !AEConfig.instance.isFeatureEnabled( AEFeature.InWorldSingularity ) ) + if( !AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_SINGULARITY ) ) { return; } diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java index 029a47b55..81a58c695 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java @@ -141,7 +141,7 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit } } - if( AEConfig.instance.isFeatureEnabled( AEFeature.TinyTNTBlockDamage ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.TINY_TNT_BLOCK_DAMAGE ) ) { this.posY -= 0.25; final Explosion ex = new Explosion( this.worldObj, this, this.posX, this.posY, this.posZ, 0.2f, false, false ); diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java index 8c7e04362..a19251ba2 100644 --- a/src/main/java/appeng/hooks/CompassManager.java +++ b/src/main/java/appeng/hooks/CompassManager.java @@ -76,7 +76,7 @@ public class CompassManager private void requestUpdate( final CompassRequest r ) { - NetworkHandler.instance.sendToServer( new PacketCompassRequest( r.attunement, r.cx, r.cz, r.cdy ) ); + NetworkHandler.instance().sendToServer( new PacketCompassRequest( r.attunement, r.cx, r.cz, r.cdy ) ); } private static class CompassRequest diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index ba43c345d..7043db6bc 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -201,7 +201,7 @@ public class TickHandler final Collection jobSet = this.craftingJobs.get( wte.world ); if( !jobSet.isEmpty() ) { - final int simTime = Math.max( 1, AEConfig.instance.craftingCalculationTimePerTick / jobSet.size() ); + final int simTime = Math.max( 1, AEConfig.instance().getCraftingCalculationTimePerTick() / jobSet.size() ); final Iterator i = jobSet.iterator(); while( i.hasNext() ) { diff --git a/src/main/java/appeng/integration/IntegrationNode.java b/src/main/java/appeng/integration/IntegrationNode.java index c929fb39e..a60649435 100644 --- a/src/main/java/appeng/integration/IntegrationNode.java +++ b/src/main/java/appeng/integration/IntegrationNode.java @@ -80,8 +80,8 @@ final class IntegrationNode final ModAPIManager apiManager = ModAPIManager.INSTANCE; boolean enabled = this.modID == null || Loader.isModLoaded( this.modID ) || apiManager.hasAPI( this.modID ); - AEConfig.instance.addCustomCategoryComment( "ModIntegration", "Valid Values are 'AUTO', 'ON', or 'OFF' - defaults to 'AUTO' ; Suggested that you leave this alone unless your experiencing an issue, or wish to disable the integration for a reason." ); - final String mode = AEConfig.instance.get( "ModIntegration", this.displayName.replace( " ", "" ), "AUTO" ).getString(); + AEConfig.instance().addCustomCategoryComment( "ModIntegration", "Valid Values are 'AUTO', 'ON', or 'OFF' - defaults to 'AUTO' ; Suggested that you leave this alone unless your experiencing an issue, or wish to disable the integration for a reason." ); + final String mode = AEConfig.instance().get( "ModIntegration", this.displayName.replace( " ", "" ), "AUTO" ).getString(); if( mode.toUpperCase().equals( "ON" ) ) { diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java index 599c75776..bf8a4dacf 100644 --- a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java @@ -79,7 +79,7 @@ public class JEIPlugin extends BlankModPlugin IMaterials materials = definitions.materials(); final String message; - if( AEConfig.instance.isFeatureEnabled( AEFeature.CertusQuartzWorldGen ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.CERTUS_QUARTZ_WORLD_GEN ) ) { message = GuiText.ChargedQuartz.getLocal() + "\n\n" + GuiText.ChargedQuartzFind.getLocal(); } @@ -89,24 +89,24 @@ public class JEIPlugin extends BlankModPlugin } addDescription( registry, materials.certusQuartzCrystalCharged(), message ); - if( AEConfig.instance.isFeatureEnabled( AEFeature.MeteoriteWorldGen ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.METEORITE_WORLD_GEN ) ) { addDescription( registry, materials.logicProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() ); addDescription( registry, materials.calcProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() ); addDescription( registry, materials.engProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() ); } - if( AEConfig.instance.isFeatureEnabled( AEFeature.InWorldFluix ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_FLUIX ) ) { addDescription( registry, materials.fluixCrystal(), GuiText.inWorldFluix.getLocal() ); } - if( AEConfig.instance.isFeatureEnabled( AEFeature.InWorldSingularity ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_SINGULARITY ) ) { addDescription( registry, materials.qESingularity(), GuiText.inWorldSingularity.getLocal() ); } - if( AEConfig.instance.isFeatureEnabled( AEFeature.InWorldPurification ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_PURIFICATION ) ) { addDescription( registry, materials.purifiedCertusQuartzCrystal(), GuiText.inWorldPurificationCertus.getLocal() ); addDescription( registry, materials.purifiedNetherQuartzCrystal(), GuiText.inWorldPurificationNether.getLocal() ); diff --git a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java index 841c03bc5..454447d9f 100644 --- a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java +++ b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java @@ -131,7 +131,7 @@ class RecipeTransferHandler implements IRecipeTransferHandl try { - NetworkHandler.instance.sendToServer( new PacketJEIRecipe( recipe ) ); + NetworkHandler.instance().sendToServer( new PacketJEIRecipe( recipe ) ); } catch( IOException e ) { diff --git a/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java b/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java index 5fb426a39..d145b7ca8 100644 --- a/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java +++ b/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java @@ -51,7 +51,7 @@ class ShapedRecipeWrapper extends BlankRecipeWrapper implements IShapedCraftingR @Override public void getIngredients( IIngredients ingredients ) { - final boolean useSingleItems = AEConfig.instance.disableColoredCableRecipesInJEI(); + final boolean useSingleItems = AEConfig.instance().disableColoredCableRecipesInJEI(); Object[] items = recipe.getIngredients(); int width = recipe.getWidth(); diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java index 3971e9225..c01d33c00 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMaterial.java @@ -172,10 +172,10 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, for( final AEFeature f : mat.getFeature() ) { - enabled = enabled && AEConfig.instance.isFeatureEnabled( f ); + enabled = enabled && AEConfig.instance().isFeatureEnabled( f ); } - mat.setStackSrc( new MaterialStackSrc( mat ) ); + mat.setStackSrc( new MaterialStackSrc( mat, enabled ) ); if( enabled ) { @@ -228,7 +228,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, } } - if( replacement == null || AEConfig.instance.useAEVersion( mt ) ) + if( replacement == null || AEConfig.instance().useAEVersion( mt ) ) { // continue using the AE2 item. for( final String name : names ) @@ -339,7 +339,8 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, try { - eqi = droppedEntity.getConstructor( World.class, double.class, double.class, double.class, ItemStack.class ).newInstance( w, location.posX, location.posY, location.posZ, itemstack ); + eqi = droppedEntity.getConstructor( World.class, double.class, double.class, double.class, ItemStack.class ).newInstance( w, location.posX, + location.posY, location.posZ, itemstack ); } catch( final Throwable t ) { diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java index 7ffdca8c0..b69bd106e 100644 --- a/src/main/java/appeng/items/materials/MaterialType.java +++ b/src/main/java/appeng/items/materials/MaterialType.java @@ -20,6 +20,7 @@ package appeng.items.materials; import java.util.EnumSet; +import java.util.Set; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -38,85 +39,85 @@ import appeng.entity.EntitySingularity; public enum MaterialType { - InvalidType( -1, "material_invalid_type", AEFeature.Core ), + InvalidType( -1, "material_invalid_type" ), - CertusQuartzCrystal( 0, "material_certus_quartz_crystal", AEFeature.Core, "crystalCertusQuartz" ), - CertusQuartzCrystalCharged( 1, "material_certus_quartz_crystal_charged", AEFeature.Core, EntityChargedQuartz.class ), + CertusQuartzCrystal( 0, "material_certus_quartz_crystal", EnumSet.of( AEFeature.CERTUS ), "crystalCertusQuartz" ), + CertusQuartzCrystalCharged( 1, "material_certus_quartz_crystal_charged", EnumSet.of( AEFeature.CERTUS ), EntityChargedQuartz.class ), - CertusQuartzDust( 2, "material_certus_quartz_dust", AEFeature.Core, "dustCertusQuartz" ), - NetherQuartzDust( 3, "material_nether_quartz_dust", AEFeature.Core, "dustNetherQuartz" ), - Flour( 4, "material_flour", AEFeature.Flour, "dustWheat" ), - GoldDust( 51, "material_gold_dust", AEFeature.Core, "dustGold" ), - IronDust( 49, "material_iron_dust", AEFeature.Core, "dustIron" ), - IronNugget( 50, "material_iron_nugget", AEFeature.Core, "nuggetIron" ), + CertusQuartzDust( 2, "material_certus_quartz_dust", EnumSet.of( AEFeature.DUSTS, AEFeature.CERTUS ), "dustCertusQuartz" ), + NetherQuartzDust( 3, "material_nether_quartz_dust", EnumSet.of( AEFeature.DUSTS ), "dustNetherQuartz" ), + Flour( 4, "material_flour", EnumSet.of( AEFeature.FLOUR ), "dustWheat" ), + GoldDust( 51, "material_gold_dust", EnumSet.of( AEFeature.DUSTS ), "dustGold" ), + IronDust( 49, "material_iron_dust", EnumSet.of( AEFeature.DUSTS ), "dustIron" ), + IronNugget( 50, "material_iron_nugget", EnumSet.of( AEFeature.NUGGETS ), "nuggetIron" ), - Silicon( 5, "material_silicon", AEFeature.Core, "itemSilicon" ), - MatterBall( 6, "material_matter_ball" ), + Silicon( 5, "material_silicon", EnumSet.of( AEFeature.SILICON ), "itemSilicon" ), + MatterBall( 6, "material_matter_ball", EnumSet.of( AEFeature.MATTER_BALL ) ), - FluixCrystal( 7, "material_fluix_crystal", AEFeature.Core, "crystalFluix" ), - FluixDust( 8, "material_fluix_dust", AEFeature.Core, "dustFluix" ), - FluixPearl( 9, "material_fluix_pearl", AEFeature.Core, "pearlFluix" ), + FluixCrystal( 7, "material_fluix_crystal", EnumSet.of( AEFeature.FLUIX ), "crystalFluix" ), + FluixDust( 8, "material_fluix_dust", EnumSet.of( AEFeature.FLUIX, AEFeature.DUSTS ), "dustFluix" ), + FluixPearl( 9, "material_fluix_pearl", EnumSet.of( AEFeature.FLUIX ), "pearlFluix" ), - PurifiedCertusQuartzCrystal( 10, "material_purified_certus_quartz_crystal" ), - PurifiedNetherQuartzCrystal( 11, "material_purified_nether_quartz_crystal" ), - PurifiedFluixCrystal( 12, "material_purified_fluix_crystal" ), + PurifiedCertusQuartzCrystal( 10, "material_purified_certus_quartz_crystal", EnumSet.of( AEFeature.CERTUS, AEFeature.PURE_CRYSTALS ) ), + PurifiedNetherQuartzCrystal( 11, "material_purified_nether_quartz_crystal", EnumSet.of( AEFeature.PURE_CRYSTALS ) ), + PurifiedFluixCrystal( 12, "material_purified_fluix_crystal", EnumSet.of( AEFeature.FLUIX, AEFeature.PURE_CRYSTALS ) ), - CalcProcessorPress( 13, "material_calc_processor_press" ), - EngProcessorPress( 14, "material_eng_processor_press" ), - LogicProcessorPress( 15, "material_logic_processor_press" ), + CalcProcessorPress( 13, "material_calc_processor_press", EnumSet.of( AEFeature.PRESSES ) ), + EngProcessorPress( 14, "material_eng_processor_press", EnumSet.of( AEFeature.PRESSES ) ), + LogicProcessorPress( 15, "material_logic_processor_press", EnumSet.of( AEFeature.PRESSES ) ), - CalcProcessorPrint( 16, "material_calc_processor_print" ), - EngProcessorPrint( 17, "material_eng_processor_print" ), - LogicProcessorPrint( 18, "material_logic_processor_print" ), + CalcProcessorPrint( 16, "material_calc_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), + EngProcessorPrint( 17, "material_eng_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), + LogicProcessorPrint( 18, "material_logic_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), - SiliconPress( 19, "material_silicon_press" ), - SiliconPrint( 20, "material_silicon_print" ), + SiliconPress( 19, "material_silicon_press", EnumSet.of( AEFeature.PRESSES ) ), + SiliconPrint( 20, "material_silicon_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), - NamePress( 21, "material_name_press" ), + NamePress( 21, "material_name_press", EnumSet.of( AEFeature.PRESSES ) ), - LogicProcessor( 22, "material_logic_processor" ), - CalcProcessor( 23, "material_calc_processor" ), - EngProcessor( 24, "material_eng_processor" ), + LogicProcessor( 22, "material_logic_processor", EnumSet.of( AEFeature.PROCESSORS ) ), + CalcProcessor( 23, "material_calc_processor", EnumSet.of( AEFeature.PROCESSORS ) ), + EngProcessor( 24, "material_eng_processor", EnumSet.of( AEFeature.PROCESSORS ) ), // Basic Cards - BasicCard( 25, "material_basic_card" ), - CardRedstone( 26, "material_card_redstone" ), - CardCapacity( 27, "material_card_capacity" ), + BasicCard( 25, "material_basic_card", EnumSet.of( AEFeature.BASIC_CARDS ) ), + CardRedstone( 26, "material_card_redstone", EnumSet.of( AEFeature.BASIC_CARDS ) ), + CardCapacity( 27, "material_card_capacity", EnumSet.of( AEFeature.BASIC_CARDS ) ), // Adv Cards - AdvCard( 28, "material_adv_card" ), - CardFuzzy( 29, "material_card_fuzzy" ), - CardSpeed( 30, "material_card_speed" ), - CardInverter( 31, "material_card_inverter" ), + AdvCard( 28, "material_adv_card", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), + CardFuzzy( 29, "material_card_fuzzy", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), + CardSpeed( 30, "material_card_speed", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), + CardInverter( 31, "material_card_inverter", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), - Cell2SpatialPart( 32, "material_cell2_spatial_part", AEFeature.SpatialIO ), - Cell16SpatialPart( 33, "material_cell16_spatial_part", AEFeature.SpatialIO ), - Cell128SpatialPart( 34, "material_cell128_spatial_part", AEFeature.SpatialIO ), + Cell2SpatialPart( 32, "material_cell2_spatial_part", EnumSet.of( AEFeature.SPATIAL_IO ) ), + Cell16SpatialPart( 33, "material_cell16_spatial_part", EnumSet.of( AEFeature.SPATIAL_IO ) ), + Cell128SpatialPart( 34, "material_cell128_spatial_part", EnumSet.of( AEFeature.SPATIAL_IO ) ), - Cell1kPart( 35, "material_cell1k_part", AEFeature.StorageCells ), - Cell4kPart( 36, "material_cell4k_part", AEFeature.StorageCells ), - Cell16kPart( 37, "material_cell16k_part", AEFeature.StorageCells ), - Cell64kPart( 38, "material_cell64k_part", AEFeature.StorageCells ), - EmptyStorageCell( 39, "material_empty_storage_cell", AEFeature.StorageCells ), + Cell1kPart( 35, "material_cell1k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), + Cell4kPart( 36, "material_cell4k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), + Cell16kPart( 37, "material_cell16k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), + Cell64kPart( 38, "material_cell64k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), + EmptyStorageCell( 39, "material_empty_storage_cell", EnumSet.of( AEFeature.STORAGE_CELLS ) ), - WoodenGear( 40, "material_wooden_gear", AEFeature.GrindStone, "gearWood" ), + WoodenGear( 40, "material_wooden_gear", EnumSet.of( AEFeature.GRIND_STONE ), "gearWood" ), - Wireless( 41, "material_wireless", AEFeature.WirelessAccessTerminal ), - WirelessBooster( 42, "material_wireless_booster", AEFeature.WirelessAccessTerminal ), + Wireless( 41, "material_wireless", EnumSet.of( AEFeature.WIRELESS_ACCESS_TERMINAL ) ), + WirelessBooster( 42, "material_wireless_booster", EnumSet.of( AEFeature.WIRELESS_ACCESS_TERMINAL ) ), - FormationCore( 43, "material_formation_core" ), - AnnihilationCore( 44, "material_annihilation_core" ), + FormationCore( 43, "material_formation_core", EnumSet.of( AEFeature.CORES ) ), + AnnihilationCore( 44, "material_annihilation_core", EnumSet.of( AEFeature.CORES ) ), - SkyDust( 45, "material_sky_dust", AEFeature.Core ), + SkyDust( 45, "material_sky_dust", EnumSet.of( AEFeature.DUSTS ) ), - EnderDust( 46, "material_ender_dust", AEFeature.QuantumNetworkBridge, "dustEnder,dustEnderPearl", EntitySingularity.class ), - Singularity( 47, "material_singularity", AEFeature.QuantumNetworkBridge, EntitySingularity.class ), - QESingularity( 48, "material_qesingularity", AEFeature.QuantumNetworkBridge, EntitySingularity.class ), + EnderDust( 46, "material_ender_dust", EnumSet.of( AEFeature.QUANTUM_NETWORK_BRIDGE ), "dustEnder,dustEnderPearl", EntitySingularity.class ), + Singularity( 47, "material_singularity", EnumSet.of( AEFeature.QUANTUM_NETWORK_BRIDGE ), EntitySingularity.class ), + QESingularity( 48, "material_qesingularity", EnumSet.of( AEFeature.QUANTUM_NETWORK_BRIDGE ), EntitySingularity.class ), - BlankPattern( 52, "material_blank_pattern" ), - CardCrafting( 53, "material_card_crafting" ); + BlankPattern( 52, "material_blank_pattern", EnumSet.of( AEFeature.PATTERNS ) ), + CardCrafting( 53, "material_card_crafting", EnumSet.of( AEFeature.ADVANCED_CARDS, AEFeature.CRAFTING_CPU ) ); - private final EnumSet features; + private final Set features; private final ModelResourceLocation model; private Item itemInstance; private int damageValue; @@ -128,35 +129,37 @@ public enum MaterialType MaterialType( final int metaValue, String modelName ) { - this( metaValue, modelName, AEFeature.Core ); + this( metaValue, modelName, EnumSet.of( AEFeature.CORE ) ); } - MaterialType( final int metaValue, String modelName, final AEFeature part ) + MaterialType( final int metaValue, String modelName, final Set features ) { this.setDamageValue( metaValue ); - this.features = EnumSet.of( part ); + this.features = features; this.model = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, modelName ), "inventory" ); } - MaterialType( final int metaValue, String modelName, final AEFeature part, final Class c ) + MaterialType( final int metaValue, String modelName, final Set features, final Class c ) { - this( metaValue, modelName, part ); + this( metaValue, modelName, features ); this.droppedEntity = c; - EntityRegistry.registerModEntity( this.droppedEntity, this.droppedEntity.getSimpleName(), EntityIds.get( this.droppedEntity ), AppEng.instance(), 16, 4, true ); + EntityRegistry.registerModEntity( this.droppedEntity, this.droppedEntity.getSimpleName(), EntityIds.get( this.droppedEntity ), AppEng.instance(), 16, 4, + true ); } - MaterialType( final int metaValue, String modelName, final AEFeature part, final String oreDictionary, final Class c ) + MaterialType( final int metaValue, String modelName, final Set features, final String oreDictionary, final Class c ) { - this( metaValue, modelName, part ); + this( metaValue, modelName, features ); this.oreName = oreDictionary; this.droppedEntity = c; - EntityRegistry.registerModEntity( this.droppedEntity, this.droppedEntity.getSimpleName(), EntityIds.get( this.droppedEntity ), AppEng.instance(), 16, 4, true ); + EntityRegistry.registerModEntity( this.droppedEntity, this.droppedEntity.getSimpleName(), EntityIds.get( this.droppedEntity ), AppEng.instance(), 16, 4, + true ); } - MaterialType( final int metaValue, String modelName, final AEFeature part, final String oreDictionary ) + MaterialType( final int metaValue, String modelName, final Set features, final String oreDictionary ) { - this( metaValue, modelName, part ); + this( metaValue, modelName, features ); this.oreName = oreDictionary; } @@ -165,7 +168,7 @@ public enum MaterialType return new ItemStack( this.getItemInstance(), size, this.getDamageValue() ); } - EnumSet getFeature() + Set getFeature() { return this.features; } @@ -225,7 +228,8 @@ public enum MaterialType this.stackSrc = stackSrc; } - public ModelResourceLocation getModel() { + public ModelResourceLocation getModel() + { return model; } diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index d486ead4a..01016f8a6 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -133,9 +133,9 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte } } - if( FacadeConfig.instance.hasChanged() ) + if( FacadeConfig.instance().hasChanged() ) { - FacadeConfig.instance.save(); + FacadeConfig.instance().save(); } } } @@ -183,7 +183,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte } final boolean defaultValue = ( b.isFullyOpaque( blockState ) && hasSimpleModel( blockState ) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; - if( FacadeConfig.instance.checkEnabled( b, metadata, defaultValue ) ) + if( FacadeConfig.instance().checkEnabled( b, metadata, defaultValue ) ) { if( returnItem ) { diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index 8cb282d87..af6eb7bea 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -79,9 +79,9 @@ import appeng.util.Platform; public enum PartType { - InvalidType( -1, "invalid" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), null ), + InvalidType( -1, "invalid", EnumSet.of( AEFeature.CORE ), EnumSet.noneOf( IntegrationType.class ), null ), - CableGlass( 0, "cable_glass" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableGlass.class ) + CableGlass( 0, "cable_glass", EnumSet.of( AEFeature.GLASS_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableGlass.class ) { @Override public boolean isCable() @@ -95,11 +95,11 @@ public enum PartType { return Arrays.stream( AEColor.values() ) .map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ) - .collect( Collectors.toList()); + .collect( Collectors.toList() ); } }, - CableCovered( 20, "cable_covered" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableCovered.class ) + CableCovered( 20, "cable_covered", EnumSet.of( AEFeature.COVERED_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableCovered.class ) { @Override public boolean isCable() @@ -113,11 +113,11 @@ public enum PartType { return Arrays.stream( AEColor.values() ) .map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ) - .collect( Collectors.toList()); + .collect( Collectors.toList() ); } }, - CableSmart( 40, "cable_smart" , EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) + CableSmart( 40, "cable_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.SMART_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) { @Override public boolean isCable() @@ -131,11 +131,11 @@ public enum PartType { return Arrays.stream( AEColor.values() ) .map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ) - .collect( Collectors.toList()); + .collect( Collectors.toList() ); } }, - CableDense( 60, "cable_dense" , EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartDenseCable.class ) + CableDense( 60, "cable_dense", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCable.class ) { @Override public boolean isCable() @@ -149,51 +149,56 @@ public enum PartType { return Arrays.stream( AEColor.values() ) .map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ) - .collect( Collectors.toList()); + .collect( Collectors.toList() ); } }, - ToggleBus( 80, "toggle_bus" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartToggleBus.class ), + ToggleBus( 80, "toggle_bus", EnumSet.of( AEFeature.TOGGLE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartToggleBus.class ), - InvertedToggleBus( 100, "inverted_toggle_bus" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInvertedToggleBus.class ), + InvertedToggleBus( 100, "inverted_toggle_bus", EnumSet.of( AEFeature.TOGGLE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartInvertedToggleBus.class ), - CableAnchor( 120, "cable_anchor" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableAnchor.class ), + CableAnchor( 120, "cable_anchor", EnumSet.of( AEFeature.CABLE_ANCHOR ), EnumSet.noneOf( IntegrationType.class ), PartCableAnchor.class ), - QuartzFiber( 140, "quartz_fiber" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartQuartzFiber.class ), + QuartzFiber( 140, "quartz_fiber", EnumSet.of( AEFeature.QUARTZ_FIBER ), EnumSet.noneOf( IntegrationType.class ), PartQuartzFiber.class ), - Monitor( 160, "monitor" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartPanel.class ), + Monitor( 160, "monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartPanel.class ), - SemiDarkMonitor( 180, "semi_dark_monitor" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartSemiDarkPanel.class ), + SemiDarkMonitor( 180, "semi_dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartSemiDarkPanel.class ), - DarkMonitor( 200, "dark_monitor" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartDarkPanel.class ), + DarkMonitor( 200, "dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartDarkPanel.class ), - StorageBus( 220, "storage_bus" , EnumSet.of( AEFeature.StorageBus ), EnumSet.noneOf( IntegrationType.class ), PartStorageBus.class ), + StorageBus( 220, "storage_bus", EnumSet.of( AEFeature.STORAGE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartStorageBus.class ), - ImportBus( 240, "import_bus" , EnumSet.of( AEFeature.ImportBus ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ), + ImportBus( 240, "import_bus", EnumSet.of( AEFeature.IMPORT_BUS ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ), - ExportBus( 260, "export_bus" , EnumSet.of( AEFeature.ExportBus ), EnumSet.noneOf( IntegrationType.class ), PartExportBus.class ), + ExportBus( 260, "export_bus", EnumSet.of( AEFeature.EXPORT_BUS ), EnumSet.noneOf( IntegrationType.class ), PartExportBus.class ), - LevelEmitter( 280, "level_emitter" , EnumSet.of( AEFeature.LevelEmitter ), EnumSet.noneOf( IntegrationType.class ), PartLevelEmitter.class ), + LevelEmitter( 280, "level_emitter", EnumSet.of( AEFeature.LEVEL_EMITTER ), EnumSet.noneOf( IntegrationType.class ), PartLevelEmitter.class ), - AnnihilationPlane( 300, "annihilation_plane" , EnumSet.of( AEFeature.AnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartAnnihilationPlane.class ), + AnnihilationPlane( 300, "annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE ), EnumSet + .noneOf( IntegrationType.class ), PartAnnihilationPlane.class ), - IdentityAnnihilationPlane( 301, "identity_annihilation_plane" , EnumSet.of( AEFeature.AnnihilationPlane, AEFeature.IdentityAnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ), + IdentityAnnihilationPlane( 301, "identity_annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE, AEFeature.IDENTITY_ANNIHILATION_PLANE ), EnumSet + .noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ), - FormationPlane( 320, "formation_plane" , EnumSet.of( AEFeature.FormationPlane ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ), + FormationPlane( 320, "formation_plane", EnumSet.of( AEFeature.FORMATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ), - PatternTerminal( 340, "pattern_terminal" , EnumSet.of( AEFeature.Patterns ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), + PatternTerminal( 340, "pattern_terminal", EnumSet.of( AEFeature.PATTERNS ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), - CraftingTerminal( 360, "crafting_terminal" , EnumSet.of( AEFeature.CraftingTerminal ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ), + CraftingTerminal( 360, "crafting_terminal", EnumSet.of( AEFeature.CRAFTING_TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ), - Terminal( 380, "terminal" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ), + Terminal( 380, "terminal", EnumSet.of( AEFeature.TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ), - StorageMonitor( 400, "storage_monitor" , EnumSet.of( AEFeature.StorageMonitor ), EnumSet.noneOf( IntegrationType.class ), PartStorageMonitor.class ), + StorageMonitor( 400, "storage_monitor", EnumSet.of( AEFeature.STORAGE_MONITOR ), EnumSet.noneOf( IntegrationType.class ), PartStorageMonitor.class ), - ConversionMonitor( 420, "conversion_monitor" , EnumSet.of( AEFeature.PartConversionMonitor ), EnumSet.noneOf( IntegrationType.class ), PartConversionMonitor.class ), + ConversionMonitor( 420, "conversion_monitor", EnumSet.of( AEFeature.PART_CONVERSION_MONITOR ), EnumSet + .noneOf( IntegrationType.class ), PartConversionMonitor.class ), - Interface( 440, "interface" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ), + Interface( 440, "interface", EnumSet.of( AEFeature.INTERFACE ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ), - P2PTunnelME( 460, "p2p_tunnel_me" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelME ), EnumSet.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel ) { + P2PTunnelME( 460, "p2p_tunnel_me", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ME ), EnumSet + .noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel ) + { @Override String getUnlocalizedName() { @@ -201,7 +206,9 @@ public enum PartType } }, - P2PTunnelRedstone( 461, "p2p_tunnel_redstone" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRedstone ), EnumSet.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel ) { + P2PTunnelRedstone( 461, "p2p_tunnel_redstone", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_REDSTONE ), EnumSet + .noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel ) + { @Override String getUnlocalizedName() { @@ -209,7 +216,9 @@ public enum PartType } }, - P2PTunnelItems( 462, "p2p_tunnel_items" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelItems ), EnumSet.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel ) { + P2PTunnelItems( 462, "p2p_tunnel_items", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ITEMS ), EnumSet + .noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel ) + { @Override String getUnlocalizedName() { @@ -217,7 +226,9 @@ public enum PartType } }, - P2PTunnelLiquids( 463, "p2p_tunnel_liquids" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLiquids ), EnumSet.noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ) { + P2PTunnelLiquids( 463, "p2p_tunnel_liquids", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_LIQUIDS ), EnumSet + .noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ) + { @Override String getUnlocalizedName() { @@ -225,20 +236,22 @@ public enum PartType } }, - P2PTunnelEU( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelEU ), EnumSet.of( IntegrationType.IC2 ), - PartP2PIC2Power.class, GuiText.EUTunnel ) - { - @Override - String getUnlocalizedName() - { - return "P2PTunnel"; - } - }, + P2PTunnelEU( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_EU ), EnumSet + .of( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel ) + { + @Override + String getUnlocalizedName() + { + return "P2PTunnel"; + } + }, // P2PTunnelRF( 466, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRF ), EnumSet.of( IntegrationType.RF ), // PartP2PRFPower.class, GuiText.RFTunnel ), - P2PTunnelLight( 467, "p2p_tunnel_light" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLight ), EnumSet.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ) { + P2PTunnelLight( 467, "p2p_tunnel_light", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_LIGHT ), EnumSet + .noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ) + { @Override String getUnlocalizedName() { @@ -249,7 +262,8 @@ public enum PartType // P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of( // IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ), - InterfaceTerminal( 480, "interface_terminal" , EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class ); + InterfaceTerminal( 480, "interface_terminal", EnumSet.of( AEFeature.INTERFACE_TERMINAL ), EnumSet + .noneOf( IntegrationType.class ), PartInterfaceTerminal.class ); private final int baseDamage; private final Set features; @@ -276,8 +290,8 @@ public enum PartType this.extraName = en; // The part is enabled if all features + integrations it needs are enabled - this.enabled = features.stream().allMatch( AEConfig.instance::isFeatureEnabled ) - && integrations.stream().allMatch( IntegrationRegistry.INSTANCE::isEnabled ); + this.enabled = features.stream().allMatch( AEConfig.instance()::isFeatureEnabled ) && integrations.stream() + .allMatch( IntegrationRegistry.INSTANCE::isEnabled ); if( enabled ) { @@ -348,7 +362,8 @@ public enum PartType return this.myPart; } - String getUnlocalizedName() { + String getUnlocalizedName() + { return name(); } @@ -378,5 +393,4 @@ public enum PartType return models; } - } diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index d60fef290..4c7fc2be2 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -296,6 +296,6 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe @Override public boolean hasContainerItem( final ItemStack stack ) { - return AEConfig.instance.isFeatureEnabled( AEFeature.EnableDisassemblyCrafting ); + return AEConfig.instance().isFeatureEnabled( AEFeature.ENABLE_DISASSEMBLY_CRAFTING ); } } diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index 51d9c57ba..b510a13af 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -122,7 +122,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / if( Platform.isClient() ) { - NetworkHandler.instance.sendToServer( new PacketClick( pos, side, hitX, hitY, hitZ, hand ) ); + NetworkHandler.instance().sendToServer( new PacketClick( pos, side, hitX, hitY, hitZ, hand ) ); } return EnumActionResult.SUCCESS; diff --git a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java index 6058dd0af..f08f37648 100644 --- a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java +++ b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java @@ -36,7 +36,7 @@ public class ToolChargedStaff extends AEBasePoweredItem public ToolChargedStaff() { - super( AEConfig.instance.chargedStaffBattery ); + super( AEConfig.instance().getChargedStaffBattery() ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index dacacbe4d..61a71bd43 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -100,7 +100,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe public ToolColorApplicator() { - super( AEConfig.instance.colorApplicatorBattery ); + super( AEConfig.instance().getColorApplicatorBattery() ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 9aa5b1ab5..ec4b00464 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -61,7 +61,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT public ToolEntropyManipulator() { - super( AEConfig.instance.entropyManipulatorBattery ); + super( AEConfig.instance().getEntropyManipulatorBattery() ); this.heatUp = new HashMap(); this.coolDown = new HashMap(); diff --git a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java index 0b675d3c3..cd2729bc1 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java @@ -84,7 +84,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell public ToolMatterCannon() { - super( AEConfig.instance.matterCannonBattery ); + super( AEConfig.instance().getMatterCannonBattery() ); } @Override @@ -271,7 +271,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell } pos.entityHit.attackEntityFrom( DamageSource.causePlayerDamage( p ), 0 ); - NetworkHandler.instance.sendToAll( marker.getPacket() ); + NetworkHandler.instance().sendToAll( marker.getPacket() ); } else if( pos.typeOfHit == RayTraceResult.Type.BLOCK ) { @@ -401,7 +401,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell } else if( pos.typeOfHit == RayTraceResult.Type.BLOCK ) { - if( !AEConfig.instance.isFeatureEnabled( AEFeature.MassCannonBlockDamage ) ) + if( !AEConfig.instance().isFeatureEnabled( AEFeature.MASS_CANNON_BLOCK_DAMAGE ) ) { penetration = 0; } diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 4ef486e8f..7423b5ca9 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -60,7 +60,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, { public ToolPortableCell() { - super( AEConfig.instance.portableCellBattery ); + super( AEConfig.instance().getPortableCellBattery() ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 3117196b1..96e012a41 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -52,7 +52,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless public ToolWirelessTerminal() { - super( AEConfig.instance.wirelessTerminalBattery ); + super( AEConfig.instance().getWirelessTerminalBattery() ); } @Override diff --git a/src/main/java/appeng/loot/ChestLoot.java b/src/main/java/appeng/loot/ChestLoot.java index ef09d8650..7bf26dcca 100644 --- a/src/main/java/appeng/loot/ChestLoot.java +++ b/src/main/java/appeng/loot/ChestLoot.java @@ -79,7 +79,7 @@ public class ChestLoot new LootCondition[0], new RandomValueRange( 1, 4 ), new RandomValueRange( 0, 2 ), - "AE2 Dusts" + "AE2 DUSTS" ) ); } ); diff --git a/src/main/java/appeng/me/GridConnection.java b/src/main/java/appeng/me/GridConnection.java index 399b1eefa..cd7b0c6b8 100644 --- a/src/main/java/appeng/me/GridConnection.java +++ b/src/main/java/appeng/me/GridConnection.java @@ -62,7 +62,7 @@ public class GridConnection implements IGridConnection, IPathItem if( Platform.securityCheck( a, b ) ) { - if( AEConfig.instance.isFeatureEnabled( AEFeature.LogSecurityAudits ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.LOG_SECURITY_AUDITS ) ) { final DimensionalCoord aCoordinates = a.getGridBlock().getLocation(); final DimensionalCoord bCoordinates = b.getGridBlock().getLocation(); diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index f2cb082aa..74e6afc51 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -99,7 +99,7 @@ public class PathGridCache implements IPathingGrid this.updateNetwork = false; this.setChannelsInUse( 0 ); - if( !AEConfig.instance.isFeatureEnabled( AEFeature.Channels ) ) + if( !AEConfig.instance().isFeatureEnabled( AEFeature.CHANNELS ) ) { final int used = this.calculateRequiredChannels(); @@ -339,7 +339,7 @@ public class PathGridCache implements IPathingGrid private void achievementPost() { - if( this.lastChannels != this.getChannelsInUse() && AEConfig.instance.isFeatureEnabled( AEFeature.Channels ) ) + if( this.lastChannels != this.getChannelsInUse() && AEConfig.instance().isFeatureEnabled( AEFeature.CHANNELS ) ) { final Achievements currentBracket = this.getAchievementBracket( this.getChannelsInUse() ); final Achievements lastBracket = this.getAchievementBracket( this.lastChannels ); diff --git a/src/main/java/appeng/me/cache/SpatialPylonCache.java b/src/main/java/appeng/me/cache/SpatialPylonCache.java index 61e25f0d2..77827c018 100644 --- a/src/main/java/appeng/me/cache/SpatialPylonCache.java +++ b/src/main/java/appeng/me/cache/SpatialPylonCache.java @@ -159,8 +159,8 @@ public class SpatialPylonCache implements ISpatialCache this.efficiency = 0.0; } - minPower = (double) reqX * (double) reqY * reqZ * AEConfig.instance.spatialPowerMultiplier; - maxPower = Math.pow( minPower, AEConfig.instance.spatialPowerExponent ); + minPower = (double) reqX * (double) reqY * reqZ * AEConfig.instance().getSpatialPowerMultiplier(); + maxPower = Math.pow( minPower, AEConfig.instance().getSpatialPowerExponent() ); } final double affective_efficiency = Math.pow( this.efficiency, 0.25 ); diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index b6b2eeb4c..72e183e71 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/src/main/java/appeng/me/storage/CellInventory.java @@ -470,7 +470,7 @@ public class CellInventory implements ICellInventory } catch( Throwable ex ) { - if( AEConfig.instance.removeCrashingItemsOnLoad ) + if( AEConfig.instance().isRemoveCrashingItemsOnLoad() ) { AELog.warn( ex, "Removing item " + compoundTag + " from storage cell because loading the ItemStack crashed." ); return; @@ -488,7 +488,7 @@ public class CellInventory implements ICellInventory } catch( Throwable ex ) { - if( AEConfig.instance.removeCrashingItemsOnLoad ) + if( AEConfig.instance().isRemoveCrashingItemsOnLoad() ) { AELog.warn( ex, "Removing item " + t + " from storage cell because processing the loaded item crashed." ); return; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index cbcd62250..40d15d798 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -134,7 +134,7 @@ public class PartPlacement else { player.swingArm( hand ); - NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); + NetworkHandler.instance().sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); } return EnumActionResult.SUCCESS; } @@ -186,7 +186,7 @@ public class PartPlacement else { player.swingArm( hand ); - NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); + NetworkHandler.instance().sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); return EnumActionResult.SUCCESS; } } @@ -212,7 +212,7 @@ public class PartPlacement { if( world.isRemote ) { - NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); + NetworkHandler.instance().sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); } return EnumActionResult.SUCCESS; } @@ -275,7 +275,7 @@ public class PartPlacement else { player.swingArm( hand ); - NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); + NetworkHandler.instance().sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); return EnumActionResult.SUCCESS; } } @@ -431,7 +431,7 @@ public class PartPlacement if( event.getEntityPlayer().isSneaking() && held != null && supportedItem ) { - NetworkHandler.instance.sendToServer( new PacketClick( event.getPos(), event.getFace(), 0, 0, 0, event.getHand() ) ); + NetworkHandler.instance().sendToServer( new PacketClick( event.getPos(), event.getFace(), 0, 0, 0, event.getHand() ) ); } } } diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index dac61470a..0a4738155 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -529,7 +529,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine * } */ - if( sum < AEConfig.instance.formationPlaneEntityLimit ) + if( sum < AEConfig.instance().getFormationPlaneEntityLimit() ) { if( type == Actionable.MODULATE ) { diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 9abc69816..4657633e2 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -422,7 +422,7 @@ public class RecipeHandler implements IRecipeHandler AELog.info( "Recipes Loading: " + e.getKey().getSimpleName() + ": " + e.getValue() + " loaded." ); } - if( AEConfig.instance.isFeatureEnabled( AEFeature.WebsiteRecipes ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.WEBSITE_RECIPES ) ) { try { diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index 9238a3876..92f2650b8 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -109,7 +109,7 @@ public class ServerHelper extends CommonHelper if( dX * dX + dY * dY + dZ * dZ < dist * dist ) { - NetworkHandler.instance.sendTo( packet, entityplayermp ); + NetworkHandler.instance().sendTo( packet, entityplayermp ); } } } diff --git a/src/main/java/appeng/server/subcommands/ChunkLogger.java b/src/main/java/appeng/server/subcommands/ChunkLogger.java index 5c1d05664..58fb35911 100644 --- a/src/main/java/appeng/server/subcommands/ChunkLogger.java +++ b/src/main/java/appeng/server/subcommands/ChunkLogger.java @@ -49,7 +49,7 @@ public class ChunkLogger implements ISubCommand private void displayStack() { - if( AEConfig.instance.isFeatureEnabled( AEFeature.ChunkLoggerTrace ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.CHUNK_LOGGER_TRACE ) ) { boolean output = false; for( final StackTraceElement e : Thread.currentThread().getStackTrace() ) diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index 13bd9717a..7009fbfd6 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -511,7 +511,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade { final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimension(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32 ); final IAEItemStack item = AEItemStack.create( output ); - NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( this.pos, (byte) speed, item ), where ); + NetworkHandler.instance().sendToAllAround( new PacketAssemblerAnimation( this.pos, (byte) speed, item ), where ); } catch( final IOException e ) { diff --git a/src/main/java/appeng/tile/networking/TileWireless.java b/src/main/java/appeng/tile/networking/TileWireless.java index 42ef8b907..3a198798e 100644 --- a/src/main/java/appeng/tile/networking/TileWireless.java +++ b/src/main/java/appeng/tile/networking/TileWireless.java @@ -163,7 +163,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi private void updatePower() { - this.getProxy().setIdlePowerUsage( AEConfig.instance.wireless_getPowerDrain( this.getBoosters() ) ); + this.getProxy().setIdlePowerUsage( AEConfig.instance().wireless_getPowerDrain( this.getBoosters() ) ); } private int getBoosters() @@ -181,7 +181,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi @Override public double getRange() { - return AEConfig.instance.wireless_getMaxRange( this.getBoosters() ); + return AEConfig.instance().wireless_getMaxRange( this.getBoosters() ); } @Override diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 9568de21a..f9b8108ae 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -186,7 +186,7 @@ public class Platform { double p = ( (double) n ) / 100; - final PowerUnits displayUnits = AEConfig.instance.selectedPowerUnit(); + final PowerUnits displayUnits = AEConfig.instance().selectedPowerUnit(); p = PowerUnits.AE.convertTo( displayUnits, p ); final String[] preFixes = { "k", "M", "G", "T", "P", "T", "P", "E", "Z", "Y" }; @@ -1489,7 +1489,7 @@ public class Platform final boolean a_isSecure = isPowered( a.getGrid() ) && a.getLastSecurityKey() != -1; final boolean b_isSecure = isPowered( b.getGrid() ) && b.getLastSecurityKey() != -1; - if( AEConfig.instance.isFeatureEnabled( AEFeature.LogSecurityAudits ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.LOG_SECURITY_AUDITS ) ) { AELog.info( "Audit: " + a_isSecure + " : " + b_isSecure + " @ " + a.getLastSecurityKey() + " vs " + b.getLastSecurityKey() + " & " + a.getPlayerID() + " vs " + b.getPlayerID() ); } @@ -1723,14 +1723,14 @@ public class Platform return false; } - if( type == AEFeature.CertusQuartzTools ) + if( type == AEFeature.CERTUS_QUARTZ_TOOLS ) { final IItemDefinition certusQuartzCrystal = AEApi.instance().definitions().materials().certusQuartzCrystal(); return certusQuartzCrystal.isSameAs( b ); } - if( type == AEFeature.NetherQuartzTools ) + if( type == AEFeature.NETHER_QUARTZ_TOOLS ) { return Items.QUARTZ == b.getItem(); } diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index 47fb38557..1ba38ece9 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -218,7 +218,7 @@ public final class MeteoritePlacer // spawn meteor this.skyStoneDefinition.maybeBlock().ifPresent( block -> placeMeteoriteSkyStone( w, x, y, z, block ) ); - if( AEConfig.instance.isFeatureEnabled( AEFeature.SpawnPressesInMeteorites ) ) + if( AEConfig.instance().isFeatureEnabled( AEFeature.SPAWN_PRESSES_IN_METEORITES ) ) { this.skyChestDefinition.maybeBlock().ifPresent( block -> this.putter.put( w, x, y, z, block ) ); diff --git a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java index 89dc87595..c312d2264 100644 --- a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java +++ b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java @@ -44,19 +44,11 @@ public final class MeteoriteWorldGen implements IWorldGenerator { if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.METEORITES, w ) ) { - // add new meteorites? - if( r.nextFloat() < AEConfig.instance.meteoriteSpawnChance ) - { - final int x = r.nextInt( 16 ) + ( chunkX << 4 ); - final int z = r.nextInt( 16 ) + ( chunkZ << 4 ); + final int x = r.nextInt( 16 ) + ( chunkX << 4 ); + final int z = r.nextInt( 16 ) + ( chunkZ << 4 ); + final int depth = AEConfig.instance().getMeteoriteMaximumSpawnHeight() + r.nextInt( 20 ); - final int depth = 180 + r.nextInt( 20 ); - TickHandler.INSTANCE.addCallable( w, new MeteoriteSpawn( x, depth, z ) ); - } - else - { - TickHandler.INSTANCE.addCallable( w, new MeteoriteSpawn( chunkX << 4, 128, chunkZ << 4 ) ); - } + TickHandler.INSTANCE.addCallable( w, new MeteoriteSpawn( x, depth, z ) ); } else { @@ -79,7 +71,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator { for( int cz = pz - 6; cz < pz + 6; cz++ ) { - if( w.getChunkProvider().getLoadedChunk( cx, cz ) != null) + if( w.getChunkProvider().getLoadedChunk( cx, cz ) != null ) { if( px == cx && pz == cz ) { @@ -144,9 +136,9 @@ public final class MeteoriteWorldGen implements IWorldGenerator minSqDist = Math.min( minSqDist, mp.getSqDistance( this.x, this.z ) ); } - final boolean isCluster = ( minSqDist < 30 * 30 ) && Platform.getRandomFloat() < AEConfig.instance.meteoriteClusterChance; + final boolean isCluster = ( minSqDist < 30 * 30 ) && Platform.getRandomFloat() < AEConfig.instance().getMeteoriteClusterChance(); - if( minSqDist > AEConfig.instance.minMeteoriteDistanceSq || isCluster ) + if( minSqDist > AEConfig.instance().getMinMeteoriteDistanceSq() || isCluster ) { MeteoriteWorldGen.this.tryMeteorite( world, this.depth, this.x, this.z ); } diff --git a/src/main/java/appeng/worldgen/QuartzWorldGen.java b/src/main/java/appeng/worldgen/QuartzWorldGen.java index 6aa8a8ed2..7c1fd4ff2 100644 --- a/src/main/java/appeng/worldgen/QuartzWorldGen.java +++ b/src/main/java/appeng/worldgen/QuartzWorldGen.java @@ -51,8 +51,8 @@ public final class QuartzWorldGen implements IWorldGenerator final Block ore = oreDefinition.maybeBlock().orElse( null ); final Block charged = chargedDefinition.maybeBlock().orElse( null ); - this.oreNormal = new WorldGenMinable( ore.getDefaultState(), AEConfig.instance.quartzOresPerCluster ); - this.oreCharged = new WorldGenMinable( charged.getDefaultState(), AEConfig.instance.quartzOresPerCluster ); + this.oreNormal = new WorldGenMinable( ore.getDefaultState(), AEConfig.instance().getQuartzOresPerCluster() ); + this.oreCharged = new WorldGenMinable( charged.getDefaultState(), AEConfig.instance().getQuartzOresPerCluster() ); } @Override @@ -72,12 +72,12 @@ public final class QuartzWorldGen implements IWorldGenerator return; } - final double oreDepthMultiplier = AEConfig.instance.quartzOresClusterAmount * seaLevel / 64; + final double oreDepthMultiplier = AEConfig.instance().getQuartzOresClusterAmount() * seaLevel / 64; final int scale = (int) Math.round( r.nextGaussian() * Math.sqrt( oreDepthMultiplier ) + oreDepthMultiplier ); for( int x = 0; x < ( r.nextBoolean() ? scale * 2 : scale ) / 2; ++x ) { - final boolean isCharged = r.nextFloat() > AEConfig.instance.spawnChargedChance; + final boolean isCharged = r.nextFloat() > AEConfig.instance().getSpawnChargedChance(); final WorldGenMinable whichOre = isCharged ? this.oreCharged : this.oreNormal; if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( isCharged ? WorldGenType.CHARGED_CERTUS_QUARTZ : WorldGenType.CERTUS_QUARTZ, w ) )