sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

cleanup, rename 2 items

Browse source
This commit is contained in:
Sen 2025-06-22 22:14:22 +02:00
parent 73f5951962
commit 72d46bfe72
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
164 changed files with 517 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/main/java/client/Client.java
View file

@ -130,9 +130,9 @@ import common.init.SoundEvent;
import common.init.UniverseRegistry;
import common.inventory.InventoryPlayer;
import common.item.Item;
import common.item.ItemBlock;
import common.item.ItemControl;
import common.item.ItemStack;
import common.item.block.ItemBlock;
import common.log.Log;
import common.log.LogLevel;
import common.net.bootstrap.Bootstrap;

2
client/src/main/java/client/renderer/entity/RenderPotion.java
View file

@ -2,8 +2,8 @@ package client.renderer.entity;
import common.entity.projectile.EntityPotion;
import common.init.Items;
import common.item.ItemPotion;
import common.item.ItemStack;
import common.item.tool.ItemPotion;
public class RenderPotion extends RenderItemEntity<EntityPotion>
{

2
client/src/main/java/client/renderer/layers/LayerArmor.java
View file

@ -7,8 +7,8 @@ import client.renderer.entity.RendererLivingEntity;
import client.renderer.model.ModelArmor;
import client.renderer.model.ModelBiped;
import common.entity.types.EntityLiving;
import common.item.ItemArmor;
import common.item.ItemStack;
import common.item.tool.ItemArmor;
public class LayerArmor implements LayerRenderer<EntityLiving>
{

2
client/src/main/java/client/renderer/layers/LayerHeldItem.java
View file

@ -9,8 +9,8 @@ import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.init.Items;
import common.item.Item;
import common.item.ItemBlock;
import common.item.ItemStack;
import common.item.block.ItemBlock;
import common.model.Transforms;
public class LayerHeldItem implements LayerRenderer<EntityLiving>

2
client/src/main/java/client/renderer/particle/EntityFirework.java
View file

@ -5,7 +5,7 @@ import client.renderer.RenderBuffer;
import client.world.WorldClient;
import common.entity.Entity;
import common.init.SoundEvent;
import common.item.ItemDye;
import common.item.material.ItemDye;
import common.tags.TagObject;
import java.util.List;
import common.util.BoundingBox;

2
client/src/main/java/client/util/PlayerController.java
View file

@ -9,9 +9,9 @@ import common.entity.npc.EntityNPC;
import common.init.BlockRegistry;
import common.init.Blocks;
import common.init.EntityRegistry;
import common.item.ItemBlock;
import common.item.ItemControl;
import common.item.ItemStack;
import common.item.block.ItemBlock;
import common.packet.CPacketAction;
import common.packet.CPacketBreak;
import common.packet.CPacketClick;

4
client/src/main/java/client/world/WorldClient.java
View file

@ -19,8 +19,8 @@ import common.init.Blocks;
import common.init.ItemRegistry;
import common.init.Items;
import common.init.SoundEvent;
import common.item.ItemDye;
import common.item.ItemPotion;
import common.item.material.ItemDye;
import common.item.tool.ItemPotion;
import common.log.Log;
import common.model.ParticleType;
import common.rng.Random;

0
client/src/main/resources/textures/items/blaze_powder.png → client/src/main/resources/textures/items/blazing_powder.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 278 B

Before After
Before After

0
client/src/main/resources/textures/items/ghast_tear.png → client/src/main/resources/textures/items/tear.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 126 B

Before After
Before After

2
common/src/main/java/common/block/Block.java
View file

@ -27,8 +27,8 @@ import common.entity.types.EntityLiving;
import common.init.ItemRegistry;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemBlock;
import common.item.ItemStack;
import common.item.block.ItemBlock;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/artificial/BlockBed.java
View file

@ -8,7 +8,7 @@ import common.color.TextColor;
import common.entity.npc.EntityNPC;
import common.init.ItemRegistry;
import common.item.Item;
import common.item.ItemBed;
import common.item.block.ItemBed;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/artificial/BlockCake.java
View file

@ -6,7 +6,7 @@ import common.entity.npc.EntityNPC;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSmallBlock;
import common.item.block.ItemSmallBlock;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/artificial/BlockDoor.java
View file

@ -10,7 +10,7 @@ import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.init.Items;
import common.item.Item;
import common.item.ItemDoor;
import common.item.block.ItemDoor;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

4
common/src/main/java/common/block/artificial/BlockFence.java
View file

@ -9,8 +9,8 @@ import common.entity.Entity;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemFence;
import common.item.ItemLead;
import common.item.block.ItemFence;
import common.item.tool.ItemLead;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

4
common/src/main/java/common/block/artificial/BlockFlowerPot.java
View file

@ -13,9 +13,9 @@ import common.init.ItemRegistry;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemBlock;
import common.item.ItemSmallBlock;
import common.item.ItemStack;
import common.item.block.ItemBlock;
import common.item.block.ItemSmallBlock;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/artificial/BlockMetalBlock.java
View file

@ -6,7 +6,7 @@ import common.block.SoundType;
import common.init.MetalType;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemMetalBlock;
import common.item.block.ItemMetalBlock;
public class BlockMetalBlock extends Block {
private final MetalType metal;

2
common/src/main/java/common/block/artificial/BlockPane.java
View file

@ -8,7 +8,7 @@ import common.entity.Entity;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemBlock;
import common.item.block.ItemBlock;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/artificial/BlockSkull.java
View file

@ -8,7 +8,7 @@ import common.entity.types.EntityLiving;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSmallBlock;
import common.item.block.ItemSmallBlock;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

2
common/src/main/java/common/block/artificial/BlockSlab.java
View file

@ -10,8 +10,8 @@ import common.entity.Entity;
import common.entity.types.EntityLiving;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSlab;
import common.item.ItemStack;
import common.item.block.ItemSlab;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

2
common/src/main/java/common/block/artificial/BlockStainedGlassPane.java
View file

@ -4,7 +4,7 @@ import common.block.Material;
import common.color.DyeColor;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemBlock;
import common.item.block.ItemBlock;
import common.model.BlockLayer;
import common.properties.Property;
import common.world.State;

2
common/src/main/java/common/block/artificial/BlockWall.java
View file

@ -8,7 +8,7 @@ import common.collect.Lists;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemWall;
import common.item.block.ItemWall;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

2
common/src/main/java/common/block/foliage/BlockCarrot.java
View file

@ -3,7 +3,7 @@ package common.block.foliage;
import common.init.Blocks;
import common.init.Items;
import common.item.Item;
import common.item.ItemSeedFood;
import common.item.block.ItemSeedFood;
import common.model.Model;
import common.model.ModelProvider;
import common.world.State;

2
common/src/main/java/common/block/foliage/BlockCrops.java
View file

@ -6,8 +6,8 @@ import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSeeds;
import common.item.ItemStack;
import common.item.block.ItemSeeds;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

2
common/src/main/java/common/block/foliage/BlockDeadBush.java
View file

@ -7,8 +7,8 @@ import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.init.Items;
import common.item.Item;
import common.item.ItemShears;
import common.item.ItemStack;
import common.item.tool.ItemShears;
import common.model.Model;
import common.model.ModelProvider;
import common.rng.Random;

4
common/src/main/java/common/block/foliage/BlockDoublePlant.java
View file

@ -11,9 +11,9 @@ import common.init.Blocks;
import common.init.ItemRegistry;
import common.init.Items;
import common.item.Item;
import common.item.ItemDoublePlant;
import common.item.ItemShears;
import common.item.ItemStack;
import common.item.block.ItemDoublePlant;
import common.item.tool.ItemShears;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

2
common/src/main/java/common/block/foliage/BlockGrass.java
View file

@ -7,7 +7,7 @@ import common.color.Colorizer;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemColored;
import common.item.block.ItemColored;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/foliage/BlockHugeMushroom.java
View file

@ -5,7 +5,7 @@ import common.block.Material;
import common.entity.types.EntityLiving;
import common.init.ItemRegistry;
import common.item.Item;
import common.item.ItemBlock;
import common.item.block.ItemBlock;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

4
common/src/main/java/common/block/foliage/BlockLeaves.java
View file

@ -13,9 +13,9 @@ import common.init.ItemRegistry;
import common.init.WoodType;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemColored;
import common.item.ItemShears;
import common.item.ItemStack;
import common.item.block.ItemColored;
import common.item.tool.ItemShears;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ParticleType;

2
common/src/main/java/common/block/foliage/BlockLilyPad.java
View file

@ -12,7 +12,7 @@ import common.entity.types.EntityLiving;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemLilyPad;
import common.item.block.ItemLilyPad;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

2
common/src/main/java/common/block/foliage/BlockPotato.java
View file

@ -3,8 +3,8 @@ package common.block.foliage;
import common.init.Blocks;
import common.init.Items;
import common.item.Item;
import common.item.ItemSeedFood;
import common.item.ItemStack;
import common.item.block.ItemSeedFood;
import common.model.Model;
import common.model.ModelProvider;
import common.util.BlockPos;

2
common/src/main/java/common/block/foliage/BlockReed.java
View file

@ -6,7 +6,7 @@ import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSmallBlock;
import common.item.block.ItemSmallBlock;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/foliage/BlockStem.java
View file

@ -6,8 +6,8 @@ import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSeeds;
import common.item.ItemStack;
import common.item.block.ItemSeeds;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

4
common/src/main/java/common/block/foliage/BlockTallGrass.java
View file

@ -6,9 +6,9 @@ import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.init.Items;
import common.item.Item;
import common.item.ItemColored;
import common.item.ItemShears;
import common.item.ItemStack;
import common.item.block.ItemColored;
import common.item.tool.ItemShears;
import common.model.Model;
import common.model.ModelProvider;
import common.rng.Random;

4
common/src/main/java/common/block/foliage/BlockVine.java
View file

@ -8,9 +8,9 @@ import common.entity.types.EntityLiving;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemColored;
import common.item.ItemShears;
import common.item.ItemStack;
import common.item.block.ItemColored;
import common.item.tool.ItemShears;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/foliage/BlockWart.java
View file

@ -6,8 +6,8 @@ import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSeeds;
import common.item.ItemStack;
import common.item.block.ItemSeeds;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

2
common/src/main/java/common/block/natural/BlockMetalOre.java
View file

@ -3,7 +3,7 @@ package common.block.natural;
import common.block.SoundType;
import common.init.MetalType;
import common.item.Item;
import common.item.ItemMetalBlock;
import common.item.block.ItemMetalBlock;
public class BlockMetalOre extends BlockOre {
private final MetalType metal;

2
common/src/main/java/common/block/natural/BlockSnow.java
View file

@ -7,8 +7,8 @@ import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSnow;
import common.item.ItemStack;
import common.item.block.ItemSnow;
import common.model.Model;
import common.model.ModelProvider;
import common.model.Transforms;

2
common/src/main/java/common/block/tech/BlockBasePressurePlate.java
View file

@ -7,7 +7,7 @@ import common.entity.Entity;
import common.init.SoundEvent;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemPressurePlate;
import common.item.block.ItemPressurePlate;
import common.model.Model;
import common.model.ModelProvider;
import common.rng.Random;

2
common/src/main/java/common/block/tech/BlockBrewingStand.java
View file

@ -12,8 +12,8 @@ import common.inventory.Container;
import common.inventory.InventoryHelper;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSmallBlock;
import common.item.ItemStack;
import common.item.block.ItemSmallBlock;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/tech/BlockButton.java
View file

@ -13,7 +13,7 @@ import common.entity.types.EntityLiving;
import common.init.SoundEvent;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemButton;
import common.item.block.ItemButton;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

6
common/src/main/java/common/block/tech/BlockCauldron.java
View file

@ -10,10 +10,10 @@ import common.entity.npc.EntityNPC;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemArmor;
import common.item.ItemBanner;
import common.item.ItemSmallBlock;
import common.item.ItemStack;
import common.item.block.ItemBanner;
import common.item.block.ItemSmallBlock;
import common.item.tool.ItemArmor;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

2
common/src/main/java/common/block/tech/BlockChest.java
View file

@ -17,8 +17,8 @@ import common.inventory.InventoryHelper;
import common.inventory.InventoryLargeChest;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemChest;
import common.item.ItemStack;
import common.item.block.ItemChest;
import common.packet.SPacketSoundEffect;
import common.properties.Property;
import common.tileentity.ILockableContainer;

2
common/src/main/java/common/block/tech/BlockDispenser.java
View file

@ -11,8 +11,8 @@ import common.inventory.Container;
import common.inventory.InventoryHelper;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemBlock;
import common.item.ItemStack;
import common.item.block.ItemBlock;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

2
common/src/main/java/common/block/tech/BlockHopper.java
View file

@ -12,8 +12,8 @@ import common.inventory.Container;
import common.inventory.InventoryHelper;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemBlock;
import common.item.ItemStack;
import common.item.block.ItemBlock;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/tech/BlockLever.java
View file

@ -7,7 +7,7 @@ import common.entity.types.EntityLiving;
import common.init.SoundEvent;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemBlock;
import common.item.block.ItemBlock;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

2
common/src/main/java/common/block/tech/BlockNuke.java
View file

@ -8,7 +8,7 @@ import common.init.Blocks;
import common.init.SoundEvent;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemBlock;
import common.item.block.ItemBlock;
import common.model.Model;
import common.model.ModelProvider;
import common.util.BlockPos;

2
common/src/main/java/common/block/tech/BlockPistonBase.java
View file

@ -14,8 +14,8 @@ import common.init.Blocks;
import common.init.SoundEvent;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemPiston;
import common.item.ItemStack;
import common.item.block.ItemPiston;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

2
common/src/main/java/common/block/tech/BlockRedstoneComparator.java
View file

@ -9,7 +9,7 @@ import common.init.Items;
import common.init.SoundEvent;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSmallBlock;
import common.item.block.ItemSmallBlock;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

2
common/src/main/java/common/block/tech/BlockRedstoneRepeater.java
View file

@ -6,7 +6,7 @@ import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemSmallBlock;
import common.item.block.ItemSmallBlock;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

2
common/src/main/java/common/block/tech/BlockRedstoneWire.java
View file

@ -11,7 +11,7 @@ import common.collect.Sets;
import common.init.Blocks;
import common.init.Items;
import common.item.Item;
import common.item.ItemRedstone;
import common.item.block.ItemRedstone;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/tech/BlockTNT.java
View file

@ -11,7 +11,7 @@ import common.init.Items;
import common.init.SoundEvent;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemTNT;
import common.item.block.ItemTNT;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

4
common/src/main/java/common/block/tech/BlockTripWire.java
View file

@ -10,8 +10,8 @@ import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemShears;
import common.item.ItemSmallBlock;
import common.item.block.ItemSmallBlock;
import common.item.tool.ItemShears;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/tech/BlockTripWireHook.java
View file

@ -8,8 +8,8 @@ import common.init.Blocks;
import common.init.SoundEvent;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemBlock;
import common.item.ItemStack;
import common.item.block.ItemBlock;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/block/tile/BlockBannerStanding.java
View file

@ -2,7 +2,7 @@ package common.block.tile;
import common.block.Block;
import common.item.Item;
import common.item.ItemBanner;
import common.item.block.ItemBanner;
import common.properties.Property;
import common.util.BlockPos;
import common.world.State;

2
common/src/main/java/common/block/tile/BlockStandingSign.java
View file

@ -2,7 +2,7 @@ package common.block.tile;
import common.block.Block;
import common.item.Item;
import common.item.ItemSign;
import common.item.block.ItemSign;
import common.properties.Property;
import common.properties.PropertyInteger;
import common.util.BlockPos;

6
common/src/main/java/common/enchantment/Enchantment.java
View file

@ -5,10 +5,10 @@ import common.collect.Maps;
import common.entity.DamageSource;
import common.entity.Entity;
import common.entity.types.EntityLiving;
import common.item.ItemArmor;
import common.item.ItemAxe;
import common.item.ItemShears;
import common.item.ItemStack;
import common.item.tool.ItemArmor;
import common.item.tool.ItemAxe;
import common.item.tool.ItemShears;
import common.rng.Random;
import common.util.Displayable;
import common.util.ExtMath;

10
common/src/main/java/common/enchantment/EnchantmentType.java
View file

@ -2,11 +2,11 @@ package common.enchantment;
import common.attributes.UsageSlot;
import common.item.Item;
import common.item.ItemArmor;
import common.item.ItemBow;
import common.item.ItemFishingRod;
import common.item.ItemSword;
import common.item.ItemTool;
import common.item.tool.ItemArmor;
import common.item.tool.ItemBow;
import common.item.tool.ItemFishingRod;
import common.item.tool.ItemSword;
import common.item.tool.ItemTool;
public enum EnchantmentType
{

2
common/src/main/java/common/entity/animal/EntityHorse.java
View file

@ -26,8 +26,8 @@ import common.inventory.AnimalChest;
import common.inventory.IInvBasic;
import common.inventory.InventoryBasic;
import common.item.Item;
import common.item.ItemMonsterPlacer;
import common.item.ItemStack;
import common.item.spawner.ItemMonsterPlacer;
import common.model.ParticleType;
import common.pathfinding.PathNavigateGround;
import common.potion.Potion;

2
common/src/main/java/common/entity/animal/EntityMooshroom.java
View file

@ -6,8 +6,8 @@ import common.entity.types.EntityLiving;
import common.init.Blocks;
import common.init.Items;
import common.init.SoundEvent;
import common.item.ItemShears;
import common.item.ItemStack;
import common.item.tool.ItemShears;
import common.model.ParticleType;
import common.world.World;

2
common/src/main/java/common/entity/animal/EntityOcelot.java
View file

@ -23,8 +23,8 @@ import common.entity.types.EntityTameable;
import common.init.Items;
import common.init.SoundEvent;
import common.item.Item;
import common.item.ItemFishFood;
import common.item.ItemStack;
import common.item.tool.ItemFishFood;
import common.pathfinding.PathNavigateGround;
import common.tags.TagObject;
import common.vars.Vars;

4
common/src/main/java/common/entity/animal/EntitySheep.java
View file

@ -26,9 +26,9 @@ import common.init.SoundEvent;
import common.inventory.Container;
import common.inventory.InventoryCrafting;
import common.item.Item;
import common.item.ItemDye;
import common.item.ItemShears;
import common.item.ItemStack;
import common.item.material.ItemDye;
import common.item.tool.ItemShears;
import common.pathfinding.PathNavigateGround;
import common.rng.Random;
import common.tags.TagObject;

4
common/src/main/java/common/entity/animal/EntityWolf.java
View file

@ -26,9 +26,9 @@ import common.entity.types.EntityTameable;
import common.init.Items;
import common.init.SoundEvent;
import common.item.Item;
import common.item.ItemDye;
import common.item.ItemFood;
import common.item.ItemStack;
import common.item.material.ItemDye;
import common.item.tool.ItemFood;
import common.model.ParticleType;
import common.pathfinding.PathNavigateGround;
import common.tags.TagObject;

2
common/src/main/java/common/entity/npc/EntityMage.java
View file

@ -5,8 +5,8 @@ import java.util.List;
import common.entity.effect.EntityLightning;
import common.entity.types.EntityLiving;
import common.init.Items;
import common.item.ItemPotion;
import common.item.ItemStack;
import common.item.tool.ItemPotion;
import common.potion.Potion;
import common.potion.PotionEffect;
import common.rng.Random;

2
common/src/main/java/common/entity/npc/EntityMetalhead.java
View file

@ -2,8 +2,8 @@ package common.entity.npc;
import common.init.ItemRegistry;
import common.init.MetalType;
import common.item.ItemMetal;
import common.item.ItemStack;
import common.item.material.ItemMetal;
import common.rng.Random;
import common.world.World;

14
common/src/main/java/common/entity/npc/EntityNPC.java
View file

@ -57,14 +57,14 @@ import common.inventory.InventoryPlayer;
import common.inventory.InventoryWarpChest;
import common.item.Item;
import common.item.ItemAction;
import common.item.ItemArmor;
import common.item.ItemBow;
import common.item.ItemGunBase;
import common.item.ItemHoe;
import common.item.ItemShears;
import common.item.ItemStack;
import common.item.ItemSword;
import common.item.ItemTool;
import common.item.tool.ItemArmor;
import common.item.tool.ItemBow;
import common.item.tool.ItemGunBase;
import common.item.tool.ItemHoe;
import common.item.tool.ItemShears;
import common.item.tool.ItemSword;
import common.item.tool.ItemTool;
import common.model.ParticleType;
import common.network.IClientPlayer;
import common.network.IPlayer;

2
common/src/main/java/common/entity/projectile/EntityDie.java
View file

@ -6,8 +6,8 @@ import common.entity.types.EntityLiving;
import common.entity.types.EntityThrowable;
import common.entity.types.IObjectData;
import common.init.SoundEvent;
import common.item.ItemDie;
import common.item.ItemStack;
import common.item.tool.ItemDie;
import common.tags.TagObject;
import common.util.HitPosition;
import common.world.World;

2
common/src/main/java/common/entity/projectile/EntityPotion.java
View file

@ -6,8 +6,8 @@ import common.entity.types.EntityLiving;
import common.entity.types.EntityThrowable;
import common.entity.types.IObjectData;
import common.init.Items;
import common.item.ItemPotion;
import common.item.ItemStack;
import common.item.tool.ItemPotion;
import common.potion.Potion;
import common.potion.PotionEffect;
import common.tags.TagObject;

4
common/src/main/java/common/entity/types/EntityLiving.java
View file

@ -39,9 +39,9 @@ import common.init.ItemRegistry;
import common.init.Items;
import common.init.SoundEvent;
import common.item.Item;
import common.item.ItemArmor;
import common.item.ItemMonsterPlacer;
import common.item.ItemStack;
import common.item.spawner.ItemMonsterPlacer;
import common.item.tool.ItemArmor;
import common.model.ParticleType;
import common.network.IPlayer;
import common.packet.SPacketEntityAttach;

16
common/src/main/java/common/init/CraftingRegistry.java
View file

@ -19,10 +19,10 @@ import common.color.DyeColor;
import common.entity.animal.EntitySheep;
import common.inventory.InventoryCrafting;
import common.item.Item;
import common.item.ItemArmor;
import common.item.ItemBanner;
import common.item.ItemDye;
import common.item.ItemStack;
import common.item.block.ItemBanner;
import common.item.material.ItemDye;
import common.item.tool.ItemArmor;
import common.tags.TagObject;
import common.tileentity.TileEntityBanner;
import common.world.World;
@ -147,8 +147,8 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.pumpkin_stem, 4), "M", 'M', Blocks.pumpkin);
addShapeless(new ItemStack(Items.pumpkin_pie), Blocks.pumpkin, Items.sugar, Items.egg);
addShapeless(new ItemStack(Items.fermented_spider_eye), Items.spider_eye, Blocks.brown_mushroom, Items.sugar);
addShapeless(new ItemStack(Items.blaze_powder, 2), Items.blaze_rod);
addShapeless(new ItemStack(Items.magma_cream), Items.blaze_powder, Items.slime_ball);
addShapeless(new ItemStack(Items.blazing_powder, 2), Items.blaze_rod);
addShapeless(new ItemStack(Items.magma_cream), Items.blazing_powder, Items.slime_ball);
add(new ItemStack(Blocks.trapped_chest), "#-", '#', Blocks.chest, '-', Blocks.tripwire_hook);
add(new ItemStack(Blocks.warp_chest), "###", "#E#", "###", '#', Blocks.obsidian, 'E', Items.charged_orb);
@ -335,9 +335,9 @@ public abstract class CraftingRegistry
add(new ItemStack(Blocks.sticky_piston, 1), "S", "P", 'S', Items.slime_ball, 'P', Blocks.piston);
add(new ItemStack(Blocks.enchanting_table, 1), " B ", "D#D", "###", '#', Blocks.obsidian, 'B', Items.book, 'D', Items.diamond);
add(new ItemStack(Blocks.anvil, 1), "III", " i ", "iii", 'I', Blocks.iron_block, 'i', Items.iron_ingot);
addShapeless(new ItemStack(Items.charged_orb, 1), Items.orb, Items.blaze_powder);
addShapeless(new ItemStack(Items.fire_charge, 3), Items.gunpowder, Items.blaze_powder, Items.coal);
addShapeless(new ItemStack(Items.fire_charge, 3), Items.gunpowder, Items.blaze_powder, Items.charcoal);
addShapeless(new ItemStack(Items.charged_orb, 1), Items.orb, Items.blazing_powder);
addShapeless(new ItemStack(Items.fire_charge, 3), Items.gunpowder, Items.blazing_powder, Items.coal);
addShapeless(new ItemStack(Items.fire_charge, 3), Items.gunpowder, Items.blazing_powder, Items.charcoal);
add(new ItemStack(Blocks.hopper), "I I", "ICI", " I ", 'I', Items.iron_ingot, 'C', Blocks.chest);

116
common/src/main/java/common/init/ItemRegistry.java
View file

@ -15,70 +15,70 @@ import common.entity.npc.CharacterInfo;
import common.entity.npc.SpeciesInfo;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemAmmo;
import common.item.ItemAppleGold;
import common.item.ItemArmor;
import common.item.ItemArrow;
import common.item.ItemAxe;
import common.item.ItemBanHammer;
import common.item.ItemBlock;
import common.item.ItemBoat;
import common.item.ItemBoltgun;
import common.item.ItemBook;
import common.item.ItemBow;
import common.item.ItemBucket;
import common.item.ItemBucketMilk;
import common.item.ItemCamera;
import common.item.ItemCarrotOnAStick;
import common.item.ItemChargedOrb;
import common.item.ItemDie;
import common.item.ItemDye;
import common.item.ItemDynamite;
import common.item.ItemEditWand;
import common.item.ItemEffect;
import common.item.ItemEgg;
import common.item.ItemEnchantedBook;
import common.item.ItemExpBottle;
import common.item.ItemExterminator;
import common.item.ItemFireball;
import common.item.ItemFirework;
import common.item.ItemFireworkCharge;
import common.item.ItemFishFood;
import common.item.ItemFishingRod;
import common.item.ItemFlintAndSteel;
import common.item.ItemFood;
import common.item.ItemFragile;
import common.item.ItemGlassBottle;
import common.item.ItemHoe;
import common.item.ItemHorseArmor;
import common.item.ItemInfoWand;
import common.item.ItemKey;
import common.item.ItemLead;
import common.item.ItemLightning;
import common.item.ItemMagnet;
import common.item.ItemMagnetic;
import common.item.ItemMetal;
import common.item.ItemMinecart;
import common.item.ItemMonsterPlacer;
import common.item.ItemNameTag;
import common.item.ItemNpcSpawner;
import common.item.ItemNugget;
import common.item.ItemPickaxe;
import common.item.ItemPotion;
import common.item.ItemRecord;
import common.item.ItemRod;
import common.item.ItemSaddle;
import common.item.ItemShears;
import common.item.ItemSmall;
import common.item.ItemSnowball;
import common.item.ItemSoup;
import common.item.ItemSpaceNavigator;
import common.item.ItemShovel;
import common.item.ItemStack;
import common.item.ItemStick;
import common.item.ItemSword;
import common.item.ItemTiny;
import common.item.ItemWeatherToken;
import common.item.block.ItemBlock;
import common.item.material.ItemBook;
import common.item.material.ItemDye;
import common.item.material.ItemEnchantedBook;
import common.item.material.ItemMetal;
import common.item.material.ItemNugget;
import common.item.material.ItemRecord;
import common.item.spawner.ItemBoat;
import common.item.spawner.ItemMinecart;
import common.item.spawner.ItemMonsterPlacer;
import common.item.spawner.ItemNpcSpawner;
import common.item.tool.ItemAmmo;
import common.item.tool.ItemAppleGold;
import common.item.tool.ItemArmor;
import common.item.tool.ItemArrow;
import common.item.tool.ItemAxe;
import common.item.tool.ItemBanHammer;
import common.item.tool.ItemBoltgun;
import common.item.tool.ItemBow;
import common.item.tool.ItemBucket;
import common.item.tool.ItemBucketMilk;
import common.item.tool.ItemCamera;
import common.item.tool.ItemCarrotOnAStick;
import common.item.tool.ItemChargedOrb;
import common.item.tool.ItemDie;
import common.item.tool.ItemDynamite;
import common.item.tool.ItemEditWand;
import common.item.tool.ItemEgg;
import common.item.tool.ItemExpBottle;
import common.item.tool.ItemExterminator;
import common.item.tool.ItemFireball;
import common.item.tool.ItemFirework;
import common.item.tool.ItemFireworkCharge;
import common.item.tool.ItemFishFood;
import common.item.tool.ItemFishingRod;
import common.item.tool.ItemFlintAndSteel;
import common.item.tool.ItemFood;
import common.item.tool.ItemGlassBottle;
import common.item.tool.ItemHoe;
import common.item.tool.ItemHorseArmor;
import common.item.tool.ItemInfoWand;
import common.item.tool.ItemKey;
import common.item.tool.ItemLead;
import common.item.tool.ItemLightning;
import common.item.tool.ItemMagnet;
import common.item.tool.ItemNameTag;
import common.item.tool.ItemPickaxe;
import common.item.tool.ItemPotion;
import common.item.tool.ItemSaddle;
import common.item.tool.ItemShears;
import common.item.tool.ItemShovel;
import common.item.tool.ItemSnowball;
import common.item.tool.ItemSoup;
import common.item.tool.ItemSpaceNavigator;
import common.item.tool.ItemSword;
import common.item.tool.ItemWeatherToken;
import common.log.Log;
import common.potion.Potion;
import common.potion.PotionHelper;
@ -272,7 +272,7 @@ public abstract class ItemRegistry {
registerItem("rotten_flesh", (new ItemFood(4, true)).setDisplay("Verrottetes Fleisch"));
registerItem("orb", (new ItemFragile()).setDisplay("Kugel").setTab(CheatTab.TOOLS));
registerItem("blaze_rod", (new ItemRod()).setDisplay("Lohenrute").setTab(CheatTab.MATERIALS).setMaxAmount(256));
registerItem("ghast_tear", (new ItemTiny()).setDisplay("Ghastträne").setPotionEffect(PotionHelper.ghastTearEffect).setTab(CheatTab.MATERIALS).setMaxAmount(256));
registerItem("tear", (new ItemTiny()).setDisplay("Träne").setPotionEffect(PotionHelper.tearEffect).setTab(CheatTab.MATERIALS).setMaxAmount(256));
registerItem("gold_nugget", (new ItemNugget()).setDisplay("Goldnugget").setTab(CheatTab.METALS).setMaxAmount(256));
for(int data : ItemPotion.getValidDataValues()) {
ItemPotion potion = new ItemPotion(data);
@ -283,7 +283,7 @@ public abstract class ItemRegistry {
.setPotionEffect(PotionHelper.spiderEyeEffect).setMaxAmount(128));
registerItem("fermented_spider_eye", (new Item()).setDisplay("Fermentiertes Spinnenauge")
.setPotionEffect(PotionHelper.fermentedSpiderEyeEffect).setTab(CheatTab.MISC).setMaxAmount(128));
registerItem("blaze_powder", (new Item()).setDisplay("Lohenstaub").setPotionEffect(PotionHelper.blazePowderEffect)
registerItem("blazing_powder", (new Item()).setDisplay("Glühender Staub").setPotionEffect(PotionHelper.blazingPowderEffect)
.setTab(CheatTab.MATERIALS).setMaxAmount(256));
registerItem("magma_cream", (new Item()).setDisplay("Magmacreme").setPotionEffect(PotionHelper.magmaCreamEffect).setTab(CheatTab.MATERIALS).setMaxAmount(128));
registerItem("charged_orb", (new ItemChargedOrb()).setDisplay("Geladene Kugel"));

79
common/src/main/java/common/init/Items.java
View file

@ -11,6 +11,81 @@ import java.util.Set;
import common.collect.Lists;
import common.collect.Sets;
import common.item.*;
import common.item.block.ItemBanner;
import common.item.block.ItemBed;
import common.item.block.ItemBlock;
import common.item.block.ItemButton;
import common.item.block.ItemChest;
import common.item.block.ItemColored;
import common.item.block.ItemDoor;
import common.item.block.ItemDoublePlant;
import common.item.block.ItemFence;
import common.item.block.ItemLilyPad;
import common.item.block.ItemMetalBlock;
import common.item.block.ItemPiston;
import common.item.block.ItemPressurePlate;
import common.item.block.ItemRedstone;
import common.item.block.ItemSeedFood;
import common.item.block.ItemSeeds;
import common.item.block.ItemSign;
import common.item.block.ItemSlab;
import common.item.block.ItemSmallBlock;
import common.item.block.ItemSnow;
import common.item.block.ItemWall;
import common.item.material.ItemBook;
import common.item.material.ItemDye;
import common.item.material.ItemEnchantedBook;
import common.item.material.ItemMetal;
import common.item.material.ItemNugget;
import common.item.material.ItemRecord;
import common.item.spawner.ItemBoat;
import common.item.spawner.ItemMinecart;
import common.item.spawner.ItemMonsterPlacer;
import common.item.spawner.ItemNpcSpawner;
import common.item.tool.ItemAmmo;
import common.item.tool.ItemAppleGold;
import common.item.tool.ItemArmor;
import common.item.tool.ItemAxe;
import common.item.tool.ItemBanHammer;
import common.item.tool.ItemBoltgun;
import common.item.tool.ItemBow;
import common.item.tool.ItemBucket;
import common.item.tool.ItemBucketMilk;
import common.item.tool.ItemCamera;
import common.item.tool.ItemCarrotOnAStick;
import common.item.tool.ItemChargedOrb;
import common.item.tool.ItemDie;
import common.item.tool.ItemDynamite;
import common.item.tool.ItemEditWand;
import common.item.tool.ItemEgg;
import common.item.tool.ItemExpBottle;
import common.item.tool.ItemExterminator;
import common.item.tool.ItemFireball;
import common.item.tool.ItemFirework;
import common.item.tool.ItemFireworkCharge;
import common.item.tool.ItemFishFood;
import common.item.tool.ItemFishingRod;
import common.item.tool.ItemFlintAndSteel;
import common.item.tool.ItemFood;
import common.item.tool.ItemGlassBottle;
import common.item.tool.ItemHoe;
import common.item.tool.ItemHorseArmor;
import common.item.tool.ItemInfoWand;
import common.item.tool.ItemKey;
import common.item.tool.ItemLead;
import common.item.tool.ItemLightning;
import common.item.tool.ItemMagnet;
import common.item.tool.ItemNameTag;
import common.item.tool.ItemPickaxe;
import common.item.tool.ItemPotion;
import common.item.tool.ItemSaddle;
import common.item.tool.ItemShears;
import common.item.tool.ItemShovel;
import common.item.tool.ItemSnowball;
import common.item.tool.ItemSoup;
import common.item.tool.ItemSpaceNavigator;
import common.item.tool.ItemSword;
import common.item.tool.ItemWeatherToken;
import common.util.Util;
@ -116,7 +191,7 @@ public abstract class Items {
public static final ItemBlock blackwood_sapling = get("blackwood_sapling");
public static final ItemSlab blackwood_slab = get("blackwood_slab");
public static final ItemBlock blackwood_stairs = get("blackwood_stairs");
public static final Item blaze_powder = get("blaze_powder");
public static final Item blazing_powder = get("blazing_powder");
public static final ItemRod blaze_rod = get("blaze_rod");
public static final ItemBlock blood_brick = get("blood_brick");
public static final ItemFence blood_brick_fence = get("blood_brick_fence");
@ -311,7 +386,7 @@ public abstract class Items {
public static final ItemBlock floor_tiles_white = get("floor_tiles_white");
public static final ItemSmallBlock flowerpot = get("flowerpot");
public static final ItemBlock furnace = get("furnace");
public static final ItemTiny ghast_tear = get("ghast_tear");
public static final ItemTiny tear = get("tear");
public static final Item ghi_fragment = get("ghi_fragment");
public static final ItemBlock glass = get("glass");
public static final ItemGlassBottle glass_bottle = get("glass_bottle");

2
common/src/main/java/common/init/SmeltingRegistry.java
View file

@ -6,8 +6,8 @@ import java.util.Map.Entry;
import common.block.Block;
import common.collect.Maps;
import common.item.Item;
import common.item.ItemFishFood;
import common.item.ItemStack;
import common.item.tool.ItemFishFood;
import java.util.Set;

2
common/src/main/java/common/inventory/ContainerPlayer.java
View file

@ -7,8 +7,8 @@ import common.attributes.UsageSlot;
import common.collect.Lists;
import common.entity.npc.EntityNPC;
import common.init.CraftingRegistry;
import common.item.ItemArmor;
import common.item.ItemStack;
import common.item.tool.ItemArmor;
public class ContainerPlayer extends Container
{

2
common/src/main/java/common/inventory/InventoryPlayer.java
View file

@ -3,8 +3,8 @@ package common.inventory;
import common.block.Block;
import common.entity.npc.EntityNPC;
import common.item.Item;
import common.item.ItemArmor;
import common.item.ItemStack;
import common.item.tool.ItemArmor;
import common.tags.TagObject;
import java.util.List;

1
common/src/main/java/common/item/ItemStack.java
View file

@ -16,6 +16,7 @@ import common.enchantment.EnchantmentHelper;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.init.ItemRegistry;
import common.item.tool.ItemBow;
import common.rng.Random;
import common.tags.TagObject;
import common.util.BlockPos;

5
common/src/main/java/common/item/ItemBanner.java → common/src/main/java/common/item/block/ItemBanner.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import java.util.List;
@ -10,6 +10,9 @@ import common.color.DyeColor;
import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.model.Model;
import common.model.ModelProvider;
import common.model.Transforms;

5
common/src/main/java/common/item/ItemBed.java → common/src/main/java/common/item/block/ItemBed.java
View file

@ -1,8 +1,11 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.artificial.BlockBed;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.util.BlockPos;
import common.util.ExtMath;
import common.util.Facing;

5
common/src/main/java/common/item/ItemBlock.java → common/src/main/java/common/item/block/ItemBlock.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.color.TextColor;
@ -6,6 +6,9 @@ import common.entity.Entity;
import common.entity.npc.EntityNPC;
import common.init.BlockRegistry;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.model.Model;
import common.model.ModelProvider;
import common.model.Transforms;

2
common/src/main/java/common/item/ItemButton.java → common/src/main/java/common/item/block/ItemButton.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import common.block.tech.BlockButton;
import common.model.Model;

2
common/src/main/java/common/item/ItemChest.java → common/src/main/java/common/item/block/ItemChest.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.model.Model;

2
common/src/main/java/common/item/ItemCloth.java → common/src/main/java/common/item/block/ItemCloth.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.color.DyeColor;

3
common/src/main/java/common/item/ItemColored.java → common/src/main/java/common/item/block/ItemColored.java
View file

@ -1,6 +1,7 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.item.ItemStack;
public class ItemColored extends ItemBlock
{

5
common/src/main/java/common/item/ItemDoor.java → common/src/main/java/common/item/block/ItemDoor.java
View file

@ -1,10 +1,13 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.Material;
import common.block.artificial.BlockDoor;
import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.util.BlockPos;
import common.util.Facing;
import common.world.State;

3
common/src/main/java/common/item/ItemDoublePlant.java → common/src/main/java/common/item/block/ItemDoublePlant.java
View file

@ -1,8 +1,9 @@
package common.item;
package common.item.block;
import common.block.foliage.BlockDoublePlant;
import common.block.foliage.BlockDoublePlant.EnumPlantType;
import common.color.Colorizer;
import common.item.ItemStack;
import common.model.Model;
import common.model.ModelProvider;

2
common/src/main/java/common/item/ItemFence.java → common/src/main/java/common/item/block/ItemFence.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.artificial.BlockFence;

3
common/src/main/java/common/item/ItemLilyPad.java → common/src/main/java/common/item/block/ItemLilyPad.java
View file

@ -1,10 +1,11 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.foliage.BlockLilyPad;
import common.block.liquid.BlockLiquid;
import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.item.ItemStack;
import common.util.BlockPos;
import common.util.HitPosition;
import common.world.State;

3
common/src/main/java/common/item/ItemMetalBlock.java → common/src/main/java/common/item/block/ItemMetalBlock.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import java.util.List;
import java.util.Map;
@ -8,6 +8,7 @@ import common.block.Block;
import common.color.TextColor;
import common.entity.npc.EntityNPC;
import common.init.MetalType;
import common.item.ItemStack;
public class ItemMetalBlock extends ItemBlock {
private final MetalType metal;

2
common/src/main/java/common/item/ItemPiston.java → common/src/main/java/common/item/block/ItemPiston.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.init.Blocks;

2
common/src/main/java/common/item/ItemPressurePlate.java → common/src/main/java/common/item/block/ItemPressurePlate.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.tech.BlockBasePressurePlate;

5
common/src/main/java/common/item/ItemRedstone.java → common/src/main/java/common/item/block/ItemRedstone.java
View file

@ -1,9 +1,12 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.tech.BlockRedstoneWire;
import common.entity.Entity;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.util.BlockPos;
import common.util.Facing;
import common.world.World;

5
common/src/main/java/common/item/ItemSeedFood.java → common/src/main/java/common/item/block/ItemSeedFood.java
View file

@ -1,7 +1,10 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.item.ItemStack;
import common.item.tool.ItemFood;
import common.util.BlockPos;
import common.util.Facing;
import common.world.World;

5
common/src/main/java/common/item/ItemSeeds.java → common/src/main/java/common/item/block/ItemSeeds.java
View file

@ -1,7 +1,10 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.model.Transforms;
import common.util.BlockPos;
import common.util.Facing;

5
common/src/main/java/common/item/ItemSign.java → common/src/main/java/common/item/block/ItemSign.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.tile.BlockSign;
@ -6,6 +6,9 @@ import common.block.tile.BlockStandingSign;
import common.block.tile.BlockWallSign;
import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.tileentity.TileEntity;
import common.tileentity.TileEntitySign;
import common.util.BlockPos;

3
common/src/main/java/common/item/ItemSlab.java → common/src/main/java/common/item/block/ItemSlab.java
View file

@ -1,8 +1,9 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.artificial.BlockSlab;
import common.entity.npc.EntityNPC;
import common.item.ItemStack;
import common.util.BlockPos;
import common.util.Facing;
import common.world.State;

4
common/src/main/java/common/item/ItemSmallBlock.java → common/src/main/java/common/item/block/ItemSmallBlock.java
View file

@ -1,9 +1,11 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.natural.BlockSnow;
import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.item.Item;
import common.item.ItemStack;
import common.util.BlockPos;
import common.util.Facing;
import common.world.State;

3
common/src/main/java/common/item/ItemSnow.java → common/src/main/java/common/item/block/ItemSnow.java
View file

@ -1,8 +1,9 @@
package common.item;
package common.item.block;
import common.block.Block;
import common.block.natural.BlockSnow;
import common.entity.npc.EntityNPC;
import common.item.ItemStack;
import common.util.BlockPos;
import common.util.BoundingBox;
import common.util.Facing;

3
common/src/main/java/common/item/ItemTNT.java → common/src/main/java/common/item/block/ItemTNT.java
View file

@ -1,10 +1,11 @@
package common.item;
package common.item.block;
import common.block.tech.BlockTNT;
import common.color.TextColor;
import common.entity.item.EntityTnt;
import common.entity.types.EntityLiving;
import common.init.SoundEvent;
import common.item.ItemStack;
import common.tileentity.TileEntity;
import common.util.BlockPos;
import common.util.Facing;

2
common/src/main/java/common/item/ItemWall.java → common/src/main/java/common/item/block/ItemWall.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.block;
import common.block.artificial.BlockWall;
import common.model.Model;

5
common/src/main/java/common/item/ItemBook.java → common/src/main/java/common/item/material/ItemBook.java
View file

@ -1,4 +1,7 @@
package common.item;
package common.item.material;
import common.item.Item;
import common.item.ItemStack;
public class ItemBook extends Item
{

5
common/src/main/java/common/item/ItemDye.java → common/src/main/java/common/item/material/ItemDye.java
View file

@ -1,4 +1,4 @@
package common.item;
package common.item.material;
import common.block.Block;
import common.block.artificial.BlockBed;
@ -9,6 +9,9 @@ import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.init.BlockRegistry;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ParticleType;

Some files were not shown because too many files have changed in this diff Show more