Ubujira
/
ironbarrels
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Format source code

This commit is contained in:
alexbegt 2019-01-06 16:32:51 -05:00
parent 402bd8f5f7
commit 37b34bfc02
14 changed files with 121 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
idea/code_style.xml
View File

@ -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="ENABLE_JAVADOC_FORMATTING" value="false"/>
<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>
<option name="OBJECT_WRAPPING" value="5"/>
<option name="ARRAY_WRAPPING" value="5"/>
@ -42,7 +44,7 @@
<option name="CLASS_ANNOTATION_WRAP" value="0"/>
<option name="FIELD_ANNOTATION_WRAP" value="0"/>
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true"/>
<option name="USE_TAB_CHARACTER" value="FALSE"/>
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JSON">

34
src/main/java/cpw/mods/ironchest/client/ClientProxy.java
View File

@ -17,23 +17,23 @@ import net.minecraftforge.fml.client.registry.ClientRegistry;
public class ClientProxy extends ServerProxy
{
public ClientProxy()
{
public ClientProxy()
{
}
}
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public void preInit()
{
System.out.println("hello");
super.preInit();
for (IronChestType type : IronChestType.values())
{
if (type.clazz != null)
{
ClientRegistry.bindTileEntitySpecialRenderer(type.clazz, new TileEntityIronChestRenderer());
}
}
}
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public void preInit()
{
System.out.println("hello");
super.preInit();
for (IronChestType type : IronChestType.values())
{
if (type.clazz != null)
{
ClientRegistry.bindTileEntitySpecialRenderer(type.clazz, new TileEntityIronChestRenderer());
}
}
}
}

12
src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestRenderer.java
View File

@ -10,10 +10,7 @@
******************************************************************************/
package cpw.mods.ironchest.client.renderer;
import java.util.Random;
import com.google.common.primitives.SignedBytes;
import cpw.mods.ironchest.common.blocks.BlockChest;
import cpw.mods.ironchest.common.blocks.BlockIronChest;
import cpw.mods.ironchest.common.blocks.IronChestType;
@ -31,6 +28,8 @@ import net.minecraft.tileentity.IChestLid;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import java.util.Random;
public class TileEntityIronChestRenderer<T extends TileEntity & IChestLid> extends TileEntityRenderer<T>
{
private Random random;
@ -66,7 +65,9 @@ public class TileEntityIronChestRenderer<T extends TileEntity & IChestLid> exten
GlStateManager.enableDepthTest();
GlStateManager.depthFunc(515);
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 typeNew = BlockChest.getTypeFromBlock(iblockstate.getBlock());
@ -131,7 +132,8 @@ public class TileEntityIronChestRenderer<T extends TileEntity & IChestLid> exten
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);

4
src/main/java/cpw/mods/ironchest/common/ai/OcelotsSitOnChestsHandler.java
View File

@ -10,14 +10,14 @@
******************************************************************************/
package cpw.mods.ironchest.common.ai;
import java.util.HashSet;
import net.minecraft.entity.ai.EntityAIOcelotSit;
import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry;
import net.minecraft.entity.passive.EntityOcelot;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import java.util.HashSet;
public class OcelotsSitOnChestsHandler
{
@SubscribeEvent

4
src/main/java/cpw/mods/ironchest/common/blocks/BlockChest.java
View File

@ -10,8 +10,6 @@
******************************************************************************/
package cpw.mods.ironchest.common.blocks;
import javax.annotation.Nullable;
import cpw.mods.ironchest.common.tileentity.TileEntityIronChest;
import net.minecraft.block.Block;
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.OnlyIn;
import javax.annotation.Nullable;
public abstract class BlockChest extends Block implements ITileEntityProvider
{
public static final DirectionProperty FACING = BlockHorizontal.HORIZONTAL_FACING;

111
src/main/java/cpw/mods/ironchest/common/blocks/IronChestType.java
View File

@ -65,7 +65,8 @@ public enum IronChestType implements IStringSerializable
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.size = size;
@ -126,24 +127,24 @@ public enum IronChestType implements IStringSerializable
{
switch (resourceLocation.toString())
{
case BlockNames.IRON_CHEST:
return IRON;
case BlockNames.GOLD_CHEST:
return GOLD;
case BlockNames.DIAMOND_CHEST:
return DIAMOND;
case BlockNames.COPPER_CHEST:
return COPPER;
case BlockNames.SILVER_CHEST:
return SILVER;
case BlockNames.CRYSTAL_CHEST:
return CRYSTAL;
case BlockNames.OBSIDIAN_CHEST:
return OBSIDIAN;
case BlockNames.DIRT_CHEST:
return DIRTCHEST9000;
default:
return WOOD;
case BlockNames.IRON_CHEST:
return IRON;
case BlockNames.GOLD_CHEST:
return GOLD;
case BlockNames.DIAMOND_CHEST:
return DIAMOND;
case BlockNames.COPPER_CHEST:
return COPPER;
case BlockNames.SILVER_CHEST:
return SILVER;
case BlockNames.CRYSTAL_CHEST:
return CRYSTAL;
case BlockNames.OBSIDIAN_CHEST:
return OBSIDIAN;
case BlockNames.DIRT_CHEST:
return DIRTCHEST9000;
default:
return WOOD;
}
}
@ -151,24 +152,24 @@ public enum IronChestType implements IStringSerializable
{
switch (type)
{
case IRON:
return IronChestBlocks.ironChestBlock.getDefaultState();
case GOLD:
return IronChestBlocks.goldChestBlock.getDefaultState();
case DIAMOND:
return IronChestBlocks.diamondChestBlock.getDefaultState();
case COPPER:
return IronChestBlocks.copperChestBlock.getDefaultState();
case SILVER:
return IronChestBlocks.silverChestBlock.getDefaultState();
case CRYSTAL:
return IronChestBlocks.crystalChestBlock.getDefaultState();
case OBSIDIAN:
return IronChestBlocks.obsidianChestBlock.getDefaultState();
case DIRTCHEST9000:
return IronChestBlocks.dirtChestBlock.getDefaultState();
default:
return null;
case IRON:
return IronChestBlocks.ironChestBlock.getDefaultState();
case GOLD:
return IronChestBlocks.goldChestBlock.getDefaultState();
case DIAMOND:
return IronChestBlocks.diamondChestBlock.getDefaultState();
case COPPER:
return IronChestBlocks.copperChestBlock.getDefaultState();
case SILVER:
return IronChestBlocks.silverChestBlock.getDefaultState();
case CRYSTAL:
return IronChestBlocks.crystalChestBlock.getDefaultState();
case OBSIDIAN:
return IronChestBlocks.obsidianChestBlock.getDefaultState();
case DIRTCHEST9000:
return IronChestBlocks.dirtChestBlock.getDefaultState();
default:
return null;
}
}
@ -176,24 +177,24 @@ public enum IronChestType implements IStringSerializable
{
switch (this)
{
case IRON:
return new TileEntityIronChest();
case GOLD:
return new TileEntityGoldChest();
case DIAMOND:
return new TileEntityDiamondChest();
case COPPER:
return new TileEntityCopperChest();
case SILVER:
return new TileEntitySilverChest();
case CRYSTAL:
return new TileEntityCrystalChest();
case OBSIDIAN:
return new TileEntityObsidianChest();
case DIRTCHEST9000:
return new TileEntityDirtChest();
default:
return null;
case IRON:
return new TileEntityIronChest();
case GOLD:
return new TileEntityGoldChest();
case DIAMOND:
return new TileEntityDiamondChest();
case COPPER:
return new TileEntityCopperChest();
case SILVER:
return new TileEntitySilverChest();
case CRYSTAL:
return new TileEntityCrystalChest();
case OBSIDIAN:
return new TileEntityObsidianChest();
case DIRTCHEST9000:
return new TileEntityDirtChest();
default:
return null;
}
}
}

8
src/main/java/cpw/mods/ironchest/common/core/IronChestBlocks.java
View File

@ -61,14 +61,18 @@ public class IronChestBlocks
public void registerBlocks()
{
// 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
}
public void registerItems()
{
// 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
}

4
src/main/java/cpw/mods/ironchest/common/core/IronChestItems.java
View File

@ -30,7 +30,9 @@ public class IronChestItems
public void registerItems()
{
// 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
}

10
src/main/java/cpw/mods/ironchest/common/items/ChestChangerType.java
View File

@ -10,6 +10,11 @@
******************************************************************************/
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.CRYSTAL;
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.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
{
//@formatter:off

4
src/main/java/cpw/mods/ironchest/common/items/ItemChestChanger.java
View File

@ -73,7 +73,7 @@ public class ItemChestChanger extends ItemTooltip
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;
if (te != null)
@ -108,7 +108,7 @@ public class ItemChestChanger extends ItemTooltip
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++)
{

10
src/main/java/cpw/mods/ironchest/common/items/ItemTooltip.java
View File

@ -10,12 +10,7 @@
******************************************************************************/
package cpw.mods.ironchest.common.items;
import java.util.List;
import javax.annotation.Nullable;
import com.google.common.collect.Lists;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
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.OnlyIn;
import javax.annotation.Nullable;
import java.util.List;
public class ItemTooltip extends Item
{
public ItemTooltip(Builder properties)
@ -70,7 +68,9 @@ public class ItemTooltip extends Item
{
List<String> list = Lists.newLinkedList();
if (text == null)
{
return list;
}
int j = 0;
int k;
while ((k = text.indexOf("\\n", j)) >= 0)

1
src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java
View File

@ -12,7 +12,6 @@ package cpw.mods.ironchest.common.tileentity;
import com.mojang.datafixers.DataFixUtils;
import com.mojang.datafixers.types.Type;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;

14
src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityCrystalChest.java
View File

@ -10,15 +10,15 @@
******************************************************************************/
package cpw.mods.ironchest.common.tileentity;
import java.util.Collections;
import java.util.Comparator;
import cpw.mods.ironchest.common.blocks.IronChestType;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import java.util.Collections;
import java.util.Comparator;
public class TileEntityCrystalChest extends TileEntityIronChest
{
/** Crystal Chest top stacks */
@ -33,7 +33,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest
public TileEntityCrystalChest()
{
super(IronChestEntityType.CRYSTAL_CHEST, IronChestType.CRYSTAL);
this.topStacks = NonNullList.<ItemStack> withSize(8, ItemStack.EMPTY);
this.topStacks = NonNullList.<ItemStack>withSize(8, ItemStack.EMPTY);
}
@Override
@ -79,7 +79,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest
return;
}
NonNullList<ItemStack> tempCopy = NonNullList.<ItemStack> withSize(this.getSizeInventory(), ItemStack.EMPTY);
NonNullList<ItemStack> tempCopy = NonNullList.<ItemStack>withSize(this.getSizeInventory(), ItemStack.EMPTY);
boolean hasStuff = false;
@ -192,7 +192,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest
{
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;
@ -213,7 +213,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest
return sortList;
}
return NonNullList.<ItemStack> withSize(this.getTopItems().size(), ItemStack.EMPTY);
return NonNullList.<ItemStack>withSize(this.getTopItems().size(), ItemStack.EMPTY);
}
protected void sendTopStacksPacket()

9
src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityIronChest.java
View File

@ -71,14 +71,14 @@ public class TileEntityIronChest extends TileEntityLockableLoot implements IChes
{
super(typeIn);
this.chestType = chestTypeIn;
this.chestContents = NonNullList.<ItemStack> withSize(chestTypeIn.size, ItemStack.EMPTY);
this.chestContents = NonNullList.<ItemStack>withSize(chestTypeIn.size, ItemStack.EMPTY);
}
@Override
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++)
{
@ -139,7 +139,8 @@ public class TileEntityIronChest extends TileEntityLockableLoot implements IChes
{
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)
{
@ -205,7 +206,7 @@ public class TileEntityIronChest extends TileEntityLockableLoot implements IChes
{
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))
{