Format source code
This commit is contained in:
parent
402bd8f5f7
commit
37b34bfc02
|
@ -1,7 +1,9 @@
|
||||||
<code_scheme name="Iron Chests Formatting Guidelines">
|
<code_scheme name="Iron Chests1 Formatting Guidelines">
|
||||||
<option name="RIGHT_MARGIN" value="160"/>
|
<option name="RIGHT_MARGIN" value="160"/>
|
||||||
<option name="ENABLE_JAVADOC_FORMATTING" value="false"/>
|
<option name="ENABLE_JAVADOC_FORMATTING" value="false"/>
|
||||||
<option name="FORMATTER_TAGS_ENABLED" value="true" />
|
<option name="FORMATTER_TAGS_ENABLED" value="true" />
|
||||||
|
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
|
||||||
|
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
|
||||||
<JSON>
|
<JSON>
|
||||||
<option name="OBJECT_WRAPPING" value="5"/>
|
<option name="OBJECT_WRAPPING" value="5"/>
|
||||||
<option name="ARRAY_WRAPPING" value="5"/>
|
<option name="ARRAY_WRAPPING" value="5"/>
|
||||||
|
@ -42,7 +44,7 @@
|
||||||
<option name="CLASS_ANNOTATION_WRAP" value="0"/>
|
<option name="CLASS_ANNOTATION_WRAP" value="0"/>
|
||||||
<option name="FIELD_ANNOTATION_WRAP" value="0"/>
|
<option name="FIELD_ANNOTATION_WRAP" value="0"/>
|
||||||
<indentOptions>
|
<indentOptions>
|
||||||
<option name="USE_TAB_CHARACTER" value="true"/>
|
<option name="USE_TAB_CHARACTER" value="FALSE"/>
|
||||||
</indentOptions>
|
</indentOptions>
|
||||||
</codeStyleSettings>
|
</codeStyleSettings>
|
||||||
<codeStyleSettings language="JSON">
|
<codeStyleSettings language="JSON">
|
||||||
|
|
|
@ -17,23 +17,23 @@ import net.minecraftforge.fml.client.registry.ClientRegistry;
|
||||||
|
|
||||||
public class ClientProxy extends ServerProxy
|
public class ClientProxy extends ServerProxy
|
||||||
{
|
{
|
||||||
public ClientProxy()
|
public ClientProxy()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||||
public void preInit()
|
public void preInit()
|
||||||
{
|
{
|
||||||
System.out.println("hello");
|
System.out.println("hello");
|
||||||
super.preInit();
|
super.preInit();
|
||||||
for (IronChestType type : IronChestType.values())
|
for (IronChestType type : IronChestType.values())
|
||||||
{
|
{
|
||||||
if (type.clazz != null)
|
if (type.clazz != null)
|
||||||
{
|
{
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(type.clazz, new TileEntityIronChestRenderer());
|
ClientRegistry.bindTileEntitySpecialRenderer(type.clazz, new TileEntityIronChestRenderer());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,10 +10,7 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package cpw.mods.ironchest.client.renderer;
|
package cpw.mods.ironchest.client.renderer;
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import com.google.common.primitives.SignedBytes;
|
import com.google.common.primitives.SignedBytes;
|
||||||
|
|
||||||
import cpw.mods.ironchest.common.blocks.BlockChest;
|
import cpw.mods.ironchest.common.blocks.BlockChest;
|
||||||
import cpw.mods.ironchest.common.blocks.BlockIronChest;
|
import cpw.mods.ironchest.common.blocks.BlockIronChest;
|
||||||
import cpw.mods.ironchest.common.blocks.IronChestType;
|
import cpw.mods.ironchest.common.blocks.IronChestType;
|
||||||
|
@ -31,6 +28,8 @@ import net.minecraft.tileentity.IChestLid;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.EnumFacing;
|
import net.minecraft.util.EnumFacing;
|
||||||
|
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
public class TileEntityIronChestRenderer<T extends TileEntity & IChestLid> extends TileEntityRenderer<T>
|
public class TileEntityIronChestRenderer<T extends TileEntity & IChestLid> extends TileEntityRenderer<T>
|
||||||
{
|
{
|
||||||
private Random random;
|
private Random random;
|
||||||
|
@ -66,7 +65,9 @@ public class TileEntityIronChestRenderer<T extends TileEntity & IChestLid> exten
|
||||||
GlStateManager.enableDepthTest();
|
GlStateManager.enableDepthTest();
|
||||||
GlStateManager.depthFunc(515);
|
GlStateManager.depthFunc(515);
|
||||||
GlStateManager.depthMask(true);
|
GlStateManager.depthMask(true);
|
||||||
IBlockState iblockstate = tileEntityIn.hasWorld() ? tileEntityIn.getBlockState() : (IBlockState) IronChestBlocks.ironChestBlock.getDefaultState().with(BlockIronChest.FACING, EnumFacing.SOUTH);
|
IBlockState iblockstate = tileEntityIn.hasWorld() ?
|
||||||
|
tileEntityIn.getBlockState() :
|
||||||
|
(IBlockState) IronChestBlocks.ironChestBlock.getDefaultState().with(BlockIronChest.FACING, EnumFacing.SOUTH);
|
||||||
IronChestType chesttype = IronChestType.IRON;
|
IronChestType chesttype = IronChestType.IRON;
|
||||||
IronChestType typeNew = BlockChest.getTypeFromBlock(iblockstate.getBlock());
|
IronChestType typeNew = BlockChest.getTypeFromBlock(iblockstate.getBlock());
|
||||||
|
|
||||||
|
@ -131,7 +132,8 @@ public class TileEntityIronChestRenderer<T extends TileEntity & IChestLid> exten
|
||||||
GlStateManager.matrixMode(5888);
|
GlStateManager.matrixMode(5888);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chesttype.isTransparent() && tileEntityIn.getDistanceSq(this.rendererDispatcher.entityX, this.rendererDispatcher.entityY, this.rendererDispatcher.entityZ) < 128d)
|
if (chesttype.isTransparent()
|
||||||
|
&& tileEntityIn.getDistanceSq(this.rendererDispatcher.entityX, this.rendererDispatcher.entityY, this.rendererDispatcher.entityZ) < 128d)
|
||||||
{
|
{
|
||||||
this.random.setSeed(254L);
|
this.random.setSeed(254L);
|
||||||
|
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package cpw.mods.ironchest.common.ai;
|
package cpw.mods.ironchest.common.ai;
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
|
|
||||||
import net.minecraft.entity.ai.EntityAIOcelotSit;
|
import net.minecraft.entity.ai.EntityAIOcelotSit;
|
||||||
import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry;
|
import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry;
|
||||||
import net.minecraft.entity.passive.EntityOcelot;
|
import net.minecraft.entity.passive.EntityOcelot;
|
||||||
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
|
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
|
||||||
public class OcelotsSitOnChestsHandler
|
public class OcelotsSitOnChestsHandler
|
||||||
{
|
{
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
|
|
|
@ -10,8 +10,6 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package cpw.mods.ironchest.common.blocks;
|
package cpw.mods.ironchest.common.blocks;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import cpw.mods.ironchest.common.tileentity.TileEntityIronChest;
|
import cpw.mods.ironchest.common.tileentity.TileEntityIronChest;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockHorizontal;
|
import net.minecraft.block.BlockHorizontal;
|
||||||
|
@ -46,6 +44,8 @@ import net.minecraft.world.World;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
public abstract class BlockChest extends Block implements ITileEntityProvider
|
public abstract class BlockChest extends Block implements ITileEntityProvider
|
||||||
{
|
{
|
||||||
public static final DirectionProperty FACING = BlockHorizontal.HORIZONTAL_FACING;
|
public static final DirectionProperty FACING = BlockHorizontal.HORIZONTAL_FACING;
|
||||||
|
|
|
@ -65,7 +65,8 @@ public enum IronChestType implements IStringSerializable
|
||||||
|
|
||||||
public final String itemName;
|
public final String itemName;
|
||||||
|
|
||||||
IronChestType(int size, int rowLength, boolean tieredChest, String modelTexture, Class<? extends TileEntityIronChest> clazz, int xSize, int ySize, String itemName)
|
IronChestType(int size, int rowLength, boolean tieredChest, String modelTexture, Class<? extends TileEntityIronChest> clazz, int xSize, int ySize,
|
||||||
|
String itemName)
|
||||||
{
|
{
|
||||||
this.name = this.name().toLowerCase();
|
this.name = this.name().toLowerCase();
|
||||||
this.size = size;
|
this.size = size;
|
||||||
|
@ -126,24 +127,24 @@ public enum IronChestType implements IStringSerializable
|
||||||
{
|
{
|
||||||
switch (resourceLocation.toString())
|
switch (resourceLocation.toString())
|
||||||
{
|
{
|
||||||
case BlockNames.IRON_CHEST:
|
case BlockNames.IRON_CHEST:
|
||||||
return IRON;
|
return IRON;
|
||||||
case BlockNames.GOLD_CHEST:
|
case BlockNames.GOLD_CHEST:
|
||||||
return GOLD;
|
return GOLD;
|
||||||
case BlockNames.DIAMOND_CHEST:
|
case BlockNames.DIAMOND_CHEST:
|
||||||
return DIAMOND;
|
return DIAMOND;
|
||||||
case BlockNames.COPPER_CHEST:
|
case BlockNames.COPPER_CHEST:
|
||||||
return COPPER;
|
return COPPER;
|
||||||
case BlockNames.SILVER_CHEST:
|
case BlockNames.SILVER_CHEST:
|
||||||
return SILVER;
|
return SILVER;
|
||||||
case BlockNames.CRYSTAL_CHEST:
|
case BlockNames.CRYSTAL_CHEST:
|
||||||
return CRYSTAL;
|
return CRYSTAL;
|
||||||
case BlockNames.OBSIDIAN_CHEST:
|
case BlockNames.OBSIDIAN_CHEST:
|
||||||
return OBSIDIAN;
|
return OBSIDIAN;
|
||||||
case BlockNames.DIRT_CHEST:
|
case BlockNames.DIRT_CHEST:
|
||||||
return DIRTCHEST9000;
|
return DIRTCHEST9000;
|
||||||
default:
|
default:
|
||||||
return WOOD;
|
return WOOD;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -151,24 +152,24 @@ public enum IronChestType implements IStringSerializable
|
||||||
{
|
{
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case IRON:
|
case IRON:
|
||||||
return IronChestBlocks.ironChestBlock.getDefaultState();
|
return IronChestBlocks.ironChestBlock.getDefaultState();
|
||||||
case GOLD:
|
case GOLD:
|
||||||
return IronChestBlocks.goldChestBlock.getDefaultState();
|
return IronChestBlocks.goldChestBlock.getDefaultState();
|
||||||
case DIAMOND:
|
case DIAMOND:
|
||||||
return IronChestBlocks.diamondChestBlock.getDefaultState();
|
return IronChestBlocks.diamondChestBlock.getDefaultState();
|
||||||
case COPPER:
|
case COPPER:
|
||||||
return IronChestBlocks.copperChestBlock.getDefaultState();
|
return IronChestBlocks.copperChestBlock.getDefaultState();
|
||||||
case SILVER:
|
case SILVER:
|
||||||
return IronChestBlocks.silverChestBlock.getDefaultState();
|
return IronChestBlocks.silverChestBlock.getDefaultState();
|
||||||
case CRYSTAL:
|
case CRYSTAL:
|
||||||
return IronChestBlocks.crystalChestBlock.getDefaultState();
|
return IronChestBlocks.crystalChestBlock.getDefaultState();
|
||||||
case OBSIDIAN:
|
case OBSIDIAN:
|
||||||
return IronChestBlocks.obsidianChestBlock.getDefaultState();
|
return IronChestBlocks.obsidianChestBlock.getDefaultState();
|
||||||
case DIRTCHEST9000:
|
case DIRTCHEST9000:
|
||||||
return IronChestBlocks.dirtChestBlock.getDefaultState();
|
return IronChestBlocks.dirtChestBlock.getDefaultState();
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -176,24 +177,24 @@ public enum IronChestType implements IStringSerializable
|
||||||
{
|
{
|
||||||
switch (this)
|
switch (this)
|
||||||
{
|
{
|
||||||
case IRON:
|
case IRON:
|
||||||
return new TileEntityIronChest();
|
return new TileEntityIronChest();
|
||||||
case GOLD:
|
case GOLD:
|
||||||
return new TileEntityGoldChest();
|
return new TileEntityGoldChest();
|
||||||
case DIAMOND:
|
case DIAMOND:
|
||||||
return new TileEntityDiamondChest();
|
return new TileEntityDiamondChest();
|
||||||
case COPPER:
|
case COPPER:
|
||||||
return new TileEntityCopperChest();
|
return new TileEntityCopperChest();
|
||||||
case SILVER:
|
case SILVER:
|
||||||
return new TileEntitySilverChest();
|
return new TileEntitySilverChest();
|
||||||
case CRYSTAL:
|
case CRYSTAL:
|
||||||
return new TileEntityCrystalChest();
|
return new TileEntityCrystalChest();
|
||||||
case OBSIDIAN:
|
case OBSIDIAN:
|
||||||
return new TileEntityObsidianChest();
|
return new TileEntityObsidianChest();
|
||||||
case DIRTCHEST9000:
|
case DIRTCHEST9000:
|
||||||
return new TileEntityDirtChest();
|
return new TileEntityDirtChest();
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,14 +61,18 @@ public class IronChestBlocks
|
||||||
public void registerBlocks()
|
public void registerBlocks()
|
||||||
{
|
{
|
||||||
// Chest Start
|
// Chest Start
|
||||||
GameRegistry.findRegistry(Block.class).registerAll(ironChestBlock, goldChestBlock, diamondChestBlock, copperChestBlock, silverChestBlock, crystalChestBlock, obsidianChestBlock, dirtChestBlock);
|
GameRegistry.findRegistry(Block.class)
|
||||||
|
.registerAll(ironChestBlock, goldChestBlock, diamondChestBlock, copperChestBlock, silverChestBlock, crystalChestBlock, obsidianChestBlock,
|
||||||
|
dirtChestBlock);
|
||||||
// Chest End
|
// Chest End
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerItems()
|
public void registerItems()
|
||||||
{
|
{
|
||||||
// Chest Start
|
// Chest Start
|
||||||
GameRegistry.findRegistry(Item.class).registerAll(ironChestItemBlock, goldChestItemBlock, diamondChestItemBlock, copperChestItemBlock, silverChestItemBlock, crystalChestItemBlock, obsidianChestItemBlock, dirtChestItemBlock);
|
GameRegistry.findRegistry(Item.class)
|
||||||
|
.registerAll(ironChestItemBlock, goldChestItemBlock, diamondChestItemBlock, copperChestItemBlock, silverChestItemBlock, crystalChestItemBlock,
|
||||||
|
obsidianChestItemBlock, dirtChestItemBlock);
|
||||||
// Chest End
|
// Chest End
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,9 @@ public class IronChestItems
|
||||||
public void registerItems()
|
public void registerItems()
|
||||||
{
|
{
|
||||||
// Chest Start
|
// Chest Start
|
||||||
GameRegistry.findRegistry(Item.class).registerAll(ironToGoldUpgrade, goldToDiamondUpgrade, copperToSilverUpgrade, silverToGoldUpgrade, copperToIronUpgrade, diamondToCrystalUpgrade, woodToIronUpgrade, woodToCopperUpgrade, diamondToObsidianUpgrade);
|
GameRegistry.findRegistry(Item.class)
|
||||||
|
.registerAll(ironToGoldUpgrade, goldToDiamondUpgrade, copperToSilverUpgrade, silverToGoldUpgrade, copperToIronUpgrade, diamondToCrystalUpgrade,
|
||||||
|
woodToIronUpgrade, woodToCopperUpgrade, diamondToObsidianUpgrade);
|
||||||
// Chest End
|
// Chest End
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,11 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package cpw.mods.ironchest.common.items;
|
package cpw.mods.ironchest.common.items;
|
||||||
|
|
||||||
|
import cpw.mods.ironchest.common.blocks.IronChestType;
|
||||||
|
import cpw.mods.ironchest.common.core.IronChestCreativeTabs;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraftforge.registries.IForgeRegistry;
|
||||||
|
|
||||||
import static cpw.mods.ironchest.common.blocks.IronChestType.COPPER;
|
import static cpw.mods.ironchest.common.blocks.IronChestType.COPPER;
|
||||||
import static cpw.mods.ironchest.common.blocks.IronChestType.CRYSTAL;
|
import static cpw.mods.ironchest.common.blocks.IronChestType.CRYSTAL;
|
||||||
import static cpw.mods.ironchest.common.blocks.IronChestType.DIAMOND;
|
import static cpw.mods.ironchest.common.blocks.IronChestType.DIAMOND;
|
||||||
|
@ -19,11 +24,6 @@ import static cpw.mods.ironchest.common.blocks.IronChestType.OBSIDIAN;
|
||||||
import static cpw.mods.ironchest.common.blocks.IronChestType.SILVER;
|
import static cpw.mods.ironchest.common.blocks.IronChestType.SILVER;
|
||||||
import static cpw.mods.ironchest.common.blocks.IronChestType.WOOD;
|
import static cpw.mods.ironchest.common.blocks.IronChestType.WOOD;
|
||||||
|
|
||||||
import cpw.mods.ironchest.common.blocks.IronChestType;
|
|
||||||
import cpw.mods.ironchest.common.core.IronChestCreativeTabs;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraftforge.registries.IForgeRegistry;
|
|
||||||
|
|
||||||
public enum ChestChangerType
|
public enum ChestChangerType
|
||||||
{
|
{
|
||||||
//@formatter:off
|
//@formatter:off
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class ItemChestChanger extends ItemTooltip
|
||||||
|
|
||||||
ITextComponent customname = null;
|
ITextComponent customname = null;
|
||||||
|
|
||||||
NonNullList<ItemStack> chestContents = NonNullList.<ItemStack> withSize(27, ItemStack.EMPTY);
|
NonNullList<ItemStack> chestContents = NonNullList.<ItemStack>withSize(27, ItemStack.EMPTY);
|
||||||
EnumFacing chestFacing = EnumFacing.NORTH;
|
EnumFacing chestFacing = EnumFacing.NORTH;
|
||||||
|
|
||||||
if (te != null)
|
if (te != null)
|
||||||
|
@ -108,7 +108,7 @@ public class ItemChestChanger extends ItemTooltip
|
||||||
return EnumActionResult.PASS;
|
return EnumActionResult.PASS;
|
||||||
}
|
}
|
||||||
|
|
||||||
chestContents = NonNullList.<ItemStack> withSize(chest.getSizeInventory(), ItemStack.EMPTY);
|
chestContents = NonNullList.<ItemStack>withSize(chest.getSizeInventory(), ItemStack.EMPTY);
|
||||||
|
|
||||||
for (int i = 0; i < chestContents.size(); i++)
|
for (int i = 0; i < chestContents.size(); i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -10,12 +10,7 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package cpw.mods.ironchest.common.items;
|
package cpw.mods.ironchest.common.items;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
|
|
||||||
import net.minecraft.client.resources.I18n;
|
import net.minecraft.client.resources.I18n;
|
||||||
import net.minecraft.client.util.ITooltipFlag;
|
import net.minecraft.client.util.ITooltipFlag;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
@ -27,6 +22,9 @@ import net.minecraft.world.World;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemTooltip extends Item
|
public class ItemTooltip extends Item
|
||||||
{
|
{
|
||||||
public ItemTooltip(Builder properties)
|
public ItemTooltip(Builder properties)
|
||||||
|
@ -70,7 +68,9 @@ public class ItemTooltip extends Item
|
||||||
{
|
{
|
||||||
List<String> list = Lists.newLinkedList();
|
List<String> list = Lists.newLinkedList();
|
||||||
if (text == null)
|
if (text == null)
|
||||||
|
{
|
||||||
return list;
|
return list;
|
||||||
|
}
|
||||||
int j = 0;
|
int j = 0;
|
||||||
int k;
|
int k;
|
||||||
while ((k = text.indexOf("\\n", j)) >= 0)
|
while ((k = text.indexOf("\\n", j)) >= 0)
|
||||||
|
|
|
@ -12,7 +12,6 @@ package cpw.mods.ironchest.common.tileentity;
|
||||||
|
|
||||||
import com.mojang.datafixers.DataFixUtils;
|
import com.mojang.datafixers.DataFixUtils;
|
||||||
import com.mojang.datafixers.types.Type;
|
import com.mojang.datafixers.types.Type;
|
||||||
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.tileentity.TileEntityType;
|
import net.minecraft.tileentity.TileEntityType;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
|
@ -10,15 +10,15 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package cpw.mods.ironchest.common.tileentity;
|
package cpw.mods.ironchest.common.tileentity;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
|
|
||||||
import cpw.mods.ironchest.common.blocks.IronChestType;
|
import cpw.mods.ironchest.common.blocks.IronChestType;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.Comparator;
|
||||||
|
|
||||||
public class TileEntityCrystalChest extends TileEntityIronChest
|
public class TileEntityCrystalChest extends TileEntityIronChest
|
||||||
{
|
{
|
||||||
/** Crystal Chest top stacks */
|
/** Crystal Chest top stacks */
|
||||||
|
@ -33,7 +33,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest
|
||||||
public TileEntityCrystalChest()
|
public TileEntityCrystalChest()
|
||||||
{
|
{
|
||||||
super(IronChestEntityType.CRYSTAL_CHEST, IronChestType.CRYSTAL);
|
super(IronChestEntityType.CRYSTAL_CHEST, IronChestType.CRYSTAL);
|
||||||
this.topStacks = NonNullList.<ItemStack> withSize(8, ItemStack.EMPTY);
|
this.topStacks = NonNullList.<ItemStack>withSize(8, ItemStack.EMPTY);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -79,7 +79,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NonNullList<ItemStack> tempCopy = NonNullList.<ItemStack> withSize(this.getSizeInventory(), ItemStack.EMPTY);
|
NonNullList<ItemStack> tempCopy = NonNullList.<ItemStack>withSize(this.getSizeInventory(), ItemStack.EMPTY);
|
||||||
|
|
||||||
boolean hasStuff = false;
|
boolean hasStuff = false;
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest
|
||||||
{
|
{
|
||||||
if (this.getIronChestType().isTransparent())
|
if (this.getIronChestType().isTransparent())
|
||||||
{
|
{
|
||||||
NonNullList<ItemStack> sortList = NonNullList.<ItemStack> withSize(this.getTopItems().size(), ItemStack.EMPTY);
|
NonNullList<ItemStack> sortList = NonNullList.<ItemStack>withSize(this.getTopItems().size(), ItemStack.EMPTY);
|
||||||
|
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
|
|
||||||
|
@ -213,7 +213,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest
|
||||||
return sortList;
|
return sortList;
|
||||||
}
|
}
|
||||||
|
|
||||||
return NonNullList.<ItemStack> withSize(this.getTopItems().size(), ItemStack.EMPTY);
|
return NonNullList.<ItemStack>withSize(this.getTopItems().size(), ItemStack.EMPTY);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void sendTopStacksPacket()
|
protected void sendTopStacksPacket()
|
||||||
|
|
|
@ -71,14 +71,14 @@ public class TileEntityIronChest extends TileEntityLockableLoot implements IChes
|
||||||
{
|
{
|
||||||
super(typeIn);
|
super(typeIn);
|
||||||
this.chestType = chestTypeIn;
|
this.chestType = chestTypeIn;
|
||||||
this.chestContents = NonNullList.<ItemStack> withSize(chestTypeIn.size, ItemStack.EMPTY);
|
this.chestContents = NonNullList.<ItemStack>withSize(chestTypeIn.size, ItemStack.EMPTY);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setItems(NonNullList<ItemStack> contents)
|
public void setItems(NonNullList<ItemStack> contents)
|
||||||
{
|
{
|
||||||
this.chestContents = NonNullList.<ItemStack> withSize(this.getIronChestType().size, ItemStack.EMPTY);
|
this.chestContents = NonNullList.<ItemStack>withSize(this.getIronChestType().size, ItemStack.EMPTY);
|
||||||
|
|
||||||
for (int i = 0; i < contents.size(); i++)
|
for (int i = 0; i < contents.size(); i++)
|
||||||
{
|
{
|
||||||
|
@ -139,7 +139,8 @@ public class TileEntityIronChest extends TileEntityLockableLoot implements IChes
|
||||||
{
|
{
|
||||||
this.numPlayersUsing = 0;
|
this.numPlayersUsing = 0;
|
||||||
|
|
||||||
for (EntityPlayer entityplayer : this.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(i - 5.0F, j - 5.0F, k - 5.0F, i + 1 + 5.0F, j + 1 + 5.0F, k + 1 + 5.0F)))
|
for (EntityPlayer entityplayer : this.world
|
||||||
|
.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(i - 5.0F, j - 5.0F, k - 5.0F, i + 1 + 5.0F, j + 1 + 5.0F, k + 1 + 5.0F)))
|
||||||
{
|
{
|
||||||
if (entityplayer.openContainer instanceof ContainerIronChest)
|
if (entityplayer.openContainer instanceof ContainerIronChest)
|
||||||
{
|
{
|
||||||
|
@ -205,7 +206,7 @@ public class TileEntityIronChest extends TileEntityLockableLoot implements IChes
|
||||||
{
|
{
|
||||||
super.read(compound);
|
super.read(compound);
|
||||||
|
|
||||||
this.chestContents = NonNullList.<ItemStack> withSize(this.getSizeInventory(), ItemStack.EMPTY);
|
this.chestContents = NonNullList.<ItemStack>withSize(this.getSizeInventory(), ItemStack.EMPTY);
|
||||||
|
|
||||||
if (!this.checkLootAndRead(compound))
|
if (!this.checkLootAndRead(compound))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue