fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format sourcecode

Browse Source
This commit is contained in:
yueh
2017-07-20 21:17:10 +02:00
parent 66437897be
commit 621910df91
295 changed files with 2142 additions and 1562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
+9 -8
View File
@@ -221,7 +221,8 @@ class BlockDefinitionBuilder implements IBlockBuilder
}
// Register the item and block with the game
factory.addPreInit( side -> {
factory.addPreInit( side ->
{
Registration.addBlockToRegister( block );
if( item != null )
{
@@ -231,16 +232,13 @@ class BlockDefinitionBuilder implements IBlockBuilder
block.setCreativeTab( creativeTab );
// Register all extra handlers
preInitCallbacks.forEach( consumer -> factory.addPreInit( side -> consumer.accept( block, item ) ) );
initCallbacks.forEach( consumer -> factory.addInit( side -> consumer.accept( block, item ) ) );
modelRegCallbacks.forEach(consumer -> factory.addModelReg(side -> consumer.accept( block, item ) ) );
modelRegCallbacks.forEach( consumer -> factory.addModelReg( side -> consumer.accept( block, item ) ) );
postInitCallbacks.forEach( consumer -> factory.addPostInit( side -> consumer.accept( block, item ) ) );
if ( tileEntityDefinition != null && block instanceof AEBaseTileBlock )
if( tileEntityDefinition != null && block instanceof AEBaseTileBlock )
{
( (AEBaseTileBlock) block ).setTileEntity( tileEntityDefinition.getTileEntityClass() );
if( tileEntityDefinition.getName() == null )
@@ -270,8 +268,11 @@ class BlockDefinitionBuilder implements IBlockBuilder
if( block instanceof AEBaseTileBlock )
{
factory.addPreInit( side -> {
AEBaseTile.registerTileItem( tileEntityDefinition == null ? ( (AEBaseTileBlock) block ).getTileEntityClass() : tileEntityDefinition.getTileEntityClass(), new BlockStackSrc( block, 0, ActivityState.Enabled ) );
factory.addPreInit( side ->
{
AEBaseTile.registerTileItem(
tileEntityDefinition == null ? ( (AEBaseTileBlock) block ).getTileEntityClass() : tileEntityDefinition.getTileEntityClass(),
new BlockStackSrc( block, 0, ActivityState.Enabled ) );
} );
if( tileEntityDefinition != null )
src/main/java/appeng/bootstrap/FeatureFactory.java
+2 -1
View File
@@ -99,7 +99,8 @@ public class FeatureFactory
{
ColoredItemDefinition definition = new ColoredItemDefinition();
target.maybeItem().ifPresent( targetItem -> {
target.maybeItem().ifPresent( targetItem ->
{
for( final AEColor color : AEColor.VALID_COLORS )
{
final ActivityState state = ActivityState.from( target.isEnabled() );
src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java
+3 -2
View File
@@ -165,13 +165,14 @@ class ItemDefinitionBuilder implements IItemBuilder
// Register all extra handlers
preInitCallbacks.forEach( consumer -> factory.addPreInit( side -> consumer.accept( item ) ) );
initCallbacks.forEach( consumer -> factory.addInit( side -> consumer.accept( item ) ) );
modelRegCallbacks.forEach(consumer -> factory.addModelReg(side -> consumer.accept( item ) ) );
modelRegCallbacks.forEach( consumer -> factory.addModelReg( side -> consumer.accept( item ) ) );
postInitCallbacks.forEach( consumer -> factory.addPostInit( side -> consumer.accept( item ) ) );
// Register custom dispenser behavior if requested
if( dispenserBehaviorSupplier != null )
{
factory.addPostInit( side -> {
factory.addPostInit( side ->
{
IBehaviorDispenseItem behavior = dispenserBehaviorSupplier.get();
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( item, behavior );
} );
src/main/java/appeng/bootstrap/components/ItemModelComponent.java
+2 -1
View File
@@ -52,7 +52,8 @@ public class ItemModelComponent implements InitComponent
{
ItemModelMesher itemMesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
modelsByMeta.forEach( ( meta, model ) -> {
modelsByMeta.forEach( ( meta, model ) ->
{
itemMesher.register( item, meta, model );
} );
}
src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class ModelOverrideComponent implements PreInitComponent
{
IRegistry<ModelResourceLocation, IBakedModel> modelRegistry = event.getModelRegistry();
Set<ModelResourceLocation> keys = Sets.newHashSet( modelRegistry.getKeys() );
// IBakedModel missingModel = modelRegistry.getObject( MODEL_MISSING );
// IBakedModel missingModel = modelRegistry.getObject( MODEL_MISSING );
IModel missingModel = ModelLoaderRegistry.getMissingModel();
for( ModelResourceLocation location : keys )
src/main/java/appeng/bootstrap/components/ModelRegComponent.java
+6 -2
View File
@@ -1,15 +1,19 @@
package appeng.bootstrap.components;
import appeng.bootstrap.IBootstrapComponent;
import net.minecraftforge.fml.relauncher.Side;
/**
* @author GuntherDW
*/
@FunctionalInterface
public interface ModelRegComponent extends IBootstrapComponent {
public interface ModelRegComponent extends IBootstrapComponent
{
void modelReg(Side side);
void modelReg( Side side );
}
src/main/java/appeng/bootstrap/components/StateMapperComponent.java
+2 -1
View File
@@ -50,7 +50,8 @@ public class StateMapperComponent implements ModelRegComponent
ModelLoader.setCustomStateMapper( block, stateMapper );
if( stateMapper instanceof IResourceManagerReloadListener )
{
( (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager() ).registerReloadListener( (IResourceManagerReloadListener) stateMapper );
( (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager() )
.registerReloadListener( (IResourceManagerReloadListener) stateMapper );
}
}
}
src/main/java/appeng/bootstrap/components/TesrComponent.java
+2 -2
View File
@@ -31,7 +31,7 @@ import appeng.tile.AEBaseTile;
*
* @param <T>
*/
//public class TesrComponent<T extends AEBaseTile> implements ModelRegComponent
// public class TesrComponent<T extends AEBaseTile> implements ModelRegComponent
public class TesrComponent<T extends AEBaseTile> implements PreInitComponent
{
@@ -46,7 +46,7 @@ public class TesrComponent<T extends AEBaseTile> implements PreInitComponent
}
@Override
// public void modelReg( Side side )
// public void modelReg( Side side )
public void preInitialize( Side side )
{
ClientRegistry.bindTileEntitySpecialRenderer( tileEntityClass, tesr );
src/main/java/appeng/bootstrap/components/TileEntityComponent.java
+26 -23
View File
@@ -1,5 +1,7 @@
package appeng.bootstrap.components;
import appeng.bootstrap.definitions.TileEntityDefinition;
import appeng.core.AppEng;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -8,35 +10,36 @@ import net.minecraftforge.fml.relauncher.Side;
import java.util.ArrayList;
import java.util.List;
/**
* @author GuntherDW
*/
public class TileEntityComponent implements PreInitComponent
{
private List<TileEntityDefinition> tileEntityDefinitions = new ArrayList<>();
private List<TileEntityDefinition> tileEntityDefinitions = new ArrayList<>();
public TileEntityComponent()
{
}
public TileEntityComponent()
{
}
public void addTileEntity( TileEntityDefinition tileEntityDefinition )
{
if( !tileEntityDefinitions.contains( tileEntityDefinition ) )
{
tileEntityDefinitions.add( tileEntityDefinition );
}
}
public void addTileEntity( TileEntityDefinition tileEntityDefinition )
{
if( !tileEntityDefinitions.contains( tileEntityDefinition ) )
{
tileEntityDefinitions.add( tileEntityDefinition );
}
}
@Override
public void preInitialize( Side side )
{
for( TileEntityDefinition tileEntityDefinition : tileEntityDefinitions )
{
if ( !tileEntityDefinition.isRegistered() )
{
GameRegistry.registerTileEntity( tileEntityDefinition.getTileEntityClass(), AppEng.MOD_ID + ":" + tileEntityDefinition.getName() );
tileEntityDefinition.setRegistered( true );
}
}
}
@Override
public void preInitialize( Side side )
{
for( TileEntityDefinition tileEntityDefinition : tileEntityDefinitions )
{
if( !tileEntityDefinition.isRegistered() )
{
GameRegistry.registerTileEntity( tileEntityDefinition.getTileEntityClass(), AppEng.MOD_ID + ":" + tileEntityDefinition.getName() );
tileEntityDefinition.setRegistered( true );
}
}
}
}
src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java
+36 -34
View File
@@ -18,53 +18,55 @@
package appeng.bootstrap.definitions;
import appeng.tile.AEBaseTile;
/**
* @author GuntherDW
*/
public class TileEntityDefinition
{
private final Class<? extends AEBaseTile> tileEntityClass;
private String name;
private boolean isRegistered = false;
private final Class<? extends AEBaseTile> tileEntityClass;
private String name;
private boolean isRegistered = false;
// This signals the BlockDefinitionBuilder to set the name of the TE to the blockname.
public TileEntityDefinition( Class<? extends AEBaseTile> tileEntityClass )
{
this.tileEntityClass = tileEntityClass;
this.name = null;
}
// This signals the BlockDefinitionBuilder to set the name of the TE to the blockname.
public TileEntityDefinition( Class<? extends AEBaseTile> tileEntityClass )
{
this.tileEntityClass = tileEntityClass;
this.name = null;
}
public TileEntityDefinition( Class<? extends AEBaseTile> tileEntityClass, String optionalName )
{
this.tileEntityClass = tileEntityClass;
this.name = optionalName;
}
public TileEntityDefinition( Class<? extends AEBaseTile> tileEntityClass, String optionalName )
{
this.tileEntityClass = tileEntityClass;
this.name = optionalName;
}
public Class<? extends AEBaseTile> getTileEntityClass()
{
return tileEntityClass;
}
public Class<? extends AEBaseTile> getTileEntityClass()
{
return tileEntityClass;
}
public void setName( String name )
{
this.name = name;
}
public void setName( String name )
{
this.name = name;
}
public String getName()
{
return name;
}
public String getName()
{
return name;
}
public boolean isRegistered()
{
return isRegistered;
}
public boolean isRegistered()
{
return isRegistered;
}
public void setRegistered( boolean registered )
{
isRegistered = registered;
}
public void setRegistered( boolean registered )
{
isRegistered = registered;
}
}