Add a temporary (?) method to register the TileEntities because the Forge method changed from 1.10 to 1.11.2.
This commit is contained in:
@@ -388,7 +388,7 @@ public class BlockCableBus extends AEBaseTileBlock
|
|||||||
noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class );
|
noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class );
|
||||||
this.setTileEntity( noTesrTile );
|
this.setTileEntity( noTesrTile );
|
||||||
// TODO: Change after transition phase
|
// TODO: Change after transition phase
|
||||||
GameRegistry.registerTileEntityWithAlternatives( noTesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "BlockCableBus", "BlockCableBus" );
|
Platform.registerTileEntityWithAlternatives( noTesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "BlockCableBus", "BlockCableBus" );
|
||||||
if( Platform.isClient() )
|
if( Platform.isClient() )
|
||||||
{
|
{
|
||||||
setupTesr();
|
setupTesr();
|
||||||
@@ -400,7 +400,7 @@ public class BlockCableBus extends AEBaseTileBlock
|
|||||||
{
|
{
|
||||||
tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class );
|
tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class );
|
||||||
// TODO: Change after transition phase
|
// TODO: Change after transition phase
|
||||||
GameRegistry.registerTileEntityWithAlternatives( tesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "ClientOnly_TESR_CableBus", "ClientOnly_TESR_CableBus" );
|
Platform.registerTileEntityWithAlternatives( tesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "ClientOnly_TESR_CableBus", "ClientOnly_TESR_CableBus" );
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer( BlockCableBus.getTesrTile(), new CableBusTESR() );
|
ClientRegistry.bindTileEntitySpecialRenderer( BlockCableBus.getTesrTile(), new CableBusTESR() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -242,6 +242,9 @@ class BlockDefinitionBuilder implements IBlockBuilder
|
|||||||
factory.addPreInit( side -> {
|
factory.addPreInit( side -> {
|
||||||
Class<? extends AEBaseTile> tileEntityClass = tileBlock.getTileEntityClass();
|
Class<? extends AEBaseTile> tileEntityClass = tileBlock.getTileEntityClass();
|
||||||
AEBaseTile.registerTileItem( tileEntityClass, new BlockStackSrc( block, 0, ActivityState.Enabled ) );
|
AEBaseTile.registerTileItem( tileEntityClass, new BlockStackSrc( block, 0, ActivityState.Enabled ) );
|
||||||
|
|
||||||
|
// TODO: Change after transition phase
|
||||||
|
Platform.registerTileEntityWithAlternatives( tileEntityClass, AppEng.MOD_ID.toLowerCase() + ":" + registryName, registryName );
|
||||||
} );
|
} );
|
||||||
|
|
||||||
return (T) new TileDefinition( registryName, (AEBaseTileBlock) block, item );
|
return (T) new TileDefinition( registryName, (AEBaseTileBlock) block, item );
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ import net.minecraft.stats.Achievement;
|
|||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.tileentity.TileEntityChest;
|
import net.minecraft.tileentity.TileEntityChest;
|
||||||
import net.minecraft.util.EnumFacing;
|
import net.minecraft.util.EnumFacing;
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.math.AxisAlignedBB;
|
import net.minecraft.util.math.AxisAlignedBB;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.MathHelper;
|
import net.minecraft.util.math.MathHelper;
|
||||||
@@ -76,6 +77,8 @@ import net.minecraftforge.common.util.FakePlayerFactory;
|
|||||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||||
import net.minecraftforge.fml.common.Loader;
|
import net.minecraftforge.fml.common.Loader;
|
||||||
import net.minecraftforge.fml.common.ModContainer;
|
import net.minecraftforge.fml.common.ModContainer;
|
||||||
|
import net.minecraftforge.fml.common.registry.GameData;
|
||||||
|
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
@@ -1818,4 +1821,24 @@ public class Platform
|
|||||||
|
|
||||||
return isPurified;
|
return isPurified;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Added because the internal Forge GameRegistry method changed a bit
|
||||||
|
* @param tileEntityClass
|
||||||
|
* @param id
|
||||||
|
* @param alternatives
|
||||||
|
*/
|
||||||
|
public static void registerTileEntityWithAlternatives(Class<? extends TileEntity> tileEntityClass, String id, String... alternatives)
|
||||||
|
{
|
||||||
|
ResourceLocation rloc = GameData.getTileEntityRegistry().getNameForObject(tileEntityClass);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If there's no mention of said TE in the registry, add it, otherwise add the aliases.
|
||||||
|
*/
|
||||||
|
if(rloc == null) {
|
||||||
|
GameRegistry.registerTileEntityWithAlternatives( tileEntityClass, AppEng.MOD_ID.toLowerCase() + ":" + id, id );
|
||||||
|
} else {
|
||||||
|
GameData.getTileEntityRegistry().addLegacyName(new ResourceLocation(id), new ResourceLocation(AppEng.MOD_ID.toLowerCase() + ":" + id));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user