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

Fix client-side init code (checked for thread groups instead of dist).

Browse Source 
More sky compass fixes.
This commit is contained in:
Sebastian Hartte
2020-06-03 18:49:22 +02:00
parent 64651feb3c
commit 6eb2a9504a
7 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
+3 -3
View File
@@ -83,7 +83,7 @@ class BlockDefinitionBuilder implements IBlockBuilder
this.registryName = id;
this.blockSupplier = blockSupplier;
if( Platform.isClient() )
if( Platform.hasClientClasses() )
{
this.blockRendering = new BlockRendering();
this.itemRendering = new ItemRendering();
@@ -115,7 +115,7 @@ class BlockDefinitionBuilder implements IBlockBuilder
@Override
public BlockDefinitionBuilder rendering( BlockRenderingCustomizer callback )
{
if( Platform.isClient() )
if( Platform.hasClientClasses() )
{
this.customizeForClient( callback );
}
@@ -180,7 +180,7 @@ class BlockDefinitionBuilder implements IBlockBuilder
this.tileEntityDefinition.addBlock(block);
}
if( Platform.isClient() )
if( Platform.hasClientClasses() )
{
this.blockRendering.apply( this.factory, block );
src/main/java/appeng/bootstrap/FeatureFactory.java
+2 -2
View File
@@ -70,7 +70,7 @@ public class FeatureFactory
this.defaultFeatures = new AEFeature[] { AEFeature.CORE };
this.bootstrapComponents = new HashMap<>();
if( Platform.isClient() )
if( Platform.hasClientClasses() )
{
this.modelOverrideComponent = new ModelOverrideComponent();
this.addBootstrapComponent( this.modelOverrideComponent );
@@ -83,7 +83,7 @@ public class FeatureFactory
{
this.defaultFeatures = defaultFeatures.clone();
this.bootstrapComponents = parent.bootstrapComponents;
if( Platform.isClient() )
if( Platform.hasClientClasses() )
{
this.modelOverrideComponent = parent.modelOverrideComponent;
this.builtInModelComponent = parent.builtInModelComponent;
src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java
+3 -3
View File
@@ -66,7 +66,7 @@ class ItemDefinitionBuilder implements IItemBuilder
this.factory = factory;
this.registryName = registryName;
this.itemSupplier = itemSupplier;
if( Platform.isClient() )
if( Platform.hasClientClasses() )
{
// FIXME this.itemRendering = new ItemRendering();
}
@@ -104,7 +104,7 @@ class ItemDefinitionBuilder implements IItemBuilder
// FIXME @Override
// FIXME public IItemBuilder rendering( ItemRenderingCustomizer callback )
// FIXME {
// FIXME if( Platform.isClient() )
// FIXME if( Platform.hasClientClasses() )
// FIXME {
// FIXME this.customizeForClient( callback );
// FIXME }
@@ -148,7 +148,7 @@ class ItemDefinitionBuilder implements IItemBuilder
this.factory.addBootstrapComponent( (IItemRegistrationComponent) ( side, reg ) -> reg.register( item ) );
if( Platform.isClient() )
if( Platform.hasClientClasses() )
{
// FIXME this.itemRendering.apply( this.factory, item );
}