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

block cleanup #10

Browse source
This commit is contained in:
Sen 2025-06-21 19:59:52 +02:00
parent 18d4ea7167
commit 518300e68f
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
23 changed files with 541 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -179,7 +179,7 @@ public class BlockFlowerPot extends Block
public Item getItem(World worldIn, BlockPos pos)
{
return worldIn.getState(pos).getBlock() == this && this.content != null ? ItemRegistry.getItemFromBlock(this.content) : Items.flower_pot;
return worldIn.getState(pos).getBlock() == this && this.content != null ? ItemRegistry.getItemFromBlock(this.content) : Items.flowerpot;
}
public boolean isPickStrict()
@ -216,7 +216,7 @@ public class BlockFlowerPot extends Block
*/
public Item getItemDropped(State state, Random rand, int fortune)
{
return Items.flower_pot;
return Items.flowerpot;
}
public BlockLayer getBlockLayer()

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

@ -180,7 +180,7 @@ public class BlockPane extends Block
public final boolean canPaneConnectToBlock(Block blockIn)
{
return blockIn.isFullBlock() || blockIn == this || blockIn == Blocks.glass || blockIn == Blocks.stained_glass || blockIn == Blocks.stained_glass_pane || blockIn instanceof BlockPane;
return blockIn.isFullBlock() || blockIn == this || blockIn == Blocks.glass || blockIn instanceof BlockStainedGlass || blockIn instanceof BlockStainedGlassPane || blockIn instanceof BlockPane;
}
public boolean canSilkHarvest()

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

@ -249,7 +249,7 @@ public class BlockTrapDoor extends Block implements Rotatable
private static boolean isValidSupportBlock(Block blockIn)
{
return blockIn.getMaterial().isOpaque() && blockIn.isFullCube() || blockIn == Blocks.glass || blockIn == Blocks.stained_glass || blockIn == Blocks.glowstone || blockIn instanceof BlockSlab || blockIn instanceof BlockStairs;
return blockIn.getMaterial().isOpaque() && blockIn.isFullCube() || blockIn == Blocks.glass || blockIn instanceof BlockStainedGlass || blockIn == Blocks.glowstone || blockIn instanceof BlockSlab || blockIn instanceof BlockStairs;
}
public BlockLayer getBlockLayer()

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

@ -140,6 +140,10 @@ public class BlockWall extends Block
return state.withProperty(UP, Boolean.valueOf(worldIn.getState(pos.up()).getBlock() != Blocks.air)).withProperty(NORTH, Boolean.valueOf(this.canConnectTo(worldIn, pos.north()))).withProperty(EAST, Boolean.valueOf(this.canConnectTo(worldIn, pos.east()))).withProperty(SOUTH, Boolean.valueOf(this.canConnectTo(worldIn, pos.south()))).withProperty(WEST, Boolean.valueOf(this.canConnectTo(worldIn, pos.west())));
}
public int getMetaFromState(State state) {
return 0;
}
protected Property[] getProperties()
{
return new Property[] {UP, NORTH, EAST, WEST, SOUTH};

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

@ -327,8 +327,8 @@ public class BlockLeaves extends BlockLeavesBase
}
public Model getModel(ModelProvider provider, String name, State state) {
return this.subType.isTinted() ? provider.getModel(name + "_" + this.subType.getName()).add().all().tint() :
provider.getModel(name + "_" + this.subType.getName()).add().all();
return this.subType.isTinted() ? provider.getModel(name).add().all().tint() :
provider.getModel(name).add().all();
}
public Property<?>[] getIgnoredProperties() {

4
common/src/main/java/common/block/natural/BlockPodzol.java
View file

@ -29,6 +29,10 @@ public class BlockPodzol extends Block {
return state.withProperty(SNOWY, Boolean.valueOf(block == Blocks.snow || block == Blocks.snow_layer));
}
public int getMetaFromState(State state) {
return 0;
}
protected Property[] getProperties() {
return new Property[] {SNOWY};
}

3
common/src/main/java/common/block/tech/BlockTorch.java
View file

@ -4,6 +4,7 @@ import common.block.Block;
import common.block.DirectionalUp;
import common.block.Material;
import common.block.artificial.BlockFence;
import common.block.artificial.BlockStainedGlass;
import common.entity.types.EntityLiving;
import common.init.Blocks;
import common.item.CheatTab;
@ -68,7 +69,7 @@ public class BlockTorch extends Block implements DirectionalUp
else
{
Block block = worldIn.getState(pos).getBlock();
return block instanceof BlockFence || block == Blocks.glass || block == Blocks.cobblestone_wall || block == Blocks.stained_glass;
return block instanceof BlockFence || block == Blocks.glass || block == Blocks.cobblestone_wall || block instanceof BlockStainedGlass;
}
}

6
common/src/main/java/common/color/DyeColor.java
View file

@ -50,8 +50,8 @@ public enum DyeColor implements Identifyable
this.subject = subject;
this.msubject = msubject;
this.fsubject = fsubject;
this.dye = dye;
this.dyeName = dyeName == null ? name + "_dye" : dyeName;
this.dye = dye == null ? name + "_dye" : dye;
this.dyeName = dyeName;
this.color = colorIn;
this.chatColor = chatColor;
}
@ -139,7 +139,7 @@ public enum DyeColor implements Identifyable
public String getDyeName()
{
return this.dye;
return this.dyeName;
}
static {

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

@ -12,6 +12,7 @@ import common.ai.EntityAITempt;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.biome.Biome;
import common.block.artificial.BlockWool;
import common.collect.Maps;
import common.color.DyeColor;
import common.entity.item.EntityItem;
@ -142,7 +143,7 @@ public class EntitySheep extends EntityAnimal
protected Item getDropItem()
{
return ItemRegistry.getItemFromBlock(Blocks.wool);
return ItemRegistry.getItemFromBlock(BlockWool.getByColor(this.getFleeceColor()));
}
public void handleStatusUpdate(byte id)

208
common/src/main/java/common/init/Blocks.java
View file

@ -20,10 +20,15 @@ import common.util.Util;
public abstract class Blocks {
public static final BlockAir air = get("air");
public static final BlockDoor acacia_door = get("acacia_door");
public static final BlockFence acacia_fence = get("acacia_fence");
public static final BlockFenceGate acacia_fence_gate = get("acacia_fence_gate");
public static final BlockLeaves acacia_leaves = get("acacia_leaves");
public static final BlockLeaves acacia_leaves_autumn = get("acacia_leaves_autumn");
public static final BlockLeaves acacia_leaves_snowy = get("acacia_leaves_snowy");
public static final BlockLeaves acacia_leaves_spring = get("acacia_leaves_spring");
public static final BlockLeaves acacia_leaves_summer = get("acacia_leaves_summer");
public static final BlockLeaves acacia_leaves_winter = get("acacia_leaves_winter");
public static final BlockLog acacia_log = get("acacia_log");
public static final Block acacia_planks = get("acacia_planks");
public static final BlockSapling acacia_sapling = get("acacia_sapling");
@ -31,12 +36,14 @@ public abstract class Blocks {
public static final BlockStairs acacia_stairs = get("acacia_stairs");
public static final BlockStaticLiquid acid = get("acid");
public static final BlockRailPowered activator_rail = get("activator_rail");
public static final BlockAir air = get("air");
public static final BlockFlower allium = get("allium");
public static final Block aluminium_block = get("aluminium_block");
public static final BlockOre aluminium_ore = get("aluminium_ore");
public static final Block antimony_block = get("antimony_block");
public static final BlockOre antimony_ore = get("antimony_ore");
public static final BlockAnvil anvil = get("anvil");
public static final BlockAnvil anvil_damaged_1 = get("anvil_damaged_1");
public static final BlockAnvil anvil_damaged_2 = get("anvil_damaged_2");
public static final Block ardite_block = get("ardite_block");
public static final BlockOre ardite_ore = get("ardite_ore");
public static final Block arsenic_block = get("arsenic_block");
@ -49,7 +56,11 @@ public abstract class Blocks {
public static final BlockDoor birch_door = get("birch_door");
public static final BlockFence birch_fence = get("birch_fence");
public static final BlockFenceGate birch_fence_gate = get("birch_fence_gate");
public static final BlockLeaves birch_leaves = get("birch_leaves");
public static final BlockLeaves birch_leaves_autumn = get("birch_leaves_autumn");
public static final BlockLeaves birch_leaves_snowy = get("birch_leaves_snowy");
public static final BlockLeaves birch_leaves_spring = get("birch_leaves_spring");
public static final BlockLeaves birch_leaves_summer = get("birch_leaves_summer");
public static final BlockLeaves birch_leaves_winter = get("birch_leaves_winter");
public static final BlockLog birch_log = get("birch_log");
public static final Block birch_planks = get("birch_planks");
public static final BlockSapling birch_sapling = get("birch_sapling");
@ -62,13 +73,21 @@ public abstract class Blocks {
public static final BlockFence black_brick_fence = get("black_brick_fence");
public static final BlockSlab black_brick_slab = get("black_brick_slab");
public static final BlockStairs black_brick_stairs = get("black_brick_stairs");
public static final BlockCarpet black_carpet = get("black_carpet");
public static final BlockColoredClay black_clay = get("black_clay");
public static final BlockTintedFire black_fire = get("black_fire");
public static final BlockStainedGlass black_glass = get("black_glass");
public static final BlockStainedGlassPane black_glass_pane = get("black_glass_pane");
public static final BlockFlower black_lotus = get("black_lotus");
public static final Block black_metal_block = get("black_metal_block");
public static final BlockOre black_metal_ore = get("black_metal_ore");
public static final BlockQuartz black_quartz_block = get("black_quartz_block");
public static final BlockOre black_quartz_ore = get("black_quartz_ore");
public static final BlockQuartz black_quartz_ornaments = get("black_quartz_ornaments");
public static final BlockQuartzPillar black_quartz_pillar = get("black_quartz_pillar");
public static final BlockSlab black_quartz_slab = get("black_quartz_slab");
public static final BlockStairs black_quartz_stairs = get("black_quartz_stairs");
public static final BlockWool black_wool = get("black_wool");
public static final Block blackened_cobble = get("blackened_cobble");
public static final BlockBlackenedDirt blackened_dirt = get("blackened_dirt");
public static final BlockBlackenedSoil blackened_soil = get("blackened_soil");
@ -76,7 +95,11 @@ public abstract class Blocks {
public static final BlockDoor blackwood_door = get("blackwood_door");
public static final BlockFence blackwood_fence = get("blackwood_fence");
public static final BlockFenceGate blackwood_fence_gate = get("blackwood_fence_gate");
public static final BlockLeaves blackwood_leaves = get("blackwood_leaves");
public static final BlockLeaves blackwood_leaves_autumn = get("blackwood_leaves_autumn");
public static final BlockLeaves blackwood_leaves_snowy = get("blackwood_leaves_snowy");
public static final BlockLeaves blackwood_leaves_spring = get("blackwood_leaves_spring");
public static final BlockLeaves blackwood_leaves_summer = get("blackwood_leaves_summer");
public static final BlockLeaves blackwood_leaves_winter = get("blackwood_leaves_winter");
public static final BlockLog blackwood_log = get("blackwood_log");
public static final Block blackwood_planks = get("blackwood_planks");
public static final BlockSapling blackwood_sapling = get("blackwood_sapling");
@ -87,26 +110,42 @@ public abstract class Blocks {
public static final BlockFence blood_brick_fence = get("blood_brick_fence");
public static final BlockSlab blood_brick_slab = get("blood_brick_slab");
public static final BlockStairs blood_brick_stairs = get("blood_brick_stairs");
public static final BlockCarpet blue_carpet = get("blue_carpet");
public static final BlockColoredClay blue_clay = get("blue_clay");
public static final BlockStainedGlass blue_glass = get("blue_glass");
public static final BlockStainedGlassPane blue_glass_pane = get("blue_glass_pane");
public static final BlockBlueShroom blue_mushroom = get("blue_mushroom");
public static final BlockFlower blue_orchid = get("blue_orchid");
public static final BlockWool blue_wool = get("blue_wool");
public static final BlockBookshelf bookshelf = get("bookshelf");
public static final BlockBrewingStand brewing_stand = get("brewing_stand");
public static final Block brick_block = get("brick_block");
public static final BlockSlab brick_slab = get("brick_slab");
public static final BlockStairs brick_stairs = get("brick_stairs");
public static final BlockCarpet brown_carpet = get("brown_carpet");
public static final BlockColoredClay brown_clay = get("brown_clay");
public static final BlockStainedGlass brown_glass = get("brown_glass");
public static final BlockStainedGlassPane brown_glass_pane = get("brown_glass_pane");
public static final BlockMushroom brown_mushroom = get("brown_mushroom");
public static final BlockHugeMushroom brown_mushroom_block = get("brown_mushroom_block");
public static final BlockWool brown_wool = get("brown_wool");
public static final BlockCactus cactus = get("cactus");
public static final BlockCake cake = get("cake");
public static final Block calcium_block = get("calcium_block");
public static final BlockOre calcium_ore = get("calcium_ore");
public static final BlockCarpet carpet = get("carpet");
public static final BlockCarrot carrot = get("carrot");
public static final BlockSandStone carved_sandstone = get("carved_sandstone");
public static final Block carved_stonebrick = get("carved_stonebrick");
public static final BlockCauldron cauldron = get("cauldron");
public static final Block cell_rock = get("cell_rock");
public static final BlockDoor cherry_door = get("cherry_door");
public static final BlockFence cherry_fence = get("cherry_fence");
public static final BlockFenceGate cherry_fence_gate = get("cherry_fence_gate");
public static final BlockLeaves cherry_leaves = get("cherry_leaves");
public static final BlockLeaves cherry_leaves_autumn = get("cherry_leaves_autumn");
public static final BlockLeaves cherry_leaves_snowy = get("cherry_leaves_snowy");
public static final BlockLeaves cherry_leaves_spring = get("cherry_leaves_spring");
public static final BlockLeaves cherry_leaves_summer = get("cherry_leaves_summer");
public static final BlockLeaves cherry_leaves_winter = get("cherry_leaves_winter");
public static final BlockLog cherry_log = get("cherry_log");
public static final Block cherry_planks = get("cherry_planks");
public static final BlockSapling cherry_sapling = get("cherry_sapling");
@ -120,6 +159,7 @@ public abstract class Blocks {
public static final BlockClay clay = get("clay");
public static final Block coal_block = get("coal_block");
public static final BlockOre coal_ore = get("coal_ore");
public static final Block coarse_dirt = get("coarse_dirt");
public static final Block cobalt_block = get("cobalt_block");
public static final BlockOre cobalt_ore = get("cobalt_ore");
public static final Block cobblestone = get("cobblestone");
@ -132,10 +172,22 @@ public abstract class Blocks {
public static final Block copper_block = get("copper_block");
public static final BlockOre copper_ore = get("copper_ore");
public static final BlockCore core = get("core");
public static final Block cracked_stonebrick = get("cracked_stonebrick");
public static final BlockCarpet cyan_carpet = get("cyan_carpet");
public static final BlockColoredClay cyan_clay = get("cyan_clay");
public static final BlockStainedGlass cyan_glass = get("cyan_glass");
public static final BlockStainedGlassPane cyan_glass_pane = get("cyan_glass_pane");
public static final BlockWool cyan_wool = get("cyan_wool");
public static final BlockFlower daisy = get("daisy");
public static final BlockFlower dandelion = get("dandelion");
public static final BlockDoor dark_oak_door = get("dark_oak_door");
public static final BlockFence dark_oak_fence = get("dark_oak_fence");
public static final BlockFenceGate dark_oak_fence_gate = get("dark_oak_fence_gate");
public static final BlockLeaves dark_oak_leaves = get("dark_oak_leaves");
public static final BlockLeaves dark_oak_leaves_autumn = get("dark_oak_leaves_autumn");
public static final BlockLeaves dark_oak_leaves_snowy = get("dark_oak_leaves_snowy");
public static final BlockLeaves dark_oak_leaves_spring = get("dark_oak_leaves_spring");
public static final BlockLeaves dark_oak_leaves_summer = get("dark_oak_leaves_summer");
public static final BlockLeaves dark_oak_leaves_winter = get("dark_oak_leaves_winter");
public static final BlockLog dark_oak_log = get("dark_oak_log");
public static final Block dark_oak_planks = get("dark_oak_planks");
public static final BlockSapling dark_oak_sapling = get("dark_oak_sapling");
@ -143,13 +195,13 @@ public abstract class Blocks {
public static final BlockStairs dark_oak_stairs = get("dark_oak_stairs");
public static final BlockDaylightDetector daylight_detector = get("daylight_detector");
public static final BlockDaylightDetector daylight_detector_inverted = get("daylight_detector_inverted");
public static final BlockTallGrass dead_bush = get("dead_bush");
public static final BlockDeadBush deadbush = get("deadbush");
public static final BlockRailDetector detector_rail = get("detector_rail");
public static final Block diamond_block = get("diamond_block");
public static final BlockOre diamond_ore = get("diamond_ore");
public static final Block dirt = get("dirt");
public static final BlockDispenser dispenser = get("dispenser");
public static final BlockDoublePlant double_plant = get("double_plant");
public static final BlockDragonEgg dragon_egg = get("dragon_egg");
public static final BlockDropper dropper = get("dropper");
public static final BlockDryLeaves dry_leaves = get("dry_leaves");
@ -157,6 +209,7 @@ public abstract class Blocks {
public static final BlockOre emerald_ore = get("emerald_ore");
public static final BlockEnchantmentTable enchanting_table = get("enchanting_table");
public static final BlockFarmland farmland = get("farmland");
public static final BlockTallGrass fern = get("fern");
public static final BlockFire fire = get("fire");
public static final BlockFloorPortal floor_portal = get("floor_portal");
public static final Block floor_tiles = get("floor_tiles");
@ -164,6 +217,19 @@ public abstract class Blocks {
public static final Block floor_tiles_red = get("floor_tiles_red");
public static final Block floor_tiles_white = get("floor_tiles_white");
public static final BlockFlowerPot flowerpot = get("flowerpot");
public static final BlockFlowerPot flowerpot_allium = get("flowerpot_allium");
public static final BlockFlowerPot flowerpot_black_lotus = get("flowerpot_black_lotus");
public static final BlockFlowerPot flowerpot_blue_orchid = get("flowerpot_blue_orchid");
public static final BlockFlowerPot flowerpot_cactus = get("flowerpot_cactus");
public static final BlockFlowerPot flowerpot_daisy = get("flowerpot_daisy");
public static final BlockFlowerPot flowerpot_dandelion = get("flowerpot_dandelion");
public static final BlockFlowerPot flowerpot_houstonia = get("flowerpot_houstonia");
public static final BlockFlowerPot flowerpot_orange_tulip = get("flowerpot_orange_tulip");
public static final BlockFlowerPot flowerpot_pink_tulip = get("flowerpot_pink_tulip");
public static final BlockFlowerPot flowerpot_poppy = get("flowerpot_poppy");
public static final BlockFlowerPot flowerpot_red_tulip = get("flowerpot_red_tulip");
public static final BlockFlowerPot flowerpot_rose = get("flowerpot_rose");
public static final BlockFlowerPot flowerpot_white_tulip = get("flowerpot_white_tulip");
public static final BlockDynamicLiquid flowing_acid = get("flowing_acid");
public static final BlockDynamicLiquid flowing_blood = get("flowing_blood");
public static final BlockDynamicLiquid flowing_goo = get("flowing_goo");
@ -173,6 +239,7 @@ public abstract class Blocks {
public static final BlockDynamicLiquid flowing_mercury = get("flowing_mercury");
public static final BlockDynamicLiquid flowing_nukage = get("flowing_nukage");
public static final BlockDynamicLiquid flowing_slime = get("flowing_slime");
public static final BlockDynamicLiquid flowing_springwater = get("flowing_springwater");
public static final BlockDynamicLiquid flowing_water = get("flowing_water");
public static final BlockFurnace furnace = get("furnace");
public static final BlockGlass glass = get("glass");
@ -184,6 +251,16 @@ public abstract class Blocks {
public static final BlockStaticLiquid goo = get("goo");
public static final BlockGrass grass = get("grass");
public static final BlockGravel gravel = get("gravel");
public static final BlockCarpet gray_carpet = get("gray_carpet");
public static final BlockColoredClay gray_clay = get("gray_clay");
public static final BlockStainedGlass gray_glass = get("gray_glass");
public static final BlockStainedGlassPane gray_glass_pane = get("gray_glass_pane");
public static final BlockWool gray_wool = get("gray_wool");
public static final BlockCarpet green_carpet = get("green_carpet");
public static final BlockColoredClay green_clay = get("green_clay");
public static final BlockStainedGlass green_glass = get("green_glass");
public static final BlockStainedGlassPane green_glass_pane = get("green_glass_pane");
public static final BlockWool green_wool = get("green_wool");
public static final Block gyriyn_block = get("gyriyn_block");
public static final BlockOre gyriyn_ore = get("gyriyn_ore");
public static final BlockHardenedClay hardened_clay = get("hardened_clay");
@ -191,6 +268,7 @@ public abstract class Blocks {
public static final BlockPressurePlateWeighted heavy_weighted_pressure_plate = get("heavy_weighted_pressure_plate");
public static final BlockHellRock hellrock = get("hellrock");
public static final BlockHopper hopper = get("hopper");
public static final BlockFlower houstonia = get("houstonia");
public static final BlockStaticLiquid hydrogen = get("hydrogen");
public static final BlockIce ice = get("ice");
public static final Block iodine_block = get("iodine_block");
@ -204,7 +282,11 @@ public abstract class Blocks {
public static final BlockDoor jungle_door = get("jungle_door");
public static final BlockFence jungle_fence = get("jungle_fence");
public static final BlockFenceGate jungle_fence_gate = get("jungle_fence_gate");
public static final BlockLeaves jungle_leaves = get("jungle_leaves");
public static final BlockLeaves jungle_leaves_autumn = get("jungle_leaves_autumn");
public static final BlockLeaves jungle_leaves_snowy = get("jungle_leaves_snowy");
public static final BlockLeaves jungle_leaves_spring = get("jungle_leaves_spring");
public static final BlockLeaves jungle_leaves_summer = get("jungle_leaves_summer");
public static final BlockLeaves jungle_leaves_winter = get("jungle_leaves_winter");
public static final BlockLog jungle_log = get("jungle_log");
public static final Block jungle_planks = get("jungle_planks");
public static final BlockSapling jungle_sapling = get("jungle_sapling");
@ -214,17 +296,34 @@ public abstract class Blocks {
public static final Block lamp = get("lamp");
public static final Block lapis_block = get("lapis_block");
public static final BlockOre lapis_ore = get("lapis_ore");
public static final BlockDoublePlant large_fern = get("large_fern");
public static final BlockDoublePlant large_tallgrass = get("large_tallgrass");
public static final BlockStaticLiquid lava = get("lava");
public static final Block lead_block = get("lead_block");
public static final BlockOre lead_ore = get("lead_ore");
public static final BlockLever lever = get("lever");
public static final BlockCarpet light_blue_carpet = get("light_blue_carpet");
public static final BlockColoredClay light_blue_clay = get("light_blue_clay");
public static final BlockStainedGlass light_blue_glass = get("light_blue_glass");
public static final BlockStainedGlassPane light_blue_glass_pane = get("light_blue_glass_pane");
public static final BlockWool light_blue_wool = get("light_blue_wool");
public static final BlockPressurePlateWeighted light_weighted_pressure_plate = get("light_weighted_pressure_plate");
public static final BlockCarpet lime_carpet = get("lime_carpet");
public static final BlockColoredClay lime_clay = get("lime_clay");
public static final BlockStainedGlass lime_glass = get("lime_glass");
public static final BlockStainedGlassPane lime_glass_pane = get("lime_glass_pane");
public static final BlockWool lime_wool = get("lime_wool");
public static final BlockFurnace lit_furnace = get("lit_furnace");
public static final BlockPumpkin lit_pumpkin = get("lit_pumpkin");
public static final BlockRedstoneLight lit_redstone_lamp = get("lit_redstone_lamp");
public static final BlockRedstoneOre lit_redstone_ore = get("lit_redstone_ore");
public static final Block lithium_block = get("lithium_block");
public static final BlockOre lithium_ore = get("lithium_ore");
public static final BlockCarpet magenta_carpet = get("magenta_carpet");
public static final BlockColoredClay magenta_clay = get("magenta_clay");
public static final BlockStainedGlass magenta_glass = get("magenta_glass");
public static final BlockStainedGlassPane magenta_glass_pane = get("magenta_glass_pane");
public static final BlockWool magenta_wool = get("magenta_wool");
public static final BlockStaticLiquid magma = get("magma");
public static final Block magnesium_block = get("magnesium_block");
public static final BlockOre magnesium_ore = get("magnesium_ore");
@ -233,7 +332,11 @@ public abstract class Blocks {
public static final BlockDoor maple_door = get("maple_door");
public static final BlockFence maple_fence = get("maple_fence");
public static final BlockFenceGate maple_fence_gate = get("maple_fence_gate");
public static final BlockLeaves maple_leaves = get("maple_leaves");
public static final BlockLeaves maple_leaves_autumn = get("maple_leaves_autumn");
public static final BlockLeaves maple_leaves_snowy = get("maple_leaves_snowy");
public static final BlockLeaves maple_leaves_spring = get("maple_leaves_spring");
public static final BlockLeaves maple_leaves_summer = get("maple_leaves_summer");
public static final BlockLeaves maple_leaves_winter = get("maple_leaves_winter");
public static final BlockLog maple_log = get("maple_log");
public static final Block maple_planks = get("maple_planks");
public static final BlockSapling maple_sapling = get("maple_sapling");
@ -246,6 +349,8 @@ public abstract class Blocks {
public static final BlockTreasure moon_cheese = get("moon_cheese");
public static final Block moon_rock = get("moon_rock");
public static final Block mossy_cobblestone = get("mossy_cobblestone");
public static final BlockWall mossy_cobblestone_wall = get("mossy_cobblestone_wall");
public static final Block mossy_stonebrick = get("mossy_stonebrick");
public static final BlockMycelium mycelium = get("mycelium");
public static final Block neodymium_block = get("neodymium_block");
public static final BlockOre neodymium_ore = get("neodymium_ore");
@ -261,19 +366,36 @@ public abstract class Blocks {
public static final BlockDoor oak_door = get("oak_door");
public static final BlockFence oak_fence = get("oak_fence");
public static final BlockFenceGate oak_fence_gate = get("oak_fence_gate");
public static final BlockLeaves oak_leaves = get("oak_leaves");
public static final BlockLeaves oak_leaves_autumn = get("oak_leaves_autumn");
public static final BlockLeaves oak_leaves_snowy = get("oak_leaves_snowy");
public static final BlockLeaves oak_leaves_spring = get("oak_leaves_spring");
public static final BlockLeaves oak_leaves_summer = get("oak_leaves_summer");
public static final BlockLeaves oak_leaves_winter = get("oak_leaves_winter");
public static final BlockLog oak_log = get("oak_log");
public static final Block oak_planks = get("oak_planks");
public static final BlockSapling oak_sapling = get("oak_sapling");
public static final BlockSlab oak_slab = get("oak_slab");
public static final BlockStairs oak_stairs = get("oak_stairs");
public static final BlockObsidian obsidian = get("obsidian");
public static final BlockCarpet orange_carpet = get("orange_carpet");
public static final BlockColoredClay orange_clay = get("orange_clay");
public static final BlockStainedGlass orange_glass = get("orange_glass");
public static final BlockStainedGlassPane orange_glass_pane = get("orange_glass_pane");
public static final BlockFlower orange_tulip = get("orange_tulip");
public static final BlockWool orange_wool = get("orange_wool");
public static final BlockPackedIce packed_ice = get("packed_ice");
public static final BlockDoublePlant paeonia = get("paeonia");
public static final Block palladium_block = get("palladium_block");
public static final BlockOre palladium_ore = get("palladium_ore");
public static final Block pentagram = get("pentagram");
public static final Block phosphor_block = get("phosphor_block");
public static final BlockOre phosphor_ore = get("phosphor_ore");
public static final BlockCarpet pink_carpet = get("pink_carpet");
public static final BlockColoredClay pink_clay = get("pink_clay");
public static final BlockStainedGlass pink_glass = get("pink_glass");
public static final BlockStainedGlassPane pink_glass_pane = get("pink_glass_pane");
public static final BlockFlower pink_tulip = get("pink_tulip");
public static final BlockWool pink_wool = get("pink_wool");
public static final BlockPistonBase piston = get("piston");
public static final BlockPistonMoving piston_extension = get("piston_extension");
public static final BlockPistonHead piston_head = get("piston_head");
@ -281,6 +403,8 @@ public abstract class Blocks {
public static final BlockOre platinum_ore = get("platinum_ore");
public static final Block plutonium_block = get("plutonium_block");
public static final BlockOre plutonium_ore = get("plutonium_ore");
public static final BlockPodzol podzol = get("podzol");
public static final BlockFlower poppy = get("poppy");
public static final BlockPortal portal = get("portal");
public static final BlockPortalFrame portal_frame = get("portal_frame");
public static final Block potassium_block = get("potassium_block");
@ -293,8 +417,15 @@ public abstract class Blocks {
public static final BlockPumpkin pumpkin = get("pumpkin");
public static final BlockStem pumpkin_stem = get("pumpkin_stem");
public static final BlockBed purple_bed = get("purple_bed");
public static final BlockCarpet purple_carpet = get("purple_carpet");
public static final BlockColoredClay purple_clay = get("purple_clay");
public static final BlockStainedGlass purple_glass = get("purple_glass");
public static final BlockStainedGlassPane purple_glass_pane = get("purple_glass_pane");
public static final BlockWool purple_wool = get("purple_wool");
public static final BlockQuartz quartz_block = get("quartz_block");
public static final BlockOre quartz_ore = get("quartz_ore");
public static final BlockQuartz quartz_ornaments = get("quartz_ornaments");
public static final BlockQuartzPillar quartz_pillar = get("quartz_pillar");
public static final BlockSlab quartz_slab = get("quartz_slab");
public static final BlockStairs quartz_stairs = get("quartz_stairs");
public static final Block radium_block = get("radium_block");
@ -302,8 +433,15 @@ public abstract class Blocks {
public static final BlockRail rail = get("rail");
public static final BlockBed red_bed = get("red_bed");
public static final BlockButton red_button = get("red_button");
public static final BlockCarpet red_carpet = get("red_carpet");
public static final BlockColoredClay red_clay = get("red_clay");
public static final BlockStainedGlass red_glass = get("red_glass");
public static final BlockStainedGlassPane red_glass_pane = get("red_glass_pane");
public static final BlockMushroom red_mushroom = get("red_mushroom");
public static final BlockHugeMushroom red_mushroom_block = get("red_mushroom_block");
public static final BlockFalling red_sand = get("red_sand");
public static final BlockFlower red_tulip = get("red_tulip");
public static final BlockWool red_wool = get("red_wool");
public static final BlockRedstoneWire redstone = get("redstone");
public static final BlockCompressedPowered redstone_block = get("redstone_block");
public static final BlockRedstoneLight redstone_lamp = get("redstone_lamp");
@ -312,6 +450,8 @@ public abstract class Blocks {
public static final BlockReed reeds = get("reeds");
public static final BlockRedstoneRepeater repeater = get("repeater");
public static final Block rock = get("rock");
public static final BlockFlower rose = get("rose");
public static final BlockDoublePlant rose_bush = get("rose_bush");
public static final Block ruby_block = get("ruby_block");
public static final BlockOre ruby_ore = get("ruby_ore");
public static final BlockFalling sand = get("sand");
@ -324,10 +464,17 @@ public abstract class Blocks {
public static final Block silicon_block = get("silicon_block");
public static final BlockOre silicon_ore = get("silicon_ore");
public static final Block silver_block = get("silver_block");
public static final BlockCarpet silver_carpet = get("silver_carpet");
public static final BlockColoredClay silver_clay = get("silver_clay");
public static final BlockStainedGlass silver_glass = get("silver_glass");
public static final BlockStainedGlassPane silver_glass_pane = get("silver_glass_pane");
public static final BlockOre silver_ore = get("silver_ore");
public static final BlockWool silver_wool = get("silver_wool");
public static final BlockSkull skull = get("skull");
public static final BlockStaticLiquid slime = get("slime");
public static final BlockSlime slime_block = get("slime_block");
public static final Block smooth_rock = get("smooth_rock");
public static final BlockSandStone smooth_sandstone = get("smooth_sandstone");
public static final BlockSnowBlock snow = get("snow");
public static final BlockSnow snow_layer = get("snow_layer");
public static final Block sodium_block = get("sodium_block");
@ -336,18 +483,20 @@ public abstract class Blocks {
public static final BlockSoulSand soul_sand = get("soul_sand");
public static final BlockWart soul_wart = get("soul_wart");
public static final Block sponge = get("sponge");
public static final BlockStaticLiquid springwater = get("springwater");
public static final BlockDoor spruce_door = get("spruce_door");
public static final BlockFence spruce_fence = get("spruce_fence");
public static final BlockFenceGate spruce_fence_gate = get("spruce_fence_gate");
public static final BlockLeaves spruce_leaves = get("spruce_leaves");
public static final BlockLeaves spruce_leaves_autumn = get("spruce_leaves_autumn");
public static final BlockLeaves spruce_leaves_snowy = get("spruce_leaves_snowy");
public static final BlockLeaves spruce_leaves_spring = get("spruce_leaves_spring");
public static final BlockLeaves spruce_leaves_summer = get("spruce_leaves_summer");
public static final BlockLeaves spruce_leaves_winter = get("spruce_leaves_winter");
public static final BlockLog spruce_log = get("spruce_log");
public static final Block spruce_planks = get("spruce_planks");
public static final BlockSapling spruce_sapling = get("spruce_sapling");
public static final BlockSlab spruce_slab = get("spruce_slab");
public static final BlockStairs spruce_stairs = get("spruce_stairs");
public static final BlockStainedGlass stained_glass = get("stained_glass");
public static final BlockStainedGlassPane stained_glass_pane = get("stained_glass_pane");
public static final BlockWool stained_hardened_clay = get("stained_hardened_clay");
public static final BlockPistonBase sticky_piston = get("sticky_piston");
public static final BlockStone stone = get("stone");
public static final BlockButton stone_button = get("stone_button");
@ -360,6 +509,8 @@ public abstract class Blocks {
public static final BlockTripWire string = get("string");
public static final Block sulfur_block = get("sulfur_block");
public static final BlockOre sulfur_ore = get("sulfur_ore");
public static final BlockDoublePlant sunflower = get("sunflower");
public static final BlockDoublePlant syringa = get("syringa");
public static final BlockTallGrass tallgrass = get("tallgrass");
public static final Block thetium_block = get("thetium_block");
public static final BlockOre thetium_ore = get("thetium_ore");
@ -367,7 +518,11 @@ public abstract class Blocks {
public static final BlockDoor tian_door = get("tian_door");
public static final BlockFence tian_fence = get("tian_fence");
public static final BlockFenceGate tian_fence_gate = get("tian_fence_gate");
public static final BlockLeaves tian_leaves = get("tian_leaves");
public static final BlockLeaves tian_leaves_autumn = get("tian_leaves_autumn");
public static final BlockLeaves tian_leaves_snowy = get("tian_leaves_snowy");
public static final BlockLeaves tian_leaves_spring = get("tian_leaves_spring");
public static final BlockLeaves tian_leaves_summer = get("tian_leaves_summer");
public static final BlockLeaves tian_leaves_winter = get("tian_leaves_winter");
public static final BlockLog tian_log = get("tian_log");
public static final Block tian_planks = get("tian_planks");
public static final BlockTianReactor tian_reactor = get("tian_reactor");
@ -380,6 +535,13 @@ public abstract class Blocks {
public static final Block titanium_block = get("titanium_block");
public static final BlockOre titanium_ore = get("titanium_ore");
public static final BlockTNT tnt = get("tnt");
public static final BlockTNT tnt_1 = get("tnt_1");
public static final BlockTNT tnt_2 = get("tnt_2");
public static final BlockTNT tnt_3 = get("tnt_3");
public static final BlockTNT tnt_4 = get("tnt_4");
public static final BlockTNT tnt_5 = get("tnt_5");
public static final BlockTNT tnt_6 = get("tnt_6");
public static final BlockTNT tnt_7 = get("tnt_7");
public static final BlockTorch torch = get("torch");
public static final BlockTrapDoor trapdoor = get("trapdoor");
public static final BlockChest trapped_chest = get("trapped_chest");
@ -400,14 +562,22 @@ public abstract class Blocks {
public static final BlockWeb web = get("web");
public static final BlockCrops wheat = get("wheat");
public static final BlockBed white_bed = get("white_bed");
public static final BlockCarpet white_carpet = get("white_carpet");
public static final BlockColoredClay white_clay = get("white_clay");
public static final BlockStainedGlass white_glass = get("white_glass");
public static final BlockStainedGlassPane white_glass_pane = get("white_glass_pane");
public static final BlockFlower white_tulip = get("white_tulip");
public static final BlockWool white_wool = get("white_wool");
public static final BlockButton wooden_button = get("wooden_button");
public static final BlockPressurePlate wooden_pressure_plate = get("wooden_pressure_plate");
public static final BlockWool wool = get("wool");
public static final BlockWorkbench workbench = get("workbench");
public static final BlockCarpet yellow_carpet = get("yellow_carpet");
public static final BlockColoredClay yellow_clay = get("yellow_clay");
public static final BlockStainedGlass yellow_glass = get("yellow_glass");
public static final BlockStainedGlassPane yellow_glass_pane = get("yellow_glass_pane");
public static final BlockWool yellow_wool = get("yellow_wool");
public static final Block zinc_block = get("zinc_block");
public static final BlockOre zinc_ore = get("zinc_ore");
public static final BlockDynamicLiquid flowing_springwater = get("flowing_springwater");
public static final BlockStaticLiquid springwater = get("springwater");
private static <T extends Block> T get(String id) {
if(!BlockRegistry.REGISTRY.containsKey(id))

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

@ -159,10 +159,10 @@ public abstract class CraftingRegistry
add(new ItemStack(Blocks.warp_chest), "###", "#E#", "###", '#', Blocks.obsidian, 'E', Items.charged_orb);
add(new ItemStack(Blocks.furnace), "###", "# #", "###", '#', Blocks.cobblestone);
add(new ItemStack(Blocks.sandstone), "##", "##", '#', Blocks.sand);
add(new ItemStack(Blocks.sandstone_smooth, 4), "##", "##", '#', Blocks.sandstone);
add(new ItemStack(Blocks.smooth_sandstone, 4), "##", "##", '#', Blocks.sandstone);
add(new ItemStack(Blocks.quartz_pillar, 2), "#", "#", '#', Blocks.quartz_block);
add(new ItemStack(Blocks.stonebrick, 4), "##", "##", '#', Blocks.stone);
addShapeless(new ItemStack(Blocks.stonebrick_mossy), Blocks.stonebrick, Blocks.vine);
addShapeless(new ItemStack(Blocks.mossy_stonebrick), Blocks.stonebrick, Blocks.vine);
addShapeless(new ItemStack(Blocks.mossy_cobblestone, 1), Blocks.cobblestone, Blocks.vine);
add(new ItemStack(Blocks.iron_bars, 16), "###", "###", '#', Items.iron_ingot);
add(new ItemStack(Blocks.glass_pane, 16), "###", "###", '#', Blocks.glass);
@ -276,7 +276,7 @@ public abstract class CraftingRegistry
add(new ItemStack(Blocks.brick_block, 1), "##", "##", '#', Items.brick);
add(new ItemStack(Blocks.glowstone, 1), "##", "##", '#', Items.glowstone_dust);
add(new ItemStack(Blocks.quartz_block, 1), "##", "##", '#', Items.quartz);
add(new ItemStack(Blocks.wool, 1), "##", "##", '#', Items.string);
add(new ItemStack(Blocks.white_wool, 1), "##", "##", '#', Items.string);
add(new ItemStack(Blocks.tnt, 1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Blocks.sand);
add(new ItemStack(Blocks.tnt_1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Blocks.tnt);
@ -310,7 +310,7 @@ public abstract class CraftingRegistry
add(new ItemStack(Items.tnt_minecart, 1), "A", "B", 'A', Blocks.tnt, 'B', Items.minecart);
add(new ItemStack(Items.hopper_minecart, 1), "A", "B", 'A', Blocks.hopper, 'B', Items.minecart);
add(new ItemStack(Items.bucket, 1), "# #", " # ", '#', Items.iron_ingot);
add(new ItemStack(Items.flower_pot, 1), "# #", " # ", '#', Items.brick);
add(new ItemStack(Items.flowerpot, 1), "# #", " # ", '#', Items.brick);
addShapeless(new ItemStack(Items.flint_and_steel, 1), new ItemStack(Items.iron_ingot, 1), new ItemStack(Items.flint, 1));
add(new ItemStack(Items.bread, 1), "###", '#', Items.wheats);
@ -688,7 +688,7 @@ public abstract class CraftingRegistry
if (itemstack != null && itemstack.getItem() != Items.banner)
{
if (itemstack.getItem() == Items.dye)
if (itemstack.getItem() instanceof ItemDye)
{
if (flag2)
{
@ -923,7 +923,7 @@ public abstract class CraftingRegistry
{
++l;
}
else if (itemstack.getItem() == Items.dye)
else if (itemstack.getItem() instanceof ItemDye)
{
++k;
}
@ -1297,7 +1297,7 @@ public abstract class CraftingRegistry
}
else
{
if (itemstack1.getItem() != Items.dye)
if (!(itemstack1.getItem() instanceof ItemDye))
{
return false;
}

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

@ -359,6 +359,8 @@ public abstract class ItemRegistry {
registerItem("cooked_porkchop", (new ItemFood(8, true)).setDisplay("Gebratenes Schweinefleisch"));
registerItem("golden_apple", (new ItemAppleGold(4, false)).setPotionEffect(Potion.REGENERATION, 5, 1, 1.0F)
.setDisplay("Goldener Apfel"));
registerItem("golden_apple_powered", (new ItemAppleGold(4, true)).setPotionEffect(Potion.REGENERATION, 5, 1, 1.0F)
.setDisplay("Goldener Apfel"));
registerItem((new ItemSign()).setDisplay("Schild"));
registerItem("saddle", (new ItemSaddle()).setDisplay("Sattel"));
registerItem((new ItemRedstone()).setDisplay("Redstone").setPotionEffect(PotionHelper.redstoneEffect).setMaxAmount(256));
@ -377,9 +379,9 @@ public abstract class ItemRegistry {
registerItem("glowstone_dust", (new Item()).setDisplay("Glowstonestaub").setPotionEffect(PotionHelper.glowstoneEffect)
.setTab(CheatTab.MATERIALS).setMaxAmount(256));
for(ItemFishFood.FishType type : ItemFishFood.FishType.values()) {
registerItem(type.getName(), (new ItemFishFood(false, type)).setDisplay("Fisch"));
registerItem(type.getName(), (new ItemFishFood(false, type)).setDisplay(type.getDisplay()));
if(type.canCook())
registerItem("cooked_" + type.getName(), (new ItemFishFood(true, type)).setDisplay("Fisch"));
registerItem("cooked_" + type.getName(), (new ItemFishFood(true, type)).setDisplay(type.getDisplay()));
}
Item lapis = null;
for(DyeColor color : DyeColor.values()) {

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

@ -18,7 +18,11 @@ public abstract class Items {
public static final ItemDoor acacia_door = get("acacia_door");
public static final ItemFence acacia_fence = get("acacia_fence");
public static final ItemBlock acacia_fence_gate = get("acacia_fence_gate");
public static final ItemColored acacia_leaves = get("acacia_leaves");
public static final ItemColored acacia_leaves_autumn = get("acacia_leaves_autumn");
public static final ItemColored acacia_leaves_snowy = get("acacia_leaves_snowy");
public static final ItemColored acacia_leaves_spring = get("acacia_leaves_spring");
public static final ItemColored acacia_leaves_summer = get("acacia_leaves_summer");
public static final ItemColored acacia_leaves_winter = get("acacia_leaves_winter");
public static final ItemBlock acacia_log = get("acacia_log");
public static final ItemBlock acacia_planks = get("acacia_planks");
public static final ItemBlock acacia_sapling = get("acacia_sapling");
@ -27,6 +31,7 @@ public abstract class Items {
public static final ItemBucket acid_bucket = get("acid_bucket");
public static final ItemBlock activator_rail = get("activator_rail");
public static final Item ahrd_fragment = get("ahrd_fragment");
public static final ItemBlock allium = get("allium");
public static final ItemMetalBlock aluminium_block = get("aluminium_block");
public static final ItemMetal aluminium_ingot = get("aluminium_ingot");
public static final ItemMetalBlock aluminium_ore = get("aluminium_ore");
@ -34,6 +39,8 @@ public abstract class Items {
public static final ItemMetalBlock antimony_ore = get("antimony_ore");
public static final ItemMetal antimony_powder = get("antimony_powder");
public static final ItemBlock anvil = get("anvil");
public static final ItemBlock anvil_damaged_1 = get("anvil_damaged_1");
public static final ItemBlock anvil_damaged_2 = get("anvil_damaged_2");
public static final ItemFood apple = get("apple");
public static final ItemBlock ardite_block = get("ardite_block");
public static final ItemArmor ardite_boots = get("ardite_boots");
@ -57,7 +64,11 @@ public abstract class Items {
public static final ItemDoor birch_door = get("birch_door");
public static final ItemFence birch_fence = get("birch_fence");
public static final ItemBlock birch_fence_gate = get("birch_fence_gate");
public static final ItemColored birch_leaves = get("birch_leaves");
public static final ItemColored birch_leaves_autumn = get("birch_leaves_autumn");
public static final ItemColored birch_leaves_snowy = get("birch_leaves_snowy");
public static final ItemColored birch_leaves_spring = get("birch_leaves_spring");
public static final ItemColored birch_leaves_summer = get("birch_leaves_summer");
public static final ItemColored birch_leaves_winter = get("birch_leaves_winter");
public static final ItemBlock birch_log = get("birch_log");
public static final ItemBlock birch_planks = get("birch_planks");
public static final ItemBlock birch_sapling = get("birch_sapling");
@ -71,14 +82,22 @@ public abstract class Items {
public static final ItemFence black_brick_fence = get("black_brick_fence");
public static final ItemSlab black_brick_slab = get("black_brick_slab");
public static final ItemBlock black_brick_stairs = get("black_brick_stairs");
public static final ItemBlock black_carpet = get("black_carpet");
public static final ItemBlock black_clay = get("black_clay");
public static final ItemBlock black_glass = get("black_glass");
public static final ItemBlock black_glass_pane = get("black_glass_pane");
public static final ItemBlock black_lotus = get("black_lotus");
public static final ItemMetalBlock black_metal_block = get("black_metal_block");
public static final ItemMetal black_metal_ingot = get("black_metal_ingot");
public static final ItemMetalBlock black_metal_ore = get("black_metal_ore");
public static final Item black_quartz = get("black_quartz");
public static final ItemBlock black_quartz_block = get("black_quartz_block");
public static final ItemBlock black_quartz_ore = get("black_quartz_ore");
public static final ItemBlock black_quartz_ornaments = get("black_quartz_ornaments");
public static final ItemBlock black_quartz_pillar = get("black_quartz_pillar");
public static final ItemSlab black_quartz_slab = get("black_quartz_slab");
public static final ItemBlock black_quartz_stairs = get("black_quartz_stairs");
public static final ItemBlock black_wool = get("black_wool");
public static final Item blackbrick = get("blackbrick");
public static final ItemBlock blackened_cobble = get("blackened_cobble");
public static final ItemBlock blackened_dirt = get("blackened_dirt");
@ -87,7 +106,11 @@ public abstract class Items {
public static final ItemDoor blackwood_door = get("blackwood_door");
public static final ItemFence blackwood_fence = get("blackwood_fence");
public static final ItemBlock blackwood_fence_gate = get("blackwood_fence_gate");
public static final ItemColored blackwood_leaves = get("blackwood_leaves");
public static final ItemColored blackwood_leaves_autumn = get("blackwood_leaves_autumn");
public static final ItemColored blackwood_leaves_snowy = get("blackwood_leaves_snowy");
public static final ItemColored blackwood_leaves_spring = get("blackwood_leaves_spring");
public static final ItemColored blackwood_leaves_summer = get("blackwood_leaves_summer");
public static final ItemColored blackwood_leaves_winter = get("blackwood_leaves_winter");
public static final ItemBlock blackwood_log = get("blackwood_log");
public static final ItemBlock blackwood_planks = get("blackwood_planks");
public static final ItemBlock blackwood_sapling = get("blackwood_sapling");
@ -101,11 +124,18 @@ public abstract class Items {
public static final ItemBlock blood_brick_stairs = get("blood_brick_stairs");
public static final ItemBucket blood_bucket = get("blood_bucket");
public static final Item bloodbrick = get("bloodbrick");
public static final ItemBlock blue_carpet = get("blue_carpet");
public static final ItemBlock blue_clay = get("blue_clay");
public static final ItemBlock blue_glass = get("blue_glass");
public static final ItemBlock blue_glass_pane = get("blue_glass_pane");
public static final ItemBlock blue_mushroom = get("blue_mushroom");
public static final ItemBlock blue_orchid = get("blue_orchid");
public static final ItemBlock blue_wool = get("blue_wool");
public static final ItemBoat boat = get("boat");
public static final ItemAmmo bolt = get("bolt");
public static final ItemBoltgun boltgun = get("boltgun");
public static final ItemStick bone = get("bone");
public static final ItemDye bonemeal = get("bonemeal");
public static final ItemBook book = get("book");
public static final ItemBlock bookshelf = get("bookshelf");
public static final ItemBow bow = get("bow");
@ -116,19 +146,26 @@ public abstract class Items {
public static final ItemBlock brick_block = get("brick_block");
public static final ItemSlab brick_slab = get("brick_slab");
public static final ItemBlock brick_stairs = get("brick_stairs");
public static final ItemBlock brown_carpet = get("brown_carpet");
public static final ItemBlock brown_clay = get("brown_clay");
public static final ItemBlock brown_glass = get("brown_glass");
public static final ItemBlock brown_glass_pane = get("brown_glass_pane");
public static final ItemBlock brown_mushroom = get("brown_mushroom");
public static final ItemHugeMushroom brown_mushroom_block = get("brown_mushroom_block");
public static final ItemBlock brown_wool = get("brown_wool");
public static final ItemBucket bucket = get("bucket");
public static final ItemFlintAndSteel burning_soul = get("burning_soul");
public static final ItemBlock cactus = get("cactus");
public static final ItemDye cactus_green = get("cactus_green");
public static final ItemSmallBlock cake = get("cake");
public static final ItemMetalBlock calcium_block = get("calcium_block");
public static final ItemMetalBlock calcium_ore = get("calcium_ore");
public static final ItemMetal calcium_powder = get("calcium_powder");
public static final ItemCamera camera = get("camera");
public static final ItemCloth carpet = get("carpet");
public static final ItemSeedFood carrot = get("carrot");
public static final ItemCarrotOnAStick carrot_on_a_stick = get("carrot_on_a_stick");
public static final ItemBlock carved_sandstone = get("carved_sandstone");
public static final ItemBlock carved_stonebrick = get("carved_stonebrick");
public static final ItemSmallBlock cauldron = get("cauldron");
public static final ItemBlock cell_rock = get("cell_rock");
public static final ItemMagnetic chain = get("chain");
@ -136,12 +173,17 @@ public abstract class Items {
public static final ItemArmor chain_chestplate = get("chain_chestplate");
public static final ItemArmor chain_helmet = get("chain_helmet");
public static final ItemArmor chain_leggings = get("chain_leggings");
public static final Item charcoal = get("charcoal");
public static final ItemEffect charge_crystal = get("charge_crystal");
public static final ItemChargedOrb charged_orb = get("charged_orb");
public static final ItemDoor cherry_door = get("cherry_door");
public static final ItemFence cherry_fence = get("cherry_fence");
public static final ItemBlock cherry_fence_gate = get("cherry_fence_gate");
public static final ItemColored cherry_leaves = get("cherry_leaves");
public static final ItemColored cherry_leaves_autumn = get("cherry_leaves_autumn");
public static final ItemColored cherry_leaves_snowy = get("cherry_leaves_snowy");
public static final ItemColored cherry_leaves_spring = get("cherry_leaves_spring");
public static final ItemColored cherry_leaves_summer = get("cherry_leaves_summer");
public static final ItemColored cherry_leaves_winter = get("cherry_leaves_winter");
public static final ItemBlock cherry_log = get("cherry_log");
public static final ItemBlock cherry_planks = get("cherry_planks");
public static final ItemBlock cherry_sapling = get("cherry_sapling");
@ -164,9 +206,9 @@ public abstract class Items {
public static final ItemArmor cloth_helmet = get("cloth_helmet");
public static final ItemArmor cloth_leggings = get("cloth_leggings");
public static final Item coal = get("coal");
public static final Item charcoal = get("charcoal");
public static final ItemBlock coal_block = get("coal_block");
public static final ItemBlock coal_ore = get("coal_ore");
public static final ItemBlock coarse_dirt = get("coarse_dirt");
public static final ItemMetalBlock cobalt_block = get("cobalt_block");
public static final ItemMetal cobalt_ingot = get("cobalt_ingot");
public static final ItemMetalBlock cobalt_ore = get("cobalt_ore");
@ -174,6 +216,7 @@ public abstract class Items {
public static final ItemSlab cobblestone_slab = get("cobblestone_slab");
public static final ItemBlock cobblestone_stairs = get("cobblestone_stairs");
public static final ItemWall cobblestone_wall = get("cobblestone_wall");
public static final ItemDye cocoa = get("cocoa");
public static final ItemSmallBlock comparator = get("comparator");
public static final ItemBlock construction_table = get("construction_table");
public static final ItemFood cooked_beef = get("cooked_beef");
@ -184,17 +227,31 @@ public abstract class Items {
public static final ItemMetal copper_ingot = get("copper_ingot");
public static final ItemMetalBlock copper_ore = get("copper_ore");
public static final ItemBlock core = get("core");
public static final ItemBlock cracked_stonebrick = get("cracked_stonebrick");
public static final ItemBlock cyan_carpet = get("cyan_carpet");
public static final ItemBlock cyan_clay = get("cyan_clay");
public static final ItemDye cyan_dye = get("cyan_dye");
public static final ItemBlock cyan_glass = get("cyan_glass");
public static final ItemBlock cyan_glass_pane = get("cyan_glass_pane");
public static final ItemBlock cyan_wool = get("cyan_wool");
public static final ItemBlock daisy = get("daisy");
public static final ItemBlock dandelion = get("dandelion");
public static final ItemFlintAndSteel dark_lighter = get("dark_lighter");
public static final ItemDoor dark_oak_door = get("dark_oak_door");
public static final ItemFence dark_oak_fence = get("dark_oak_fence");
public static final ItemBlock dark_oak_fence_gate = get("dark_oak_fence_gate");
public static final ItemColored dark_oak_leaves = get("dark_oak_leaves");
public static final ItemColored dark_oak_leaves_autumn = get("dark_oak_leaves_autumn");
public static final ItemColored dark_oak_leaves_snowy = get("dark_oak_leaves_snowy");
public static final ItemColored dark_oak_leaves_spring = get("dark_oak_leaves_spring");
public static final ItemColored dark_oak_leaves_summer = get("dark_oak_leaves_summer");
public static final ItemColored dark_oak_leaves_winter = get("dark_oak_leaves_winter");
public static final ItemBlock dark_oak_log = get("dark_oak_log");
public static final ItemBlock dark_oak_planks = get("dark_oak_planks");
public static final ItemBlock dark_oak_sapling = get("dark_oak_sapling");
public static final ItemSlab dark_oak_slab = get("dark_oak_slab");
public static final ItemBlock dark_oak_stairs = get("dark_oak_stairs");
public static final ItemBlock daylight_detector = get("daylight_detector");
public static final ItemColored dead_bush = get("dead_bush");
public static final ItemBlock deadbush = get("deadbush");
public static final ItemBlock detector_rail = get("detector_rail");
public static final Item diamond = get("diamond");
@ -211,15 +268,25 @@ public abstract class Items {
public static final ItemShears diamond_shears = get("diamond_shears");
public static final ItemShovel diamond_shovel = get("diamond_shovel");
public static final ItemSword diamond_sword = get("diamond_sword");
public static final ItemDie die = get("die");
public static final ItemDie die_10 = get("die_10");
public static final ItemDie die_12 = get("die_12");
public static final ItemDie die_20 = get("die_20");
public static final ItemDie die_4 = get("die_4");
public static final ItemDie die_6 = get("die_6");
public static final ItemDie die_8 = get("die_8");
public static final ItemBlock dirt = get("dirt");
public static final ItemDispenser dispenser = get("dispenser");
public static final ItemDoublePlant double_plant = get("double_plant");
public static final ItemBlock dragon_egg = get("dragon_egg");
public static final ItemDispenser dropper = get("dropper");
public static final ItemBlock dry_leaves = get("dry_leaves");
public static final ItemDye dye = get("dye");
public static final ItemDynamite dynamite = get("dynamite");
public static final ItemDynamite dynamite_1 = get("dynamite_1");
public static final ItemDynamite dynamite_2 = get("dynamite_2");
public static final ItemDynamite dynamite_3 = get("dynamite_3");
public static final ItemDynamite dynamite_4 = get("dynamite_4");
public static final ItemDynamite dynamite_5 = get("dynamite_5");
public static final ItemDynamite dynamite_6 = get("dynamite_6");
public static final ItemDynamite dynamite_7 = get("dynamite_7");
public static final ItemEgg egg = get("egg");
public static final Item emerald = get("emerald");
public static final ItemBlock emerald_block = get("emerald_block");
@ -231,6 +298,7 @@ public abstract class Items {
public static final ItemBlock farmland = get("farmland");
public static final Item feather = get("feather");
public static final Item fermented_spider_eye = get("fermented_spider_eye");
public static final ItemColored fern = get("fern");
public static final ItemFireball fire_charge = get("fire_charge");
public static final ItemFireworkCharge firework_charge = get("firework_charge");
public static final ItemFirework fireworks = get("fireworks");
@ -241,8 +309,20 @@ public abstract class Items {
public static final ItemBlock floor_tiles_black = get("floor_tiles_black");
public static final ItemBlock floor_tiles_red = get("floor_tiles_red");
public static final ItemBlock floor_tiles_white = get("floor_tiles_white");
public static final ItemBlock flower = get("flower");
public static final ItemSmallBlock flower_pot = get("flower_pot");
public static final ItemSmallBlock flowerpot = get("flowerpot");
public static final ItemBlock flowerpot_allium = get("flowerpot_allium");
public static final ItemBlock flowerpot_black_lotus = get("flowerpot_black_lotus");
public static final ItemBlock flowerpot_blue_orchid = get("flowerpot_blue_orchid");
public static final ItemBlock flowerpot_cactus = get("flowerpot_cactus");
public static final ItemBlock flowerpot_daisy = get("flowerpot_daisy");
public static final ItemBlock flowerpot_dandelion = get("flowerpot_dandelion");
public static final ItemBlock flowerpot_houstonia = get("flowerpot_houstonia");
public static final ItemBlock flowerpot_orange_tulip = get("flowerpot_orange_tulip");
public static final ItemBlock flowerpot_pink_tulip = get("flowerpot_pink_tulip");
public static final ItemBlock flowerpot_poppy = get("flowerpot_poppy");
public static final ItemBlock flowerpot_red_tulip = get("flowerpot_red_tulip");
public static final ItemBlock flowerpot_rose = get("flowerpot_rose");
public static final ItemBlock flowerpot_white_tulip = get("flowerpot_white_tulip");
public static final ItemBlock furnace = get("furnace");
public static final ItemTiny ghast_tear = get("ghast_tear");
public static final Item ghi_fragment = get("ghi_fragment");
@ -267,11 +347,23 @@ public abstract class Items {
public static final ItemShovel gold_shovel = get("gold_shovel");
public static final ItemSword gold_sword = get("gold_sword");
public static final ItemAppleGold golden_apple = get("golden_apple");
public static final ItemAppleGold golden_apple_powered = get("golden_apple_powered");
public static final ItemFood golden_carrot = get("golden_carrot");
public static final ItemBlock golden_rail = get("golden_rail");
public static final ItemBucket goo_bucket = get("goo_bucket");
public static final ItemColored grass = get("grass");
public static final ItemBlock gravel = get("gravel");
public static final ItemBlock gray_carpet = get("gray_carpet");
public static final ItemBlock gray_clay = get("gray_clay");
public static final ItemDye gray_dye = get("gray_dye");
public static final ItemBlock gray_glass = get("gray_glass");
public static final ItemBlock gray_glass_pane = get("gray_glass_pane");
public static final ItemBlock gray_wool = get("gray_wool");
public static final ItemBlock green_carpet = get("green_carpet");
public static final ItemBlock green_clay = get("green_clay");
public static final ItemBlock green_glass = get("green_glass");
public static final ItemBlock green_glass_pane = get("green_glass_pane");
public static final ItemBlock green_wool = get("green_wool");
public static final Item gunpowder = get("gunpowder");
public static final ItemAxe gyriyn_axe = get("gyriyn_axe");
public static final ItemBlock gyriyn_block = get("gyriyn_block");
@ -285,9 +377,11 @@ public abstract class Items {
public static final ItemBlock hellrock = get("hellrock");
public static final ItemBlock hopper = get("hopper");
public static final ItemMinecart hopper_minecart = get("hopper_minecart");
public static final ItemBlock houstonia = get("houstonia");
public static final ItemBucket hydrogen_bucket = get("hydrogen_bucket");
public static final ItemBlock ice = get("ice");
public static final ItemInfoWand info_wand = get("info_wand");
public static final ItemDye ink_sack = get("ink_sack");
public static final ItemMetalBlock iodine_block = get("iodine_block");
public static final ItemMetalBlock iodine_ore = get("iodine_ore");
public static final ItemMetal iodine_powder = get("iodine_powder");
@ -312,7 +406,11 @@ public abstract class Items {
public static final ItemDoor jungle_door = get("jungle_door");
public static final ItemFence jungle_fence = get("jungle_fence");
public static final ItemBlock jungle_fence_gate = get("jungle_fence_gate");
public static final ItemColored jungle_leaves = get("jungle_leaves");
public static final ItemColored jungle_leaves_autumn = get("jungle_leaves_autumn");
public static final ItemColored jungle_leaves_snowy = get("jungle_leaves_snowy");
public static final ItemColored jungle_leaves_spring = get("jungle_leaves_spring");
public static final ItemColored jungle_leaves_summer = get("jungle_leaves_summer");
public static final ItemColored jungle_leaves_winter = get("jungle_leaves_winter");
public static final ItemBlock jungle_log = get("jungle_log");
public static final ItemBlock jungle_planks = get("jungle_planks");
public static final ItemBlock jungle_sapling = get("jungle_sapling");
@ -322,7 +420,10 @@ public abstract class Items {
public static final ItemBlock ladder = get("ladder");
public static final ItemBlock lamp = get("lamp");
public static final ItemBlock lapis_block = get("lapis_block");
public static final ItemDye lapis_lazuli = get("lapis_lazuli");
public static final ItemBlock lapis_ore = get("lapis_ore");
public static final ItemDoublePlant large_fern = get("large_fern");
public static final ItemDoublePlant large_tallgrass = get("large_tallgrass");
public static final ItemBucket lava_bucket = get("lava_bucket");
public static final ItemLead lead = get("lead");
public static final ItemMetalBlock lead_block = get("lead_block");
@ -334,13 +435,31 @@ public abstract class Items {
public static final ItemArmor leather_helmet = get("leather_helmet");
public static final ItemArmor leather_leggings = get("leather_leggings");
public static final ItemBlock lever = get("lever");
public static final ItemBlock light_blue_carpet = get("light_blue_carpet");
public static final ItemBlock light_blue_clay = get("light_blue_clay");
public static final ItemDye light_blue_dye = get("light_blue_dye");
public static final ItemBlock light_blue_glass = get("light_blue_glass");
public static final ItemBlock light_blue_glass_pane = get("light_blue_glass_pane");
public static final ItemBlock light_blue_wool = get("light_blue_wool");
public static final ItemPressurePlate light_weighted_pressure_plate = get("light_weighted_pressure_plate");
public static final ItemLightning lightning_wand = get("lightning_wand");
public static final ItemBlock lime_carpet = get("lime_carpet");
public static final ItemBlock lime_clay = get("lime_clay");
public static final ItemDye lime_dye = get("lime_dye");
public static final ItemBlock lime_glass = get("lime_glass");
public static final ItemBlock lime_glass_pane = get("lime_glass_pane");
public static final ItemBlock lime_wool = get("lime_wool");
public static final ItemBlock lit_furnace = get("lit_furnace");
public static final ItemBlock lit_pumpkin = get("lit_pumpkin");
public static final ItemMetalBlock lithium_block = get("lithium_block");
public static final ItemMetal lithium_ingot = get("lithium_ingot");
public static final ItemMetalBlock lithium_ore = get("lithium_ore");
public static final ItemBlock magenta_carpet = get("magenta_carpet");
public static final ItemBlock magenta_clay = get("magenta_clay");
public static final ItemDye magenta_dye = get("magenta_dye");
public static final ItemBlock magenta_glass = get("magenta_glass");
public static final ItemBlock magenta_glass_pane = get("magenta_glass_pane");
public static final ItemBlock 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 ItemMetalBlock magnesium_block = get("magnesium_block");
@ -353,7 +472,11 @@ public abstract class Items {
public static final ItemDoor maple_door = get("maple_door");
public static final ItemFence maple_fence = get("maple_fence");
public static final ItemBlock maple_fence_gate = get("maple_fence_gate");
public static final ItemColored maple_leaves = get("maple_leaves");
public static final ItemColored maple_leaves_autumn = get("maple_leaves_autumn");
public static final ItemColored maple_leaves_snowy = get("maple_leaves_snowy");
public static final ItemColored maple_leaves_spring = get("maple_leaves_spring");
public static final ItemColored maple_leaves_summer = get("maple_leaves_summer");
public static final ItemColored maple_leaves_winter = get("maple_leaves_winter");
public static final ItemBlock maple_log = get("maple_log");
public static final ItemBlock maple_planks = get("maple_planks");
public static final ItemBlock maple_sapling = get("maple_sapling");
@ -369,6 +492,8 @@ public abstract class Items {
public static final ItemBlock moon_cheese = get("moon_cheese");
public static final ItemBlock moon_rock = get("moon_rock");
public static final ItemBlock mossy_cobblestone = get("mossy_cobblestone");
public static final ItemWall mossy_cobblestone_wall = get("mossy_cobblestone_wall");
public static final ItemBlock mossy_stonebrick = get("mossy_stonebrick");
public static final ItemSoup mushroom_stew = get("mushroom_stew");
public static final ItemBlock mycelium = get("mycelium");
public static final ItemNameTag name_tag = get("name_tag");
@ -400,15 +525,27 @@ public abstract class Items {
public static final ItemDoor oak_door = get("oak_door");
public static final ItemFence oak_fence = get("oak_fence");
public static final ItemBlock oak_fence_gate = get("oak_fence_gate");
public static final ItemColored oak_leaves = get("oak_leaves");
public static final ItemColored oak_leaves_autumn = get("oak_leaves_autumn");
public static final ItemColored oak_leaves_snowy = get("oak_leaves_snowy");
public static final ItemColored oak_leaves_spring = get("oak_leaves_spring");
public static final ItemColored oak_leaves_summer = get("oak_leaves_summer");
public static final ItemColored oak_leaves_winter = get("oak_leaves_winter");
public static final ItemBlock oak_log = get("oak_log");
public static final ItemBlock oak_planks = get("oak_planks");
public static final ItemBlock oak_sapling = get("oak_sapling");
public static final ItemSlab oak_slab = get("oak_slab");
public static final ItemBlock oak_stairs = get("oak_stairs");
public static final ItemBlock obsidian = get("obsidian");
public static final ItemBlock orange_carpet = get("orange_carpet");
public static final ItemBlock orange_clay = get("orange_clay");
public static final ItemDye orange_dye = get("orange_dye");
public static final ItemBlock orange_glass = get("orange_glass");
public static final ItemBlock orange_glass_pane = get("orange_glass_pane");
public static final ItemBlock orange_tulip = get("orange_tulip");
public static final ItemBlock orange_wool = get("orange_wool");
public static final ItemFragile orb = get("orb");
public static final ItemBlock packed_ice = get("packed_ice");
public static final ItemDoublePlant paeonia = get("paeonia");
public static final ItemMetalBlock palladium_block = get("palladium_block");
public static final ItemMetal palladium_ingot = get("palladium_ingot");
public static final ItemMetalBlock palladium_ore = get("palladium_ore");
@ -417,6 +554,13 @@ public abstract class Items {
public static final ItemMetalBlock phosphor_block = get("phosphor_block");
public static final ItemMetalBlock phosphor_ore = get("phosphor_ore");
public static final ItemMetal phosphor_powder = get("phosphor_powder");
public static final ItemBlock pink_carpet = get("pink_carpet");
public static final ItemBlock pink_clay = get("pink_clay");
public static final ItemDye pink_dye = get("pink_dye");
public static final ItemBlock pink_glass = get("pink_glass");
public static final ItemBlock pink_glass_pane = get("pink_glass_pane");
public static final ItemBlock pink_tulip = get("pink_tulip");
public static final ItemBlock pink_wool = get("pink_wool");
public static final ItemPiston piston = get("piston");
public static final ItemMetalBlock platinum_block = get("platinum_block");
public static final ItemMetal platinum_ingot = get("platinum_ingot");
@ -424,7 +568,9 @@ public abstract class Items {
public static final ItemMetalBlock plutonium_block = get("plutonium_block");
public static final ItemMetal plutonium_ingot = get("plutonium_ingot");
public static final ItemMetalBlock plutonium_ore = get("plutonium_ore");
public static final ItemBlock podzol = get("podzol");
public static final ItemFood poisonous_potato = get("poisonous_potato");
public static final ItemBlock poppy = get("poppy");
public static final ItemFood porkchop = get("porkchop");
public static final ItemBlock portal_frame = get("portal_frame");
public static final ItemMetalBlock potassium_block = get("potassium_block");
@ -432,6 +578,32 @@ public abstract class Items {
public static final ItemMetal potassium_powder = get("potassium_powder");
public static final ItemSeedFood potato = get("potato");
public static final ItemPotion potion = get("potion");
public static final ItemPotion potion_damage = get("potion_damage");
public static final ItemPotion potion_damage_2 = get("potion_damage_2");
public static final ItemPotion potion_fire_resistance_3600 = get("potion_fire_resistance_3600");
public static final ItemPotion potion_fire_resistance_9600 = get("potion_fire_resistance_9600");
public static final ItemPotion potion_health = get("potion_health");
public static final ItemPotion potion_health_2 = get("potion_health_2");
public static final ItemPotion potion_night_vision_3600 = get("potion_night_vision_3600");
public static final ItemPotion potion_night_vision_9600 = get("potion_night_vision_9600");
public static final ItemPotion potion_poison_2400 = get("potion_poison_2400");
public static final ItemPotion potion_poison_2_450 = get("potion_poison_2_450");
public static final ItemPotion potion_poison_900 = get("potion_poison_900");
public static final ItemPotion potion_regeneration_2400 = get("potion_regeneration_2400");
public static final ItemPotion potion_regeneration_2_450 = get("potion_regeneration_2_450");
public static final ItemPotion potion_regeneration_900 = get("potion_regeneration_900");
public static final ItemPotion potion_slowness_1800 = get("potion_slowness_1800");
public static final ItemPotion potion_slowness_4800 = get("potion_slowness_4800");
public static final ItemPotion potion_speed_2_1800 = get("potion_speed_2_1800");
public static final ItemPotion potion_speed_3600 = get("potion_speed_3600");
public static final ItemPotion potion_speed_9600 = get("potion_speed_9600");
public static final ItemPotion potion_stability_3600 = get("potion_stability_3600");
public static final ItemPotion potion_stability_9600 = get("potion_stability_9600");
public static final ItemPotion potion_strength_2_1800 = get("potion_strength_2_1800");
public static final ItemPotion potion_strength_3600 = get("potion_strength_3600");
public static final ItemPotion potion_strength_9600 = get("potion_strength_9600");
public static final ItemPotion potion_weakness_1800 = get("potion_weakness_1800");
public static final ItemPotion potion_weakness_4800 = get("potion_weakness_4800");
public static final ItemMetalBlock praseodymium_block = get("praseodymium_block");
public static final ItemMetal praseodymium_ingot = get("praseodymium_ingot");
public static final ItemMetalBlock praseodymium_ore = get("praseodymium_ore");
@ -439,9 +611,17 @@ public abstract class Items {
public static final ItemFood pumpkin_pie = get("pumpkin_pie");
public static final ItemSeeds pumpkin_stem = get("pumpkin_stem");
public static final ItemBed purple_bed = get("purple_bed");
public static final ItemBlock purple_carpet = get("purple_carpet");
public static final ItemBlock purple_clay = get("purple_clay");
public static final ItemDye purple_dye = get("purple_dye");
public static final ItemBlock purple_glass = get("purple_glass");
public static final ItemBlock purple_glass_pane = get("purple_glass_pane");
public static final ItemBlock purple_wool = get("purple_wool");
public static final Item quartz = get("quartz");
public static final ItemBlock quartz_block = get("quartz_block");
public static final ItemBlock quartz_ore = get("quartz_ore");
public static final ItemBlock quartz_ornaments = get("quartz_ornaments");
public static final ItemBlock quartz_pillar = get("quartz_pillar");
public static final ItemSlab quartz_slab = get("quartz_slab");
public static final ItemBlock quartz_stairs = get("quartz_stairs");
public static final ItemMetalBlock radium_block = get("radium_block");
@ -472,11 +652,20 @@ public abstract class Items {
public static final ItemBucket recursive_mercury_bucket = get("recursive_mercury_bucket");
public static final ItemBucket recursive_nukage_bucket = get("recursive_nukage_bucket");
public static final ItemBucket recursive_slime_bucket = get("recursive_slime_bucket");
public static final ItemBucket recursive_springwater_bucket = get("recursive_springwater_bucket");
public static final ItemBucket recursive_water_bucket = get("recursive_water_bucket");
public static final ItemBed red_bed = get("red_bed");
public static final ItemButton red_button = get("red_button");
public static final ItemBlock red_carpet = get("red_carpet");
public static final ItemBlock red_clay = get("red_clay");
public static final ItemDye red_dye = get("red_dye");
public static final ItemBlock red_glass = get("red_glass");
public static final ItemBlock red_glass_pane = get("red_glass_pane");
public static final ItemBlock red_mushroom = get("red_mushroom");
public static final ItemHugeMushroom red_mushroom_block = get("red_mushroom_block");
public static final ItemBlock red_sand = get("red_sand");
public static final ItemBlock red_tulip = get("red_tulip");
public static final ItemBlock red_wool = get("red_wool");
public static final ItemRedstone redstone = get("redstone");
public static final ItemBlock redstone_block = get("redstone_block");
public static final ItemBlock redstone_lamp = get("redstone_lamp");
@ -485,6 +674,8 @@ public abstract class Items {
public static final ItemSmallBlock reeds = get("reeds");
public static final ItemSmallBlock repeater = get("repeater");
public static final ItemBlock rock = get("rock");
public static final ItemBlock rose = get("rose");
public static final ItemDoublePlant rose_bush = get("rose_bush");
public static final ItemFood rotten_flesh = get("rotten_flesh");
public static final Item ruby = get("ruby");
public static final ItemBlock ruby_block = get("ruby_block");
@ -502,12 +693,20 @@ public abstract class Items {
public static final ItemMetal silicon_ingot = get("silicon_ingot");
public static final ItemMetalBlock silicon_ore = get("silicon_ore");
public static final ItemMetalBlock silver_block = get("silver_block");
public static final ItemBlock silver_carpet = get("silver_carpet");
public static final ItemBlock silver_clay = get("silver_clay");
public static final ItemDye silver_dye = get("silver_dye");
public static final ItemBlock silver_glass = get("silver_glass");
public static final ItemBlock silver_glass_pane = get("silver_glass_pane");
public static final ItemMetal silver_ingot = get("silver_ingot");
public static final ItemMetalBlock silver_ore = get("silver_ore");
public static final ItemBlock silver_wool = get("silver_wool");
public static final ItemSmallBlock skull = get("skull");
public static final Item slime_ball = get("slime_ball");
public static final ItemBlock slime_block = get("slime_block");
public static final ItemBucket slime_bucket = get("slime_bucket");
public static final ItemBlock smooth_rock = get("smooth_rock");
public static final ItemBlock smooth_sandstone = get("smooth_sandstone");
public static final ItemBlock snow = get("snow");
public static final ItemSnow snow_layer = get("snow_layer");
public static final ItemSnowball snowball = get("snowball");
@ -518,19 +717,48 @@ public abstract class Items {
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 ItemPotion splash_potion = get("splash_potion");
public static final ItemPotion splash_potion_damage = get("splash_potion_damage");
public static final ItemPotion splash_potion_damage_2 = get("splash_potion_damage_2");
public static final ItemPotion splash_potion_fire_resistance_2701 = get("splash_potion_fire_resistance_2701");
public static final ItemPotion splash_potion_fire_resistance_7201 = get("splash_potion_fire_resistance_7201");
public static final ItemPotion splash_potion_health = get("splash_potion_health");
public static final ItemPotion splash_potion_health_2 = get("splash_potion_health_2");
public static final ItemPotion splash_potion_night_vision_2701 = get("splash_potion_night_vision_2701");
public static final ItemPotion splash_potion_night_vision_7201 = get("splash_potion_night_vision_7201");
public static final ItemPotion splash_potion_poison_1801 = get("splash_potion_poison_1801");
public static final ItemPotion splash_potion_poison_2_338 = get("splash_potion_poison_2_338");
public static final ItemPotion splash_potion_poison_676 = get("splash_potion_poison_676");
public static final ItemPotion splash_potion_regeneration_1801 = get("splash_potion_regeneration_1801");
public static final ItemPotion splash_potion_regeneration_2_338 = get("splash_potion_regeneration_2_338");
public static final ItemPotion splash_potion_regeneration_676 = get("splash_potion_regeneration_676");
public static final ItemPotion splash_potion_slowness_1351 = get("splash_potion_slowness_1351");
public static final ItemPotion splash_potion_slowness_3601 = get("splash_potion_slowness_3601");
public static final ItemPotion splash_potion_speed_2701 = get("splash_potion_speed_2701");
public static final ItemPotion splash_potion_speed_2_1351 = get("splash_potion_speed_2_1351");
public static final ItemPotion splash_potion_speed_7201 = get("splash_potion_speed_7201");
public static final ItemPotion splash_potion_stability_2701 = get("splash_potion_stability_2701");
public static final ItemPotion splash_potion_stability_7201 = get("splash_potion_stability_7201");
public static final ItemPotion splash_potion_strength_2701 = get("splash_potion_strength_2701");
public static final ItemPotion splash_potion_strength_2_1351 = get("splash_potion_strength_2_1351");
public static final ItemPotion splash_potion_strength_7201 = get("splash_potion_strength_7201");
public static final ItemPotion splash_potion_weakness_1351 = get("splash_potion_weakness_1351");
public static final ItemPotion splash_potion_weakness_3601 = get("splash_potion_weakness_3601");
public static final ItemBlock sponge = get("sponge");
public static final ItemBucket springwater_bucket = get("springwater_bucket");
public static final ItemDoor spruce_door = get("spruce_door");
public static final ItemFence spruce_fence = get("spruce_fence");
public static final ItemBlock spruce_fence_gate = get("spruce_fence_gate");
public static final ItemColored spruce_leaves = get("spruce_leaves");
public static final ItemColored spruce_leaves_autumn = get("spruce_leaves_autumn");
public static final ItemColored spruce_leaves_snowy = get("spruce_leaves_snowy");
public static final ItemColored spruce_leaves_spring = get("spruce_leaves_spring");
public static final ItemColored spruce_leaves_summer = get("spruce_leaves_summer");
public static final ItemColored spruce_leaves_winter = get("spruce_leaves_winter");
public static final ItemBlock spruce_log = get("spruce_log");
public static final ItemBlock spruce_planks = get("spruce_planks");
public static final ItemBlock spruce_sapling = get("spruce_sapling");
public static final ItemSlab spruce_slab = get("spruce_slab");
public static final ItemBlock spruce_stairs = get("spruce_stairs");
public static final ItemCloth stained_glass = get("stained_glass");
public static final ItemCloth stained_glass_pane = get("stained_glass_pane");
public static final ItemCloth stained_hardened_clay = get("stained_hardened_clay");
public static final ItemStick stick = get("stick");
public static final ItemPiston sticky_piston = get("sticky_piston");
public static final ItemBlock stone = get("stone");
@ -551,6 +779,8 @@ public abstract class Items {
public static final ItemMetalBlock sulfur_block = get("sulfur_block");
public static final ItemMetalBlock sulfur_ore = get("sulfur_ore");
public static final ItemMetal sulfur_powder = get("sulfur_powder");
public static final ItemDoublePlant sunflower = get("sunflower");
public static final ItemDoublePlant syringa = get("syringa");
public static final ItemColored tallgrass = get("tallgrass");
public static final ItemAxe thetium_axe = get("thetium_axe");
public static final ItemBlock thetium_block = get("thetium_block");
@ -568,7 +798,11 @@ public abstract class Items {
public static final ItemDoor tian_door = get("tian_door");
public static final ItemFence tian_fence = get("tian_fence");
public static final ItemBlock tian_fence_gate = get("tian_fence_gate");
public static final ItemColored tian_leaves = get("tian_leaves");
public static final ItemColored tian_leaves_autumn = get("tian_leaves_autumn");
public static final ItemColored tian_leaves_snowy = get("tian_leaves_snowy");
public static final ItemColored tian_leaves_spring = get("tian_leaves_spring");
public static final ItemColored tian_leaves_summer = get("tian_leaves_summer");
public static final ItemColored tian_leaves_winter = get("tian_leaves_winter");
public static final ItemBlock tian_log = get("tian_log");
public static final ItemBlock tian_planks = get("tian_planks");
public static final ItemBlock tian_reactor = get("tian_reactor");
@ -583,6 +817,13 @@ public abstract class Items {
public static final ItemMetal titanium_ingot = get("titanium_ingot");
public static final ItemMetalBlock titanium_ore = get("titanium_ore");
public static final ItemBlock tnt = get("tnt");
public static final ItemBlock tnt_1 = get("tnt_1");
public static final ItemBlock tnt_2 = get("tnt_2");
public static final ItemBlock tnt_3 = get("tnt_3");
public static final ItemBlock tnt_4 = get("tnt_4");
public static final ItemBlock tnt_5 = get("tnt_5");
public static final ItemBlock tnt_6 = get("tnt_6");
public static final ItemBlock tnt_7 = get("tnt_7");
public static final ItemMinecart tnt_minecart = get("tnt_minecart");
public static final ItemBlock torch = get("torch");
public static final ItemBlock trapdoor = get("trapdoor");
@ -623,6 +864,12 @@ public abstract class Items {
public static final ItemSeeds wheat = get("wheat");
public static final Item wheats = get("wheats");
public static final ItemBed white_bed = get("white_bed");
public static final ItemBlock white_carpet = get("white_carpet");
public static final ItemBlock white_clay = get("white_clay");
public static final ItemBlock white_glass = get("white_glass");
public static final ItemBlock white_glass_pane = get("white_glass_pane");
public static final ItemBlock white_tulip = get("white_tulip");
public static final ItemBlock white_wool = get("white_wool");
public static final ItemAxe wood_axe = get("wood_axe");
public static final ItemHoe wood_hoe = get("wood_hoe");
public static final ItemPickaxe wood_pickaxe = get("wood_pickaxe");
@ -630,15 +877,24 @@ public abstract class Items {
public static final ItemSword wood_sword = get("wood_sword");
public static final ItemButton wooden_button = get("wooden_button");
public static final ItemPressurePlate wooden_pressure_plate = get("wooden_pressure_plate");
public static final ItemCloth wool = get("wool");
public static final ItemBlock workbench = get("workbench");
public static final Item writable_book = get("writable_book");
public static final Item written_book = get("written_book");
public static final ItemBlock yellow_carpet = get("yellow_carpet");
public static final ItemBlock yellow_clay = get("yellow_clay");
public static final ItemDye yellow_dye = get("yellow_dye");
public static final ItemBlock yellow_glass = get("yellow_glass");
public static final ItemBlock yellow_glass_pane = get("yellow_glass_pane");
public static final ItemBlock yellow_wool = get("yellow_wool");
public static final ItemMetalBlock zinc_block = get("zinc_block");
public static final ItemMetal zinc_ingot = get("zinc_ingot");
public static final ItemMetalBlock zinc_ore = get("zinc_ore");
public static final ItemBucket recursive_springwater_bucket = get("recursive_springwater_bucket");
public static final ItemBucket springwater_bucket = get("springwater_bucket");
public static final ItemFishFood cod = get("cod");
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");
private static <T extends Item> T get(String id) {
if(!ItemRegistry.REGISTRY.containsKey(id))

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

@ -30,7 +30,7 @@ public abstract class SmeltingRegistry
add(Items.beef, new ItemStack(Items.cooked_beef), 0.35F);
add(Items.chicken, new ItemStack(Items.cooked_chicken), 0.35F);
add(Blocks.cobblestone, new ItemStack(Blocks.stone), 0.1F);
add(Blocks.stonebrick, new ItemStack(Blocks.stonebrick_cracked), 0.1F);
add(Blocks.stonebrick, new ItemStack(Blocks.cracked_stonebrick), 0.1F);
add(Items.clay_ball, new ItemStack(Items.brick), 0.3F);
add(Blocks.clay, new ItemStack(Blocks.hardened_clay), 0.35F);
add(Blocks.cactus, new ItemStack(Items.cactus_green), 0.2F);

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

@ -30,7 +30,7 @@ public abstract class TradeRegistry {
new GemForItem(Items.coal, new PriceInfo(16, 24)),
new ItemForGemItem(Items.cod, new PriceInfo(6, 6), Items.cooked_cod, new PriceInfo(6, 6)),
new EnchForGem(Items.fishing_rod, new PriceInfo(7, 8)),
new GemForItem(ItemRegistry.getItemFromBlock(Blocks.wool), new PriceInfo(16, 22)),
new GemForItem(Items.white_wool, new PriceInfo(16, 22)),
new ItemForGem(Items.iron_shears, new PriceInfo(3, 4)),
new ItemForGem(Items.white_wool, new PriceInfo(1, 2)),
new ItemForGem(Items.black_wool, new PriceInfo(1, 2)),

2
common/src/main/java/common/item/CheatTab.java
View file

@ -24,7 +24,7 @@ public enum CheatTab {
},
PLANTS("Pflanzen") {
protected Item getIconItem() {
return ItemRegistry.getItemFromBlock(Blocks.oak_leaves);
return ItemRegistry.getItemFromBlock(Blocks.oak_leaves_spring);
}
},
DECORATION("Dekoration") {

28
common/src/main/java/common/item/ItemFishFood.java
View file

@ -51,11 +51,11 @@ public class ItemFishFood extends ItemFood
public String getDisplay(ItemStack stack)
{
return (this.type.canCook() ? (this.cooked ? "Gebratener " : "Roher ") : "") + this.type.getName();
return (this.type.canCook() ? (this.cooked ? "Gebratener " : "Roher ") : "") + this.type.getDisplay();
}
public Model getModel(ModelProvider provider, String name) {
return provider.getModel(this.getTransform(), (this.cooked ? "cooked_" : "") + this.type.getTexture());
return provider.getModel(this.getTransform(), (this.cooked ? "cooked_" : "") + this.type.getName());
}
public static enum FishType
@ -66,27 +66,27 @@ public class ItemFishFood extends ItemFood
PUFFERFISH("pufferfish", 3, "Kugelfisch", 1);
private final int meta;
private final String texture;
private final String name;
private final String display;
private final int uncookedHealAmount;
private final int cookedHealAmount;
private boolean cookable = false;
private FishType(String texture, int meta, String name, int uncookedHeal, int cookedHeal)
private FishType(String name, int meta, String display, int uncookedHeal, int cookedHeal)
{
this.texture = texture;
this.meta = meta;
this.name = name;
this.meta = meta;
this.display = display;
this.uncookedHealAmount = uncookedHeal;
this.cookedHealAmount = cookedHeal;
this.cookable = true;
}
private FishType(String texture, int meta, String name, int uncookedHeal)
private FishType(String name, int meta, String display, int uncookedHeal)
{
this.texture = texture;
this.meta = meta;
this.name = name;
this.meta = meta;
this.display = display;
this.uncookedHealAmount = uncookedHeal;
this.cookedHealAmount = 0;
this.cookable = false;
@ -97,16 +97,16 @@ public class ItemFishFood extends ItemFood
return this.meta;
}
public String getDisplay()
{
return this.display;
}
public String getName()
{
return this.name;
}
public String getTexture()
{
return this.texture;
}
public int getUncookedHealAmount()
{
return this.uncookedHealAmount;

4
common/src/main/java/common/tileentity/TileEntityBeacon.java
View file

@ -3,6 +3,8 @@ package common.tileentity;
import java.util.List;
import common.block.Block;
import common.block.artificial.BlockStainedGlass;
import common.block.artificial.BlockStainedGlassPane;
import common.color.DyeColor;
import common.entity.types.EntityLiving;
import common.init.Blocks;
@ -154,7 +156,7 @@ public class TileEntityBeacon extends TileEntity implements ITickable
{
State iblockstate = this.worldObj.getState(blockpos$mutableblockpos.set(j, i1, l));
if (iblockstate.getBlock() != Blocks.stained_glass && iblockstate.getBlock() != Blocks.stained_glass_pane
if (!(iblockstate.getBlock() instanceof BlockStainedGlass) && !(iblockstate.getBlock() instanceof BlockStainedGlassPane)
&& iblockstate.getBlock().getLightOpacity() >= 15 && iblockstate.getBlock() != Blocks.bedrock) {
this.isComplete = false;
break;