diff --git a/gradle.properties b/gradle.properties index 8d267819e..3bd131d15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ aebuild=7 aegroup=appeng aebasename=appliedenergistics2 extended=extended_life -extendedversion=v51k +extendedversion=v0.52.1 ######################################################### # Versions # ######################################################### diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 053e922d7..08dfe0a3c 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -359,16 +359,16 @@ public final class ApiBlocks implements IBlocks this.tinyTNT = registry.block( "tiny_tnt", BlockTinyTNT::new ) .features( AEFeature.TINY_TNT ) .bootstrap( ( block, item ) -> (IPreInitComponent) side -> BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( item, - new DispenserBehaviorTinyTNT() ) ) + new DispenserBehaviorTinyTNT() ) ) .bootstrap( ( block, item ) -> (IEntityRegistrationComponent) r -> { r.register( EntityEntryBuilder.create() - .entity( EntityTinyTNTPrimed.class ) - .id( new ResourceLocation( "appliedenergistics2", EntityTinyTNTPrimed.class.getName() ), - EntityIds.get( EntityTinyTNTPrimed.class ) ) - .name( "EntityTinyTNTPrimed" ) - .tracker( 16, 4, true ) - .build() ); + .entity( EntityTinyTNTPrimed.class ) + .id( new ResourceLocation( "appliedenergistics2", EntityTinyTNTPrimed.class.getName() ), + EntityIds.get( EntityTinyTNTPrimed.class ) ) + .name( "EntityTinyTNTPrimed" ) + .tracker( 16, 4, true ) + .build() ); } ) .build(); this.securityStation = registry.block( "security_station", BlockSecurityStation::new ) @@ -397,7 +397,6 @@ public final class ApiBlocks implements IBlocks .tileEntity( new TileEntityDefinition( TileSpatialIOPort.class ) ) .build(); this.controller = registry.block( "controller", BlockController::new ) - .features( AEFeature.CHANNELS ) .tileEntity( new TileEntityDefinition( TileController.class ) ) .useCustomItemModel() .rendering( new ControllerRendering() ) @@ -635,7 +634,7 @@ public final class ApiBlocks implements IBlocks } ) .build(); - Verify.verify(stairs.maybeBlock().isPresent()); + Verify.verify( stairs.maybeBlock().isPresent() ); return stairs; } diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index 2c2654748..295668606 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -105,7 +105,7 @@ public enum PartType } }, - CABLE_SMART( 40, "cable_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.SMART_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) + CABLE_SMART( 40, "cable_smart", EnumSet.of( AEFeature.SMART_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) { @Override public boolean isCable() @@ -121,7 +121,7 @@ public enum PartType } }, - CABLE_DENSE_SMART( 60, "cable_dense_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCableSmart.class ) + CABLE_DENSE_SMART( 60, "cable_dense_smart", EnumSet.of( AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCableSmart.class ) { @Override public boolean isCable() @@ -137,7 +137,7 @@ public enum PartType } }, - CABLE_DENSE_COVERED( 500, "cable_dense_covered", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCableCovered.class ) + CABLE_DENSE_COVERED( 500, "cable_dense_covered", EnumSet.of( AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCableCovered.class ) { @Override public boolean isCable()