feat: more customization

This commit is contained in:
Timo Ley 2023-02-01 17:15:49 +01:00
parent 19ee5f4088
commit 20858b2b9f
8 changed files with 26 additions and 9 deletions

View File

@ -1,6 +1,6 @@
aeversion=rv3 aeversion=rv3
aechannel=beta aechannel=beta
aebuild=19 aebuild=20
aegroup=appeng aegroup=appeng
aebasename=appliedenergistics2 aebasename=appliedenergistics2

View File

@ -156,6 +156,11 @@ public interface IBlocks {
ITileDefinition energyCellCreative(); ITileDefinition energyCellCreative();
/*
* legacy
*/
ITileDefinition legacyController();
// rv1 // rv1
ITileDefinition craftingUnit(); ITileDefinition craftingUnit();

View File

@ -26,7 +26,7 @@ public class BlockTransitionPlane extends AEBaseTileBlock {
super(Material.iron); super(Material.iron);
this.isOpaque = true; this.isOpaque = true;
this.setTileEntity(TileTransitionPlane.class); this.setTileEntity(TileTransitionPlane.class);
this.setFeature(EnumSet.of(AEFeature.Legacy)); this.setFeature(EnumSet.of(AEFeature.Legacy, AEFeature.Experimental));
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View File

@ -35,7 +35,7 @@ public class BlockController extends AEBaseTileBlock {
super(Material.iron); super(Material.iron);
this.setTileEntity(TileController.class); this.setTileEntity(TileController.class);
this.setHardness(6); this.setHardness(6);
this.setFeature(EnumSet.of(AEFeature.Core)); this.setFeature(EnumSet.of(AEFeature.Controller));
} }
@Override @Override

View File

@ -50,6 +50,7 @@ public final class CreativeTab extends CreativeTabs {
return this.findFirst( return this.findFirst(
blocks.controller(), blocks.controller(),
blocks.legacyController(),
blocks.chest(), blocks.chest(),
blocks.cellWorkbench(), blocks.cellWorkbench(),
blocks.fluix(), blocks.fluix(),

View File

@ -685,4 +685,9 @@ public final class ApiBlocks implements IBlocks {
public Set<IOrientableBlock> orientables() { public Set<IOrientableBlock> orientables() {
return this.orientables; return this.orientables;
} }
@Override
public ITileDefinition legacyController() {
return this.legacyController;
}
} }

View File

@ -66,6 +66,7 @@ public enum AEFeature {
QuantumNetworkBridge(Constants.CATEGORY_NETWORK_FEATURES), QuantumNetworkBridge(Constants.CATEGORY_NETWORK_FEATURES),
Channels(Constants.CATEGORY_NETWORK_FEATURES), Channels(Constants.CATEGORY_NETWORK_FEATURES),
Legacy(Constants.CATEGORY_NETWORK_FEATURES), Legacy(Constants.CATEGORY_NETWORK_FEATURES),
Controller(Constants.CATEGORY_NETWORK_FEATURES),
LevelEmitter(Constants.CATEGORY_NETWORK_BUSES), LevelEmitter(Constants.CATEGORY_NETWORK_BUSES),
CraftingTerminal(Constants.CATEGORY_NETWORK_BUSES), CraftingTerminal(Constants.CATEGORY_NETWORK_BUSES),
@ -78,6 +79,10 @@ public enum AEFeature {
ExportBus(Constants.CATEGORY_NETWORK_BUSES), ExportBus(Constants.CATEGORY_NETWORK_BUSES),
StorageBus(Constants.CATEGORY_NETWORK_BUSES), StorageBus(Constants.CATEGORY_NETWORK_BUSES),
PartConversionMonitor(Constants.CATEGORY_NETWORK_BUSES), PartConversionMonitor(Constants.CATEGORY_NETWORK_BUSES),
PartPatternTerminal(Constants.CATEGORY_NETWORK_BUSES),
PartTerminal(Constants.CATEGORY_NETWORK_BUSES),
PartMonitor(Constants.CATEGORY_NETWORK_BUSES),
QuartzFiber(Constants.CATEGORY_NETWORK_BUSES),
PortableCell(Constants.CATEGORY_PORTABLE_CELL), PortableCell(Constants.CATEGORY_PORTABLE_CELL),
@ -119,6 +124,7 @@ public enum AEFeature {
CraftingLog(Constants.CATEGORY_MISC, false), CraftingLog(Constants.CATEGORY_MISC, false),
LightDetector(Constants.CATEGORY_MISC), LightDetector(Constants.CATEGORY_MISC),
DebugLogging(Constants.CATEGORY_MISC, false), DebugLogging(Constants.CATEGORY_MISC, false),
Experimental(Constants.CATEGORY_MISC, false),
EnableFacadeCrafting(Constants.CATEGORY_CRAFTING), EnableFacadeCrafting(Constants.CATEGORY_CRAFTING),
InWorldSingularity(Constants.CATEGORY_CRAFTING), InWorldSingularity(Constants.CATEGORY_CRAFTING),

View File

@ -109,28 +109,28 @@ public enum PartType {
QuartzFiber( QuartzFiber(
140, 140,
EnumSet.of(AEFeature.Core), EnumSet.of(AEFeature.QuartzFiber),
EnumSet.noneOf(IntegrationType.class), EnumSet.noneOf(IntegrationType.class),
PartQuartzFiber.class PartQuartzFiber.class
), ),
Monitor( Monitor(
160, 160,
EnumSet.of(AEFeature.Core), EnumSet.of(AEFeature.PartMonitor),
EnumSet.noneOf(IntegrationType.class), EnumSet.noneOf(IntegrationType.class),
PartPanel.class PartPanel.class
), ),
SemiDarkMonitor( SemiDarkMonitor(
180, 180,
EnumSet.of(AEFeature.Core), EnumSet.of(AEFeature.PartMonitor),
EnumSet.noneOf(IntegrationType.class), EnumSet.noneOf(IntegrationType.class),
PartSemiDarkPanel.class PartSemiDarkPanel.class
), ),
DarkMonitor( DarkMonitor(
200, 200,
EnumSet.of(AEFeature.Core), EnumSet.of(AEFeature.PartMonitor),
EnumSet.noneOf(IntegrationType.class), EnumSet.noneOf(IntegrationType.class),
PartDarkPanel.class PartDarkPanel.class
), ),
@ -186,7 +186,7 @@ public enum PartType {
PatternTerminal( PatternTerminal(
340, 340,
EnumSet.of(AEFeature.Patterns), EnumSet.of(AEFeature.Patterns, AEFeature.PartPatternTerminal),
EnumSet.noneOf(IntegrationType.class), EnumSet.noneOf(IntegrationType.class),
PartPatternTerminal.class PartPatternTerminal.class
), ),
@ -200,7 +200,7 @@ public enum PartType {
Terminal( Terminal(
380, 380,
EnumSet.of(AEFeature.Core), EnumSet.of(AEFeature.PartTerminal),
EnumSet.noneOf(IntegrationType.class), EnumSet.noneOf(IntegrationType.class),
PartTerminal.class PartTerminal.class
), ),