pick 97420a31d The big reformat of 2020

This commit is contained in:
yueh
2020-06-16 21:41:28 +02:00
parent 5304b3febe
commit 5225ea426b
2252 changed files with 95466 additions and 118582 deletions
+183 -229
View File
@@ -18,16 +18,15 @@
package appeng.items.parts;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.RenderTypeLookup;
import net.minecraft.block.Blocks;
import net.minecraft.item.*;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.ActionResultType;
@@ -47,277 +46,232 @@ import appeng.facade.FacadePart;
import appeng.facade.IFacadeItem;
import appeng.items.AEBaseItem;
public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassItem {
public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassItem
{
private static final String TAG_ITEM_ID = "item";
private static final String TAG_ITEM_ID = "item";
private List<ItemStack> subTypes = null;
private List<ItemStack> subTypes = null;
public ItemFacade(Properties properties) {
super(properties);
// FIXME this.setHasSubtypes( true );
}
public ItemFacade(Properties properties) {
super(properties);
// FIXME this.setHasSubtypes( true );
}
@Override
public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) {
return AEApi.instance().partHelper().placeBus(stack, context.getPos(), context.getFace(), context.getPlayer(),
context.getHand(), context.getWorld());
}
@Override
public ActionResultType onItemUseFirst( ItemStack stack, ItemUseContext context )
{
return AEApi.instance().partHelper().placeBus( stack, context.getPos(), context.getFace(), context.getPlayer(), context.getHand(), context.getWorld() );
}
@Override
public ITextComponent getDisplayName(ItemStack is) {
try {
final ItemStack in = this.getTextureItem(is);
if (!in.isEmpty()) {
return super.getDisplayName(is).deepCopy().appendText(" - ").appendSibling(in.getDisplayName());
}
} catch (final Throwable ignored) {
@Override
public ITextComponent getDisplayName(ItemStack is) {
try
{
final ItemStack in = this.getTextureItem( is );
if( !in.isEmpty() )
{
return super.getDisplayName( is ).deepCopy().appendText(" - ").appendSibling(in.getDisplayName());
}
}
catch( final Throwable ignored )
{
}
}
return super.getDisplayName(is);
}
return super.getDisplayName( is );
}
@Override
public void fillItemGroup(ItemGroup group, NonNullList<ItemStack> items) {
this.calculateSubTypes();
items.addAll(this.subTypes);
}
@Override
public void fillItemGroup(ItemGroup group, NonNullList<ItemStack> items) {
this.calculateSubTypes();
items.addAll( this.subTypes );
}
private void calculateSubTypes() {
if (this.subTypes == null) {
this.subTypes = new ArrayList<>(1000);
for (final Block b : ForgeRegistries.BLOCKS) {
try {
final Item item = Item.getItemFromBlock(b);
if (item == Items.AIR) {
continue;
}
private void calculateSubTypes()
{
if( this.subTypes == null )
{
this.subTypes = new ArrayList<>( 1000 );
for( final Block b : ForgeRegistries.BLOCKS )
{
try
{
final Item item = Item.getItemFromBlock( b );
if( item == Items.AIR )
{
continue;
}
Item blockItem = b.asItem();
if (blockItem != null && blockItem.getGroup() != null) {
final NonNullList<ItemStack> tmpList = NonNullList.create();
b.fillItemGroup(blockItem.getGroup(), tmpList);
for (final ItemStack l : tmpList) {
final ItemStack facade = this.createFacadeForItem(l, false);
if (!facade.isEmpty()) {
this.subTypes.add(facade);
}
}
}
} catch (final Throwable t) {
// just absorb..
}
}
}
}
Item blockItem = b.asItem();
if (blockItem != null && blockItem.getGroup() != null) {
final NonNullList<ItemStack> tmpList = NonNullList.create();
b.fillItemGroup(blockItem.getGroup(), tmpList);
for (final ItemStack l : tmpList) {
final ItemStack facade = this.createFacadeForItem(l, false);
if (!facade.isEmpty()) {
this.subTypes.add(facade);
}
}
}
}
catch( final Throwable t )
{
// just absorb..
}
}
}
}
public ItemStack createFacadeForItem(final ItemStack itemStack, final boolean returnItem) {
if (itemStack.isEmpty()) {
return ItemStack.EMPTY;
}
public ItemStack createFacadeForItem( final ItemStack itemStack, final boolean returnItem )
{
if( itemStack.isEmpty() )
{
return ItemStack.EMPTY;
}
final Block block = Block.getBlockFromItem(itemStack.getItem());
if (block == Blocks.AIR || itemStack.hasTag()) {
return ItemStack.EMPTY;
}
final Block block = Block.getBlockFromItem( itemStack.getItem() );
if( block == Blocks.AIR || itemStack.hasTag() )
{
return ItemStack.EMPTY;
}
final int metadata = 0; // FIXME itemStack.getItem().getMetadata( itemStack.getDamage() );
final int metadata = 0; // FIXME itemStack.getItem().getMetadata( itemStack.getDamage() );
// Try to get the block state based on the item stack's meta. If this fails,
// don't consider it for a facade
// This for example fails for Pistons because they hardcoded an invalid meta
// value in vanilla
BlockState blockState;
try {
blockState = null; // FIXME block.getStateFromMeta( metadata );
} catch (Exception e) {
AELog.debug(e, "Cannot create a facade for " + block.getRegistryName());
return ItemStack.EMPTY;
}
// Try to get the block state based on the item stack's meta. If this fails, don't consider it for a facade
// This for example fails for Pistons because they hardcoded an invalid meta value in vanilla
BlockState blockState;
try
{
blockState = null; // FIXME block.getStateFromMeta( metadata );
}
catch( Exception e )
{
AELog.debug( e, "Cannot create a facade for " + block.getRegistryName() );
return ItemStack.EMPTY;
}
final boolean areTileEntitiesEnabled = FacadeConfig.instance().allowTileEntityFacades();
final boolean isWhiteListed = FacadeConfig.instance().isWhiteListed(block, metadata);
final boolean isModel = blockState.getRenderType() == BlockRenderType.MODEL;
final boolean areTileEntitiesEnabled = FacadeConfig.instance().allowTileEntityFacades();
final boolean isWhiteListed = FacadeConfig.instance().isWhiteListed( block, metadata );
final boolean isModel = blockState.getRenderType() == BlockRenderType.MODEL;
final BlockState defaultState = block.getDefaultState();
final boolean isTileEntity = block.hasTileEntity(defaultState);
final boolean isFullCube = true; // FIXME defaultState.isFullCube( defaultState );
final BlockState defaultState = block.getDefaultState();
final boolean isTileEntity = block.hasTileEntity( defaultState );
final boolean isFullCube = true; // FIXME defaultState.isFullCube( defaultState );
final boolean isTileEntityAllowed = !isTileEntity || (areTileEntitiesEnabled && isWhiteListed);
final boolean isBlockAllowed = isFullCube || isWhiteListed;
final boolean isTileEntityAllowed = !isTileEntity || ( areTileEntitiesEnabled && isWhiteListed );
final boolean isBlockAllowed = isFullCube || isWhiteListed;
if (isModel && isTileEntityAllowed && isBlockAllowed) {
if (returnItem) {
return itemStack;
}
if( isModel && isTileEntityAllowed && isBlockAllowed )
{
if( returnItem )
{
return itemStack;
}
final ItemStack is = new ItemStack(this);
final CompoundNBT data = new CompoundNBT();
data.putString(TAG_ITEM_ID, itemStack.getItem().getRegistryName().toString());
is.setTag(data);
return is;
}
return ItemStack.EMPTY;
}
final ItemStack is = new ItemStack( this );
final CompoundNBT data = new CompoundNBT();
data.putString(TAG_ITEM_ID, itemStack.getItem().getRegistryName().toString());
is.setTag( data );
return is;
}
return ItemStack.EMPTY;
}
@Override
public FacadePart createPartFromItemStack(final ItemStack is, final AEPartLocation side) {
final ItemStack in = this.getTextureItem(is);
if (!in.isEmpty()) {
return new FacadePart(is, side);
}
return null;
}
@Override
public FacadePart createPartFromItemStack( final ItemStack is, final AEPartLocation side )
{
final ItemStack in = this.getTextureItem( is );
if( !in.isEmpty() )
{
return new FacadePart( is, side );
}
return null;
}
@Override
public ItemStack getTextureItem(ItemStack is) {
@Override
public ItemStack getTextureItem( ItemStack is )
{
CompoundNBT nbt = is.getTag();
CompoundNBT nbt = is.getTag();
if (nbt == null) {
return ItemStack.EMPTY;
}
if( nbt == null )
{
return ItemStack.EMPTY;
}
ResourceLocation itemId;
ResourceLocation itemId;
// Handle legacy facades
if (nbt.contains("x")) {
int[] data = nbt.getIntArray("x");
if (data.length != 2) {
return ItemStack.EMPTY;
}
// Handle legacy facades
if( nbt.contains("x") )
{
int[] data = nbt.getIntArray( "x" );
if( data.length != 2 )
{
return ItemStack.EMPTY;
}
Item item = Registry.ITEM.getByValue(data[0]);
if (item == null) {
return ItemStack.EMPTY;
}
Item item = Registry.ITEM.getByValue( data[0] );
if( item == null )
{
return ItemStack.EMPTY;
}
itemId = item.getRegistryName();
} else {
// First item is numeric item id
itemId = new ResourceLocation(nbt.getString(TAG_ITEM_ID));
}
itemId = item.getRegistryName();
}
else
{
// First item is numeric item id
itemId = new ResourceLocation( nbt.getString( TAG_ITEM_ID ) );
}
Item baseItem = ForgeRegistries.ITEMS.getValue(itemId);
Item baseItem = ForgeRegistries.ITEMS.getValue( itemId );
if (baseItem == null) {
return ItemStack.EMPTY;
}
if( baseItem == null )
{
return ItemStack.EMPTY;
}
return new ItemStack(baseItem, 1);
}
return new ItemStack( baseItem, 1 );
}
@Override
public BlockState getTextureBlockState(ItemStack is) {
@Override
public BlockState getTextureBlockState( ItemStack is )
{
ItemStack baseItemStack = this.getTextureItem(is);
ItemStack baseItemStack = this.getTextureItem( is );
if (baseItemStack.isEmpty()) {
return Blocks.GLASS.getDefaultState();
}
if( baseItemStack.isEmpty() )
{
return Blocks.GLASS.getDefaultState();
}
Block block = Block.getBlockFromItem(baseItemStack.getItem());
Block block = Block.getBlockFromItem( baseItemStack.getItem() );
if (block == Blocks.AIR) {
return Blocks.GLASS.getDefaultState();
}
if( block == Blocks.AIR )
{
return Blocks.GLASS.getDefaultState();
}
int metadata = 0; // FIXME baseItemStack.getItem().getMetadata( baseItemStack );
int metadata = 0; // FIXME baseItemStack.getItem().getMetadata( baseItemStack );
try {
return null; // FIXME block.getStateFromMeta( metadata );
} catch (Exception e) {
AELog.warn("Block %s has broken getStateFromMeta method for meta %d", block.getRegistryName().toString(),
baseItemStack.getDamage());
return Blocks.GLASS.getDefaultState();
}
}
try
{
return null; // FIXME block.getStateFromMeta( metadata );
}
catch( Exception e )
{
AELog.warn( "Block %s has broken getStateFromMeta method for meta %d", block.getRegistryName().toString(), baseItemStack.getDamage() );
return Blocks.GLASS.getDefaultState();
}
}
public List<ItemStack> getFacades() {
this.calculateSubTypes();
return this.subTypes;
}
public List<ItemStack> getFacades()
{
this.calculateSubTypes();
return this.subTypes;
}
public ItemStack getCreativeTabIcon() {
this.calculateSubTypes();
if (this.subTypes.isEmpty()) {
return new ItemStack(Items.CAKE);
}
return this.subTypes.get(0);
}
public ItemStack getCreativeTabIcon()
{
this.calculateSubTypes();
if( this.subTypes.isEmpty() )
{
return new ItemStack( Items.CAKE );
}
return this.subTypes.get( 0 );
}
public ItemStack createFromID(final int id) {
ItemStack facadeStack = AEApi.instance().definitions().items().facade().maybeStack(1).orElseThrow(
() -> new MissingDefinitionException("Tried to create a facade, while facades are being deactivated."));
public ItemStack createFromID( final int id )
{
ItemStack facadeStack = AEApi.instance()
.definitions()
.items()
.facade()
.maybeStack( 1 )
.orElseThrow( () -> new MissingDefinitionException( "Tried to create a facade, while facades are being deactivated." ) );
// Convert back to a registry name...
Item item = Registry.ITEM.getByValue(id);
if (item == null) {
return ItemStack.EMPTY;
}
// Convert back to a registry name...
Item item = Registry.ITEM.getByValue( id );
if( item == null )
{
return ItemStack.EMPTY;
}
final CompoundNBT facadeTag = new CompoundNBT();
facadeTag.putString(TAG_ITEM_ID, item.getRegistryName().toString());
facadeStack.setTag(facadeTag);
final CompoundNBT facadeTag = new CompoundNBT();
facadeTag.putString(TAG_ITEM_ID, item.getRegistryName().toString());
facadeStack.setTag( facadeTag );
return facadeStack;
}
return facadeStack;
}
@Override
public boolean useAlphaPass(final ItemStack is) {
BlockState blockState = this.getTextureBlockState(is);
@Override
public boolean useAlphaPass( final ItemStack is )
{
BlockState blockState = this.getTextureBlockState( is );
if (blockState == null) {
return false;
}
if( blockState == null )
{
return false;
}
return RenderTypeLookup.canRenderInLayer( blockState, RenderType.getTranslucent() )
|| RenderTypeLookup.canRenderInLayer( blockState, RenderType.getTranslucentNoCrumbling() );
}
return RenderTypeLookup.canRenderInLayer(blockState, RenderType.getTranslucent())
|| RenderTypeLookup.canRenderInLayer(blockState, RenderType.getTranslucentNoCrumbling());
}
}