item texture rework temp 1

This commit is contained in:
Sen 2025-07-26 13:43:07 +02:00
parent edfd5332ee
commit 28b26d4881
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
255 changed files with 75 additions and 324 deletions

View file

@ -21,7 +21,7 @@ public class BlockClay extends Block
*/
public Item getDrop(State state, Random rand, int fortune)
{
return Items.clay_ball;
return Items.clay_lump;
}
/**

View file

@ -42,7 +42,7 @@ public class BlockGlowstone extends Block
*/
public Item getDrop(State state, Random rand, int fortune)
{
return Items.glowstone_dust;
return Items.glowing_powder;
}
@Serverside

View file

@ -221,7 +221,7 @@ public class EntityTntCart extends EntityCart
}
public Item getItem() {
return Items.tnt_minecart;
return Items.minecart;
}
public EntityType getType() {

View file

@ -1,64 +0,0 @@
package common.entity.item;
import common.entity.types.EntityLiving;
import common.entity.types.EntityThrowable;
import common.util.BlockPos;
import common.util.HitPosition;
import common.world.World;
public class EntityXpBottle extends EntityThrowable
{
public EntityXpBottle(World worldIn)
{
super(worldIn);
}
public EntityXpBottle(World worldIn, EntityLiving p_i1786_2_)
{
super(worldIn, p_i1786_2_);
}
public EntityXpBottle(World worldIn, double x, double y, double z)
{
super(worldIn, x, y, z);
}
/**
* Gets the amount of gravity to apply to the thrown entity with each tick.
*/
protected float getGravityVelocity()
{
return 0.07F;
}
protected float getVelocity()
{
return 0.7F;
}
protected float getInaccuracy()
{
return -20.0F;
}
/**
* Called when this EntityThrowable hits a block or entity.
*/
protected void onImpact(HitPosition p_70184_1_)
{
if (!this.worldObj.client)
{
this.worldObj.playEffect(2002, new BlockPos(this), 0);
int i = this.worldObj.rand.rangeBonus(3, 7, 4);
while (i > 0)
{
int j = EntityXp.getXPSplit(i);
i -= j;
this.worldObj.spawnEntityInWorld(new EntityXp(this.worldObj, this.posX, this.posY, this.posZ, j));
}
this.setDead();
}
}
}

View file

@ -180,7 +180,7 @@ public class EntitySlime extends EntityNPC
World world = this.worldObj;
double d0 = this.posX + (double)f2;
double d1 = this.posZ + (double)f3;
world.clientParticle(ParticleType.ITEM_CRACK, d0, this.getEntityBoundingBox().minY, d1, ItemRegistry.getId(Items.slime_ball));
world.clientParticle(ParticleType.ITEM_CRACK, d0, this.getEntityBoundingBox().minY, d1, ItemRegistry.getId(Items.slime_blob));
}
// if (!this.isChild())

View file

@ -9,8 +9,7 @@ public abstract class FishConstants {
(new RngFishable(new ItemStack(Items.leather_boots), 10)).setMaxDamagePercent(0.9F), new RngFishable(new ItemStack(Items.leather), 10),
new RngFishable(new ItemStack(Items.bone), 10), new RngFishable(new ItemStack(Items.water_bottle), 10),
new RngFishable(new ItemStack(Items.string), 5), (new RngFishable(new ItemStack(Items.fishing_rod), 2)).setMaxDamagePercent(0.9F),
new RngFishable(new ItemStack(Items.bowl), 10), new RngFishable(new ItemStack(Items.stick), 5),
new RngFishable(new ItemStack(Items.ink_sack, 10), 1),
new RngFishable(new ItemStack(Items.stick), 5), new RngFishable(new ItemStack(Items.ink_sack, 10), 1),
new RngFishable(new ItemStack(Items.tripwire_hook), 10), new RngFishable(new ItemStack(Items.rotten_flesh), 10));
public static final WeightedList<RngFishable> FISHING_TREASURE = new WeightedList<RngFishable>(
new RngFishable(new ItemStack(Items.waterlily), 1), new RngFishable(new ItemStack(Items.name_tag), 1),
@ -20,7 +19,5 @@ public abstract class FishConstants {
(new RngFishable(new ItemStack(Items.book), 1)).setEnchantable());
public static final WeightedList<RngFishable> FISH_TYPES = new WeightedList<RngFishable>(
new RngFishable(new ItemStack(Items.cod), 60),
new RngFishable(new ItemStack(Items.salmon), 25),
new RngFishable(new ItemStack(Items.clownfish), 2),
new RngFishable(new ItemStack(Items.pufferfish), 13));
new RngFishable(new ItemStack(Items.salmon), 25));
}

View file

@ -36,7 +36,7 @@ public abstract class CraftingRegistry
{Items.charged_block, new ItemStack(Items.charged_powder, 9)},
{Items.coal_block, new ItemStack(Items.coal, 9)},
{Items.hay_block, new ItemStack(Items.wheat, 9)},
{Items.slime_block, new ItemStack(Items.slime_ball, 9)}
{Items.slime_block, new ItemStack(Items.slime_blob, 9)}
};
private static final List<IRecipe> recipes = Lists.<IRecipe>newArrayList();
@ -133,15 +133,11 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.gold_ingot), "###", "###", "###", '#', Items.gold_nugget);
add(new ItemStack(Items.gold_nugget, 9), "#", '#', Items.gold_ingot);
addShapeless(new ItemStack(Items.mushroom_stew), Items.brown_mushroom, Items.red_mushroom, Items.bowl);
add(new ItemStack(Items.cookie, 8), "#X#", 'X', Items.cocoa_powder, '#', Items.wheat);
add(new ItemStack(Items.melon_block), "MMM", "MMM", "MMM", 'M', Items.melon);
add(new ItemStack(Items.melon_seed), "M", 'M', Items.melon);
add(new ItemStack(Items.pumpkin_seed, 4), "M", 'M', Items.pumpkin);
addShapeless(new ItemStack(Items.pumpkin_pie), Items.pumpkin, Items.sugar, Items.egg);
addShapeless(new ItemStack(Items.fermented_spider_eye), Items.spider_eye, Items.brown_mushroom, Items.sugar);
addShapeless(new ItemStack(Items.blazing_powder, 2), Items.demon_rod);
addShapeless(new ItemStack(Items.magma_cream), Items.blazing_powder, Items.slime_ball);
add(new ItemStack(Items.warp_chest), "###", "#E#", "###", '#', Items.obsidian, 'E', Items.charged_orb);
add(new ItemStack(Items.furnace), "###", "# #", "###", '#', Items.cobblestone);
@ -210,7 +206,6 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.paper, 3), "###", '#', Items.reeds);
addShapeless(new ItemStack(Items.book, 1), Items.paper, Items.paper, Items.paper, Items.leather);
addShapeless(new ItemStack(Items.writable_book, 1), Items.book, Items.ink_sack, Items.feather);
for(WoodType wood : WoodType.values()) {
Item planks = ItemRegistry.byName(wood.getName() + "_planks");
add(new ItemStack(ItemRegistry.byName(wood.getName() + "_fence"), 3), "W#W", "W#W", '#', Items.stick, 'W', planks);
@ -230,7 +225,6 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.trapdoor, 2), "###", "###", '#', planks);
add(new ItemStack(Items.sign, 3), "###", "###", " X ", '#', planks, 'X', Items.stick);
add(new ItemStack(Items.stick, 4), "#", "#", '#', planks);
add(new ItemStack(Items.bowl, 4), "# #", " # ", '#', planks);
add(new ItemStack(Items.boat, 1), "# #", "###", '#', planks);
add(new ItemStack(Items.tripwire_hook, 2), "I", "S", "#", '#', planks, 'S', Items.stick, 'I', Items.iron_ingot);
add(new ItemStack(Items.wooden_button, 1), "#", '#', planks);
@ -245,12 +239,12 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.mossy_cobblestone_wall, 6), "###", "###", '#', Items.mossy_cobblestone);
add(new ItemStack(Items.blood_brick_fence, 6), "###", "###", '#', Items.blood_brick);
add(new ItemStack(Items.lead, 2), "~~ ", "~O ", " ~", '~', Items.string, 'O', Items.slime_ball);
add(new ItemStack(Items.lead, 2), "~~ ", "~O ", " ~", '~', Items.string, 'O', Items.slime_blob);
add(new ItemStack(Items.snow, 1), "##", "##", '#', Items.snowball);
add(new ItemStack(Items.snow_layer, 6), "###", '#', Items.snow);
add(new ItemStack(Items.clay, 1), "##", "##", '#', Items.clay_ball);
add(new ItemStack(Items.clay, 1), "##", "##", '#', Items.clay_lump);
add(new ItemStack(Items.brick_block, 1), "##", "##", '#', Items.brick);
add(new ItemStack(Items.glowstone, 1), "##", "##", '#', Items.glowstone_dust);
add(new ItemStack(Items.glowstone, 1), "##", "##", '#', Items.glowing_powder);
add(new ItemStack(Items.quartz_block, 1), "##", "##", '#', Items.quartz);
add(new ItemStack(Items.white_wool, 1), "##", "##", '#', Items.string);
add(new ItemStack(Items.tnt, 1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.sand);
@ -278,7 +272,6 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.minecart, 1), "# #", "###", '#', Items.iron_ingot);
add(new ItemStack(Items.cauldron, 1), "# #", "# #", "###", '#', Items.iron_ingot);
add(new ItemStack(Items.brewing_stand, 1), " B ", "###", '#', Items.cobblestone, 'B', Items.demon_rod);
add(new ItemStack(Items.tnt_minecart, 1), "A", "B", 'A', Items.tnt, 'B', Items.minecart);
add(new ItemStack(Items.bucket, 1), "# #", " # ", '#', Items.iron_ingot);
add(new ItemStack(Items.flowerpot, 1), "# #", " # ", '#', Items.brick);
addShapeless(new ItemStack(Items.lighter, 1), new ItemStack(Items.iron_ingot, 1), new ItemStack(Items.flint, 1));
@ -295,7 +288,6 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.golden_apple, 1), "###", "#X#", "###", '#', Items.gold_ingot, 'X', Items.apple);
add(new ItemStack(Items.charged_apple, 1), "###", "#X#", "###", '#', Items.gold_block, 'X', Items.apple);
add(new ItemStack(Items.golden_carrot, 1), "###", "#X#", "###", '#', Items.gold_nugget, 'X', Items.carrot);
add(new ItemStack(Items.speckled_melon, 1), "###", "#X#", "###", '#', Items.gold_nugget, 'X', Items.melon);
add(new ItemStack(Items.lever, 1), "X", "#", '#', Items.cobblestone, 'X', Items.stick);
add(new ItemStack(Items.navigator, 1), " # ", "#X#", " # ", '#', Items.iron_ingot, 'X', Items.charged_powder);
add(new ItemStack(Items.stone_button, 1), "#", '#', Items.stone);
@ -304,7 +296,7 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.light_weighted_pressure_plate, 1), "##", '#', Items.gold_ingot);
add(new ItemStack(Items.dispenser, 1), "###", "#X#", "#R#", '#', Items.cobblestone, 'X', Items.bow, 'R', Items.charged_powder);
add(new ItemStack(Items.dropper, 1), "###", "# #", "#R#", '#', Items.cobblestone, 'R', Items.charged_powder);
add(new ItemStack(Items.sticky_piston, 1), "S", "P", 'S', Items.slime_ball, 'P', Items.piston);
add(new ItemStack(Items.sticky_piston, 1), "S", "P", 'S', Items.slime_blob, 'P', Items.piston);
add(new ItemStack(Items.enchanting_table, 1), " B ", "D#D", "###", '#', Items.obsidian, 'B', Items.book, 'D', Items.diamond);
add(new ItemStack(Items.anvil, 1), "III", " i ", "iii", 'I', Items.iron_block, 'i', Items.iron_ingot);
addShapeless(new ItemStack(Items.charged_orb, 1), Items.orb, Items.blazing_powder);
@ -313,7 +305,7 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.hopper), "I I", "ICI", " I ", 'I', Items.iron_ingot, 'C', Items.chest);
add(new ItemStack(Items.dynamite, 1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.clay_ball);
add(new ItemStack(Items.dynamite, 1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.clay_lump);
add(new ItemStack(Items.dynamite_1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.dynamite);
add(new ItemStack(Items.dynamite_2), "##", "##", '#', Items.dynamite_1);
addShapeless(new ItemStack(Items.dynamite_3), Items.dynamite_2, Items.dynamite_2);
@ -323,7 +315,6 @@ public abstract class CraftingRegistry
addShapeless(new ItemStack(Items.dynamite_7), Items.dynamite_6, Items.dynamite_6);
add(new ItemStack(Items.portal_frame, 1), "XYX", "X#X", "XXX", 'X', Items.obsidian, 'Y', Items.orb, '#', Items.charged_orb);
add(new ItemStack(Items.experience_bottle, 1), "YXY", "X#X", "YXY", 'X', Items.glass_pane, 'Y', Items.glowstone, '#', Items.emerald);
add(new ItemStack(Items.mob_spawner, 1), "###", "#X#", "###", 'X', Items.charge_crystal, '#', Items.iron_bars);
add(new ItemStack(Items.dragon_egg, 1), "###", "#X#", "#D#", 'X', Items.charge_crystal, 'D', Items.diamond, '#', Items.obsidian);

View file

@ -29,7 +29,6 @@ import common.entity.item.EntityOrb;
import common.entity.item.EntityTnt;
import common.entity.item.EntityTntCart;
import common.entity.item.EntityXp;
import common.entity.item.EntityXpBottle;
import common.entity.npc.SpeciesInfo;
import common.entity.projectile.EntityArrow;
import common.entity.projectile.EntityBox;
@ -245,7 +244,6 @@ public abstract class EntityRegistry {
registerEntity("FireCharge", EntityFireCharge.class, "Feuerkugel");
registerEntity("Orb", EntityOrb.class, "Geladene Kugel");
registerEntity("Potion", EntityPotion.class, "Trank");
registerEntity("XpBottle", EntityXpBottle.class, "Erfahrungsfläschchen");
registerEntity("Box", EntityBox.class, "Eisenwürfel");
registerEntity("Tnt", EntityTnt.class, "TNT");
registerEntity("Falling", EntityFalling.class, "Fallender Block");

View file

@ -32,7 +32,6 @@ import common.item.consumable.ItemFishFood;
import common.item.consumable.ItemFood;
import common.item.consumable.ItemPotion;
import common.item.consumable.ItemSeedFood;
import common.item.consumable.ItemSoup;
import common.item.material.ItemArmor;
import common.item.material.ItemBook;
import common.item.material.ItemBottle;
@ -47,7 +46,6 @@ import common.item.projectile.ItemChargedOrb;
import common.item.projectile.ItemDie;
import common.item.projectile.ItemDynamite;
import common.item.projectile.ItemEgg;
import common.item.projectile.ItemExpBottle;
import common.item.projectile.ItemFireball;
import common.item.projectile.ItemSnowball;
import common.item.spawner.ItemBoat;
@ -182,9 +180,7 @@ public abstract class ItemRegistry {
register("milk_bucket", (new ItemBucketMilk()).setDisplay("Milch").setContainerItem(bucket));
register("boat", (new ItemBoat()).setDisplay("Boot"));
register("minecart", (new ItemMinecart(false)).setDisplay("Lore"));
register("tnt_minecart", (new ItemMinecart(true)).setDisplay("TNT-Lore")
.setColor(TextColor.RED));
register("minecart", (new ItemMinecart()).setDisplay("Lore"));
for(EntityInfo egg : EntityRegistry.DNA.values()) {
register("dna_sample_" + egg.id().toLowerCase(), (new ItemMobTemplate(egg.id()))
.setMaxAmount(StackSize.L));
@ -235,8 +231,6 @@ public abstract class ItemRegistry {
register("coal", coal);
register("charcoal", (new Item()).setDisplay("Holzkohle").setTab(CheatTab.METALS));
register("stick", (new Item()).setDisplay("Stock").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL));
register("bowl", (new Item()).setDisplay("Schüssel").setTab(CheatTab.MISC));
register("mushroom_stew", (new ItemSoup(6)).setDisplay("Pilzsuppe"));
register("feather", (new Item()).setDisplay("Feder").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XXL));
register("gunpowder", (new Item()).setDisplay("Schwarzpulver").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL));
register("wheat", (new Item()).setDisplay("Weizen").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L));
@ -252,20 +246,19 @@ public abstract class ItemRegistry {
register("snowball", (new ItemSnowball()).setDisplay("Schneeball").setMaxAmount(StackSize.L));
register("leather", (new Item()).setDisplay("Leder").setTab(CheatTab.MATERIALS));
register("brick", (new Item()).setDisplay("Ziegel").setTab(CheatTab.MATERIALS));
register("clay_ball", (new Item()).setDisplay("Ton").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L));
register("clay_lump", (new Item()).setDisplay("Ton").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L));
register("paper", (new Item()).setDisplay("Papier").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL).setDefaultColor(0xffffff));
register("book", (new ItemBook()).setDisplay("Buch").setTab(CheatTab.MISC));
register("slime_ball", (new Item()).setDisplay("Schleimball").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L));
register("slime_blob", (new Item()).setDisplay("Schleim").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L));
register("egg", (new ItemEgg()).setDisplay("Ei").setMaxAmount(StackSize.L));
register("navigator", (new ItemSpaceNavigator()).setDisplay("Elektronischer Navigator").setTab(CheatTab.TOOLS));
register("exterminator", (new ItemExterminator()).setDisplay("Weltenzerstörer"));
register("fishing_rod", (new ItemFishingRod()).setDisplay("Angel"));
register("glowstone_dust", (new Item()).setDisplay("Glowstonestaub")
register("glowing_powder", (new Item()).setDisplay("Glühender Staub")
.setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL));
for(ItemFishFood.FishType type : ItemFishFood.FishType.values()) {
register(type.getName(), (new ItemFishFood(false, type)));
if(type.canCook())
register("cooked_" + type.getName(), (new ItemFishFood(true, type)));
register("cooked_" + type.getName(), (new ItemFishFood(true, type)));
}
Item lapis = null;
for(DyeColor color : DyeColor.values()) {
@ -294,20 +287,12 @@ public abstract class ItemRegistry {
for(Pair<String, StatusEffect> pot : ItemPotion.getBrewedPotions()) {
register(pot.first(), new ItemPotion(pot.second().getPotion(), pot.second()));
}
register("spider_eye", (new ItemFood(2, false)).setPotionEffect(Effect.POISON, 5, 0, 1.0F).setDisplay("Spinnenauge")
register("eye", (new ItemFood(2, false)).setPotionEffect(Effect.POISON, 5, 0, 1.0F).setDisplay("Auge")
.setMaxAmount(StackSize.L));
register("fermented_spider_eye", (new Item()).setDisplay("Fermentiertes Spinnenauge")
.setTab(CheatTab.MISC).setMaxAmount(StackSize.L));
register("blazing_powder", (new Item()).setDisplay("Glühender Staub")
register("blazing_powder", (new Item()).setDisplay("Schillernder Staub")
.setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL));
register("magma_cream", (new Item()).setDisplay("Magmacreme").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L));
register("charged_orb", (new ItemChargedOrb()).setDisplay("Geladene Kugel"));
register("speckled_melon", (new Item()).setDisplay("Glitzernde Melone")
.setTab(CheatTab.MISC));
register("experience_bottle", (new ItemExpBottle()).setDisplay("Erfahrungsfläschchen"));
register("fireball", (new ItemFireball()).setDisplay("Feuerkugel"));
register("writable_book", (new Item()).setDisplay("Buch und Feder").setTab(CheatTab.TOOLS));
register("written_book", (new Item()).setDisplay("Beschriebenes Buch").setTab(CheatTab.MISC));
Item emerald = (new Item()).setDisplay("Smaragd").setTab(CheatTab.METALS);
register("emerald", emerald);
@ -321,11 +306,9 @@ public abstract class ItemRegistry {
register("baked_potato", (new ItemFood(5, false)).setDisplay("Ofenkartoffel").setMaxAmount(StackSize.L));
register("poisonous_potato", (new ItemFood(2, false)).setPotionEffect(Effect.POISON, 5, 0, 0.6F).setDisplay("Giftige Kartoffel").setMaxAmount(StackSize.L));
register("golden_carrot", (new ItemFood(6, false)).setDisplay("Goldene Karotte")
);
register("golden_carrot", (new ItemFood(6, false)).setDisplay("Goldene Karotte"));
register("carrot_on_a_stick", (new ItemCarrotOnAStick()).setDisplay("Karottenrute"));
register("charge_crystal", (new Item()).setDisplay("Energiekristall").setTab(CheatTab.MISC).setColor(TextColor.DMAGENTA).setGleaming());
register("pumpkin_pie", (new ItemFood(8, false)).setDisplay("Kürbiskuchen").setTab(CheatTab.FOOD));
for(Enchantment ench : Enchantment.values()) {
register("enchanted_book_" + ench.getName(), (new ItemEnchantedBook(ench, 1)).setUnstackable().setDisplay("Verzaubertes Buch mit " + ench.getFormattedName(1)).setTab(CheatTab.ENCHANTMENTS));
int max = ench.getMaxLevel();

View file

@ -17,7 +17,6 @@ import common.item.consumable.ItemFishFood;
import common.item.consumable.ItemFood;
import common.item.consumable.ItemPotion;
import common.item.consumable.ItemSeedFood;
import common.item.consumable.ItemSoup;
import common.item.material.ItemArmor;
import common.item.material.ItemBook;
import common.item.material.ItemBottle;
@ -32,7 +31,6 @@ import common.item.projectile.ItemChargedOrb;
import common.item.projectile.ItemDie;
import common.item.projectile.ItemDynamite;
import common.item.projectile.ItemEgg;
import common.item.projectile.ItemExpBottle;
import common.item.projectile.ItemFireball;
import common.item.projectile.ItemSnowball;
import common.item.spawner.ItemBoat;
@ -194,7 +192,6 @@ public abstract class Items {
public static final ItemBook book = get("book");
public static final Item bookshelf = get("bookshelf");
public static final ItemBow bow = get("bow");
public static final Item bowl = get("bowl");
public static final ItemFood bread = get("bread");
public static final Item brewing_stand = get("brewing_stand");
public static final Item brick = get("brick");
@ -254,7 +251,7 @@ public abstract class Items {
public static final Item cinnabar_block = get("cinnabar_block");
public static final Item cinnabar_ore = get("cinnabar_ore");
public static final Item clay = get("clay");
public static final Item clay_ball = get("clay_ball");
public static final Item clay_lump = get("clay_lump");
public static final ItemArmor cloth_boots = get("cloth_boots");
public static final ItemArmor cloth_chestplate = get("cloth_chestplate");
public static final ItemArmor cloth_helmet = get("cloth_helmet");
@ -343,10 +340,8 @@ public abstract class Items {
public static final Item emerald_block = get("emerald_block");
public static final Item emerald_ore = get("emerald_ore");
public static final Item enchanting_table = get("enchanting_table");
public static final ItemExpBottle experience_bottle = get("experience_bottle");
public static final ItemExterminator exterminator = get("exterminator");
public static final Item feather = get("feather");
public static final Item fermented_spider_eye = get("fermented_spider_eye");
public static final Item fern = get("fern");
public static final ItemFireball fireball = get("fireball");
public static final ItemFishingRod fishing_rod = get("fishing_rod");
@ -364,7 +359,7 @@ public abstract class Items {
public static final ItemBottle bottle = get("bottle");
public static final Item glass_pane = get("glass_pane");
public static final Item glowstone = get("glowstone");
public static final Item glowstone_dust = get("glowstone_dust");
public static final Item glowing_powder = get("glowing_powder");
public static final ItemAxe gold_axe = get("gold_axe");
public static final Item gold_block = get("gold_block");
public static final ItemArmor gold_boots = get("gold_boots");
@ -488,7 +483,6 @@ public abstract class Items {
public static final Item magenta_glass_pane = get("magenta_glass_pane");
public static final Item magenta_wool = get("magenta_wool");
public static final ItemBucket magma_bucket = get("magma_bucket");
public static final Item magma_cream = get("magma_cream");
public static final Item magnesium_block = get("magnesium_block");
public static final Item magnesium_ore = get("magnesium_ore");
public static final ItemMetal magnesium_powder = get("magnesium_powder");
@ -521,7 +515,6 @@ public abstract class Items {
public static final Item mossy_cobblestone = get("mossy_cobblestone");
public static final Item mossy_cobblestone_wall = get("mossy_cobblestone_wall");
public static final Item mossy_stonebrick = get("mossy_stonebrick");
public static final ItemSoup mushroom_stew = get("mushroom_stew");
public static final Item mycelium = get("mycelium");
public static final ItemNameTag name_tag = get("name_tag");
public static final ItemSpaceNavigator navigator = get("navigator");
@ -607,7 +600,6 @@ public abstract class Items {
public static final ItemMetal praseodymium_ingot = get("praseodymium_ingot");
public static final Item praseodymium_ore = get("praseodymium_ore");
public static final Item pumpkin = get("pumpkin");
public static final ItemFood pumpkin_pie = get("pumpkin_pie");
public static final ItemSeeds pumpkin_seed = get("pumpkin_seed");
public static final Item purple_bed = get("purple_bed");
public static final Item purple_carpet = get("purple_carpet");
@ -695,7 +687,7 @@ public abstract class Items {
public static final Item silver_ore = get("silver_ore");
public static final Item silver_wool = get("silver_wool");
public static final Item skull = get("skull");
public static final Item slime_ball = get("slime_ball");
public static final Item slime_blob = get("slime_blob");
public static final Item slime_block = get("slime_block");
public static final ItemBucket slime_bucket = get("slime_bucket");
public static final Item smooth_rock = get("smooth_rock");
@ -708,8 +700,7 @@ public abstract class Items {
public static final ItemMetal sodium_powder = get("sodium_powder");
public static final Item soul_sand = get("soul_sand");
public static final ItemSeeds soul_wart = get("soul_wart");
public static final Item speckled_melon = get("speckled_melon");
public static final ItemFood spider_eye = get("spider_eye");
public static final ItemFood eye = get("eye");
public static final Item sponge = get("sponge");
public static final ItemBucket spring_water_bucket = get("spring_water_bucket");
public static final Item spruce_door = get("spruce_door");
@ -790,7 +781,6 @@ public abstract class Items {
public static final Item tnt_5 = get("tnt_5");
public static final Item tnt_6 = get("tnt_6");
public static final Item tnt_7 = get("tnt_7");
public static final ItemMinecart tnt_minecart = get("tnt_minecart");
public static final Item trapdoor = get("trapdoor");
public static final Item tripwire_hook = get("tripwire_hook");
public static final Item tungsten_block = get("tungsten_block");
@ -842,8 +832,6 @@ public abstract class Items {
public static final Item wooden_button = get("wooden_button");
public static final Item wooden_pressure_plate = get("wooden_pressure_plate");
public static final Item workbench = get("workbench");
public static final Item writable_book = get("writable_book");
public static final Item written_book = get("written_book");
public static final Item yellow_carpet = get("yellow_carpet");
public static final Item yellow_clay = get("yellow_clay");
public static final ItemDye yellow_dye = get("yellow_dye");
@ -857,8 +845,6 @@ public abstract class Items {
public static final ItemFishFood cooked_cod = get("cooked_cod");
public static final ItemFishFood salmon = get("salmon");
public static final ItemFishFood cooked_salmon = get("cooked_salmon");
public static final ItemFishFood clownfish = get("clownfish");
public static final ItemFishFood pufferfish = get("pufferfish");
public static final Item concrete = get("concrete");
public static final Item concrete_slab = get("concrete_slab");
public static final Item concrete_stairs = get("concrete_stairs");

View file

@ -29,7 +29,7 @@ public abstract class SmeltingRegistry
add(Items.chicken, new ItemStack(Items.cooked_chicken), 0.35F);
add(Items.cobblestone, new ItemStack(Items.stone), 0.1F);
add(Items.stonebrick, new ItemStack(Items.cracked_stonebrick), 0.1F);
add(Items.clay_ball, new ItemStack(Items.brick), 0.3F);
add(Items.clay_lump, new ItemStack(Items.brick), 0.3F);
add(Items.clay, new ItemStack(Items.hardened_clay), 0.35F);
add(Items.cactus, new ItemStack(Items.cactus_green), 0.2F);
add(Items.potato, new ItemStack(Items.baked_potato), 0.35F);
@ -37,10 +37,7 @@ public abstract class SmeltingRegistry
for (ItemFishFood.FishType fish : ItemFishFood.FishType.values())
{
if (fish.canCook())
{
add(ItemRegistry.byName(fish.getName()), new ItemStack(ItemRegistry.byName("cooked_" + fish.getName())), 0.35F);
}
add(ItemRegistry.byName(fish.getName()), new ItemStack(ItemRegistry.byName("cooked_" + fish.getName())), 0.35F);
}
add(Items.emerald_ore, new ItemStack(Items.emerald), 1.0F);

View file

@ -20,7 +20,6 @@ public abstract class TradeRegistry {
new GemForItem(Items.carrot, new PriceInfo(15, 19)),
new ItemForGem(Items.bread, new PriceInfo(-4, -2)),
new GemForItem(Items.pumpkin, new PriceInfo(8, 13)),
new ItemForGem(Items.pumpkin_pie, new PriceInfo(-3, -2)),
new GemForItem(Items.melon_block, new PriceInfo(7, 12)),
new ItemForGem(Items.apple, new PriceInfo(-5, -7)),
new ItemForGem(Items.cookie, new PriceInfo(-6, -10)),
@ -47,7 +46,6 @@ public abstract class TradeRegistry {
new ItemForGem(Items.navigator, new PriceInfo(10, 12)),
new ItemForGem(Items.bookshelf,
new PriceInfo(3, 4)),
new GemForItem(Items.written_book, new PriceInfo(2, 2)),
new ItemForGem(Items.glass,
new PriceInfo(-5, -3)),
new BookForGem(),
@ -59,7 +57,6 @@ public abstract class TradeRegistry {
new ItemForGem(Items.ink_sack, new PriceInfo(-2, -1)),
new ItemForGem(Items.charged_orb, new PriceInfo(7, 11)),
new ItemForGem(Items.glowstone, new PriceInfo(-3, -1)),
new ItemForGem(Items.experience_bottle, new PriceInfo(3, 11)),
new GemForItem(Items.coal, new PriceInfo(16, 24)),
new ItemForGem(Items.iron_helmet, new PriceInfo(4, 6)),
new GemForItem(Items.iron_ingot, new PriceInfo(7, 9)),

View file

@ -1,102 +1,60 @@
package common.item.consumable;
import common.effect.Effect;
import common.effect.StatusEffect;
import common.entity.npc.EntityNPC;
import common.item.ItemStack;
import common.world.World;
public class ItemFishFood extends ItemFood
{
private final boolean cooked;
private final FishType type;
public class ItemFishFood extends ItemFood {
private final boolean cooked;
private final FishType type;
public ItemFishFood(boolean cooked, FishType type)
{
super(0, false);
this.cooked = cooked;
this.type = type;
this.setDisplay((this.type.canCook() ? (this.cooked ? "Gebratener " : "Roher ") : "") + this.type.getDisplay());
}
public FishType getType() {
return this.type;
}
public boolean isCooked() {
return this.cooked;
}
public ItemFishFood(boolean cooked, FishType type) {
super(0, false);
this.cooked = cooked;
this.type = type;
this.setDisplay((this.cooked ? "Gebratener " : "Roher ") + this.type.getDisplay());
}
public int getHealAmount(ItemStack stack)
{
return this.cooked && this.type.canCook() ? this.type.getCookedHealAmount() : this.type.getUncookedHealAmount();
}
public FishType getType() {
return this.type;
}
protected void onFoodEaten(ItemStack stack, World worldIn, EntityNPC player)
{
if (this.type == ItemFishFood.FishType.PUFFERFISH)
{
player.addEffect(new StatusEffect(Effect.POISON, 1200, 3));
player.addEffect(new StatusEffect(Effect.NAUSEA, 300, 1));
}
public boolean isCooked() {
return this.cooked;
}
super.onFoodEaten(stack, worldIn, player);
}
public int getHealAmount(ItemStack stack) {
return this.cooked ? this.type.getCookedHealAmount() : this.type.getUncookedHealAmount();
}
public static enum FishType
{
COD("cod", "Kabeljau", 2, 5),
SALMON("salmon", "Lachs", 2, 6),
CLOWNFISH("clownfish", "Clownfisch", 1),
PUFFERFISH("pufferfish", "Kugelfisch", 1);
public static enum FishType {
COD("cod", "Kabeljau", 2, 5),
SALMON("salmon", "Lachs", 2, 6);
private final String name;
private final String display;
private final int uncookedHealAmount;
private final int cookedHealAmount;
private boolean cookable = false;
private final String name;
private final String display;
private final int uncookedHealAmount;
private final int cookedHealAmount;
private FishType(String name, String display, int uncookedHeal, int cookedHeal)
{
this.name = name;
this.display = display;
this.uncookedHealAmount = uncookedHeal;
this.cookedHealAmount = cookedHeal;
this.cookable = true;
}
private FishType(String name, String display, int uncookedHeal, int cookedHeal) {
this.name = name;
this.display = display;
this.uncookedHealAmount = uncookedHeal;
this.cookedHealAmount = cookedHeal;
}
private FishType(String name, String display, int uncookedHeal)
{
this.name = name;
this.display = display;
this.uncookedHealAmount = uncookedHeal;
this.cookedHealAmount = 0;
this.cookable = false;
}
public String getDisplay() {
return this.display;
}
public String getDisplay()
{
return this.display;
}
public String getName() {
return this.name;
}
public String getName()
{
return this.name;
}
public int getUncookedHealAmount() {
return this.uncookedHealAmount;
}
public int getUncookedHealAmount()
{
return this.uncookedHealAmount;
}
public int getCookedHealAmount()
{
return this.cookedHealAmount;
}
public boolean canCook()
{
return this.cookable;
}
}
public int getCookedHealAmount() {
return this.cookedHealAmount;
}
}
}

View file

@ -1,25 +0,0 @@
package common.item.consumable;
import common.entity.npc.EntityNPC;
import common.init.Items;
import common.item.ItemStack;
import common.world.World;
public class ItemSoup extends ItemFood
{
public ItemSoup(int healAmount)
{
super(healAmount, false);
this.setUnstackable();
}
/**
* Called when the player finishes using this Item (E.g. finishes eating.). Not called when the player stops using
* the Item before the action is complete.
*/
public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityNPC playerIn)
{
super.onItemUseFinish(stack, worldIn, playerIn);
return new ItemStack(Items.bowl);
}
}

View file

@ -11,6 +11,6 @@ public class ItemRecord extends Item {
@Clientside
public String[] getTextures(String name) {
return new String[] {"record_old"};
return new String[] {"paper"};
}
}

View file

@ -1,55 +0,0 @@
package common.item.projectile;
import common.entity.item.EntityXpBottle;
import common.entity.npc.EntityNPC;
import common.init.SoundEvent;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.tileentity.TileEntity;
import common.util.BlockPos;
import common.util.Facing;
import common.util.Serverside;
import common.util.Vec3;
import common.world.AWorldServer;
import common.world.World;
public class ItemExpBottle extends Item
{
public ItemExpBottle()
{
this.setTab(CheatTab.MAGIC);
this.setGleaming();
}
/**
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/
public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityNPC playerIn)
{
// if (!playerIn.creative)
// {
itemStackIn.decrSize();
// }
worldIn.playSoundAtEntity(playerIn, SoundEvent.THROW, 0.5F);
if (!worldIn.client)
{
worldIn.spawnEntityInWorld(new EntityXpBottle(worldIn, playerIn));
}
// playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]);
return itemStackIn;
}
@Serverside
public ItemStack dispenseStack(AWorldServer world, TileEntity source, Vec3 position, BlockPos blockpos, Facing facing, ItemStack stack) {
return this.dispenseProjectile(world, facing, stack, new EntityXpBottle(world, position.xCoord, position.yCoord, position.zCoord), 1.375f, 3.0f);
}
@Serverside
public int getDispenseSoundId() {
return 1002;
}
}

View file

@ -3,7 +3,6 @@ package common.item.spawner;
import common.block.tech.BlockRail;
import common.entity.item.EntityCart;
import common.entity.item.EntityMinecart;
import common.entity.item.EntityTntCart;
import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.item.CheatTab;
@ -20,22 +19,13 @@ import common.world.World;
public class ItemMinecart extends Item
{
private final boolean tnt;
public ItemMinecart(boolean tnt)
public ItemMinecart()
{
this.setUnstackable();
this.tnt = tnt;
this.setTab(tnt ? CheatTab.EXPLOSIVES : CheatTab.VEHICLES);
this.setTab(CheatTab.VEHICLES);
this.setMagnetic();
}
@Serverside
private EntityCart getMinecart(World worldIn, double x, double y, double z)
{
return this.tnt ? new EntityTntCart(worldIn, x, y, z) : new EntityMinecart(worldIn, x, y, z);
}
/**
* Called when a Block is right-clicked with this Item
*/
@ -64,7 +54,7 @@ public class ItemMinecart extends Item
d0 = 0.5D;
}
EntityCart entityminecart = this.getMinecart(worldIn, (double)pos.getX() + 0.5D, (double)pos.getY() + 0.0625D + d0, (double)pos.getZ() + 0.5D);
EntityCart entityminecart = new EntityMinecart(worldIn, (double)pos.getX() + 0.5D, (double)pos.getY() + 0.0625D + d0, (double)pos.getZ() + 0.5D);
if (stack.hasDisplayName())
{
@ -126,7 +116,7 @@ public class ItemMinecart extends Item
}
}
EntityCart entityminecart = this.getMinecart(world, d0, d1 + d3, d2);
EntityCart entityminecart = new EntityMinecart(world, d0, d1 + d3, d2);
if (stack.hasDisplayName())
{